FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Robert Osfield
2008-08-25 15:20:42 +00:00
parent 0c9214636f
commit 5c2a4b014e
3 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/osgPlugins/quicktime/QTUtils.cpp
View File

@@ -20,19 +20,21 @@ using namespace std;
class QuicktimeInitializer : public osg::Referenced {
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();
}
}
~QuicktimeInitializer() {
@@ -72,8 +74,12 @@ using namespace std;
void initQuicktime(bool erase) {
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();
}
}
@@ -113,10 +119,9 @@ using namespace std;
// ---------------------------------------------------------------------------
// 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);
#else