summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-03-09 12:51:25 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-03-09 12:51:25 +0000
commit68f9e1ad5772ceeddec11a602d6eaf4806adec16 (patch)
treecbe3223a8afa9185266e5077dc451a832a59ee1d
parent98cd3e8868a54541dce9875dfaf04e2695a97c37 (diff)
downloadrockbox-68f9e1ad5772ceeddec11a602d6eaf4806adec16.tar.gz
rockbox-68f9e1ad5772ceeddec11a602d6eaf4806adec16.zip
Guess there were more changes to it.:) Odd that mine built until a make clean.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12694 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playback.c18
-rw-r--r--firmware/mp3_playback.c57
-rw-r--r--firmware/powermgmt.c3
3 files changed, 15 insertions, 63 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 31ec21afda..37a5de97b2 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -181,12 +181,7 @@ enum {
#define IBSS_ATTR_VOICE_STACK IBSS_ATTR
#endif
-#ifndef SIMULATOR
-extern bool audio_is_initialized;
-#else
-static bool audio_is_initialized = false;
-#endif
-
+bool audio_is_initialized = false;
/* Variables are commented with the threads that use them: *
* A=audio, C=codec, V=voice. A suffix of - indicates that *
@@ -381,6 +376,17 @@ void mp3_play_stop(void)
#endif
}
+void mp3_play_pause(bool play)
+{
+ /* a dummy */
+ (void)play;
+}
+
+bool mp3_is_playing(void)
+{
+ return voice_is_playing;
+}
+
bool mp3_pause_done(void)
{
return pcm_is_paused();
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c
index a5a251160e..bd6ba60777 100644
--- a/firmware/mp3_playback.c
+++ b/firmware/mp3_playback.c
@@ -72,7 +72,6 @@ static void (*callback_for_more)(unsigned char**, int*);
bool audio_is_initialized = false;
#endif
-#if CONFIG_CODEC != SWCODEC
/* FIX: this code pretty much assumes a MAS */
#ifndef SIMULATOR
@@ -594,59 +593,3 @@ unsigned char* mp3_get_pos(void)
#endif /* #ifndef SIMULATOR */
-
-#else /* CONFIG_CODEC != SWCODEC */
-void mp3_init(int volume, int bass, int treble, int balance, int loudness,
- int avc, int channel_config, int stereo_width,
- int mdb_strength, int mdb_harmonics,
- int mdb_center, int mdb_shape, bool mdb_enable,
- bool superbass)
-{
- /* a dummy */
- (void)volume;
- (void)bass;
- (void)treble;
- (void)balance;
- (void)loudness;
- (void)avc;
- (void)channel_config;
- (void)stereo_width;
- (void)mdb_strength;
- (void)mdb_harmonics;
- (void)mdb_center;
- (void)mdb_shape;
- (void)mdb_enable;
- (void)superbass;
-
- paused = false;
- playing = false;
-#ifndef SIMULATOR
- playstart_tick = 0;
- cumulative_ticks = 0;
- callback_for_more = 0;
-#endif
-}
-
-void mp3_shutdown(void)
-{
- /* a dummy */
-}
-
-void mp3_play_pause(bool play)
-{
- /* a dummy */
- (void)play;
-}
-
-unsigned char* mp3_get_pos(void)
-{
- /* a dummy */
- return (unsigned char *)0x1234;
-}
-
-bool mp3_is_playing(void)
-{
- return playing;
-}
-
-#endif /* CONFIG_CODEC == SWCODEC */
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 7948e9ad18..bbb98144fb 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -1315,7 +1315,10 @@ void shutdown_hw(void)
remote_backlight_off();
#endif
+#if CONFIG_CODEC != SWCODEC
mp3_shutdown();
+#endif
+
#ifdef HAVE_UDA1380
audiohw_close();
#elif defined(HAVE_TLV320)