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

Converted osg::notify to OSG_INFO etc.

Browse Source
This commit is contained in:
Robert Osfield
2010-05-28 16:39:08 +00:00
parent bba4a1900d
commit ecaa239288
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgPlugins/ffmpeg/FFmpegImageStream.cpp
View File

@@ -39,11 +39,11 @@ FFmpegImageStream::FFmpegImageStream(const FFmpegImageStream & image, const osg:
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
// refences.
@@ -55,7 +55,7 @@ FFmpegImageStream::~FFmpegImageStream()
delete m_commands;
osg::notify(osg::INFO)<<"Destructed FFMpegImageStream."<<std::endl;
OSG_INFO<<"Destructed FFMpegImageStream."<<std::endl;
}
@@ -75,7 +75,7 @@ bool FFmpegImageStream::open(const std::string & filename)
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
// swscale is reported errors and then crashing when rescaling video of size less than 10 by 10.
@@ -87,7 +87,7 @@ bool FFmpegImageStream::open(const std::string & filename)
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()));
}
@@ -218,15 +218,15 @@ void FFmpegImageStream::run()
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;
}