Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commit patch in FS#7967 by Vuong Minh Hiep (with some small changes to variable names for consistency) - separately keep track of viewer-index and playlist-index of moving tracks, so that viewer correctly shows which track is moving when playlist is shuffled, and correctly moves the track you tell it to

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21616 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Hooper 2009-07-02 23:03:46 +00:00
parent 4044499198
commit 119252177c
1 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
apps/playlist_viewer.c
View file

@ -95,7 +95,10 @@ struct playlist_viewer {
int num_tracks; /* Number of tracks in playlist */ int num_tracks; /* Number of tracks in playlist */
int current_playing_track; /* Index of current playing track */ int current_playing_track; /* Index of current playing track */
int selected_track; /* The selected track, relative (first is 0) */ int selected_track; /* The selected track, relative (first is 0) */
int move_track; /* Playlist index of track to move or -1 */ int moving_track; /* The track to move, relative (first is 0)
or -1 if nothing is currently being moved */
int moving_playlist_index; /* Playlist-relative index (as opposed to
viewer-relative index) of moving track */
struct playlist_buffer buffer; struct playlist_buffer buffer;
}; };
@ -344,7 +347,7 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
} }
playlist_buffer_init(&viewer->buffer, buffer, buffer_size ); playlist_buffer_init(&viewer->buffer, buffer, buffer_size );
viewer->move_track = -1; viewer->moving_track = -1;
if (!reload) if (!reload)
{ {
@ -455,7 +458,7 @@ static int onplay_menu(int index)
else if (result >= 0) else if (result >= 0)
{ {
/* Abort current move */ /* Abort current move */
viewer.move_track = -1; viewer.moving_track = -1;
switch (result) switch (result)
{ {
@ -487,7 +490,8 @@ static int onplay_menu(int index)
break; break;
case 1: case 1:
/* move track */ /* move track */
viewer.move_track = current_track->index; viewer.moving_track = index;
viewer.moving_playlist_index = current_track->index;
ret = 0; ret = 0;
break; break;
case 2: /* add to catalog */ case 2: /* add to catalog */
@ -533,21 +537,21 @@ bool playlist_viewer(void)
static int get_track_num( struct playlist_viewer * local_viewer, static int get_track_num( struct playlist_viewer * local_viewer,
int selected_item ) int selected_item )
{ {
if( local_viewer->move_track >= 0 ) if( local_viewer->moving_track >= 0 )
{ {
if( local_viewer->selected_track == selected_item ) if( local_viewer->selected_track == selected_item )
{ {
return local_viewer->move_track; return local_viewer->moving_track;
} }
else if( local_viewer->selected_track > selected_item else if( local_viewer->selected_track > selected_item
&& selected_item >= local_viewer->move_track ) && selected_item >= local_viewer->moving_track )
{ {
return selected_item+1; return selected_item+1; /* move down */
} }
else if( local_viewer->selected_track < selected_item else if( local_viewer->selected_track < selected_item
&& selected_item <= local_viewer->move_track ) && selected_item <= local_viewer->moving_track )
{ {
return selected_item-1; return selected_item-1; /* move up */
} }
} }
return selected_item; return selected_item;
@ -583,7 +587,7 @@ static int playlist_callback_icons(int selected_item, void *data)
/* Current playing track */ /* Current playing track */
return Icon_Audio; return Icon_Audio;
} }
else if (track->index == local_viewer->move_track) else if (track->index == local_viewer->moving_playlist_index)
{ {
/* Track we are moving */ /* Track we are moving */
return Icon_Moving; return Icon_Moving;
@ -637,7 +641,7 @@ bool playlist_viewer_ex(const char* filename)
viewer.current_playing_track = track; viewer.current_playing_track = track;
gui_synclist_set_nb_items(&playlist_lists, viewer.num_tracks); gui_synclist_set_nb_items(&playlist_lists, viewer.num_tracks);
/* Abort move on playlist change */ /* Abort move on playlist change */
viewer.move_track = -1; viewer.moving_track = -1;
gui_synclist_draw(&playlist_lists); gui_synclist_draw(&playlist_lists);
} }
@ -661,11 +665,11 @@ bool playlist_viewer_ex(const char* filename)
case ACTION_TREE_WPS: case ACTION_TREE_WPS:
case ACTION_STD_CANCEL: case ACTION_STD_CANCEL:
{ {
if (viewer.move_track >= 0) if (viewer.moving_track >= 0)
{ {
viewer.selected_track = viewer.move_track; viewer.selected_track = viewer.moving_track;
gui_synclist_select_item(&playlist_lists, viewer.move_track); gui_synclist_select_item(&playlist_lists, viewer.moving_track);
viewer.move_track = -1; viewer.moving_track = -1;
gui_synclist_draw(&playlist_lists); gui_synclist_draw(&playlist_lists);
} }
else else
@ -677,18 +681,19 @@ bool playlist_viewer_ex(const char* filename)
struct playlist_entry * current_track = struct playlist_entry * current_track =
playlist_buffer_get_track(&viewer.buffer, playlist_buffer_get_track(&viewer.buffer,
viewer.selected_track); viewer.selected_track);
if (viewer.move_track >= 0) if (viewer.moving_track >= 0)
{ {
/* Move track */ /* Move track */
int ret_val; int ret_val;
ret_val = playlist_move(viewer.playlist, viewer.move_track, ret_val = playlist_move(viewer.playlist,
viewer.moving_playlist_index,
current_track->index); current_track->index);
if (ret_val < 0) if (ret_val < 0)
splashf(HZ, (unsigned char *)"%s %s", str(LANG_MOVE), splashf(HZ, (unsigned char *)"%s %s", str(LANG_MOVE),
str(LANG_FAILED)); str(LANG_FAILED));
update_playlist(true); update_playlist(true);
viewer.move_track = -1; viewer.moving_track = -1;
} }
else if (!viewer.playlist) else if (!viewer.playlist)
{ {