Changeset a474ef7 in orbit
- Timestamp:
- 12/11/13 13:33:18 (9 years ago)
- Branches:
- master, Servo
- Children:
- 490c673
- Parents:
- afcc0af
- Location:
- android/src/info/puzzlebox/orbit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
android/src/info/puzzlebox/orbit/AudioHandler.java
rddcd1b4 ra474ef7 136 136 137 137 // TODO - custom thread logic 138 Log.v(TAG, "while (running)");139 140 138 // Log.v(TAG, "while (running)"); 139 140 141 141 // Don't play audio when app is first loaded 142 142 if (! firstRun) … … 144 144 else 145 145 firstRun = false; 146 147 146 147 148 148 // Wait on mutex 149 149 synchronized (mutex) { … … 178 178 179 179 public void shutdown() { 180 180 181 181 Log.v(TAG, "shutdown()"); 182 182 183 183 // Set running to false 184 184 running = false; … … 225 225 keepPlaying = true; 226 226 227 Log.v(TAG, "playControlSignal()");227 // Log.v(TAG, "playControlSignal()"); 228 228 229 229 int throttle=command[0].intValue(); -
android/src/info/puzzlebox/orbit/OrbitTabActivity.java
ra03ff5d ra474ef7 1157 1157 /** Getting the user sound settings */ 1158 1158 AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE); 1159 float actualVolume = (float) audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);1159 // float actualVolume = (float) audioManager.getStreamVolume(AudioManager.STREAM_MUSIC); 1160 1160 float maxVolume = (float) audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC); 1161 float volume = actualVolume / maxVolume; 1161 // float volume = actualVolume / maxVolume; 1162 1163 audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, (int) maxVolume, 0); 1162 1164 /** Is the sound loaded already? */ 1163 1165 if (loaded) { 1164 1166 // soundPool.play(soundID, volume, volume, 1, 0, 1f); 1165 soundPool.play(soundID, maxVolume, maxVolume, 1, 0, 1f); // Fixes Samsung Galaxy S4 [SGH-M919] 1167 // soundPool.setVolume(soundID, 1f, 1f); 1168 // soundPool.play(soundID, maxVolume, maxVolume, 1, 0, 1f); // Fixes Samsung Galaxy S4 [SGH-M919] 1169 soundPool.play(soundID, 1f, 1f, 1, 0, 1f); // Fixes Samsung Galaxy S4 [SGH-M919] 1166 1170 if (DEBUG) 1167 1171 Log.v(TAG, "Played sound");
Note: See TracChangeset
for help on using the changeset viewer.