mirror of
https://github.com/TomHarte/CLK.git
synced 2025-02-05 21:32:55 +00:00
Use std::fill
; update volume with slider.
This commit is contained in:
parent
ce0d53b277
commit
fd73c24fc3
@ -8,19 +8,20 @@
|
|||||||
|
|
||||||
#include "AudioToggle.hpp"
|
#include "AudioToggle.hpp"
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
using namespace Audio;
|
using namespace Audio;
|
||||||
|
|
||||||
Audio::Toggle::Toggle(Concurrency::AsyncTaskQueue<false> &audio_queue) :
|
Audio::Toggle::Toggle(Concurrency::AsyncTaskQueue<false> &audio_queue) :
|
||||||
audio_queue_(audio_queue) {}
|
audio_queue_(audio_queue) {}
|
||||||
|
|
||||||
void Toggle::get_samples(std::size_t number_of_samples, std::int16_t *target) {
|
void Toggle::get_samples(std::size_t number_of_samples, std::int16_t *target) {
|
||||||
for(std::size_t sample = 0; sample < number_of_samples; ++sample) {
|
std::fill(target, target + number_of_samples, level_);
|
||||||
target[sample] = level_;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Toggle::set_sample_volume_range(std::int16_t range) {
|
void Toggle::set_sample_volume_range(std::int16_t range) {
|
||||||
volume_ = range;
|
volume_ = range;
|
||||||
|
level_ = level_active_ ? volume_ : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Toggle::skip_samples(std::size_t) {}
|
void Toggle::skip_samples(std::size_t) {}
|
||||||
@ -29,6 +30,7 @@ void Toggle::set_output(bool enabled) {
|
|||||||
if(is_enabled_ == enabled) return;
|
if(is_enabled_ == enabled) return;
|
||||||
is_enabled_ = enabled;
|
is_enabled_ = enabled;
|
||||||
audio_queue_.enqueue([this, enabled] {
|
audio_queue_.enqueue([this, enabled] {
|
||||||
|
level_active_ = enabled;
|
||||||
level_ = enabled ? volume_ : 0;
|
level_ = enabled ? volume_ : 0;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -34,6 +34,7 @@ class Toggle: public Outputs::Speaker::SampleSource {
|
|||||||
|
|
||||||
// Accessed on the audio thread.
|
// Accessed on the audio thread.
|
||||||
int16_t level_ = 0, volume_ = 0;
|
int16_t level_ = 0, volume_ = 0;
|
||||||
|
bool level_active_ = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user