Add ClapTransport class

include/ClapInstance.h

@@ -192,8 +192,8 @@ class ClapInstance final : public LinkedModelGroup
 	auto deactivate() -> bool;
 
 	auto processBegin(std::uint32_t frames) -> bool;
-	void processNoteOff(int sampleOffset, int channel, int key, int velocity);
-	void processNoteOn(int sampleOffset, int channel, int key, int velocity);
+	void processNoteOff(f_cnt_t sampleOffset, std::int8_t channel, std::int16_t key, std::uint8_t velocity);
+	void processNoteOn(f_cnt_t sampleOffset, std::int8_t channel, std::int16_t key, std::uint8_t velocity);
 	auto process(std::uint32_t frames) -> bool;
 	auto processEnd(std::uint32_t frames) -> bool;
 

include/ClapManager.h

@@ -77,21 +77,6 @@ class ClapManager
 	//! Creates a plugin instance given plugin info; Plugin instance is owned by ClapManager
 	//auto createInstance(const ClapPluginInfo* info) -> std::weak_ptr<ClapPluginInstance>;
 
-	/**
-	 * Transport update methods
-	 * TODO: Add pre-roll and beat position
-	 */
-	static void updateTransport();
-	static void setPlaying(bool isPlaying);
-	static void setRecording(bool isRecording);
-	static void setLooping(bool isLooping);
-	static void setBeatPosition();
-	static void setTimePosition(int elapsedMilliseconds);
-	static void setTempo(bpm_t tempo);
-	static void setTimeSignature(int num, int denom);
-
-	static auto transport() -> const clap_event_transport* { return &s_transport; }
-
 	static auto clapGuiApi() -> const char*;
 
 	static auto debugging() -> bool { return s_debug; }
@@ -115,7 +100,6 @@ class ClapManager
 	std::unordered_map<std::string, std::weak_ptr<const ClapPluginInfo>> m_uriToPluginInfo; //!< Non-owning map of plugin URIs (IDs) to ClapPluginInfo
 	//std::vector<std::weak_ptr<ClapInstance>> m_instances; //!< Vector of all CLAP plugin instances (for guaranteeing correct clean-up order)
 
-	static clap_event_transport s_transport;
 	static bool s_debug; //!< If LMMS_CLAP_DEBUG is set, debug output will be printed
 };
 

include/ClapTransport.h

@@ -0,0 +1,62 @@
+/*
+ * ClapTransport.h - CLAP transport events
+ *
+ * Copyright (c) 2023 Dalton Messmer <messmer.dalton/at/gmail.com>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef LMMS_CLAP_TRANSPORT_H
+#define LMMS_CLAP_TRANSPORT_H
+
+#include "lmmsconfig.h"
+
+#ifdef LMMS_HAVE_CLAP
+
+#include "lmms_basics.h"
+
+#include <clap/events.h>
+
+namespace lmms
+{
+
+//! Static class for managing CLAP transport events
+class ClapTransport
+{
+public:
+	static void update();
+	static void setPlaying(bool isPlaying);
+	static void setRecording(bool isRecording);
+	static void setLooping(bool isLooping);
+	static void setBeatPosition();
+	static void setTimePosition(int elapsedMilliseconds);
+	static void setTempo(bpm_t tempo);
+	static void setTimeSignature(int num, int denom);
+
+	static auto get() -> const clap_event_transport* { return &s_transport; }
+
+private:
+	static clap_event_transport s_transport;
+};
+
+} // namespace lmms
+
+#endif // LMMS_HAVE_CLAP
+
+#endif // LMMS_CLAP_TRANSPORT_H

src/core/CMakeLists.txt

@@ -112,6 +112,7 @@ set(LMMS_SRCS
 	core/clap/ClapManager.cpp
 	core/clap/ClapParam.cpp
 	core/clap/ClapSubPluginFeatures.cpp
+	core/clap/ClapTransport.cpp
 
 	core/lv2/Lv2Basics.cpp
 	core/lv2/Lv2ControlBase.cpp

src/core/Song.cpp

@@ -34,6 +34,7 @@
 
 #include "AutomationTrack.h"
 #include "AutomationEditor.h"
+#include "ClapTransport.h"
 #include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "ControllerConnection.h"
@@ -56,7 +57,6 @@
 #include "SongEditor.h"
 #include "TimeLineWidget.h"
 #include "PeakController.h"
-#include "ClapManager.h"
 
 
 namespace lmms
@@ -166,7 +166,7 @@ void Song::setTempo()
 	m_vstSyncController.setTempo( tempo );
 
 #ifdef LMMS_HAVE_CLAP
-	ClapManager::setTempo(tempo);
+	ClapTransport::setTempo(tempo);
 #endif
 
 	emit tempoChanged( tempo );
@@ -186,7 +186,7 @@ void Song::setTimeSignature()
 		getTimeSigModel().getNumerator(), getTimeSigModel().getDenominator() );
 
 #ifdef LMMS_HAVE_CLAP
-	ClapManager::setTimeSignature(getTimeSigModel().getNumerator(), getTimeSigModel().getDenominator());
+	ClapTransport::setTimeSignature(getTimeSigModel().getNumerator(), getTimeSigModel().getDenominator());
 #endif
 }
 
@@ -272,7 +272,7 @@ void Song::processNextBuffer()
 #ifdef LMMS_HAVE_CLAP
 	// If looping is enabled, or we're playing a pattern track or a MIDI clip
 	// TODO: Looping might not be handled correctly
-	ClapManager::setLooping(loopEnabled
+	ClapTransport::setLooping(loopEnabled
 		|| (m_playMode == PlayMode::Pattern)
 		|| (m_playMode == PlayMode::MidiClip && m_loopMidiClip)
 		);
@@ -350,8 +350,8 @@ void Song::processNextBuffer()
 			m_vstSyncController.update();
 
 #ifdef LMMS_HAVE_CLAP
-			ClapManager::setBeatPosition();
-			ClapManager::setTimePosition(getMilliseconds());
+			ClapTransport::setBeatPosition();
+			ClapTransport::setTimePosition(getMilliseconds());
 #endif
 		}
 
@@ -513,7 +513,7 @@ void Song::playSong()
 	m_vstSyncController.setPlaybackState( true );
 
 #ifdef LMMS_HAVE_CLAP
-	ClapManager::setPlaying(true);
+	ClapTransport::setPlaying(true);
 #endif
 
 	savePlayStartPosition();
@@ -556,7 +556,7 @@ void Song::playPattern()
 	m_vstSyncController.setPlaybackState( true );
 
 #ifdef LMMS_HAVE_CLAP
-	ClapManager::setPlaying(true);
+	ClapTransport::setPlaying(true);
 #endif
 
 	savePlayStartPosition();
@@ -654,7 +654,7 @@ void Song::togglePause()
 	m_vstSyncController.setPlaybackState( m_playing );
 
 #ifdef LMMS_HAVE_CLAP
-	ClapManager::setPlaying(m_playing);
+	ClapTransport::setPlaying(m_playing);
 #endif
 
 	emit playbackStateChanged();
@@ -714,9 +714,9 @@ void Song::stop()
 		/ (double) Engine::framesPerTick() );
 
 #ifdef LMMS_HAVE_CLAP
-	ClapManager::setPlaying(m_exporting);
-	ClapManager::setBeatPosition();
-	ClapManager::setTimePosition(getMilliseconds());
+	ClapTransport::setPlaying(m_exporting);
+	ClapTransport::setBeatPosition();
+	ClapTransport::setTimePosition(getMilliseconds());
 #endif
 
 	// remove all note-play-handles that are active
@@ -802,7 +802,7 @@ void Song::stopExport()
 	m_vstSyncController.setPlaybackState( m_playing );
 
 #ifdef LMMS_HAVE_CLAP
-	ClapManager::setPlaying(m_playing);
+	ClapTransport::setPlaying(m_playing);
 #endif
 }
 

src/core/clap/ClapInstance.cpp

@@ -27,6 +27,7 @@
 #ifdef LMMS_HAVE_CLAP
 
 #include "ClapManager.h"
+#include "ClapTransport.h"
 #include "Engine.h"
 #include "AudioEngine.h"
 #include "MidiEvent.h"
@@ -124,7 +125,7 @@ ClapInstance::ClapInstance(const ClapPluginInfo* pluginInfo, Model* parent)
 	m_pluginState = PluginState::None;
 	setHost();
 
-	m_process.transport = ClapManager::transport();
+	m_process.transport = ClapTransport::get();
 
 	start();
 }
@@ -151,6 +152,9 @@ void ClapInstance::copyModelsFromCore()
 
 	if (!hasNoteInput()) { return; } // TODO: Check for MIDI event / note event support instead?
 
+	// TODO: Midi events and parameter events may not be ordered according to increasing sample offset
+	//       The event.header.time values need to be sorted in increasing order.
+
 	while (m_midiInputReader.read_space() > 0)
 	{
 		const auto [event, _, offset] = m_midiInputReader.read(1)[0];
@@ -672,7 +676,7 @@ auto ClapInstance::processBegin(std::uint32_t frames) -> bool
 	return false;
 }
 
-void ClapInstance::processNoteOff(int sampleOffset, int channel, int key, int velocity)
+void ClapInstance::processNoteOff(f_cnt_t sampleOffset, std::int8_t channel, std::int16_t key, std::uint8_t velocity)
 {
 	assert(isAudioThread());
 
@@ -691,7 +695,7 @@ void ClapInstance::processNoteOff(int sampleOffset, int channel, int key, int ve
 	m_evIn.push(&ev.header);
 }
 
-void ClapInstance::processNoteOn(int sampleOffset, int channel, int key, int velocity)
+void ClapInstance::processNoteOn(f_cnt_t sampleOffset, std::int8_t channel, std::int16_t key, std::uint8_t velocity)
 {
 	assert(isAudioThread());