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

osinoleg · osinoleg · commit 55f6e0932e67 · 2014-08-12T15:05:53.000-07:00
diff --git a/Resources/Sounds/sound.ogg b/Resources/Sounds/sound.ogg
diff --git a/cocos2d-ui-tests/tests/ObjectALTest.m b/cocos2d-ui-tests/tests/ObjectALTest.m
@@ -49,7 +49,11 @@ - (void) setupSimpleAudioTest
 
 - (void) playSimpleSound:(id)sender
 {
+#if ANDROID
+    [[OALSimpleAudio sharedInstance] playEffect:@"Sounds/sound.ogg"];
+#else
     [[OALSimpleAudio sharedInstance] playEffect:@"Sounds/sound.wav"];
+#endif
 }
 
 
diff --git a/external/ObjectAL/OALSimpleAudio.m b/external/ObjectAL/OALSimpleAudio.m
@@ -312,7 +312,7 @@ - (void) setPaused:(bool) value
 
 - (bool) honorSilentSwitch
 {
-#if ANDROID
+#if __CC_PLATFORM_ANDROID
 #warning honorSilentSwitch not implemented
     return false;
 #else
@@ -322,7 +322,7 @@ - (bool) honorSilentSwitch
 
 - (void) setHonorSilentSwitch:(bool) value
 {
-#if ANDROID
+#if __CC_PLATFORM_ANDROID
 #warning setHonorSilentSwitch not implemented
 #else
 	[OALAudioSession sharedInstance].honorSilentSwitch = value;
diff --git a/external/ObjectAL/Support/OALAudioFile.m b/external/ObjectAL/Support/OALAudioFile.m
@@ -180,9 +180,6 @@ - (void) dealloc
 		fileHandle = nil;
 	}
 #elif __CC_PLATFORM_ANDROID
-	if (oggPath) {
-		free((void*)oggPath);
-	}
 	if (rawFILE) {
 		fclose(rawFILE);
 	}

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,11 @@ - (void) setupSimpleAudioTest`
`49`	`49`
`50`	`50`	`- (void) playSimpleSound:(id)sender`
`51`	`51`	`{`
	`52`	`+#if ANDROID`
	`53`	`+ [[OALSimpleAudio sharedInstance] playEffect:@"Sounds/sound.ogg"];`
	`54`	`+#else`
`52`	`55`	`[[OALSimpleAudio sharedInstance] playEffect:@"Sounds/sound.wav"];`
	`56`	`+#endif`
`53`	`57`	`}`
`54`	`58`
`55`	`59`