Merge branch 'headless-develop' of github.com:spritebuilder/cocos2d-swift into headless-develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: darvin

cocos2d-ios.xcodeproj/project.pbxproj

@@ -2319,8 +2319,8 @@
 			buildConfigurationList = D2FEB74C194F6C9E00FC0574 /* Build configuration list for PBXNativeTarget "cocos2dAndroid" */;
 			buildPhases = (
 				D2FEB610194F6C9E00FC0574 /* Headers */,
-				D2FEB6B8194F6C9E00FC0574 /* Sources */,
 				D2FEB740194F6C9E00FC0574 /* Frameworks */,
+				D2FEB6B8194F6C9E00FC0574 /* Sources */,
 			);
 			buildRules = (
 			);
@@ -3023,6 +3023,8 @@
 					"$(SRCROOT)/external/Chipmunk/include",
 					"$(SRCROOT)/external/Chipmunk/objectivec/include",
 					"$(SRCROOT)/external/ObjectAL/**",
+					"$(SRCROOT)/external/tremor/include",
+					"$(SRCROOT)/external/ogg/include",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3068,6 +3070,8 @@
 					"$(SRCROOT)/external/Chipmunk/include",
 					"$(SRCROOT)/external/Chipmunk/objectivec/include",
 					"$(SRCROOT)/external/ObjectAL/**",
+					"$(SRCROOT)/external/tremor/include",
+					"$(SRCROOT)/external/ogg/include",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",

external/ObjectAL/AudioTrack/OALAudioTrack.m

@@ -257,7 +257,7 @@ - (void) dealloc
 #if __CC_PLATFORM_IOS || __CC_PLATFORM_MAC
     player.delegate = nil;
 #elif __CC_PLATFORM_ANDROID
-#warning missing delegate from android media player
+    [player setOnCompletionListener:nil];
 #endif
     [player stop];
 
@@ -897,7 +897,6 @@ - (bool) play
             [player seekToMsec:(int32_t)(currentTime * 1000)];
         }
         [self _updateVolume];
-#warning  FIXME
         [player setLooping:(-1 == numberOfLoops) ? YES : NO];
         paused = NO;
         [player start];
@@ -929,7 +928,6 @@ - (bool) playAtTime:(NSTimeInterval) time
         [player stop];
         [player seekToMsec:(int32_t)(currentTime * 1000)];
         [self _updateVolume];
-#warning FIXME looping
         [player setLooping:(-1 == numberOfLoops) ? YES : NO];
         paused = NO;
         [player start];

external/ObjectAL/OALSimpleAudio.m

@@ -313,7 +313,7 @@ - (void) setPaused:(bool) value
 - (bool) honorSilentSwitch
 {
 #if ANDROID
-#warning TODO: FIXME
+#warning honorSilentSwitch not implemented
     return false;
 #else
 	return [OALAudioSession sharedInstance].honorSilentSwitch;
@@ -323,7 +323,7 @@ - (bool) honorSilentSwitch
 - (void) setHonorSilentSwitch:(bool) value
 {
 #if ANDROID
-#warning TODO: FIXME
+#warning setHonorSilentSwitch not implemented
 #else
 	[OALAudioSession sharedInstance].honorSilentSwitch = value;
 #endif
@@ -659,7 +659,7 @@ - (void) unloadAllEffects
 		return nil;
 	}
 
-#if __CC_PLATFORM_ANDROID
+#if 0 // __CC_PLATFORM_ANDROID
     // TODO: we are creating a player and throwing it away each time, and not taking into account if it was preloaded.
     // think about checking for preload and implement the player's asyncPrepare finish listener
     AndroidAssetFileDescriptor *assetFd = [[[CCActivity currentActivity] assets] openFdWithFileName:filePath];
@@ -730,7 +730,7 @@ - (void) resetToDefault
 - (bool) manuallySuspended
 {
 #if ANDROID
-#warning TODO: FIXME
+#warning manuallySuspended not implemented
     return false;
 #else
 	return [OALAudioSession sharedInstance].manuallySuspended;
@@ -740,7 +740,7 @@ - (bool) manuallySuspended
 - (void) setManuallySuspended:(bool) value
 {
 #if ANDROID
-#warning TODO: FIXME
+#warning setManuallySuspended not implemented
 #else
 	[OALAudioSession sharedInstance].manuallySuspended = value;
 #endif
@@ -749,7 +749,7 @@ - (void) setManuallySuspended:(bool) value
 - (bool) interrupted
 {
 #if ANDROID
-#warning TODO: FIXME
+#warning interrupted not implemented
     return false;
 #else
 	return [OALAudioSession sharedInstance].interrupted;
@@ -759,7 +759,7 @@ - (bool) interrupted
 - (bool) suspended
 {
 #if ANDROID
-#warning TODO: FIXME
+#warning suspended not implemented
     return false;
 #else
 	return [OALAudioSession sharedInstance].suspended;

external/ObjectAL/OpenAL/OpenALManager.m

@@ -121,12 +121,8 @@ - (void) dealloc
 
 - (void)main
 {
-#if ANDROID 
-#warning TODO: FIXME
-#else
 	ALBuffer* buffer = [OALAudioFile bufferFromUrl:url reduceToMono:reduceToMono];
 	[target performSelectorOnMainThread:selector withObject:buffer waitUntilDone:NO];
-#endif
 }
 
 @end
@@ -353,12 +349,7 @@ - (ALBuffer*) bufferFromFile:(NSString*) filePath
 
 - (ALBuffer*) bufferFromFile:(NSString*) filePath reduceToMono:(bool) reduceToMono
 {
-#if ANDROID
-#warning TODO: FIXME
-    return nil;
-#else
 	return [self bufferFromUrl:[OALTools urlForPath:filePath] reduceToMono:reduceToMono];
-#endif
 }
 
 - (ALBuffer*) bufferFromUrl:(NSURL*) url
@@ -369,12 +360,7 @@ - (ALBuffer*) bufferFromUrl:(NSURL*) url
 - (ALBuffer*) bufferFromUrl:(NSURL*) url reduceToMono:(bool) reduceToMono
 {
 	OAL_LOG_DEBUG(@"Load buffer from %@", url);
-#if ANDROID
-#warning TODO: FIXME
-    return nil;
-#else
 	return [OALAudioFile bufferFromUrl:url reduceToMono:reduceToMono];
-#endif
 }
 
 - (NSString*) bufferAsyncFromFile:(NSString*) filePath
@@ -392,15 +378,10 @@ - (NSString*) bufferAsyncFromFile:(NSString*) filePath
 						   target:(id) target
 						 selector:(SEL) selector
 {
-#if ANDROID
-#warning TODO: FIXME
-    return nil;
-#else
 	return [self bufferAsyncFromUrl:[OALTools urlForPath:filePath]
 					   reduceToMono:reduceToMono
 							 target:target
 						   selector:selector];
-#endif
 }
 
 - (NSString*) bufferAsyncFromUrl:(NSURL*) url

external/ObjectAL/Support/OALAudioFile.h

@@ -29,9 +29,12 @@
 
 #import "ccMacros.h"
 #if __CC_PLATFORM_IOS || __CC_PLATFORM_MAC
+#import <AudioToolbox/AudioToolbox.h>
+#elif __CC_PLATFORM_ANDROID
+#import <tremor/ivorbisfile.h>
+#endif
 
 #import <Foundation/Foundation.h>
-#import <AudioToolbox/AudioToolbox.h>
 #import "ALBuffer.h"
 
 
@@ -45,21 +48,45 @@
 	bool reduceToMono;
 	SInt64 totalFrames;
 
+#if __CC_PLATFORM_IOS || __CC_PLATFORM_MAC
+
 	/** A description of the audio data in this file. */
 	AudioStreamBasicDescription streamDescription;
 
 	/** The OS specific file handle */
 	ExtAudioFileRef fileHandle;
 
+#elif __CC_PLATFORM_ANDROID
+	FILE *rawFILE;
+	OggVorbis_File oggFile;
+	const char *oggPath;
+	UInt32 sampleRate;
+	UInt32 channelsPerFrame;
+	UInt32 bitsPerChannel;
+	UInt32 bytesPerFrame;
+	UInt32 framesPerPacket;
+	UInt32 bytesPerPacket;
+#endif
+
 	/** The actual number of channels in the audio data if not reducing to mono */
 	UInt32 originalChannelsPerFrame;
 }
 
 /** The URL of the audio file */
 @property(nonatomic,readonly,retain) NSURL* url;
 
+
+#if __CC_PLATFORM_IOS || __CC_PLATFORM_MAC
 /** A description of the audio data in this file. */
 @property(nonatomic,readonly,assign) AudioStreamBasicDescription* streamDescription;
+#elif __CC_PLATFORM_ANDROID
+@property(nonatomic,readonly,assign) UInt32 sampleRate;
+@property(nonatomic,readonly,assign) UInt32 channelsPerFrame;
+@property(nonatomic,readonly,assign) UInt32 bitsPerChannel;
+@property(nonatomic,readonly,assign) UInt32 bytesPerFrame;
+@property(nonatomic,readonly,assign) UInt32 framesPerPacket;
+@property(nonatomic,readonly,assign) UInt32 bytesPerPacket;
+#endif
 
 /** The total number of audio frames in this file */
 @property(nonatomic,readonly,assign) SInt64 totalFrames;
@@ -121,4 +148,3 @@
 
 @end
 
-#endif