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

@@ -30,6 +30,8 @@
 #include "GroupBox.h"
 #include "InstrumentFunctions.h"
 #include "InstrumentSoundShaping.h"
+#include "Midi.h"
+#include "MidiCCRackView.h"
 #include "MidiEventProcessor.h"
 #include "MidiPort.h"
 #include "NotePlayHandle.h"
@@ -229,7 +231,6 @@ class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 	void newNote();
 	void endNote();
 
-
 protected:
 	QString nodeName() const override
 	{
@@ -248,6 +249,8 @@ protected slots:
 
 
 private:
+	void processCCEvent(int controller);
+
 	MidiPort m_midiPort;
 
 	NotePlayHandle* m_notes[NumKeys];
@@ -287,11 +290,14 @@ protected slots:
 
 	Piano m_piano;
 
+	std::unique_ptr<BoolModel> m_midiCCEnable;
+	std::unique_ptr<FloatModel> m_midiCCModel[MidiControllerCount];
 
 	friend class InstrumentTrackView;
 	friend class InstrumentTrackWindow;
 	friend class NotePlayHandle;
 	friend class InstrumentMiscView;
+	friend class MidiCCRackView;
 
 } ;
 
@@ -339,6 +345,7 @@ class InstrumentTrackView : public TrackView
 
 private slots:
 	void toggleInstrumentWindow( bool _on );
+	void toggleMidiCCRack();
 	void activityIndicatorPressed();
 	void activityIndicatorReleased();
 
@@ -366,6 +373,8 @@ private slots:
 	QAction * m_midiInputAction;
 	QAction * m_midiOutputAction;
 
+	std::unique_ptr<MidiCCRackView> m_midiCCRackView;
+
 	QPoint m_lastPos;
 
 	FadeButton * getActivityIndicator() override

include/MidiCCRackView.h

@@ -0,0 +1,40 @@
+#ifndef MIDI_CC_RACK_VIEW_H
+#define MIDI_CC_RACK_VIEW_H
+
+#include <QWidget>
+
+#include "GroupBox.h"
+#include "Knob.h"
+#include "Midi.h"
+#include "SerializingObject.h"
+
+class InstrumentTrack;
+
+class MidiCCRackView : public QWidget, public SerializingObject
+{
+	Q_OBJECT
+public:
+	MidiCCRackView(InstrumentTrack * track);
+	~MidiCCRackView() override;
+
+	void saveSettings(QDomDocument & doc, QDomElement & parent) override;
+	void loadSettings(const QDomElement &) override;
+
+	inline QString nodeName() const override
+	{
+		return "MidiCCRackView";
+	}
+
+private slots:
+	void renameWindow();
+
+private:
+	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

@@ -22,6 +22,7 @@ SET(LMMS_SRCS
 	gui/Lv2ViewBase.cpp
 	gui/MainApplication.cpp
 	gui/MainWindow.cpp
+	gui/MidiCCRackView.cpp
 	gui/MidiSetupWidget.cpp
 	gui/ModelView.cpp
 	gui/PeakControllerDialog.cpp

src/gui/MidiCCRackView.cpp

@@ -0,0 +1,133 @@
+/*
+ * MidiCCRackView.cpp - implementation of the MIDI CC rack widget
+ *
+ * Copyright (c) 2020 Ian Caio <iancaio_dev/at/hotmail.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.
+ *
+ */
+
+
+#include "MidiCCRackView.h"
+
+#include <QGridLayout>
+#include <QMdiSubWindow>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
+
+#include "embed.h"
+#include "GroupBox.h"
+#include "GuiApplication.h"
+#include "InstrumentTrack.h"
+#include "Knob.h"
+#include "MainWindow.h"
+#include "Track.h"
+
+
+MidiCCRackView::MidiCCRackView(InstrumentTrack * track) :
+	QWidget(),
+	m_track(track)
+{
+	setWindowIcon(embed::getIconPixmap("midi_cc_rack"));
+	setWindowTitle(tr("MIDI CC Rack - %1").arg(m_track->name()));
+
+	QMdiSubWindow * subWin = gui->mainWindow()->addWindowedWidget(this);
+
+	// Remove maximize button
+	Qt::WindowFlags flags = subWin->windowFlags();
+	flags &= ~Qt::WindowMaximizeButtonHint;
+	subWin->setWindowFlags(flags);
+
+	// Adjust window attributes, sizing and position
+	subWin->setAttribute(Qt::WA_DeleteOnClose, false);
+	subWin->resize(350, 300);
+	subWin->setFixedWidth(350);
+	subWin->setMinimumHeight(300);
+	subWin->hide();
+
+	// Main window layout
+	QVBoxLayout *mainLayout = new QVBoxLayout(this);
+
+	// Knobs GroupBox - Here we have the MIDI CC controller knobs for the selected track
+	m_midiCCGroupBox = new GroupBox(tr("MIDI CC Knobs:"));
+
+	// Layout to keep scrollable area under the GroupBox header
+	QVBoxLayout *knobsGroupBoxLayout = new QVBoxLayout();
+	knobsGroupBoxLayout->setContentsMargins(5, 16, 5, 5);
+
+	m_midiCCGroupBox->setLayout(knobsGroupBoxLayout);
+
+	// Scrollable area + widget + its layout that will have all the knobs
+	QScrollArea *knobsScrollArea = new QScrollArea();
+	QWidget *knobsArea = new QWidget();
+	QGridLayout *knobsAreaLayout = new QGridLayout();
+
+	knobsArea->setLayout(knobsAreaLayout);
+	knobsScrollArea->setWidget(knobsArea);
+	knobsScrollArea->setWidgetResizable(true);
+
+	knobsGroupBoxLayout->addWidget(knobsScrollArea);
+
+	// Adds the controller knobs
+	for (int i = 0; i < MidiControllerCount; ++i)
+	{
+		m_controllerKnob[i] = new Knob(knobBright_26);
+		m_controllerKnob[i]->setLabel(tr("CC %1").arg(i));
+		knobsAreaLayout->addWidget(m_controllerKnob[i], i/4, i%4);
+	}
+
+	// Set all the models
+	// Set the LED button to enable/disable the track midi cc
+	m_midiCCGroupBox->setModel(m_track->m_midiCCEnable.get());
+
+	// Set the model for each Knob
+	for (int i = 0; i < MidiControllerCount; ++i)
+	{
+		m_controllerKnob[i]->setModel(m_track->m_midiCCModel[i].get());
+	}
+
+	// Connection to update the name of the track on the label
+	connect(m_track, SIGNAL(nameChanged()),
+		this, SLOT(renameWindow()));
+
+	// Adding everything to the main layout
+	mainLayout->addWidget(m_midiCCGroupBox);
+}
+
+MidiCCRackView::~MidiCCRackView()
+{
+	if(parentWidget())
+	{
+		parentWidget()->hide();
+		parentWidget()->deleteLater();
+	}
+}
+
+void MidiCCRackView::renameWindow()
+{
+	setWindowTitle(tr("MIDI CC Rack - %1").arg(m_track->name()));
+}
+
+void MidiCCRackView::saveSettings(QDomDocument & doc, QDomElement & parent)
+{
+}
+
+void MidiCCRackView::loadSettings(const QDomElement &)
+{
+}

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 )