X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_interface.h;h=fae34b527e1f19ed359b5acbce0d526423b37cd3;hb=a11122ee5f8162a8195da054e8d5772e0e7f9589;hp=78388518a482f62dc4b2539776f9fee01dbc4dca;hpb=f6d917cb446f91abd2033725597a9ef3b8ea84e2;p=vlc

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 78388518a4..fae34b527e 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -66,8 +66,6 @@ struct intf_thread_t
     void ( *pf_show_dialog ) ( intf_thread_t *, int, int,
                                intf_dialog_args_t * );
 
-    vlc_mutex_t  change_lock;
-
     config_chain_t *p_cfg;
 };
 
@@ -92,7 +90,7 @@ struct intf_dialog_args_t
     bool b_multiple;
 
     /* Specific to INTF_DIALOG_INTERACTION */
-    interaction_dialog_t *p_dialog;
+    struct interaction_dialog_t *p_dialog;
 };
 
 /*****************************************************************************
@@ -108,9 +106,6 @@ VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) );
 
 VLC_EXPORT( void, libvlc_Quit, ( libvlc_int_t * ) );
 
-VLC_EXPORT( int, interaction_Register, ( intf_thread_t * ) );
-VLC_EXPORT( int, interaction_Unregister, ( intf_thread_t * ) );
-
 /*@}*/
 
 /*****************************************************************************
@@ -171,17 +166,18 @@ typedef enum vlc_dialog {
 /* Useful text messages shared by interfaces */
 #define INTF_ABOUT_MSG LICENSE_MSG
 
-#define EXTENSIONS_AUDIO "*.a52;*.aac;*.ac3;*.ape;*.dts;*.flac;*.m4a;*.m4p;*.mka;" \
-                         "*.mlp;*.mod;*.mp1;*.mp2;*.mp3;*.oga;*.ogg;*.oma;*.spx;" \
+#define EXTENSIONS_AUDIO "*.a52;*.aac;*.ac3;*.ape;*.dts;*.flac;*.it;" \
+                         "*.m4a;*.m4p;*.mka;*.mlp;*.mod;*.mp1;*.mp2;*.mp3;" \
+                         "*.oga;*.ogg;*.oma;*.s3m;*.spx;" \
                          "*.wav;*.wma;*.wv;*.xm"
 
 #define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.iso;*.m1v;*.m2v;" \
                          "*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \
                          "*.mpeg2;*.mpeg4;*.mpg;*.mts;*.mxf;*.nuv;" \
                          "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \
-                         "*.rec;*.rm;*.rmvb;*.ts;*.vob;*.wmv;"
+                         "*.rec;*.rm;*.rmvb;*.ts;*.vob;*.wmv"
 
-#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.vlc;*.xspf"
+#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.ram;*.vlc;*.xspf"
 
 #define EXTENSIONS_MEDIA EXTENSIONS_VIDEO ";" EXTENSIONS_AUDIO ";" \
                           EXTENSIONS_PLAYLIST
@@ -198,7 +194,7 @@ typedef enum vlc_dialog {
 /**
  * This structure describes a piece of interaction with the user
  */
-struct interaction_dialog_t
+typedef struct interaction_dialog_t
 {
     int             i_type;             ///< Type identifier
     char           *psz_title;          ///< Title
@@ -225,7 +221,7 @@ struct interaction_dialog_t
                                         //for interaction
     intf_thread_t  *p_interface;
     vlc_mutex_t    *p_lock;
-};
+} interaction_dialog_t;
 
 /**
  * Possible flags . Dialog types
@@ -242,7 +238,6 @@ struct interaction_dialog_t
 /** Possible return codes */
 enum
 {
-    DIALOG_DEFAULT,
     DIALOG_OK_YES,
     DIALOG_NO,
     DIALOG_CANCELLED
@@ -251,21 +246,10 @@ enum
 /** Possible status  */
 enum
 {
-    SENT_DIALOG=1,                ///< Sent to interface
-    UPDATED_DIALOG,             ///< Update to send
     ANSWERED_DIALOG,            ///< Got "answer"
-    HIDING_DIALOG,              ///< Hiding requested
-    HIDDEN_DIALOG,              ///< Now hidden. Requesting destruction
     DESTROYED_DIALOG,           ///< Interface has destroyed it
 };
 
-/** Possible interaction types */
-enum
-{
-    INTERACT_DIALOG_ONEWAY,     ///< Dialog box without feedback
-    INTERACT_DIALOG_TWOWAY,     ///< Dialog box with feedback
-};
-
 /** Possible actions */
 enum
 {
@@ -275,23 +259,10 @@ enum
     INTERACT_DESTROY
 };
 
-/***************************************************************************
- * Exported symbols
- ***************************************************************************/
-
-#define intf_UserLoginPassword( a, b, c, d, e... ) __intf_UserLoginPassword( VLC_OBJECT(a),b,c,d,e)
-VLC_EXPORT( int, __intf_UserLoginPassword,( vlc_object_t*, const char*, const char*, char **, char **) );
-#define intf_UserYesNo( a, b, c, d, e, f ) __intf_UserYesNo( VLC_OBJECT(a),b,c, d, e, f )
-VLC_EXPORT( int, __intf_UserYesNo,( vlc_object_t*, const char*, const char*, const char*, const char*, const char*) );
-#define intf_UserStringInput( a, b, c, d ) __intf_UserStringInput( VLC_OBJECT(a),b,c,d )
-VLC_EXPORT( int, __intf_UserStringInput,(vlc_object_t*, const char*, const char*, char **) );
-
-#define intf_IntfProgress( a, b, c ) __intf_Progress( VLC_OBJECT(a), NULL, b,c, -1 )
-#define intf_UserProgress( a, b, c, d, e ) __intf_Progress( VLC_OBJECT(a),b,c,d,e )
-VLC_EXPORT( interaction_dialog_t *, __intf_Progress,( vlc_object_t*, const char*, const char*, float, int) );
-VLC_EXPORT( void, intf_ProgressUpdate,( interaction_dialog_t *, const char*, float, int) );
-VLC_EXPORT( bool, intf_ProgressIsCancelled,( interaction_dialog_t * ) );
-VLC_EXPORT( void, intf_UserHide,( interaction_dialog_t * ));
+#define intf_UserStringInput( a, b, c, d ) (VLC_OBJECT(a),b,c,d, VLC_EGENERIC)
+#define interaction_Register( t ) (t, VLC_EGENERIC)
+#define interaction_Unregister( t ) (t, VLC_EGENERIC)
+
 
 /** @} */
 /** @} */