From 812d98449da916f1549db763cb5b851bc227d54d Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Fri, 8 Jul 2011 22:23:28 +0000
Subject: [PATCH] Audio drivers have no business setting channel volumes from
 user settings

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3636 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/libs/sound/audiocore.c                      | 5 +++++
 sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c | 4 ----
 sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c         | 4 ----
 sc2/src/libs/sound/openal/audiodrv_openal.c         | 4 ----
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/sc2/src/libs/sound/audiocore.c b/sc2/src/libs/sound/audiocore.c
index a271045b9..440f63f2d 100644
--- a/sc2/src/libs/sound/audiocore.c
+++ b/sc2/src/libs/sound/audiocore.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "audiocore.h"
+#include "sound.h"
 #include "libs/log.h"
 
 static audio_Driver audiodrv;
@@ -76,6 +77,10 @@ initAudio (sint32 driver, sint32 flags)
 				"NOTICE: Try running UQM with '--sound=none' option");
 		exit (EXIT_FAILURE);
 	}
+
+	SetSFXVolume (sfxVolumeScale);
+	SetSpeechVolume (speechVolumeScale);
+	SetMusicVolume (musicVolume);
 	
 	audio_inited = true;
 	
diff --git a/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c b/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c
index 3182f4e84..b4d27a921 100644
--- a/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c
+++ b/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c
@@ -148,10 +148,6 @@ noSound_Init (audio_Driver *driver, sint32 flags)
 
 	atexit (unInitAudio);
 
-	SetSFXVolume (sfxVolumeScale);
-	SetSpeechVolume (speechVolumeScale);
-	SetMusicVolume ((COUNT)musicVolume);
-		
 	PlaybackTask = AssignTask (PlaybackTaskFunc, 1024, 
 		"nosound audio playback");
 
diff --git a/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c b/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c
index 72a1c2443..5eeedea51 100644
--- a/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c
+++ b/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c
@@ -212,10 +212,6 @@ mixSDL_Init (audio_Driver *driver, sint32 flags)
 
 	atexit (unInitAudio);
 
-	SetSFXVolume (sfxVolumeScale);
-	SetSpeechVolume (speechVolumeScale);
-	SetMusicVolume ((COUNT)musicVolume);
-				
 	SDL_PauseAudio (0);
 		
 	return 0;
diff --git a/sc2/src/libs/sound/openal/audiodrv_openal.c b/sc2/src/libs/sound/openal/audiodrv_openal.c
index 857a8bb9b..ba75fb987 100644
--- a/sc2/src/libs/sound/openal/audiodrv_openal.c
+++ b/sc2/src/libs/sound/openal/audiodrv_openal.c
@@ -193,10 +193,6 @@ openAL_Init (audio_Driver *driver, sint32 flags)
 		return -1;
 	}
 	
-	SetSFXVolume (sfxVolumeScale);
-	SetSpeechVolume (speechVolumeScale);
-	SetMusicVolume ((COUNT) musicVolume);
-
 	if (optStereoSFX)
 		alDistanceModel (AL_INVERSE_DISTANCE);
 	else