New project structure for building a static library.

calm · Sep 7, 2011 · edeb446 · edeb446
1 parent 18381f2
commit edeb446
Show file tree

Hide file tree

Showing 29 changed files with 509 additions and 379 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
-Demo/build/
-Demo/Demo.xcodeproj/*.*
+.svn
+project.xcworkspace
+xcuserdata
 *.swp
diff --git a/Source/Decoder.h → Decoder/Decoder.h b/Source/Decoder.h → Decoder/Decoder.h
diff --git a/Source/Decoder.m → Decoder/Decoder.m b/Source/Decoder.m → Decoder/Decoder.m
diff --git a/Source/PCMDecoder.h → Decoder/PCMDecoder.h b/Source/PCMDecoder.h → Decoder/PCMDecoder.h
diff --git a/Source/PCMDecoder.m → Decoder/PCMDecoder.m b/Source/PCMDecoder.m → Decoder/PCMDecoder.m
diff --git a/Source/Sample.h → Decoder/Sample.h b/Source/Sample.h → Decoder/Sample.h
diff --git a/Source/Sample.m → Decoder/Sample.m b/Source/Sample.m → Decoder/Sample.m
diff --git a/Demo/Application.h b/Demo/Application.h
@@ -0,0 +1,9 @@
+@class Controller;
+
+@interface Application : NSObject <UIApplicationDelegate>
+
+@property(retain, nonatomic) IBOutlet UIWindow *window;
+@property(retain, nonatomic) IBOutlet Controller *controller;
+
+@end
+
diff --git a/Demo/Classes/Application.m → Demo/Application.m b/Demo/Classes/Application.m → Demo/Application.m
@@ -6,7 +6,7 @@ @implementation Application
 
 - (void) applicationDidFinishLaunching: (UIApplication*) application
 {
-    [window addSubview:controller.view];
+    [window setRootViewController:controller];
     [window makeKeyAndVisible];
 }
 

diff --git a/Demo/MainWindow.xib → Demo/Bootstrap.xib b/Demo/MainWindow.xib → Demo/Bootstrap.xib
diff --git a/Demo/Classes/Application.h b/Demo/Classes/Application.h
diff --git a/Demo/Classes/Controller.h → Demo/Controller.h b/Demo/Classes/Controller.h → Demo/Controller.h
@@ -1,4 +1,4 @@
-@interface Controller : UIViewController {}
+@interface Controller : UIViewController
 
 - (IBAction) makeGoodSound;
 - (IBAction) makeBadSound;

diff --git a/Demo/Classes/Controller.m → Demo/Controller.m b/Demo/Classes/Controller.m → Demo/Controller.m
@@ -2,7 +2,6 @@
 #import "Finch.h"
 #import "Sound.h"
 #import "RevolverSound.h"
-#import <AVFoundation/AVFoundation.h>
 #import <unistd.h>
 
 static const int kBulletRounds = 4;

diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
diff --git a/Demo/Info.plist b/Demo/Info.plist
@@ -16,20 +16,26 @@
 		<string>Icon@2x.png</string>
 	</array>
 	<key>CFBundleIdentifier</key>
-	<string>com.crowdcafe.test</string>
+	<string>com.crowdcafe.Finch-Demo</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>
-	<string>MainWindow</string>
+	<string>Bootstrap</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
 </dict>
 </plist>
diff --git a/Demo/main.m b/Demo/main.m
@@ -1,7 +1,5 @@
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-
+int main(int argc, char *argv[])
+{
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
     int retVal = UIApplicationMain(argc, argv, nil, nil);
     [pool release];

diff --git a/Demo/prefix.pch b/Demo/prefix.pch
@@ -1,8 +1,5 @@
-//
-// Prefix header for all source files of the 'Demo' target in the 'Demo' project
-//
-
 #ifdef __OBJC__
+    #import <AVFoundation/AVFoundation.h>
     #import <Foundation/Foundation.h>
     #import <UIKit/UIKit.h>
 #endif
diff --git a/Finch.xcodeproj/project.pbxproj b/Finch.xcodeproj/project.pbxproj
diff --git a/Finch/Finch.h b/Finch/Finch.h
@@ -0,0 +1,2 @@
+@interface Finch : NSObject
+@end
diff --git a/Source/Finch.m → Finch/Finch.m b/Source/Finch.m → Finch/Finch.m
diff --git a/Source/Reporter.h → Finch/Reporter.h b/Source/Reporter.h → Finch/Reporter.h
diff --git a/Source/Reporter.m → Finch/Reporter.m b/Source/Reporter.m → Finch/Reporter.m
diff --git a/Source/RevolverSound.h → Finch/RevolverSound.h b/Source/RevolverSound.h → Finch/RevolverSound.h
diff --git a/Source/RevolverSound.m → Finch/RevolverSound.m b/Source/RevolverSound.m → Finch/RevolverSound.m
@@ -26,7 +26,7 @@ - (void) dealloc
 
 - (void) play
 {
-    [[sounds objectAtIndex:current] play];
+    [(Sound*) [sounds objectAtIndex:current] play];
     current = (current + 1) % [sounds count];
 }
 

diff --git a/Source/Sound.h → Finch/Sound.h b/Source/Sound.h → Finch/Sound.h
diff --git a/Source/Sound.m → Finch/Sound.m b/Source/Sound.m → Finch/Sound.m
diff --git a/Source/Finch.h b/Source/Finch.h
diff --git a/prefix.pch b/prefix.pch
@@ -0,0 +1,3 @@
+#ifdef __OBJC__
+    #import <Foundation/Foundation.h>
+#endif
diff --git a/todo.md b/todo.md
@@ -5,3 +5,6 @@ Design Notes
 * If we want the decoder stuff to be useful for other people, we have to separate
   the file reading from decoding and we have to decode the audio in chunks if the
   caller wants to.
+* “A tip for when you want to add panning to Finch – move (AL_POSITION) the
+  listener or the source slightly from the default Z position (0.0f) to get
+  smooth panning.”