Coding Style fixes

[vlc] / modules / services_discovery / podcast.c

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index 9b8d263d662bd8fbaae8c3d6fff314cbb930f202..a0498bcfd013d1470af838a154b6e74d96a36afc 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -80,7 +80,8 @@ vlc_module_end();
 struct services_discovery_sys_t
 {
     /* playlist node */
-    playlist_item_t *p_node;
+    playlist_item_t *p_node_cat;
+    playlist_item_t *p_node_one;
     input_thread_t **pp_input;
 
     char **ppsz_urls;
@@ -150,29 +151,32 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
-    p_sys->p_node = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
-                                         _("Podcast"), p_view->p_root );
+    p_sys->p_node_cat = playlist_NodeCreate( p_playlist, _("Podcast"),
+                                         p_playlist->p_root_category );
+    p_sys->p_node_one = playlist_NodeCreate( p_playlist, _("Podcast"),
+                                         p_playlist->p_root_onelevel );
+    p_sys->p_node_one->p_input->i_id = p_sys->p_node_cat->p_input->i_id;
+
+    p_sys->p_node_one->i_flags |= PLAYLIST_RO_FLAG;
+    p_sys->p_node_cat->i_flags |= PLAYLIST_RO_FLAG;
+    p_sys->p_node_one->i_flags |= PLAYLIST_SKIP_FLAG;
+    p_sys->p_node_cat->i_flags |= PLAYLIST_SKIP_FLAG;
     p_sys->pp_input = malloc( p_sys->i_urls * sizeof( input_thread_t * ) );
     for( i = 0; i < p_sys->i_urls; i++ )
     {
+        input_item_t *p_input;
         asprintf( &psz_buf, "%s", p_sys->ppsz_urls[i] );
-        p_item = playlist_ItemNew( p_playlist, psz_buf,
-                                         p_sys->ppsz_urls[i] );
+        p_input = input_ItemNewExt( p_playlist, psz_buf,
+                                    p_sys->ppsz_urls[i], 0, NULL, -1 );
+        vlc_input_item_AddOption( p_input, "demux=podcast" );
+        p_item = playlist_NodeAddInput( p_playlist, p_input, p_sys->p_node_cat,
+                                        PLAYLIST_APPEND, PLAYLIST_END );
+        p_item = playlist_NodeAddInput( p_playlist, p_input, p_sys->p_node_one,
+                                        PLAYLIST_APPEND, PLAYLIST_END );
         free( psz_buf );
-        playlist_ItemAddOption( p_item, "demux=podcast" );
-        playlist_NodeAddItem( p_playlist, p_item,
-                              p_sys->p_node->pp_parents[0]->i_view,
-                              p_sys->p_node, PLAYLIST_APPEND,
-                              PLAYLIST_END );
-
-        /* We need to declare the parents of the node as the same of the
-         * parent's ones */
-        playlist_CopyParents( p_sys->p_node, p_item );
-        p_sys->pp_input[i] = input_CreateThread( p_playlist, &p_item->input );
+        p_sys->pp_input[i] = input_CreateThread( p_playlist, p_input );
     }
 
-    p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
     val.b_bool = VLC_TRUE;
     var_Set( p_playlist, "intf-change", val );
 
@@ -205,7 +209,8 @@ static void Close( vlc_object_t *p_this )
     free( p_sd->p_sys->pp_input );
     if( p_playlist )
     {
-        playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE, VLC_TRUE );
+        playlist_NodeDelete( p_playlist, p_sys->p_node_cat, VLC_TRUE, VLC_TRUE );
+        playlist_NodeDelete( p_playlist, p_sys->p_node_one, VLC_TRUE, VLC_TRUE );
         vlc_object_release( p_playlist );
     }
     for( i = 0; i < p_sys->i_urls; i++ ) free( p_sys->ppsz_urls[i] );