Commit d8751888 authored by Clément Stenac's avatar Clément Stenac

Fixes

Build the correct files
Updated TODO
parent 38184c2e
...@@ -326,7 +326,7 @@ SOURCES_libvlc_common = \ ...@@ -326,7 +326,7 @@ SOURCES_libvlc_common = \
src/playlist/playlist.c \ src/playlist/playlist.c \
src/playlist/sort.c \ src/playlist/sort.c \
src/playlist/loadsave.c \ src/playlist/loadsave.c \
src/playlist/group.c \ src/playlist/view.c \
src/playlist/item.c \ src/playlist/item.c \
src/playlist/item-ext.c \ src/playlist/item-ext.c \
src/playlist/info.c \ src/playlist/info.c \
......
...@@ -109,10 +109,34 @@ Task ...@@ -109,10 +109,34 @@ Task
Difficulty: Medium Difficulty: Medium
Urgency: Normal Urgency: Normal
Platform: any Platform: any
Description: Tree playlist Description: Playlist II
A hierarchized playlist structure, eventually using a media library. 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 /> 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 Status: Assigned to zorglub
Task Task
...@@ -515,7 +539,7 @@ Status: Todo ...@@ -515,7 +539,7 @@ Status: Todo
Task Task
Difficulty: Medium Difficulty: Medium
Platform: any Platform: any
Urgency: Normal Urgency: Important
Description: Update matroska demux Description: Update matroska demux
Better Seeking Better Seeking
Status: Todo Status: Todo
......
...@@ -941,9 +941,6 @@ static mvar_t *mvar_PlaylistSetNew( char *name, playlist_t *p_pl ) ...@@ -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 ); 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 ); mvar_AppendVar( s, itm );
} }
vlc_mutex_unlock( &p_pl->object_lock ); vlc_mutex_unlock( &p_pl->object_lock );
...@@ -1585,26 +1582,25 @@ static void MacroDo( httpd_file_sys_t *p_args, ...@@ -1585,26 +1582,25 @@ static void MacroDo( httpd_file_sys_t *p_args,
uri_extract_value( p_request, "item", item, 512 ); uri_extract_value( p_request, "item", item, 512 );
i_item = atoi( item ); 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 ); msg_Dbg( p_intf, "requested playlist item: %i", i_item );
break; break;
} }
case MVLC_STOP: 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" ); msg_Dbg( p_intf, "requested playlist stop" );
break; break;
case MVLC_PAUSE: 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" ); msg_Dbg( p_intf, "requested playlist pause" );
break; break;
case MVLC_NEXT: case MVLC_NEXT:
playlist_Command( p_sys->p_playlist, PLAYLIST_GOTO, playlist_Control( p_sys->p_playlist, PLAYLIST_SKIP, 1 );
p_sys->p_playlist->i_index + 1 );
msg_Dbg( p_intf, "requested playlist next" ); msg_Dbg( p_intf, "requested playlist next" );
break; break;
case MVLC_PREVIOUS: case MVLC_PREVIOUS:
playlist_Command( p_sys->p_playlist, PLAYLIST_GOTO, playlist_Control( p_sys->p_playlist, PLAYLIST_SKIP, -1);
p_sys->p_playlist->i_index - 1 );
msg_Dbg( p_intf, "requested playlist next" ); msg_Dbg( p_intf, "requested playlist next" );
break; break;
case MVLC_FULLSCREEN: case MVLC_FULLSCREEN:
...@@ -1989,10 +1985,6 @@ static void MacroDo( httpd_file_sys_t *p_args, ...@@ -1989,10 +1985,6 @@ static void MacroDo( httpd_file_sys_t *p_args,
{ {
playlist_SortTitle( p_sys->p_playlist , i_order ); playlist_SortTitle( p_sys->p_playlist , i_order );
msg_Dbg( p_intf, "requested playlist sort by title (%d)" , 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" ) ) } else if( !strcmp( type , "author" ) )
{ {
playlist_SortAuthor( p_sys->p_playlist , i_order ); playlist_SortAuthor( p_sys->p_playlist , i_order );
......
...@@ -53,6 +53,11 @@ int Export_M3U( vlc_object_t *p_this ) ...@@ -53,6 +53,11 @@ int Export_M3U( vlc_object_t *p_this )
/* Go through the playlist and add items */ /* Go through the playlist and add items */
for( i = 0; i< p_playlist->i_size ; i++) for( i = 0; i< p_playlist->i_size ; i++)
{ {
if( p_playlist->pp_items[i]->i_flags & ~PLAYLIST_SAVE_FLAG )
{
continue;
}
/* General info */ /* General info */
if( p_playlist->pp_items[i]->input.psz_name && 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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment