Cleaning code style of Definitions.

[kdenlive] / src / scopes / scopemanager.cpp

diff --git a/src/scopes/scopemanager.cpp b/src/scopes/scopemanager.cpp
index a1fc1416a9be450b549cae162f0249d4a5e83632..b192beafb0ffdab50744a58e0dc8c2a38acf3096 100644 (file)
--- a/src/scopes/scopemanager.cpp
+++ b/src/scopes/scopemanager.cpp
@@ -41,7 +41,7 @@ bool ScopeManager::addScope(AbstractAudioScopeWidget *audioScope, QDockWidget *a
     bool added = false;
     int exists = false;
     // Only add the scope if it does not exist yet in the list
-    for (int i = 0; i < m_audioScopes.size(); i++) {
+    for (int i = 0; i < m_audioScopes.size(); ++i) {
         if (m_audioScopes[i].scope == audioScope) {
             exists = true;
             break;
@@ -77,7 +77,7 @@ bool ScopeManager::addScope(AbstractGfxScopeWidget *colorScope, QDockWidget *col
 {
     bool added = false;
     int exists = false;
-    for (int i = 0; i < m_colorScopes.size(); i++) {
+    for (int i = 0; i < m_colorScopes.size(); ++i) {
         if (m_colorScopes[i].scope == colorScope) {
             exists = true;
             break;
@@ -110,12 +110,12 @@ bool ScopeManager::addScope(AbstractGfxScopeWidget *colorScope, QDockWidget *col
 }
 
 
-void ScopeManager::slotDistributeAudio(QVector<int16_t> sampleData, int freq, int num_channels, int num_samples)
+void ScopeManager::slotDistributeAudio(const QVector<int16_t> &sampleData, int freq, int num_channels, int num_samples)
 {
 #ifdef DEBUG_SM
     qDebug() << "ScopeManager: Starting to distribute audio.";
 #endif
-    for (int i = 0; i < m_audioScopes.size(); i++) {
+    for (int i = 0; i < m_audioScopes.size(); ++i) {
         // Distribute audio to all scopes that are visible and want to be refreshed
         if (!m_audioScopes[i].scope->visibleRegion().isEmpty()) {
             if (m_audioScopes[i].scope->autoRefreshEnabled()) {
@@ -129,12 +129,12 @@ void ScopeManager::slotDistributeAudio(QVector<int16_t> sampleData, int freq, in
 
     checkActiveAudioScopes();
 }
-void ScopeManager::slotDistributeFrame(QImage image)
+void ScopeManager::slotDistributeFrame(const QImage &image)
 {
 #ifdef DEBUG_SM
     qDebug() << "ScopeManager: Starting to distribute frame.";
 #endif
-    for (int i = 0; i < m_colorScopes.size(); i++) {
+    for (int i = 0; i < m_colorScopes.size(); ++i) {
         if (!m_colorScopes[i].scope->visibleRegion().isEmpty()) {
             if (m_colorScopes[i].scope->autoRefreshEnabled()) {
                 m_colorScopes[i].scope->slotRenderZoneUpdated(image);
@@ -158,7 +158,7 @@ void ScopeManager::slotDistributeFrame(QImage image)
 }
 
 
-void ScopeManager::slotRequestFrame(const QString widgetName)
+void ScopeManager::slotRequestFrame(const QString &widgetName)
 {
 #ifdef DEBUG_SM
     qDebug() << "ScopeManager: New frame was requested by " << widgetName;
@@ -166,13 +166,13 @@ void ScopeManager::slotRequestFrame(const QString widgetName)
 
     // Search for the scope in the lists and tag it to trigger a forced update
     // in the distribution slots
-    for (int i = 0; i < m_colorScopes.size(); i++) {
+    for (int i = 0; i < m_colorScopes.size(); ++i) {
         if (m_colorScopes[i].scope->widgetName() == widgetName) {
             m_colorScopes[i].singleFrameRequested = true;
             break;
         }
     }
-    for (int i = 0; i < m_audioScopes.size(); i++) {
+    for (int i = 0; i < m_audioScopes.size(); ++i) {
         if (m_audioScopes[i].scope->widgetName() == widgetName) {
             m_audioScopes[i].singleFrameRequested = true;
             break;
@@ -202,6 +202,8 @@ void ScopeManager::slotUpdateActiveRenderer()
     }
 
     m_lastConnectedRenderer = m_monitorManager->activeRenderer();
+    // DVD monitor shouldn't be monitored or will cause crash on deletion
+    if (m_monitorManager->isActive(Kdenlive::DvdMonitor)) m_lastConnectedRenderer = NULL;
 
     // Connect new renderer
     if (m_lastConnectedRenderer != NULL) {
@@ -238,7 +240,7 @@ void ScopeManager::slotCheckActiveScopes()
 bool ScopeManager::audioAcceptedByScopes() const
 {
     bool accepted = false;
-    for (int i = 0; i < m_audioScopes.size(); i++) {
+    for (int i = 0; i < m_audioScopes.size(); ++i) {
         if (!m_audioScopes[i].scope->visibleRegion().isEmpty() && m_audioScopes[i].scope->autoRefreshEnabled()) {
             accepted = true;
             break;
@@ -252,7 +254,7 @@ bool ScopeManager::audioAcceptedByScopes() const
 bool ScopeManager::imagesAcceptedByScopes() const
 {
     bool accepted = false;
-    for (int i = 0; i < m_colorScopes.size(); i++) {
+    for (int i = 0; i < m_colorScopes.size(); ++i) {
         if (!m_colorScopes[i].scope->visibleRegion().isEmpty() && m_colorScopes[i].scope->autoRefreshEnabled()) {
             accepted = true;
             break;
@@ -287,16 +289,18 @@ void ScopeManager::checkActiveColourScopes()
 
     // Notify monitors whether frames are still required
     Monitor *monitor;
-    monitor = static_cast<Monitor*>( m_monitorManager->monitor(Kdenlive::projectMonitor) );
+    monitor = static_cast<Monitor*>( m_monitorManager->monitor(Kdenlive::ProjectMonitor) );
     if (monitor != NULL) { 
        if (monitor->effectSceneDisplayed()) monitor->render->sendFrameForAnalysis = true;
        else monitor->render->sendFrameForAnalysis = imageStillRequested;
     }
 
-    monitor = static_cast<Monitor*>( m_monitorManager->monitor(Kdenlive::clipMonitor) );
+    monitor = static_cast<Monitor*>( m_monitorManager->monitor(Kdenlive::ClipMonitor) );
     if (monitor != NULL) { monitor->render->sendFrameForAnalysis = imageStillRequested; }
 
-    RecMonitor *recMonitor = static_cast<RecMonitor*>( m_monitorManager->monitor(Kdenlive::recordMonitor) );
+    RecMonitor *recMonitor = static_cast<RecMonitor*>( m_monitorManager->monitor(Kdenlive::RecordMonitor) );
     if (recMonitor != NULL) { recMonitor->analyseFrames(imageStillRequested); }
 }
 
+
+#include "scopemanager.moc"