WIP: More Track

kleinesfilmroellchen · Jan 13, 2022 · f6a9741 · f6a9741
1 parent d7ae322
commit f6a9741
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/Userland/Applications/Piano/AudioPlayerLoop.cpp b/Userland/Applications/Piano/AudioPlayerLoop.cpp
@@ -40,7 +40,7 @@ AudioPlayerLoop::AudioPlayerLoop(NonnullRefPtr<LibDSP::TrackManager> track_manag
 
 void AudioPlayerLoop::enqueue_audio()
 {
-    m_track_manager->fill_buffer();
+    m_track_manager->fill_one_buffer();
     NonnullRefPtr<Audio::Buffer> audio_buffer = music_samples_to_buffer(m_buffer);
     // FIXME: Handle OOM better.
     audio_buffer = MUST(Audio::resample_buffer(m_resampler.value(), *audio_buffer));

diff --git a/Userland/Libraries/LibDSP/Effects.cpp b/Userland/Libraries/LibDSP/Effects.cpp
@@ -55,7 +55,7 @@ Mastering::Mastering(NonnullRefPtr<Transport> transport)
 {
 }
 
-void Mastering::process([[maybe_unused]] Vector<Sample>& input_signal)
+void Mastering::process([[maybe_unused]] FixedArray<Sample>& input_signal)
 {
     TODO();
 }

diff --git a/Userland/Libraries/LibDSP/Keyboard.cpp b/Userland/Libraries/LibDSP/Keyboard.cpp
@@ -56,4 +56,4 @@ ErrorOr<void> Keyboard::set_virtual_keyboard_octave(u8 octave)
     return Error::from_string_literal("Octave out of range");
 }
 
-}
+}
diff --git a/Userland/Libraries/LibDSP/Music.cpp b/Userland/Libraries/LibDSP/Music.cpp
@@ -19,4 +19,4 @@ RollNote RollNote::at_real_time(Transport& transport) const
         return *this + transport.time_offset();
     return *this;
 }
-}
+}
diff --git a/Userland/Libraries/LibDSP/Track.h b/Userland/Libraries/LibDSP/Track.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "AK/Noncopyable.h"
 #include <AK/FixedArray.h>
+#include <AK/Noncopyable.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/StdLibExtras.h>
@@ -97,7 +97,7 @@ class AudioTrack final : public Track {
     virtual void set_buffer_size(size_t samples) override
     {
         FixedArray<Sample> new_buffer(samples);
-        m_temporary_audio_buffer = new_buffer;
+        m_temporary_audio_buffer.swap(new_buffer);
     }
 
 protected:

diff --git a/Userland/Libraries/LibDSP/Transport.h b/Userland/Libraries/LibDSP/Transport.h
@@ -44,6 +44,7 @@ class Transport final : public Core::Object {
     constexpr double current_measure() const { return looping_time() / samples_per_measure(); }
 
     constexpr u16 beats_per_minute() const { return m_beats_per_minute; }
+    constexpr u8 beats_per_measure() const { return m_beats_per_measure; }
     constexpr double samples_per_measure() const { return (1.0 / m_beats_per_minute) * 60.0 * m_sample_rate; }
     constexpr double sample_rate() const { return m_sample_rate; }
     constexpr double ms_sample_rate() const { return m_sample_rate / 1000.; }