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

10
src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
View File

@@ -47,7 +47,7 @@ bool FFmpegDecoder::open(const std::string & filename)
{
avdevice_register_all();
osg::notify(osg::NOTICE)<<"Attempting to stream "<<filename<<std::endl;
OSG_NOTICE<<"Attempting to stream "<<filename<<std::endl;
AVFormatParameters formatParams;
memset(&formatParams, 0, sizeof(AVFormatParameters));
@@ -70,11 +70,11 @@ bool FFmpegDecoder::open(const std::string & filename)
if (iformat)
{
osg::notify(osg::NOTICE)<<"Found input format: "<<format<<std::endl;
OSG_NOTICE<<"Found input format: "<<format<<std::endl;
}
else
{
osg::notify(osg::NOTICE)<<"Failed to find input format: "<<format<<std::endl;
OSG_NOTICE<<"Failed to find input format: "<<format<<std::endl;
}
int error = av_open_input_file(&p_format_context, filename.c_str(), iformat, 0, &formatParams);
@@ -133,13 +133,13 @@ bool FFmpegDecoder::open(const std::string & filename)
catch (const std::runtime_error & error)
{
osg::notify(osg::WARN) << "FFmpegImageStream::open audio failed, audio stream will be disabled: " << error.what() << std::endl;
OSG_WARN << "FFmpegImageStream::open audio failed, audio stream will be disabled: " << error.what() << std::endl;
}
}
catch (const std::runtime_error & error)
{
osg::notify(osg::WARN) << "FFmpegImageStream::open : " << error.what() << std::endl;
OSG_WARN << "FFmpegImageStream::open : " << error.what() << std::endl;
return false;
}