Fixes createTCO method on some classes

plugins/HydrogenImport/HydrogenImport.cpp

@@ -314,10 +314,8 @@ bool HydrogenImport::readSong()
 
 			int i = pattern_id[patId]+song_num_tracks;
 			Track *t = ( BBTrack * ) s->tracks().at( i );
- 			TrackContentObject *tco = t->createTCO( pos );      
-			tco->movePosition( pos );
+			t->createTCO( pos );
 
-
 			if ( pattern_length[patId] > best_length ) 
 			{
 				best_length = pattern_length[patId];

plugins/MidiImport/MidiImport.cpp

@@ -193,8 +193,7 @@ class smfMidiCC
 		{
 			MidiTime pPos = MidiTime( time.getBar(), 0 );
 			ap = dynamic_cast<AutomationPattern*>(
-				at->createTCO(0) );
-			ap->movePosition( pPos );
+				at->createTCO( pPos ) );
 			ap->addObject( objModel );
 		}
 
@@ -287,8 +286,7 @@ class smfMidiChannel
 			if (!newPattern || n->pos() > lastEnd + DefaultTicksPerBar)
 			{
 				MidiTime pPos = MidiTime(n->pos().getBar(), 0);
-				newPattern = dynamic_cast<Pattern*>(it->createTCO(0));
-				newPattern->movePosition(pPos);
+				newPattern = dynamic_cast<Pattern*>(it->createTCO( pPos ));
 			}
 			lastEnd = n->pos() + n->length();
 

src/core/Track.cpp

@@ -1860,7 +1860,7 @@ bool TrackContentWidget::pasteSelection( MidiTime tcoPos, const QMimeData * md,
 
 		TrackContentObject * tco = t->createTCO( pos );
 		tco->restoreState( tcoElement );
-		tco->movePosition( pos );
+		tco->movePosition( pos ); // Because we restored the state, we need to move the TCO again.
 		if( wasSelection )
 		{
 			tco->selectViewOnCreate( true );
@@ -1914,11 +1914,7 @@ void TrackContentWidget::mousePressEvent( QMouseEvent * me )
 		getTrack()->addJournalCheckPoint();
 		const MidiTime pos = getPosition( me->x() ).getBar() *
 						MidiTime::ticksPerBar();
-		TrackContentObject * tco = getTrack()->createTCO( pos );
-
-		tco->saveJournallingState( false );
-		tco->movePosition( pos );
-		tco->restoreJournallingState();
+		getTrack()->createTCO( pos );
 	}
 }
 
@@ -2570,8 +2566,6 @@ void Track::loadSettings( const QDomElement & element )
 				TrackContentObject * tco = createTCO(
 								MidiTime( 0 ) );
 				tco->restoreState( node.toElement() );
-				saveJournallingState( false );
-				restoreJournallingState();
 			}
 		}
 		node = node.nextSibling();
@@ -2759,7 +2753,6 @@ void Track::createTCOsForBB( int bb )
 	{
 		MidiTime position = MidiTime( numOfTCOs(), 0 );
 		TrackContentObject * tco = createTCO( position );
-		tco->movePosition( position );
 		tco->changeLength( MidiTime( 1, 0 ) );
 	}
 }

src/tracks/AutomationTrack.cpp

@@ -57,9 +57,11 @@ TrackView * AutomationTrack::createView( TrackContainerView* tcv )
 
 
 
-TrackContentObject * AutomationTrack::createTCO( const MidiTime & )
+TrackContentObject * AutomationTrack::createTCO( const MidiTime & _pos )
 {
-	return new AutomationPattern( this );
+	AutomationPattern *p = new AutomationPattern( this );
+	p->movePosition( _pos );
+	return p;
 }
 
 
@@ -133,7 +135,6 @@ void AutomationTrackView::dropEvent( QDropEvent * _de )
 			TrackContentObject * tco = getTrack()->createTCO( pos );
 			AutomationPattern * pat = dynamic_cast<AutomationPattern *>( tco );
 			pat->addObject( mod );
-			pat->movePosition( pos );
 		}
 	}
 

src/tracks/BBTrack.cpp

@@ -479,6 +479,9 @@ TrackContentObject * BBTrack::createTCO( const MidiTime & _pos )
 		bbtco->setColor( *s_lastTCOColor );
 		bbtco->setUseStyleColor( false );
 	}
+
+	bbtco->movePosition( _pos );
+
 	return bbtco;
 }
 

src/tracks/InstrumentTrack.cpp

@@ -713,9 +713,11 @@ bool InstrumentTrack::play( const MidiTime & _start, const fpp_t _frames,
 
 
 
-TrackContentObject * InstrumentTrack::createTCO( const MidiTime & )
+TrackContentObject * InstrumentTrack::createTCO( const MidiTime & _pos )
 {
-	return new Pattern( this );
+	Pattern *p = new Pattern( this );
+	p->movePosition( _pos );
+	return p;
 }
 
 

src/tracks/SampleTrack.cpp

@@ -746,10 +746,10 @@ TrackView * SampleTrack::createView( TrackContainerView* tcv )
 
 
 
-TrackContentObject * SampleTrack::createTCO(const MidiTime & pos)
+TrackContentObject * SampleTrack::createTCO(const MidiTime & _pos)
 {
-	SampleTCO * sTco = new SampleTCO(this);
-	sTco->movePosition(pos);
+	SampleTCO * sTco = new SampleTCO( this );
+	sTco->movePosition( _pos );
 	return sTco;
 }