Drop notes with length zero (#3031)

LMMS · Sep 12, 2016 · 1f90337 · 1f90337
1 parent ede0e07
commit 1f90337
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 189 deletions.
diff --git a/include/MidiTime.h b/include/MidiTime.h
@@ -97,6 +97,7 @@ class EXPORT MidiTime
 	static tick_t ticksPerTact( const TimeSig &sig );
 	static int stepsPerTact();
 	static void setTicksPerTact( tick_t tpt );
+	static MidiTime stepPosition( int step );
 
 private:
 	tick_t m_ticks;

diff --git a/include/Pattern.h b/include/Pattern.h
@@ -70,11 +70,11 @@ class EXPORT Pattern : public TrackContentObject
 	// note management
 	Note * addNote( const Note & _new_note, const bool _quant_pos = true );
 
-	void removeNote( const Note * _note_to_del );
+	void removeNote( Note * _note_to_del );
 
 	Note * noteAtStep( int _step );
 
-	Note * rearrangeNote( const Note * _note_to_proc,
+	Note * rearrangeNote( Note * _note_to_proc,
 						const bool _quant_pos = true );
 	void rearrangeAllNotes();
 	void clearNotes();
@@ -84,7 +84,8 @@ class EXPORT Pattern : public TrackContentObject
 		return m_notes;
 	}
 
-	void setStep( int _step, bool _enabled );
+	Note * addStepNote( int step );
+	void setStep( int step, bool enabled );
 
 	// pattern-type stuff
 	inline PatternTypes type() const
@@ -122,7 +123,6 @@ class EXPORT Pattern : public TrackContentObject
 
 
 protected:
-	void ensureBeatNotes();
 	void updateBBTrack();
 
 

diff --git a/src/core/midi/MidiTime.cpp b/src/core/midi/MidiTime.cpp
@@ -198,3 +198,9 @@ void MidiTime::setTicksPerTact( tick_t tpt )
 {
 	s_ticksPerTact = tpt;
 }
+
+
+MidiTime MidiTime::stepPosition( int step )
+{
+	return step * ticksPerTact() / stepsPerTact();
+}
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
@@ -1627,17 +1627,8 @@ void PianoRoll::mousePressEvent(QMouseEvent * me )
 				m_mouseDownRight = true;
 				if( it != notes.begin()-1 )
 				{
-					Note *note = *it;
 					m_pattern->addJournalCheckPoint();
-					if( note->length() > 0 )
-					{
-						m_pattern->removeNote( note );
-					}
-					else
-					{
-						note->setLength( 0 );
-						m_pattern->dataChanged();
-					}
+					m_pattern->removeNote( *it );
 					Engine::getSong()->setModified();
 				}
 			}
@@ -2288,19 +2279,8 @@ void PianoRoll::mouseMoveEvent( QMouseEvent * me )
 					)
 				{
 					// delete this note
-					if( it != notes.end() )
-					{
-						if( note->length() > 0 )
-						{
-							m_pattern->removeNote( note );
-						}
-						else
-						{
-							note->setLength( 0 );
-							m_pattern->dataChanged();
-						}
-						Engine::getSong()->setModified();
-					}
+					m_pattern->removeNote( note );
+					Engine::getSong()->setModified();
 				}
 				else
 				{
@@ -3700,7 +3680,7 @@ void PianoRoll::cutSelectedNotes()
 
 		Engine::getSong()->setModified();
 
-		for( const Note *note : selected_notes )
+		for( Note *note : selected_notes )
 		{
 			// note (the memory of it) is also deleted by
 			// pattern::removeNote(...) so we don't have to do that

diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
@@ -656,25 +656,21 @@ bool InstrumentTrack::play( const MidiTime & _start, const fpp_t _frames,
 		while( nit != notes.end() &&
 					( cur_note = *nit )->pos() == cur_start )
 		{
-			if( cur_note->length() != 0 )
-			{
-				const f_cnt_t note_frames =
-					cur_note->length().frames(
-							frames_per_tick );
-
-				NotePlayHandle* notePlayHandle = NotePlayHandleManager::acquire( this, _offset, note_frames, *cur_note );
-				notePlayHandle->setBBTrack( bb_track );
-				// are we playing global song?
-				if( _tco_num < 0 )
-				{
-					// then set song-global offset of pattern in order to
-					// properly perform the note detuning
-					notePlayHandle->setSongGlobalParentOffset( p->startPosition() );
-				}
+			const f_cnt_t note_frames =
+				cur_note->length().frames( frames_per_tick );
 
-				Engine::mixer()->addPlayHandle( notePlayHandle );
-				played_a_note = true;
+			NotePlayHandle* notePlayHandle = NotePlayHandleManager::acquire( this, _offset, note_frames, *cur_note );
+			notePlayHandle->setBBTrack( bb_track );
+			// are we playing global song?
+			if( _tco_num < 0 )
+			{
+				// then set song-global offset of pattern in order to
+				// properly perform the note detuning
+				notePlayHandle->setSongGlobalParentOffset( p->startPosition() );
 			}
+
+			Engine::mixer()->addPlayHandle( notePlayHandle );
+			played_a_note = true;
 			++nit;
 		}
 	}