From fb36458505fc51cb9491f54465c07e85fb33eb14 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Mon, 14 Jan 2008 18:33:30 +0000 Subject: [PATCH] don't copy 'meta-file' option to inputs --- include/vlc_input.h | 5 +++++ src/playlist/loadsave.c | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/vlc_input.h b/include/vlc_input.h index 8d3b94f40f..f602c51077 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -106,6 +106,11 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent, 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 * diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index bdd6b377de..be675b0a11 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -97,14 +97,6 @@ static void input_item_subitem_added( const vlc_event_t * p_event, playlist_t *p_playlist = user_data; 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, VLC_FALSE, VLC_FALSE ); } -- 2.39.2