Revert "'Off beat' beat notes to MelodyPattern"

This reverts commit e4474af.
LMMS · May 1, 2017 · 082dbed · 082dbed
1 parent 2f51062
commit 082dbed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/include/Pattern.h b/include/Pattern.h
@@ -88,7 +88,7 @@ class EXPORT Pattern : public TrackContentObject
 	{
 		return m_patternType;
 	}
-	void checkType();
+
 
 	// next/previous track based on position in the containing track
 	Pattern * previousPattern() const;
@@ -132,6 +132,7 @@ protected slots:
 	MidiTime beatPatternLength() const;
 
 	void setType( PatternTypes _new_pattern_type );
+	void checkType();
 
 	void resizeToFirstTrack();
 

diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
@@ -2459,11 +2459,6 @@ void PianoRoll::dragNotes( int x, int y, bool alt, bool shift, bool ctrl )
 
 					note->setPos( MidiTime( pos_ticks ) );
 					note->setKey( key_num );
-					// If dragging beat notes check if pattern should be MelodyPattern
-					if( note->length() < 0 )
-					{
-						m_pattern->checkType();
-					}
 				}
 			}
 		}

diff --git a/src/tracks/Pattern.cpp b/src/tracks/Pattern.cpp
@@ -361,9 +361,7 @@ void Pattern::checkType()
 	NoteVector::Iterator it = m_notes.begin();
 	while( it != m_notes.end() )
 	{
-		if( ( *it )->length() > 0 ||
-			( *it )->pos() % ( MidiTime::ticksPerTact() /
-						MidiTime::stepsPerTact() ) )
+		if( ( *it )->length() > 0 )
 		{
 			setType( MelodyPattern );
 			return;