libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 00:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Audio debug level and fixed a bug when freeing music streams.

Browse Source 
svn-id: r26804
This commit is contained in:
Nicola Mettifogo 2007-05-12 12:56:35 +00:00
parent 069e84b33b
commit 346f0746d6
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/parallaction/parallaction.cpp
View File

@ -120,6 +120,7 @@ Parallaction::Parallaction(OSystem *syst) :
Common::addSpecialDebugLevel(kDebugGraphics, "gfx", "Gfx debug level");
Common::addSpecialDebugLevel(kDebugJobs, "jobs", "Jobs debug level");
Common::addSpecialDebugLevel(kDebugInput, "input", "Input debug level");
Common::addSpecialDebugLevel(kDebugAudio, "audio", "Audio debug level");
}

3
engines/parallaction/parallaction.h
View File

@ -51,7 +51,8 @@ enum {
kDebugDialogue = 1 << 3,
kDebugGraphics = 1 << 4,
kDebugJobs = 1 << 5,
kDebugInput = 1 << 6
kDebugInput = 1 << 6,
kDebugAudio = 1 << 7
};
enum {

17
engines/parallaction/sound.cpp
View File

@ -231,10 +231,14 @@ DosSoundMan::DosSoundMan(Parallaction *vm, MidiDriver *midiDriver) : SoundMan(vm
}
DosSoundMan::~DosSoundMan() {
debugC(1, kDebugAudio, "DosSoundMan::playMusic()");
delete _midiPlayer;
}
void DosSoundMan::playMusic() {
debugC(1, kDebugAudio, "DosSoundMan::playMusic()");
_midiPlayer->play(_musicFile);
}
@ -313,6 +317,8 @@ void AmigaSoundMan::playSfx(const char *filename, uint channel, bool looping, in
return;
}
debugC(1, kDebugAudio, "AmigaSoundMan::playSfx(%s, %i)", filename, channel);
Channel *ch = &_channels[channel];
Common::ReadStream *stream = _vm->_disk->loadSound(filename);
Audio::A8SVXDecoder decoder(*stream, ch->header, ch->data, ch->dataSize);
@ -349,6 +355,8 @@ void AmigaSoundMan::stopSfx(uint channel) {
return;
}
debugC(1, kDebugAudio, "AmigaSoundMan::stopSfx(%i)", channel);
_mixer->stopHandle(_channels[channel].handle);
free(_channels[channel].data);
_channels[channel].data = 0;
@ -357,16 +365,25 @@ void AmigaSoundMan::stopSfx(uint channel) {
void AmigaSoundMan::playMusic() {
stopMusic();
debugC(1, kDebugAudio, "AmigaSoundMan::playMusic()");
Common::ReadStream *stream = _vm->_disk->loadMusic(_musicFile);
_musicStream = Audio::makeProtrackerStream(stream);
delete stream;
debugC(3, kDebugAudio, "AmigaSoundMan::playMusic(): created new music stream");
_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _musicStream, -1, 255, 0, false, false);
}
void AmigaSoundMan::stopMusic() {
debugC(1, kDebugAudio, "AmigaSoundMan::stopMusic()");
if (_mixer->isSoundHandleActive(_musicHandle)) {
_mixer->stopHandle(_musicHandle);
delete _musicStream;
_musicStream = 0;
}
}
void AmigaSoundMan::playCharacterMusic(const char *character) {