'Off beat' beat notes to MelodyPattern

LMMS · Feb 20, 2017 · 9e791ce · 9e791ce
1 parent 62ad715
commit 9e791ce
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 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,7 +132,6 @@ 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
@@ -2451,6 +2451,11 @@ 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
@@ -369,7 +369,9 @@ void Pattern::checkType()
 	NoteVector::Iterator it = m_notes.begin();
 	while( it != m_notes.end() )
 	{
-		if( ( *it )->length() > 0 )
+		if( ( *it )->length() > 0 ||
+			( *it )->pos() % ( MidiTime::ticksPerTact() /
+						MidiTime::stepsPerTact() ) )
 		{
 			setType( MelodyPattern );
 			return;
@@ -975,14 +977,14 @@ void PatternView::paintEvent( QPaintEvent * )
 								y_pos <= max_ht )
 					{
 						// calculate start and end x-coords of the line to be drawn
-						int length =  ( *it )->length();
+						int length = ( *it )->length();
 						length = length > 0 ? length : 4;
 						const int x1 = x_base +
 							static_cast<int>
-							( ( *it )->pos() * ( ppt  / MidiTime::ticksPerTact() ) );
+							( ( *it )->pos() * ( ppt / MidiTime::ticksPerTact() ) );
 						const int x2 = x_base +
 							static_cast<int>
-							( ( ( *it )->pos() + length ) * ( ppt  / MidiTime::ticksPerTact() ) );
+							( ( ( *it )->pos() + length ) * ( ppt / MidiTime::ticksPerTact() ) );
 
 						// check bounds, draw line
 						if( x1 < width() - TCO_BORDER_WIDTH )