X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_interface.h;h=2e02f6baa604a903f50ffda753df8ba00758c1bb;hb=a83fefd59eb020438010c7a5803398ab04bc3b68;hp=8ab8aa5f54efa7f99b17edc35b7de77ba1eae3db;hpb=e9050e582a93be48596c9f8a7835bfff19f0bf0a;p=vlc diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 8ab8aa5f54..2e02f6baa6 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -3,8 +3,8 @@ * This library provides basic functions for threads to interact with user * interface, such as message output. ***************************************************************************** - * Copyright (C) 1999, 2000 VideoLAN - * $Id: vlc_interface.h,v 1.10 2004/03/01 18:31:12 gbazin Exp $ + * Copyright (C) 1999, 2000 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin * @@ -20,9 +20,16 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifndef VLC_INTF_H_ +#define VLC_INTF_H_ + +# ifdef __cplusplus +extern "C" { +# endif + typedef struct intf_dialog_args_t intf_dialog_args_t; /** @@ -31,62 +38,49 @@ typedef struct intf_dialog_args_t intf_dialog_args_t; * interface management in vlc */ - -/***************************************************************************** - * intf_thread_t: describe an interface thread - ***************************************************************************** - * This struct describes all interface-specific data of the main (interface) - * thread. - *****************************************************************************/ - /** * \defgroup vlc_interface Interface * These functions and structures are for interface management * @{ */ -struct intf_thread_t + +typedef struct intf_sys_t intf_sys_t; + +/** Describe all interface-specific data of the interface thread */ +typedef struct intf_thread_t { VLC_COMMON_MEMBERS + struct intf_thread_t *p_next; /** LibVLC interfaces book keeping */ + vlc_thread_t thread; /** LibVLC thread */ /* Thread properties and locks */ - vlc_bool_t b_block; +#if defined( __APPLE__ ) + bool b_should_run_on_first_thread; +#endif /* Specific interfaces */ - intf_console_t * p_console; /** console */ intf_sys_t * p_sys; /** system interface */ /** Interface module */ module_t * p_module; - void ( *pf_run ) ( intf_thread_t * ); /** Run function */ + void ( *pf_run ) ( struct intf_thread_t * ); /** Run function */ /** Specific for dialogs providers */ - void ( *pf_show_dialog ) ( intf_thread_t *, int, int, + void ( *pf_show_dialog ) ( struct intf_thread_t *, int, int, intf_dialog_args_t * ); - /* XXX: new message passing stuff will go here */ - vlc_mutex_t change_lock; - vlc_bool_t b_menu_change; - vlc_bool_t b_menu; - - /* Provides the ability to switch an interface on the fly */ - char *psz_switch_intf; -}; + config_chain_t *p_cfg; +} intf_thread_t; -/***************************************************************************** - * intf_dialog_args_t: arguments structure passed to a dialogs provider. - ***************************************************************************** - * This struct describes the arguments passed to the dialogs provider. - * For now they are only used with INTF_DIALOG_FILE_GENERIC. - *****************************************************************************/ +/** \brief Arguments passed to a dialogs provider + * This describes the arguments passed to the dialogs provider. They are + * mainly used with INTF_DIALOG_FILE_GENERIC. + */ struct intf_dialog_args_t { + intf_thread_t *p_intf; char *psz_title; - vlc_bool_t b_blocking; - vlc_bool_t b_ready; - vlc_mutex_t lock; - vlc_cond_t wait; - char **psz_results; int i_results; @@ -95,18 +89,23 @@ struct intf_dialog_args_t /* Specifically for INTF_DIALOG_FILE_GENERIC */ char *psz_extensions; - vlc_bool_t b_save; - vlc_bool_t b_multiple; + bool b_save; + bool b_multiple; + + /* Specific to INTF_DIALOG_INTERACTION */ + struct interaction_dialog_t *p_dialog; }; /***************************************************************************** * Prototypes *****************************************************************************/ -#define intf_Create(a,b) __intf_Create(VLC_OBJECT(a),b) -VLC_EXPORT( intf_thread_t *, __intf_Create, ( vlc_object_t *, const char * ) ); -VLC_EXPORT( int, intf_RunThread, ( intf_thread_t * ) ); -VLC_EXPORT( void, intf_StopThread, ( intf_thread_t * ) ); -VLC_EXPORT( void, intf_Destroy, ( intf_thread_t * ) ); +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_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 * ); /*@}*/ @@ -115,46 +114,218 @@ VLC_EXPORT( void, intf_Destroy, ( intf_thread_t * ) ); *****************************************************************************/ #if defined( WIN32 ) && !defined( UNDER_CE ) # 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, COPYRIGHT_MESSAGE ); \ - msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \ - "anymore, open a dos command box, go to the " \ + } \ + 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 wxwin\"\n") ) + "\"vlc -I qt\"\n") ) #else -# define CONSOLE_INTRO_MSG +# define CONSOLE_INTRO_MSG (void)0 #endif /* Interface dialog ids for dialog providers */ -#define INTF_DIALOG_FILE_SIMPLE 1 -#define INTF_DIALOG_FILE 2 -#define INTF_DIALOG_DISC 3 -#define INTF_DIALOG_NET 4 -#define INTF_DIALOG_SAT 5 +typedef enum vlc_dialog { + INTF_DIALOG_FILE_SIMPLE = 1, + INTF_DIALOG_FILE, + INTF_DIALOG_DISC, + INTF_DIALOG_NET, + INTF_DIALOG_CAPTURE, + INTF_DIALOG_SAT, + INTF_DIALOG_DIRECTORY, + + INTF_DIALOG_STREAMWIZARD, + INTF_DIALOG_WIZARD, -#define INTF_DIALOG_STREAMWIZARD 8 + INTF_DIALOG_PLAYLIST, + INTF_DIALOG_MESSAGES, + INTF_DIALOG_FILEINFO, + INTF_DIALOG_PREFS, + INTF_DIALOG_BOOKMARKS, + INTF_DIALOG_EXTENDED, -#define INTF_DIALOG_PLAYLIST 10 -#define INTF_DIALOG_MESSAGES 11 -#define INTF_DIALOG_FILEINFO 12 -#define INTF_DIALOG_PREFS 13 + INTF_DIALOG_POPUPMENU = 20, + INTF_DIALOG_AUDIOPOPUPMENU, + INTF_DIALOG_VIDEOPOPUPMENU, + INTF_DIALOG_MISCPOPUPMENU, -#define INTF_DIALOG_POPUPMENU 20 + INTF_DIALOG_FILE_GENERIC = 30, + INTF_DIALOG_INTERACTION = 50, -#define INTF_DIALOG_FILE_GENERIC 30 + INTF_DIALOG_UPDATEVLC = 90, + INTF_DIALOG_VLM, -#define INTF_DIALOG_EXIT 99 + INTF_DIALOG_EXIT = 99 +} vlc_dialog_t; /* Useful text messages shared by interfaces */ -#define INTF_ABOUT_MSG \ - _( "VLC is an open-source and cross-platform multimedia " \ - "player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, " \ - "DivX, mp3, Ogg, ...) as well as DVDs, VCDs, CD audio, and various " \ - "streaming protocols.\n\n" \ - "VLC is also a streaming server with transcoding capabilities " \ - "(UDP unicast and multicast, HTTP, ...) mainly designed for " \ - "high-bandwidth networks.\n\n"\ - "For more information, have a look at the web site." ) +#define INTF_ABOUT_MSG LICENSE_MSG + +#define EXTENSIONS_AUDIO_CSV "a52", "aac", "ac3", "ape", "awb", "dts", "flac", "it", \ + "m4a", "m4p", "mka", "mlp", "mod", "mp1", "mp2", "mp3",\ + "oga", "ogg", "oma", "s3m", "spx" \ + "wav", "wma", "wv", "xm" + +#define EXTENSIONS_VIDEO_CSV "asf", "avi", "divx", "dv", "f4v", "flv", "gxf", "iso", \ + "m1v", "m2v", "m2t", "m2ts", "m4v", "mkv", "mov",\ + "mp2", "mp4", "mpeg", "mpeg1", \ + "mpeg2", "mpeg4", "mpg", "mts", "mtv", "mxf", "nuv", \ + "ogg", "ogm", "ogv", "ogx", "ps", \ + "rec", "rm", "rmvb", "ts", "vob", "wmv" + +#define EXTENSIONS_AUDIO \ + "*.a52;" \ + "*.aac;" \ + "*.ac3;" \ + "*.adt;" \ + "*.adts;" \ + "*.aif;"\ + "*.aifc;"\ + "*.aiff;"\ + "*.amr;" \ + "*.aob;" \ + "*.ape;" \ + "*.awb;" \ + "*.caf;" \ + "*.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;*.divx;*.dv;*f4v;*.flv;*.gxf;*.iso;*.m1v;*.m2v;" \ + "*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp2v;*.mp4;*.mp4v;*.mpa;*.mpe;*.mpeg;*.mpeg1;" \ + "*.mpeg2;*.mpeg4;*.mpg;*.mpv2;*.mts;*.mtv;*.mxf;*.nsv;*.nuv;" \ + "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \ + "*.rec;*.rm;*.rmvb;*.tod;*.ts;*.tts;*.vob;*.vro;*.webm;*.wmv" + +#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.cue;*.ifo;*.m3u;*.m3u8;*.pls;*.ram;*.rar;*.sdp;*.vlc;*.xspf;*.zip" + +#define EXTENSIONS_MEDIA EXTENSIONS_VIDEO ";" EXTENSIONS_AUDIO ";" \ + EXTENSIONS_PLAYLIST + +#define EXTENSIONS_SUBTITLE "*.cdg;*.idx;*.srt;" \ + "*.sub;*.utf;*.ass;" \ + "*.ssa;*.aqt;" \ + "*.jss;*.psb;" \ + "*.rt;*.smi;*.txt;" \ + "*.smil;*.stl;*.usf" \ + "*.dks;*.pjs;*.mpl2" + +/** \defgroup vlc_interaction Interaction + * \ingroup vlc_interface + * Interaction between user and modules + * @{ + */ + +/** + * This structure describes a piece of interaction with the user + */ +typedef struct interaction_dialog_t +{ + int i_type; ///< Type identifier + char *psz_title; ///< Title + char *psz_description; ///< Descriptor string + char *psz_default_button; ///< default button title (~OK) + char *psz_alternate_button;///< alternate button title (~NO) + /// other button title (optional,~Cancel) + char *psz_other_button; + + char *psz_returned[1]; ///< returned responses from the user + + vlc_value_t val; ///< value coming from core for dialogue + int i_timeToGo; ///< time (in sec) until shown progress is finished + bool b_cancelled; ///< was the dialogue cancelled ? + + void * p_private; ///< Private interface data + + int i_status; ///< Dialog status; + int i_action; ///< Action to perform; + int i_flags; ///< Misc flags + int i_return; ///< Return status + + vlc_object_t *p_parent; ///< The vlc object that asked + //for interaction + intf_thread_t *p_interface; + vlc_mutex_t *p_lock; +} interaction_dialog_t; + +/** + * Possible flags . Dialog types + */ +#define DIALOG_GOT_ANSWER 0x01 +#define DIALOG_YES_NO_CANCEL 0x02 +#define DIALOG_LOGIN_PW_OK_CANCEL 0x04 +#define DIALOG_PSZ_INPUT_OK_CANCEL 0x08 +#define DIALOG_BLOCKING_ERROR 0x10 +#define DIALOG_NONBLOCKING_ERROR 0x20 +#define DIALOG_USER_PROGRESS 0x80 +#define DIALOG_INTF_PROGRESS 0x100 + +/** Possible return codes */ +enum +{ + DIALOG_OK_YES, + DIALOG_NO, + DIALOG_CANCELLED +}; + +/** Possible status */ +enum +{ + ANSWERED_DIALOG, ///< Got "answer" + DESTROYED_DIALOG, ///< Interface has destroyed it +}; + +/** Possible actions */ +enum +{ + INTERACT_NEW, + INTERACT_UPDATE, + INTERACT_HIDE, + INTERACT_DESTROY +}; + +#define intf_UserStringInput( a, b, c, d ) (VLC_OBJECT(a),b,c,d, VLC_EGENERIC) +#define interaction_Register( t ) (t, VLC_EGENERIC) +#define interaction_Unregister( t ) (t, VLC_EGENERIC) + + +/** @} */ +/** @} */ + +# ifdef __cplusplus +} +# endif +#endif