* Almost fix shoutcast (still some problems in "flat" view)

* Disable interaction in WX until it's fixed

modules/demux/playlist/pls.c

@@ -99,37 +99,18 @@ void E_(Close_PLS)( vlc_object_t *p_this )
 
 static int Demux( demux_t *p_demux )
 {
-#if 0
     mtime_t        i_duration = -1;
     char          *psz_name = NULL;
     char          *psz_line;
     char          *psz_mrl = NULL;
     char          *psz_key;
     char          *psz_value;
-    playlist_t    *p_playlist;
     int            i_position;
     int            i_item = -1;
     int            i_new_item = 0;
     int            i_key_length;
-    playlist_item_t *p_parent;
-    vlc_bool_t b_play;
 
-    p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
-                                                 FIND_ANYWHERE );
-    if( !p_playlist )
-    {
-        msg_Err( p_demux, "can't find playlist" );
-        return -1;
-    }
-
-    b_play = E_(FindItem)( p_demux, p_playlist, &p_parent );
-    p_parent->input.i_type = ITEM_TYPE_PLAYLIST;
-
-    /* Change the item to a node */
-    if( p_parent->i_children == -1)
-    {
-        playlist_ItemToNode( p_playlist,p_parent );
-    }
+    INIT_PLAYLIST_STUFF;
 
     while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
     {
@@ -186,25 +167,12 @@ static int Demux( demux_t *p_demux )
         {
             if( psz_mrl )
             {
-                playlist_item_t *p_item = playlist_ItemNew( p_playlist, psz_mrl,
-                                                            psz_name );
-
-                playlist_NodeAddItem( p_playlist,p_item,
-                                      p_parent->pp_parents[0]->i_view,
-                                      p_parent,
-                                      PLAYLIST_APPEND, PLAYLIST_END );
-
-                playlist_CopyParents( p_parent, p_item );
-                if( i_duration != -1 )
-                {
-                    //playlist_SetDuration( p_playlist, i_position, i_duration );
-                }
-                i_position++;
-                free( psz_mrl );
-                psz_mrl = NULL;
-
-                vlc_input_item_CopyOptions( &p_parent->input,
-                                            &p_item->input );
+                p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,
+                                            0, NULL, -1 );
+                vlc_input_item_CopyOptions( p_current->p_input, p_input );
+                playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
+                                p_item_in_category, (i_parent_id > 0 ) ?
+                                VLC_TRUE: VLC_FALSE, PLAYLIST_APPEND );
             }
             else
             {
@@ -244,24 +212,13 @@ static int Demux( demux_t *p_demux )
     /* Add last object */
     if( psz_mrl )
     {
-        playlist_item_t *p_item = playlist_ItemNew( p_playlist, psz_mrl,
-                                                    psz_name );
-
-        playlist_NodeAddItem( p_playlist,p_item,
-                              p_parent->pp_parents[0]->i_view,
-                              p_parent,
-                              PLAYLIST_APPEND, PLAYLIST_END );
-
-        playlist_CopyParents( p_parent, p_item );
-        if( i_duration != -1 )
-        {
-            //playlist_SetDuration( p_playlist, i_position, i_duration );
-        }
+        p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,0, NULL, -1 );
+        vlc_input_item_CopyOptions( p_current->p_input, p_input );
+        playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
+                                p_item_in_category, (i_parent_id > 0 ) ?
+                                VLC_TRUE: VLC_FALSE, PLAYLIST_APPEND );
         free( psz_mrl );
         psz_mrl = NULL;
-
-        vlc_input_item_CopyOptions( &p_parent->input,
-                                    &p_item->input );
     }
     else
     {
@@ -273,18 +230,8 @@ static int Demux( demux_t *p_demux )
         psz_name = NULL;
     }
 
-    if( b_play && p_playlist->status.p_item &&
-        p_playlist->status.p_item->i_children > 0 )
-    {
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
-                          p_playlist->status.i_view,
-                          p_playlist->status.p_item,
-                          p_playlist->status.p_item->pp_children[0] );
-    }
-    vlc_object_release( p_playlist );
+    HANDLE_PLAY_AND_RELEASE;
     return VLC_SUCCESS;
-#endif
-    return 0;
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )

modules/gui/wxwidgets/dialogs.cpp

@@ -570,6 +570,8 @@ void DialogsProvider::OnInteraction( wxCommandEvent& event )
     interaction_dialog_t *p_dialog;
     InteractionDialog *p_wxdialog;
 
+    return;
+
     if( p_arg == NULL )
     {
         msg_Dbg( p_intf, "OnInteraction() called with NULL arg" );

src/playlist/item.c

@@ -382,7 +382,8 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
      *  - If we find it
      *    - change it to node
      *    - we'll return it at the end
-     *    - Delete the input from ONELEVEL
+     *    - If we are a direct child of onelevel root, change to node, else
+     *      delete the input from ONELEVEL
      *  - If we don't find it, just change to node (we are probably in VLM)
      *    and return NULL
      *
@@ -397,9 +398,19 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
 
     if( p_item_in_category )
     {
+        playlist_item_t *p_item_in_one = playlist_ItemFindFromInputAndRoot(
+                                            p_playlist, p_item->p_input->i_id,
+                                            p_playlist->p_root_onelevel );
         ChangeToNode( p_playlist, p_item_in_category );
-        playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id,
-                                  p_playlist->p_root_onelevel, VLC_FALSE );
+        if( p_item_in_one->p_parent == p_playlist->p_root_onelevel )
+        {
+            ChangeToNode( p_playlist, p_item_in_one );
+        }
+        else
+        {
+            playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id,
+                                      p_playlist->p_root_onelevel, VLC_FALSE );
+        }
         var_SetInteger( p_playlist, "item-change", p_item->p_input->i_id );
         return p_item_in_category;
     }