Fixes

Build the correct files
Updated TODO

diff --git a/Makefile.am b/Makefile.am
index 2de941216b6f094e10c12f73127888867d6bb98e..85c1f67e5b157d31b066555511590eaba39b8244 100644 (file)
--- a/Makefile.am
+++ b/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 \

diff --git a/TODO b/TODO
index 2a4fb5aa7819ccccd580fddc7d191f786dfa795d..c135cd59982035d519867f0e9cf73dfe1a467180 100644 (file)
--- a/TODO
+++ b/TODO
@@ -109,10 +109,34 @@ Task
 Difficulty: Medium\r
 Urgency: Normal\r
 Platform: any\r
-Description: Tree playlist\r
+Description: Playlist II\r
  A hierarchized playlist structure, eventually using a media library.\r
 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 />\r
-Mostly finished. will be done after 0.8.0\r
+50% done.<br />\r
+Todo:<br />\r
+- Core support<br />\r
+   - **  input options inheritance (down nodes)<br />\r
+   - *** Improve random mode and fix loop<br />\r
+   - *   "Name finder"<br />\r
+   - *   "Protocol rollover" node<br />\r
+   - *** Fix autodeletion<br />\r
+   - *** Item moving/copying facilities<br />\r
+- Helper modules<br />\r
+   - **  ASX and B4S parsers (see below)<br />\r
+   - *   Rewrite SLP announce discovery<br />\r
+   - *** Finish new SAP parser (see above)<br />\r
+   - **  Adapt CDDAX<br />\r
+   - **  Fix MP4, LIVE.COM<br />\r
+- *** Implement in MacOS X and Skins 2 interfaces<br />\r
+- wx implementation :<br />\r
+   - **  Support item move/copy<br />\r
+   - *   Explorer view<br />\r
+   - *** Fix search<br />\r
+   - *** Play Node vs Play all<br />\r
+   - **  Clever update using i_serial<br />\r
+   - *   Playlist preferences panel<br />\r
+   - **  Improve iteminfo dialog<br />\r
+   - **  Support item types<br />\r
 Status: Assigned to zorglub\r
 \r
 Task\r
@@ -515,7 +539,7 @@ Status: Todo
 Task\r
 Difficulty: Medium\r
 Platform: any\r
-Urgency: Normal\r
+Urgency: Important\r
 Description: Update matroska demux\r
  Better Seeking\r
 Status: Todo\r

diff --git a/modules/control/http.c b/modules/control/http.c
index 0e8b7541696d296eaf85f1cbcdba92d1d7728d37..149a8f9cdb1dbdc4b4c86d75d1bc6c4ccde31ea9 100644 (file)
--- a/modules/control/http.c
+++ b/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;
                 }

diff --git a/modules/misc/playlist/m3u.c b/modules/misc/playlist/m3u.c
index 67a266eb2682be80f3c05698e8da108a9f689936..d3d2e7becb9892a57a932ca7a6ae3abf528f5219 100644 (file)
--- a/modules/misc/playlist/m3u.c
+++ b/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 =