diff options
Diffstat (limited to 'apps/playlist_viewer.c')
-rw-r--r-- | apps/playlist_viewer.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 8670f0ad46..96614d1c9a 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -108,15 +108,15 @@ static struct playlist_viewer viewer; | |||
108 | /* Used when viewing playlists on disk */ | 108 | /* Used when viewing playlists on disk */ |
109 | static struct playlist_info temp_playlist; | 109 | static struct playlist_info temp_playlist; |
110 | 110 | ||
111 | void playlist_buffer_init(struct playlist_buffer * pb, char * names_buffer, | 111 | static void playlist_buffer_init(struct playlist_buffer *pb, char *names_buffer, |
112 | int names_buffer_size); | 112 | int names_buffer_size); |
113 | void playlist_buffer_load_entries(struct playlist_buffer * pb, int index, | 113 | static void playlist_buffer_load_entries(struct playlist_buffer * pb, int index, |
114 | enum direction direction); | 114 | enum direction direction); |
115 | int playlist_entry_load(struct playlist_entry *entry, int index, | 115 | static int playlist_entry_load(struct playlist_entry *entry, int index, |
116 | char* name_buffer, int remaining_size); | 116 | char* name_buffer, int remaining_size); |
117 | 117 | ||
118 | struct playlist_entry * playlist_buffer_get_track(struct playlist_buffer * pb, | 118 | static struct playlist_entry * playlist_buffer_get_track(struct playlist_buffer *pb, |
119 | int index); | 119 | int index); |
120 | 120 | ||
121 | static bool playlist_viewer_init(struct playlist_viewer * viewer, | 121 | static bool playlist_viewer_init(struct playlist_viewer * viewer, |
122 | char* filename, bool reload); | 122 | char* filename, bool reload); |
@@ -133,8 +133,8 @@ static bool show_indices(void); | |||
133 | static bool track_display(void); | 133 | static bool track_display(void); |
134 | static bool save_playlist(void); | 134 | static bool save_playlist(void); |
135 | 135 | ||
136 | void playlist_buffer_init(struct playlist_buffer * pb, char * names_buffer, | 136 | static void playlist_buffer_init(struct playlist_buffer *pb, char *names_buffer, |
137 | int names_buffer_size) | 137 | int names_buffer_size) |
138 | { | 138 | { |
139 | pb->name_buffer=names_buffer; | 139 | pb->name_buffer=names_buffer; |
140 | pb->buffer_size=names_buffer_size; | 140 | pb->buffer_size=names_buffer_size; |
@@ -145,8 +145,8 @@ void playlist_buffer_init(struct playlist_buffer * pb, char * names_buffer, | |||
145 | /* | 145 | /* |
146 | * Loads the entries following 'index' in the playlist buffer | 146 | * Loads the entries following 'index' in the playlist buffer |
147 | */ | 147 | */ |
148 | void playlist_buffer_load_entries(struct playlist_buffer * pb, int index, | 148 | static void playlist_buffer_load_entries(struct playlist_buffer *pb, int index, |
149 | enum direction direction) | 149 | enum direction direction) |
150 | { | 150 | { |
151 | int num_entries = viewer.num_tracks; | 151 | int num_entries = viewer.num_tracks; |
152 | char* p = pb->name_buffer; | 152 | char* p = pb->name_buffer; |
@@ -181,8 +181,8 @@ void playlist_buffer_load_entries(struct playlist_buffer * pb, int index, | |||
181 | pb->num_loaded = i; | 181 | pb->num_loaded = i; |
182 | } | 182 | } |
183 | 183 | ||
184 | void playlist_buffer_load_entries_screen(struct playlist_buffer * pb, | 184 | static void playlist_buffer_load_entries_screen(struct playlist_buffer * pb, |
185 | enum direction direction) | 185 | enum direction direction) |
186 | { | 186 | { |
187 | if(direction==FORWARD) | 187 | if(direction==FORWARD) |
188 | { | 188 | { |
@@ -200,8 +200,8 @@ void playlist_buffer_load_entries_screen(struct playlist_buffer * pb, | |||
200 | } | 200 | } |
201 | } | 201 | } |
202 | 202 | ||
203 | int playlist_entry_load(struct playlist_entry *entry, int index, | 203 | static int playlist_entry_load(struct playlist_entry *entry, int index, |
204 | char* name_buffer, int remaining_size) | 204 | char* name_buffer, int remaining_size) |
205 | { | 205 | { |
206 | struct playlist_track_info info; | 206 | struct playlist_track_info info; |
207 | int len; | 207 | int len; |
@@ -229,7 +229,7 @@ int playlist_entry_load(struct playlist_entry *entry, int index, | |||
229 | return -1; | 229 | return -1; |
230 | } | 230 | } |
231 | 231 | ||
232 | int playlist_buffer_get_index(struct playlist_buffer * pb, int index ) | 232 | static int playlist_buffer_get_index(struct playlist_buffer *pb, int index ) |
233 | { | 233 | { |
234 | int buffer_index; | 234 | int buffer_index; |
235 | if(pb->direction==FORWARD) | 235 | if(pb->direction==FORWARD) |
@@ -252,7 +252,7 @@ int playlist_buffer_get_index(struct playlist_buffer * pb, int index ) | |||
252 | 252 | ||
253 | #define distance(a, b) \ | 253 | #define distance(a, b) \ |
254 | a>b? (a) - (b) : (b) - (a) | 254 | a>b? (a) - (b) : (b) - (a) |
255 | bool playlist_buffer_needs_reload(struct playlist_buffer* pb, int track_index) | 255 | static bool playlist_buffer_needs_reload(struct playlist_buffer* pb, int track_index) |
256 | { | 256 | { |
257 | if(pb->num_loaded==viewer.num_tracks) | 257 | if(pb->num_loaded==viewer.num_tracks) |
258 | return(false); | 258 | return(false); |
@@ -267,8 +267,8 @@ bool playlist_buffer_needs_reload(struct playlist_buffer* pb, int track_index) | |||
267 | return(false); | 267 | return(false); |
268 | } | 268 | } |
269 | 269 | ||
270 | struct playlist_entry * playlist_buffer_get_track(struct playlist_buffer * pb, | 270 | static struct playlist_entry * playlist_buffer_get_track(struct playlist_buffer *pb, |
271 | int index) | 271 | int index) |
272 | { | 272 | { |
273 | int buffer_index=playlist_buffer_get_index(pb, index); | 273 | int buffer_index=playlist_buffer_get_index(pb, index); |
274 | return(&(pb->tracks[buffer_index])); | 274 | return(&(pb->tracks[buffer_index])); |
@@ -561,7 +561,7 @@ bool playlist_viewer(void) | |||
561 | return playlist_viewer_ex(NULL); | 561 | return playlist_viewer_ex(NULL); |
562 | } | 562 | } |
563 | 563 | ||
564 | char * playlist_callback_name(int selected_item, void * data, char *buffer) | 564 | static char *playlist_callback_name(int selected_item, void *data, char *buffer) |
565 | { | 565 | { |
566 | struct playlist_viewer * local_viewer = (struct playlist_viewer *)data; | 566 | struct playlist_viewer * local_viewer = (struct playlist_viewer *)data; |
567 | struct playlist_entry *track= | 567 | struct playlist_entry *track= |
@@ -571,7 +571,7 @@ char * playlist_callback_name(int selected_item, void * data, char *buffer) | |||
571 | } | 571 | } |
572 | 572 | ||
573 | 573 | ||
574 | void playlist_callback_icons(int selected_item, void * data, ICON * icon) | 574 | static void playlist_callback_icons(int selected_item, void *data, ICON * icon) |
575 | { | 575 | { |
576 | struct playlist_viewer * local_viewer=(struct playlist_viewer *)data; | 576 | struct playlist_viewer * local_viewer=(struct playlist_viewer *)data; |
577 | struct playlist_entry *track= | 577 | struct playlist_entry *track= |
@@ -780,7 +780,8 @@ exit: | |||
780 | action_signalscreenchange(); | 780 | action_signalscreenchange(); |
781 | return ret; | 781 | return ret; |
782 | } | 782 | } |
783 | char * playlist_search_callback_name(int selected_item, void * data, char *buffer) | 783 | |
784 | static char *playlist_search_callback_name(int selected_item, void * data, char *buffer) | ||
784 | { | 785 | { |
785 | int *found_indicies = (int*)data; | 786 | int *found_indicies = (int*)data; |
786 | static struct playlist_track_info track; | 787 | static struct playlist_track_info track; |
@@ -790,7 +791,7 @@ char * playlist_search_callback_name(int selected_item, void * data, char *buffe | |||
790 | } | 791 | } |
791 | 792 | ||
792 | 793 | ||
793 | void playlist_search_callback_icons(int selected_item, void * data, ICON * icon) | 794 | static void playlist_search_callback_icons(int selected_item, void * data, ICON * icon) |
794 | { | 795 | { |
795 | (void)selected_item; | 796 | (void)selected_item; |
796 | (void)data; | 797 | (void)data; |