1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:37:35 +00:00

Piano+LibDSP: Move Track to LibDSP

This is a tangly commit and it fixes all the bugs that a plain move
would have caused (i.e. we need to touch other logic which had wrong
assumptions).
This commit is contained in:
kleines Filmröllchen 2022-07-13 12:44:19 +02:00 committed by Linus Groh
parent 125122a9ab
commit 4941cffdd0
29 changed files with 322 additions and 413 deletions

View file

@ -8,15 +8,18 @@
*/
#include "TrackManager.h"
#include "Applications/Piano/Music.h"
#include "Music.h"
#include <AK/NonnullRefPtr.h>
#include <AK/TypedTransfer.h>
#include <LibDSP/Effects.h>
#include <LibDSP/Synthesizers.h>
TrackManager::TrackManager()
: m_transport(make_ref_counted<DSP::Transport>(120, 4))
, m_keyboard(make_ref_counted<DSP::Keyboard>(m_transport))
, m_temporary_track_buffer(FixedArray<DSP::Sample>::must_create_but_fixme_should_propagate_errors(sample_count))
{
add_track();
m_tracks[m_current_track]->set_active(true);
}
void TrackManager::time_forward(int amount)
@ -30,47 +33,38 @@ void TrackManager::time_forward(int amount)
}
}
void TrackManager::fill_buffer(Span<Sample> buffer)
void TrackManager::fill_buffer(FixedArray<DSP::Sample>& buffer)
{
memset(buffer.data(), 0, buffer_size);
VERIFY(buffer.size() == m_temporary_track_buffer.size());
size_t sample_count = buffer.size();
// No need to zero the temp buffer as the track overwrites it anyways.
buffer.fill_with({});
for (size_t i = 0; i < buffer.size(); ++i) {
for (auto& track : m_tracks)
track->fill_sample(buffer[i]);
m_transport->set_time(m_transport->time() + 1);
// FIXME: This should be handled automatically by Transport.
if (m_transport->time() >= roll_length) {
m_transport->set_time(0);
if (!m_should_loop)
break;
}
for (auto& track : m_tracks) {
track->current_signal(m_temporary_track_buffer);
for (size_t i = 0; i < sample_count; ++i)
buffer[i] += m_temporary_track_buffer[i];
}
memcpy(m_current_back_buffer.data(), buffer.data(), buffer_size);
swap(m_current_front_buffer, m_current_back_buffer);
m_transport->set_time(m_transport->time() + sample_count);
// FIXME: This should be handled automatically by Transport. It will also advance slightly past the loop point if we're unlucky.
if (m_transport->time() >= roll_length)
m_transport->set_time(0);
}
void TrackManager::reset()
{
memset(m_front_buffer.data(), 0, buffer_size);
memset(m_back_buffer.data(), 0, buffer_size);
m_current_front_buffer = m_front_buffer.span();
m_current_back_buffer = m_back_buffer.span();
m_transport->set_time(0);
for (auto& track : m_tracks) {
track->reset();
track->set_active(false);
}
m_tracks[m_current_track]->set_active(true);
}
void TrackManager::add_track()
{
m_tracks.append(make<Track>(m_transport, m_keyboard));
auto new_track = make_ref_counted<DSP::NoteTrack>(m_transport, m_keyboard);
MUST(new_track->resize_internal_buffers_to(m_temporary_track_buffer.size()));
new_track->add_processor(make_ref_counted<DSP::Synthesizers::Classic>(m_transport));
new_track->add_processor(make_ref_counted<DSP::Effects::Delay>(m_transport));
new_track->add_clip(0, roll_length);
m_tracks.append(move(new_track));
}
int TrackManager::next_track_index() const