Fix merge conflicts

include/Mixer.h

@@ -363,6 +363,8 @@ class LMMS_EXPORT Mixer : public QObject
 
 	const surroundSampleFrame * renderNextBuffer();
 
+	void handleMetronome();
+
 	void clearInternal();
 
 	//! Called by the audio thread to give control to other threads,

src/core/Mixer.cpp

@@ -345,35 +345,6 @@ const surroundSampleFrame * Mixer::renderNextBuffer()
 
 	s_renderingThread = true;
 
-	static Song::PlayPos last_metro_pos = -1;
-
-	Song *song = Engine::getSong();
-
-	Song::PlayModes currentPlayMode = song->playMode();
-	Song::PlayPos p = song->getPlayPos( currentPlayMode );
-
-	bool playModeSupportsMetronome = currentPlayMode == Song::Mode_PlayPattern ||
-					 currentPlayMode == Song::Mode_PlaySong ||
-					 currentPlayMode == Song::Mode_PlayBB;
-
-	if( playModeSupportsMetronome && m_metronomeActive && !song->isExporting() &&
-		!song->isPaused() && p != last_metro_pos &&
-			// Stop crash with metronome if empty project
-				Engine::getSong()->countTracks() )
-	{
-		tick_t ticksPerBar = TimePos::ticksPerBar();
-		if ( p.getTicks() % ( ticksPerBar / 1 ) == 0 )
-		{
-			addPlayHandle( new SamplePlayHandle( "misc/metronome02.ogg" ) );
-		}
-		else if ( p.getTicks() % ( ticksPerBar /
-			song->getTimeSigModel().getNumerator() ) == 0 )
-		{
-			addPlayHandle( new SamplePlayHandle( "misc/metronome01.ogg" ) );
-		}
-		last_metro_pos = p;
-	}
-
 	// swap buffer
 	m_inputBufferWrite = ( m_inputBufferWrite + 1 ) % 2;
 	m_inputBufferRead =  ( m_inputBufferRead + 1 ) % 2;
@@ -423,8 +394,10 @@ const surroundSampleFrame * Mixer::renderNextBuffer()
 	FxMixer * fxMixer = Engine::fxMixer();
 	fxMixer->prepareMasterMix();
 
+	handleMetronome();
+
 	// create play-handles for new notes, samples etc.
-	song->processNextBuffer();
+	Engine::getSong()->processNextBuffer();
 
 	// add all play-handles that have to be added
 	for( LocklessListElement * e = m_newPlayHandles.popList(); e; )
@@ -493,6 +466,51 @@ const surroundSampleFrame * Mixer::renderNextBuffer()
 
 
 
+void Mixer::handleMetronome()
+{
+	static tick_t lastMetroTicks = -1;
+
+	Song *song = Engine::getSong();
+	Song::PlayModes currentPlayMode = song->playMode();
+
+	bool metronomeSupported = currentPlayMode == Song::Mode_PlayPattern ||
+					 currentPlayMode == Song::Mode_PlaySong ||
+					 currentPlayMode == Song::Mode_PlayBB;
+
+	if( !metronomeSupported || !m_metronomeActive || song->isExporting() )
+	{
+		return;
+	}
+
+	// stop crash with metronome if empty project
+	if( song->countTracks() == 0 )
+	{
+		return;
+	}
+
+	tick_t ticks = song->getPlayPos( currentPlayMode ).getTicks();
+	tick_t ticksPerTact = MidiTime::ticksPerTact();
+	int numerator = song->getTimeSigModel().getNumerator();
+
+	if( ticks == lastMetroTicks )
+	{
+		return;
+	}
+
+	if( ticks % ( ticksPerTact / 1 ) == 0 )
+	{
+		addPlayHandle( new SamplePlayHandle( "misc/metronome02.ogg" ) );
+	}
+	else if( ticks % ( ticksPerTact / numerator ) == 0 )
+	{
+		addPlayHandle( new SamplePlayHandle( "misc/metronome01.ogg" ) );
+	}
+
+	lastMetroTicks = ticks;
+}
+
+
+
 void Mixer::clear()
 {
 	m_clearSignal = true;