Enabled CoreAudio sound decoder support on iOS

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-02-22 22:17:17 -04:00
parent aac4b3487a
commit 182792de85
4 changed files with 9 additions and 6 deletions
@@ -3797,6 +3797,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
LOVE_SUPPORT_IMAGEIO, LOVE_SUPPORT_IMAGEIO,
LOVE_SUPPORT_COREAUDIO,
LOVE_NO_TURBOJPEG, LOVE_NO_TURBOJPEG,
LOVE_NO_MODPLUG, LOVE_NO_MODPLUG,
LOVE_NOMPG123, LOVE_NOMPG123,
@@ -3840,6 +3841,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
LOVE_SUPPORT_IMAGEIO, LOVE_SUPPORT_IMAGEIO,
LOVE_SUPPORT_COREAUDIO,
LOVE_NO_TURBOJPEG, LOVE_NO_TURBOJPEG,
LOVE_NO_MODPLUG, LOVE_NO_MODPLUG,
LOVE_NOMPG123, LOVE_NOMPG123,
@@ -3883,6 +3885,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
LOVE_SUPPORT_IMAGEIO, LOVE_SUPPORT_IMAGEIO,
LOVE_SUPPORT_COREAUDIO,
LOVE_NO_TURBOJPEG, LOVE_NO_TURBOJPEG,
LOVE_NO_MODPLUG, LOVE_NO_MODPLUG,
LOVE_NOMPG123, LOVE_NOMPG123,
@@ -18,7 +18,7 @@
* 3. This notice may not be removed or altered from any source distribution. * 3. This notice may not be removed or altered from any source distribution.
**/ **/
#ifdef LOVE_SUPPORT_CORE_AUDIO #ifdef LOVE_SUPPORT_COREAUDIO
// LOVE // LOVE
#include "CoreAudioDecoder.h" #include "CoreAudioDecoder.h"
@@ -271,4 +271,4 @@ int CoreAudioDecoder::getBitDepth() const
} // sound } // sound
} // love } // love
#endif // LOVE_SUPPORT_CORE_AUDIO #endif // LOVE_SUPPORT_COREAUDIO
+2 -2
View File
@@ -23,7 +23,7 @@
#include "common/config.h" #include "common/config.h"
#ifdef LOVE_SUPPORT_CORE_AUDIO #ifdef LOVE_SUPPORT_COREAUDIO
// LOVE // LOVE
#include "common/Data.h" #include "common/Data.h"
@@ -76,6 +76,6 @@ private:
} // sound } // sound
} // love } // love
#endif // LOVE_SUPPORT_CORE_AUDIO #endif // LOVE_SUPPORT_COREAUDIO
#endif // LOVE_SOUND_LULLABY_CORE_AUDIO_DECODER_H #endif // LOVE_SOUND_LULLABY_CORE_AUDIO_DECODER_H
+2 -2
View File
@@ -34,7 +34,7 @@
# include "Mpg123Decoder.h" # include "Mpg123Decoder.h"
#endif // LOVE_NOMPG123 #endif // LOVE_NOMPG123
#ifdef LOVE_SUPPORT_CORE_AUDIO #ifdef LOVE_SUPPORT_COREAUDIO
# include "CoreAudioDecoder.h" # include "CoreAudioDecoder.h"
#endif #endif
@@ -85,7 +85,7 @@ sound::Decoder *Sound::newDecoder(love::filesystem::FileData *data, int bufferSi
else if (GmeDecoder::accepts(ext)) else if (GmeDecoder::accepts(ext))
decoder = new GmeDecoder(data, ext, bufferSize); decoder = new GmeDecoder(data, ext, bufferSize);
#endif // LOVE_SUPPORT_GME #endif // LOVE_SUPPORT_GME
#ifdef LOVE_SUPPORT_CORE_AUDIO #ifdef LOVE_SUPPORT_COREAUDIO
else if (CoreAudioDecoder::accepts(ext)) else if (CoreAudioDecoder::accepts(ext))
decoder = new CoreAudioDecoder(data, ext, bufferSize); decoder = new CoreAudioDecoder(data, ext, bufferSize);
#endif #endif