Remove useless debug, fix a bug

modules/demux/playlist/m3u.c

@@ -172,7 +172,6 @@ static int Demux( demux_t *p_demux )
             if ( psz_artist && *psz_artist )
                 vlc_input_item_AddInfo( p_input, _(VLC_META_INFO_CAT),
                                         _(VLC_META_ARTIST), "%s", psz_artist );
-            msg_Dbg( p_demux, "Adding %s\n", p_input->psz_uri );
             playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
                  p_item_in_category, (i_parent_id > 0 )? VLC_TRUE : VLC_FALSE,
                  PLAYLIST_APPEND );

modules/demux/playlist/playlist.h

@@ -87,7 +87,7 @@ void E_(Close_GVP) ( vlc_object_t * );
     { \
         b_play = E_(FindItem)( p_demux, p_playlist, &p_current ); \
         p_item_in_category = playlist_ItemToNode( p_playlist, p_current ); \
-        p_current->p_input->i_type = ITEM_TYPE_PLAYLIST;        \
+        p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST;        \
     }
 
 #define HANDLE_PLAY_AND_RELEASE \

modules/demux/playlist/xspf.c

@@ -553,7 +553,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
                     }
                     if( p_handler->pf_handler.smpl )
                     {
-                        p_handler->pf_handler.smpl( NULL, p_input,
+                        p_handler->pf_handler.smpl( NULL, p_new_input,
                                                     p_handler->name,
                                                     psz_value );
                         FREE_ATT();
@@ -585,6 +585,7 @@ static vlc_bool_t set_item_info SIMPLE_INTERFACE
     if( !psz_name || !psz_value || !p_input )
         return VLC_FALSE;
 
+
     /* re-convert xml special characters inside psz_value */
     resolve_xml_special_chars( psz_value );
 
@@ -661,11 +662,6 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
         msg_Warn( p_demux, "<node> requires \"title\" attribute" );
         return VLC_FALSE;
     }
-
-    if( !strcmp( psz_element, "node" ) )
-    {
-        fprintf( stderr, "  node: %s\n", psz_title );
-    }
     if( psz_title ) free( psz_title );
 
     /* parse the child elements */
@@ -740,7 +736,6 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
                 /* leave if the current parent node is terminated */
                 if( !strcmp( psz_name, psz_element ) )
                 {
-                    fprintf( stderr, "  </node>\n" );
                     FREE_ATT();
                     return VLC_TRUE;
                 }
@@ -818,9 +813,6 @@ static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE
         msg_Warn( p_demux, "invalid \"href\" attribute" );
         return VLC_FALSE;
     }
-
-    fprintf( stderr, "    %s\n", p_demux->p_sys->pp_tracklist[i_href]->psz_name );
-
     return VLC_TRUE;
 }