From 6a57eabb145e5000427e38ab0c8d3bb435b2c596 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 6 Apr 2012 15:30:36 +0300
Subject: Handle failing openal init properly, add enable_sound and
 sound_volume settings

---
 src/sound_openal.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/sound_openal.cpp')

diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index 66faf40c1..c74fa276c 100644
--- a/src/sound_openal.cpp
+++ b/src/sound_openal.cpp
@@ -198,12 +198,14 @@ private:
 	std::map<int, PlayingSound*> m_sounds_playing;
 	v3f m_listener_pos;
 public:
+	bool m_is_initialized;
 	OpenALSoundManager(OnDemandSoundFetcher *fetcher):
 		m_fetcher(fetcher),
 		m_device(NULL),
 		m_context(NULL),
 		m_can_vorbis(false),
-		m_next_id(1)
+		m_next_id(1),
+		m_is_initialized(false)
 	{
 		ALCenum error = ALC_NO_ERROR;
 		
@@ -252,6 +254,8 @@ public:
 		infostream<<"Audio: Initialized: OpenAL "<<alGetString(AL_VERSION)
 				<<", using "<<alcGetString(m_device, ALC_DEVICE_SPECIFIER)
 				<<std::endl;
+
+		m_is_initialized = true;
 	}
 
 	~OpenALSoundManager()
@@ -465,6 +469,11 @@ public:
 		alListenerfv(AL_ORIENTATION, f);
 		warn_if_error(alGetError(), "updateListener");
 	}
+	
+	void setListenerGain(float gain)
+	{
+		alListenerf(AL_GAIN, gain);
+	}
 
 	int playSound(const std::string &name, bool loop, float volume)
 	{
@@ -519,6 +528,10 @@ public:
 
 ISoundManager *createOpenALSoundManager(OnDemandSoundFetcher *fetcher)
 {
-	return new OpenALSoundManager(fetcher);
+	OpenALSoundManager *m = new OpenALSoundManager(fetcher);
+	if(m->m_is_initialized)
+		return m;
+	delete m;
+	return NULL;
 };
 
-- 
cgit v1.2.3