X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_interface.h;h=ca1c5646b318f4bff1b852db87098d4ff05ee3aa;hb=f3398a2741095ee9b5f2951c260bed8eaab111d8;hp=f31c87a4ca24942ad0bec382890c0aa9d2f0b09e;hpb=db662f04a5d849695a10ac36187380482c107420;p=vlc diff --git a/include/vlc_interface.h b/include/vlc_interface.h index f31c87a4ca..ca1c5646b3 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -3,24 +3,24 @@ * This library provides basic functions for threads to interact with user * interface, such as message output. ***************************************************************************** - * Copyright (C) 1999, 2000 the VideoLAN team + * Copyright (C) 1999, 2000 VLC authors and VideoLAN * $Id$ * * Authors: Vincent Seguin * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef VLC_INTF_H_ @@ -52,18 +52,12 @@ typedef struct intf_thread_t VLC_COMMON_MEMBERS struct intf_thread_t *p_next; /** LibVLC interfaces book keeping */ - /* Thread properties and locks */ -#if defined( __APPLE__ ) - bool b_should_run_on_first_thread; -#endif /* Specific interfaces */ intf_sys_t * p_sys; /** system interface */ - char * psz_intf; /** intf name specified */ /** Interface module */ module_t * p_module; - void ( *pf_run ) ( struct intf_thread_t * ); /** Run function */ /** Specific for dialogs providers */ void ( *pf_show_dialog ) ( struct intf_thread_t *, int, int, @@ -96,40 +90,29 @@ struct intf_dialog_args_t struct interaction_dialog_t *p_dialog; }; -/***************************************************************************** - * Prototypes - *****************************************************************************/ -VLC_EXPORT( 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_EXPORT( int, intf_Eject, ( vlc_object_t *, const char * ) ); -#define intf_Eject(a,b) intf_Eject(VLC_OBJECT(a),b) +VLC_API void libvlc_Quit( libvlc_int_t * ); -VLC_EXPORT( void, libvlc_Quit, ( libvlc_int_t * ) ); +static inline playlist_t *pl_Get( struct intf_thread_t *intf ) +{ + return (playlist_t *)(intf->p_parent); +} -/*@}*/ +/** + * Retrieves the current input thread from the playlist. + * @note The returned object must be released with vlc_object_release(). + */ +#define pl_CurrentInput(intf) (playlist_CurrentInput(pl_Get(intf))) -/***************************************************************************** - * Macros - *****************************************************************************/ -#if defined( WIN32 ) && !defined( UNDER_CE ) -# define CONSOLE_INTRO_MSG \ - if( !getenv( "PWD" ) || !getenv( "PS1" ) ) /* detect cygwin shell */ \ - { \ - 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 can't 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 -#endif +/** + * @ingroup messages + * @{ + */ + +VLC_API void vlc_LogSet(libvlc_int_t *, vlc_log_cb cb, void *data); + +/*@}*/ /* Interface dialog ids for dialog providers */ typedef enum vlc_dialog { @@ -158,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, @@ -168,19 +152,24 @@ typedef enum vlc_dialog { /* Useful text messages shared by interfaces */ #define INTF_ABOUT_MSG LICENSE_MSG -#define EXTENSIONS_AUDIO_CSV "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_AUDIO_CSV "3ga", "669", "a52", "aac", "ac3", "adt", "adts", "aif", "aifc", "aiff", \ + "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 "asf", "avi", "divx", "dv", "flv", "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", "mp4", "mpeg", "mpeg1", \ - "mpeg2", "mpeg4", "mpg", "mts", "mxf", "nuv", \ + "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", "ts", "vob", "wmv" + "rec", "rm", "rmvb", "rpl", "thp", "tod", "ts", "tts", "txd", "vob", "vro", \ + "webm", "wm", "wmv", "wtv", "xesc" #define EXTENSIONS_AUDIO \ + "*.3ga;" \ + "*.669;" \ "*.a52;" \ "*.aac;" \ "*.ac3;" \ @@ -192,26 +181,40 @@ typedef enum vlc_dialog { "*.amr;" \ "*.aob;" \ "*.ape;" \ - "*.cda;" \ + "*.au;" \ + "*.awb;" \ + "*.caf;" \ "*.dts;" \ "*.flac;"\ "*.it;" \ + "*.kar;" \ "*.m4a;" \ + "*.m4b;" \ "*.m4p;" \ + "*.m5p;" \ "*.mid;" \ "*.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;" \ @@ -222,19 +225,25 @@ typedef enum vlc_dialog { "*.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;" \ +#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;*.wmv" + "*.rec;*.rm;*.rmvb;*.rpl;*.thp;*.tod;*.ts;*.tts;*.txd;*.vob;*.vro;*.webm;*.wm;*.wmv;*.wtv;*.xesc" -#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.ifo;*.m3u;*.m3u8;*.pls;*.ram;*.rar;*.sdp;*.vlc;*.xspf;*.zip" +#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 -#define EXTENSIONS_SUBTITLE "*.cdg;*.idx;*.srt;*.sub;*.utf;*.ass;*.ssa;*.aqt;" \ - "*.jss;*.psb;*.rt;*.smi" +#define EXTENSIONS_SUBTITLE "*.cdg;*.idx;*.srt;" \ + "*.sub;*.utf;*.ass;" \ + "*.ssa;*.aqt;" \ + "*.jss;*.psb;" \ + "*.rt;*.smi;*.txt;" \ + "*.smil;*.stl;*.usf;" \ + "*.dks;*.pjs;*.mpl2;*.mks;" \ + "*.vtt" /** \defgroup vlc_interaction Interaction * \ingroup vlc_interface