[Kdenlive-svn] [kdenlive/feature/jack] src: jack refactoring + cleanup - part2

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

Git commit 39b7a782184883f399b85e399c08fc7e9f7393db by Ed Rogalsky.
Committed on 29/03/2013 at 18:23.
Pushed by rogalsky into branch 'feature/jack'.

jack refactoring + cleanup - part2

M  +0    -9    src/abstractmonitor.h
M  +2    -2    src/mainwindow.cpp
M  +4    -4    src/monitormanager.cpp
M  +4    -4    src/monitormanager.h
M  +11   -11   src/renderer.cpp
M  +4    -4    src/renderer.h

http://commits.kde.org/kdenlive/39b7a782184883f399b85e399c08fc7e9f7393db

diff --git a/src/abstractmonitor.h b/src/abstractmonitor.h
index 9731964..b1c5888 100644
--- a/src/abstractmonitor.h
+++ b/src/abstractmonitor.h
@@ -65,15 +65,6 @@ namespace AudioEngine
 	};
 };
 
-namespace Device
-{
-	enum Type
-	{
-		Mlt	= 0,
-		Jack
-	};
-};
-
 namespace Mon
 {
 	const static unsigned int NoRole				= (1<<0);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 20f8d36..87a0eb5 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -4846,7 +4846,7 @@ void MainWindow::slotSaveTimelineClip()
 
 void MainWindow::slotConnectJack()
 {
-	m_monitorManager->slotOpenDevice(Device::Jack);
+	m_monitorManager->slotOpenAudioEngine(AudioEngine::Jack);
 	AbstractRender* abstrRender = m_monitorManager->activeRenderer();
 
 	if (abstrRender && abstrRender->isSlavePermSet(Slave::Perm::Jack)) {
@@ -4858,7 +4858,7 @@ void MainWindow::slotConnectJack()
 
 void MainWindow::slotDisconnectJack()
 {
-	m_monitorManager->slotCloseDevice(Device::Jack);
+	m_monitorManager->slotCloseAudioEngine(AudioEngine::Jack);
 }
 
 void MainWindow::slotProcessImportKeyframes(GRAPHICSRECTITEM type, const QString& data, int maximum)
diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 68ded6c..53ce69a 100644
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -290,14 +290,14 @@ QString MonitorManager::getProjectFolder() const
     return m_document->projectFolder().path(KUrl::AddTrailingSlash);
 }
 
-void MonitorManager::slotOpenDevice(Device::Type dev)
+void MonitorManager::slotOpenAudioEngine(AudioEngine::Type engine)
 {
-	m_projectMonitor->render->openDevice(dev);
+	m_projectMonitor->render->openAudioEngine(engine);
 }
 
-void MonitorManager::slotCloseDevice(Device::Type dev)
+void MonitorManager::slotCloseAudioEngine(AudioEngine::Type engine)
 {
-	m_projectMonitor->render->closeDevice(dev);
+	m_projectMonitor->render->closeAudioEngine(engine);
 }
 
 void MonitorManager::updateConfiguration()
diff --git a/src/monitormanager.h b/src/monitormanager.h
index 94b8aea..0bedaf5 100644
--- a/src/monitormanager.h
+++ b/src/monitormanager.h
@@ -84,10 +84,10 @@ public slots:
     void slotSwitchMonitors(bool activateClip);
     void slotUpdateAudioMonitoring();
 
-    /** @brief Open defined audio device */
-    void slotOpenDevice(Device::Type dev);
-    /** @brief Close defined audio device */
-    void slotCloseDevice(Device::Type dev);
+    /** @brief Open defined audio engine */
+    void slotOpenAudioEngine(AudioEngine::Type engine);
+    /** @brief Close defined audio engine */
+    void slotCloseAudioEngine(AudioEngine::Type engine);
 
 private slots:
     void slotRefreshCurrentMonitor(const QString &id);
diff --git a/src/renderer.cpp b/src/renderer.cpp
index efeee60..43d718a 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -183,7 +183,7 @@ Render::~Render()
 {
 #ifdef USE_JACK
 	/* isDeviceActive ()*/
-	closeDevice(Device::Jack);
+	closeAudioEngine(AudioEngine::Jack);
 #endif
 	closeMlt();
     delete m_mltProfile;
@@ -370,7 +370,7 @@ void Render::buildConsumer(const QString &profileName)
 			if(&JACKDEV && JACKDEV.probe()) {
 				/* I hate the enumeration shit here */
 				if(m_name == Kdenlive::projectMonitor) {
-					openDevice(Device::Jack);
+					openAudioEngine(AudioEngine::Jack);
 				} else if (m_name == Kdenlive::clipMonitor) {
 					/* stop consumer */
 					if (!m_mltConsumer->is_stopped())
@@ -389,7 +389,7 @@ void Render::buildConsumer(const QString &profileName)
 		JackDevice::singleton(m_mltProfile);
 		if(&JACKDEV && JACKDEV.probe()) {
 			if(m_name == Kdenlive::projectMonitor) {
-				openDevice(Device::Jack);
+				openAudioEngine(AudioEngine::Jack);
 			} else if (m_name == Kdenlive::clipMonitor) {
 				/* stop consumer */
 				if (!m_mltConsumer->is_stopped())
@@ -4910,10 +4910,10 @@ bool Render::checkX11Grab()
     return result.contains("x11grab");
 }
 
-void Render::openDevice(Device::Type dev)
+void Render::openAudioEngine(AudioEngine::Type engine)
 {
 #ifdef USE_JACK
-	if (dev == Device::Jack) {
+	if (engine == AudioEngine::Jack) {
 		/* stop consumer */
 		if (!m_mltConsumer->is_stopped())
 				m_mltConsumer->stop();
@@ -4938,15 +4938,15 @@ void Render::openDevice(Device::Type dev)
 #endif
 	{
 		/* prevent warnings */
-		dev = dev;
+		engine = engine;
 	}
 }
 
-void Render::closeDevice(Device::Type dev)
+void Render::closeAudioEngine(AudioEngine::Type engine)
 {
 #ifdef USE_JACK
-	if (dev == Device::Jack) {
-		if(&JACKDEV && JACKDEV.isValid()) {
+	if (engine == AudioEngine::Jack) {
+		if(isAudioEngineActive(AudioEngine::Jack)) {
 			/* close jack slave */
 			enableSlave(Slave::Internal);
 			/* disconnect shutdown event handler */
@@ -4960,7 +4960,7 @@ void Render::closeDevice(Device::Type dev)
 #endif
 	{
 		/* prevent warning */
-		dev = dev;
+		engine = engine;
 	}
 }
 
@@ -5080,7 +5080,7 @@ void Render::slotOnSlavePlaybackStopped(int position)
 
 void Render::slotOnDeviceShutdown()
 {
-	closeDevice(Device::Jack);
+	closeAudioEngine(AudioEngine::Jack);
 }
 
 #include "renderer.moc"
diff --git a/src/renderer.h b/src/renderer.h
index 9bc0ae3..cb1977a 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -115,11 +115,11 @@ Q_OBJECT public:
     void seek(int time, bool slave = false);
     void seekToFrameDiff(int diff);
 
-    /** @brief Open appropriate audio device */
-    void openDevice(Device::Type dev);
+    /** @brief Open appropriate audio engine */
+    void openAudioEngine(AudioEngine::Type engine);
 
-    /** @brief Close appropriate audio device */
-    void closeDevice(Device::Type dev);
+    /** @brief Close appropriate audio engine */
+    void closeAudioEngine(AudioEngine::Type engine);
 
     /** @brief Enable appropriate transport slave */
     void enableSlave(Slave::Type slave);