diff options
| author | Nils Wallménius <nils@rockbox.org> | 2010-10-17 08:47:56 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2010-10-17 08:47:56 +0000 |
| commit | 65ee5eb5e73e5840d315d9574e06f2fd22d59e3b (patch) | |
| tree | dc86f7dc46192b144f023feb87697b8cdb0131ae | |
| parent | 5432894dbace1462a7d62b2ed3056abfeb2ecf2a (diff) | |
| download | rockbox-65ee5eb5e73e5840d315d9574e06f2fd22d59e3b.zip rockbox-65ee5eb5e73e5840d315d9574e06f2fd22d59e3b.tar.gz rockbox-65ee5eb5e73e5840d315d9574e06f2fd22d59e3b.tar.bz2 rockbox-65ee5eb5e73e5840d315d9574e06f2fd22d59e3b.tar.xz | |
Accept FS#11606 by Michael Gentry, making ACTION_TREE_STOP stop radio too.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28295 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/misc.c | 12 | ||||
| -rw-r--r-- | docs/CREDITS | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/apps/misc.c b/apps/misc.c index 5f6df46..4622ee6 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -57,6 +57,10 @@ #include "yesno.h" #include "viewport.h" +#ifdef CONFIG_TUNER +#include "radio.h" +#endif + #ifdef IPOD_ACCESSORY_PROTOCOL #include "iap.h" #endif @@ -376,10 +380,14 @@ bool list_stop_handler(void) { bool ret = false; +#if CONFIG_TUNER + radio_stop(); +#endif + /* Stop the music if it is playing */ - if(audio_status()) + if(audio_status()) { - if (!global_settings.party_mode) + if (!global_settings.party_mode) { if (global_settings.fade_on_stop) fade(false, false); diff --git a/docs/CREDITS b/docs/CREDITS index 64f1fa4..2d1ae6b 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -560,6 +560,7 @@ István Nagy Wojciech Lesniak Tuomas Airaksinen Calvin Walden +Michael Gentry The libmad team The wavpack team |