Changeset 7945ecb in orbit

Timestamp:

08/07/13 13:56:01 (9 years ago)

Author:

Jonathon Horsman <jonathon@…>

Branches:

master, Servo, Tab_Interface, pyramid

Children:

1472980

Parents:

359a504

Message:

CHange volume detection method

Location:

iOS/Orbit

Files:

• Orbit/SignalConverter.m (modified) (4 diffs)
• orbit.xcodeproj/project.xcworkspace/xcuserdata/jonathon.xcuserdatad/UserInterfaceState.xcuserstate (modified) (previous)

iOS/Orbit/Orbit/SignalConverter.m

@@ -49 +49 @@
         // initialise the audio session - this should only be done once
         AudioSessionInitialize(NULL, NULL, NULL, NULL);
+        AudioSessionSetActive(YES);
     }
     return self;
@@ -70 +71 @@
         [_delegate appStopped];
     }
+    AudioSessionSetActive(NO);
 }
 
@@ -142 +144 @@
 - (BOOL) isVolumeMax
 {
-    AudioSessionSetActive(YES);
-    float volume = [[AVAudioSession sharedInstance] outputVolume];
+    Float32 volume;
+    UInt32 dataSize;
+    AudioSessionGetPropertySize(kAudioSessionProperty_CurrentHardwareOutputVolume, &dataSize);
+    AudioSessionGetProperty(kAudioSessionProperty_CurrentHardwareOutputVolume, &dataSize, &volume);
     NSLog(@"Volume is %f", volume);
     return 1.0 == volume;
@@ -157 +161 @@
     
     // make the call to get the audio description and populate the desc dictionary
-    AudioSessionGetProperty (kAudioSessionProperty_AudioRouteDescription, &routeSize, &desc);
+    AudioSessionGetProperty(kAudioSessionProperty_AudioRouteDescription, &routeSize, &desc);
 
     // the dictionary contains 2 keys, for input and output. Get output array