Main menu music.

audio.cpp

@@ -42,7 +42,7 @@ AudioManager::AudioManager()
 	}
 
 	_musicSource = 0;
-	_musicBuffer = 0;
+	_mapMusicBuffer = 0;
 	alGenSources(1, &_musicSource);
 
 	loadWAV("./data/sounds/alarm.wav");
@@ -63,6 +63,8 @@ AudioManager::AudioManager()
 	loadWAV("./data/sounds/elevator_arrive.wav");
 	loadWAV("./data/sounds/elevator_leave.wav");
 	loadWAV("./data/sounds/elevator_decelerate.wav");
+	_mainmenuMusicBuffer = bufferFromOGG("./data/music/ontheground.ogg");
+	_playingMenuMusic = false;
 }
 
 AudioManager::~AudioManager()
@@ -78,9 +80,14 @@ AudioManager::~AudioManager()
 
 	alDeleteSources(1, &_musicSource);
 
-	if (_musicBuffer != 0)
+	if (_mapMusicBuffer != 0)
 	{
-		alDeleteBuffers(1, &_musicBuffer);
+		alDeleteBuffers(1, &_mapMusicBuffer);
+	}
+
+	if (_mainmenuMusicBuffer != 0)
+	{
+		alDeleteBuffers(1, &_mainmenuMusicBuffer);
 	}
 
 	std::map<std::string, ALuint>::iterator it;
@@ -107,31 +114,50 @@ void AudioManager::playSound(std::string filename)
 	alSourcePlay(src);
 }
 
-void AudioManager::playMusic(std::string filename)
+void AudioManager::playMapMusic(std::string filename)
 {
-	if (_musicBuffer != 0)
+	if (_mapMusicBuffer != 0)
 	{
-		alDeleteBuffers(1, &_musicBuffer);
-		_musicBuffer = 0;
+		alDeleteBuffers(1, &_mapMusicBuffer);
+		_mapMusicBuffer = 0;
 	}
 
-	_musicBuffer = bufferFromOGG("./data/music/" + filename);
+	_mapMusicBuffer = bufferFromOGG("./data/music/" + filename);
+
+	if (_playingMenuMusic)
+	{
+		alSourceStop(_musicSource);
+	}
+	_playingMenuMusic = false;
+	playMusic(_mapMusicBuffer);
+}
 
-	if (_musicBuffer == 0)
+void AudioManager::playMenuMusic()
+{
+	if (_playingMenuMusic)
+		return;
+
+	_playingMenuMusic = true;
+	playMusic(_mainmenuMusicBuffer);
+}
+
+void AudioManager::playMusic(ALuint buf)
+{
+	if (buf == 0)
 	{
 		return;
 	}
 
-	alSourcei(_musicSource, AL_BUFFER, _musicBuffer);
+	alSourcei(_musicSource, AL_BUFFER, buf);
 	alSource3f(_musicSource, AL_POSITION, 0, 0, 0);
 	alSourcei(_musicSource, AL_LOOPING, 1);
 	alSourcePlay(_musicSource);
 }
 
 void AudioManager::stopMusic()
 {
-	alDeleteBuffers(1, &_musicBuffer);
-	_musicBuffer = 0;
+	alDeleteBuffers(1, &_mapMusicBuffer);
+	_mapMusicBuffer = 0;
 	alSourceStop(_musicSource);
 }
 

audio.h

@@ -35,7 +35,9 @@ class AudioManager
 	AudioManager();
 	~AudioManager();
 	void playSound(std::string filename);
-	void playMusic(std::string filename);
+	void playMapMusic(std::string filename);
+	void playMenuMusic();
+	void playMusic(ALuint buf);
 	void stopMusic();
 	void playSound3D(const char* filename, float x, float y, float z);
 	void loadWAV(std::string filename);
@@ -48,9 +50,11 @@ class AudioManager
 	std::map<std::string, ALuint> _loadedBuffers;
 	std::vector<ALuint> _loadedSources;
 	ALuint _musicSource;
-	ALuint _musicBuffer;
+	ALuint _mapMusicBuffer;
+	ALuint _mainmenuMusicBuffer;
 	ALCdevice* _device;
 	ALCcontext* _context;
+	bool _playingMenuMusic;
 };
 
 #endif

loadingmapstate.cpp

@@ -39,7 +39,7 @@ void LoadingMapState::update(unsigned int dT)
 	{
 		_manager->initSceneAndMap(_mapFilename.c_str());
 		_manager->makeStartSave();
-		Locator::getAudio()->playMusic(_mapMusicFilename);
+		Locator::getAudio()->playMapMusic(_mapMusicFilename);
 		_loaded = true;
 	}
 

readme.txt

@@ -126,7 +126,7 @@ Credits:
 			- CC0 http://creativecommons.org/publicdomain/zero/1.0/
 
 	Music
-		1. groove_grove.ogg, brittle_rille.ogg, ultralounge.ogg
+		1. groove_grove.ogg, brittle_rille.ogg, ultralounge.ogg, ontheground.ogg
 			- By Kevin MacLeod
 			- incompetech.com
 			- CC BY 3.0 http://creativecommons.org/licenses/by/3.0/

statemanager.cpp

@@ -46,6 +46,8 @@ StateManager::StateManager()
 	_settingsChanged = false;
 	_activeMapFilename = "";
 	_mapMusicFilename = "";
+
+	Locator::getAudio()->playMenuMusic();
 }
 
 StateManager::~StateManager()
@@ -85,6 +87,7 @@ void StateManager::switchToState(eState state)
 	switch(state)
 	{
 	case MAINMENU_SCREEN:
+		Locator::getAudio()->playMenuMusic();
 		_activeState = _mainMenuState;
 		break;
 	case GAME_SCREEN:
@@ -109,6 +112,7 @@ void StateManager::switchToState(eState state)
 		_activeState = _pauseState;
 		break;
 	case LOADINGMAP_SCREEN:
+		Locator::getAudio()->stopMusic();
 		getMusicFilename(_activeMapFilename);
 		lms->setMap(_activeMapFilename, _mapMusicFilename);
 		_activeState = _loadingMapState;