diff options
| author | Matthew Stewart | 2018-02-24 13:59:08 -0500 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | 2dd96e044f46aed90ed1b6dbc682bc01f43e438c (patch) | |
| tree | b0baea094d31ed729989c316750834f6a75c355e /engines/startrek/sound.cpp | |
| parent | 8cd5441959108b890d1433e70376c6cc1dd3bdb5 (diff) | |
| download | scummvm-rg350-2dd96e044f46aed90ed1b6dbc682bc01f43e438c.tar.gz scummvm-rg350-2dd96e044f46aed90ed1b6dbc682bc01f43e438c.tar.bz2 scummvm-rg350-2dd96e044f46aed90ed1b6dbc682bc01f43e438c.zip | |
STARTREK: Begin implementation of showText.
Also started using SharedPtrs.
Diffstat (limited to 'engines/startrek/sound.cpp')
| -rwxr-xr-x | engines/startrek/sound.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/startrek/sound.cpp b/engines/startrek/sound.cpp index 114ec8acec..5191fc404c 100755 --- a/engines/startrek/sound.cpp +++ b/engines/startrek/sound.cpp @@ -107,12 +107,11 @@ void Sound::playSMFSound(const char *baseSoundName) { } debug(0, "Playing sound \'%s\'\n", soundName.c_str()); - Common::SeekableReadStream *soundStream = _vm->openFile(soundName.c_str()); + SharedPtr<Common::SeekableReadStream> soundStream = _vm->openFile(soundName.c_str()); byte *soundData = (byte *)malloc(soundStream->size()); soundStream->read(soundData, soundStream->size()); _midiParser->loadMusic(soundData, soundStream->size()); - delete soundStream; _midiDriver->setTimerCallback(_midiParser, MidiParser::timerCallback); } @@ -135,12 +134,11 @@ void Sound::playXMIDISound(const char *baseSoundName) { } debug(0, "Playing sound \'%s\'\n", soundName.c_str()); - Common::SeekableReadStream *soundStream = _vm->openFile(soundName.c_str()); + SharedPtr<Common::SeekableReadStream> soundStream = _vm->openFile(soundName.c_str()); byte *soundData = (byte *)malloc(soundStream->size()); soundStream->read(soundData, soundStream->size()); _midiParser->loadMusic(soundData, soundStream->size()); - delete soundStream; _midiDriver->setTimerCallback(_midiParser, MidiParser::timerCallback); } @@ -165,7 +163,7 @@ void Sound::playAmigaSoundEffect(const char *baseSoundName) { if (_vm->_mixer->isSoundHandleActive(*_soundHandle)) _vm->_mixer->stopHandle(*_soundHandle); - Audio::AudioStream *audStream = (Audio::AudioStream *)Audio::makeRawStream(_vm->openFile(soundName.c_str()), 11025, 0); + Audio::AudioStream *audStream = (Audio::AudioStream *)Audio::makeRawStream(_vm->openFile(soundName.c_str()).get(), 11025, 0); _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, _soundHandle, audStream); } |