X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_input.h;h=f97d196061c900d61048b5c98437724b71056d67;hb=c7d6aad63acbb25785b77fdee040b095db2018e1;hp=ffbdcb818370fb137438ad37333bc4b7b83c47d0;hpb=d11fd0d1e5433a5299fbf0f0150178178ebd3f83;p=vlc diff --git a/include/vlc_input.h b/include/vlc_input.h index ffbdcb8183..f97d196061 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -73,6 +73,7 @@ struct input_item_t mtime_t i_duration; /**< Duration in milliseconds*/ uint8_t i_type; /**< Type (file, disc, ...) */ + bool b_prefers_tree; /**< Do we prefer being displayed as tree*/ int i_categories; /**< Number of info categories */ info_category_t **pp_categories; /**< Pointer to the first info category */ @@ -103,52 +104,15 @@ struct input_item_t #define ITEM_TYPE_NODE 8 #define ITEM_TYPE_NUMBER 9 -static inline void input_item_CopyOptions( input_item_t *p_parent, - input_item_t *p_child ) -{ - int i; - for( i = 0 ; i< p_parent->i_options; i++ ) - { - char *psz_option= strdup( p_parent->ppsz_options[i] ); - if( !strcmp( psz_option, "meta-file" ) ) - { - free( psz_option ); - continue; - } - p_child->i_options++; - p_child->ppsz_options = (char **)realloc( p_child->ppsz_options, - p_child->i_options * - sizeof( char * ) ); - p_child->ppsz_options[p_child->i_options-1] = psz_option; - p_child->optflagc++; - p_child->optflagv = (uint8_t *)realloc( p_child->optflagv, - p_child->optflagc ); - p_child->optflagv[p_child->optflagc - 1] = p_parent->optflagv[i]; - } -} - -static inline void input_item_SetName( input_item_t *p_item, const char *psz_name ) -{ - free( p_item->psz_name ); - p_item->psz_name = strdup( psz_name ); -} +VLC_EXPORT( void, input_item_CopyOptions, ( input_item_t *p_parent, input_item_t *p_child ) ); +VLC_EXPORT( void, input_item_SetName, ( input_item_t *p_item, const char *psz_name ) ); /* This won't hold the item, but can tell to interested third parties * Like the playlist, that there is a new sub item. With this design * It is not the input item's responsability to keep all the ref of * the input item children. */ -static inline void input_item_AddSubItem( input_item_t *p_parent, - input_item_t *p_child ) -{ - vlc_event_t event; - - p_parent->i_type = ITEM_TYPE_PLAYLIST; +VLC_EXPORT( void, input_item_AddSubItem, ( input_item_t *p_parent, input_item_t *p_child ) ); - /* Notify interested third parties */ - event.type = vlc_InputItemSubItemAdded; - event.u.input_item_subitem_added.p_new_child = p_child; - vlc_event_send( &p_parent->event_manager, &event ); -} /* Flags handled past input_item_AddOpt() */ #define VLC_INPUT_OPTION_TRUSTED 0x2 @@ -157,137 +121,26 @@ static inline void input_item_AddSubItem( input_item_t *p_parent, #define VLC_INPUT_OPTION_UNIQUE 0x100 VLC_EXPORT( int, input_item_AddOpt, ( input_item_t *, const char *str, unsigned flags ) ); - -static inline -int input_item_AddOption (input_item_t *item, const char *str) -{ - return input_item_AddOpt (item, str, VLC_INPUT_OPTION_TRUSTED); -} - -static inline -int input_item_HasErrorWhenReading (input_item_t *item) -{ - return item->b_error_when_reading; -} - - +VLC_EXPORT( int, input_item_AddOption, (input_item_t *item, const char *str) ); +VLC_EXPORT( int ,input_item_AddOption, (input_item_t *item, const char *str) ); +VLC_EXPORT( bool,input_item_HasErrorWhenReading, (input_item_t *item) ); VLC_EXPORT( void, input_item_SetMeta, ( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz_val )); -static inline bool input_item_MetaMatch( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz ) -{ - vlc_mutex_lock( &p_i->lock ); - if( !p_i->p_meta ) - { - vlc_mutex_unlock( &p_i->lock ); - return false; - } - const char * meta = vlc_meta_Get( p_i->p_meta, meta_type ); - bool ret = meta && strcasestr( meta, psz ); - vlc_mutex_unlock( &p_i->lock ); - - return ret; -} - -static inline char * input_item_GetMeta( input_item_t *p_i, vlc_meta_type_t meta_type ) -{ - char * psz = NULL; - vlc_mutex_lock( &p_i->lock ); - - if( !p_i->p_meta ) - { - vlc_mutex_unlock( &p_i->lock ); - return NULL; - } - - if( vlc_meta_Get( p_i->p_meta, meta_type ) ) - psz = strdup( vlc_meta_Get( p_i->p_meta, meta_type ) ); - - vlc_mutex_unlock( &p_i->lock ); - return psz; -} - -static inline char * input_item_GetName( input_item_t * p_i ) -{ - vlc_mutex_lock( &p_i->lock ); - char *psz_s = p_i->psz_name ? strdup( p_i->psz_name ) : NULL; - vlc_mutex_unlock( &p_i->lock ); - return psz_s; -} - -static inline char * input_item_GetURI( input_item_t * p_i ) -{ - vlc_mutex_lock( &p_i->lock ); - char *psz_s = p_i->psz_uri ? strdup( p_i->psz_uri ) : NULL; - vlc_mutex_unlock( &p_i->lock ); - return psz_s; -} - -static inline void input_item_SetURI( input_item_t * p_i, char * psz_uri ) -{ - vlc_mutex_lock( &p_i->lock ); - free( p_i->psz_uri ); - p_i->psz_uri = strdup( psz_uri ); - vlc_mutex_unlock( &p_i->lock ); -} - -static inline mtime_t input_item_GetDuration( input_item_t * p_i ) -{ - vlc_mutex_lock( &p_i->lock ); - mtime_t i_duration = p_i->i_duration; - vlc_mutex_unlock( &p_i->lock ); - return i_duration; -} +VLC_EXPORT( bool,input_item_HasErrorWhenReading, (input_item_t *item) ); -static inline void input_item_SetDuration( input_item_t * p_i, mtime_t i_duration ) -{ - bool send_event = false; - - vlc_mutex_lock( &p_i->lock ); - if( p_i->i_duration != i_duration ) - { - p_i->i_duration = i_duration; - send_event = true; - } - vlc_mutex_unlock( &p_i->lock ); - - if ( send_event == true ) - { - vlc_event_t event; - event.type = vlc_InputItemDurationChanged; - event.u.input_item_duration_changed.new_duration = i_duration; - vlc_event_send( &p_i->event_manager, &event ); - } - - return; -} +VLC_EXPORT( bool,input_item_MetaMatch, ( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz ) ); +VLC_EXPORT( char *, input_item_GetMeta, ( input_item_t *p_i, vlc_meta_type_t meta_type ) ); +VLC_EXPORT( char *, input_item_GetName, ( input_item_t * p_i ) ); +VLC_EXPORT( char *, input_item_GetURI, ( input_item_t * p_i ) ); +VLC_EXPORT( void, input_item_SetURI, ( input_item_t * p_i, char * psz_uri )); +VLC_EXPORT(mtime_t, input_item_GetDuration, ( input_item_t * p_i ) ); +VLC_EXPORT( void, input_item_SetDuration, ( input_item_t * p_i, mtime_t i_duration )); +VLC_EXPORT( bool, input_item_IsPreparsed, ( input_item_t *p_i )); +VLC_EXPORT( bool, input_item_IsArtFetched, ( input_item_t *p_i )); +VLC_EXPORT( const vlc_meta_t *, input_item_GetMetaObject, ( input_item_t *p_i )); +VLC_EXPORT( void, input_item_MetaMerge, ( input_item_t *p_i, const vlc_meta_t * p_new_meta )); -static inline bool input_item_IsPreparsed( input_item_t *p_i ) -{ - return p_i->p_meta ? p_i->p_meta->i_status & ITEM_PREPARSED : false ; -} - -static inline bool input_item_IsArtFetched( input_item_t *p_i ) -{ - return p_i->p_meta ? p_i->p_meta->i_status & ITEM_ART_FETCHED : false ; -} - -static inline const vlc_meta_t * input_item_GetMetaObject( input_item_t *p_i ) -{ - if( !p_i->p_meta ) - p_i->p_meta = vlc_meta_New(); - - return p_i->p_meta; -} - -static inline void input_item_MetaMerge( input_item_t *p_i, const vlc_meta_t * p_new_meta ) -{ - if( !p_i->p_meta ) - p_i->p_meta = vlc_meta_New(); - - vlc_meta_Merge( p_i->p_meta, p_new_meta ); -} - #define input_item_SetTitle( item, b ) input_item_SetMeta( item, vlc_meta_Title, b ) #define input_item_SetArtist( item, b ) input_item_SetMeta( item, vlc_meta_Artist, b ) #define input_item_SetGenre( item, b ) input_item_SetMeta( item, vlc_meta_Genre, b ) @@ -691,4 +544,13 @@ VLC_EXPORT( bool, input_AddSubtitles, ( input_thread_t *, char *, bool ) ); VLC_EXPORT( vlc_event_manager_t *, input_get_event_manager, ( input_thread_t * ) ); +/** + * This function allows to split a MRL into access, demux and path part. + * + * You should not write into access and demux string as they may not point into + * the provided buffer. + * The buffer provided by psz_dup will be modified. + */ +VLC_EXPORT( void, input_SplitMRL, ( const char **ppsz_access, const char **ppsz_demux, char **ppsz_path, char *psz_dup ) ); + #endif