diff options
| author | Miika Pekkarinen <miipekk@ihme.org> | 2005-08-20 11:13:19 +0000 |
|---|---|---|
| committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-08-20 11:13:19 +0000 |
| commit | 159c52dd36e5c008612458192904f57ea6dfdfad (patch) | |
| tree | 4b6f7d8329069e90d72284ef73ba542d75705b55 /firmware | |
| parent | 329caa8ade0b78a3235e9d28983cb1c506e573a0 (diff) | |
| download | rockbox-159c52dd36e5c008612458192904f57ea6dfdfad.tar.gz rockbox-159c52dd36e5c008612458192904f57ea6dfdfad.zip | |
Initial voice ui support for software codec platforms. Added also a
beep when changing tracks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7360 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/mp3_playback.c | 16 | ||||
| -rw-r--r-- | firmware/sound.c | 7 |
2 files changed, 7 insertions, 16 deletions
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c index dfe08e5d3a..3a2fdb4f1a 100644 --- a/firmware/mp3_playback.c +++ b/firmware/mp3_playback.c @@ -576,7 +576,6 @@ void mp3_reset_playtime(void) playstart_tick = current_tick; } - bool mp3_is_playing(void) { return playing; @@ -624,18 +623,11 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness, audio_is_initialized = true; #endif } + void mp3_shutdown(void) { /* a dummy */ } -void mp3_play_data(const unsigned char* start, int size, - void (*get_more)(unsigned char** start, int* size)) -{ - /* a dummy */ - (void)start; - (void)size; - (void)get_more; -} void mp3_play_stop(void) { @@ -653,4 +645,10 @@ unsigned char* mp3_get_pos(void) /* a dummy */ return (unsigned char *)0x1234; } + +bool mp3_is_playing(void) +{ + return playing; +} + #endif /* CONFIG_HWCODEC == MASNONE */ diff --git a/firmware/sound.c b/firmware/sound.c index 8fb015c27a..cd772f5e9f 100644 --- a/firmware/sound.c +++ b/firmware/sound.c @@ -704,10 +704,3 @@ int sound_get_pitch(void) } #endif -#if CONFIG_HWCODEC == MASNONE -bool mp3_is_playing(void) -{ - /* a dummy */ - return false; -} -#endif |