Changeset 8589b24945ea0e4f049ab0d32de0fab8a480e9bd

Show
Ignore:
Timestamp:
06/14/08 17:12:13 (3 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1213456333 +0200
git-parent:

[9e93e03708144022e1d47f138ba1917fd4eb41b5]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1213456333 +0200
Message:

demux/playlist: Don't use playlist_t code.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/demux/playlist/playlist.c

    r3561b9b r8589b24  
    3232#include <vlc_plugin.h> 
    3333#include <vlc_demux.h> 
    34 #include <vlc_playlist.h> 
    3534 
    3635#include "playlist.h" 

  • modules/demux/playlist/pls.c

    r3561b9b r8589b24  
    160160            if( psz_mrl ) 
    161161            { 
    162                 p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name, 
     162                p_input = input_ItemNewExt( p_demux, psz_mrl, psz_name, 
    163163                                            0, NULL, -1 ); 
    164164                input_ItemCopyOptions( p_current_input, p_input ); 
    …… 
    216216    if( psz_mrl ) 
    217217    { 
    218         p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,0, NULL, -1 ); 
     218        p_input = input_ItemNewExt( p_demux, psz_mrl, psz_name,0, NULL, -1 ); 
    219219        input_ItemCopyOptions( p_current_input, p_input ); 
    220220        input_ItemAddSubItem( p_current_input, p_input ); 

  • modules/demux/playlist/podcast.c

    r3561b9b r8589b24  
    3838{ 
    3939    char *psz_prefix; 
    40     playlist_t *p_playlist; 
    4140    xml_t *p_xml; 
    4241    xml_reader_t *p_xml_reader; 
    …… 
    6160    STANDARD_DEMUX_INIT_MSG( "using podcast reader" ); 
    6261    p_demux->p_sys->psz_prefix = FindPrefix( p_demux ); 
    63     p_demux->p_sys->p_playlist = NULL; 
    6462    p_demux->p_sys->p_xml = NULL; 
    6563    p_demux->p_sys->p_xml_reader = NULL; 
    …… 
    7775 
    7876    free( p_sys->psz_prefix ); 
    79     if( p_sys->p_playlist ) vlc_object_release( p_sys->p_playlist ); 
    8077    if( p_sys->p_xml_reader ) xml_ReaderDelete( p_sys->p_xml, p_sys->p_xml_reader ); 
    8178    if( p_sys->p_xml ) xml_Delete( p_sys->p_xml ); 
    …… 
    276273                        return -1; 
    277274                    } 
    278                     p_input = input_ItemNewExt( p_playlist, psz_item_mrl, 
     275                    p_input = input_ItemNewExt( p_demux, psz_item_mrl, 
    279276                                                psz_item_name, 0, NULL, -1 ); 
    280277                    if( p_input == NULL ) break; 

  • modules/demux/playlist/qtl.c

    r3561b9b r8589b24  
    6161struct demux_sys_t 
    6262{ 
    63     playlist_t *p_playlist; 
    6463    input_item_t *p_current_input; 
    6564 
    …… 
    9190{ 
    9291    DEMUX_BY_EXTENSION_MSG( ".qtl", "using QuickTime Media Link reader" ); 
    93     p_demux->p_sys->p_playlist = NULL; 
    9492    p_demux->p_sys->p_xml = NULL; 
    9593    p_demux->p_sys->p_xml_reader = NULL; 
    …… 
    105103    demux_sys_t *p_sys = p_demux->p_sys; 
    106104 
    107     if( p_sys->p_playlist ) 
    108         vlc_object_release( p_sys->p_playlist ); 
    109105    if( p_sys->p_xml_reader ) 
    110106        xml_ReaderDelete( p_sys->p_xml, p_sys->p_xml_reader ); 
    …… 
    140136    INIT_PLAYLIST_STUFF; 
    141137 
    142     p_sys->p_playlist = p_playlist; 
    143138    p_sys->p_current_input = p_current_input; 
    144139 
    …… 
    355350    else 
    356351    { 
    357         p_input = input_ItemNewExt( p_sys->p_playlist, 
     352        p_input = input_ItemNewExt( p_demux, 
    358353                                psz_src, psz_moviename, 0, NULL, -1 ); 
    359354#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \ 
    …… 
    365360        if( psz_qtnext ) 
    366361        { 
    367             p_input = input_ItemNewExt( p_sys->p_playlist, 
     362            p_input = input_ItemNewExt( p_demux, 
    368363                                        psz_qtnext, NULL, 0, NULL, -1 ); 
    369364            input_ItemAddSubItem( p_current_input, p_input ); 
    …… 
    373368 
    374369    HANDLE_PLAY_AND_RELEASE; 
    375  
    376     p_sys->p_playlist = NULL; 
    377370 
    378371    free( psz_href );