loopback one tick earlier

LMMS · Jan 5, 2017 · b04f8b8 · b04f8b8
1 parent d784d75
commit b04f8b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/core/Song.cpp b/src/core/Song.cpp
@@ -269,7 +269,6 @@ void Song::processNextBuffer()
 				( tl->loopBegin().getTicks() * 60 * 1000 / 48 ) / getTempo();
 			m_playPos[m_playMode].setTicks(
 						tl->loopBegin().getTicks() );
-			emit updateSampleTracks();
 		}
 	}
 
@@ -339,14 +338,17 @@ void Song::processNextBuffer()
 				// if looping-mode is enabled and we have got
 				// past the looping range, return to the 
 				// beginning of the range
+				if( m_playPos[m_playMode] == tl->loopEnd() - 1 )
+				{
+					emit updateSampleTracks();
+				}
 				if( m_playPos[m_playMode] >= tl->loopEnd() )
 				{
 					m_playPos[m_playMode].setTicks( tl->loopBegin().getTicks() );
 
 					m_elapsedMilliSeconds = 
 						( ( tl->loopBegin().getTicks() ) * 60 * 1000 / 48 ) / 
 							getTempo();
-					emit updateSampleTracks();
 				}
 			}
 			else

diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp
@@ -572,7 +572,7 @@ bool SampleTrack::play( const MidiTime & _start, const fpp_t _frames,
 					//else we play the sample to the end but nothing more
 					f_cnt_t samplePlayLength = tcoFrameLength > sampleBufferLength ? sampleBufferLength : tcoFrameLength;
 					//we only play within the sampleBuffer limits
-					if( sampleStart < sTco->sampleBuffer()->frames() )
+					if( sampleStart < sampleBufferLength )
 					{
 						sTco->setSampleStartFrame( sampleStart );
 						sTco->setSamplePlayLength( samplePlayLength );