From b9f40748d04747d81cf79812a900e380d8f45c72 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Fri, 20 Mar 2015 00:45:43 +0100 Subject: [PATCH] Revert "Load audio earlier in the process. Might save us some time" This reverts commit c0e497c19521c1868f44c0fd21bbf666a66654be. --- src/supertux/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp index 17571a3c8..1cfba9c4c 100644 --- a/src/supertux/main.cpp +++ b/src/supertux/main.cpp @@ -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"); -- 2.11.0