Browse Source

Enabled CoreAudio sound decoder support on iOS

--HG--
branch : minor
Alex Szpakowski 10 years ago
parent
commit
182792de85

+ 3 - 0
platform/xcode/liblove.xcodeproj/project.pbxproj

@@ -3797,6 +3797,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					LOVE_SUPPORT_IMAGEIO,
+					LOVE_SUPPORT_COREAUDIO,
 					LOVE_NO_TURBOJPEG,
 					LOVE_NO_MODPLUG,
 					LOVE_NOMPG123,
@@ -3840,6 +3841,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					LOVE_SUPPORT_IMAGEIO,
+					LOVE_SUPPORT_COREAUDIO,
 					LOVE_NO_TURBOJPEG,
 					LOVE_NO_MODPLUG,
 					LOVE_NOMPG123,
@@ -3883,6 +3885,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					LOVE_SUPPORT_IMAGEIO,
+					LOVE_SUPPORT_COREAUDIO,
 					LOVE_NO_TURBOJPEG,
 					LOVE_NO_MODPLUG,
 					LOVE_NOMPG123,

+ 2 - 2
src/modules/sound/lullaby/CoreAudioDecoder.cpp

@@ -18,7 +18,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-#ifdef LOVE_SUPPORT_CORE_AUDIO
+#ifdef LOVE_SUPPORT_COREAUDIO
 
 // LOVE
 #include "CoreAudioDecoder.h"
@@ -271,4 +271,4 @@ int CoreAudioDecoder::getBitDepth() const
 } // sound
 } // love
 
-#endif // LOVE_SUPPORT_CORE_AUDIO
+#endif // LOVE_SUPPORT_COREAUDIO

+ 2 - 2
src/modules/sound/lullaby/CoreAudioDecoder.h

@@ -23,7 +23,7 @@
 
 #include "common/config.h"
 
-#ifdef LOVE_SUPPORT_CORE_AUDIO
+#ifdef LOVE_SUPPORT_COREAUDIO
 
 // LOVE
 #include "common/Data.h"
@@ -76,6 +76,6 @@ private:
 } // sound
 } // love
 
-#endif // LOVE_SUPPORT_CORE_AUDIO
+#endif // LOVE_SUPPORT_COREAUDIO
 
 #endif // LOVE_SOUND_LULLABY_CORE_AUDIO_DECODER_H

+ 2 - 2
src/modules/sound/lullaby/Sound.cpp

@@ -34,7 +34,7 @@
 #	include "Mpg123Decoder.h"
 #endif // LOVE_NOMPG123
 
-#ifdef LOVE_SUPPORT_CORE_AUDIO
+#ifdef LOVE_SUPPORT_COREAUDIO
 #	include "CoreAudioDecoder.h"
 #endif
 
@@ -85,7 +85,7 @@ sound::Decoder *Sound::newDecoder(love::filesystem::FileData *data, int bufferSi
 	else if (GmeDecoder::accepts(ext))
 		decoder = new GmeDecoder(data, ext, bufferSize);
 #endif // LOVE_SUPPORT_GME
-#ifdef LOVE_SUPPORT_CORE_AUDIO
+#ifdef LOVE_SUPPORT_COREAUDIO
 	else if (CoreAudioDecoder::accepts(ext))
 		decoder = new CoreAudioDecoder(data, ext, bufferSize);
 #endif