Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / scopes / scopemanager.h

diff --git a/src/scopes/scopemanager.h b/src/scopes/scopemanager.h
index 3ad8320cbb32bc9ea24174a2e46465f10039f589..d4d98d434da2552363f00e7890a92c4e0246ec6e 100644 (file)
--- a/src/scopes/scopemanager.h
+++ b/src/scopes/scopemanager.h
@@ -36,14 +36,22 @@ class ScopeManager : QObject
         AbstractGfxScopeWidget *scope;
         QDockWidget *scopeDockWidget;
         bool singleFrameRequested;
-        GfxScopeData() { singleFrameRequested = false; }
+        GfxScopeData() {
+            scope = NULL;
+            scopeDockWidget = NULL;
+            singleFrameRequested = false;
+        }
     };
 
     struct AudioScopeData {
         AbstractAudioScopeWidget *scope;
         QDockWidget *scopeDockWidget;
         bool singleFrameRequested;
-        AudioScopeData() { singleFrameRequested = false; }
+        AudioScopeData() {
+            scope = NULL;
+            scopeDockWidget = NULL;
+            singleFrameRequested = false; 
+        }
     };
 
 public:
@@ -107,7 +115,7 @@ private slots:
       */
     
     void slotCheckActiveScopes();
-    void slotDistributeFrame(QImage image);
+    void slotDistributeFrame(const QImage image);
     void slotDistributeAudio(QVector<int16_t> sampleData, int freq, int num_channels, int num_samples);
     /**
       Allows a scope to explicitly request a new frame, even if the scope's autoRefresh is disabled.