summaryrefslogtreecommitdiffstats
path: root/apps/settings.c
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2011-03-14 12:25:48 +0000
committerBjörn Stenberg <bjorn@haxx.se>2011-03-14 12:25:48 +0000
commite50cc0e3d760d4fdb99f971070a6943ee15a9a98 (patch)
tree9d22cde7d39a2aefbc75cd970916fbc161f53cac /apps/settings.c
parent606bed035ed898df1d1bf4a8c7be904f76b118ff (diff)
downloadrockbox-e50cc0e3d760d4fdb99f971070a6943ee15a9a98.tar.gz
rockbox-e50cc0e3d760d4fdb99f971070a6943ee15a9a98.tar.bz2
rockbox-e50cc0e3d760d4fdb99f971070a6943ee15a9a98.zip
Listen to and follow external Android volume changes. (Based on FS#11914 by Maurus Cuelenaere)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29586 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/settings.c b/apps/settings.c
index e9458dc601..623bc5b2a0 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -726,7 +726,9 @@ void sound_settings_apply(void)
sound_set(SOUND_TREBLE, global_settings.treble);
#endif
sound_set(SOUND_BALANCE, global_settings.balance);
+#ifndef PLATFORM_HAS_VOLUME_CHANGE
sound_set(SOUND_VOLUME, global_settings.volume);
+#endif
sound_set(SOUND_CHANNELS, global_settings.channel_config);
sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width);
#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)