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

TSAGE: Removed no longer needed fields from the Fx sound driver

Browse Source
This commit is contained in:
Paul Gilbert 2011-07-29 19:57:29 +10:00
parent ea05f68046
commit 95b49a4cc3
2 changed files with 2 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
engines/tsage/sound.cpp
View File

@ -2802,20 +2802,6 @@ AdlibFxSoundDriver::AdlibFxSoundDriver(): SoundDriver() {
_mixer = _vm->_mixer; _mixer = _vm->_mixer;
_sampleRate = _mixer->getOutputRate(); _sampleRate = _mixer->getOutputRate();
_audioStream = NULL; _audioStream = NULL;
// _mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
/*
Common::set_to(_channelVoiced, _channelVoiced + ADLIB_CHANNEL_COUNT, false);
memset(_channelVolume, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
memset(_v4405E, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
memset(_v44067, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
memset(_v44070, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
memset(_v44079, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
memset(_v44082, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
_v44082[ADLIB_CHANNEL_COUNT] = 0x90;
Common::set_to(_pitchBlend, _pitchBlend + ADLIB_CHANNEL_COUNT, 0x2000);
memset(_v4409E, 0, ADLIB_CHANNEL_COUNT * sizeof(int));
_patchData = NULL;
*/
} }
AdlibFxSoundDriver::~AdlibFxSoundDriver() { AdlibFxSoundDriver::~AdlibFxSoundDriver() {
@ -2823,26 +2809,13 @@ AdlibFxSoundDriver::~AdlibFxSoundDriver() {
} }
bool AdlibFxSoundDriver::open() { bool AdlibFxSoundDriver::open() {
write209();
write(64);
write(165);
// for (int idx = 0; idx < 5000 * 16; ++idx) al = port[21h]
// _v45071 = 1;
// _v4506F = 0;
return true; return true;
} }
void AdlibFxSoundDriver::close() { void AdlibFxSoundDriver::close() {
write(208);
write211();
} }
bool AdlibFxSoundDriver::reset() { bool AdlibFxSoundDriver::reset() {
return true; return true;
} }
@ -2850,16 +2823,6 @@ const GroupData *AdlibFxSoundDriver::getGroupData() {
return &_groupData; return &_groupData;
} }
void AdlibFxSoundDriver::poll() {
if (!_masterVolume || !_channelVolume) {
if (_v45046)
write211();
} else {
if (!_v45046)
write209();
}
}
int AdlibFxSoundDriver::setMasterVolume(int volume) { int AdlibFxSoundDriver::setMasterVolume(int volume) {
int oldVolume = _masterVolume; int oldVolume = _masterVolume;
_masterVolume = volume; _masterVolume = volume;
@ -2877,7 +2840,6 @@ void AdlibFxSoundDriver::playSound(const byte *channelData, int dataOffset, int
// Set the new channel data // Set the new channel data
_channelData = channelData + dataOffset; _channelData = channelData + dataOffset;
_soundData = _channelData + 18;
// Make a copy of the buffer // Make a copy of the buffer
int dataSize = _vm->_memoryManager.getSize(channelData); int dataSize = _vm->_memoryManager.getSize(channelData);
@ -2904,10 +2866,9 @@ void AdlibFxSoundDriver::proc38(int channel, int cmd, int value) {
} }
void AdlibFxSoundDriver::proc42(int channel, int cmd, int value, int *v1, int *v2) { void AdlibFxSoundDriver::proc42(int channel, int cmd, int value, int *v1, int *v2) {
_v4506A = value; // TODO: v2 is used for flagging a reset of the timer. I'm not sure if it's needed
*v1 = _v4506B; *v1 = 0;
*v2 = 0; *v2 = 0;
_v4506B = 0;
// Note: Checking whether a playing Fx sound had finished was originally done in another // Note: Checking whether a playing Fx sound had finished was originally done in another
// method in the sample playing code. But since we're using the ScummVM audio soundsystem, // method in the sample playing code. But since we're using the ScummVM audio soundsystem,
@ -2921,23 +2882,6 @@ void AdlibFxSoundDriver::proc42(int channel, int cmd, int value, int *v1, int *v
if (!_channelData) if (!_channelData)
// Flag that sound isn't playing // Flag that sound isn't playing
*v1 = 1; *v1 = 1;
// TODO: v2 is used for flagging a reset of the timer. I'm not sure if it's needed
*v2 = 0;
}
void AdlibFxSoundDriver::write(int v) {
// No implementation
}
void AdlibFxSoundDriver::write209() {
write(209);
_v45046 = true;
}
void AdlibFxSoundDriver::write211() {
write(211);
_v45046 = false;
} }
} // End of namespace tSage } // End of namespace tSage

15
engines/tsage/sound.h
View File

@ -461,29 +461,15 @@ public:
class AdlibFxSoundDriver: public SoundDriver { class AdlibFxSoundDriver: public SoundDriver {
private: private:
Common::Queue<RegisterValue> _queue;
GroupData _groupData; GroupData _groupData;
Audio::Mixer *_mixer; Audio::Mixer *_mixer;
Audio::SoundHandle _soundHandle; Audio::SoundHandle _soundHandle;
Audio::QueuingAudioStream *_audioStream; Audio::QueuingAudioStream *_audioStream;
int _sampleRate; int _sampleRate;
int _v45062;
int _v45066;
int _v45068;
int _v4506A;
int _v4506B;
bool _v45046;
byte _masterVolume; byte _masterVolume;
byte _channelVolume; byte _channelVolume;
const byte *_channelData; const byte *_channelData;
const byte *_soundData;
void write(int v);
void flush();
void sub_4556E();
void write209();
void write211();
public: public:
AdlibFxSoundDriver(); AdlibFxSoundDriver();
virtual ~AdlibFxSoundDriver(); virtual ~AdlibFxSoundDriver();
@ -492,7 +478,6 @@ public:
virtual void close(); virtual void close();
virtual bool reset(); virtual bool reset();
virtual const GroupData *getGroupData(); virtual const GroupData *getGroupData();
virtual void poll();
virtual int setMasterVolume(int volume); virtual int setMasterVolume(int volume);
virtual void playSound(const byte *channelData, int dataOffset, int program, int channel, int v0, int v1); virtual void playSound(const byte *channelData, int dataOffset, int program, int channel, int v0, int v1);
virtual void updateVoice(int channel); virtual void updateVoice(int channel);