Song: Fix loops and recording.

include/SampleTrack.h

@@ -180,7 +180,7 @@ public slots:
 	void updateTcos();
 	void setPlayingTcos( bool isPlaying );
 	void updateEffectChannel();
-	void beforeRecord ();
+	void beforeRecordOn (MidiTime time);
 	void toggleRecord();
 	void playbackPositionChanged();
 

include/Song.h

@@ -343,7 +343,7 @@ public slots:
 	void addBBTrack();
 
 signals:
-	void beforeRecord ();
+	void beforeRecordOn (MidiTime time);
 
 private slots:
 	void insertBar();

src/core/Song.cpp

@@ -108,6 +108,7 @@ Song::Song() :
 			this, SLOT( masterPitchChanged() ) );*/
 
 	qRegisterMetaType<Note>( "Note" );
+	qRegisterMetaType<MidiTime>("MidiTime");
 	setType( SongContainer );
 }
 
@@ -263,9 +264,6 @@ void Song::processNextBuffer()
 			m_vstSyncController.setPlaybackJumped( true );
 
 			emit updateSampleTracks();
-
-			if (isRecording ())
-				emit beforeRecord ();
 		}
 	}
 
@@ -274,6 +272,11 @@ void Song::processNextBuffer()
 		m_vstSyncController.setPlaybackJumped( true );
 		m_playPos[m_playMode].setJumped( false );
 	}
+
+	if (isRecording())
+	{
+		emit beforeRecordOn(getPlayPos());
+	}
 
 	f_cnt_t framesPlayed = 0;
 	const float framesPerTick = Engine::framesPerTick();
@@ -350,7 +353,7 @@ void Song::processNextBuffer()
 
 					if (isRecording())
 					{
-						emit beforeRecord ();
+						emit beforeRecordOn(getPlayPos());
 					}
 					emit updateSampleTracks();
 				}
@@ -560,8 +563,6 @@ void Song::record()
 
 void Song::playAndRecord()
 {
-	emit beforeRecord ();
-
 	playSong();
 	m_recording = true;
 }

src/tracks/SampleTrack.cpp

@@ -564,7 +564,7 @@ SampleTrack::SampleTrack( TrackContainer* tc ) :
 	m_effectChannelModel.setRange( 0, Engine::fxMixer()->numChannels()-1, 1);
 
 	connect( &m_effectChannelModel, SIGNAL( dataChanged() ), this, SLOT( updateEffectChannel() ) );
-	connect (Engine::getSong (), SIGNAL(beforeRecord()), this, SLOT(beforeRecord()));
+	connect (Engine::getSong (), SIGNAL(beforeRecordOn(MidiTime)), this, SLOT(beforeRecordOn(MidiTime)));
 
 
 	//care about positionmarker
@@ -777,7 +777,8 @@ void SampleTrack::setPlayingTcos( bool isPlaying )
 	}
 }
 
-void SampleTrack::beforeRecord() {
+void SampleTrack::beforeRecordOn(MidiTime time)
+{
 	if (isRecord ()) {
 		bool isRecordTCOExist = false;
 
@@ -792,7 +793,7 @@ void SampleTrack::beforeRecord() {
 			auto fallbackRecordTCO = static_cast<SampleTCO*>(createTCO (0));
 
 			fallbackRecordTCO->setRecord (true);
-			fallbackRecordTCO->movePosition (Engine::getSong ()->getPlayPos (Song::Mode_PlaySong));
+			fallbackRecordTCO->movePosition (time);
 //			fallbackRecordTCO->setSamplePlayLength (Engine::framesPerTick());
 			fallbackRecordTCO->changeLength (1);
 			fallbackRecordTCO->setSampleStartFrame (0);