Enhanced arpeggio - working snapshot

data/presets/CMakeLists.txt

@@ -2,4 +2,4 @@ INCLUDE(InstallHelpers)
 
 INSTALL_DATA_SUBDIRS("presets" "*.xpf")
 INSTALL_DATA_SUBDIRS("presets" "*.xiz")
-
+INSTALL_DATA_SUBDIRS("presets" "*.ctd")

include/AutomatableSlider.h

@@ -32,7 +32,7 @@
 
 
 
-class AutomatableSlider : public QSlider, public IntModelView
+class EXPORT AutomatableSlider : public QSlider, public IntModelView
 {
 	Q_OBJECT
 public:

include/ChordTable.h

@@ -0,0 +1,238 @@
+/*
+ * ChordTable.h - The notestacking/arpeggio chord classes
+ *
+ * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2016-2017 Riki Sluga <rikislav/at/gmail.com>
+ *
+ * This file is part of LMMS - http://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 CHORD_TABLE_H
+#define CHORD_TABLE_H
+
+#include <QStringList>
+
+#include "ConfigManager.h"
+#include "JournallingObject.h"
+#include "AutomatableModel.h"
+
+class Model;
+class Chord;
+class ChordTable;
+
+//new constants for key notes in arpeggios, used by the Int Automated model
+const int KeyMax = ( 0 + 30 );
+const int KeyMin = -KeyMax;
+const int KeyDefault = 0;
+
+
+class EXPORT ChordSemiTone : public Model , public JournallingObject
+{
+	Q_OBJECT
+public:
+
+	// the semitone
+	IntModel * key; 
+	FloatModel * vol;
+	FloatModel * pan;
+	// the note is played -> true: yes, false: skipped
+	//TO DO: has to be implemented yet
+	BoolModel * active;
+	// the note is processed but silenced -> true: normally played, false: muted
+	BoolModel * silenced;
+	// random: the note will be a random value within the abs(key) range
+	BoolModel * rand;
+	// The note only has the key value. True: bare, we will discard al the rest, taking data from the base note
+	BoolModel * bare;
+
+	//The semitone will always belong to a chord
+	ChordSemiTone( Chord * _parent );
+
+	//Creates a new semitone which gets data from the argument
+	ChordSemiTone( ChordSemiTone * _copy );
+
+	//constructs the object from a given string by calling the parseString function
+	ChordSemiTone( Chord * _parent, QString _string );
+
+	virtual ~ChordSemiTone();
+
+	//return the parent chord
+	Chord * getChord()
+	{
+		return qobject_cast< Chord * >( parent() );
+	}
+
+	//parses a string into data
+	void parseString( QString _string );
+
+	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	virtual void loadSettings( const QDomElement & _this );
+
+	inline virtual QString nodeName() const
+	{
+		return "chordSemiTone";
+	}
+};
+
+class EXPORT Chord : public Model, public JournallingObject, public QVector<ChordSemiTone * >
+{
+	Q_OBJECT
+public:
+	QString m_name;
+
+	//creates an empty chord
+	Chord( Model * _parent );
+
+	//creates a chord by parsing the semitone string
+	Chord( Model * _parent, QString _name, QString _string );
+
+	//creates a new Chord without semitones
+	Chord( Model * _parent, QString _name );
+
+	//Creates a copy of the chord, changing name too;
+	Chord( Chord * _copy, QString _name );
+
+	virtual ~Chord();
+
+	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	virtual void loadSettings( const QDomElement & _this );
+
+	inline virtual QString nodeName() const
+	{
+		return "Chord";
+	}
+
+	//TO DO : check for duplicate keys
+	bool isScale() const
+	{
+		return size() > 6;
+	}
+
+	bool isEmpty() const
+	{
+		return size() == 0;
+	}
+
+	bool hasSemiTone( int8_t semiTone ) const;
+
+	//returns the key of the last chordsemitone
+	int8_t last() const
+	{
+		if ( size() > 0 )
+		{
+			return at( size() - 1 )->key->value();
+		} else {
+			return 0;
+		}
+	}
+
+	const QString & getName() const
+	{
+		return m_name;
+	}
+
+	// returning the key
+	int8_t operator[]( int n ) const
+	{
+		return at( n )->key->value();
+	}
+
+	//Adds at the end a standard semitone
+	void addSemiTone();
+
+	//inserts the semitone in the stated position
+	void insertSemiTone( ChordSemiTone * csm, int position );
+
+	//deletes the semitone
+	void removeSemiTone( int i );
+
+	//parses the string into data by adding the Semitones to the vector after clearing it
+	void parseString( QString _string );
+};
+
+
+
+class EXPORT ChordTable : public Model, public JournallingObject, public QVector<Chord * >
+{
+	Q_OBJECT
+public:
+	ChordTable( Model * _parent );
+	virtual ~ChordTable() {}
+
+	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	virtual void loadSettings( const QDomElement & _this );
+
+	inline virtual QString nodeName() const
+	{
+		return "ChordTable";
+	}
+
+	//old function, not used in the new version which makes use of the available data functions.
+	bool readXML();
+
+	//loads the factory preset
+	void loadFactoryPreset();
+
+	//adds or clones a chord to the chord table. If -1 adds a chord else clones the given
+	void cloneChord( int i = -1 );
+
+	//removes the chord and emits the datachanged signal;
+	void removeChord( int i );
+
+
+	const Chord & getByName( const QString & name, bool is_scale = false ) const;
+
+	const Chord & getScaleByName( const QString & name ) const
+	{
+		return getByName( name, true );
+	}
+
+	const Chord & getChordByName( const QString & name ) const
+	{
+		return getByName( name, false );
+	}
+
+
+	//tricking compiler
+	//the compiler before qt5 treats signals as private
+	void emitChordTableChangedSignal()
+	{
+		emit chordTableChanged();
+	}
+
+	void emitChordNameChanged()
+	{
+		emit chordNameChanged();
+	}
+
+public slots:
+
+	//reloads the chordtable from the file
+	void reset();
+
+signals:
+
+	//emitted only when chord names are changed to reflect in other classes
+	void chordNameChanged();
+	//emitted when the chord table data has changed
+	void chordTableChanged();
+
+};
+
+#endif

include/ControllerConnectionDialog.h

@@ -28,6 +28,7 @@
 #define CONTROLLER_CONNECTION_DIALOG_H
 
 #include <QDialog>
+#include <QLabel>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 
@@ -69,6 +70,11 @@ public slots:
 	void autoDetectToggled();
 	void enableAutoDetect( QAction * _a );
 
+	//RIKIS
+	//Sets the label text in the midi dialog
+	void setLabelText();
+	//RIKIS
+
 
 protected slots:
 	void midiValueChanged();
@@ -83,6 +89,15 @@ protected slots:
 	MidiPortMenu * m_readablePorts;
 	BoolModel m_midiAutoDetect;
 
+	//RIKIS
+	QLabel * m_ValueLabel;
+	QLabel * m_ControllerTypeLabel;
+	QLabel * m_KeyLabel;
+	QLabel * m_VelocityLabel;
+	QLabel * m_PitchLabel;
+	//RIKIS
+
+
 	// User
 	GroupBox * m_userGroupBox;
 	ComboBox * m_userController;

include/DataFile.h

@@ -41,6 +41,7 @@ class EXPORT DataFile : public QDomDocument
 	enum Types
 	{
 		UnknownType,
+		ChordTable,
 		SongProject,
 		SongProjectTemplate,
 		InstrumentTrackSettings,

include/Engine.h

@@ -39,6 +39,7 @@ class ProjectJournal;
 class Mixer;
 class Song;
 class Ladspa2LMMS;
+class ChordTable;
 
 
 // Note: This class is called 'LmmsCore' instead of 'Engine' because of naming
@@ -111,6 +112,12 @@ class EXPORT LmmsCore : public QObject
 		return s_instanceOfMe;
 	}
 
+	static ChordTable * chordTable()
+	{
+		return s_chordTable;
+	}
+
+
 signals:
 	void initProgress(const QString &msg);
 
@@ -138,6 +145,8 @@ class EXPORT LmmsCore : public QObject
 
 	static Ladspa2LMMS * s_ladspaManager;
 
+	static ChordTable * s_chordTable;
+
 	// even though most methods are static, an instance is needed for Qt slots/signals
 	static LmmsCore * s_instanceOfMe;
 

include/GuiApplication.h

@@ -28,6 +28,7 @@
 #include <QtCore/QObject>
 
 #include "export.h"
+#include "PluginView.h"
 
 class QLabel;
 
@@ -58,6 +59,23 @@ class EXPORT GuiApplication : public QObject
 	AutomationEditorWindow* automationEditor() { return m_automationEditor; }
 	ControllerRackView* getControllerRackView() { return m_controllerRackView; }
 
+	//As at present the editor is a toolPlugin we initiate it 
+	//while loading in gui/MainWindow.cpp:368
+	void setChordTableEditorView( PluginView * _view );
+
+	PluginView* getChordTableEditorView() { return m_chordTableEditorView; }
+
+	//the convenience method which emits the signal below
+	void emitGenericSignal_1(int i)
+	{
+		emit genericSignal_1( i );
+	}
+
+signals:
+	//lazy workaround for easy communication
+	void genericSignal_1( int i );
+
+
 public slots:
 	void displayInitProgress(const QString &msg);
 
@@ -67,6 +85,9 @@ private slots:
 private:
 	static GuiApplication* s_instance;
 
+	//will be initialized by MainWindow.finalize - tools menu section
+	PluginView* m_chordTableEditorView;
+
 	MainWindow* m_mainWindow;
 	FxMixerView* m_fxMixerView;
 	SongEditorWindow* m_songEditor;

include/InstrumentFunctionViews.h

@@ -47,6 +47,9 @@ class InstrumentFunctionNoteStackingView : public QWidget, public ModelView
 	InstrumentFunctionNoteStackingView( InstrumentFunctionNoteStacking* cc, QWidget* parent = NULL );
 	virtual ~InstrumentFunctionNoteStackingView();
 
+public slots:
+	//To display the chordTableEditorPlugin
+	void showChordTableEditor();
 
 private:
 	virtual void modelChanged();
@@ -70,6 +73,9 @@ class InstrumentFunctionArpeggioView : public QWidget, public ModelView
 	InstrumentFunctionArpeggioView( InstrumentFunctionArpeggio* arp, QWidget* parent = NULL );
 	virtual ~InstrumentFunctionArpeggioView();
 
+public slots:
+	//To display the chordTableEditorPlugin
+	void showChordTableEditor();
 
 private:
 	virtual void modelChanged();