diff options
author | Peter D'Hoye <peter.dhoye@gmail.com> | 2006-07-01 23:48:30 +0000 |
---|---|---|
committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2006-07-01 23:48:30 +0000 |
commit | 5f3c0129845f30a7dc5780951fffa1699acc1e5c (patch) | |
tree | 4c6802194c5d0e1e46aecdca5bc2f4acba36205b | |
parent | c26a0851624161741c18a9eeaf79324311e20bec (diff) | |
download | rockbox-5f3c0129845f30a7dc5780951fffa1699acc1e5c.tar.gz rockbox-5f3c0129845f30a7dc5780951fffa1699acc1e5c.zip |
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.c | 3 | ||||
-rw-r--r-- | docs/CREDITS | 1 |
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 @@ | |||
63 | #include "dircache.h" | 63 | #include "dircache.h" |
64 | #include "tagcache.h" | 64 | #include "tagcache.h" |
65 | #include "yesno.h" | 65 | #include "yesno.h" |
66 | #include "gwps-common.h" | ||
66 | 67 | ||
67 | /* gui api */ | 68 | /* gui api */ |
68 | #include "list.h" | 69 | #include "list.h" |
@@ -643,6 +644,8 @@ static bool dirbrowse(void) | |||
643 | /* Stop the music if it is playing */ | 644 | /* Stop the music if it is playing */ |
644 | if(audio_status()) { | 645 | if(audio_status()) { |
645 | if (!global_settings.party_mode) | 646 | if (!global_settings.party_mode) |
647 | if (global_settings.fade_on_stop) | ||
648 | fade(0); | ||
646 | audio_stop(); | 649 | audio_stop(); |
647 | } | 650 | } |
648 | #if defined(CONFIG_CHARGING) && \ | 651 | #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 | |||
207 | Frédéric François | 207 | Frédéric François |
208 | Marc-André Moreau | 208 | Marc-André Moreau |
209 | Ioannis Koutoulakis | 209 | Ioannis Koutoulakis |
210 | Alistair Marshall | ||