aboutsummaryrefslogtreecommitdiff
path: root/engines/lab/music.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/lab/music.cpp')
-rw-r--r--engines/lab/music.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index 42262bf8f1..8045c51044 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -45,7 +45,6 @@ namespace Lab {
Music::Music(LabEngine *vm) : _vm(vm) {
_musicFile = nullptr;
- _musicPaused = false;
_curRoomMusic = 1;
_storedPos = 0;
}
@@ -64,7 +63,6 @@ void Music::changeMusic(const Common::String filename, bool storeCurPos, bool se
if (storeCurPos)
_storedPos = _musicFile->pos();
- _musicPaused = false;
stopSoundEffect();
freeMusic();
_musicFile = _vm->_resource->openDataFile(filename);
@@ -76,7 +74,6 @@ void Music::changeMusic(const Common::String filename, bool storeCurPos, bool se
}
void Music::playSoundEffect(uint16 sampleSpeed, uint32 length, bool loop, Common::File *dataFile) {
- pauseBackMusic();
stopSoundEffect();
// NOTE: We need to use malloc(), cause this will be freed with free()
@@ -100,26 +97,9 @@ bool Music::isSoundEffectActive() const {
void Music::freeMusic() {
_vm->_mixer->stopHandle(_musicHandle);
_vm->_mixer->stopHandle(_sfxHandle);
- _musicPaused = false;
_musicFile = nullptr;
}
-void Music::pauseBackMusic() {
- if (!_musicPaused) {
- stopSoundEffect();
- _vm->_mixer->pauseHandle(_musicHandle, true);
- _musicPaused = true;
- }
-}
-
-void Music::resumeBackMusic() {
- if (_musicPaused) {
- stopSoundEffect();
- _vm->_mixer->pauseHandle(_musicHandle, false);
- _musicPaused = false;
- }
-}
-
void Music::checkRoomMusic() {
if ((_curRoomMusic == _vm->_roomNum) || !_musicFile)
return;