1
0
Fork 0
forked from len0rd/rockbox

Minor const police raid.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25879 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Steve Bavin 2010-05-07 16:35:37 +00:00
parent feecb7d4be
commit b08222caec
5 changed files with 8 additions and 8 deletions

View file

@ -199,7 +199,7 @@ static void draw_playlist_viewer_list(struct gui_wps *gwps,
struct mp3entry *pid3; struct mp3entry *pid3;
char buf[MAX_PATH*2], tempbuf[MAX_PATH]; char buf[MAX_PATH*2], tempbuf[MAX_PATH];
char *filename; const char *filename;
gwps->display->set_viewport(viewer->vp); gwps->display->set_viewport(viewer->vp);
for(i=start_item; (i-start_item)<lines && i<=playlist_amount(); i++) for(i=start_item; (i-start_item)<lines && i<=playlist_amount(); i++)

View file

@ -87,7 +87,7 @@ extern enum /* from mp3_playback.c */
} mpeg_mode; } mpeg_mode;
#endif /* CONFIG_CODEC == MAS3587F */ #endif /* CONFIG_CODEC == MAS3587F */
extern char* playlist_peek(int steps); extern const char* playlist_peek(int steps);
extern bool playlist_check(int steps); extern bool playlist_check(int steps);
extern int playlist_next(int steps); extern int playlist_next(int steps);
extern int playlist_amount(void); extern int playlist_amount(void);
@ -929,7 +929,7 @@ static int new_file(int steps)
} }
do { do {
char *trackname; const char *trackname;
trackname = playlist_peek( start + steps ); trackname = playlist_peek( start + steps );
if ( !trackname ) if ( !trackname )
@ -2741,7 +2741,7 @@ void audio_next(void)
queue_remove_from_head(&mpeg_queue, MPEG_NEED_DATA); queue_remove_from_head(&mpeg_queue, MPEG_NEED_DATA);
queue_post(&mpeg_queue, MPEG_NEXT, 0); queue_post(&mpeg_queue, MPEG_NEXT, 0);
#else /* SIMULATOR */ #else /* SIMULATOR */
char* file; const char* file;
int steps = 1; int steps = 1;
int index; int index;
@ -2770,7 +2770,7 @@ void audio_prev(void)
queue_remove_from_head(&mpeg_queue, MPEG_NEED_DATA); queue_remove_from_head(&mpeg_queue, MPEG_NEED_DATA);
queue_post(&mpeg_queue, MPEG_PREV, 0); queue_post(&mpeg_queue, MPEG_PREV, 0);
#else /* SIMULATOR */ #else /* SIMULATOR */
char* file; const char* file;
int steps = -1; int steps = -1;
int index; int index;

View file

@ -2450,7 +2450,7 @@ bool playlist_check(int steps)
/* get trackname of track that is "steps" away from current playing track. /* get trackname of track that is "steps" away from current playing track.
NULL is used to identify end of playlist */ NULL is used to identify end of playlist */
char* playlist_peek(int steps) const char* playlist_peek(int steps)
{ {
struct playlist_info* playlist = &current_playlist; struct playlist_info* playlist = &current_playlist;
int seek; int seek;

View file

@ -127,7 +127,7 @@ int playlist_add(const char *filename);
int playlist_shuffle(int random_seed, int start_index); int playlist_shuffle(int random_seed, int start_index);
void playlist_start(int start_index, int offset); void playlist_start(int start_index, int offset);
bool playlist_check(int steps); bool playlist_check(int steps);
char *playlist_peek(int steps); const char *playlist_peek(int steps);
int playlist_next(int steps); int playlist_next(int steps);
bool playlist_next_dir(int direction); bool playlist_next_dir(int direction);
int playlist_get_resume_info(int *resume_index); int playlist_get_resume_info(int *resume_index);

View file

@ -1068,7 +1068,7 @@ bool bookmark_play(char *resume_file, int index, int offset, int seed,
lastdir[0]='\0'; lastdir[0]='\0';
if (playlist_create(resume_file, NULL) != -1) if (playlist_create(resume_file, NULL) != -1)
{ {
char* peek_filename; const char* peek_filename;
resume_directory(resume_file); resume_directory(resume_file);
if (global_settings.playlist_shuffle) if (global_settings.playlist_shuffle)
playlist_shuffle(seed, -1); playlist_shuffle(seed, -1);