X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_interface.h;h=ed9b64edf48717f3566d223bc0f27a11f87b4b18;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=6bbdc9435f8a86700de742dc7e78d360650635b9;hpb=3aa8ed0b6dd9d4a198c302c531a2b7d6b1925925;p=vlc diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 6bbdc9435f..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 " \ @@ -171,9 +172,15 @@ typedef enum vlc_dialog { "*.a52;" \ "*.aac;" \ "*.ac3;" \ + "*.adt;" \ + "*.adts;" \ + "*.aif;"\ + "*.aifc;"\ "*.aiff;"\ + "*.amr;" \ "*.aob;" \ "*.ape;" \ + "*.cda;" \ "*.dts;" \ "*.flac;"\ "*.it;" \ @@ -193,6 +200,7 @@ typedef enum vlc_dialog { "*.rmi;" \ "*.s3m;" \ "*.spx;" \ + "*.tta;" \ "*.voc;" \ "*.vqf;" \ "*.w64;" \ @@ -202,11 +210,11 @@ typedef enum vlc_dialog { "*.xa;" \ "*.xm" -#define EXTENSIONS_VIDEO "*.amv;*.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_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;*.tod;*.ts;*.vob;*.wmv" + "*.rec;*.rm;*.rmvb;*.tod;*.ts;*.tts;*.vob;*.vro;*.webm;*.wmv" #define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.ifo;*.m3u;*.m3u8;*.pls;*.ram;*.rar;*.sdp;*.vlc;*.xspf;*.zip"