Changeset 8792 for OpenSceneGraph/trunk/src/osgPlugins/quicktime/MovieData.cpp

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.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/quicktime/MovieData.cpp (modified) (2 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;