Adds support for MIDI CC events inside LMMS

include/AutomatableModelView.h

@@ -50,6 +50,7 @@ class LMMS_EXPORT AutomatableModelView : public ModelView
 	}
 
 	void setModel( Model* model, bool isOldModelValid = true ) override;
+	void unsetModel() override;
 
 	template<typename T>
 	inline T value() const

include/InstrumentTrack.h

@@ -38,6 +38,8 @@
 #include "Pitch.h"
 #include "Plugin.h"
 #include "Track.h"
+#include "Midi.h"
+#include "MidiCCRackView.h"
 
 
 
@@ -221,6 +223,9 @@ class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 
 	void autoAssignMidiDevice( bool );
 
+	BoolModel *m_midiCCEnable;
+	FloatModel *m_midiCCModel[MidiControllerCount];
+
 signals:
 	void instrumentChanged();
 	void midiNoteOn( const Note& );
@@ -229,6 +234,8 @@ class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 	void newNote();
 	void endNote();
 
+public slots:
+	void processCCEvent(int controller);
 
 protected:
 	QString nodeName() const override
@@ -339,6 +346,7 @@ class InstrumentTrackView : public TrackView
 
 private slots:
 	void toggleInstrumentWindow( bool _on );
+	void toggleMidiCCRack();
 	void activityIndicatorPressed();
 	void activityIndicatorReleased();
 
@@ -366,6 +374,8 @@ private slots:
 	QAction * m_midiInputAction;
 	QAction * m_midiOutputAction;
 
+	MidiCCRackView * m_midiCCRackView;
+
 	QPoint m_lastPos;
 
 	FadeButton * getActivityIndicator() override

include/MidiCCRackView.h

@@ -0,0 +1,50 @@
+#ifndef MIDI_CC_RACK_VIEW_H
+#define MIDI_CC_RACK_VIEW_H
+
+#include <QWidget>
+#include <QLabel>
+#include <QCloseEvent>
+
+#include "SerializingObject.h"
+#include "lmms_basics.h"
+#include "ComboBox.h"
+#include "ComboBoxModel.h"
+#include "Knob.h"
+#include "TrackContainer.h"
+#include "GroupBox.h"
+#include "Midi.h"
+
+class InstrumentTrack;
+
+class MidiCCRackView : public QWidget, public SerializingObject
+{
+	Q_OBJECT
+public:
+	MidiCCRackView(InstrumentTrack * track);
+	virtual ~MidiCCRackView();
+
+	void saveSettings(QDomDocument & doc, QDomElement & parent) override;
+	void loadSettings(const QDomElement &) override;
+
+	inline QString nodeName() const override
+	{
+		return "MidiCCRackView";
+	}
+
+public slots:
+	void unsetModels();
+	void destroyRack();
+	void renameLabel();
+
+private:
+	QLabel *m_trackLabel;
+
+	InstrumentTrack *m_track;
+
+	GroupBox *m_midiCCGroupBox; // MIDI CC GroupBox (used to enable disable MIDI CC)
+
+	Knob *m_controllerKnob[MidiControllerCount]; // Holds the knob widgets for each controller
+
+};
+
+#endif

include/MidiEvent.h

@@ -33,27 +33,30 @@
 class MidiEvent
 {
 public:
-	MidiEvent( MidiEventTypes type = MidiActiveSensing,
+	MidiEvent(MidiEventTypes type = MidiActiveSensing,
 				int8_t channel = 0,
 				int16_t param1 = 0,
 				int16_t param2 = 0,
-				const void* sourcePort = NULL ) :
+				const void* sourcePort = nullptr,
+				bool ignoreOnExport = true) :
 		m_type( type ),
 		m_metaEvent( MidiMetaInvalid ),
 		m_channel( channel ),
 		m_sysExData( NULL ),
-		m_sourcePort( sourcePort )
+		m_sourcePort(sourcePort),
+		m_ignoreOnExport(ignoreOnExport)
 	{
 		m_data.m_param[0] = param1;
 		m_data.m_param[1] = param2;
 	}
 
-	MidiEvent( MidiEventTypes type, const char* sysExData, int dataLen ) :
+	MidiEvent(MidiEventTypes type, const char* sysExData, int dataLen, bool ignoreOnExport = true) :
 		m_type( type ),
 		m_metaEvent( MidiMetaInvalid ),
 		m_channel( 0 ),
 		m_sysExData( sysExData ),
-		m_sourcePort( NULL )
+		m_sourcePort(nullptr),
+		m_ignoreOnExport(ignoreOnExport)
 	{
 		m_data.m_sysExDataLen = dataLen;
 	}
@@ -64,7 +67,8 @@ class MidiEvent
 		m_channel( other.m_channel ),
 		m_data( other.m_data ),
 		m_sysExData( other.m_sysExData ),
-		m_sourcePort( other.m_sourcePort )
+		m_sourcePort(other.m_sourcePort),
+		m_ignoreOnExport(other.m_ignoreOnExport)
 	{
 	}
 
@@ -190,6 +194,16 @@ class MidiEvent
 		setParam( 0, pitchBend );
 	}
 
+	bool ignoreOnExport() const
+	{
+		return m_ignoreOnExport;
+	}
+
+	void setIgnoreOnExport(bool value)
+	{
+		m_ignoreOnExport = value;
+	}
+
 
 private:
 	MidiEventTypes m_type;		// MIDI event type
@@ -205,6 +219,9 @@ class MidiEvent
 	const char* m_sysExData;
 	const void* m_sourcePort;
 
+	// This helps us ignore MIDI events that shouldn't be processed
+	// during a project export, like physical controller events.
+	bool m_ignoreOnExport;
 } ;
 
 #endif

include/ModelView.h

@@ -36,6 +36,7 @@ class LMMS_EXPORT ModelView
 	virtual ~ModelView();
 
 	virtual void setModel( Model* model, bool isOldModelValid = true );
+	virtual void unsetModel();
 
 	Model* model()
 	{

src/gui/AutomatableModelView.cpp

@@ -142,6 +142,31 @@ void AutomatableModelView::setModel( Model* model, bool isOldModelValid )
 
 
 
+// Unsets the current model by setting a dummy empty model. The dummy model is marked as
+// "defaultConstructed", so the next call to setModel will delete it.
+void AutomatableModelView::unsetModel()
+{
+	if (dynamic_cast<FloatModelView*>(this))
+	{
+		setModel(new FloatModel(0, 0, 0, 1, nullptr, QString(), true));
+	}
+	else if (dynamic_cast<IntModelView*>(this))
+	{
+		setModel(new IntModel(0, 0, 0, nullptr, QString(), true));
+	}
+	else if (dynamic_cast<BoolModelView*>(this))
+	{
+		setModel(new BoolModel(false, nullptr, QString(), true));
+	}
+	else
+	{
+		ModelView::unsetModel();
+	}
+}
+
+
+
+
 void AutomatableModelView::mousePressEvent( QMouseEvent* event )
 {
 	if( event->button() == Qt::LeftButton && event->modifiers() & Qt::ControlModifier )

src/gui/CMakeLists.txt

@@ -78,6 +78,7 @@ SET(LMMS_SRCS
 	gui/widgets/ControlLayout.cpp
 	gui/widgets/LinkedModelGroupViews.cpp
 	gui/widgets/MeterDialog.cpp
+	gui/widgets/MidiCCRackView.cpp
 	gui/widgets/MidiPortMenu.cpp
 	gui/widgets/NStateButton.cpp
 	gui/widgets/Oscilloscope.cpp

src/gui/ModelView.cpp

@@ -74,6 +74,16 @@ void ModelView::setModel( Model* model, bool isOldModelValid )
 
 
 
+// Unsets the current model by setting a dummy empty model. The dummy model is marked as
+// "defaultConstructed", so the next call to setModel will delete it.
+void ModelView::unsetModel()
+{
+	setModel(new Model(nullptr, QString(), true));
+}
+
+
+
+
 void ModelView::doConnections()
 {
 	if( m_model != NULL )