[vlmc-devel] commit: MainWorkflow: deleting blackoutput when closing. ( Hugo Beauzee-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzee-Luyssen <beauze.h at gmail.com> | Wed Apr  7 16:58:53 2010 +0200| [fb9b810fda4c2870249505e710bdca4c4fc6b983] | committer: Hugo Beauzee-Luyssen 

MainWorkflow: deleting blackoutput when closing.

blackOutput is now private

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=fb9b810fda4c2870249505e710bdca4c4fc6b983
---

 src/Workflow/MainWorkflow.cpp |    1 +
 src/Workflow/MainWorkflow.h   |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Workflow/MainWorkflow.cpp b/src/Workflow/MainWorkflow.cpp
index 438da09..03f96a5 100644
--- a/src/Workflow/MainWorkflow.cpp
+++ b/src/Workflow/MainWorkflow.cpp
@@ -69,6 +69,7 @@ MainWorkflow::~MainWorkflow()
     for ( unsigned int i = 0; i < MainWorkflow::NbTrackType; ++i )
         delete m_tracks[i];
     delete[] m_tracks;
+    delete MainWorkflow::blackOutput;
 }
 
 void
diff --git a/src/Workflow/MainWorkflow.h b/src/Workflow/MainWorkflow.h
index e48ec72..d3dea6c 100644
--- a/src/Workflow/MainWorkflow.h
+++ b/src/Workflow/MainWorkflow.h
@@ -339,9 +339,6 @@ class   MainWorkflow : public QObject, public Singleton<MainWorkflow>
         void                    unsplit( Clip* origin, Clip* splitted, quint32 trackId,
                                          MainWorkflow::TrackType trackType );
 
-        /// Pre-filled buffer used when there's nothing to render
-        static LightVideoFrame*         blackOutput;
-
     private:
         MainWorkflow( int trackCount = 64 );
         ~MainWorkflow();
@@ -384,6 +381,9 @@ class   MainWorkflow : public QObject, public Singleton<MainWorkflow>
         /// Height used for the render
         quint32                         m_height;
 
+        /// Pre-filled buffer used when there's nothing to render
+        static LightVideoFrame*         blackOutput;
+
         friend class                    Singleton<MainWorkflow>;
 
     private slots: