Changeset 11508 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.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/FFmpegImageStream.cpp (modified) (5 diffs)

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

@@ -40 +40 @@
 FFmpegImageStream::~FFmpegImageStream()
 {
-    osg::notify(osg::INFO)<<"Destructing FFmpegImageStream..."<<std::endl;
+    OSG_INFO<<"Destructing FFmpegImageStream..."<<std::endl;
 
     quit(true);
     
-    osg::notify(osg::INFO)<<"Have done quit"<<std::endl;
+    OSG_INFO<<"Have done quit"<<std::endl;
 
     // release athe audio streams to make sure that the decoder doesn't retain any external
@@ -56 +56 @@
     delete m_commands;
 
-    osg::notify(osg::INFO)<<"Destructed FFMpegImageStream."<<std::endl;
+    OSG_INFO<<"Destructed FFMpegImageStream."<<std::endl;
 }
 
@@ -76 +76 @@
     setPixelAspectRatio(m_decoder->video_decoder().pixelAspectRatio());
 
-    osg::notify(osg::NOTICE)<<"ffmpeg::open("<<filename<<") size("<<s()<<", "<<t()<<") aspect ratio "<<m_decoder->video_decoder().pixelAspectRatio()<<std::endl;
+    OSG_NOTICE<<"ffmpeg::open("<<filename<<") size("<<s()<<", "<<t()<<") aspect ratio "<<m_decoder->video_decoder().pixelAspectRatio()<<std::endl;
 
 #if 1
@@ -88 +88 @@
     if (m_decoder->audio_decoder().validContext())
     {
-        osg::notify(osg::NOTICE)<<"Attaching FFmpegAudioStream"<<std::endl;
+        OSG_NOTICE<<"Attaching FFmpegAudioStream"<<std::endl;
 
         getAudioStreams().push_back(new FFmpegAudioStream(m_decoder.get()));
@@ -219 +219 @@
     catch (const std::exception & error)
     {
-        osg::notify(osg::WARN) << "FFmpegImageStream::run : " << error.what() << std::endl;
+        OSG_WARN << "FFmpegImageStream::run : " << error.what() << std::endl;
     }
 
     catch (...)
     {
-        osg::notify(osg::WARN) << "FFmpegImageStream::run : unhandled exception" << std::endl;
+        OSG_WARN << "FFmpegImageStream::run : unhandled exception" << std::endl;
     }
     
-    osg::notify(osg::NOTICE)<<"Finished FFmpegImageStream::run()"<<std::endl;
+    OSG_NOTICE<<"Finished FFmpegImageStream::run()"<<std::endl;
 }