summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2008-04-09 21:47:43 +0000
committerNils Wallménius <nils@rockbox.org>2008-04-09 21:47:43 +0000
commit791e0928c5f9d5287a6077a95a385bc6bd90ac1d (patch)
treec660a20e10355da2e9ecd7a1ed344913d442038b
parent183dbbdc9ac524ad027e64f4e7b2499a59eaa8ef (diff)
downloadrockbox-791e0928c5f9d5287a6077a95a385bc6bd90ac1d.tar.gz
rockbox-791e0928c5f9d5287a6077a95a385bc6bd90ac1d.zip
Slight readability improvements
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17056 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playlist_viewer.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 9483dadfab..c9a9f4b7af 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -223,7 +223,7 @@ static int playlist_entry_load(struct playlist_entry *entry, int index,
223 return -1; 223 return -1;
224} 224}
225 225
226static int playlist_buffer_get_index(struct playlist_buffer *pb, int index ) 226static int playlist_buffer_get_index(struct playlist_buffer *pb, int index)
227{ 227{
228 int buffer_index; 228 int buffer_index;
229 if(pb->direction==FORWARD) 229 if(pb->direction==FORWARD)
@@ -246,7 +246,8 @@ static int playlist_buffer_get_index(struct playlist_buffer *pb, int index )
246 246
247#define distance(a, b) \ 247#define distance(a, b) \
248 a>b? (a) - (b) : (b) - (a) 248 a>b? (a) - (b) : (b) - (a)
249static bool playlist_buffer_needs_reload(struct playlist_buffer* pb, int track_index) 249static bool playlist_buffer_needs_reload(struct playlist_buffer* pb,
250 int track_index)
250{ 251{
251 if(pb->num_loaded==viewer.num_tracks) 252 if(pb->num_loaded==viewer.num_tracks)
252 return(false); 253 return(false);
@@ -550,8 +551,13 @@ static char *playlist_callback_name(int selected_item,
550 size_t buffer_len) 551 size_t buffer_len)
551{ 552{
552 struct playlist_viewer * local_viewer = (struct playlist_viewer *)data; 553 struct playlist_viewer * local_viewer = (struct playlist_viewer *)data;
553 struct playlist_entry *track = playlist_buffer_get_track(&(local_viewer->buffer), get_track_num(local_viewer,selected_item)); 554
555 int track_num = get_track_num(local_viewer, selected_item);
556 struct playlist_entry *track =
557 playlist_buffer_get_track(&(local_viewer->buffer), track_num);
558
554 format_line(track, buffer, buffer_len); 559 format_line(track, buffer, buffer_len);
560
555 return(buffer); 561 return(buffer);
556} 562}
557 563
@@ -559,9 +565,11 @@ static char *playlist_callback_name(int selected_item,
559static int playlist_callback_icons(int selected_item, void *data) 565static int playlist_callback_icons(int selected_item, void *data)
560{ 566{
561 struct playlist_viewer * local_viewer=(struct playlist_viewer *)data; 567 struct playlist_viewer * local_viewer=(struct playlist_viewer *)data;
568
569 int track_num = get_track_num(local_viewer, selected_item);
562 struct playlist_entry *track= 570 struct playlist_entry *track=
563 playlist_buffer_get_track(&(local_viewer->buffer), 571 playlist_buffer_get_track(&(local_viewer->buffer), track_num);
564 get_track_num(local_viewer, selected_item)); 572
565 if (track->index == local_viewer->current_playing_track) 573 if (track->index == local_viewer->current_playing_track)
566 { 574 {
567 /* Current playing track */ 575 /* Current playing track */