devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Only set volume on SYS_VOLUME_CHANGED the first time. Workaround for FS#12034.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29663 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2011-03-31 07:04:44 +00:00
parent 277b8fba71
commit ce755dd9c5
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
android/src/org/rockbox/RockboxPCM.java
View file

@ -85,9 +85,19 @@ public class RockboxPCM extends AudioTrack
pcmrange = getMaxVolume() - minpcmvolume;
setupVolumeHandler();
postVolume(audiomanager.getStreamVolume(streamtype));
}
private native void postVolumeChangedEvent(int volume);
private void postVolume(int volume)
{
int rbvolume = ((maxstreamvolume - volume) * -99) /
maxstreamvolume;
LOG("java:postVolumeChangedEvent, avol "+volume+" rbvol "+rbvolume);
postVolumeChangedEvent(rbvolume);
}
private void setupVolumeHandler()
{
BroadcastReceiver broadcastReceiver = new BroadcastReceiver()
@ -105,9 +115,7 @@ public class RockboxPCM extends AudioTrack
volume != setstreamvolume &&
rbservice.isRockboxRunning())
{
int rbvolume = ((maxstreamvolume - volume) * -99) /
maxstreamvolume;
postVolumeChangedEvent(rbvolume);
postVolume(volume);
}
}
};
@ -190,6 +198,7 @@ public class RockboxPCM extends AudioTrack
private void set_volume(int volume)
{
LOG("java:set_volume("+volume+")");
/* Rockbox 'volume' is 0..-990 deci-dB attenuation.
Android streams have rather low resolution volume control,
typically 8 or 15 steps.
@ -209,6 +218,7 @@ public class RockboxPCM extends AudioTrack
int oldstreamvolume = audiomanager.getStreamVolume(streamtype);
if (streamvolume != oldstreamvolume) {
LOG("java:setStreamVolume("+streamvolume+")");
setstreamvolume = streamvolume;
audiomanager.setStreamVolume(streamtype, streamvolume, 0);
}

11
apps/misc.c
View file

@ -58,6 +58,8 @@
#include "yesno.h"
#include "viewport.h"
#include "debug.h"
#if CONFIG_TUNER
#include "radio.h"
#endif
@ -632,9 +634,16 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
#if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(PLATFORM_HAS_VOLUME_CHANGE)
case SYS_VOLUME_CHANGED:
{
static bool firstvolume = true;
int volume = hosted_get_volume();
if (global_settings.volume != volume)
DEBUGF("SYS_VOLUME_CHANGED: %d\n", volume);
if (global_settings.volume != volume) {
global_settings.volume = volume;
if (firstvolume) {
setvol();
firstvolume = false;
}
}
return 0;
}
#endif