X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_interface.h;h=ca1c5646b318f4bff1b852db87098d4ff05ee3aa;hb=90fc091360a6cdfcd7f2d6a244f505bdc2280b4c;hp=20bac6e12f1113bc7b1f086f8f3e7d70c6c69c5f;hpb=0f6fc6a2842c52bf17c231372966d37778091f02;p=vlc diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 20bac6e12f..ca1c5646b3 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -90,58 +90,30 @@ struct intf_dialog_args_t struct interaction_dialog_t *p_dialog; }; -VLC_API int intf_Create( vlc_object_t *, const char * ); -#define intf_Create(a,b) intf_Create(VLC_OBJECT(a),b) +VLC_API int intf_Create( playlist_t *, const char * ); VLC_API void libvlc_Quit( libvlc_int_t * ); -/** - * \defgroup vlc_subscription Log messages subscription - * These functions deal with log messages. - * @{ - */ +static inline playlist_t *pl_Get( struct intf_thread_t *intf ) +{ + return (playlist_t *)(intf->p_parent); +} /** - * Message logging callback signature. - * Accepts one private data pointer, the message, and an overrun counter. + * Retrieves the current input thread from the playlist. + * @note The returned object must be released with vlc_object_release(). */ -typedef void (*msg_callback_t) (void *, int, const msg_item_t *, - const char *, va_list); +#define pl_CurrentInput(intf) (playlist_CurrentInput(pl_Get(intf))) /** - * Used by interface plugins which subscribe to the message bank. + * @ingroup messages + * @{ */ -typedef struct msg_subscription -{ - struct msg_subscription *prev, *next; - msg_callback_t func; - void *opaque; -} msg_subscription_t; -VLC_API void vlc_Subscribe(msg_subscription_t *, msg_callback_t, void *); -VLC_API void vlc_Unsubscribe(msg_subscription_t *); +VLC_API void vlc_LogSet(libvlc_int_t *, vlc_log_cb cb, void *data); /*@}*/ -#if defined( WIN32 ) -# define CONSOLE_INTRO_MSG \ - if( !getenv( "PWD" ) ) /* detect Cygwin shell or Wine */ \ - { \ - AllocConsole(); \ - freopen( "CONOUT$", "w", stdout ); \ - 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 cannot access the GUI " \ - "anymore, open a command-line window, go to the " \ - "directory where you installed VLC and run " \ - "\"vlc -I qt\"\n") ) -#else -# define CONSOLE_INTRO_MSG (void)0 -#endif - /* Interface dialog ids for dialog providers */ typedef enum vlc_dialog { INTF_DIALOG_FILE_SIMPLE = 1, @@ -169,6 +141,7 @@ typedef enum vlc_dialog { INTF_DIALOG_FILE_GENERIC = 30, INTF_DIALOG_INTERACTION = 50, + INTF_DIALOG_SENDKEY = 51, INTF_DIALOG_UPDATEVLC = 90, INTF_DIALOG_VLM, @@ -180,18 +153,18 @@ typedef enum vlc_dialog { #define INTF_ABOUT_MSG LICENSE_MSG #define EXTENSIONS_AUDIO_CSV "3ga", "669", "a52", "aac", "ac3", "adt", "adts", "aif", "aifc", "aiff", \ - "amr", "aob", "ape", "awb", "caf", "dts", "flac", "it", "kar", \ - "m4a", "m4p", "m5p", "mka", "mlp", "mod", "mpa", "mp1", "mp2", "mp3", "mpc", "mpga", \ - "oga", "ogg", "oma", "opus", "qcp", "ra", "rmi", "s3m", "spx", "thd", "tta", \ + "amr", "aob", "ape", "au", "awb", "caf", "dts", "flac", "it", "kar", \ + "m4a", "m4b", "m4p", "m5p", "mka", "mlp", "mod", "mpa", "mp1", "mp2", "mp3", "mpc", "mpga", "mus", \ + "oga", "ogg", "oma", "opus", "qcp", "ra", "rmi", "s3m", "sid", "spx", "tak", "thd", "tta", \ "voc", "vqf", "w64", "wav", "wma", "wv", "xa", "xm" -#define EXTENSIONS_VIDEO_CSV "3g2", "3gp", "3gp2", "3gpp", "amv", "asf", "avi", "divx", "drc", "dv", \ - "f4v", "flv", "gvi", "gxf", "iso", \ +#define EXTENSIONS_VIDEO_CSV "3g2", "3gp", "3gp2", "3gpp", "amv", "asf", "avi", "bik", "divx", "drc", "dv", \ + "evo", "f4v", "flv", "gvi", "gxf", "iso", \ "m1v", "m2v", "m2t", "m2ts", "m4v", "mkv", "mov",\ "mp2", "mp2v", "mp4", "mp4v", "mpe", "mpeg", "mpeg1", \ "mpeg2", "mpeg4", "mpg", "mpv2", "mts", "mtv", "mxf", "mxg", "nsv", "nuv", \ "ogg", "ogm", "ogv", "ogx", "ps", \ - "rec", "rm", "rmvb", "tod", "ts", "tts", "vob", "vro", \ + "rec", "rm", "rmvb", "rpl", "thp", "tod", "ts", "tts", "txd", "vob", "vro", \ "webm", "wm", "wmv", "wtv", "xesc" #define EXTENSIONS_AUDIO \ @@ -208,6 +181,7 @@ typedef enum vlc_dialog { "*.amr;" \ "*.aob;" \ "*.ape;" \ + "*.au;" \ "*.awb;" \ "*.caf;" \ "*.dts;" \ @@ -215,6 +189,7 @@ typedef enum vlc_dialog { "*.it;" \ "*.kar;" \ "*.m4a;" \ + "*.m4b;" \ "*.m4p;" \ "*.m5p;" \ "*.mid;" \ @@ -227,6 +202,7 @@ typedef enum vlc_dialog { "*.mp3;" \ "*.mpc;" \ "*.mpga;" \ + "*.mus;" \ "*.oga;" \ "*.ogg;" \ "*.oma;" \ @@ -235,7 +211,9 @@ typedef enum vlc_dialog { "*.ra;" \ "*.rmi;" \ "*.s3m;" \ + "*.sid;" \ "*.spx;" \ + "*.tak;" \ "*.thd;" \ "*.tta;" \ "*.voc;" \ @@ -247,13 +225,13 @@ typedef enum vlc_dialog { "*.xa;" \ "*.xm" -#define EXTENSIONS_VIDEO "*.3g2;*.3gp;*.3gp2;*.3gpp;*.amv;*.asf;*.avi;*.bin;*.divx;*.drc;*.dv;*f4v;*.flv;*.gvi;*.gvi;*.gxf;*.iso;*.m1v;*.m2v;" \ +#define EXTENSIONS_VIDEO "*.3g2;*.3gp;*.3gp2;*.3gpp;*.amv;*.asf;*.avi;*.bik;*.bin;*.divx;*.drc;*.dv;*.evo;*.f4v;*.flv;*.gvi;*.gxf;*.iso;*.m1v;*.m2v;" \ "*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp2v;*.mp4;*.mp4v;*.mpe;*.mpeg;*.mpeg1;" \ "*.mpeg2;*.mpeg4;*.mpg;*.mpv2;*.mts;*.mtv;*.mxf;*.mxg;*.nsv;*.nuv;" \ "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \ - "*.rec;*.rm;*.rmvb;*.tod;*.ts;*.tts;*.vob;*.vro;*.webm;*.wm;*.wmv;*.wtv;*.xesc" + "*.rec;*.rm;*.rmvb;*.rpl;*.thp;*.tod;*.ts;*.tts;*.txd;*.vob;*.vro;*.webm;*.wm;*.wmv;*.wtv;*.xesc" -#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.cue;*.ifo;*.m3u;*.m3u8;*.pls;*.ram;*.rar;*.sdp;*.vlc;*.xspf;*.wvx;*.zip;*.conf" +#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.cue;*.ifo;*.m3u;*.m3u8;*.pls;*.ram;*.rar;*.sdp;*.vlc;*.xspf;*.wax;*.wvx;*.zip;*.conf" #define EXTENSIONS_MEDIA EXTENSIONS_VIDEO ";" EXTENSIONS_AUDIO ";" \ EXTENSIONS_PLAYLIST @@ -264,7 +242,8 @@ typedef enum vlc_dialog { "*.jss;*.psb;" \ "*.rt;*.smi;*.txt;" \ "*.smil;*.stl;*.usf;" \ - "*.dks;*.pjs;*.mpl2;*.mks" + "*.dks;*.pjs;*.mpl2;*.mks;" \ + "*.vtt" /** \defgroup vlc_interaction Interaction * \ingroup vlc_interface