6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-27 16:31:31 +00:00
Code Issues Projects Releases Wiki Activity

Allows audio volume to be set.

Browse Source
This commit is contained in:
Thomas Harte 2020-03-21 22:00:47 -04:00
parent 0c689e85a5
commit 9087bb9b08
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Analyser/Dynamic/MultiMachine/Implementation/MultiSpeaker.cpp
View File

@ -54,6 +54,12 @@ bool MultiSpeaker::get_is_stereo() {
return false; return false;
} }
void MultiSpeaker::set_output_volume(float volume) {
for(const auto &speaker: speakers_) {
speaker->set_output_volume(volume);
}
}
void MultiSpeaker::set_delegate(Outputs::Speaker::Speaker::Delegate *delegate) { void MultiSpeaker::set_delegate(Outputs::Speaker::Speaker::Delegate *delegate) {
delegate_ = delegate; delegate_ = delegate;
} }

1
Analyser/Dynamic/MultiMachine/Implementation/MultiSpeaker.hpp
View File

@ -42,6 +42,7 @@ class MultiSpeaker: public Outputs::Speaker::Speaker, Outputs::Speaker::Speaker:
void set_computed_output_rate(float cycles_per_second, int buffer_size, bool stereo) override; void set_computed_output_rate(float cycles_per_second, int buffer_size, bool stereo) override;
void set_delegate(Outputs::Speaker::Speaker::Delegate *delegate) override; void set_delegate(Outputs::Speaker::Speaker::Delegate *delegate) override;
bool get_is_stereo() override; bool get_is_stereo() override;
void set_output_volume(float) override;
private: private:
void speaker_did_complete_samples(Speaker *speaker, const std::vector<int16_t> &buffer) final; void speaker_did_complete_samples(Speaker *speaker, const std::vector<int16_t> &buffer) final;

7
Outputs/Speaker/Implementation/LowpassSpeaker.hpp
View File

@ -31,9 +31,16 @@ namespace Speaker {
template <typename SampleSource> class LowpassSpeaker: public Speaker { template <typename SampleSource> class LowpassSpeaker: public Speaker {
public: public:
LowpassSpeaker(SampleSource &sample_source) : sample_source_(sample_source) { LowpassSpeaker(SampleSource &sample_source) : sample_source_(sample_source) {
// Propagate an initial volume level.
sample_source.set_sample_volume_range(32767); sample_source.set_sample_volume_range(32767);
} }
void set_output_volume(float volume) final {
// Clamp to the acceptable range, and set.
volume = std::min(std::max(0.0f, volume), 1.0f);
sample_source_.set_sample_volume_range(int16_t(32767.0f * volume));
}
// Implemented as per Speaker. // Implemented as per Speaker.
float get_ideal_clock_rate_in_range(float minimum, float maximum) final { float get_ideal_clock_rate_in_range(float minimum, float maximum) final {
std::lock_guard<std::mutex> lock_guard(filter_parameters_mutex_); std::lock_guard<std::mutex> lock_guard(filter_parameters_mutex_);

5
Outputs/Speaker/Speaker.hpp
View File

@ -45,6 +45,9 @@ class Speaker {
compute_output_rate(); compute_output_rate();
} }
/// Sets the output volume, in the range [0, 1].
virtual void set_output_volume(float) = 0;
/*! /*!
Speeds a speed multiplier for this machine, e.g. that it is currently being run at 2.0x its normal rate. Speeds a speed multiplier for this machine, e.g. that it is currently being run at 2.0x its normal rate.
This will affect the number of input samples that are combined to produce one output sample. This will affect the number of input samples that are combined to produce one output sample.
@ -79,6 +82,8 @@ class Speaker {
delegate_ = delegate; delegate_ = delegate;
} }
// This is primarily exposed for MultiSpeaker et al; it's not for general callers.
virtual void set_computed_output_rate(float cycles_per_second, int buffer_size, bool stereo) = 0; virtual void set_computed_output_rate(float cycles_per_second, int buffer_size, bool stereo) = 0;
protected: protected: