Changeset 11508 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp

Timestamp:

05/28/10 18:39:08 (3 years ago)

Author:

robert

Message:

Converted osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp

@@ -56 +56 @@
 FFmpegDecoderVideo::~FFmpegDecoderVideo()
 {
-    osg::notify(osg::INFO)<<"Destructing FFmpegDecoderVideo..."<<std::endl;
+    OSG_INFO<<"Destructing FFmpegDecoderVideo..."<<std::endl;
 
 
@@ -77 +77 @@
 #endif
 
-    osg::notify(osg::INFO)<<"Destructed FFmpegDecoderVideo"<<std::endl;
+    OSG_INFO<<"Destructed FFmpegDecoderVideo"<<std::endl;
 }
 
@@ -158 +158 @@
     catch (const std::exception & error)
     {
-        osg::notify(osg::WARN) << "FFmpegDecoderVideo::run : " << error.what() << std::endl;
+        OSG_WARN << "FFmpegDecoderVideo::run : " << error.what() << std::endl;
     }
 
     catch (...)
     {
-        osg::notify(osg::WARN) << "FFmpegDecoderVideo::run : unhandled exception" << std::endl;
+        OSG_WARN << "FFmpegDecoderVideo::run : unhandled exception" << std::endl;
     }
 }
@@ -283 +283 @@
     
 
-    osg::notify(osg::INFO)<<"Using sws_scale ";
+    OSG_INFO<<"Using sws_scale ";
     
     int result =  sws_scale(m_swscale_ctx,
@@ -290 +290 @@
 #else
 
-    osg::notify(osg::INFO)<<"Using img_convert ";
+    OSG_INFO<<"Using img_convert ";
 
     int result = img_convert(dst, dst_pix_fmt, src,
@@ -297 +297 @@
 #endif
     osg::Timer_t endTick = osg::Timer::instance()->tick();
-    osg::notify(osg::INFO)<<" time = "<<osg::Timer::instance()->delta_m(startTick,endTick)<<"ms"<<std::endl;
+    OSG_INFO<<" time = "<<osg::Timer::instance()->delta_m(startTick,endTick)<<"ms"<<std::endl;
 
     return result;