Implement Note Types

data/themes/classic/style.css

@@ -143,6 +143,7 @@ lmms--gui--PianoRoll {
 	qproperty-backgroundShade: rgba( 255, 255, 255, 10 );
 	qproperty-noteModeColor: rgb( 255, 255, 255 );
 	qproperty-noteColor: rgb( 119, 199, 216 );
+	qproperty-stepNoteColor: #9b1313;
 	qproperty-noteTextColor: rgb( 255, 255, 255 );
 	qproperty-noteOpacity: 128;
 	qproperty-noteBorders: true; /* boolean property, set false to have borderless notes */

data/themes/default/style.css

@@ -175,6 +175,7 @@ lmms--gui--PianoRoll {
 	qproperty-backgroundShade: rgba(255, 255, 255, 10);
 	qproperty-noteModeColor: #0bd556;
 	qproperty-noteColor: #0bd556;
+	qproperty-stepNoteColor: #9b1313;
 	qproperty-noteTextColor: #ffffff;
 	qproperty-noteOpacity: 165;
 	qproperty-noteBorders: false; /* boolean property, set false to have borderless notes */

include/DataFile.h

@@ -128,6 +128,7 @@ class LMMS_EXPORT DataFile : public QDomDocument
 	void upgrade_bbTcoRename();
 	void upgrade_sampleAndHold();
 	void upgrade_midiCCIndexing();
+  void upgrade_noteTypes();
 
 	// List of all upgrade methods
 	static const std::vector<UpgradeMethod> UPGRADE_METHODS;

include/Note.h

@@ -107,6 +107,19 @@ class LMMS_EXPORT Note : public SerializingObject
 	Note( const Note & note );
 	~Note() override;
 
+	// Note types
+	enum class Type
+	{
+		Regular = 0,
+		Step
+	};
+
+	Type type() const
+	{
+		return m_type;
+	}
+	inline void setType(Type t) { m_type = t; }
+
 	// used by GUI
 	inline void setSelected( const bool selected ) { m_selected = selected; }
 	inline void setOldKey( const int oldKey ) { m_oldKey = oldKey; }
@@ -253,6 +266,8 @@ class LMMS_EXPORT Note : public SerializingObject
 	TimePos m_length;
 	TimePos m_pos;
 	DetuningHelper * m_detuning;
+
+	Type m_type = Type::Regular;
 };
 
 using NoteVector = std::vector<Note*>;

include/PianoRoll.h

@@ -73,6 +73,7 @@ class PianoRoll : public QWidget
 	Q_PROPERTY(QColor lineColor MEMBER m_lineColor)
 	Q_PROPERTY(QColor noteModeColor MEMBER m_noteModeColor)
 	Q_PROPERTY(QColor noteColor MEMBER m_noteColor)
+	Q_PROPERTY(QColor stepNoteColor MEMBER m_stepNoteColor)
 	Q_PROPERTY(QColor ghostNoteColor MEMBER m_ghostNoteColor)
 	Q_PROPERTY(QColor noteTextColor MEMBER m_noteTextColor)
 	Q_PROPERTY(QColor ghostNoteTextColor MEMBER m_ghostNoteTextColor)
@@ -466,6 +467,7 @@ protected slots:
 	QColor m_lineColor;
 	QColor m_noteModeColor;
 	QColor m_noteColor;
+	QColor m_stepNoteColor;
 	QColor m_noteTextColor;
 	QColor m_ghostNoteColor;
 	QColor m_ghostNoteTextColor;

plugins/MidiExport/MidiExport.cpp

@@ -27,6 +27,7 @@
 
 #include "MidiExport.h"
 
+#include "Engine.h"
 #include "TrackContainer.h"
 #include "DataFile.h"
 #include "InstrumentTrack.h"
@@ -113,6 +114,7 @@ bool MidiExport::tryExport(const TrackContainer::TrackList &tracks,
 			int base_pitch = 0;
 			double base_volume = 1.0;
 			int base_time = 0;
+			int base_beatLen = 16;
 
 			MidiNoteVector midiClip;
 
@@ -128,6 +130,17 @@ bool MidiExport::tryExport(const TrackContainer::TrackList &tracks,
 						base_pitch += masterPitch;
 					}
 					base_volume = LocaleHelper::toDouble(it.attribute("volume", "100"))/100.0;
+					// From the PR 5902 forward (Note Types), the instrument XML includes the beat length
+					// in frames. We try to fetch it and convert to the length in ticks. If there's no beat
+					// length in XML, the default beat length of 16 ticks will be used.
+					QDomNode iNode = it.elementsByTagName("instrument").at(0);
+					if(!iNode.isNull()){
+						QDomElement i = iNode.toElement();
+						if(i.hasAttribute("beatlen"))
+						{
+							base_beatLen = i.attribute("beatlen", "0").toInt() / Engine::framesPerTick();
+						}
+					}
 				}
 
 				if (n.nodeName() == "midiclip")
@@ -137,7 +150,7 @@ bool MidiExport::tryExport(const TrackContainer::TrackList &tracks,
 				}
 
 			}
-			processPatternNotes(midiClip, INT_MAX);
+			processPatternNotes(midiClip, base_beatLen, INT_MAX);
 			writeMidiClipToTrack(mtrack, midiClip);
 			size = mtrack.writeToBuffer(buffer.data());
 			midiout.writeRawData((char *)buffer.data(), size);
@@ -188,6 +201,7 @@ bool MidiExport::tryExport(const TrackContainer::TrackList &tracks,
 
 		int base_pitch = 0;
 		double base_volume = 1.0;
+		int base_beatLen = 16;
 
 		// for each pattern in the pattern editor
 		for (QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling())
@@ -201,6 +215,13 @@ bool MidiExport::tryExport(const TrackContainer::TrackList &tracks,
 					base_pitch += masterPitch;
 				}
 				base_volume = LocaleHelper::toDouble(it.attribute("volume", "100")) / 100.0;
+				QDomNode iNode = it.elementsByTagName("instrument").at(0);
+				if(!iNode.isNull()){
+					QDomElement i = iNode.toElement();
+					if(i.hasAttribute("beatlen")){
+						base_beatLen = i.attribute("beatlen", "0").toInt()/Engine::framesPerTick();
+					}
+				}
 			}
 
 			if (n.nodeName() == "midiclip")
@@ -247,7 +268,7 @@ bool MidiExport::tryExport(const TrackContainer::TrackList &tracks,
 					st.pop_back();
 				}
 
-				processPatternNotes(nv, pos);
+				processPatternNotes(nv, base_beatLen, pos);
 				writeMidiClipToTrack(mtrack, nv);
 
 				// next pattern track
@@ -279,6 +300,7 @@ void MidiExport::writeMidiClip(MidiNoteVector &midiClip, const QDomNode& n,
 		mnote.volume = qMin(qRound(base_volume * LocaleHelper::toDouble(note.attribute("vol", "100")) * (127.0 / 200.0)), 127);
 		mnote.time = base_time + note.attribute("pos", "0").toInt();
 		mnote.duration = note.attribute("len", "0").toInt();
+		mnote.type = static_cast<Note::Type>(note.attribute("type", "0").toInt());
 		midiClip.push_back(mnote);
 	}
 }
@@ -311,14 +333,15 @@ void MidiExport::writePatternClip(MidiNoteVector& src, MidiNoteVector& dst,
 			note.pitch = srcNote.pitch;
 			note.time = base + time;
 			note.volume = srcNote.volume;
+			note.type = srcNote.type;
 			dst.push_back(note);
 		}
 	}
 }
 
 
 
-void MidiExport::processPatternNotes(MidiNoteVector& nv, int cutPos)
+void MidiExport::processPatternNotes(MidiNoteVector& nv, int beatLen, int cutPos)
 {
 	std::sort(nv.begin(), nv.end());
 	int cur = INT_MAX, next = INT_MAX;
@@ -329,9 +352,9 @@ void MidiExport::processPatternNotes(MidiNoteVector& nv, int cutPos)
 			next = cur;
 			cur = it->time;
 		}
-		if (it->duration < 0)
+		if (it->type == Note::Type::Step)
 		{
-			it->duration = qMin(qMin(-it->duration, next - cur), cutPos - it->time);
+			it->duration = qMin(qMin(beatLen, next - cur), cutPos - it->time);
 		}
 	}
 }

plugins/MidiExport/MidiExport.h

@@ -30,6 +30,7 @@
 
 #include "ExportFilter.h"
 #include "MidiFile.hpp"
+#include "Note.h"
 
 class QDomNode;
 
@@ -46,6 +47,7 @@ struct MidiNote
 	uint8_t pitch;
 	int duration;
 	uint8_t volume;
+	Note::Type type;
 
 	inline bool operator<(const MidiNote &b) const
 	{
@@ -78,7 +80,7 @@ class MidiExport: public ExportFilter
 	void writeMidiClipToTrack(MTrack &mtrack, MidiNoteVector &nv);
 	void writePatternClip(MidiNoteVector &src, MidiNoteVector &dst,
 				int len, int base, int start, int end);
-	void processPatternNotes(MidiNoteVector &nv, int cutPos);
+	void processPatternNotes(MidiNoteVector &nv, int beatLen, int cutPos);
 
 	void error();
 

src/core/DataFile.cpp

@@ -42,6 +42,7 @@
 #include "embed.h"
 #include "GuiApplication.h"
 #include "LocaleHelper.h"
+#include "Note.h"
 #include "PluginFactory.h"
 #include "ProjectVersion.h"
 #include "SongEditor.h"
@@ -79,7 +80,8 @@ const std::vector<DataFile::UpgradeMethod> DataFile::UPGRADE_METHODS = {
 	&DataFile::upgrade_automationNodes  ,   &DataFile::upgrade_extendedNoteRange,
 	&DataFile::upgrade_defaultTripleOscillatorHQ,
 	&DataFile::upgrade_mixerRename      ,   &DataFile::upgrade_bbTcoRename,
-	&DataFile::upgrade_sampleAndHold    ,   &DataFile::upgrade_midiCCIndexing
+	&DataFile::upgrade_sampleAndHold    ,   &DataFile::upgrade_midiCCIndexing,
+	&DataFile::upgrade_noteTypes
 };
 
 // Vector of all versions that have upgrade routines.
@@ -1662,6 +1664,24 @@ void DataFile::upgrade_automationNodes()
 	}
 }
 
+// Convert the negative length notes to StepNotes
+void DataFile::upgrade_noteTypes()
+{
+	const auto notes = elementsByTagName("note");
+
+	for (int i = 0; i < notes.size(); ++i)
+	{
+		auto note = notes.item(i).toElement();
+
+		const auto noteSize = note.attribute("len").toInt();
+		if (noteSize < 0)
+		{
+			note.setAttribute("len", DefaultTicksPerBar / 16);
+			note.setAttribute("type", static_cast<int>(Note::Type::Step));
+		}
+	}
+}
+
 
 /** \brief Note range has been extended to match MIDI specification
  *

src/core/Note.cpp

@@ -74,7 +74,8 @@ Note::Note( const Note & note ) :
 	m_panning( note.m_panning ),
 	m_length( note.m_length ),
 	m_pos( note.m_pos ),
-	m_detuning( nullptr )
+	m_detuning(nullptr),
+	m_type(note.m_type)
 {
 	if( note.m_detuning )
 	{
@@ -179,6 +180,7 @@ void Note::saveSettings( QDomDocument & doc, QDomElement & parent )
 	parent.setAttribute( "pan", m_panning );
 	parent.setAttribute( "len", m_length );
 	parent.setAttribute( "pos", m_pos );
+	parent.setAttribute("type", static_cast<int>(m_type));
 
 	if( m_detuning && m_length )
 	{
@@ -197,6 +199,8 @@ void Note::loadSettings( const QDomElement & _this )
 	m_panning = _this.attribute( "pan" ).toInt();
 	m_length = _this.attribute( "len" ).toInt();
 	m_pos = _this.attribute( "pos" ).toInt();
+	// Default m_type value is 0, which corresponds to RegularNote
+	m_type = static_cast<Type>(_this.attribute("type", "0").toInt());
 
 	if( _this.hasChildNodes() )
 	{

src/core/NotePlayHandle.cpp

@@ -53,7 +53,7 @@ NotePlayHandle::NotePlayHandle( InstrumentTrack* instrumentTrack,
 								NotePlayHandle *parent,
 								int midiEventChannel,
 								Origin origin ) :
-	PlayHandle( Type::NotePlayHandle, _offset ),
+	PlayHandle( PlayHandle::Type::NotePlayHandle, _offset ),
 	Note( n.length(), n.pos(), n.key(), n.getVolume(), n.getPanning(), n.detuning() ),
 	m_pluginData( nullptr ),
 	m_instrumentTrack( instrumentTrack ),

src/core/TimePos.cpp

@@ -161,11 +161,7 @@ tick_t TimePos::getTickWithinBeat( const TimeSig &sig ) const
 
 f_cnt_t TimePos::frames( const float framesPerTick ) const
 {
-	if( m_ticks >= 0 )
-	{
-		return static_cast<f_cnt_t>( m_ticks * framesPerTick );
-	}
-	return 0;
+	return static_cast<f_cnt_t>(m_ticks * framesPerTick);
 }
 
 double TimePos::getTimeInMilliseconds( bpm_t beatsPerMinute ) const
@@ -221,4 +217,4 @@ double TimePos::ticksToMilliseconds(double ticks, bpm_t beatsPerMinute)
 }
 
 
-} // namespace lmms
+} // namespace lmms