ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1975 from Flakebi/sound

Browse Source 
Set correct volume for last lap music
This commit is contained in:
hiker 2015-02-12 08:02:10 +11:00
commit 2d5f78974a
6 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/audio/music.hpp
View File

@ -35,7 +35,6 @@ public:
virtual bool pauseMusic () = 0;
virtual bool resumeMusic () = 0;
virtual void setVolume (float volume) = 0;
virtual void updateFading(float percent) = 0;
virtual void updateFaster(float percent, float pitch) = 0;
virtual void update () = 0;
virtual bool isPlaying () = 0;

1
src/audio/music_dummy.hpp
View File

@ -35,7 +35,6 @@ public:
virtual bool pauseMusic () { return true; }
virtual bool resumeMusic () { return true; }
virtual void setVolume (float volume) {}
virtual void updateFading(float percent) {}
virtual void updateFaster(float percent, float pitch) {}
virtual void update () {}
virtual bool isPlaying () { return false; }

5
src/audio/music_information.cpp
View File

@ -223,8 +223,8 @@ void MusicInformation::update(float dt)
return;
}
float fraction=m_time_since_faster/m_faster_time;
m_normal_music->updateFading(1-fraction);
m_fast_music->updateFading(fraction);
m_normal_music->setVolume(1-fraction);
m_fast_music->setVolume(fraction);
break;
}
case SOUND_FASTER: {
@ -322,6 +322,7 @@ void MusicInformation::switchToFastMusic()
{
m_mode = SOUND_FADING;
m_fast_music->playMusic();
m_fast_music->setVolume(0);
}
else
{

7
src/audio/music_ogg.cpp
View File

@ -257,13 +257,6 @@ void MusicOggStream::setVolume(float volume)
check("volume music"); // clear errors
} // setVolume
//-----------------------------------------------------------------------------
void MusicOggStream::updateFading(float percent)
{
alSourcef(m_soundSource,AL_GAIN,percent);
update();
} // updateFading
//-----------------------------------------------------------------------------
void MusicOggStream::updateFaster(float percent, float max_pitch)
{

1
src/audio/music_ogg.hpp
View File

@ -51,7 +51,6 @@ public:
virtual ~MusicOggStream();
virtual void update();
virtual void updateFading(float percent);
virtual void updateFaster(float percent, float max_pitch);
virtual bool load(const std::string& filename);

3
src/audio/sfx_manager.cpp
View File

@ -889,7 +889,7 @@ void SFXManager::positionListener(const Vec3 &position, const Vec3 &front,
void SFXManager::reallyPositionListenerNow()
{
#if HAVE_OGGVORBIS
if (!UserConfigParams::m_sfx || !m_initialized) return;
if (!sfxAllowed()) return;
m_listener_position.lock();
{
@ -949,4 +949,3 @@ SFXBase* SFXManager::quickSound(const std::string &sound_type)
} // quickSound