Changeset a0e351f5a791d05b4e38bf835064055d10730efc

Timestamp:

06/14/08 17:36:03 (2 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1213457763 +0200

git-parent:

[fcaf3746c77c7aaa692e39b3c377321f2155bda1]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1213457763 +0200

Message:

demux/playlist: Don't use playlist_t.

Files:

• modules/demux/playlist/asx.c (modified) (2 diffs)
• modules/demux/playlist/b4s.c (modified) (4 diffs)
• modules/demux/playlist/dvb.c (modified) (1 diff)
• modules/demux/playlist/gvp.c (modified) (6 diffs)
• modules/demux/playlist/ifo.c (modified) (1 diff)
• modules/demux/playlist/itml.c (modified) (8 diffs)
• modules/demux/playlist/itml.h (modified) (1 diff)
• modules/demux/playlist/m3u.c (modified) (1 diff)
• modules/demux/playlist/playlist.h (modified) (2 diffs)

modules/demux/playlist/asx.c

@@ -460 +460 @@
-                            memcpy( psz_string, psz_backup, i_strlen );
-                            psz_string[i_strlen] = '\0';
-playlist
+demux
-                            input_ItemCopyOptions( p_current_input, p_input );
-                            input_ItemAddSubItem( p_current_input, p_input );
@@ -517 +517 @@
-                    asprintf( &psz_name, "%d %s", i_entry_count, ( psz_title_entry ? psz_title_entry : p_current_input->psz_name ) );
-
-playlist
+demux
-                    FREENULL( psz_name );
-                    input_ItemCopyOptions( p_current_input, p_entry );

modules/demux/playlist/b4s.c

@@ -110 +110 @@
-    {
-        msg_Err( p_demux, "invalid file (no root node)" );
-        vlc_object_release( p_playlist );
-        return -1;
-    }
@@ -121 +120 @@
-                 xml_ReaderNodeType( p_xml_reader ), psz_elname );
-        free( psz_elname );
-        vlc_object_release( p_playlist );
-        return -1;
-    }
@@ -259 +257 @@
-                if( !strcmp( psz_elname, "entry" ) )
-                {
-playlist
+demux
-                                                0, NULL, -1 );
-                    if( psz_now )
@@ -266 +264 @@
-                        input_item_SetGenre( p_input, psz_genre );
-                    if( psz_listeners )
-playlist
+demux
-                    if( psz_bitrate )
-playlist
+demux
-
-                    input_ItemAddSubItem( p_current_input, p_input );

modules/demux/playlist/dvb.c

@@ -118 +118 @@
-        EnsureUTF8( psz_name );
-
-playlist
+demux
-        for( i = 0; i< i_options; i++ )
-        {

modules/demux/playlist/gvp.c

@@ -62 +62 @@
-struct demux_sys_t
-{
-    playlist_t *p_playlist;
-    input_item_t *p_current_input;
-};
@@ -99 +98 @@
-    p_demux->pf_demux = Demux;
-    MALLOC_ERR( p_demux->p_sys, demux_sys_t );
-    p_demux->p_sys->p_playlist = NULL;
-
-    return VLC_SUCCESS;
@@ -112 +110 @@
-    demux_sys_t *p_sys = p_demux->p_sys;
-
-    if( p_sys->p_playlist )
-        vlc_object_release( p_sys->p_playlist );
-    free( p_sys );
-}
@@ -134 +130 @@
-    INIT_PLAYLIST_STUFF;
-
-    p_sys->p_playlist = p_playlist;
-    p_sys->p_current_input = p_current_input;
-
@@ -207 +202 @@
-    else
-    {
-sys->p_playlist
+demux
-                                    psz_url, psz_title, 0, NULL, -1 );
-#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \
@@ -226 +221 @@
-    free( psz_description );
-
-    p_sys->p_playlist = NULL;
-
-    return 0; /* Needed for correct operation of go back */
-}

modules/demux/playlist/ifo.c

@@ -96 +96 @@
-    snprintf( psz_url, len+1, "dvd://%s", p_demux->psz_path );
-
-playlist
+demux
-    input_ItemAddSubItem( p_current_input, p_input );
-    vlc_gc_decref( p_input );

modules/demux/playlist/itml.c

@@ -115 +115 @@
-        xml_elem_hnd_t pl_elements[] =
-            { {"dict",    COMPLEX_CONTENT, {.cmplx = parse_plist_dict} } };
-playlist, p_
+
-                                     NULL, p_xml_reader, "plist",
-                                     pl_elements );
@@ -173 +173 @@
-        msg_Warn( p_demux, "<plist> requires \"version\" attribute" );
-
-playlist, p_
+
-                       "plist", p_handlers );
-}
@@ -221 +221 @@
-                {
-                    if( p_handler->pf_handler.cmplx( p_demux,
-                                                     p_playlist,
-                                                     p_input_item,
-                                                     NULL,
@@ -317 +316 @@
-        };
-
-playlist, p_
+
-                       "dict", pl_elements );
-}
@@ -330 +329 @@
-        };
-
-playlist, p_
+
-                "dict", tracks_elements );
-
@@ -358 +357 @@
-        };
-
-playlist, p_
+
-                        p_xml_reader, "dict", track_elements );
-
@@ -382 +381 @@
-            msg_Info( p_demux, "Adding '%s'", psz_uri );
-
-playlist
+demux
-                                            NULL, 0, NULL, -1 );
-            input_ItemAddSubItem( p_input_item, p_new_input );
@@ -489 +488 @@
-static bool skip_element COMPLEX_INTERFACE
-{
-playlist); VLC_UNUSED(p_
+
-    VLC_UNUSED(p_track); VLC_UNUSED(p_handlers);
-    char *psz_endname;

modules/demux/playlist/itml.h

@@ -42 +42 @@
-                           char            *psz_value)
-#define COMPLEX_INTERFACE (demux_t         *p_demux,\
-                           playlist_t      *p_playlist,\
-                           input_item_t    *p_input_item,\
-                           track_elem_t    *p_track,\

modules/demux/playlist/m3u.c

@@ -183 +183 @@
-            if( !psz_mrl ) goto error;
-
-playlist
+demux
-                                        0, NULL, i_duration );
-

modules/demux/playlist/playlist.h

@@ -22 +22 @@
- *****************************************************************************/
-
-
+
+
-char *ProcessMRL( char *, char * );
-char *FindPrefix( demux_t * );
@@ -78 +79 @@
-
-#define INIT_PLAYLIST_STUFF \
-    playlist_t *p_playlist = pl_Yield( p_demux ); \
-    input_thread_t *p_input_thread = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT ); \
-    input_item_t *p_current_input = input_GetItem( p_input_thread );
-
-#define HANDLE_PLAY_AND_RELEASE \
-
-
-
+