Add .iso to the video files extensions (untested)

[vlc] / include / vlc_interface.h

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 1c028b74204f777bb38f320a4f0c707a367588c9..ecd43a4bf7b2202e7dd3e7af39e28c98530a1897 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -50,12 +50,11 @@ struct intf_thread_t
     VLC_COMMON_MEMBERS
 
     /* Thread properties and locks */
-#ifdef __APPLE__
+#if defined( __APPLE__ ) || defined( WIN32 )
     bool          b_should_run_on_first_thread;
 #endif
 
     /* Specific interfaces */
-    intf_console_t *    p_console;                               /** console */
     intf_sys_t *        p_sys;                          /** system interface */
     char *              psz_intf;                    /** intf name specified */
 
@@ -67,13 +66,9 @@ struct intf_thread_t
     void ( *pf_show_dialog ) ( intf_thread_t *, int, int,
                                intf_dialog_args_t * );
 
-    /** Interaction stuff */
-    bool b_interaction;
-
-    /* XXX: new message passing stuff will go here */
     vlc_mutex_t  change_lock;
-    bool   b_menu_change;
-    bool   b_menu;
+
+    config_chain_t *p_cfg;
 };
 
 /** \brief Arguments passed to a dialogs provider
@@ -108,13 +103,14 @@ VLC_EXPORT( intf_thread_t *, __intf_Create,     ( vlc_object_t *, const char * )
 VLC_EXPORT( int,               intf_RunThread,  ( intf_thread_t * ) );
 VLC_EXPORT( void,              intf_StopThread, ( intf_thread_t * ) );
 
-/* If the interface is in the main thread, it should listen both to
- * p_intf->b_die and p_libvlc->b_die */
-#define intf_ShouldDie( p_intf ) (p_intf->b_die || p_intf->p_libvlc->b_die )
-
 #define intf_Eject(a,b) __intf_Eject(VLC_OBJECT(a),b)
 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 * ) );
+
 /*@}*/
 
 /*****************************************************************************
@@ -180,10 +176,11 @@ typedef enum vlc_dialog {
                          "*.wav;*.wma;*.xm"
 
 #define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.m1v;*.m2v;" \
-                         "*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \
-                         "*.mpeg2;*.mpeg4;*.mpg;*.mts;*.mxf;" \
+                         "*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \
+                         "*.mpeg2;*.mpeg4;*.mpg;*.mts;*.mxf;*.nuv;" \
                          "*.ogg;*.ogm;*.ogv;*.ogx;" \
-                         "*.ps;*.ts;*.vob;*.wmv"
+                         "*.ps;*.rm;*.rmvb;*.ts;*.vob;*.wmv;" \
+                         "*.iso"
 
 #define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.vlc;*.xspf"
 
@@ -204,7 +201,6 @@ typedef enum vlc_dialog {
  */
 struct interaction_dialog_t
 {
-    int             i_id;               ///< Unique ID
     int             i_type;             ///< Type identifier
     char           *psz_title;          ///< Title
     char           *psz_description;    ///< Descriptor string
@@ -229,6 +225,7 @@ struct interaction_dialog_t
     interaction_t  *p_interaction;      ///< Parent interaction object
     vlc_object_t   *p_parent;           ///< The vlc object that asked
                                         //for interaction
+    intf_thread_t  *p_interface;
 };
 
 /**
@@ -256,8 +253,7 @@ enum
 /** Possible status  */
 enum
 {
-    NEW_DIALOG,                 ///< Just created
-    SENT_DIALOG,                ///< Sent to interface
+    SENT_DIALOG=1,                ///< Sent to interface
     UPDATED_DIALOG,             ///< Update to send
     ANSWERED_DIALOG,            ///< Got "answer"
     HIDING_DIALOG,              ///< Hiding requested
@@ -281,20 +277,6 @@ enum
     INTERACT_DESTROY
 };
 
-/**
- * This structure contains the active interaction dialogs, and is
- * used by the manager
- */
-struct interaction_t
-{
-    VLC_COMMON_MEMBERS
-
-    int                         i_dialogs;      ///< Number of dialogs
-    interaction_dialog_t      **pp_dialogs;     ///< Dialogs
-    intf_thread_t              *p_intf;         ///< Interface to use
-    int                         i_last_id;      ///< Last attributed ID
-};
-
 /***************************************************************************
  * Exported symbols
  ***************************************************************************/
@@ -312,13 +294,10 @@ VLC_EXPORT( int, __intf_UserStringInput,(vlc_object_t*, const char*, const 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( int, __intf_Progress,( vlc_object_t*, const char*, const char*, float, int) );
-#define intf_ProgressUpdate( a, b, c, d, e ) __intf_ProgressUpdate( VLC_OBJECT(a),b,c,d,e )
-VLC_EXPORT( void, __intf_ProgressUpdate,( vlc_object_t*, int, const char*, float, int) );
-#define intf_ProgressIsCancelled( a, b ) __intf_UserProgressIsCancelled( VLC_OBJECT(a),b )
-VLC_EXPORT( bool, __intf_UserProgressIsCancelled,( vlc_object_t*, int ) );
-#define intf_UserHide( a, b ) __intf_UserHide( VLC_OBJECT(a), b )
-VLC_EXPORT( void, __intf_UserHide,( vlc_object_t *, int ));
+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 * ));
 
 /** @} */
 /** @} */