X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_interface.h;h=8564a7b2232a1c5dd0efa833f7971f6610d7e997;hb=c3d58105344a51ff1e20c99ea4c6bd64e61f63be;hp=6ef6db9bffc44dbf964f6b52205f75808012f132;hpb=e0bbc1967a72e56f7987c03c713d58b5561c14b4;p=vlc diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 6ef6db9bff..8564a7b223 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,8 +50,7 @@ struct intf_thread_t VLC_COMMON_MEMBERS /* Thread properties and locks */ - vlc_bool_t b_play; - vlc_bool_t b_should_run_on_first_thread; + bool b_should_run_on_first_thread; /* Specific interfaces */ intf_console_t * p_console; /** console */ @@ -71,7 +66,7 @@ struct intf_thread_t intf_dialog_args_t * ); /** Interaction stuff */ - vlc_bool_t b_interaction; + bool b_interaction; /** Video window callbacks */ void * ( *pf_request_window ) ( intf_thread_t *, vout_thread_t *, @@ -82,8 +77,8 @@ struct intf_thread_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; + bool b_menu_change; + bool b_menu; /* Provides the ability to switch an interface on the fly */ char *psz_switch_intf; @@ -106,8 +101,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; @@ -116,11 +111,10 @@ 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 */ @@ -154,36 +148,36 @@ VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) ); /* Interface dialog ids for dialog providers */ 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 + 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 */ @@ -202,7 +196,8 @@ typedef enum vlc_dialog { #define EXTENSIONS_MEDIA EXTENSIONS_VIDEO ";" EXTENSIONS_AUDIO ";" \ EXTENSIONS_PLAYLIST -#define EXTENSIONS_SUBTITLE "*.cdg;*.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 @@ -228,7 +223,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 @@ -241,6 +236,7 @@ struct interaction_dialog_t vlc_object_t *p_parent; ///< The vlc object that asked //for interaction }; + /** * Possible flags . Dialog types */ @@ -310,9 +306,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*, ...) ATTRIBUTE_FORMAT( 4, 5 ) ); +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*, ...) ATTRIBUTE_FORMAT( 3, 4 ) ); +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 ) @@ -326,7 +322,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 ));