Adds support for MIDI CC events inside LMMS

include/GuiApplication.h

@@ -39,6 +39,7 @@ class MainWindow;
 class PianoRollWindow;
 class ProjectNotes;
 class SongEditorWindow;
+class MidiCCRackView;
 
 class LMMS_EXPORT GuiApplication : public QObject
 {
@@ -57,6 +58,7 @@ class LMMS_EXPORT GuiApplication : public QObject
 	ProjectNotes* getProjectNotes() { return m_projectNotes; }
 	AutomationEditorWindow* automationEditor() { return m_automationEditor; }
 	ControllerRackView* getControllerRackView() { return m_controllerRackView; }
+	MidiCCRackView* getMidiCCRackView() { return m_midiCCRackView; }
 
 public slots:
 	void displayInitProgress(const QString &msg);
@@ -75,6 +77,7 @@ private slots:
 	PianoRollWindow* m_pianoRoll;
 	ProjectNotes* m_projectNotes;
 	ControllerRackView* m_controllerRackView;
+	MidiCCRackView* m_midiCCRackView;
 	QLabel* m_loadingProgressLabel;
 };
 

include/InstrumentTrack.h

@@ -38,6 +38,7 @@
 #include "Pitch.h"
 #include "Plugin.h"
 #include "Track.h"
+#include "MidiCCRackView.h"
 
 
 
@@ -221,6 +222,9 @@ class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 
 	void autoAssignMidiDevice( bool );
 
+	BoolModel *m_midiCCEnable;
+	FloatModel *m_midiCCModel[MIDI_CC_MAX_CONTROLLERS];
+
 signals:
 	void instrumentChanged();
 	void midiNoteOn( const Note& );
@@ -229,6 +233,8 @@ class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 	void newNote();
 	void endNote();
 
+public slots:
+	void processCCEvent(int controller);
 
 protected:
 	QString nodeName() const override

include/MainWindow.h

@@ -156,6 +156,7 @@ public slots:
 	void togglePianoRollWin();
 	void toggleControllerRack();
 	void toggleFullscreen();
+	void toggleMidiCCRack();
 
 	void updatePlayPauseIcons();
 

include/MidiCCRackView.h

@@ -0,0 +1,49 @@
+#ifndef MIDI_CC_RACK_VIEW_H
+#define MIDI_CC_RACK_VIEW_H
+
+#include <QWidget>
+#include <QCloseEvent>
+
+#include "SerializingObject.h"
+#include "lmms_basics.h"
+#include "ComboBox.h"
+#include "ComboBoxModel.h"
+#include "Knob.h"
+#include "TrackContainer.h"
+#include "GroupBox.h"
+
+const int MIDI_CC_MAX_CONTROLLERS = 128;
+
+class InstrumentTrack;
+
+class MidiCCRackView : public QWidget, public SerializingObject
+{
+	Q_OBJECT
+public:
+	MidiCCRackView();
+	virtual ~MidiCCRackView();
+
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+
+	inline QString nodeName() const override
+	{
+		return "MidiCCRackView";
+	}
+
+public slots:
+	void updateTracksComboBox();
+	void updateKnobsModels();
+
+private:
+	ComboBox *m_trackComboBox;
+	ComboBoxModel *m_trackComboBoxModel;
+	TrackContainer::TrackList m_tracks; // List with pointers to the ComboBox tracks themselfs
+
+	GroupBox *m_midiCCGroupBox; // MIDI CC GroupBox (used to enable disable MIDI CC)
+
+	Knob *m_controllerKnob[MIDI_CC_MAX_CONTROLLERS]; // Holds the knob widgets for each controller
+
+};
+
+#endif

include/TrackContainer.h

@@ -97,6 +97,8 @@ class LMMS_EXPORT TrackContainer : public Model, public JournallingObject
 
 signals:
 	void trackAdded( Track * _track );
+	void trackRemoved();
+	void trackRenamed();
 
 protected:
 	static AutomatedValueMap automatedValuesFromTracks(const TrackList &tracks, MidiTime timeStart, int tcoNum = -1);

include/TrackContainerView.h

@@ -183,6 +183,7 @@ public slots:
 
 signals:
 	void positionChanged( const MidiTime & _pos );
+	void movedTrackView();
 
 
 } ;

src/core/TrackContainer.cpp

@@ -181,6 +181,9 @@ void TrackContainer::addTrack( Track * _track )
 		m_tracksMutex.unlock();
 		_track->unlock();
 		emit trackAdded( _track );
+
+		connect( _track, SIGNAL( nameChanged() ),
+			this, SIGNAL( trackRenamed() ) );
 	}
 }
 
@@ -207,6 +210,8 @@ void TrackContainer::removeTrack( Track * _track )
 		{
 			Engine::getSong()->setModified();
 		}
+
+		emit trackRemoved();
 	}
 }
 

src/gui/CMakeLists.txt

@@ -77,6 +77,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/GuiApplication.cpp

@@ -38,6 +38,7 @@
 #include "PianoRoll.h"
 #include "ProjectNotes.h"
 #include "SongEditor.h"
+#include "MidiCCRackView.h"
 
 #include <QApplication>
 #include <QDir>
@@ -151,6 +152,10 @@ GuiApplication::GuiApplication()
 	m_automationEditor = new AutomationEditorWindow;
 	connect(m_automationEditor, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
 
+	displayInitProgress(tr("Preparing MIDI CC rack"));
+	m_midiCCRackView = new MidiCCRackView;
+	connect(m_midiCCRackView, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
+
 	splashScreen.finish(m_mainWindow);
 	m_mainWindow->finalize();
 

src/gui/MainWindow.cpp

@@ -42,6 +42,7 @@
 #include "AutomationEditor.h"
 #include "BBEditor.h"
 #include "ControllerRackView.h"
+#include "MidiCCRackView.h"
 #include "embed.h"
 #include "Engine.h"
 #include "ExportProjectDialog.h"
@@ -537,13 +538,22 @@ void MainWindow::finalize()
 								m_toolBar );
 	project_notes_window->setShortcut( Qt::CTRL + Qt::Key_7 );
 
+	ToolButton * midi_cc_rack_window = new ToolButton(
+					embed::getIconPixmap( "midi_cc_rack" ),
+					tr( "Show/hide MIDI CC rack") +
+								" (F12)",
+					this, SLOT( toggleMidiCCRack() ),
+								m_toolBar );
+	midi_cc_rack_window->setShortcut( Qt::CTRL + Qt::Key_8 );
+
 	m_toolBarLayout->addWidget( song_editor_window, 1, 1 );
 	m_toolBarLayout->addWidget( bb_editor_window, 1, 2 );
 	m_toolBarLayout->addWidget( piano_roll_window, 1, 3 );
 	m_toolBarLayout->addWidget( automation_editor_window, 1, 4 );
 	m_toolBarLayout->addWidget( fx_mixer_window, 1, 5 );
 	m_toolBarLayout->addWidget( controllers_window, 1, 6 );
 	m_toolBarLayout->addWidget( project_notes_window, 1, 7 );
+	m_toolBarLayout->addWidget( midi_cc_rack_window, 1, 8 );
 	m_toolBarLayout->setColumnStretch( 100, 1 );
 
 	// setup-dialog opened before?
@@ -1243,6 +1253,14 @@ void MainWindow::toggleControllerRack()
 
 
 
+void MainWindow::toggleMidiCCRack()
+{
+	toggleWindow( gui->getMidiCCRackView() );
+}
+
+
+
+
 void MainWindow::updatePlayPauseIcons()
 {
 	gui->songEditor()->setPauseIcon( false );

src/gui/TrackContainerView.cpp

@@ -175,6 +175,8 @@ void TrackContainerView::moveTrackView( TrackView * trackView, int indexTo )
 	m_trackViews.move( indexFrom, indexTo );
 
 	realignTracks();
+
+	emit movedTrackView();
 }