← Back to branch summary

~videolan/vlc/old-trunk

« back to all changes in this revision

Viewing changes to modules/demux/playlist/shoutcast.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/shoutcast.c
2
2
 * shoutcast.c: Winamp >=5.2 shoutcast demuxer
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2006 the VideoLAN team
5
 
 * $Id: shoutcast.c 16233 2006-08-06 16:14:56Z zorglub $
 
5
 * $Id: shoutcast.c 16821 2006-09-24 12:40:10Z zorglub $
6
6
 *
7
7
 * Authors: Antoine Cellerier <dionoea -@t- videolan -Dot- org>
8
8
 *          based on b4s.c by Sigmund Augdal Helberg <dnumgis@videolan.org>
239
239
                             psz_name );
240
240
                    p_input = input_ItemNewExt( p_sys->p_playlist, psz_mrl,
241
241
                                                psz_name, 0, NULL, -1 );
242
 
                    vlc_input_item_CopyOptions( p_sys->p_current->p_input,
 
242
                    input_ItemCopyOptions( p_sys->p_current->p_input,
243
243
                                                p_input );
244
244
                    free( psz_mrl );
245
245
                    playlist_AddWhereverNeeded( p_sys->p_playlist, p_input,
417
417
                                                psz_name , 0, NULL, -1 );
418
418
                    free( psz_mrl );
419
419
 
420
 
                    vlc_input_item_CopyOptions( p_sys->p_current->p_input,
 
420
                    input_ItemCopyOptions( p_sys->p_current->p_input,
421
421
                                                p_input );
422
422
 
423
 
#define SADD_INFO( type, field ) if( field ) { vlc_input_item_AddInfo( \
 
423
#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \
424
424
                    p_input, _("Shoutcast"), _(type), "%s", field ) ; }
425
425
                    SADD_INFO( "Mime type", psz_mt );
426
426
                    SADD_INFO( "Bitrate", psz_br );