Allow OALAudioSession in Android OALSimpleAudio

marcsalem · marcsalem · commit 0d86b6561bee · 2014-08-19T17:07:27.000-07:00
diff --git a/external/ObjectAL/OALSimpleAudio.m b/external/ObjectAL/OALSimpleAudio.m
@@ -709,41 +709,22 @@ - (void) resetToDefault
 
 - (bool) manuallySuspended
 {
-#if ANDROID
-#warning manuallySuspended not implemented
-    return false;
-#else
 	return [OALAudioSession sharedInstance].manuallySuspended;
-#endif
 }
 
 - (void) setManuallySuspended:(bool) value
 {
-#if ANDROID
-#warning setManuallySuspended not implemented
-#else
 	[OALAudioSession sharedInstance].manuallySuspended = value;
-#endif
 }
 
 - (bool) interrupted
 {
-#if ANDROID
-#warning interrupted not implemented
-    return false;
-#else
 	return [OALAudioSession sharedInstance].interrupted;
-#endif
 }
 
 - (bool) suspended
 {
-#if ANDROID
-#warning suspended not implemented
-    return false;
-#else
 	return [OALAudioSession sharedInstance].suspended;
-#endif
 }
 
 
diff --git a/external/ObjectAL/Session/OALAudioSession.h b/external/ObjectAL/Session/OALAudioSession.h
@@ -154,7 +154,7 @@
 #endif
 
 #elif __CC_PLATFORM_ANDROID
-#warning Not implemented
+#warning audioSessionDelegate not implemented
 #endif
 
 /** If true, the audio session is active */

Original file line number	Diff line number	Diff line change
`@@ -709,41 +709,22 @@ - (void) resetToDefault`
`709`	`709`
`710`	`710`	`- (bool) manuallySuspended`
`711`	`711`	`{`
`712`		`-#if ANDROID`
`713`		`-#warning manuallySuspended not implemented`
`714`		`- return false;`
`715`		`-#else`
`716`	`712`	`return [OALAudioSession sharedInstance].manuallySuspended;`
`717`		`-#endif`
`718`	`713`	`}`
`719`	`714`
`720`	`715`	`- (void) setManuallySuspended:(bool) value`
`721`	`716`	`{`
`722`		`-#if ANDROID`
`723`		`-#warning setManuallySuspended not implemented`
`724`		`-#else`
`725`	`717`	`[OALAudioSession sharedInstance].manuallySuspended = value;`
`726`		`-#endif`
`727`	`718`	`}`
`728`	`719`
`729`	`720`	`- (bool) interrupted`
`730`	`721`	`{`
`731`		`-#if ANDROID`
`732`		`-#warning interrupted not implemented`
`733`		`- return false;`
`734`		`-#else`
`735`	`722`	`return [OALAudioSession sharedInstance].interrupted;`
`736`		`-#endif`
`737`	`723`	`}`
`738`	`724`
`739`	`725`	`- (bool) suspended`
`740`	`726`	`{`
`741`		`-#if ANDROID`
`742`		`-#warning suspended not implemented`
`743`		`- return false;`
`744`		`-#else`
`745`	`727`	`return [OALAudioSession sharedInstance].suspended;`
`746`		`-#endif`
`747`	`728`	`}`
`748`	`729`
`749`	`730`