Added flac and fixed more stuff

Author: kunitoki

cmake/yup_modules.cmake

@@ -835,6 +835,7 @@ macro (yup_add_default_modules modules_path)
     yup_add_module (${modules_path}/thirdparty/pffft_library "${modules_definitions}" ${thirdparty_group})
     yup_add_module (${modules_path}/thirdparty/dr_libs "${modules_definitions}" ${thirdparty_group})
     yup_add_module (${modules_path}/thirdparty/opus_library "${modules_definitions}" ${thirdparty_group})
+    yup_add_module (${modules_path}/thirdparty/flac_library "${modules_definitions}" ${thirdparty_group})
 
     # ==== Yup modules
     set (modules_group "Modules")

examples/graphics/CMakeLists.txt

@@ -75,6 +75,7 @@ yup_standalone_app (
         yup::yup_audio_formats
         pffft_library
         opus_library
+        flac_library
         dr_libs
         libpng
         libwebp

examples/graphics/data/break_boomblastic_92bpm.flac

@@ -214,10 +214,10 @@ class ConvolutionDemo
                            .getParentDirectory()
                            .getChildFile ("data");
 
-        yup::File audioFile = dataDir.getChildFile ("break_boomblastic_92bpm.wav");
+        yup::File audioFile = dataDir.getChildFile ("break_boomblastic_92bpm.flac");
         if (! audioFile.existsAsFile())
         {
-            std::cerr << "Could not find break_boomblastic_92bpm.wav" << std::endl;
+            std::cerr << "Could not find break_boomblastic_92bpm.flac" << std::endl;
             return;
         }
 

examples/graphics/source/examples/ConvolutionDemo.h

@@ -239,10 +239,10 @@ class CrossoverDemo : public yup::Component
                            .getParentDirectory()
                            .getChildFile ("data");
 
-        yup::File audioFile = dataDir.getChildFile ("break_boomblastic_92bpm.opus");
+        yup::File audioFile = dataDir.getChildFile ("break_boomblastic_92bpm.mp3");
         if (! audioFile.existsAsFile())
         {
-            std::cerr << "Could not find break_boomblastic_92bpm.wav" << std::endl;
+            std::cerr << "Could not find break_boomblastic_92bpm.mp3" << std::endl;
             return;
         }
 

examples/graphics/source/examples/CrossoverDemo.h

@@ -29,17 +29,25 @@ AudioFormatManager::AudioFormatManager()
 void AudioFormatManager::registerDefaultFormats()
 {
     // Register Wave format
+#if YUP_AUDIO_FORMAT_WAVE
     registerFormat (std::make_unique<WaveAudioFormat>());
+#endif
+
+#if YUP_AUDIO_FORMAT_MP3
+    registerFormat (std::make_unique<Mp3AudioFormat>());
+#endif
 
-#if YUP_MODULE_AVAILABLE_opus_library && YUP_AUDIO_FORMAT_OPUS
+#if YUP_AUDIO_FORMAT_OPUS
     registerFormat (std::make_unique<OpusAudioFormat>());
 #endif
 
+#if YUP_AUDIO_FORMAT_FLAC
+    registerFormat (std::make_unique<FlacAudioFormat>());
+#endif
+
     // TODO: Add other formats like:
     // registerFormat (std::make_unique<AiffAudioFormat>());
-    // registerFormat (std::make_unique<FlacAudioFormat>());
     // registerFormat (std::make_unique<OggVorbisAudioFormat>());
-    // registerFormat (std::make_unique<MP3AudioFormat>());
 }
 
 void AudioFormatManager::registerFormat (std::unique_ptr<AudioFormat> format)