lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: lisyarus:506a6c303e29546bf8c4acba89ec76e8093a9ac8
Branches Tags
lisyarus:master
..
compare: lisyarus:ae2efc94fb0f9fbe72ffdef6a103aebc290ef434
Branches Tags
lisyarus:master

No commits in common. "506a6c303e29546bf8c4acba89ec76e8093a9ac8" and "ae2efc94fb0f9fbe72ffdef6a103aebc290ef434" have entirely different histories.
506a6c303e ... ae2efc94fb

3 changed files with 5 additions and 20 deletions
Show stats Expand all files Collapse all files

1
libs/audio/include/psemek/audio/combine/mixer.hpp
View file

@ -15,7 +15,6 @@ namespace psemek::audio
virtual channel_ptr add(stream_ptr stream) = 0;
virtual std::size_t stream_count() const = 0;
virtual std::size_t max_length() const = 0;
};
using mixer_ptr = std::shared_ptr<mixer>;

13
libs/audio/source/combine/mixer.cpp
View file

@ -22,8 +22,6 @@ namespace psemek::audio
return stream_count_.load();
}
std::size_t max_length() const override;
std::size_t read(util::span<float> samples) override;
std::optional<std::size_t> length() const override
@ -61,17 +59,6 @@ namespace psemek::audio
return result;
}
std::size_t mixer_impl::max_length() const
{
// TODO: safe access when the mixer is already playing?
std::size_t result = 0;
for (auto const & channel : new_channels_)
if (auto stream = channel->stream())
if (auto length = stream->length(); length && *length > result)
result = *length;
return result;
}
std::size_t mixer_impl::read(util::span<float> samples)
{
{

11
libs/audio/source/recorder.cpp
View file

@ -23,26 +23,25 @@ namespace psemek::audio
std::size_t request(std::size_t sample_count) override
{
std::size_t count = 0;
if (storage_.size() < samples_.size() + sample_count)
{
storage_.resize(std::max<std::size_t>(samples_.size() + sample_count, storage_.size() * 2));
samples_ = {storage_.data(), storage_.data() + samples_.size()};
}
std::size_t count = 0;
if (auto stream = channel_->stream())
{
count = stream->read({storage_.data() + samples_.size(), sample_count});
if (count < sample_count)
{
channel_->stop();
}
}
std::fill(storage_.data() + samples_.size() + count, storage_.data() + samples_.size() + count, 0.f);
samples_ = {storage_.data(), storage_.data() + samples_.size() + count};
std::fill(storage_.data() + samples_.size() + count, storage_.data() + samples_.size() + sample_count, 0.f);
samples_ = {storage_.data(), storage_.data() + samples_.size() + sample_count};
return count;
return sample_count;
}
util::span<float const> buffer() const override