Remove hosted_get_volume(), as event data is available in button_get_data().

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30300 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 6 insertions, 21 deletions

diff --git a/apps/misc.c b/apps/misc.c
index 83e42cf3e0..b57e84efb3 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -622,7 +622,9 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
         case SYS_VOLUME_CHANGED:
         {
             static bool firstvolume = true;
-            int volume = hosted_get_volume();
+            /* kludge: since this events go to the button_queue,
+             * event data is available in the last button data */
+            int volume = button_get_data();
             DEBUGF("SYS_VOLUME_CHANGED: %d\n", volume);
             if (global_settings.volume != volume) {
                 global_settings.volume = volume;
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 0f709cdae6..5128801725 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -143,10 +143,6 @@ int get_cpu_boost_counter(void);
 #undef swap32
 #endif
 
-#if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(PLATFORM_HAS_VOLUME_CHANGE)
-int hosted_get_volume(void);
-#endif
-
 /* Get the byte offset of a type's member */
 #define OFFSETOF(type, membername) ((off_t)&((type *)0)->membername)
 
diff --git a/firmware/target/hosted/android/pcm-android.c b/firmware/target/hosted/android/pcm-android.c
index cbd6cb3228..3143bc90ec 100644
--- a/firmware/target/hosted/android/pcm-android.c
+++ b/firmware/target/hosted/android/pcm-android.c
@@ -224,16 +224,6 @@ void pcm_shutdown(void)
     e->CallVoidMethod(env_ptr, RockboxPCM_instance, release);
     pthread_mutex_destroy(&audio_lock_mutex);
 }
-    
-/* Due to limitations of default_event_handler(), parameters gets swallowed when
- * being posted with queue_broadcast(), so workaround this by caching the last
- * value.
- */
-static int lastPostedVolume = -1;
-int hosted_get_volume(void)
-{
-    return lastPostedVolume;
-}
 
 JNIEXPORT void JNICALL
 Java_org_rockbox_RockboxPCM_postVolumeChangedEvent(JNIEnv *env,
@@ -242,10 +232,7 @@ Java_org_rockbox_RockboxPCM_postVolumeChangedEvent(JNIEnv *env,
 {
     (void) env;
     (void) this;
-
-    if (volume != lastPostedVolume)
-    {
-        lastPostedVolume = volume;
-        queue_broadcast(SYS_VOLUME_CHANGED, 0);
-    }
+    /* for the main queue, the volume will be available through
+     * button_get_data() */
+    queue_broadcast(SYS_VOLUME_CHANGED, volume);
 }