[Kdenlive-svn] [kdenlive/feature/jack] src: syncaction enum added

[Ed R. <ed....@go...>]

Git commit b3817199944dd1d414c27e076397df42055c6c96 by Ed Rogalsky.
Committed on 21/03/2013 at 20:10.
Pushed by rogalsky into branch 'feature/jack'.

syncaction enum added

M  +5    -7    src/jackdevice.cpp
M  +11   -2    src/jackdevice.h
M  +3    -1    src/renderer.cpp

http://commits.kde.org/kdenlive/b3817199944dd1d414c27e076397df42055c6c96

diff --git a/src/jackdevice.cpp b/src/jackdevice.cpp
index e004640..869f080 100644
--- a/src/jackdevice.cpp
+++ b/src/jackdevice.cpp
@@ -26,10 +26,9 @@ JackDevice::JackDevice(Mlt::Profile * profile) :
 	m_loopState(0),
 	m_playbackSyncDiff(0),
 	m_playbackSyncMonEnabled(true),
-	m_playbackSyncMonAction(0)
+	m_playbackSyncMonAction(None)
 {
 	m_mltProfile = profile;
-//	m_playbackSyncMonAction = QString("resync");
 }
 
 JackDevice& JackDevice::singleton(Mlt::Profile * profile)
@@ -513,16 +512,15 @@ void JackDevice::monitorPlaybackSync(int position)
 	}
 
 	/* if action defined */
-	if (m_playbackSyncMonAction != 0) {
+	if (m_playbackSyncMonAction != None) {
 		if (qAbs(diff) > 1 && m_nextState == JackTransportRolling) {
-			if (m_playbackSyncMonAction == 1) {
+			if (m_playbackSyncMonAction == Stop) {
 				stopPlayback();
-			} else if (m_playbackSyncMonAction == 2) {
+			} else if (m_playbackSyncMonAction == Resync) {
 				seekPlayback(getPlaybackPosition());
 			}
 		}
 	}
-
 }
 
 void JackDevice::setTransportEnabled(bool state)
@@ -540,7 +538,7 @@ void JackDevice::setPlaybackSyncMonEnabled(bool state)
 	m_playbackSyncMonEnabled = state;
 }
 
-void JackDevice::setPlaybackSyncMonAction(int action)
+void JackDevice::setPlaybackSyncMonAction(SyncAction action)
 {
 	m_playbackSyncMonAction = action;
 }
diff --git a/src/jackdevice.h b/src/jackdevice.h
index 6c44d8a..2f5025e 100644
--- a/src/jackdevice.h
+++ b/src/jackdevice.h
@@ -45,6 +45,15 @@ public:
     virtual ~JackDevice();
 
 	/**
+	 * Sync action enum.
+	 */
+    enum SyncAction {
+    	None = 0,
+    	Stop,
+    	Resync
+    };
+
+	/**
 	 * Checks if the slave is still valid for processing.
 	 */
 	bool isValid();
@@ -128,7 +137,7 @@ public:
 	/**
 	 * Set playback sync monitoring action.
 	 */
-	void setPlaybackSyncMonAction(int action);
+	void setPlaybackSyncMonAction(SyncAction action);
 
 
 	/**
@@ -252,7 +261,7 @@ private:
 	/**
 	 * Playback sync monitoring Action.
 	 */
-	int m_playbackSyncMonAction;
+	SyncAction m_playbackSyncMonAction;
 
 	/**
 	 * Reset looping.
diff --git a/src/renderer.cpp b/src/renderer.cpp
index d5448f5..ca1f0d1 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -4917,7 +4917,9 @@ void Render::openDevice(Device::Type dev)
 			connect(&JACKDEV, SIGNAL(shutdown()),
 					this, SLOT(slotOnDeviceShutdown()));
 			/* set sync diff monitoring action */
-			JACKDEV.setPlaybackSyncMonAction(KdenliveSettings::syncdiffmonaction());
+			JackDevice::SyncAction syncAction =
+				(JackDevice::SyncAction)KdenliveSettings::syncdiffmonaction();
+			JACKDEV.setPlaybackSyncMonAction(syncAction);
 		}
 	} else
 #endif