Changeset 673861da5ce8bfeb0a4adbd5be95aa5fd2da9e4b

Timestamp:

12/11/06 00:37:25 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1163288245 +0000

git-parent:

[d1b0d5205fe25610f697435bff3e60e938a7bb41]

git-author:

Clément Stenac <zorglub@videolan.org> 1163288245 +0000

Message:

* Remove some unneeded complexity in playlist and directory
* Remove some unneeded wrappers and locking

Files:

• include/vlc_input.h (modified) (1 diff)
• include/vlc_playlist.h (modified) (7 diffs)
• include/vlc_symbols.h (modified) (11 diffs)
• modules/access/cdda.c (modified) (1 diff)
• modules/access/directory.c (modified) (5 diffs)
• modules/access/mms/mmsh.c (modified) (1 diff)
• modules/codec/cmml/intf.c (modified) (1 diff)
• modules/control/http/macro.c (modified) (1 diff)
• modules/control/http/rpn.c (modified) (1 diff)
• modules/control/rc.c (modified) (2 diffs)
• modules/demux/mp4/mp4.c (modified) (1 diff)
• modules/demux/playlist/asx.c (modified) (3 diffs)
• modules/demux/playlist/b4s.c (modified) (2 diffs)
• modules/demux/playlist/dvb.c (modified) (2 diffs)
• modules/demux/playlist/gvp.c (modified) (4 diffs)
• modules/demux/playlist/m3u.c (modified) (4 diffs)
• modules/demux/playlist/playlist.c (modified) (1 diff)
• modules/demux/playlist/playlist.h (modified) (2 diffs)
• modules/demux/playlist/pls.c (modified) (3 diffs)
• modules/demux/playlist/podcast.c (modified) (2 diffs)
• modules/demux/playlist/qtl.c (modified) (4 diffs)
• modules/demux/playlist/sgimb.c (modified) (1 diff)
• modules/demux/playlist/shoutcast.c (modified) (4 diffs)
• modules/demux/playlist/xspf.c (modified) (4 diffs)
• modules/gui/beos/InterfaceWindow.cpp (modified) (2 diffs)
• modules/gui/macosx/applescript.m (modified) (1 diff)
• modules/gui/macosx/playlist.m (modified) (1 diff)
• modules/gui/macosx/wizard.m (modified) (1 diff)
• modules/gui/qt4/dialogs/playlist.cpp (modified) (1 diff)
• modules/gui/qt4/dialogs_provider.cpp (modified) (6 diffs)
• modules/gui/qt4/main_interface.cpp (modified) (1 diff)
• modules/gui/skins2/commands/cmd_add_item.cpp (modified) (1 diff)
• modules/gui/skins2/commands/cmd_playlist.cpp (modified) (1 diff)
• modules/gui/wxwidgets/dialogs.cpp (modified) (2 diffs)
• modules/gui/wxwidgets/dialogs/open.cpp (modified) (1 diff)
• modules/gui/wxwidgets/dialogs/playlist.cpp (modified) (1 diff)
• modules/gui/wxwidgets/dialogs/wizard.cpp (modified) (1 diff)
• modules/gui/wxwidgets/interface.cpp (modified) (1 diff)
• modules/meta_engine/taglib.cpp (modified) (1 diff)
• src/libvlc.c (modified) (2 diffs)
• src/misc/win32_specific.c (modified) (1 diff)
• src/playlist/item.c (modified) (5 diffs)
• src/playlist/loadsave.c (modified) (1 diff)

include/vlc_input.h

@@ -28 +28 @@
-
-#include <vlc_es.h>
-#include <vlc_playlist.h>
-#include <vlc_meta.h>
-

include/vlc_playlist.h

@@ -26 +26 @@
-
-#include <assert.h>
+#include <vlc_input.h>
+#include <stdio.h>
+#include <stdlib.h>
-
-TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t);
@@ -74 +77 @@
-#define PLAYLIST_EXPANDED_FLAG  0x0020    /**< Expanded node */
-
-
-
-
+
-typedef enum
-{ PLAYLIST_STOPPED,PLAYLIST_RUNNING,PLAYLIST_PAUSED } playlist_status_t;
@@ -96 +97 @@
-{
-    VLC_COMMON_MEMBERS
-/**
-   \name playlist_t
-   These members are uniq to playlist_t
-*/
-/*@{*/
-    int                   i_enabled; /**< How many items are enabled ? */
-
@@ -173 +169 @@
-    input_thread_t      *p_stats_computer;
-    global_stats_t      *p_stats;             /**< Global statistics */
-
-
-
-
+
+
+
-struct playlist_add_t
-{
@@ -251 +246 @@
-
-/* Load/Save */
-VLC_EXPORT( int,  playlist_Import, ( playlist_t *, const char *, playlist_item_t *, vlc_bool_t ) );
-VLC_EXPORT( int,  playlist_Export, ( playlist_t *, const char *, playlist_item_t *, const char * ) );
-
@@ -297 +291 @@
-VLC_EXPORT( void, playlist_NodeAddItem, ( playlist_t *, playlist_item_t *, playlist_item_t *,int , int ) );
-VLC_EXPORT( int, playlist_BothAddInput, ( playlist_t *, input_item_t *,playlist_item_t *,int , int ) );
-VLC_EXPORT( void, playlist_AddWhereverNeeded, (playlist_t* , input_item_t*, playlist_item_t*,playlist_item_t*,vlc_bool_t, int ) );
-
-/** Add a MRL into the playlist.
- * \see playlist_Add
- */
-static inline int playlist_PlaylistAdd( playlist_t *p_playlist,
-                          const char *psz_uri, const char *psz_name,
-                          int i_mode, int i_pos )
-{
-    return playlist_Add( p_playlist, psz_uri, psz_name, i_mode, i_pos,
-                         VLC_TRUE);
-}
-
-/** Add a MRL to the media library
- * \see playlist_Add
- */
-static inline int playlist_MLAdd( playlist_t *p_playlist, const char *psz_uri,
-                                  const char *psz_name, int i_mode, int i_pos )
-{
-    return playlist_Add( p_playlist, psz_uri, psz_name, i_mode, i_pos,
-                         VLC_FALSE );
-}
-
-/** Add a MRL to the playlist, with duration and options given
- * \see playlist_AddExt
- */
-static inline int playlist_PlaylistAddExt( playlist_t *p_playlist,
-            const char * psz_uri, const char *psz_name, int i_mode, int i_pos,
-            mtime_t i_duration, const char **ppsz_options, int i_options ) 
-{
-    return playlist_AddExt( p_playlist, psz_uri, psz_name, i_mode, i_pos,
-                            i_duration, ppsz_options, i_options, VLC_TRUE );
-}
-
-/** Add a MRL to the media library, with duration and options given
- * \see playlist_AddExt
- */
-static inline int playlist_MLAddExt( playlist_t *p_playlist,
-            const char * psz_uri, const char *psz_name, int i_mode, int i_pos,
-            mtime_t i_duration, const char **ppsz_options, int i_options ) 
-{
-    return playlist_AddExt( p_playlist, psz_uri, psz_name, i_mode, i_pos,
-                            i_duration, ppsz_options, i_options, VLC_FALSE );
-}
-
-/** Add an input item to the playlist node
- * \see playlist_AddInput
- */
-static inline int playlist_PlaylistAddInput( playlist_t* p_playlist,
-                                input_item_t *p_input, int i_mode, int i_pos )
-{
-    return playlist_AddInput( p_playlist, p_input, i_mode, i_pos, VLC_TRUE );
-}
-
-/** Add an input item to the media library
- * \see playlist_AddInput
- */
-static inline int playlist_MLAddInput( playlist_t* p_playlist,
-                                input_item_t *p_input, int i_mode, int i_pos )
-{
-    return playlist_AddInput( p_playlist, p_input, i_mode, i_pos, VLC_FALSE );
-}
-
-/********************** Misc item operations **********************/
@@ -414 +346 @@
- * Inline functions
- ***********************************************************************/
+/** Open a playlist file, add its content to the current playlist */
+static inline int playlist_Import( playlist_t *p_playlist, const char *psz_file){
+    char psz_uri[256+10];
+    input_item_t *p_input;
+    snprintf( psz_uri, 256+9, "file/://%s", psz_file );
+    p_input = input_ItemNewExt( p_playlist, psz_uri, psz_file, 0, NULL, -1 );
+    playlist_AddInput( p_playlist, p_input, PLAYLIST_APPEND, PLAYLIST_END,
+                       VLC_TRUE );
+    input_Read( p_playlist, p_input, VLC_TRUE );
+    return VLC_SUCCESS;
+}
-
-/** Tell if the playlist is currently running */
-
-
-
-
-
-
-
-
+
-
-/** Tell if the playlist is empty */
-
-
-
-
-
-
-
-
+
-
-/** Tell the number of items in the current playing context */
-
-
-
-
+
+
-
-/** Ask the playlist to do some work */

include/vlc_symbols.h

@@ -313 +313 @@
-    int (*playlist_NodeSort_inner) (playlist_t *, playlist_item_t *,int, int);
-    int (*playlist_RecursiveNodeSort_inner) (playlist_t *, playlist_item_t *,int, int);
-int (*playlist_Import_inner) (playlist_t *, const char *, playlist_item_t *, vlc_bool_t)
+void *playlist_Import_deprecated
-    int (*playlist_Export_inner) (playlist_t *, const char *, playlist_item_t *, const char *);
-    spu_t * (*__spu_Create_inner) (vlc_object_t *);
@@ -507 +507 @@
-    int (*playlist_DeleteAllFromInput_inner) (playlist_t *, int);
-    int (*playlist_LockDeleteAllFromInput_inner) (playlist_t *, int);
-(*playlist_AddWhereverNeeded_inner) (playlist_t* , input_item_t*, playlist_item_t*,playlist_item_t*,vlc_bool_t, int)
+*playlist_AddWhereverNeeded_deprecated
-    int (*playlist_DeleteFromItemId_inner) (playlist_t *, int);
-    void (*playlist_NodeDump_inner) (playlist_t *p_playlist, playlist_item_t *p_item, int i_level);
@@ -558 +558 @@
-    char * (*str_format_time_inner) (char *);
-    char * (*__str_format_meta_inner) (vlc_object_t *, char *);
+    int (*vout_Snapshot_inner) (vout_thread_t *p_vout, picture_t *p_pic);
-};
-# if defined (__PLUGIN__)
@@ -822 +823 @@
-#  define playlist_NodeSort (p_symbols)->playlist_NodeSort_inner
-#  define playlist_RecursiveNodeSort (p_symbols)->playlist_RecursiveNodeSort_inner
-#  define playlist_Import (p_symbols)->playlist_Import_inner
-#  define playlist_Export (p_symbols)->playlist_Export_inner
-#  define __spu_Create (p_symbols)->__spu_Create_inner
@@ -997 +997 @@
-#  define playlist_DeleteAllFromInput (p_symbols)->playlist_DeleteAllFromInput_inner
-#  define playlist_LockDeleteAllFromInput (p_symbols)->playlist_LockDeleteAllFromInput_inner
-#  define playlist_AddWhereverNeeded (p_symbols)->playlist_AddWhereverNeeded_inner
-#  define playlist_DeleteFromItemId (p_symbols)->playlist_DeleteFromItemId_inner
-#  define playlist_NodeDump (p_symbols)->playlist_NodeDump_inner
@@ -1035 +1034 @@
-#  define str_format_time (p_symbols)->str_format_time_inner
-#  define __str_format_meta (p_symbols)->__str_format_meta_inner
+#  define vout_Snapshot (p_symbols)->vout_Snapshot_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1302 +1302 @@
-    ((p_symbols)->playlist_NodeSort_inner) = playlist_NodeSort; \
-    ((p_symbols)->playlist_RecursiveNodeSort_inner) = playlist_RecursiveNodeSort; \
-    ((p_symbols)->playlist_Import_inner) = playlist_Import; \
-    ((p_symbols)->playlist_Export_inner) = playlist_Export; \
-    ((p_symbols)->__spu_Create_inner) = __spu_Create; \
@@ -1477 +1476 @@
-    ((p_symbols)->playlist_DeleteAllFromInput_inner) = playlist_DeleteAllFromInput; \
-    ((p_symbols)->playlist_LockDeleteAllFromInput_inner) = playlist_LockDeleteAllFromInput; \
-    ((p_symbols)->playlist_AddWhereverNeeded_inner) = playlist_AddWhereverNeeded; \
-    ((p_symbols)->playlist_DeleteFromItemId_inner) = playlist_DeleteFromItemId; \
-    ((p_symbols)->playlist_NodeDump_inner) = playlist_NodeDump; \
@@ -1515 +1513 @@
-    ((p_symbols)->str_format_time_inner) = str_format_time; \
-    ((p_symbols)->__str_format_meta_inner) = __str_format_meta; \
+    ((p_symbols)->vout_Snapshot_inner) = vout_Snapshot; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->__sout_CfgParse_deprecated = NULL; \
@@ -1546 +1545 @@
-    (p_symbols)->playlist_Move_deprecated = NULL; \
-    (p_symbols)->playlist_NodeGroup_deprecated = NULL; \
+    (p_symbols)->playlist_Import_deprecated = NULL; \
-    (p_symbols)->playlist_NodeRemoveParent_deprecated = NULL; \
-    (p_symbols)->__vlc_fix_readdir_charset_deprecated = NULL; \
@@ -1565 +1565 @@
-    (p_symbols)->playlist_PlaylistAddInput_deprecated = NULL; \
-    (p_symbols)->vlc_input_item_AddOption_deprecated = NULL; \
+    (p_symbols)->playlist_AddWhereverNeeded_deprecated = NULL; \
-    (p_symbols)->__intf_UserOkayCancel_deprecated = NULL; \
-    (p_symbols)->playlist_NodesCreateForSD_deprecated = NULL; \

modules/access/cdda.c

@@ -502 +502 @@
-        }
-#endif
-AddWhereverNeeded( p_playlist, p_input_item, p_parent
-p_item_in_category, VLC_FALSE, PLAYLIST_APP
+BothAddInput( p_playlist, p_input_item, p_item_in_category
+PLAYLIST_APPEND, PLAYLIST_
-        free( psz_uri ); free( psz_opt ); free( psz_name );
-        free( psz_first ); free( psz_last );

modules/access/directory.c

@@ -179 +179 @@
-static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
-{
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        return VLC_ENOMEM;
+
+    if( p_current == NULL ) {
+        msg_Err( p_access, "unable to find item in playlist" );
+        return VLC_ENOOBJ;
+    }
-
-    /* Remove the ending '/' char */
@@ -197 +208 @@
-        }
-    }
-
-    playlist_item_t *p_item, *p_root_category;
-    playlist_t *p_playlist = pl_Yield( p_access );
-
-    /* Handle mode */
@@ -213 +221 @@
-    msg_Dbg( p_access, "opening directory `%s'", p_access->psz_path );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    i_activity = var_GetInteger( p_playlist, "activity" );
@@ -235 +228 @@
-                    DIRECTORY_ACTIVITY );
-
-item, p_root
+current, p_item_in
-
-    i_activity = var_GetInteger( p_playlist, "activity" );
-    var_SetInteger( p_playlist, "activity", i_activity -
-                    DIRECTORY_ACTIVITY );
+
-    if( psz_name ) free( psz_name );
-    vlc_object_release( p_playlist );
@@ -476 +470 @@
-                                                 -1, ITEM_TYPE_VFILE );
-                if (p_input != NULL)
-
-
-
+
+
+
+
-            }
-        }

modules/access/mms/mmsh.c

@@ -113 +113 @@
-
-        /** \bug we do not autodelete here */
-Playlist
-        PLAYLIST_INSERT | PLAYLIST_GO, PLAYLIST_END
+
+PLAYLIST_INSERT | PLAYLIST_GO, PLAYLIST_END, VLC_TRUE
-        vlc_object_release( p_playlist );
-

modules/codec/cmml/intf.c

@@ -796 +796 @@
-{
-    playlist_Stop( p_playlist );
-Playlist
-
+
+, VLC_TRUE
-}
-

modules/control/http/macro.c

@@ -339 +339 @@
-                    else
-                    {
-Playlist
-     PLAYLIST_APPEND, PLAYLIST_END
+
+PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE
-                        msg_Dbg( p_intf, "requested mrl add: %s", mrl );
-                    }

modules/control/http/rpn.c

@@ -851 +851 @@
-            else
-            {
-Playlist
-      PLAYLIST_APPEND, PLAYLIST_END
+
+PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE
-                msg_Dbg( p_intf, "requested mrl add: %s", mrl );
-            }

modules/control/rc.c

@@ -1417 +1417 @@
-        {
-            msg_rc( "Trying to add %s to playlist.", newval.psz_string );
-Playlist
-         PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END
+
+PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE
-        }
-    }
@@ -1429 +1429 @@
-        {
-            msg_rc( "trying to enqueue %s to playlist", newval.psz_string );
-Playlist
-PLAYLIST_APPEND, PLAYLIST_END
+
+ PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE
-        }
-    }

modules/demux/mp4/mp4.c

@@ -416 +416 @@
-                                            0, NULL, -1 );
-                        input_ItemCopyOptions( p_current->p_input, p_input );
-
-
+
+
+
-                    }
-                }

modules/demux/playlist/asx.c

@@ -132 +132 @@
-    char        *psz_backup = NULL;
-    vlc_bool_t  b_entry = VLC_FALSE;
-
+
-    INIT_PLAYLIST_STUFF;
-
@@ -356 +356 @@
-                            p_input = input_ItemNew( p_playlist, psz_string, psz_title_asx );
-                            input_ItemCopyOptions( p_current->p_input, p_input );
-
-
-
+
+
+
+
-                            free( psz_string );
-                        }
@@ -435 +436 @@
-                            if( psz_moreinfo_entry ) vlc_meta_SetURL( p_entry->p_meta, psz_moreinfo_entry );
-                            if( psz_abstract_entry ) vlc_meta_SetDescription( p_entry->p_meta, psz_abstract_entry );
-
-
-
-
+
+
+
-                            free( psz_string );
-                        }

modules/demux/playlist/b4s.c

@@ -85 +85 @@
-    char *psz_elname = NULL;
-    int i_type;
+    input_item_t *p_input;
-    char *psz_mrl = NULL, *psz_name = NULL, *psz_genre = NULL;
-    char *psz_now = NULL, *psz_listeners = NULL, *psz_bitrate = NULL;
@@ -266 +267 @@
-                        msg_Err( p_playlist, "Unsupported meta bitrate" );
-
-
-
-
-
+
+
+
-                    FREENULL( psz_name );
-                    FREENULL( psz_mrl );

modules/demux/playlist/dvb.c

@@ -96 +96 @@
-{
-    char       *psz_line;
+    input_item_t *p_input;
-    INIT_PLAYLIST_STUFF;
-
@@ -118 +119 @@
-            input_ItemAddOption( p_input, ppsz_options[i] );
-        }
-
-
-
-
+
+
-
-        while( i_options-- ) free( ppsz_options[i_options] );

modules/demux/playlist/gvp.c

@@ -63 +63 @@
-    playlist_item_t *p_current;
-    playlist_item_t *p_item_in_category;
-    int i_parent_id;
-};
-
@@ -130 +129 @@
-    char *psz_title = NULL;
-    char *psz_description = NULL;
+    input_item_t *p_input;
-
-    INIT_PLAYLIST_STUFF;
@@ -135 +135 @@
-    p_sys->p_playlist = p_playlist;
-    p_sys->p_current = p_current;
-    p_sys->i_parent_id = i_parent_id;
-    p_sys->p_item_in_category = p_item_in_category;
-
@@ -215 +214 @@
-        SADD_INFO( "docid", psz_docid );
-        SADD_INFO( "description", psz_description );
-
-
-
-
+
+
+
-    }
-

modules/demux/playlist/m3u.c

@@ -57 +57 @@
-    CHECK_PEEK( p_peek, 8 );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        return VLC_EGENERIC;
-
@@ -80 +76 @@
-{
-    demux_t *p_demux = (demux_t *)p_this;
-
-
+
-    free( p_demux->p_sys );
-}
@@ -95 +90 @@
-    int        i_options = 0, i;
-    vlc_bool_t b_cleanup = VLC_FALSE;
+    input_item_t *p_input;
-
-    INIT_PLAYLIST_STUFF;
@@ -173 +169 @@
-                input_ItemAddInfo( p_input, _(VLC_META_INFO_CAT),
-                                        _(VLC_META_ARTIST), "%s", psz_artist );
-
-
-
+
+
-            free( psz_mrl );
-        }

modules/demux/playlist/playlist.c

@@ -165 +165 @@
-    return psz_mrl;
-}
-
-void E_(AddToPlaylist)( demux_t *p_demux, playlist_t *p_playlist,
-                        input_item_t *p_input,
-                        playlist_item_t *p_item, int i_parent_id )
-{
-    // Only add to parent if specific parent requested or not current
-    // playlist item
-   if( i_parent_id > 0 || ! (
-         p_playlist->status.p_item &&
-         p_playlist->status.p_item->p_input ==
-              ((input_thread_t *)p_demux->p_parent)->input.p_item ) )
-   {
-       playlist_NodeAddInput( p_playlist, p_input, p_item,
-                              PLAYLIST_APPEND, PLAYLIST_END );
-   }
-   // Else, add to both
-   else
-   {
-       playlist_BothAddInput( p_playlist, p_input, p_item,
-                              PLAYLIST_APPEND, PLAYLIST_END );
-   }
-   input_ItemCopyOptions( p_item->p_input, p_input );
-}
-
-
-vlc_bool_t E_(FindItem)( demux_t *p_demux, playlist_t *p_playlist,
-                     playlist_item_t **pp_item )
-{
-     vlc_bool_t b_play = var_CreateGetBool( p_demux, "playlist-autostart" );
-
-     if( b_play && p_playlist->status.p_item &&
-             p_playlist->status.p_item->p_input ==
-                ((input_thread_t *)p_demux->p_parent)->input.p_item )
-     {
-         msg_Dbg( p_playlist, "starting playlist playback" );
-         *pp_item = p_playlist->status.p_item;
-         b_play = VLC_TRUE;
-     }
-     else
-     {
-         input_item_t *p_current = ( (input_thread_t*)p_demux->p_parent)->
-                                                        input.p_item;
-         *pp_item = playlist_LockItemGetByInput( p_playlist, p_current );
-         if( !*pp_item )
-         {
-             msg_Dbg( p_playlist, "unable to find item in playlist");
-         }
-         msg_Dbg( p_playlist, "not starting playlist playback");
-         p_playlist->status.i_status = PLAYLIST_STOPPED;
-         b_play = VLC_FALSE;
-     }
-     return b_play;
-}

modules/demux/playlist/playlist.h

@@ -22 +22 @@
- *****************************************************************************/
-
+#include <vlc_playlist.h>
-char *E_(ProcessMRL)( char *, char * );
-char *E_(FindPrefix)( demux_t * );
@@ -68 +69 @@
-
-#define INIT_PLAYLIST_STUFF \
-    int i_parent_id; \
-    vlc_bool_t b_play; \
-    playlist_item_t *p_current, *p_item_in_category = NULL; \
-    input_item_t *p_input; \
-    playlist_t *p_playlist = pl_Yield( p_demux ); \
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-#define HANDLE_PLAY_AND_RELEASE \
-    /* Go back and play the playlist */ \
-
-
-
-
-
-
+
+
+
-    vlc_object_release( p_playlist );
-

modules/demux/playlist/pls.c

@@ -90 +90 @@
-    int            i_new_item = 0;
-    int            i_key_length;
+    input_item_t *p_input;
-
-    INIT_PLAYLIST_STUFF;
@@ -156 +157 @@
-                                            0, NULL, -1 );
-                input_ItemCopyOptions( p_current->p_input, p_input );
-
-
-
+
+
-            }
-            else
@@ -213 +213 @@
-        p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,0, NULL, -1 );
-        input_ItemCopyOptions( p_current->p_input, p_input );
-
-
-
+
+
-