Move MidiController form Channel to ChannelManager and Renderer

monocasual · Aug 5, 2023 · 62b7169 · 62b7169
1 parent 182f841
commit 62b7169
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/src/core/channels/channel.cpp b/src/core/channels/channel.cpp
@@ -63,7 +63,6 @@ Channel::Channel(ChannelType type, ID id, ID columnId, int position, ChannelShar
 		break;
 
 	case ChannelType::MIDI:
-		midiController.emplace();
 		midiChannel.emplace();
 		break;
 
@@ -108,7 +107,6 @@ Channel::Channel(const Patch::Channel& p, ChannelShared& s, float samplerateRati
 		break;
 
 	case ChannelType::MIDI:
-		midiController.emplace();
 		midiChannel.emplace(p);
 		break;
 

diff --git a/src/core/channels/channel.h b/src/core/channels/channel.h
@@ -29,7 +29,6 @@
 
 #include "core/channels/channelShared.h"
 #include "core/channels/midiChannel.h"
-#include "core/channels/midiController.h"
 #include "core/channels/midiLearn.h"
 #include "core/channels/midiLightning.h"
 #include "core/channels/sampleAdvancer.h"
@@ -110,9 +109,8 @@ class Channel final
 	MidiLearn     midiLearn;
 	MidiLightning midiLightning;
 
-	std::optional<MidiController> midiController;
-	std::optional<SampleChannel>  sampleChannel;
-	std::optional<MidiChannel>    midiChannel;
+	std::optional<SampleChannel> sampleChannel;
+	std::optional<MidiChannel>   midiChannel;
 
 private:
 	bool m_mute;

diff --git a/src/core/channels/channelManager.cpp b/src/core/channels/channelManager.cpp
@@ -327,8 +327,8 @@ void ChannelManager::keyPress(ID channelId, int velocity, bool canRecordActions,
 {
 	Channel& ch = m_model.get().channels.get(channelId);
 
-	if (ch.midiController)
-		ch.midiController->keyPress(ch.shared->playStatus);
+	if (ch.type == ChannelType::MIDI)
+		m_midiController.keyPress(ch.shared->playStatus);
 	if (ch.type == ChannelType::SAMPLE && ch.hasWave() && canRecordActions && !ch.sampleChannel->isAnyLoopMode())
 		m_sampleActionRecorder.keyPress(channelId, *ch.shared, currentFrameQuantized, ch.sampleChannel->mode, ch.hasActions);
 	if (ch.type == ChannelType::SAMPLE && ch.hasWave())
@@ -357,8 +357,8 @@ void ChannelManager::keyKill(ID channelId, bool canRecordActions, Frame currentF
 {
 	Channel& ch = m_model.get().channels.get(channelId);
 
-	if (ch.midiController)
-		ch.midiController->keyKill(ch.shared->playStatus);
+	if (ch.type == ChannelType::MIDI)
+		m_midiController.keyKill(ch.shared->playStatus);
 	if (ch.type == ChannelType::MIDI)
 		m_midiReceiver.stop(ch.shared->midiQueue);
 	if (ch.type == ChannelType::MIDI && ch.isPlaying() && !ch.isMuted() && ch.midiChannel->outputEnabled)
@@ -574,8 +574,8 @@ void ChannelManager::stopAll()
 {
 	for (Channel& ch : m_model.get().channels.getAll())
 	{
-		if (ch.midiController)
-			ch.midiController->stop(ch.shared->playStatus);
+		if (ch.type == ChannelType::MIDI)
+			m_midiController.stop(ch.shared->playStatus);
 		if (ch.type == ChannelType::SAMPLE)
 			m_sampleReactor.stopBySeq(*ch.shared, m_model.get().behaviors.chansStopOnSeqHalt, ch.sampleChannel->isAnyLoopMode());
 		if (ch.type == ChannelType::MIDI && ch.isPlaying() && !ch.isMuted() && ch.midiChannel->outputEnabled)
@@ -591,8 +591,8 @@ void ChannelManager::stopAll()
 void ChannelManager::rewindAll()
 {
 	for (Channel& ch : m_model.get().channels.getAll())
-		if (ch.midiController)
-			ch.midiController->rewind(ch.shared->playStatus);
+		if (ch.type == ChannelType::MIDI)
+			m_midiController.rewind(ch.shared->playStatus);
 	m_model.swap(model::SwapType::SOFT);
 }
 

diff --git a/src/core/channels/channelManager.h b/src/core/channels/channelManager.h
@@ -28,6 +28,7 @@
 #define G_CHANNEL_MANAGER_H
 
 #include "core/channels/midiActionRecorder.h"
+#include "core/channels/midiController.h"
 #include "core/channels/midiLighter.h"
 #include "core/channels/midiReceiver.h"
 #include "core/channels/midiSender.h"
@@ -228,6 +229,7 @@ class ChannelManager final
 	MidiActionRecorder      m_midiActionRecorder;
 	SampleActionRecorder    m_sampleActionRecorder;
 	SampleReactor           m_sampleReactor;
+	MidiController          m_midiController;
 };
 } // namespace giada::m
 

diff --git a/src/core/renderer.cpp b/src/core/renderer.cpp
@@ -163,8 +163,8 @@ void Renderer::advanceChannel(const Channel& ch, const Sequencer::EventBuffer& e
 
 	for (const Sequencer::Event& e : events)
 	{
-		if (ch.midiController)
-			ch.midiController->advance(ch.shared->playStatus, e);
+		if (ch.type == ChannelType::MIDI)
+			m_midiController.advance(ch.shared->playStatus, e);
 
 		if (ch.type == ChannelType::SAMPLE)
 			m_sampleAdvancer.advance(ch.id, *ch.shared, e, ch.sampleChannel->mode, ch.sampleChannel->isAnyLoopMode());

diff --git a/src/core/renderer.h b/src/core/renderer.h
@@ -28,6 +28,7 @@
 #define G_RENDERER_H
 
 #include "core/channels/audioReceiver.h"
+#include "core/channels/midiController.h"
 #include "core/channels/midiReceiver.h"
 #include "core/channels/midiSender.h"
 #include "core/channels/sampleAdvancer.h"
@@ -96,6 +97,7 @@ class Renderer
 	SampleAdvancer m_sampleAdvancer;
 	MidiSender     m_midiSender;
 	MidiReceiver   m_midiReceiver;
+	MidiController m_midiController;
 };
 } // namespace giada::m