Changeset ad40faa in orbit for iOS

Timestamp:

08/29/13 10:34:36 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo, Tab_Interface, pyramid

Children:

e37a889

Parents:

c4c7004

Message:

Orbit:

• reverted to WAV output

Location:

iOS/Orbit

Files:

• .DS_Store (modified) (previous)
• Orbit/SignalConverter.h (modified) (2 diffs)
• Orbit/SignalConverter.m (modified) (6 diffs)
• Orbit/controllers/FlightViewController.m (modified) (3 diffs)
• orbit.xcodeproj/project.xcworkspace/xcuserdata/sc.xcuserdatad/UserInterfaceState.xcuserstate (modified) (previous)
• orbit.xcodeproj/xcuserdata/sc.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist (modified) (1 diff)

iOS/Orbit/Orbit/SignalConverter.h

@@ -16 +16 @@
 
 @interface SignalConverter : NSObject <TGAccessoryDelegate> {
-    AudioGenerator *audioPlayer;
+   // Generate Signal
+//   AudioGenerator *audioPlayer;
+   // Play WAV
+   AVAudioPlayer *audioPlayer;
 }
 
@@ -36 +39 @@
 - (void) playTestSound;
 - (void) stopTestSound;
+- (void) prepareAudio;
 
 @end

iOS/Orbit/Orbit/SignalConverter.m

@@ -40 +40 @@
         [[TGAccessoryManager sharedTGAccessoryManager] setupManagerWithInterval:0.05];
         [[TGAccessoryManager sharedTGAccessoryManager] setDelegate:self];
-        audioPlayer = [[AudioGenerator alloc] init];
+        // Generate Signal
+        //        audioPlayer = [[AudioGenerator alloc] init];
         
         // defaults
@@ -108 +109 @@
     if (value != nil) {
         
-//        NSLog(@"value: %i", [value intValue]);
+        //        NSLog(@"value: %i", [value intValue]);
         
         if ([value intValue] == 0) {
@@ -122 +123 @@
         }
         
-//        NSLog(@"signalStrength: %i", signalStrength);
+        //        NSLog(@"signalStrength: %i", signalStrength);
         
     }
@@ -227 +228 @@
 - (void) playTestSound
 {
+    
+    NSLog(@"playTestSound()");
+    [self prepareAudio];
+    
+//    [self playAudio];
+    
     if (!running && !testing) {
         testing = YES;
-        [audioPlayer playWithThrottle:throttle yaw:yaw pitch:pitch];
+        // Generate Sound
+        //        [audioPlayer playWithThrottle:throttle yaw:yaw pitch:pitch];
+        [self playAudio];
     }
 }
@@ -273 +282 @@
 }
 
+//- (void) playAudio
+//{
+//    if ([self currentPowerLevel] > 0) {
+//        // Generate Signal
+//        [audioPlayer playWithThrottle:throttle yaw:yaw pitch:pitch];
+//    } else {
+//        [audioPlayer stop];
+//        
+//    }
+//}
+
+
 - (void) playAudio
 {
+    
+    [audioPlayer play];
+    
+    return;
+    
+    //   audioPlayer.volume = [self currentPowerLevel];
     if ([self currentPowerLevel] > 0) {
-        [audioPlayer playWithThrottle:throttle yaw:yaw pitch:pitch];
+        audioPlayer.volume = 1.0;
+        [audioPlayer play];
     } else {
         [audioPlayer stop];
+        [self prepareAudio];
         
     }
@@ -312 +341 @@
 }
 
+- (void) prepareAudio
+{
+    NSURL *audioFilePath = [[NSBundle mainBundle] URLForResource:AUDIO_FILE_NAME withExtension:nil];
+    
+    NSError *error;
+    audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:audioFilePath error:&error];
+    if (!audioPlayer) {
+        //        [self logMessage:[NSString stringWithFormat:@"Failed to initialize audio player: %@", [error debugDescription]]];
+        NSLog(@"Failed to initialize audio player: %@", [error debugDescription]);
+    } else {
+        [audioPlayer prepareToPlay];
+    }
+}
+
 @end

iOS/Orbit/Orbit/controllers/FlightViewController.m

@@ -39 +39 @@
    self.meditationThreshold.value = 0;
    
+   [signalConverter prepareAudio];
+   
    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
    signalConverter = appDelegate.signalConverter;
@@ -46 +48 @@
    [self.attentionThreshold addTarget:self action:@selector(setThresholds) forControlEvents:UIControlEventValueChanged];
    [self.meditationThreshold addTarget:self action:@selector(setThresholds) forControlEvents:UIControlEventValueChanged];
+   
 }
 
@@ -173 +176 @@
 - (IBAction) testButtonPressed:(id) sender {
    
-   
-   NSLog(@"Available fonts: %@", [UIFont familyNames]);
-//   Droid Sans
-   
+//   NSLog(@"Available fonts: %@", [UIFont familyNames]);
    
    [signalConverter isAudioJackPlugged];

iOS/Orbit/orbit.xcodeproj/xcuserdata/sc.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist

@@ -3 +3 @@
    type = "1"
    version = "1.0">
+   <FileBreakpoints>
+      <FileBreakpoint
+         shouldBeEnabled = "Yes"
+         ignoreCount = "0"
+         continueAfterRunningActions = "No"
+         filePath = "Orbit/SignalConverter.m"
+         timestampString = "399450641.859267"
+         startingColumnNumber = "9223372036854775807"
+         endingColumnNumber = "9223372036854775807"
+         startingLineNumber = "189"
+         endingLineNumber = "189"
+         landmarkName = "-isAudioJackPlugged"
+         landmarkType = "5">
+      </FileBreakpoint>
+   </FileBreakpoints>
 </Bucket>