[Scummvm-git-logs] scummvm master -> 7df802b0f2630ac2b14f0a807e1a29efde9c1e89
OMGPizzaGuy
noreply at scummvm.org
Thu Jan 25 02:29:43 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7df802b0f2 ULTIMA8: Remove more unused audio related code
Commit: 7df802b0f2630ac2b14f0a807e1a29efde9c1e89
https://github.com/scummvm/scummvm/commit/7df802b0f2630ac2b14f0a807e1a29efde9c1e89
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-01-24T20:29:18-06:00
Commit Message:
ULTIMA8: Remove more unused audio related code
Changed paths:
engines/ultima/ultima8/audio/audio_channel.cpp
engines/ultima/ultima8/audio/audio_channel.h
engines/ultima/ultima8/audio/audio_mixer.cpp
engines/ultima/ultima8/audio/audio_mixer.h
engines/ultima/ultima8/audio/audio_process.cpp
diff --git a/engines/ultima/ultima8/audio/audio_channel.cpp b/engines/ultima/ultima8/audio/audio_channel.cpp
index a4a2345a4d3..8503c4a1023 100644
--- a/engines/ultima/ultima8/audio/audio_channel.cpp
+++ b/engines/ultima/ultima8/audio/audio_channel.cpp
@@ -32,59 +32,45 @@ namespace Ultima8 {
AudioChannel::AudioChannel(Audio::Mixer *mixer, uint32 sampleRate, bool stereo) :
- _mixer(mixer), _loop(0), _sample(nullptr),
- _paused(false), _priority(0), _volume(0), _balance(0), _pitchShift(0) {
+ _mixer(mixer), _priority(0) {
}
AudioChannel::~AudioChannel(void) {
}
-void AudioChannel::playSample(AudioSample *sample, int loop, int priority, bool paused, bool isSpeech, uint32 pitchShift, byte volume, int8 balance) {
- _sample = sample;
- _loop = loop;
- _priority = priority;
- _volume = volume;
- _balance = balance;
- _paused = paused;
- _pitchShift = pitchShift;
-
- if (!_sample)
+void AudioChannel::playSample(AudioSample *sample, int loop, int priority, bool isSpeech, uint32 pitchShift, byte volume, int8 balance) {
+ if (!sample)
return;
+ _priority = priority;
+
// Create the _sample
- Audio::SeekableAudioStream *audioStream = _sample->makeStream();
+ Audio::SeekableAudioStream *audioStream = sample->makeStream();
- int loops = _loop;
- if (loops == -1) {
+ int loops = loop;
+ if (loop == -1) {
// loop forever
loops = 0;
}
- Audio::AudioStream *stream = (_loop <= 1 && _loop != -1) ?
+ Audio::AudioStream *stream = (loop <= 1 && loop != -1) ?
(Audio::AudioStream *)audioStream :
new Audio::LoopingAudioStream(audioStream, loops);
_mixer->stopHandle(_soundHandle);
_mixer->playStream(isSpeech ? Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType, &_soundHandle, stream, -1, volume, balance);
- if (_pitchShift != AudioProcess::PITCH_SHIFT_NONE)
+ if (pitchShift != AudioProcess::PITCH_SHIFT_NONE)
_mixer->setChannelRate(_soundHandle, stream->getRate() * pitchShift / AudioProcess::PITCH_SHIFT_NONE);
- if (paused)
- _mixer->pauseHandle(_soundHandle, true);
}
bool AudioChannel::isPlaying() {
- if (!_mixer->isSoundHandleActive(_soundHandle))
- _sample = nullptr;
-
- return _sample != nullptr;
+ return _mixer->isSoundHandleActive(_soundHandle);
}
void AudioChannel::stop() {
_mixer->stopHandle(_soundHandle);
- _sample = nullptr;
}
void AudioChannel::setPaused(bool paused) {
- _paused = paused;
_mixer->pauseHandle(_soundHandle, paused);
}
diff --git a/engines/ultima/ultima8/audio/audio_channel.h b/engines/ultima/ultima8/audio/audio_channel.h
index e9173e12123..de88616b53c 100644
--- a/engines/ultima/ultima8/audio/audio_channel.h
+++ b/engines/ultima/ultima8/audio/audio_channel.h
@@ -33,16 +33,7 @@ class AudioChannel {
private:
Audio::SoundHandle _soundHandle;
Audio::Mixer *_mixer;
-
- int32 _loop;
- AudioSample *_sample;
-
- // Info for sampling
- byte _volume;
- int8 _balance;
- uint32 _pitchShift; // AudioProcess::PITCH_SHIFT_NONE = no shift
- int _priority; // anything.
- bool _paused; // true/false
+ int _priority;
public:
AudioChannel(Audio::Mixer *mixer, uint32 sampleRate, bool stereo);
@@ -50,21 +41,15 @@ public:
void stop();
- void playSample(AudioSample *sample, int loop, int priority, bool paused,
+ void playSample(AudioSample *sample, int loop, int priority,
bool isSpeech, uint32 pitchShift, byte volume, int8 balance);
bool isPlaying();
void setVolume(byte volume, int8 balance) {
- _volume = volume;
- _balance = balance;
_mixer->setChannelVolume(_soundHandle, volume);
_mixer->setChannelBalance(_soundHandle, balance);
}
- void getVolume(byte &volume, int8 &balance) const {
- volume = _volume;
- balance = _balance;
- }
void setPriority(int priority) {
_priority = priority;
@@ -74,10 +59,6 @@ public:
}
void setPaused(bool paused);
-
- bool isPaused() const {
- return _paused;
- }
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/audio/audio_mixer.cpp b/engines/ultima/ultima8/audio/audio_mixer.cpp
index 1b217eff723..8e4b33953db 100644
--- a/engines/ultima/ultima8/audio/audio_mixer.cpp
+++ b/engines/ultima/ultima8/audio/audio_mixer.cpp
@@ -78,7 +78,7 @@ void AudioMixer::reset() {
_mixer->stopAll();
}
-int AudioMixer::playSample(AudioSample *sample, int loop, int priority, bool paused, bool isSpeech, uint32 pitch_shift, byte volume, int8 balance, bool ambient) {
+int AudioMixer::playSample(AudioSample *sample, int loop, int priority, bool isSpeech, uint32 pitch_shift, byte volume, int8 balance, bool ambient) {
int lowest = -1;
int lowprior = 65536;
@@ -97,7 +97,7 @@ int AudioMixer::playSample(AudioSample *sample, int loop, int priority, bool pau
}
if (i != maxchan || lowprior < priority)
- _channels[lowest]->playSample(sample, loop, priority, paused, isSpeech, pitch_shift, volume, balance);
+ _channels[lowest]->playSample(sample, loop, priority, isSpeech, pitch_shift, volume, balance);
else
lowest = -1;
@@ -127,14 +127,6 @@ void AudioMixer::setPaused(int chan, bool paused) {
_channels[chan]->setPaused(paused);
}
-bool AudioMixer::isPaused(int chan) {
- if (chan >= TOTAL_CHANNEL_COUNT|| chan < 0)
- return false;
-
- bool ret = _channels[chan]->isPaused();
-
- return ret;
-}
void AudioMixer::setVolume(int chan, byte volume, int8 balance) {
if (chan >= TOTAL_CHANNEL_COUNT || chan < 0)
@@ -143,13 +135,6 @@ void AudioMixer::setVolume(int chan, byte volume, int8 balance) {
_channels[chan]->setVolume(volume, balance);
}
-void AudioMixer::getVolume(int chan, byte &volume, int8 &balance) {
- if (chan >= TOTAL_CHANNEL_COUNT || chan < 0)
- return;
-
- _channels[chan]->getVolume(volume, balance);
-}
-
void AudioMixer::openMidiOutput() {
_midiPlayer = new MidiPlayer();
}
diff --git a/engines/ultima/ultima8/audio/audio_mixer.h b/engines/ultima/ultima8/audio/audio_mixer.h
index 835472841a4..f96f7c84491 100644
--- a/engines/ultima/ultima8/audio/audio_mixer.h
+++ b/engines/ultima/ultima8/audio/audio_mixer.h
@@ -55,15 +55,12 @@ public:
void reset();
void createProcesses();
- int playSample(AudioSample *sample, int loop, int priority, bool paused, bool isSpeech, uint32 pitch_shift, byte volume, int8 balance, bool ambient);
+ int playSample(AudioSample *sample, int loop, int priority, bool isSpeech, uint32 pitch_shift, byte volume, int8 balance, bool ambient);
bool isPlaying(int chan);
void stopSample(int chan);
void setPaused(int chan, bool paused);
- bool isPaused(int chan);
-
void setVolume(int chan, byte volume, int8 balance);
- void getVolume(int chan, byte &volume, int8 &balance);
void openMidiOutput();
void closeMidiOutput();
diff --git a/engines/ultima/ultima8/audio/audio_process.cpp b/engines/ultima/ultima8/audio/audio_process.cpp
index 030c48a7b4f..95bbdab4738 100644
--- a/engines/ultima/ultima8/audio/audio_process.cpp
+++ b/engines/ultima/ultima8/audio/audio_process.cpp
@@ -211,7 +211,7 @@ bool AudioProcess::loadData(Common::ReadStream *rs, uint32 version) {
int AudioProcess::playSample(AudioSample *sample, int priority, int loops, bool isSpeech, uint32 pitchShift, int16 volume, int8 balance, bool ambient) {
AudioMixer *mixer = AudioMixer::get_instance();
- int channel = mixer->playSample(sample, loops, priority, false, isSpeech, pitchShift, volume, balance, ambient);
+ int channel = mixer->playSample(sample, loops, priority, isSpeech, pitchShift, volume, balance, ambient);
if (channel == -1) return channel;
More information about the Scummvm-git-logs
mailing list