X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_interface.h;h=65febc9dabd70f98f5abdc5a164739a461405b20;hb=5d313c65e44d8963262fdbc5d5d52f5169f3f787;hp=7d9998546ec4f69db996f5c2f22ddde838ac7476;hpb=f02ba5409aec3f56e2cc57f78b5aefc1fce81540;p=vlc diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 7d9998546e..65febc9dab 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -23,10 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#if !defined( __LIBVLC__ ) - #error You are not libvlc or one of its plugins. You cannot include this file -#endif - #ifndef _VLC_INTF_H_ #define _VLC_INTF_H_ @@ -54,12 +50,14 @@ struct intf_thread_t VLC_COMMON_MEMBERS /* Thread properties and locks */ - vlc_bool_t b_block; - vlc_bool_t b_play; +#ifdef __APPLE__ + bool b_should_run_on_first_thread; +#endif /* Specific interfaces */ intf_console_t * p_console; /** console */ intf_sys_t * p_sys; /** system interface */ + char * psz_intf; /** intf name specified */ /** Interface module */ module_t * p_module; @@ -70,19 +68,12 @@ struct intf_thread_t intf_dialog_args_t * ); /** Interaction stuff */ - vlc_bool_t b_interaction; - - /** Video window callbacks */ - void * ( *pf_request_window ) ( intf_thread_t *, vout_thread_t *, - int *, int *, - unsigned int *, unsigned int * ); - void ( *pf_release_window ) ( intf_thread_t *, void * ); - int ( *pf_control_window ) ( intf_thread_t *, void *, int, va_list ); + bool b_interaction; /* XXX: new message passing stuff will go here */ vlc_mutex_t change_lock; - vlc_bool_t b_menu_change; - vlc_bool_t b_menu; + bool b_menu_change; + bool b_menu; /* Provides the ability to switch an interface on the fly */ char *psz_switch_intf; @@ -105,8 +96,8 @@ 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 */ interaction_dialog_t *p_dialog; @@ -115,15 +106,14 @@ struct intf_dialog_args_t /***************************************************************************** * Prototypes *****************************************************************************/ -#define intf_Create(a,b,c,d) __intf_Create(VLC_OBJECT(a),b,c,d) -VLC_EXPORT( intf_thread_t *, __intf_Create, ( vlc_object_t *, const char *, int, const char *const * ) ); +#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 * ) ); /* If the interface is in the main thread, it should listen both to * p_intf->b_die and p_libvlc->b_die */ -#define intf_ShouldDie( p_intf ) (p_intf->b_die || (p_intf->b_block && p_intf->p_libvlc->b_die ) ) +#define intf_ShouldDie( p_intf ) (p_intf->b_die || p_intf->p_libvlc->b_die ) #define intf_Eject(a,b) __intf_Eject(VLC_OBJECT(a),b) VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) ); @@ -146,59 +136,64 @@ VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) ); 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 wx\"\n") ) + "\"vlc -I qt\"\n") ) #else # define CONSOLE_INTRO_MSG #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_CAPTURE 5 -#define INTF_DIALOG_SAT 6 -#define INTF_DIALOG_DIRECTORY 7 - -#define INTF_DIALOG_STREAMWIZARD 8 -#define INTF_DIALOG_WIZARD 9 - -#define INTF_DIALOG_PLAYLIST 10 -#define INTF_DIALOG_MESSAGES 11 -#define INTF_DIALOG_FILEINFO 12 -#define INTF_DIALOG_PREFS 13 -#define INTF_DIALOG_BOOKMARKS 14 -#define INTF_DIALOG_EXTENDED 15 - -#define INTF_DIALOG_POPUPMENU 20 -#define INTF_DIALOG_AUDIOPOPUPMENU 21 -#define INTF_DIALOG_VIDEOPOPUPMENU 22 -#define INTF_DIALOG_MISCPOPUPMENU 23 - -#define INTF_DIALOG_FILE_GENERIC 30 -#define INTF_DIALOG_INTERACTION 50 - -#define INTF_DIALOG_UPDATEVLC 90 -#define INTF_DIALOG_VLM 91 - -#define INTF_DIALOG_EXIT 99 +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, + + INTF_DIALOG_PLAYLIST, + INTF_DIALOG_MESSAGES, + INTF_DIALOG_FILEINFO, + INTF_DIALOG_PREFS, + INTF_DIALOG_BOOKMARKS, + INTF_DIALOG_EXTENDED, + + INTF_DIALOG_POPUPMENU = 20, + INTF_DIALOG_AUDIOPOPUPMENU, + INTF_DIALOG_VIDEOPOPUPMENU, + INTF_DIALOG_MISCPOPUPMENU, + + INTF_DIALOG_FILE_GENERIC = 30, + INTF_DIALOG_INTERACTION = 50, + + INTF_DIALOG_UPDATEVLC = 90, + INTF_DIALOG_VLM, + + INTF_DIALOG_EXIT = 99 +} vlc_dialog_t; /* Useful text messages shared by interfaces */ #define INTF_ABOUT_MSG LICENSE_MSG #define EXTENSIONS_AUDIO "*.a52;*.aac;*.ac3;*.dts;*.flac;*.m4a;*.m4p;*.mka;" \ - "*.mod;*.mp1;*.mp2;*.mp3;*.ogg;*.spx;*.wav;*.wma;*.xm" + "*.mod;*.mp1;*.mp2;*.mp3;*.ogg;*.oma;*.spx;" \ + "*.wav;*.wma;*.xm" -#define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.m1v;*.m2v;*.m4v;" \ - "*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;*.mpeg2;" \ - "*.mpeg4;*.mpg;*.ogg;*.ogm;*.ps;*.ts;*.vob;*.wmv" +#define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.m1v;*.m2v;" \ + "*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \ + "*.mpeg2;*.mpeg4;*.mpg;*.mts;*.mxf;*.ogg;*.ogm;" \ + "*.ps;*.ts;*.vob;*.wmv" #define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.vlc;*.xspf" #define EXTENSIONS_MEDIA EXTENSIONS_VIDEO ";" EXTENSIONS_AUDIO ";" \ EXTENSIONS_PLAYLIST -#define EXTENSIONS_SUBTITLE "*.idx;*.srt;*.sub;*.utf" +#define EXTENSIONS_SUBTITLE "*.cdg;*.idx;*.srt;*.sub;*.utf;*.ass;*.ssa;*.aqt;" \ + "*.jss;*.psb;*.rt;*.smi" /** \defgroup vlc_interaction Interaction * \ingroup vlc_interface @@ -224,7 +219,7 @@ struct interaction_dialog_t vlc_value_t val; ///< value coming from core for dialogue int i_timeToGo; ///< time (in sec) until shown progress is finished - vlc_bool_t b_cancelled; ///< was the dialogue cancelled ? + bool b_cancelled; ///< was the dialogue cancelled ? void * p_private; ///< Private interface data @@ -237,6 +232,7 @@ struct interaction_dialog_t vlc_object_t *p_parent; ///< The vlc object that asked //for interaction }; + /** * Possible flags . Dialog types */ @@ -306,9 +302,9 @@ struct interaction_t ***************************************************************************/ #define intf_UserFatal( a, b, c, d, e... ) __intf_UserFatal( VLC_OBJECT(a),b,c,d, ## e ) -VLC_EXPORT( int, __intf_UserFatal,( vlc_object_t*, vlc_bool_t, const char*, const char*, ...) ); +VLC_EXPORT( int, __intf_UserFatal,( vlc_object_t*, bool, const char*, const char*, ...) LIBVLC_FORMAT( 4, 5 ) ); #define intf_UserWarn( a, c, d, e... ) __intf_UserWarn( VLC_OBJECT(a),c,d, ## e ) -VLC_EXPORT( int, __intf_UserWarn,( vlc_object_t*, const char*, const char*, ...) ); +VLC_EXPORT( int, __intf_UserWarn,( vlc_object_t*, const char*, const char*, ...) LIBVLC_FORMAT( 3, 4 ) ); #define intf_UserLoginPassword( a, b, c, d, e... ) __intf_UserLoginPassword( VLC_OBJECT(a),b,c,d,e) VLC_EXPORT( int, __intf_UserLoginPassword,( vlc_object_t*, const char*, const char*, char **, char **) ); #define intf_UserYesNo( a, b, c, d, e, f ) __intf_UserYesNo( VLC_OBJECT(a),b,c, d, e, f ) @@ -322,7 +318,7 @@ VLC_EXPORT( int, __intf_Progress,( vlc_object_t*, const char*, const char*, floa #define intf_ProgressUpdate( a, b, c, d, e ) __intf_ProgressUpdate( VLC_OBJECT(a),b,c,d,e ) VLC_EXPORT( void, __intf_ProgressUpdate,( vlc_object_t*, int, const char*, float, int) ); #define intf_ProgressIsCancelled( a, b ) __intf_UserProgressIsCancelled( VLC_OBJECT(a),b ) -VLC_EXPORT( vlc_bool_t, __intf_UserProgressIsCancelled,( vlc_object_t*, int ) ); +VLC_EXPORT( bool, __intf_UserProgressIsCancelled,( vlc_object_t*, int ) ); #define intf_UserHide( a, b ) __intf_UserHide( VLC_OBJECT(a), b ) VLC_EXPORT( void, __intf_UserHide,( vlc_object_t *, int ));