diff options
| author | Anton Oleynikov <len0x@rockbox.org> | 2005-11-13 10:57:35 +0000 |
|---|---|---|
| committer | Anton Oleynikov <len0x@rockbox.org> | 2005-11-13 10:57:35 +0000 |
| commit | 3dbb3a271df502322bdaeec529fd0aec3f9b4b1d (patch) | |
| tree | 088b39ee76b657114a3a9dd4e4af338d34843907 | |
| parent | 0c0534e29730cca90e3f58e25c83dc4ba9501da1 (diff) | |
| download | rockbox-3dbb3a271df502322bdaeec529fd0aec3f9b4b1d.zip rockbox-3dbb3a271df502322bdaeec529fd0aec3f9b4b1d.tar.gz rockbox-3dbb3a271df502322bdaeec529fd0aec3f9b4b1d.tar.bz2 rockbox-3dbb3a271df502322bdaeec529fd0aec3f9b4b1d.tar.xz | |
iRiver: fix for audio kept on while playing a file + new function to set audio status (to be used later)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7838 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/playback.c | 24 | ||||
| -rw-r--r-- | apps/playback.h | 2 |
2 files changed, 26 insertions, 0 deletions
diff --git a/apps/playback.c b/apps/playback.c index 045b15b..c93dd28 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -61,6 +61,10 @@ #include "sound.h" #include "metadata.h" #include "talk.h" +#ifdef CONFIG_TUNER +#include "radio.h" +#include "power.h" +#endif static volatile bool audio_codec_loaded; static volatile bool voice_codec_loaded; @@ -1696,6 +1700,13 @@ void audio_thread(void) audio_stop_playback(); paused = false; } + +#ifdef CONFIG_TUNER + /* check if radio is playing */ + if(radio_get_status() != FMRADIO_OFF){ + radio_stop(); + } +#endif logf("starting..."); playing = true; @@ -2081,6 +2092,19 @@ int audio_status(void) return ret; } +void set_audio_status(int status) +{ + if (status & AUDIO_STATUS_PLAY) + playing = true; + else + playing = false; + + if (status & AUDIO_STATUS_PAUSE) + paused = true; + else + paused = false; +} + int audio_get_file_pos(void) { return 0; diff --git a/apps/playback.h b/apps/playback.h index 8128cc2..4c3f7d1 100644 --- a/apps/playback.h +++ b/apps/playback.h @@ -58,6 +58,8 @@ void voice_init(void); extern void audio_next_dir(void); extern void audio_prev_dir(void); +void set_audio_status(int status); + #endif |