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

If follow playlist is enabled, the playlist viewer should start at the current playing track. Minor code cleanup.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7997 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Hardeep Sidhu 2005-11-19 18:19:46 +00:00
parent 0afd9716a4
commit 3074394d24
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/playlist_viewer.c
View file

@ -102,7 +102,7 @@ struct playlist_viewer {
static struct playlist_viewer viewer; static struct playlist_viewer viewer;
/* Used when viewing playlists on disk */ /* Used when viewing playlists on disk */
static struct playlist_info temp_playlist; static struct playlist_info temp_playlist;
void playlist_buffer_init(struct playlist_buffer * pb, char * names_buffer, void playlist_buffer_init(struct playlist_buffer * pb, char * names_buffer,
int names_buffer_size); int names_buffer_size);
@ -118,7 +118,8 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
char* filename, bool reload); char* filename, bool reload);
static void format_name(char* dest, const char* src); static void format_name(char* dest, const char* src);
static void format_line(const struct playlist_entry* track, char* str, int len); static void format_line(const struct playlist_entry* track, char* str,
int len);
static bool update_playlist(bool force); static bool update_playlist(bool force);
static int onplay_menu(int index); static int onplay_menu(int index);
@ -136,6 +137,7 @@ void playlist_buffer_init(struct playlist_buffer * pb, char * names_buffer,
pb->first_index=0; pb->first_index=0;
pb->num_loaded=0; pb->num_loaded=0;
} }
/* /*
* Loads the entries following 'index' in the playlist buffer * Loads the entries following 'index' in the playlist buffer
*/ */
@ -245,7 +247,7 @@ int playlist_buffer_get_index(struct playlist_buffer * pb, int index )
#define distance(a, b) \ #define distance(a, b) \
a>b? (a) - (b) : (b) - (a) a>b? (a) - (b) : (b) - (a)
bool playlist_buffer_needs_reload(struct playlist_buffer * pb, int track_index) bool playlist_buffer_needs_reload(struct playlist_buffer* pb, int track_index)
{ {
if(pb->num_loaded==viewer.num_tracks) if(pb->num_loaded==viewer.num_tracks)
return(false); return(false);
@ -331,7 +333,12 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
viewer->move_track = -1; viewer->move_track = -1;
if (!reload) if (!reload)
viewer->selected_track = 0; {
if (global_settings.browse_current && !viewer->playlist)
viewer->selected_track = playlist_get_display_index() - 1;
else
viewer->selected_track = 0;
}
if (!update_playlist(true)) if (!update_playlist(true))
return false; return false;
@ -369,7 +376,8 @@ static void format_name(char* dest, const char* src)
} }
/* Format display line */ /* Format display line */
static void format_line(const struct playlist_entry* track, char* str, int len) static void format_line(const struct playlist_entry* track, char* str,
int len)
{ {
char name[MAX_PATH]; char name[MAX_PATH];
char *skipped = ""; char *skipped = "";
@ -552,9 +560,6 @@ bool playlist_viewer(void)
return playlist_viewer_ex(NULL); return playlist_viewer_ex(NULL);
} }
char * playlist_callback_name(int selected_item, void * data, char *buffer) char * playlist_callback_name(int selected_item, void * data, char *buffer)
{ {
struct playlist_viewer * local_viewer = (struct playlist_viewer *)data; struct playlist_viewer * local_viewer = (struct playlist_viewer *)data;
@ -605,8 +610,6 @@ void playlist_callback_icons(int selected_item, void * data, ICON * icon)
#endif #endif
} }
/* Main viewer function. Filename identifies playlist to be viewed. If NULL, /* Main viewer function. Filename identifies playlist to be viewed. If NULL,
view current playlist. */ view current playlist. */
bool playlist_viewer_ex(char* filename) bool playlist_viewer_ex(char* filename)
@ -620,7 +623,8 @@ bool playlist_viewer_ex(char* filename)
gui_synclist_init(&playlist_lists, playlist_callback_name, &viewer); gui_synclist_init(&playlist_lists, playlist_callback_name, &viewer);
gui_synclist_set_icon_callback(&playlist_lists, gui_synclist_set_icon_callback(&playlist_lists,
global_settings.playlist_viewer_icons?&playlist_callback_icons:NULL); global_settings.playlist_viewer_icons?
&playlist_callback_icons:NULL);
gui_synclist_set_nb_items(&playlist_lists, viewer.num_tracks); gui_synclist_set_nb_items(&playlist_lists, viewer.num_tracks);
gui_synclist_select_item(&playlist_lists, viewer.selected_track); gui_synclist_select_item(&playlist_lists, viewer.selected_track);
gui_synclist_draw(&playlist_lists); gui_synclist_draw(&playlist_lists);
@ -663,7 +667,8 @@ bool playlist_viewer_ex(char* filename)
if( (list_action=gui_synclist_do_button(&playlist_lists, button))!=0 ) if( (list_action=gui_synclist_do_button(&playlist_lists, button))!=0 )
{ {
viewer.selected_track=gui_synclist_get_sel_pos(&playlist_lists); viewer.selected_track=gui_synclist_get_sel_pos(&playlist_lists);
if(playlist_buffer_needs_reload(&viewer.buffer, viewer.selected_track)) if(playlist_buffer_needs_reload(&viewer.buffer,
viewer.selected_track))
playlist_buffer_load_entries_screen(&viewer.buffer, playlist_buffer_load_entries_screen(&viewer.buffer,
list_action==LIST_NEXT? list_action==LIST_NEXT?
FORWARD FORWARD
@ -700,13 +705,16 @@ bool playlist_viewer_ex(char* filename)
&& (lastbutton != TREE_RUN_PRE))) && (lastbutton != TREE_RUN_PRE)))
break; break;
#endif #endif
struct playlist_entry * current_track=playlist_buffer_get_track(&viewer.buffer, viewer.selected_track); struct playlist_entry * current_track =
playlist_buffer_get_track(&viewer.buffer,
viewer.selected_track);
if (viewer.move_track >= 0) if (viewer.move_track >= 0)
{ {
/* Move track */ /* Move track */
int ret; int ret;
ret = playlist_move(viewer.playlist, viewer.move_track, current_track->index); ret = playlist_move(viewer.playlist, viewer.move_track,
current_track->index);
if (ret < 0) if (ret < 0)
gui_syncsplash(HZ, true, str(LANG_MOVE_FAILED)); gui_syncsplash(HZ, true, str(LANG_MOVE_FAILED));