← Back to branch summary

~videolan/vlc/old-trunk

« back to all changes in this revision

Viewing changes to modules/demux/playlist/pls.c

  • Committer: zorglub
  • Date: 2006-09-24 12:40:10 UTC
  • Revision ID: vcs-imports@canonical.com-20060924124010-9313cccc4d61dbc9
Rename vlc_input_item_* functions to input_Item* for consistency
Add input_ItemAddOptionNoDup (unused at the moment)
+ free warning fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/demux/playlist/pls.c
2
2
 * pls.c : PLS playlist format import
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2004 the VideoLAN team
5
 
 * $Id: pls.c 16375 2006-08-27 17:07:20Z dionoea $
 
5
 * $Id: pls.c 16821 2006-09-24 12:40:10Z zorglub $
6
6
 *
7
7
 * Authors: Clément Stenac <zorglub@videolan.org>
8
8
 * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
154
154
            {
155
155
                p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,
156
156
                                            0, NULL, -1 );
157
 
                vlc_input_item_CopyOptions( p_current->p_input, p_input );
 
157
                input_ItemCopyOptions( p_current->p_input, p_input );
158
158
                playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
159
159
                                p_item_in_category, (i_parent_id > 0 ) ?
160
160
                                VLC_TRUE: VLC_FALSE, PLAYLIST_APPEND );
211
211
    if( psz_mrl )
212
212
    {
213
213
        p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,0, NULL, -1 );
214
 
        vlc_input_item_CopyOptions( p_current->p_input, p_input );
 
214
        input_ItemCopyOptions( p_current->p_input, p_input );
215
215
        playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
216
216
                                p_item_in_category, (i_parent_id > 0 ) ?
217
217
                                VLC_TRUE: VLC_FALSE, PLAYLIST_APPEND );