Changeset e37a889 in orbit for iOS


Ignore:
Timestamp:
08/29/13 10:47:43 (6 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo, Tab_Interface, pyramid
Children:
3434fbc
Parents:
ad40faa
Message:

Orbit:

  • Operating on WAV sound
Location:
iOS/Orbit
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/SignalConverter.m

    rad40faa re37a889  
    228228- (void) playTestSound 
    229229{ 
    230      
    231     NSLog(@"playTestSound()"); 
    232     [self prepareAudio]; 
    233      
    234 //    [self playAudio]; 
    235      
    236230    if (!running && !testing) { 
    237231        testing = YES; 
    238232        // Generate Sound 
    239233        //        [audioPlayer playWithThrottle:throttle yaw:yaw pitch:pitch]; 
    240         [self playAudio]; 
     234         
     235        // Play WAV 
     236        [self prepareAudio]; 
     237        [audioPlayer play]; 
    241238    } 
    242239} 
     
    289286//    } else { 
    290287//        [audioPlayer stop]; 
    291 //         
     288// 
    292289//    } 
    293290//} 
     
    297294{ 
    298295     
    299     [audioPlayer play]; 
    300      
    301     return; 
     296    NSLog(@"currentPowerLevel: %f", [self currentPowerLevel]); 
     297     
     298//    [self prepareAudio]; 
     299//    [audioPlayer play]; 
     300//     
     301//    return; 
    302302     
    303303    //   audioPlayer.volume = [self currentPowerLevel]; 
    304304    if ([self currentPowerLevel] > 0) { 
     305         
    305306        audioPlayer.volume = 1.0; 
     307         
     308        // Generate Signal 
     309//        [audioPlayer playWithThrottle:throttle yaw:yaw pitch:pitch]; 
     310         
     311        // Play WAV 
     312        [self prepareAudio]; 
    306313        [audioPlayer play]; 
     314         
    307315    } else { 
    308316        [audioPlayer stop]; 
  • iOS/Orbit/Orbit/controllers/FlightViewController.m

    rad40faa re37a889  
    3939   self.meditationThreshold.value = 0; 
    4040    
    41    [signalConverter prepareAudio]; 
     41//   [signalConverter prepareAudio]; 
    4242    
    4343   AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; 
Note: See TracChangeset for help on using the changeset viewer.