summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter D'Hoye <peter.dhoye@gmail.com>2006-07-01 23:48:30 +0000
committerPeter D'Hoye <peter.dhoye@gmail.com>2006-07-01 23:48:30 +0000
commit5f3c0129845f30a7dc5780951fffa1699acc1e5c (patch)
tree4c6802194c5d0e1e46aecdca5bc2f4acba36205b
parentc26a0851624161741c18a9eeaf79324311e20bec (diff)
Also fade out when stopping playback from within the browser (when configured to fade). Patch by Alistair Marshall for bug 5578
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10173 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/tree.c3
-rw-r--r--docs/CREDITS1
2 files changed, 4 insertions, 0 deletions
diff --git a/apps/tree.c b/apps/tree.c
index 80132449e9..4556d86c53 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -63,6 +63,7 @@
#include "dircache.h"
#include "tagcache.h"
#include "yesno.h"
+#include "gwps-common.h"
/* gui api */
#include "list.h"
@@ -643,6 +644,8 @@ static bool dirbrowse(void)
/* Stop the music if it is playing */
if(audio_status()) {
if (!global_settings.party_mode)
+ if (global_settings.fade_on_stop)
+ fade(0);
audio_stop();
}
#if defined(CONFIG_CHARGING) && \
diff --git a/docs/CREDITS b/docs/CREDITS
index 2e51aad85d..b0c6dc2dd2 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -207,3 +207,4 @@ Ewan Davies
Frédéric François
Marc-André Moreau
Ioannis Koutoulakis
+Alistair Marshall