Commit fb364585 authored by Rafaël Carré's avatar Rafaël Carré

don't copy 'meta-file' option to inputs

parent c0ac271e
...@@ -106,6 +106,11 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent, ...@@ -106,6 +106,11 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent,
for( i = 0 ; i< p_parent->i_options; i++ ) for( i = 0 ; i< p_parent->i_options; i++ )
{ {
char *psz_option= strdup( p_parent->ppsz_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->i_options++;
p_child->ppsz_options = (char **)realloc( p_child->ppsz_options, p_child->ppsz_options = (char **)realloc( p_child->ppsz_options,
p_child->i_options * p_child->i_options *
......
...@@ -97,14 +97,6 @@ static void input_item_subitem_added( const vlc_event_t * p_event, ...@@ -97,14 +97,6 @@ static void input_item_subitem_added( const vlc_event_t * p_event,
playlist_t *p_playlist = user_data; playlist_t *p_playlist = user_data;
input_item_t *p_item = p_event->u.input_item_subitem_added.p_new_child; input_item_t *p_item = p_event->u.input_item_subitem_added.p_new_child;
/* The media library input has one and only one option: "meta-file"
* So we remove that unneeded option. */
if( p_item->i_options == 1 )
{
free( p_item->ppsz_options[0] );
p_item->i_options = 0;
}
playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END, playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END,
VLC_FALSE, VLC_FALSE ); VLC_FALSE, VLC_FALSE );
} }
......
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