X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_interface.h;h=ed9b64edf48717f3566d223bc0f27a11f87b4b18;hb=HEAD;hp=46a88523991e1f486dcd0466c43dd17639eced32;hpb=14f37b2101842fa6e427f962f689db74eff6faba;p=vlc diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 46a8852399..ed9b64edf4 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -53,7 +53,7 @@ typedef struct intf_thread_t struct intf_thread_t *p_next; /** LibVLC interfaces book keeping */ /* Thread properties and locks */ -#if defined( __APPLE__ ) || defined( WIN32 ) +#if defined( __APPLE__ ) bool b_should_run_on_first_thread; #endif @@ -102,8 +102,8 @@ struct intf_dialog_args_t VLC_EXPORT( int, intf_Create, ( vlc_object_t *, const char * ) ); #define intf_Create(a,b) intf_Create(VLC_OBJECT(a),b) -#define intf_Eject(a,b) __intf_Eject(VLC_OBJECT(a),b) -VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) ); +VLC_EXPORT( int, intf_Eject, ( vlc_object_t *, const char * ) ); +#define intf_Eject(a,b) intf_Eject(VLC_OBJECT(a),b) VLC_EXPORT( void, libvlc_Quit, ( libvlc_int_t * ) ); @@ -121,6 +121,7 @@ VLC_EXPORT( void, libvlc_Quit, ( libvlc_int_t * ) ); freopen( "CONOUT$", "w", stderr ); \ freopen( "CONIN$", "r", stdin ); \ } \ + msg_Info( p_intf, "VLC media player - %s", VERSION_MESSAGE ); \ msg_Info( p_intf, "%s", COPYRIGHT_MESSAGE ); \ msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \ "anymore, open a command-line window, go to the " \ @@ -167,18 +168,55 @@ 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;*.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;" \ +#define EXTENSIONS_AUDIO \ + "*.a52;" \ + "*.aac;" \ + "*.ac3;" \ + "*.adt;" \ + "*.adts;" \ + "*.aif;"\ + "*.aifc;"\ + "*.aiff;"\ + "*.amr;" \ + "*.aob;" \ + "*.ape;" \ + "*.cda;" \ + "*.dts;" \ + "*.flac;"\ + "*.it;" \ + "*.m4a;" \ + "*.m4p;" \ + "*.mid;" \ + "*.mka;" \ + "*.mlp;" \ + "*.mod;" \ + "*.mp1;" \ + "*.mp2;" \ + "*.mp3;" \ + "*.mpc;" \ + "*.oga;" \ + "*.ogg;" \ + "*.oma;" \ + "*.rmi;" \ + "*.s3m;" \ + "*.spx;" \ + "*.tta;" \ + "*.voc;" \ + "*.vqf;" \ + "*.w64;" \ + "*.wav;" \ + "*.wma;" \ + "*.wv;" \ + "*.xa;" \ + "*.xm" + +#define EXTENSIONS_VIDEO "*.3g2;*.3gp;*.3gp2;*.3gpp;*.amv;*.asf;*.avi;*.bin;*.cue;*.divx;*.dv;*.flv;*.gxf;*.iso;*.m1v;*.m2v;" \ + "*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp2v;*.mp4;*.mp4v;*.mpa;*.mpe;*.mpeg;*.mpeg1;" \ + "*.mpeg2;*.mpeg4;*.mpg;*.mpv2;*.mts;*.mxf;*.nsv;*.nuv;" \ "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \ - "*.rec;*.rm;*.rmvb;*.ts;*.vob;*.wmv" + "*.rec;*.rm;*.rmvb;*.tod;*.ts;*.tts;*.vob;*.vro;*.webm;*.wmv" -#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.ram;*.vlc;*.xspf" +#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.ifo;*.m3u;*.m3u8;*.pls;*.ram;*.rar;*.sdp;*.vlc;*.xspf;*.zip" #define EXTENSIONS_MEDIA EXTENSIONS_VIDEO ";" EXTENSIONS_AUDIO ";" \ EXTENSIONS_PLAYLIST