audio::setup() now loads audio configuration from file

ksterker · Mar 20, 2010 · 38539ea · 38539ea
1 parent 3e6fdae
commit 38539ea
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/audio/audio.cc b/src/audio/audio.cc
@@ -30,6 +30,7 @@
 
 #include "event/manager.h"
 #include "audio/audio.h"
+#include "audio/audio_manager.h"
 #include "audio/sound.h"
 #include "audio/audio_event.h"
 #include "base/paths.h"
@@ -153,8 +154,21 @@ namespace audio
     // setup from configuration
     void setup (base::configuration & cfg)
     {
-        // TODO: read options from configuration and use during initialization
-
+        audio_manager::set_audio_buffers (
+            cfg.get_int ("Audio", "BufferSize", DEFAULT_AUDIO_BUFFERS)
+        );
+        audio_manager::set_audio_channels (
+            cfg.get_int ("Audio", "Channels", DEFAULT_AUDIO_CHANNELS)
+        );
+        audio_manager::set_audio_format (
+            cfg.get_int ("Audio", "Format", DEFAULT_AUDIO_FORMAT)
+        );
+        audio_manager::set_audio_mixchannels (
+            cfg.get_int ("Audio", "Mixchannels", DEFAULT_AUDIO_MIXCHANNELS)
+        );
+        audio_manager::set_audio_rate (
+            cfg.get_int ("Audio", "Rate", DEFAULT_AUDIO_RATE)
+        );
     }
 
     // shutdown audio

diff --git a/src/audio/test_audio.cc b/src/audio/test_audio.cc
@@ -65,11 +65,11 @@ namespace audio
     TEST_F(audio_Test, setup_Default) {
         audio::setup(cfg);
 
-        EXPECT_EQ(44100,     audio_manager::get_audio_rate());
-        EXPECT_EQ(AUDIO_S16, audio_manager::get_audio_format());
-        EXPECT_EQ(2,         audio_manager::get_audio_channels());
-        EXPECT_EQ(4096,      audio_manager::get_audio_buffers());
-        EXPECT_EQ(16,        audio_manager::get_audio_mixchannels());
+        EXPECT_EQ(DEFAULT_AUDIO_BUFFERS,     audio_manager::get_audio_buffers()    );
+        EXPECT_EQ(DEFAULT_AUDIO_CHANNELS,    audio_manager::get_audio_channels()   );
+        EXPECT_EQ(DEFAULT_AUDIO_FORMAT,      audio_manager::get_audio_format()     );
+        EXPECT_EQ(DEFAULT_AUDIO_MIXCHANNELS, audio_manager::get_audio_mixchannels());
+        EXPECT_EQ(DEFAULT_AUDIO_RATE,        audio_manager::get_audio_rate()       );
     }
 
 } // namespace{}