Commit 2feb5a9d authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

vlc_input.h: Disable's funman commit. It requires more work before going in...

vlc_input.h: Disable's funman commit. It requires more work before going in trunk. Current state dead locks.
parent 1c54a6ae
......@@ -222,11 +222,11 @@ static inline void input_item_SetMeta( input_item_t *p_i, vlc_meta_type_t meta_t
{
vlc_event_t event;
vlc_mutex_lock( &p_i->lock );
//vlc_mutex_lock( &p_i->lock );
if( !p_i->p_meta )
p_i->p_meta = vlc_meta_New();
vlc_meta_Set( p_i->p_meta, meta_type, psz_val );
vlc_mutex_unlock( &p_i->lock );
//vlc_mutex_unlock( &p_i->lock );
/* Notify interested third parties */
event.type = vlc_InputItemMetaChanged;
......@@ -236,10 +236,10 @@ static inline void input_item_SetMeta( input_item_t *p_i, vlc_meta_type_t meta_t
static inline vlc_bool_t input_item_MetaMatch( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz )
{
vlc_mutex_lock( &p_i->lock );
//vlc_mutex_lock( &p_i->lock );
const char * meta = vlc_meta_Get( p_i->p_meta, meta_type );
vlc_bool_t ret = meta && strcasestr( meta, psz );
vlc_mutex_unlock( &p_i->lock );
//vlc_mutex_unlock( &p_i->lock );
return ret;
}
......@@ -247,7 +247,7 @@ static inline vlc_bool_t input_item_MetaMatch( input_item_t *p_i, vlc_meta_type_
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 );
//vlc_mutex_lock( &p_i->lock );
if( !p_i->p_meta )
{
......@@ -258,15 +258,15 @@ static inline char * input_item_GetMeta( input_item_t *p_i, vlc_meta_type_t meta
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 );
//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 );
//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 );
//vlc_mutex_unlock( &p_i->lock );
return psz_s;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment