summaryrefslogtreecommitdiffstats
path: root/src/sound/oalsound
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2014-02-21 14:19:58 +0100
committerkrzys-h <krzys_h@interia.pl>2014-02-21 14:19:58 +0100
commitbb2a9bcfd3f63434c4bfb01a31f2ab0d64d6260b (patch)
tree4e3978ca4911d8916bb97b127cbdade5bb68b53b /src/sound/oalsound
parent2affc39b374fb83c22afb1e1deb3d82d3ab737da (diff)
downloadcolobot-bb2a9bcfd3f63434c4bfb01a31f2ab0d64d6260b.tar.gz
colobot-bb2a9bcfd3f63434c4bfb01a31f2ab0d64d6260b.tar.bz2
colobot-bb2a9bcfd3f63434c4bfb01a31f2ab0d64d6260b.zip
Added option to set pause audio in Scene
Diffstat (limited to 'src/sound/oalsound')
-rw-r--r--src/sound/oalsound/alsound.cpp4
-rw-r--r--src/sound/oalsound/alsound.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/sound/oalsound/alsound.cpp b/src/sound/oalsound/alsound.cpp
index ce109e4..ad03970 100644
--- a/src/sound/oalsound/alsound.cpp
+++ b/src/sound/oalsound/alsound.cpp
@@ -682,7 +682,7 @@ bool ALSound::PlayMusic(const std::string &filename, bool bRepeat, float fadeTim
}
-bool ALSound::PlayPauseMusic(const std::string &filename)
+bool ALSound::PlayPauseMusic(const std::string &filename, bool repeat)
{
if (m_previousMusic.fadeTime > 0.0f)
{
@@ -703,7 +703,7 @@ bool ALSound::PlayPauseMusic(const std::string &filename)
m_currentMusic = nullptr;
}
}
- return PlayMusic(filename, true);
+ return PlayMusic(filename, repeat);
}
diff --git a/src/sound/oalsound/alsound.h b/src/sound/oalsound/alsound.h
index 4113098..bb9bf28 100644
--- a/src/sound/oalsound/alsound.h
+++ b/src/sound/oalsound/alsound.h
@@ -78,7 +78,7 @@ public:
void SuspendMusic();
void StopMusic(float fadeTime=2.0f);
bool IsPlayingMusic();
- bool PlayPauseMusic(const std::string &filename);
+ bool PlayPauseMusic(const std::string &filename, bool repeat);
void StopPauseMusic();
bool CheckChannel(int &channel);