Fixes

Build the correct files
Updated TODO

Makefile.am

@@ -326,7 +326,7 @@ SOURCES_libvlc_common = \
 	src/playlist/playlist.c \
 	src/playlist/sort.c \
 	src/playlist/loadsave.c \
-	src/playlist/group.c \
+	src/playlist/view.c \
 	src/playlist/item.c \
 	src/playlist/item-ext.c \
 	src/playlist/info.c \

TODO

@@ -109,10 +109,34 @@ Task
 Difficulty: Medium
 Urgency: Normal
 Platform: any
-Description: Tree playlist
+Description: Playlist II
  A hierarchized playlist structure, eventually using a media library.
 Think playlist within playlist, directory structures, SAP section, TV channels list, iTunes library like stuff etc. <a href="http://sierra.via.ecp.fr/~zorglub/vlc/playlist.txt">Thoughts and ideas (not up-to-date)</a><br />
-Mostly finished. will be done after 0.8.0
+50% done.<br />
+Todo:<br />
+- Core support<br />
+   - **  input options inheritance (down nodes)<br />
+   - *** Improve random mode and fix loop<br />
+   - *   "Name finder"<br />
+   - *   "Protocol rollover" node<br />
+   - *** Fix autodeletion<br />
+   - *** Item moving/copying facilities<br />
+- Helper modules<br />
+   - **  ASX and B4S parsers (see below)<br />
+   - *   Rewrite SLP announce discovery<br />
+   - *** Finish new SAP parser (see above)<br />
+   - **  Adapt CDDAX<br />
+   - **  Fix MP4, LIVE.COM<br />
+- *** Implement in MacOS X and Skins 2 interfaces<br />
+- wx implementation :<br />
+   - **  Support item move/copy<br />
+   - *   Explorer view<br />
+   - *** Fix search<br />
+   - *** Play Node vs Play all<br />
+   - **  Clever update using i_serial<br />
+   - *   Playlist preferences panel<br />
+   - **  Improve iteminfo dialog<br />
+   - **  Support item types<br />
 Status: Assigned to zorglub
 
 Task
@@ -515,7 +539,7 @@ Status: Todo
 Task
 Difficulty: Medium
 Platform: any
-Urgency: Normal
+Urgency: Important
 Description: Update matroska demux
  Better Seeking
 Status: Todo

modules/control/http.c

@@ -941,9 +941,6 @@ static mvar_t *mvar_PlaylistSetNew( char *name, playlist_t *p_pl )
 
         mvar_AppendNewVar( itm, "uri", p_pl->pp_items[i]->input.psz_uri );
 
-        sprintf( value, "%d", p_pl->pp_items[i]->i_group );
-        mvar_AppendNewVar( itm, "group", value );
-
         mvar_AppendVar( s, itm );
     }
     vlc_mutex_unlock( &p_pl->object_lock );
@@ -1585,26 +1582,25 @@ static void MacroDo( httpd_file_sys_t *p_args,
 
                     uri_extract_value( p_request, "item", item, 512 );
                     i_item = atoi( item );
-                    playlist_Command( p_sys->p_playlist, PLAYLIST_GOTO, i_item );
+                    playlist_Control( p_sys->p_playlist, PLAYLIST_GOTO,
+                                                         i_item );
                     msg_Dbg( p_intf, "requested playlist item: %i", i_item );
                     break;
                 }
                 case MVLC_STOP:
-                    playlist_Command( p_sys->p_playlist, PLAYLIST_STOP, 0 );
+                    playlist_Control( p_sys->p_playlist, PLAYLIST_STOP);
                     msg_Dbg( p_intf, "requested playlist stop" );
                     break;
                 case MVLC_PAUSE:
-                    playlist_Command( p_sys->p_playlist, PLAYLIST_PAUSE, 0 );
+                    playlist_Control( p_sys->p_playlist, PLAYLIST_PAUSE );
                     msg_Dbg( p_intf, "requested playlist pause" );
                     break;
                 case MVLC_NEXT:
-                    playlist_Command( p_sys->p_playlist, PLAYLIST_GOTO,
-                                      p_sys->p_playlist->i_index + 1 );
+                    playlist_Control( p_sys->p_playlist, PLAYLIST_SKIP, 1 );
                     msg_Dbg( p_intf, "requested playlist next" );
                     break;
                 case MVLC_PREVIOUS:
-                    playlist_Command( p_sys->p_playlist, PLAYLIST_GOTO,
-                                      p_sys->p_playlist->i_index - 1 );
+                    playlist_Control( p_sys->p_playlist, PLAYLIST_SKIP, -1);
                     msg_Dbg( p_intf, "requested playlist next" );
                     break;
                 case MVLC_FULLSCREEN:
@@ -1989,10 +1985,6 @@ static void MacroDo( httpd_file_sys_t *p_args,
                     {
                         playlist_SortTitle( p_sys->p_playlist , i_order );
                         msg_Dbg( p_intf, "requested playlist sort by title (%d)" , i_order );
-                    } else if( !strcmp( type , "group" ) )
-                    {
-                        playlist_SortGroup( p_sys->p_playlist , i_order );
-                        msg_Dbg( p_intf, "requested playlist sort by group (%d)" , i_order );
                     } else if( !strcmp( type , "author" ) )
                     {
                         playlist_SortAuthor( p_sys->p_playlist , i_order );
@@ -2001,7 +1993,7 @@ static void MacroDo( httpd_file_sys_t *p_args,
                     {
                         playlist_Sort( p_sys->p_playlist , SORT_RANDOM, ORDER_NORMAL );
                         msg_Dbg( p_intf, "requested playlist shuffle");
-                    } 
+                    }
 
                     break;
                 }

modules/misc/playlist/m3u.c

@@ -53,9 +53,14 @@ int Export_M3U( vlc_object_t *p_this )
     /* Go through the playlist and add items */
     for( i = 0; i< p_playlist->i_size ; i++)
     {
+        if( p_playlist->pp_items[i]->i_flags & ~PLAYLIST_SAVE_FLAG )
+        {
+            continue;
+        }
+
         /* General info */
         if( p_playlist->pp_items[i]->input.psz_name &&
-	    strcmp( p_playlist->pp_items[i]->input.psz_name,
+             strcmp( p_playlist->pp_items[i]->input.psz_name,
                     p_playlist->pp_items[i]->input.psz_uri ) )
         {
             char *psz_author =