MIDI range MKII (extracted from microtonal PR) (#5868)

* Update MIDI range to match MIDI specification

Co-authored-by: IanCaio <[email protected]>
Co-authored-by: Kevin Zander <[email protected]>
Co-authored-by: Hyunjin Song <[email protected]>
Co-authored-by: Spekular <[email protected]>

Author: 5 people

data/themes/classic/black_key_disabled.png

@@ -165,9 +165,11 @@ PianoRoll {
 	qproperty-whiteKeyInactiveTextColor: rgb( 128, 128, 128);
 	qproperty-whiteKeyInactiveTextShadow: rgb( 240, 240, 240 );
 	qproperty-whiteKeyInactiveBackground: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #eeeeee, stop:1 #ffffff);
+	qproperty-whiteKeyDisabledBackground: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #a0a0a0, stop:1 #b0b0b0);
 	qproperty-blackKeyWidth: 48;
 	qproperty-blackKeyActiveBackground: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #43e97b, stop:1 #3bcd6c);
 	qproperty-blackKeyInactiveBackground: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #333, stop:1 #000);
+	qproperty-blackKeyDisabledBackground: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #606060, stop:1 #505050);
 	/* Grid colors */
 	qproperty-lineColor: rgba( 128, 128, 128, 80 );
 	qproperty-beatLineColor: rgba( 128, 128, 128, 160 );

data/themes/classic/style.css

@@ -197,9 +197,11 @@ PianoRoll {
 	qproperty-whiteKeyInactiveTextColor: #000;
 	qproperty-whiteKeyInactiveTextShadow: #fff;
 	qproperty-whiteKeyInactiveBackground: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #eeeeee, stop:1 #ffffff);
+	qproperty-whiteKeyDisabledBackground: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #a0a0a0, stop:1 #b0b0b0);
 	qproperty-blackKeyWidth: 48;
 	qproperty-blackKeyActiveBackground: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #43e97b, stop:1 #3bcd6c);
 	qproperty-blackKeyInactiveBackground: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #333, stop:1 #000);
+	qproperty-blackKeyDisabledBackground: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #606060, stop:1 #505050);
 	/* Grid colors */
 	qproperty-lineColor: #292929;
 	qproperty-beatLineColor: #2d6b45;

data/themes/classic/white_key_disabled.png

@@ -120,6 +120,7 @@ class LMMS_EXPORT DataFile : public QDomDocument
 	void upgrade_1_3_0();
 	void upgrade_noHiddenClipNames();
 	void upgrade_automationNodes();
+	void upgrade_extendedNoteRange();
 
 	// List of all upgrade methods
 	static const std::vector<UpgradeMethod> UPGRADE_METHODS;

data/themes/default/black_key_disabled.png

@@ -174,7 +174,19 @@ class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 		return &m_baseNoteModel;
 	}
 
+	IntModel *firstKeyModel()
+	{
+		return &m_firstKeyModel;
+	}
+
+	IntModel *lastKeyModel()
+	{
+		return &m_lastKeyModel;
+	}
+
 	int baseNote() const;
+	int firstKey() const;
+	int lastKey() const;
 
 	Piano *pianoModel()
 	{
@@ -265,11 +277,13 @@ protected slots:
 
 	bool m_previewMode;
 
+	IntModel m_baseNoteModel;	//!< The "A4" or "440 Hz" key (default 69)
+	IntModel m_firstKeyModel;	//!< First key the instrument reacts to
+	IntModel m_lastKeyModel;	//!< Last key the instrument reacts to
+
 	bool m_hasAutoMidiDev;
 	static InstrumentTrack *s_autoAssignedTrack;
 
-	IntModel m_baseNoteModel;
-
 	NotePlayHandleList m_processHandles;
 
 	FloatModel m_volumeModel;
@@ -282,7 +296,6 @@ protected slots:
 	IntModel m_effectChannelModel;
 	BoolModel m_useMasterPitchModel;
 
-
 	Instrument * m_instrument;
 	InstrumentSoundShaping m_soundShaping;
 	InstrumentFunctionArpeggio m_arpeggio;

data/themes/default/style.css

@@ -55,6 +55,7 @@ enum Keys
 
 enum Octaves
 {
+	Octave_m1,	// MIDI standard starts at C-1
 	Octave_0,
 	Octave_1,
 	Octave_2,
@@ -64,15 +65,19 @@ enum Octaves
 	Octave_6,
 	Octave_7,
 	Octave_8,
+	Octave_9,	// incomplete octave, MIDI only goes up to G9
 	NumOctaves
-} ;
+};
 
+const int FirstOctave = -1;
+const int KeysPerOctave = 12;
+const int DefaultKey = DefaultOctave * KeysPerOctave + Key_A;
+//! Number of physical keys, limited to MIDI range (valid for both MIDI 1.0 and 2.0)
+const int NumKeys = 128;
 
-const int WhiteKeysPerOctave = 7;
-const int BlackKeysPerOctave = 5;
-const int KeysPerOctave = WhiteKeysPerOctave + BlackKeysPerOctave;
-const int NumKeys = NumOctaves * KeysPerOctave;
-const int DefaultKey = DefaultOctave*KeysPerOctave + Key_A;
+const int DefaultMiddleKey = Octave_4 * KeysPerOctave + Key_C;
+const int DefaultBaseKey = Octave_4 * KeysPerOctave + Key_A;
+const float DefaultBaseFreq = 440.f;
 
 const float MaxDetuning = 4 * 12.0f;
 

data/themes/default/white_key_disabled.png

@@ -125,7 +125,7 @@ class LMMS_EXPORT NotePlayHandle : public PlayHandle, public Note
 	/*! Returns whether the play handle plays on a certain track */
 	bool isFromTrack( const Track* _track ) const override;
 
-	/*! Releases the note (and plays release frames */
+	/*! Releases the note (and plays release frames) */
 	void noteOff( const f_cnt_t offset = 0 );
 
 	/*! Returns number of frames to be played until the note is going to be released */