libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-04 07:41:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added trace output for IMuse doCommand codes that we're not sure

Browse Source 
are even used by the game scripts. This is in preparation for a
restructuring of the volume model.

Also removed unused get_music_volume() member.

svn-id: r10872
This commit is contained in:
Jamieson Christian 2003-10-17 16:46:06 +00:00
parent e59ce1cd5a
commit 0279ace9ae
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scumm/imuse.cpp
View File

@ -575,10 +575,6 @@ int IMuseInternal::query_queue(int param) {
}
}
int IMuseInternal::get_music_volume() {
return _music_volume;
}
int IMuseInternal::set_music_volume(uint vol) {
if (vol > 255)
vol = 255;
@ -697,9 +693,12 @@ int32 IMuseInternal::doCommand (int numargs, int a[]) {
case 6:
if (a[1] > 127)
return -1;
else
else {
warning ("IMuse doCommand(6) - setMasterVolume (%d)", a[1]);
return setMasterVolume((a[1] << 1) |(a[1] ? 0 : 1)); // Convert from 0-127 to 0-255
}
case 7:
warning ("IMuse doCommand(7) - getMasterVolume (%d)", a[1]);
return _master_volume >> 1; // Convert from 0-255 to 0-127
case 8:
return startSound(a[1]) ? 0 : -1;
@ -741,9 +740,11 @@ int32 IMuseInternal::doCommand (int numargs, int a[]) {
}
return -1;
case 16:
warning ("IMuse doCommand(16) - set_volchan (%d, %d)", a[1], a[2]);
return set_volchan(a[1], a[2]);
case 17:
if (g_scumm->_gameId != GID_SAMNMAX) {
warning ("IMuse doCommand(17) - set_channel_volume (%d, %d)", a[1], a[2]);
return set_channel_volume(a[1], a[2]);
} else {
if (a[4]) {
@ -1775,7 +1776,6 @@ void IMuse::on_timer(MidiDriver *midi) { in(); _target->on_timer(midi); out(); }
void IMuse::pause(bool paused) { in(); _target->pause(paused); out(); }
int IMuse::save_or_load(Serializer *ser, ScummEngine *scumm) { in(); int ret = _target->save_or_load(ser, scumm); out(); return ret; }
int IMuse::set_music_volume(uint vol) { in(); int ret = _target->set_music_volume(vol); out(); return ret; }
int IMuse::get_music_volume() { in(); int ret = _target->get_music_volume(); out(); return ret; }
void IMuse::setMasterVolume(int vol) { in(); _target->setMasterVolume(vol); out(); }
void IMuse::startSound(int sound) { in(); _target->startSound(sound); out(); }
void IMuse::stopSound(int sound) { in(); _target->stopSound(sound); out(); }

1
scumm/imuse.h
View File

@ -64,7 +64,6 @@ public:
void pause(bool paused);
int save_or_load(Serializer *ser, ScummEngine *scumm);
int set_music_volume(uint vol);
int get_music_volume();
void setMasterVolume(int vol);
void startSound(int sound);
void stopSound(int sound);

1
scumm/imuse_internal.h
View File

@ -454,7 +454,6 @@ public:
int terminate2();
int save_or_load(Serializer *ser, ScummEngine *scumm);
int set_music_volume(uint vol);
int get_music_volume();
int setMasterVolume(uint vol);
bool startSound(int sound);
int stopSound(int sound);