X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_interface.h;h=65febc9dabd70f98f5abdc5a164739a461405b20;hb=5d313c65e44d8963262fdbc5d5d52f5169f3f787;hp=aa44ee37085f5503adfeafe22fe97dfe7d557620;hpb=138da1916eef4f4d0e30883a8c1ac999c355aca9;p=vlc diff --git a/include/vlc_interface.h b/include/vlc_interface.h index aa44ee3708..65febc9dab 100644 --- 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 */ @@ -134,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 @@ -177,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"