libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted too complicated (and unneeded) volume settings code for towns driver.

Browse Source 
svn-id: r29939
This commit is contained in:
Johannes Schickel 2007-12-21 09:28:27 +00:00
parent 72e899d164
commit 1ecbde083f
3 changed files with 13 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/kyra/kyra.cpp
View File

@ -96,27 +96,10 @@ int KyraEngine::init() {
// TODO: currently we don't support the PC98 sound data,
// but since it has the FM-Towns data files, we just use the
// FM-Towns driver
// Since we handle the volume internally for our FM-Towns driver we set the global
// volume for those sound types to the maximum.
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, Audio::Mixer::kMaxMixerVolume);
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume);
if (_flags.gameID == GI_KYRA1) {
SoundTowns *snd = new SoundTowns(this, _mixer);
snd->setMusicVolume(ConfMan.getInt("music_volume"));
snd->setSoundEffectsVolume(ConfMan.getInt("sfx_volume"));
_sound = snd;
} else {
SoundTowns_v2 *snd = new SoundTowns_v2(this, _mixer);
snd->setMusicVolume(ConfMan.getInt("music_volume"));
snd->setSoundEffectsVolume(ConfMan.getInt("sfx_volume"));
_sound = snd;
}
if (_flags.gameID == GI_KYRA1)
_sound = new SoundTowns(this, _mixer);
else
_sound = new SoundTowns_v2(this, _mixer);
} else if (midiDriver == MD_ADLIB) {
_sound = new SoundAdlibPC(this, _mixer);
assert(_sound);

14
engines/kyra/sound.h
View File

@ -370,12 +370,6 @@ public:
void setVolume(int) {}
int getVolume() { return 255; }
// TODO: this should be moved to Sound or at least
// supplied by Sound as a pure virtual method.
// TODO: define ranges for those two functions
void setMusicVolume(int volume);
void setSoundEffectsVolume(int volume) { _sfxVolume = CLIP(volume, 0, 255); }
void loadSoundFile(uint file);
void playTrack(uint8 track);
@ -412,7 +406,6 @@ private:
uint _sfxFileIndex;
uint8 *_sfxFileData;
uint8 _sfxVolume;
SoundTowns_EuphonyDriver * _driver;
MidiParser * _parser;
@ -435,12 +428,6 @@ public:
void setVolume(int) {}
int getVolume() { return 255; }
// TODO: this should be moved to Sound or at least
// supplied by Sound as a pure virtual method.
// TODO: define ranges for those two functions
void setMusicVolume(int volume);
void setSoundEffectsVolume(int volume) { _sfxVolume = CLIP(volume, 0, 255); }
void loadSoundFile(uint file) {}
void playTrack(uint8 track);
@ -455,7 +442,6 @@ private:
Audio::AudioStream *_currentSFX;
Audio::SoundHandle _sfxHandle;
uint8 _sfxVolume;
//SoundTowns_v2_TwnDriver * _driver;
uint8 * _twnTrackData;

29
engines/kyra/sound_towns.cpp
View File

@ -1084,14 +1084,14 @@ void SoundTowns_EuphonyTrackQueue::initDriver() {
_driver->send(0x79B0);
}
SoundTowns::SoundTowns(KyraEngine *vm, Audio::Mixer *mixer) : Sound(vm, mixer), _lastTrack(-1),
_currentSFX(0), _sfxFileData(0), _sfxFileIndex((uint)-1), _sfxWDTable(0), _parser(0), _sfxVolume(255) {
SoundTowns::SoundTowns(KyraEngine *vm, Audio::Mixer *mixer)
: Sound(vm, mixer), _lastTrack(-1), _currentSFX(0), _sfxFileData(0),
_sfxFileIndex((uint)-1), _sfxWDTable(0), _parser(0) {
_driver = new SoundTowns_EuphonyDriver(_mixer);
int ret = open();
if (ret != MERR_ALREADY_OPEN && ret != 0) {
if (ret != MERR_ALREADY_OPEN && ret != 0)
error("couldn't open midi driver");
}
}
SoundTowns::~SoundTowns() {
@ -1190,13 +1190,6 @@ void SoundTowns::haltTrack() {
_driver->queue()->release();
}
void SoundTowns::setMusicVolume(int volume) {
volume = CLIP<int>(volume, 0, Audio::Mixer::kMaxMixerVolume);
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
_driver->setVolume(255);
}
void SoundTowns::loadSoundFile(uint file) {
if (_sfxFileIndex == file)
return;
@ -1293,7 +1286,7 @@ void SoundTowns::playSoundEffect(uint8 track) {
_currentSFX = Audio::makeLinearInputStream(sfxPlaybackBuffer, playbackBufferSize,
outputRate, Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_LITTLE_ENDIAN | Audio::Mixer::FLAG_AUTOFREE, 0, 0);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, _currentSFX, -1, _sfxVolume);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, _currentSFX);
}
void SoundTowns::beginFadeOut() {
@ -1422,9 +1415,9 @@ const uint8 SoundTowns::_sfxBTTable[256] = {
// KYRA 2
SoundTowns_v2::SoundTowns_v2(KyraEngine *vm, Audio::Mixer *mixer) :
Sound(vm, mixer), _lastTrack(-1), _currentSFX(0), /*_driver(0),*/
_twnTrackData(0), _sfxVolume(255) {
SoundTowns_v2::SoundTowns_v2(KyraEngine *vm, Audio::Mixer *mixer)
: Sound(vm, mixer), _lastTrack(-1), _currentSFX(0), /*_driver(0),*/
_twnTrackData(0) {
}
SoundTowns_v2::~SoundTowns_v2() {
@ -1448,10 +1441,6 @@ void SoundTowns_v2::process() {
AudioCD.updateCD();
}
void SoundTowns_v2::setMusicVolume(int volume) {
/* TODO */
}
void SoundTowns_v2::playTrack(uint8 track) {
if (track == _lastTrack && _musicEnabled)
return;
@ -1541,7 +1530,7 @@ void SoundTowns_v2::voicePlay(const char *file) {
_currentSFX = Audio::makeLinearInputStream(sfx, outsize, outputRate,
Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_LITTLE_ENDIAN | Audio::Mixer::FLAG_AUTOFREE, 0, 0);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, _currentSFX, -1, _sfxVolume);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, _currentSFX);
delete [] data;
}