Changeset 9b2949b in orbit

Timestamp:

08/16/13 10:11:17 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo, Tab_Interface, pyramid

Children:

e8cd830

Parents:

6d0d67b

Message:

iOS:

• pre-signal hacking

Location:

iOS/Orbit/Orbit

Files:

• AudioGenerator.m (modified) (2 diffs)
• controllers/TutorialViewController.m (modified) (1 diff)

iOS/Orbit/Orbit/AudioGenerator.m

@@ -123 +123 @@
     
         
-        // This is a mono tone generator so we only need the first buffer
-        const int channel = 0;
+//      // This is a mono tone generator so we only need the first buffer
+//      const int channel = 0;
+   
+   // There are two channels to the audio control stream (left and right)
+   const int channel = 0; // Output to left channel
+//   const int channel = 1; // Output to right channel
+
+   
+   
         Float32 *buffer = (Float32 *)ioData->mBuffers[channel].mData;
     
@@ -184 +191 @@
     streamFormat.mFramesPerPacket = 1;
     streamFormat.mBytesPerFrame = four_bytes_per_float;
-    streamFormat.mChannelsPerFrame = 1;
+   
+   // There are two channels to the audio stream
+//   streamFormat.mChannelsPerFrame = 1;
+   streamFormat.mChannelsPerFrame = 2;
+   
     streamFormat.mBitsPerChannel = four_bytes_per_float * eight_bits_per_byte;
     err = AudioUnitSetProperty (toneUnit,

iOS/Orbit/Orbit/controllers/TutorialViewController.m

@@ -18 +18 @@
      [NSURLRequest requestWithURL:
       [NSURL fileURLWithPath:
-       [[NSBundle mainBundle] pathForResource:@"index" ofType:@"html"]]]];
+       [[NSBundle mainBundle] pathForResource:@"frame" ofType:@"html"]]]];
     [super viewDidLoad];
 }