hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

NotePlayHandle, InstrumentFunctions: reworked stacking and arpeggio handling

Browse Source 
Instead of having various flags for realizing the arpeggion functionality
use a more generic approach here using the recently introduced "origin"
property.
This commit is contained in:
Tobias Doerffel
2014-03-26 11:39:14 +01:00
parent 89dc820d7b
commit 6650dd356d
5 changed files with 74 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/NotePlayHandle.h
View File

@@ -51,6 +51,8 @@ public:
{
OriginPattern, /*! playback of a note from a pattern */
OriginMidiInput, /*! playback of a MIDI note input event */
OriginNoteStacking, /*! created by note stacking instrument function */
OriginArpeggio, /*! created by arpeggio instrument function */
OriginCount
};
typedef Origins Origin;
@@ -60,7 +62,6 @@ public:
const f_cnt_t frames,
const note& noteToPlay,
NotePlayHandle* parent = NULL,
const bool isPartOfArp = false,
int midiEventChannel = -1,
Origin origin = OriginPattern );
virtual ~NotePlayHandle();
@@ -160,27 +161,24 @@ public:
return m_instrumentTrack;
}
/*! Returns whether note is a top note, e.g. is not part of an arpeggio or a chord */
bool isTopNote() const
/*! Returns whether note has a parent, e.g. is not part of an arpeggio or a chord */
bool hasParent() const
{
return m_topNote;
return m_hasParent;
}
/*! Returns whether note is part of an arpeggio playback */
bool isPartOfArpeggio() const
/*! Returns origin of note */
Origin origin() const
{
return m_partOfArpeggio;
return m_origin;
}
/*! Sets whether note is part of an arpeggio playback */
void setPartOfArpeggio( const bool _on )
/*! Returns whether note has children */
bool isMasterNote() const
{
m_partOfArpeggio = _on;
return m_subNotes.size() > 0 || m_hadChildren;
}
/*! Returns whether note is base note for arpeggio */
bool isArpeggioBaseNote() const;
/*! Returns whether note is muted */
bool isMuted() const
{
@@ -268,11 +266,8 @@ private:
// release of note
NotePlayHandleList m_subNotes; // used for chords and arpeggios
volatile bool m_released; // indicates whether note is released
bool m_topNote; // indicates whether note is a
// base-note (i.e. no sub-note)
bool m_partOfArpeggio; // indicates whether note is part of
// an arpeggio (either base-note or
// sub-note)
bool m_hasParent;
bool m_hadChildren;
bool m_muted; // indicates whether note is muted
track* m_bbTrack; // related BB track