Add m2ts and mts to the interface dialog selectors.

[vlc] / include / vlc_interface.h

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 8564a7b2232a1c5dd0efa833f7971f6610d7e997..65febc9dabd70f98f5abdc5a164739a461405b20 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -50,7 +50,9 @@ struct intf_thread_t
     VLC_COMMON_MEMBERS
 
     /* Thread properties and locks */
+#ifdef __APPLE__
     bool          b_should_run_on_first_thread;
+#endif
 
     /* Specific interfaces */
     intf_console_t *    p_console;                               /** console */
@@ -68,13 +70,6 @@ struct intf_thread_t
     /** Interaction stuff */
     bool b_interaction;
 
-    /** Video window callbacks */
-    void * ( *pf_request_window ) ( intf_thread_t *, vout_thread_t *,
-                                    int *, int *,
-                                    unsigned int *, unsigned int * );
-    void   ( *pf_release_window ) ( intf_thread_t *, void * );
-    int    ( *pf_control_window ) ( intf_thread_t *, void *, int, va_list );
-
     /* XXX: new message passing stuff will go here */
     vlc_mutex_t  change_lock;
     bool   b_menu_change;
@@ -141,7 +136,7 @@ VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) );
          msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \
                              "anymore, open a command-line window, go to the " \
                              "directory where you installed VLC and run " \
-                             "\"vlc -I wx\"\n") )
+                             "\"vlc -I qt\"\n") )
 #else
 #    define CONSOLE_INTRO_MSG
 #endif
@@ -184,11 +179,12 @@ typedef enum vlc_dialog {
 #define INTF_ABOUT_MSG LICENSE_MSG
 
 #define EXTENSIONS_AUDIO "*.a52;*.aac;*.ac3;*.dts;*.flac;*.m4a;*.m4p;*.mka;" \
-                         "*.mod;*.mp1;*.mp2;*.mp3;*.ogg;*.spx;*.wav;*.wma;*.xm"
+                         "*.mod;*.mp1;*.mp2;*.mp3;*.ogg;*.oma;*.spx;" \
+                         "*.wav;*.wma;*.xm"
 
 #define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.m1v;*.m2v;" \
-                         "*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \
-                         "*.mpeg2;*.mpeg4;*.mpg;*.mxf;*.ogg;*.ogm;" \
+                         "*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \
+                         "*.mpeg2;*.mpeg4;*.mpg;*.mts;*.mxf;*.ogg;*.ogm;" \
                          "*.ps;*.ts;*.vob;*.wmv"
 
 #define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.vlc;*.xspf"