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

Timestamp:

05/28/10 19:05:46 (3 years ago)

Author:

robert

Message:

Converted osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/quicktime/MovieData.cpp (modified) (6 diffs)

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

@@ -89 +89 @@
     if (status !=0) {
         _fError = true;
-        osg::notify(osg::FATAL) << " MovieData :: NewMovieFromProperties failed with err " << status<< std::endl;
+        OSG_FATAL << " MovieData :: NewMovieFromProperties failed with err " << status<< std::endl;
         return;
     }
@@ -153 +153 @@
 
     if (_pointer == NULL) {
-        osg::notify(osg::FATAL) << "MovieData: " << "Can't allocate texture buffer" << std::endl;
+        OSG_FATAL << "MovieData: " << "Can't allocate texture buffer" << std::endl;
         _fError= true;
     }
@@ -191 +191 @@
     
     if (err !=0 )
-        osg::notify(osg::FATAL) << "MovieData : Could not create gWorld" << std::endl;
-        
+    {
+        OSG_FATAL << "MovieData : Could not create gWorld" << std::endl;
+    }
+
     GetGWorld (&origPort, &origDevice);
     SetGWorld(_gw, NULL);                                         // set current graphics port to offscreen
@@ -204 +206 @@
         if (!LockPixels (pixmap))                                        // lock offscreen pixel map
         {
-            osg::notify(osg::FATAL) << "Could not lock PixMap" << std::endl;
+            OSG_FATAL << "Could not lock PixMap" << std::endl;
             ExitToShell ();
         }
@@ -210 +212 @@
     else
     {
-        osg::notify(osg::FATAL) << "Could not GetGWorldPixMap" << std::endl;
+        OSG_FATAL << "Could not GetGWorldPixMap" << std::endl;
         ExitToShell ();
     }
@@ -231 +233 @@
 
 void MovieData::setMovieRate(float rate) { 
-    // osg::notify(osg::ALWAYS) << "new movierate: " << rate << " current: " << getMovieRate() << std::endl;
+    // OSG_ALWAYS << "new movierate: " << rate << " current: " << getMovieRate() << std::endl;
     _movieRate = rate;
     if ((rate != 0) && (_preRolled == false)) {