summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Bavin <pondlife@pondlife.me>2010-05-07 16:35:37 +0000
committerSteve Bavin <pondlife@pondlife.me>2010-05-07 16:35:37 +0000
commitb08222caec009f504ae4ab0b9c0355597b612377 (patch)
tree80b2d2e0f0082d1bbf66ea8337fe146a2765b8ef
parentfeecb7d4beed9dc58a82201acd692631cdf6d0b3 (diff)
downloadrockbox-b08222caec009f504ae4ab0b9c0355597b612377.tar.gz
rockbox-b08222caec009f504ae4ab0b9c0355597b612377.zip
Minor const police raid.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25879 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_display.c2
-rw-r--r--apps/mpeg.c8
-rw-r--r--apps/playlist.c2
-rw-r--r--apps/playlist.h2
-rw-r--r--apps/tree.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index d3169be43a..9316294aad 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -199,7 +199,7 @@ static void draw_playlist_viewer_list(struct gui_wps *gwps,
199 199
200 struct mp3entry *pid3; 200 struct mp3entry *pid3;
201 char buf[MAX_PATH*2], tempbuf[MAX_PATH]; 201 char buf[MAX_PATH*2], tempbuf[MAX_PATH];
202 char *filename; 202 const char *filename;
203 203
204 gwps->display->set_viewport(viewer->vp); 204 gwps->display->set_viewport(viewer->vp);
205 for(i=start_item; (i-start_item)<lines && i<=playlist_amount(); i++) 205 for(i=start_item; (i-start_item)<lines && i<=playlist_amount(); i++)
diff --git a/apps/mpeg.c b/apps/mpeg.c
index 7917015a9b..1ff46b049e 100644
--- a/apps/mpeg.c
+++ b/apps/mpeg.c
@@ -87,7 +87,7 @@ extern enum /* from mp3_playback.c */
87} mpeg_mode; 87} mpeg_mode;
88#endif /* CONFIG_CODEC == MAS3587F */ 88#endif /* CONFIG_CODEC == MAS3587F */
89 89
90extern char* playlist_peek(int steps); 90extern const char* playlist_peek(int steps);
91extern bool playlist_check(int steps); 91extern bool playlist_check(int steps);
92extern int playlist_next(int steps); 92extern int playlist_next(int steps);
93extern int playlist_amount(void); 93extern int playlist_amount(void);
@@ -929,7 +929,7 @@ static int new_file(int steps)
929 } 929 }
930 930
931 do { 931 do {
932 char *trackname; 932 const char *trackname;
933 933
934 trackname = playlist_peek( start + steps ); 934 trackname = playlist_peek( start + steps );
935 if ( !trackname ) 935 if ( !trackname )
@@ -2741,7 +2741,7 @@ void audio_next(void)
2741 queue_remove_from_head(&mpeg_queue, MPEG_NEED_DATA); 2741 queue_remove_from_head(&mpeg_queue, MPEG_NEED_DATA);
2742 queue_post(&mpeg_queue, MPEG_NEXT, 0); 2742 queue_post(&mpeg_queue, MPEG_NEXT, 0);
2743#else /* SIMULATOR */ 2743#else /* SIMULATOR */
2744 char* file; 2744 const char* file;
2745 int steps = 1; 2745 int steps = 1;
2746 int index; 2746 int index;
2747 2747
@@ -2770,7 +2770,7 @@ void audio_prev(void)
2770 queue_remove_from_head(&mpeg_queue, MPEG_NEED_DATA); 2770 queue_remove_from_head(&mpeg_queue, MPEG_NEED_DATA);
2771 queue_post(&mpeg_queue, MPEG_PREV, 0); 2771 queue_post(&mpeg_queue, MPEG_PREV, 0);
2772#else /* SIMULATOR */ 2772#else /* SIMULATOR */
2773 char* file; 2773 const char* file;
2774 int steps = -1; 2774 int steps = -1;
2775 int index; 2775 int index;
2776 2776
diff --git a/apps/playlist.c b/apps/playlist.c
index 21e1eed083..485601cd7e 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -2450,7 +2450,7 @@ bool playlist_check(int steps)
2450 2450
2451/* get trackname of track that is "steps" away from current playing track. 2451/* get trackname of track that is "steps" away from current playing track.
2452 NULL is used to identify end of playlist */ 2452 NULL is used to identify end of playlist */
2453char* playlist_peek(int steps) 2453const char* playlist_peek(int steps)
2454{ 2454{
2455 struct playlist_info* playlist = &current_playlist; 2455 struct playlist_info* playlist = &current_playlist;
2456 int seek; 2456 int seek;
diff --git a/apps/playlist.h b/apps/playlist.h
index 331d2f9f2a..3ff32c7682 100644
--- a/apps/playlist.h
+++ b/apps/playlist.h
@@ -127,7 +127,7 @@ int playlist_add(const char *filename);
127int playlist_shuffle(int random_seed, int start_index); 127int playlist_shuffle(int random_seed, int start_index);
128void playlist_start(int start_index, int offset); 128void playlist_start(int start_index, int offset);
129bool playlist_check(int steps); 129bool playlist_check(int steps);
130char *playlist_peek(int steps); 130const char *playlist_peek(int steps);
131int playlist_next(int steps); 131int playlist_next(int steps);
132bool playlist_next_dir(int direction); 132bool playlist_next_dir(int direction);
133int playlist_get_resume_info(int *resume_index); 133int playlist_get_resume_info(int *resume_index);
diff --git a/apps/tree.c b/apps/tree.c
index 8fbc793bda..204ebb9ff5 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -1068,7 +1068,7 @@ bool bookmark_play(char *resume_file, int index, int offset, int seed,
1068 lastdir[0]='\0'; 1068 lastdir[0]='\0';
1069 if (playlist_create(resume_file, NULL) != -1) 1069 if (playlist_create(resume_file, NULL) != -1)
1070 { 1070 {
1071 char* peek_filename; 1071 const char* peek_filename;
1072 resume_directory(resume_file); 1072 resume_directory(resume_file);
1073 if (global_settings.playlist_shuffle) 1073 if (global_settings.playlist_shuffle)
1074 playlist_shuffle(seed, -1); 1074 playlist_shuffle(seed, -1);