Revert "Load audio earlier in the process. Might save us some time"
authorTobias Markus <tobbi@mozilla-uk.org>
Thu, 19 Mar 2015 23:45:43 +0000 (00:45 +0100)
committerTobias Markus <tobbi@mozilla-uk.org>
Thu, 19 Mar 2015 23:45:43 +0000 (00:45 +0100)
This reverts commit c0e497c19521c1868f44c0fd21bbf666a66654be.

src/supertux/main.cpp

index 17571a3..1cfba9c 100644 (file)
@@ -299,11 +299,6 @@ Main::launch_game()
   SDLSubsystem sdl_subsystem;
   ConsoleBuffer console_buffer;
 
-  timelog("audio");
-  SoundManager sound_manager;
-  sound_manager.enable_sound(g_config->sound_enabled);
-  sound_manager.enable_music(g_config->music_enabled);
-
   timelog("controller");
   InputManager input_manager(g_config->keyboard_config, g_config->joystick_config);
 
@@ -314,6 +309,11 @@ Main::launch_game()
   DrawingContext context(*video_system);
   init_video();
 
+  timelog("audio");
+  SoundManager sound_manager;
+  sound_manager.enable_sound(g_config->sound_enabled);
+  sound_manager.enable_music(g_config->music_enabled);
+
   Console console(console_buffer);
 
   timelog("scripting");