Changeset a474ef7 in orbit

Timestamp:

12/11/13 13:33:18 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

490c673

Parents:

afcc0af

Message:

orbit:

• Volume fix for Samsung Galaxy S4 [SGH-M919]

Location:

android/src/info/puzzlebox/orbit

Files:

• AudioHandler.java (modified) (4 diffs)
• OrbitTabActivity.java (modified) (1 diff)

android/src/info/puzzlebox/orbit/AudioHandler.java

@@ -136 +136 @@
 
                         // TODO - custom thread logic
-                        Log.v(TAG, "while (running)");
-
-                        
+                        //                      Log.v(TAG, "while (running)");
+
+
                         // Don't play audio when app is first loaded
                         if (! firstRun)
@@ -144 +144 @@
                         else
                                 firstRun = false;
-                        
-                        
+
+
                         // Wait on mutex
                         synchronized (mutex) {
@@ -178 +178 @@
 
         public void shutdown() {
-                
+
                 Log.v(TAG, "shutdown()");
-                
+
                 // Set running to false
                 running = false;
@@ -225 +225 @@
                 keepPlaying = true;
 
-                Log.v(TAG, "playControlSignal()");
+                //              Log.v(TAG, "playControlSignal()");
 
                 int throttle=command[0].intValue();

android/src/info/puzzlebox/orbit/OrbitTabActivity.java

@@ -1157 +1157 @@
                         /** Getting the user sound settings */
                         AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
-                        float actualVolume = (float) audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+//                      float actualVolume = (float) audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
                         float maxVolume = (float) audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
-                        float volume = actualVolume / maxVolume;
+//                      float volume = actualVolume / maxVolume;
+                        
+                        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, (int) maxVolume, 0);
                         /** Is the sound loaded already? */
                         if (loaded) {
 //                              soundPool.play(soundID, volume, volume, 1, 0, 1f);
-                                soundPool.play(soundID, maxVolume, maxVolume, 1, 0, 1f); // Fixes Samsung Galaxy S4 [SGH-M919]
+//                              soundPool.setVolume(soundID, 1f, 1f);
+//                              soundPool.play(soundID, maxVolume, maxVolume, 1, 0, 1f); // Fixes Samsung Galaxy S4 [SGH-M919]
+                                soundPool.play(soundID, 1f, 1f, 1, 0, 1f); // Fixes Samsung Galaxy S4 [SGH-M919]
                                 if (DEBUG)
                                         Log.v(TAG, "Played sound");