Show
Ignore:
Timestamp:
05/28/10 18:39:08 (4 years ago)
Author:
robert
Message:

Converted osg::notify to OSG_INFO etc.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp

    r10961 r11508  
    4040FFmpegImageStream::~FFmpegImageStream() 
    4141{ 
    42     osg::notify(osg::INFO)<<"Destructing FFmpegImageStream..."<<std::endl; 
     42    OSG_INFO<<"Destructing FFmpegImageStream..."<<std::endl; 
    4343 
    4444    quit(true); 
    4545     
    46     osg::notify(osg::INFO)<<"Have done quit"<<std::endl; 
     46    OSG_INFO<<"Have done quit"<<std::endl; 
    4747 
    4848    // release athe audio streams to make sure that the decoder doesn't retain any external 
     
    5656    delete m_commands; 
    5757 
    58     osg::notify(osg::INFO)<<"Destructed FFMpegImageStream."<<std::endl; 
     58    OSG_INFO<<"Destructed FFMpegImageStream."<<std::endl; 
    5959} 
    6060 
     
    7676    setPixelAspectRatio(m_decoder->video_decoder().pixelAspectRatio()); 
    7777 
    78     osg::notify(osg::NOTICE)<<"ffmpeg::open("<<filename<<") size("<<s()<<", "<<t()<<") aspect ratio "<<m_decoder->video_decoder().pixelAspectRatio()<<std::endl; 
     78    OSG_NOTICE<<"ffmpeg::open("<<filename<<") size("<<s()<<", "<<t()<<") aspect ratio "<<m_decoder->video_decoder().pixelAspectRatio()<<std::endl; 
    7979 
    8080#if 1 
     
    8888    if (m_decoder->audio_decoder().validContext()) 
    8989    { 
    90         osg::notify(osg::NOTICE)<<"Attaching FFmpegAudioStream"<<std::endl; 
     90        OSG_NOTICE<<"Attaching FFmpegAudioStream"<<std::endl; 
    9191 
    9292        getAudioStreams().push_back(new FFmpegAudioStream(m_decoder.get())); 
     
    219219    catch (const std::exception & error) 
    220220    { 
    221         osg::notify(osg::WARN) << "FFmpegImageStream::run : " << error.what() << std::endl; 
     221        OSG_WARN << "FFmpegImageStream::run : " << error.what() << std::endl; 
    222222    } 
    223223 
    224224    catch (...) 
    225225    { 
    226         osg::notify(osg::WARN) << "FFmpegImageStream::run : unhandled exception" << std::endl; 
     226        OSG_WARN << "FFmpegImageStream::run : unhandled exception" << std::endl; 
    227227    } 
    228228     
    229     osg::notify(osg::NOTICE)<<"Finished FFmpegImageStream::run()"<<std::endl; 
     229    OSG_NOTICE<<"Finished FFmpegImageStream::run()"<<std::endl; 
    230230} 
    231231