Commit 5ca9d7ea authored by Thomas Guillem's avatar Thomas Guillem
Browse files

preparser: merge item locks

Since input_preparser_Push() is necessarilly called from vlc_MetadataRequest().
parent 890fb755
...@@ -514,12 +514,6 @@ int vlc_MetadataRequest(libvlc_int_t *libvlc, input_item_t *item, ...@@ -514,12 +514,6 @@ int vlc_MetadataRequest(libvlc_int_t *libvlc, input_item_t *item,
if (unlikely(priv->parser == NULL)) if (unlikely(priv->parser == NULL))
return VLC_ENOMEM; return VLC_ENOMEM;
if( i_options & META_REQUEST_OPTION_DO_INTERACT )
{
vlc_mutex_lock( &item->lock );
item->b_preparse_interact = true;
vlc_mutex_unlock( &item->lock );
}
input_preparser_Push( priv->parser, item, i_options, cbs, cbs_userdata, timeout, id ); input_preparser_Push( priv->parser, item, i_options, cbs, cbs_userdata, timeout, id );
return VLC_SUCCESS; return VLC_SUCCESS;
......
...@@ -267,6 +267,8 @@ void input_preparser_Push( input_preparser_t *preparser, ...@@ -267,6 +267,8 @@ void input_preparser_Push( input_preparser_t *preparser,
vlc_mutex_lock( &item->lock ); vlc_mutex_lock( &item->lock );
enum input_item_type_e i_type = item->i_type; enum input_item_type_e i_type = item->i_type;
int b_net = item->b_net; int b_net = item->b_net;
if( i_options & META_REQUEST_OPTION_DO_INTERACT )
item->b_preparse_interact = true;
vlc_mutex_unlock( &item->lock ); vlc_mutex_unlock( &item->lock );
switch( i_type ) switch( i_type )
......
Supports Markdown
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