Refactor to move positionChanged signal to Timeline

include/AutomationEditor.h

@@ -158,7 +158,7 @@ protected slots:
 	void setProgressionType(int type);
 	void setTension();
 
-	void updatePosition( const lmms::TimePos & t );
+	void updatePosition();
 
 	void zoomingXChanged();
 	void zoomingYChanged();

include/PianoRoll.h

@@ -224,8 +224,8 @@ protected slots:
 	void pasteNotes();
 	bool deleteSelectedNotes();
 
-	void updatePosition(const lmms::TimePos & t );
-	void updatePositionAccompany(const lmms::TimePos & t );
+	void updatePosition();
+	void updatePositionAccompany();
 	void updatePositionStepRecording(const lmms::TimePos & t );
 
 	void zoomingChanged();

include/PlayPos.h

@@ -0,0 +1,54 @@
+/*
+ * PlayPos.h - declaration of class PlayPos, a TimePos with additional features useful for Timelines
+ *
+ * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef LMMS_PLAYPOS_H
+#define LMMS_PLAYPOS_H
+
+#include "TimePos.h"
+
+namespace lmms
+{
+
+class PlayPos : public TimePos
+{
+public:
+	PlayPos(const int absolutePosition = 0)
+		: TimePos{absolutePosition}
+		, m_currentFrame{0.f}
+	{
+	}
+
+	auto currentFrame() const -> float { return m_currentFrame; }
+	void setCurrentFrame( const float f ) { m_currentFrame = f; }
+	auto jumped() const -> bool { return m_jumped; }
+	void setJumped(const bool jumped) { m_jumped = jumped; }
+
+private:
+    float m_currentFrame;
+    bool m_jumped;
+};
+
+} // namespace lmms
+
+#endif // LMMS_PLAYPOS_H

include/Song.h

@@ -34,6 +34,7 @@
 #include "AudioEngine.h"
 #include "Controller.h"
 #include "Metronome.h"
+#include "PlayPos.h"
 #include "lmms_constants.h"
 #include "MeterModel.h"
 #include "Timeline.h"
@@ -103,36 +104,6 @@ class LMMS_EXPORT Song : public TrackContainer
 	bool hasErrors();
 	QString errorSummary();
 
-	class PlayPos : public TimePos
-	{
-	public:
-		PlayPos( const int abs = 0 ) :
-			TimePos( abs ),
-			m_currentFrame( 0.0f )
-		{
-		}
-		inline void setCurrentFrame( const float f )
-		{
-			m_currentFrame = f;
-		}
-		inline float currentFrame() const
-		{
-			return m_currentFrame;
-		}
-		inline void setJumped( const bool jumped )
-		{
-			m_jumped = jumped;
-		}
-		inline bool jumped() const
-		{
-			return m_jumped;
-		}
-
-	private:
-		float m_currentFrame;
-		bool m_jumped;
-	};
-
 	void processNextBuffer();
 
 	inline int getLoadingTrackCount() const
@@ -158,7 +129,7 @@ class LMMS_EXPORT Song : public TrackContainer
 	inline void setToTime(TimePos const & pos, PlayMode playMode)
 	{
 		m_elapsedMilliSeconds[static_cast<std::size_t>(playMode)] = pos.getTimeInMilliseconds(getTempo());
-		getPlayPos(playMode).setTicks(pos.getTicks());
+		getTimeline(playMode).setTicks(pos.getTicks());
 	}
 
 	inline void setToTimeByTicks(tick_t ticks)
@@ -169,7 +140,7 @@ class LMMS_EXPORT Song : public TrackContainer
 	inline void setToTimeByTicks(tick_t ticks, PlayMode playMode)
 	{
 		m_elapsedMilliSeconds[static_cast<std::size_t>(playMode)] = TimePos::ticksToMilliseconds(ticks, getTempo());
-		getPlayPos(playMode).setTicks(ticks);
+		getTimeline(playMode).setTicks(ticks);
 	}
 
 	inline int getBars() const
@@ -257,17 +228,9 @@ class LMMS_EXPORT Song : public TrackContainer
 		return m_playMode;
 	}
 
-	inline PlayPos & getPlayPos( PlayMode pm )
-	{
-		return m_playPos[static_cast<std::size_t>(pm)];
-	}
 	inline const PlayPos & getPlayPos( PlayMode pm ) const
 	{
-		return m_playPos[static_cast<std::size_t>(pm)];
-	}
-	inline PlayPos & getPlayPos()
-	{
-		return getPlayPos(m_playMode);
+		return getTimeline(pm).getPlayPos();
 	}
 	inline const PlayPos & getPlayPos() const
 	{
@@ -492,7 +455,6 @@ private slots:
 	std::array<Timeline, PlayModeCount> m_timelines;
 
 	PlayMode m_playMode;
-	PlayPos m_playPos[PlayModeCount];
 	bar_t m_length;
 
 	const MidiClip* m_midiClipToPlay;

include/SongEditor.h

@@ -86,7 +86,7 @@ public slots:
 	void setEditModeSelect();
 	void toggleProportionalSnap();
 
-	void updatePosition( const lmms::TimePos & t );
+	void updatePosition();
 	void updatePositionLine();
 	void selectAllClips( bool select );
 

include/TimeLineWidget.h

@@ -78,7 +78,7 @@ class TimeLineWidget : public QWidget
 		Disabled
 	};
 
-	TimeLineWidget(int xoff, int yoff, float ppb, Song::PlayPos& pos, Timeline& timeline,
+	TimeLineWidget(int xoff, int yoff, float ppb, Timeline& timeline,
 				const TimePos& begin, Song::PlayMode mode, QWidget* parent);
 	~TimeLineWidget() override;
 
@@ -131,11 +131,6 @@ class TimeLineWidget : public QWidget
 		m_cursorSelectRight = QCursor{m_cursorSelectRight.pixmap(), s.width(), s.height()};
 	}
 
-	inline Song::PlayPos & pos()
-	{
-		return( m_pos );
-	}
-
 	AutoScrollState autoScroll() const
 	{
 		return m_autoScroll;
@@ -157,13 +152,16 @@ class TimeLineWidget : public QWidget
 					m_ppb / TimePos::ticksPerBar() );
 	}
 
+	Timeline* model()
+	{
+		return m_timeline;
+	}
+
 signals:
-	void positionChanged(const lmms::TimePos& postion);
 	void regionSelectedFromPixels( int, int );
 	void selectionFinished();
 
 public slots:
-	void updatePosition();
 	void setSnapSize( const float snapSize )
 	{
 		m_snapSize = snapSize;
@@ -219,7 +217,6 @@ public slots:
 	int m_xOffset;
 	float m_ppb;
 	float m_snapSize = 1.f;
-	Song::PlayPos & m_pos;
 	Timeline* m_timeline;
 	// Leftmost position visible in parent editor
 	const TimePos & m_begin;

include/Timeline.h

@@ -27,7 +27,7 @@
 #include <QObject>
 
 #include "JournallingObject.h"
-#include "TimePos.h"
+#include "PlayPos.h"
 
 namespace lmms {
 
@@ -43,6 +43,36 @@ class Timeline : public QObject, public JournallingObject
 		KeepPosition
 	};
 
+	auto getPlayPos() const -> const PlayPos& { return m_pos; }
+
+	void setPlayPos(PlayPos pos)
+	{
+		m_pos = pos;
+		emit positionChanged();
+	}
+
+	auto getTicks() const -> tick_t { return m_pos.getTicks(); }
+
+	void setTicks(tick_t ticks)
+	{
+		m_pos.setTicks(ticks);
+		emit positionChanged();
+	}
+
+	auto currentFrame() const -> float { return m_pos.currentFrame(); }
+
+	void setCurrentFrame(const float f)
+	{
+		m_pos.setCurrentFrame(f);
+	}
+
+	auto jumped() const -> bool { return m_pos.jumped(); }
+
+	void setJumped(const bool jumped)
+	{
+		m_pos.setJumped(jumped);
+	}
+
 	auto loopBegin() const -> TimePos { return m_loopBegin; }
 	auto loopEnd() const -> TimePos { return m_loopEnd; }
 	auto loopEnabled() const -> bool { return m_loopEnabled; }
@@ -63,6 +93,7 @@ class Timeline : public QObject, public JournallingObject
 signals:
 	void loopEnabledChanged(bool enabled);
 	void stopBehaviourChanged(lmms::Timeline::StopBehaviour behaviour);
+	void positionChanged();
 
 protected:
 	void saveSettings(QDomDocument& doc, QDomElement& element) override;
@@ -72,6 +103,7 @@ class Timeline : public QObject, public JournallingObject
 	TimePos m_loopBegin = TimePos{0};
 	TimePos m_loopEnd = TimePos{DefaultTicksPerBar};
 	bool m_loopEnabled = false;
+	PlayPos m_pos = PlayPos{0};
 
 	StopBehaviour m_stopBehaviour = StopBehaviour::BackToStart;
 	TimePos m_playStartPosition = TimePos{-1};

src/core/Song.cpp

@@ -261,7 +261,7 @@ void Song::processNextBuffer()
 	{
 		m_vstSyncController.setPlaybackJumped(true);
 		emit updateSampleTracks();
-		getPlayPos().setJumped(false);
+		getTimeline().setJumped(false);
 	}
 
 	const auto framesPerTick = Engine::framesPerTick();
@@ -278,9 +278,9 @@ void Song::processNextBuffer()
 		{
 			// Transfer any whole ticks from the frame count to the tick count
 			const auto elapsedTicks = static_cast<int>(frameOffsetInTick / framesPerTick);
-			getPlayPos().setTicks(getPlayPos().getTicks() + elapsedTicks);
+			getTimeline().setTicks(getPlayPos().getTicks() + elapsedTicks);
 			frameOffsetInTick -= elapsedTicks * framesPerTick;
-			getPlayPos().setCurrentFrame(frameOffsetInTick);
+			getTimeline().setCurrentFrame(frameOffsetInTick);
 
 			// If we are playing a pattern track, or a MIDI clip with no loop enabled,
 			// loop back to the beginning when we reach the end
@@ -343,7 +343,7 @@ void Song::processNextBuffer()
 		// Update frame counters
 		frameOffsetInPeriod += framesToPlay;
 		frameOffsetInTick += framesToPlay;
-		getPlayPos().setCurrentFrame(frameOffsetInTick);
+		getTimeline().setCurrentFrame(frameOffsetInTick);
 		m_elapsedMilliSeconds[static_cast<std::size_t>(m_playMode)] += TimePos::ticksToMilliseconds(framesToPlay / framesPerTick, getTempo());
 		m_elapsedBars = getPlayPos(PlayMode::Song).getBar();
 		m_elapsedTicks = (getPlayPos(PlayMode::Song).getTicks() % ticksPerBar()) / 48;
@@ -602,9 +602,9 @@ void Song::setPlayPos( tick_t ticks, PlayMode playMode )
 	tick_t ticksFromPlayMode = getPlayPos(playMode).getTicks();
 	m_elapsedTicks += ticksFromPlayMode - ticks;
 	m_elapsedMilliSeconds[static_cast<std::size_t>(playMode)] += TimePos::ticksToMilliseconds( ticks - ticksFromPlayMode, getTempo() );
-	getPlayPos(playMode).setTicks( ticks );
-	getPlayPos(playMode).setCurrentFrame( 0.0f );
-	getPlayPos(playMode).setJumped( true );
+	getTimeline(playMode).setTicks(ticks);
+	getTimeline(playMode).setCurrentFrame(0.0f);
+	getTimeline(playMode).setJumped(true);
 
 // send a signal if playposition changes during playback
 	if( isPlaying() )
@@ -660,14 +660,14 @@ void Song::stop()
 	switch (timeline.stopBehaviour())
 	{
 		case Timeline::StopBehaviour::BackToZero:
-			getPlayPos().setTicks(0);
+			getTimeline().setTicks(0);
 			m_elapsedMilliSeconds[static_cast<std::size_t>(m_playMode)] = 0;
 			break;
 
 		case Timeline::StopBehaviour::BackToStart:
 			if (timeline.playStartPosition() >= 0)
 			{
-				getPlayPos().setTicks(timeline.playStartPosition().getTicks());
+				getTimeline().setTicks(timeline.playStartPosition().getTicks());
 				setToTime(timeline.playStartPosition());
 
 				timeline.setPlayStartPosition(-1);
@@ -679,9 +679,9 @@ void Song::stop()
 	}
 
 	m_elapsedMilliSeconds[static_cast<std::size_t>(PlayMode::None)] = m_elapsedMilliSeconds[static_cast<std::size_t>(m_playMode)];
-	getPlayPos(PlayMode::None).setTicks(getPlayPos().getTicks());
+	getTimeline(PlayMode::None).setTicks(getPlayPos().getTicks());
 
-	getPlayPos().setCurrentFrame( 0 );
+	getTimeline().setCurrentFrame(0);
 
 	m_vstSyncController.setPlaybackState( m_exporting );
 	m_vstSyncController.setAbsolutePosition(
@@ -726,7 +726,7 @@ void Song::startExport()
 		m_exportSongBegin = m_exportLoopBegin = timeline.loopBegin();
 		m_exportSongEnd = m_exportLoopEnd = timeline.loopEnd();
 
-		getPlayPos(PlayMode::Song).setTicks(timeline.loopBegin().getTicks());
+		getTimeline(PlayMode::Song).setTicks(timeline.loopBegin().getTicks());
 	}
 	else
 	{
@@ -749,7 +749,7 @@ void Song::startExport()
 			? timeline.loopEnd()
 			: TimePos{0};
 
-		getPlayPos(PlayMode::Song).setTicks( 0 );
+		getTimeline(PlayMode::Song).setTicks(0);
 	}
 
 	m_exportEffectiveLength = (m_exportLoopBegin - m_exportSongBegin) + (m_exportLoopEnd - m_exportLoopBegin)