Changeset 8792

Timestamp:

08/25/08 17:20:42 (5 years ago)

Author:

robert

Message:

From Michael Guerrero, Fixed crash that occurred when openning an new movie file after all previous movie ImageStream? had been closed. Also add a missing close of the movie file.

Location:

OpenSceneGraph/trunk/src/osgPlugins/quicktime

Files:

• MovieData.cpp (modified) (2 diffs)
• MovieData.h (modified) (1 diff)
• QTUtils.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgPlugins/quicktime/MovieData.cpp

@@ -24 +24 @@
 
 MovieData::~MovieData()
-{
+{  
     if (_pointer) free(_pointer);
     if (_gw) DisposeGWorld(_gw);
-    if (_movie) DisposeMovie(_movie);
+
+    if (_movie) {
+        CloseMovieFile(_resref);
+        DisposeMovie(_movie);
+    }
 }
     
@@ -42 +46 @@
     osg::notify(osg::INFO) << "MovieData :: opening movie '" << filename << "'" << std::endl;
     
-    OSStatus err = MakeMovieFromPath(filename.c_str(),&_movie);
+    OSStatus err = MakeMovieFromPath(filename.c_str(), &_movie, _resref);
     if (err !=0) {
         _fError = true;

OpenSceneGraph/trunk/src/osgPlugins/quicktime/MovieData.h

@@ -99 +99 @@
             
         protected:
-            char*            _pointer;
+            char*           _pointer;
+            short           _resref;
             Movie           _movie;
             GWorldPtr       _gw;

OpenSceneGraph/trunk/src/osgPlugins/quicktime/QTUtils.cpp

@@ -21 +21 @@
         public:
             QuicktimeInitializer() :osg::Referenced() {
-                static bool s_fQuicktimeInited = 0;
-                if (!s_fQuicktimeInited) {
-                    #ifndef __APPLE__
-                        InitializeQTML(0);
-                    #endif
-                    OSErr err = EnterMovies();
-                    if (err!=0)
-                       osg::notify(osg::FATAL) << "Error while initializing quicktime: " << err << endl; 
-                    else
-                       osg::notify(osg::DEBUG_INFO) << "Quicktime initialized successfully"  << endl;
-                    registerQTReader();
-                    s_fQuicktimeInited = true;
-                }
+               
+                 #ifndef __APPLE__
+                     InitializeQTML(0);
+                 #endif
+                 OSErr err = EnterMovies();
+                 if (err!=0)
+                    osg::notify(osg::FATAL) << "Error while initializing quicktime: " << err << endl; 
+                 else
+                    osg::notify(osg::DEBUG_INFO) << "Quicktime initialized successfully"  << endl;
+
+                 static bool registered = false;
+
+                 if (!registered){
+                  registerQTReader();                  
+                 }                 
             }
             
@@ -73 +75 @@
 
         static osg::ref_ptr<QuicktimeInitializer> s_qt_init = new QuicktimeInitializer();
-        if (erase)
+        if (erase) {
             s_qt_init = NULL;
+        } else if (!s_qt_init.valid())
+        {
+            s_qt_init = new QuicktimeInitializer();
+        }
     }
 
@@ -114 +120 @@
     // MakeMovieFromPath
     // ---------------------------------------------------------------------------
-    OSStatus MakeMovieFromPath(const char* path, Movie* movie) {
+    OSStatus MakeMovieFromPath(const char* path, Movie* movie, short& resref) {
         OSStatus err;
         FSSpec   spec;
-        short    resref;
 #ifdef __APPLE__
         MakeFSSpecFromPath(path, &spec);