summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2005-06-09 20:22:33 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2005-06-09 20:22:33 +0000
commit0bcc64cb4c80d8f8e245fc8630e8732b64882245 (patch)
tree871b62610640f6bd04a1f8aadb3fc5d3331ddc98
parent9e200e35cde8fc93a95e1955f9ae62045434b72b (diff)
downloadrockbox-0bcc64cb4c80d8f8e245fc8630e8732b64882245.tar.gz
rockbox-0bcc64cb4c80d8f8e245fc8630e8732b64882245.zip
Reset cpu to not boosted state at startup. Do case-insensitive file
extension probing. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6643 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playback.c26
-rw-r--r--firmware/pcm_playback.c1
2 files changed, 14 insertions, 13 deletions
diff --git a/apps/playback.c b/apps/playback.c
index bfe6fd5691..19f2bc3ad3 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -365,31 +365,31 @@ int probe_file_format(const char *filename)
return AFMT_UNKNOWN;
suffix += 1;
- if (!strcmp("mp1", suffix))
+ if (!strcasecmp("mp1", suffix))
return AFMT_MPA_L1;
- else if (!strcmp("mp2", suffix))
+ else if (!strcasecmp("mp2", suffix))
return AFMT_MPA_L2;
- else if (!strcmp("mpa", suffix))
+ else if (!strcasecmp("mpa", suffix))
return AFMT_MPA_L2;
- else if (!strcmp("mp3", suffix))
+ else if (!strcasecmp("mp3", suffix))
return AFMT_MPA_L3;
- else if (!strcmp("ogg", suffix))
+ else if (!strcasecmp("ogg", suffix))
return AFMT_OGG_VORBIS;
- else if (!strcmp("wav", suffix))
+ else if (!strcasecmp("wav", suffix))
return AFMT_PCM_WAV;
- else if (!strcmp("flac", suffix))
+ else if (!strcasecmp("flac", suffix))
return AFMT_FLAC;
- else if (!strcmp("mpc", suffix))
+ else if (!strcasecmp("mpc", suffix))
return AFMT_MPC;
- else if (!strcmp("aac", suffix))
+ else if (!strcasecmp("aac", suffix))
return AFMT_AAC;
- else if (!strcmp("ape", suffix))
+ else if (!strcasecmp("ape", suffix))
return AFMT_APE;
- else if (!strcmp("wma", suffix))
+ else if (!strcasecmp("wma", suffix))
return AFMT_WMA;
- else if (!strcmp("a52", suffix))
+ else if (!strcasecmp("a52", suffix))
return AFMT_A52;
- else if (!strcmp("rm", suffix))
+ else if (!strcasecmp("rm", suffix))
return AFMT_REAL;
return AFMT_UNKNOWN;
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c
index a5c1deb371..34310cf916 100644
--- a/firmware/pcm_playback.c
+++ b/firmware/pcm_playback.c
@@ -501,6 +501,7 @@ void pcm_play_init(void)
memset(&audiobuffer[0], 0, audiobuffer_pos);
pcm_play_add_chunk(&audiobuffer[0], audiobuffer_pos, NULL);
pcm_play_start();
+ cpu_boost(false);
crossfade_enabled = false;
}