mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-28 18:29:48 +02:00
Code Issues Projects Releases Wiki Activity

now fade out of music when starting game and fade out of music when ending game

Browse Source
This commit is contained in:
Mark Vejvoda
2011-10-21 19:52:55 +00:00
parent c6d4e898a0
commit 14736ddfb7
11 changed files with 94 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/include/sound/ds8/sound_player_ds8.h
View File

@@ -117,7 +117,7 @@ public:
virtual void play(StaticSound *staticSound);
virtual void play(StrSound *strSound, int64 fadeOn=0);
virtual void stop(StrSound *strSound, int64 fadeOff=0);
virtual void stopAllSounds();
virtual void stopAllSounds(int64 fadeOff=0);
virtual void updateStreams(); //updates str buffers if needed
private:

2
source/shared_lib/include/sound/openal/sound_player_openal.h
View File

@@ -100,7 +100,7 @@ public:
virtual void play(StaticSound *staticSound);
virtual void play(StrSound *strSound, int64 fadeOn=0);
virtual void stop(StrSound *strSound, int64 fadeOff=0);
virtual void stopAllSounds();
virtual void stopAllSounds(int64 fadeOff=0);
virtual void updateStreams(); //updates str buffers if needed
private:

2
source/shared_lib/include/sound/sound_player.h
View File

@@ -54,7 +54,7 @@ public:
virtual void play(StaticSound *staticSound)= 0;
virtual void play(StrSound *strSound, int64 fadeOn=0)= 0; //delay and fade in miliseconds
virtual void stop(StrSound *strSound, int64 fadeOff=0)= 0;
virtual void stopAllSounds()= 0;
virtual void stopAllSounds(int64 fadeOff=0)= 0;
virtual void updateStreams()= 0;
virtual bool wasInitOk() const { return initOk; }
};

4
source/shared_lib/sources/sound/ds8/sound_player_ds8.cpp
View File

@@ -427,12 +427,12 @@ void SoundPlayerDs8::stop(StrSound *strSound, int64 fadeOff){
}
}
void SoundPlayerDs8::stopAllSounds(){
void SoundPlayerDs8::stopAllSounds(int64 fadeOff){
if(initOk == false) return;
for(unsigned int i=0; i<params.strBufferCount; ++i){
if(!strSoundBuffers[i].isFree()){
strSoundBuffers[i].stop(0);
strSoundBuffers[i].stop(fadeOff);
strSoundBuffers[i].end();
}
}

4
source/shared_lib/sources/sound/openal/sound_player_openal.cpp
View File

@@ -505,7 +505,7 @@ void SoundPlayerOpenAL::stop(StrSound* strSound, int64 fadeOff) {
}
}
void SoundPlayerOpenAL::stopAllSounds() {
void SoundPlayerOpenAL::stopAllSounds(int64 fadeOff) {
if(initOk == false) return;
for(StaticSoundSources::iterator i = staticSources.begin();
@@ -516,7 +516,7 @@ void SoundPlayerOpenAL::stopAllSounds() {
for(StreamSoundSources::iterator i = streamSources.begin();
i != streamSources.end(); ++i) {
StreamSoundSource* source = *i;
source->stop();
source->stop(fadeOff);
}
}