From d1874456701c03fa6d0495426ddc54b7ecbae553 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 28 May 2010 16:08:15 +0000
Subject: [PATCH] Converted osg::notify to OSG_INFO etc.

---
 src/osgPresentation/AnimationMaterial.cpp    |  2 +-
 src/osgPresentation/PickEventHandler.cpp     | 22 ++---
 src/osgPresentation/SlideEventHandler.cpp    | 88 ++++++++++----------
 src/osgPresentation/SlideShowConstructor.cpp | 70 ++++++++--------
 4 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/src/osgPresentation/AnimationMaterial.cpp b/src/osgPresentation/AnimationMaterial.cpp
index f62f573f5..4680f0544 100644
--- a/src/osgPresentation/AnimationMaterial.cpp
+++ b/src/osgPresentation/AnimationMaterial.cpp
@@ -169,7 +169,7 @@ void AnimationMaterialCallback::operator()(osg::Node* node, osg::NodeVisitor* nv
             // Only update _firstTime the first time, when its value is still DBL_MAX
             if (_firstTime==DBL_MAX)
             {
-                osg::notify(osg::INFO)<<"AnimationMaterialCallback::operator() resetting _firstTime to "<<time<<std::endl;
+                OSG_INFO<<"AnimationMaterialCallback::operator() resetting _firstTime to "<<time<<std::endl;
                 _firstTime = time;
             }
             update(*node);
diff --git a/src/osgPresentation/PickEventHandler.cpp b/src/osgPresentation/PickEventHandler.cpp
index e1a749d69..797c4a2f9 100644
--- a/src/osgPresentation/PickEventHandler.cpp
+++ b/src/osgPresentation/PickEventHandler.cpp
@@ -66,7 +66,7 @@ bool PickEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionA
                 {
                     if (ea.getEventType()==osgGA::GUIEventAdapter::MOVE)
                     {
-                        osg::notify(osg::INFO)<<"Tooltip..."<<std::endl;
+                        OSG_INFO<<"Tooltip..."<<std::endl;
                     }
                     else if (ea.getEventType()==osgGA::GUIEventAdapter::RELEASE)
                     {
@@ -79,8 +79,8 @@ bool PickEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionA
         }
         case(osgGA::GUIEventAdapter::KEYDOWN):
         {
-            //osg::notify(osg::NOTICE)<<"PickEventHandler KEYDOWN "<<(char)ea.getKey()<<std::endl;
-            //if (object) osg::notify(osg::NOTICE)<<"    "<<object->className()<<std::endl;
+            //OSG_NOTICE<<"PickEventHandler KEYDOWN "<<(char)ea.getKey()<<std::endl;
+            //if (object) OSG_NOTICE<<"    "<<object->className()<<std::endl;
             break;
         }
         default:
@@ -120,7 +120,7 @@ void PickEventHandler::doOperation()
     {
         case(osgPresentation::RUN):
         {
-            osg::notify(osg::NOTICE)<<"Run "<<_command<<std::endl;
+            OSG_NOTICE<<"Run "<<_command<<std::endl;
 
 #if 0
             osgDB::FilePathList& paths = osgDB::getDataFilePathList();
@@ -163,31 +163,31 @@ void PickEventHandler::doOperation()
 #endif
             int result = system(_command.c_str());
 
-            osg::notify(osg::INFO)<<"system("<<_command<<") result "<<result<<std::endl;
+            OSG_INFO<<"system("<<_command<<") result "<<result<<std::endl;
 
             break;
         }
         case(osgPresentation::LOAD):
         {
-            osg::notify(osg::NOTICE)<<"Load "<<_command<<std::endl;
+            OSG_NOTICE<<"Load "<<_command<<std::endl;
             break;
         }
         case(osgPresentation::EVENT):
         {
-            osg::notify(osg::INFO)<<"Event "<<_keyPos._key<<" "<<_keyPos._x<<" "<<_keyPos._y<<std::endl;
+            OSG_INFO<<"Event "<<_keyPos._key<<" "<<_keyPos._x<<" "<<_keyPos._y<<std::endl;
             if (SlideEventHandler::instance()) SlideEventHandler::instance()->dispatchEvent(_keyPos);
             break;
         }
         case(osgPresentation::JUMP):
         {
-            osg::notify(osg::NOTICE)<<"Requires jump "<<std::endl;
+            OSG_NOTICE<<"Requires jump "<<std::endl;
             break;
         }
     }
     
     if (requiresJump())
     {
-        osg::notify(osg::NOTICE)<<"Requires jump "<<_relativeJump<<", "<<_slideNum<<", "<<_layerNum<<std::endl;
+        OSG_NOTICE<<"Requires jump "<<_relativeJump<<", "<<_slideNum<<", "<<_layerNum<<std::endl;
 
         if (_relativeJump)
         {
@@ -200,7 +200,7 @@ void PickEventHandler::doOperation()
                 newLayer = 0;
             }
 
-            osg::notify(osg::NOTICE)<<"   jump to "<<newSlide<<", "<<newLayer<<std::endl;
+            OSG_NOTICE<<"   jump to "<<newSlide<<", "<<newLayer<<std::endl;
 
             SlideEventHandler::instance()->selectSlide(newSlide, newLayer);
         }
@@ -211,7 +211,7 @@ void PickEventHandler::doOperation()
     }
     else
     {
-        osg::notify(osg::NOTICE)<<"No jump required."<<std::endl;
+        OSG_NOTICE<<"No jump required."<<std::endl;
     }
 }
 
diff --git a/src/osgPresentation/SlideEventHandler.cpp b/src/osgPresentation/SlideEventHandler.cpp
index 6d43078c8..8bf00e99d 100644
--- a/src/osgPresentation/SlideEventHandler.cpp
+++ b/src/osgPresentation/SlideEventHandler.cpp
@@ -37,7 +37,7 @@ SlideEventHandler* SlideEventHandler::instance() { return s_seh.get(); }
 
 void LayerAttributes::callEnterCallbacks(osg::Node* node)
 {
-    osg::notify(osg::INFO)<<"LayerAttributes::callEnterCallbacks("<<node<<")"<<std::endl;
+    OSG_INFO<<"LayerAttributes::callEnterCallbacks("<<node<<")"<<std::endl;
     for(LayerCallbacks::iterator itr = _enterLayerCallbacks.begin();
         itr != _enterLayerCallbacks.end();
         ++itr)
@@ -48,7 +48,7 @@ void LayerAttributes::callEnterCallbacks(osg::Node* node)
 
 void LayerAttributes::callLeaveCallbacks(osg::Node* node)
 {
-    osg::notify(osg::INFO)<<"LayerAttributes::callLeaveCallbacks("<<node<<")"<<std::endl;
+    OSG_INFO<<"LayerAttributes::callLeaveCallbacks("<<node<<")"<<std::endl;
     for(LayerCallbacks::iterator itr = _leaveLayerCallbacks.begin();
         itr != _leaveLayerCallbacks.end();
         ++itr)
@@ -67,7 +67,7 @@ struct ImageStreamOperator : public ObjectOperator
 
     virtual void enter()
     {
-        osg::notify(osg::INFO)<<"enter() : _imageStream->rewind() + play"<<std::endl;
+        OSG_INFO<<"enter() : _imageStream->rewind() + play"<<std::endl;
 
         reset();
     }
@@ -78,14 +78,14 @@ struct ImageStreamOperator : public ObjectOperator
     
     virtual void leave()
     {
-       osg::notify(osg::INFO)<<"leave() : _imageStream->pause()"<<std::endl;
+       OSG_INFO<<"leave() : _imageStream->pause()"<<std::endl;
 
         _imageStream->pause();
     }
 
     virtual void setPause(bool pause)
     {
-       osg::notify(osg::INFO)<<"_imageStream->setPause("<<pause<<")"<<std::endl;
+       OSG_INFO<<"_imageStream->setPause("<<pause<<")"<<std::endl;
 
         if (pause) _imageStream->pause();
         else _imageStream->play();
@@ -141,17 +141,17 @@ struct CallbackOperator : public ObjectOperator
         AnimationMaterialCallback* amc = dynamic_cast<AnimationMaterialCallback*>(_callback.get());
         if (apc)
         {
-            osg::notify(osg::INFO)<<"apc->setPause("<<pause<<")"<<std::endl;
+            OSG_INFO<<"apc->setPause("<<pause<<")"<<std::endl;
             apc->setPause(pause);
         }
         if (tc)
         {
-            osg::notify(osg::INFO)<<"tc->setPause("<<pause<<")"<<std::endl;
+            OSG_INFO<<"tc->setPause("<<pause<<")"<<std::endl;
             tc->setPause(pause);
         }
         if (amc)
         {
-            osg::notify(osg::INFO)<<"amc->setPause("<<pause<<")"<<std::endl;
+            OSG_INFO<<"amc->setPause("<<pause<<")"<<std::endl;
             amc->setPause(pause);
         }
     }
@@ -197,7 +197,7 @@ struct LayerAttributesOperator : public ObjectOperator
 
         if (!_layerAttribute->_keys.empty())
         {
-            osg::notify(osg::INFO)<<"applyKeys {"<<std::endl;
+            OSG_INFO<<"applyKeys {"<<std::endl;
 
             for(LayerAttributes::Keys::iterator itr = _layerAttribute->_keys.begin();
                 itr != _layerAttribute->_keys.end();
@@ -206,7 +206,7 @@ struct LayerAttributesOperator : public ObjectOperator
                 SlideEventHandler::instance()->dispatchEvent(*itr);
             }
 
-            osg::notify(osg::INFO)<<"}"<<std::endl;
+            OSG_INFO<<"}"<<std::endl;
         }   
         if (!_layerAttribute->_runStrings.empty())
         {
@@ -215,12 +215,12 @@ struct LayerAttributesOperator : public ObjectOperator
                 ++itr)
             {
 
-                osg::notify(osg::NOTICE)<<"Run "<<itr->c_str()<<std::endl;
+                OSG_NOTICE<<"Run "<<itr->c_str()<<std::endl;
                 osg::Timer_t startTick = osg::Timer::instance()->tick();
 
                 int result = system(itr->c_str());
 
-                osg::notify(osg::INFO)<<"system("<<*itr<<") result "<<result<<std::endl;
+                OSG_INFO<<"system("<<*itr<<") result "<<result<<std::endl;
 
                 double timeForRun = osg::Timer::instance()->delta_s(startTick, osg::Timer::instance()->tick());
 
@@ -241,7 +241,7 @@ struct LayerAttributesOperator : public ObjectOperator
     
     virtual void leave()
     {
-        osg::notify(osg::INFO)<<"LayerAttribute leave"<<std::endl;
+        OSG_INFO<<"LayerAttribute leave"<<std::endl;
 
          _layerAttribute->callLeaveCallbacks(_node.get());
     }
@@ -331,9 +331,9 @@ void ActiveOperators::collect(osg::Node* incommingNode, osg::NodeVisitor::Traver
     FindOperatorsVisitor fov(_current, tm);
     incommingNode->accept(fov);
     
-    osg::notify(osg::INFO)<<"ActiveOperators::collect("<<incommingNode<<")"<<std::endl;
-    osg::notify(osg::INFO)<<"  _previous.size()="<<_previous.size()<<std::endl;
-    osg::notify(osg::INFO)<<"  _current.size()="<<_current.size()<<std::endl;
+    OSG_INFO<<"ActiveOperators::collect("<<incommingNode<<")"<<std::endl;
+    OSG_INFO<<"  _previous.size()="<<_previous.size()<<std::endl;
+    OSG_INFO<<"  _current.size()="<<_current.size()<<std::endl;
     
     _outgoing.clear();
     _incomming.clear();
@@ -388,7 +388,7 @@ void ActiveOperators::process()
 
 void ActiveOperators::processOutgoing()
 {
-    osg::notify(osg::INFO)<<"  outgoing.size()="<<_outgoing.size()<<std::endl;    
+    OSG_INFO<<"  outgoing.size()="<<_outgoing.size()<<std::endl;    
     for(OperatorList::iterator itr = _outgoing.begin();
         itr != _outgoing.end();
         ++itr)
@@ -399,7 +399,7 @@ void ActiveOperators::processOutgoing()
 
 void ActiveOperators::processMaintained()
 {
-    osg::notify(osg::INFO)<<"  maintained.size()="<<_maintained.size()<<std::endl;
+    OSG_INFO<<"  maintained.size()="<<_maintained.size()<<std::endl;
     for(OperatorList::iterator itr = _maintained.begin();
         itr != _maintained.end();
         ++itr)
@@ -410,7 +410,7 @@ void ActiveOperators::processMaintained()
 
 void ActiveOperators::processIncomming()
 {
-    osg::notify(osg::INFO)<<"  incomming.size()="<<_incomming.size()<<std::endl;
+    OSG_INFO<<"  incomming.size()="<<_incomming.size()<<std::endl;
     for(OperatorList::iterator itr = _incomming.begin();
         itr != _incomming.end();
         ++itr)
@@ -483,7 +483,7 @@ public:
         FilePathData* fdd = dynamic_cast<FilePathData*>(node.getUserData());
         if (fdd) 
         {
-            osg::notify(osg::INFO)<<"Recorded FilePathData"<<std::endl;
+            OSG_INFO<<"Recorded FilePathData"<<std::endl;
             osgDB::setDataFilePathList(fdd->filePathList);
         }
         
@@ -520,7 +520,7 @@ public:
     
         if (lightsource.getLight())
         {
-            osg::notify(osg::INFO)<<"Adjusting light"<<std::endl;
+            OSG_INFO<<"Adjusting light"<<std::endl;
 
             osg::Light* light = lightsource.getLight();
 
@@ -530,12 +530,12 @@ public:
             
             if (lightsource.getReferenceFrame()==osg::LightSource::RELATIVE_RF)
             {
-                osg::notify(osg::INFO)<<"Relative to absolute"<<std::endl;
+                OSG_INFO<<"Relative to absolute"<<std::endl;
             }
             else
             {
                 osg::Matrix matrix(osg::computeEyeToLocal(_viewMatrix,_nodePath));
-                osg::notify(osg::INFO)<<"ModelView"<<matrix<<std::endl;
+                OSG_INFO<<"ModelView"<<matrix<<std::endl;
 
                 //direction = osg::Matrixd::transform3x3(matrix,direction);
                 //direction.normalize();
@@ -563,11 +563,11 @@ public:
        
     void apply(osg::TexEnvCombine& texenv)
     {
-        osg::notify(osg::INFO)<<"Adjusting tex env combine"<<std::endl;
+        OSG_INFO<<"Adjusting tex env combine"<<std::endl;
         
         osg::Matrix matrix(osg::computeEyeToLocal(_viewMatrix,_nodePath));
         
-        osg::notify(osg::INFO)<<"ModelView"<<matrix<<std::endl;
+        OSG_INFO<<"ModelView"<<matrix<<std::endl;
 
         float azim = _currentX*osg::PI;
         float elevation = _currentY*osg::PI_2;
@@ -607,7 +607,7 @@ public:
             osg::AlphaFunc* alphaFunc = dynamic_cast<osg::AlphaFunc*>(stateset.getAttribute(osg::StateAttribute::ALPHAFUNC));
             if (alphaFunc)
             {
-                osg::notify(osg::INFO)<<"Adjusting alpha func"<<std::endl;
+                OSG_INFO<<"Adjusting alpha func"<<std::endl;
 
                 float alpha = alphaFunc->getReferenceValue();
                 alpha = osg::clampBetween((1.0f-_currentY)*0.5f,0.0f,1.0f);
@@ -621,7 +621,7 @@ public:
             osg::Material* material = dynamic_cast<osg::Material*>(stateset.getAttribute(osg::StateAttribute::MATERIAL));
             if (material)
             {
-                osg::notify(osg::INFO)<<"Adjusting material func"<<std::endl;
+                OSG_INFO<<"Adjusting material func"<<std::endl;
                 float alpha = osg::clampBetween((_currentY+1.0f)*0.5f,0.0f,1.0f);
                 material->setAlpha(osg::Material::FRONT_AND_BACK,alpha);
             }
@@ -690,13 +690,13 @@ void SlideEventHandler::set(osg::Node* model)
     
     if (findPresentation._switch)
     {
-        osg::notify(osg::INFO)<<"Presentation '"<<model->getName()<<"'"<<std::endl;
+        OSG_INFO<<"Presentation '"<<model->getName()<<"'"<<std::endl;
         _presentationSwitch = findPresentation._switch;
         
         double duration = getDuration(_presentationSwitch.get());
         if (duration>=0.0)
         {
-            osg::notify(osg::INFO)<<"Presentation time set to "<<duration<<std::endl;
+            OSG_INFO<<"Presentation time set to "<<duration<<std::endl;
             _timePerSlide = duration;
         }
         
@@ -704,7 +704,7 @@ void SlideEventHandler::set(osg::Node* model)
     }
     else
     {
-        osg::notify(osg::INFO)<<"No presentation present in scene."<<std::endl;
+        OSG_INFO<<"No presentation present in scene."<<std::endl;
 
         _presentationSwitch = 0;
         _activeSlide = 0;
@@ -714,14 +714,14 @@ void SlideEventHandler::set(osg::Node* model)
         
         if (findSlide._switch)
         {
-            osg::notify(osg::INFO)<<"Found presentation slide"<<findSlide._switch->getName()<<std::endl;
+            OSG_INFO<<"Found presentation slide"<<findSlide._switch->getName()<<std::endl;
 
             _slideSwitch = findSlide._switch;
             //selectLayer(0);
         }
         else
         {
-            osg::notify(osg::INFO)<<"No slides present in scene, unable to operate as a slideshow."<<std::endl;
+            OSG_INFO<<"No slides present in scene, unable to operate as a slideshow."<<std::endl;
         }
     
     }
@@ -779,9 +779,9 @@ bool SlideEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIAction
         _viewer = dynamic_cast<osgViewer::Viewer*>(&aa);
         selectSlide(0);
         home();
-        osg::notify(osg::NOTICE)<<"Assigned viewer. to SlideEventHandler"<<std::endl;
+        OSG_NOTICE<<"Assigned viewer. to SlideEventHandler"<<std::endl;
     }
-    // else  osg::notify(osg::NOTICE)<<"SlideEventHandler::handle()"<<std::endl;
+    // else  OSG_NOTICE<<"SlideEventHandler::handle()"<<std::endl;
 
 
     if (ea.getHandled()) return false;
@@ -1024,7 +1024,7 @@ bool SlideEventHandler::selectSlide(int slideNum,int layerNum)
 {
     if (!_presentationSwitch) return false;
 
-    osg::notify(osg::INFO)<<"selectSlide("<<slideNum<<","<<layerNum<<")"<<std::endl;
+    OSG_INFO<<"selectSlide("<<slideNum<<","<<layerNum<<")"<<std::endl;
     
     if (slideNum==LAST_POSITION && _presentationSwitch->getNumChildren()>0)
     {
@@ -1043,7 +1043,7 @@ bool SlideEventHandler::selectSlide(int slideNum,int layerNum)
         _tickAtLastSlideOrLayerChange = tick;
     }
 
-    osg::notify(osg::INFO)<<"selectSlide("<<slideNum<<","<<layerNum<<") at time "<<osg::Timer::instance()->delta_s(_tickAtFirstSlideOrLayerChange, tick)<<" seconds, length ="<<osg::Timer::instance()->delta_s(_tickAtLastSlideOrLayerChange, tick)<<" seconds"<<std::endl;
+    OSG_INFO<<"selectSlide("<<slideNum<<","<<layerNum<<") at time "<<osg::Timer::instance()->delta_s(_tickAtFirstSlideOrLayerChange, tick)<<" seconds, length ="<<osg::Timer::instance()->delta_s(_tickAtLastSlideOrLayerChange, tick)<<" seconds"<<std::endl;
     
     _tickAtLastSlideOrLayerChange = tick;
     
@@ -1060,7 +1060,7 @@ bool SlideEventHandler::selectSlide(int slideNum,int layerNum)
     _activeSlide = slideNum;
     _presentationSwitch->setSingleChildOn(_activeSlide);
 
-    //osg::notify(osg::INFO)<<"Selected slide '"<<_presentationSwitch->getChild(_activeSlide)->getName()<<"'"<<std::endl;
+    //OSG_INFO<<"Selected slide '"<<_presentationSwitch->getChild(_activeSlide)->getName()<<"'"<<std::endl;
 
     
     FindNamedSwitchVisitor findSlide("Slide");
@@ -1069,7 +1069,7 @@ bool SlideEventHandler::selectSlide(int slideNum,int layerNum)
     bool result = false;
     if (findSlide._switch)
     {
-        //osg::notify(osg::INFO)<<"Found slide '"<<findSlide._switch->getName()<<"'"<<std::endl;
+        //OSG_INFO<<"Found slide '"<<findSlide._switch->getName()<<"'"<<std::endl;
         _slideSwitch = findSlide._switch;
 
         result = selectLayer(layerNum);
@@ -1078,7 +1078,7 @@ bool SlideEventHandler::selectSlide(int slideNum,int layerNum)
     }
     else
     {
-        //osg::notify(osg::INFO)<<"Not found slide"<<std::endl;
+        //OSG_INFO<<"Not found slide"<<std::endl;
         updateOperators();
     }
     
@@ -1125,7 +1125,7 @@ bool SlideEventHandler::selectLayer(int layerNum)
 
     updateOperators();
 
-    osg::notify(osg::INFO)<<"Selected layer '"<<_slideSwitch->getChild(_activeLayer)->getName()<<"' num="<<_activeLayer<< std::endl;
+    OSG_INFO<<"Selected layer '"<<_slideSwitch->getChild(_activeLayer)->getName()<<"' num="<<_activeLayer<< std::endl;
 
     return true;
 }
@@ -1245,7 +1245,7 @@ bool SlideEventHandler::home(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAd
 
     if (fhpv._homePosition.valid())
     {
-        osg::notify(osg::INFO)<<"Doing home for stored home position."<<std::endl;
+        OSG_INFO<<"Doing home for stored home position."<<std::endl;
 
         _viewer->getCameraManipulator()->setAutoComputeHomePosition(false);
         _viewer->getCameraManipulator()->setHomePosition(
@@ -1274,7 +1274,7 @@ bool SlideEventHandler::home()
 
 void SlideEventHandler::updateAlpha(bool modAlphaFunc, bool modMaterial, float x, float y)
 {
-    osg::notify(osg::INFO)<<"updateAlpha("<<x<<","<<y<<")"<<std::endl;
+    OSG_INFO<<"updateAlpha("<<x<<","<<y<<")"<<std::endl;
     
     UpdateAlphaVisitor uav(modAlphaFunc, modMaterial, x,y);
     if (_presentationSwitch.valid()) _presentationSwitch->accept(uav);
@@ -1284,7 +1284,7 @@ void SlideEventHandler::updateAlpha(bool modAlphaFunc, bool modMaterial, float x
 
 void SlideEventHandler::updateLight(float x, float y)
 {
-    osg::notify(osg::INFO)<<"updateLight("<<x<<", "<<y<<")"<<std::endl;
+    OSG_INFO<<"updateLight("<<x<<", "<<y<<")"<<std::endl;
 
     UpdateLightVisitor uav(_viewer->getCamera()->getViewMatrix(),x,y);
     _viewer->getSceneData()->accept(uav);
@@ -1323,7 +1323,7 @@ void SlideEventHandler::releaseSlide(unsigned int slideNum)
 
 void SlideEventHandler::dispatchEvent(const KeyPosition& keyPosition)
 {
-    osg::notify(osg::INFO)<<" keyPosition._key "<<keyPosition._key<<" "<<keyPosition._x<<" "<<keyPosition._y<<std::endl;
+    OSG_INFO<<" keyPosition._key "<<keyPosition._key<<" "<<keyPosition._x<<" "<<keyPosition._y<<std::endl;
 
     osgGA::EventQueue* eq = _viewer->getEventQueue();
 
diff --git a/src/osgPresentation/SlideShowConstructor.cpp b/src/osgPresentation/SlideShowConstructor.cpp
index b8f5df7fc..71a1601d8 100644
--- a/src/osgPresentation/SlideShowConstructor.cpp
+++ b/src/osgPresentation/SlideShowConstructor.cpp
@@ -142,8 +142,8 @@ void SlideShowConstructor::setPresentationAspectRatio(const std::string& str)
         if (ratio!=0.0) setPresentationAspectRatio(1280.0f/1024.0f);
         else
         {
-            osg::notify(osg::WARN)<<"Error: presentation aspect ratio incorrect type"<<std::endl;
-            osg::notify(osg::WARN)<<"       valid types are \"Reality Theatre\", \"Desktop\" or a numerical value."<<std::endl;
+            OSG_WARN<<"Error: presentation aspect ratio incorrect type"<<std::endl;
+            OSG_WARN<<"       valid types are \"Reality Theatre\", \"Desktop\" or a numerical value."<<std::endl;
         }
     }
 }
@@ -160,7 +160,7 @@ void SlideShowConstructor::createPresentation()
     _textFontDataDefault.maximumWidth = 0.8f;
 #endif
     
-    osg::notify(osg::INFO)<<"_titlePositionDataDefault.position="<<_titlePositionDataDefault.position<<std::endl;
+    OSG_INFO<<"_titlePositionDataDefault.position="<<_titlePositionDataDefault.position<<std::endl;
 
     _textPositionDataDefault.position.set(0.1f,_titlePositionDataDefault.position.y()-_titleFontDataDefault.characterSize,0.0f);
     _imagePositionDataDefault.position.set(0.5f,0.5f,0.0f);
@@ -180,7 +180,7 @@ void SlideShowConstructor::createPresentation()
     hp->center = slideCenter;
     hp->up.set(0.0f,0.0f,1.0f);
     
-    osg::notify(osg::INFO)<<" slideCenter "<<slideCenter<<std::endl;
+    OSG_INFO<<" slideCenter "<<slideCenter<<std::endl;
     
     if (_presentationDuration>=0.0)
     {
@@ -200,7 +200,7 @@ LayerAttributes* SlideShowConstructor::getOrCreateLayerAttributes(osg::Node* nod
     {
         if (node->getUserData())
         {
-            osg::notify(osg::NOTICE)<<"UserData already assigned, overriding to set LayerAttributes."<<std::endl;
+            OSG_NOTICE<<"UserData already assigned, overriding to set LayerAttributes."<<std::endl;
         }
 
         la = new LayerAttributes;
@@ -315,7 +315,7 @@ void SlideShowConstructor::addLayer(bool inheritPreviousLayers, bool defineAsBas
 
     _currentLayer = new osg::Group;
 
-    // osg::notify(osg::NOTICE)<<"addLayer"<<std::endl;
+    // OSG_NOTICE<<"addLayer"<<std::endl;
     
     if (!_previousLayer || !inheritPreviousLayers)
     {
@@ -323,7 +323,7 @@ void SlideShowConstructor::addLayer(bool inheritPreviousLayers, bool defineAsBas
         _imagePositionData =  _imagePositionDataDefault;
         _modelPositionData =  _modelPositionDataDefault;    
 
-        // osg::notify(osg::NOTICE)<<"   new layer background = "<<_slideBackgroundImageFileName<<std::endl;
+        // OSG_NOTICE<<"   new layer background = "<<_slideBackgroundImageFileName<<std::endl;
 
         osg::ref_ptr<osg::Image> image = !_slideBackgroundImageFileName.empty() ?
             osgDB::readImageFile(_slideBackgroundImageFileName, _options.get()) :
@@ -347,7 +347,7 @@ void SlideShowConstructor::addLayer(bool inheritPreviousLayers, bool defineAsBas
                                                             osg::Vec3(_slideWidth,0.0f,0.0f),
                                                             osg::Vec3(0.0f,0.0f,_slideHeight),
                                                             s, t);
-            // osg::notify(osg::NOTICE)<<"Image loaded "<<image.get()<<"  "<<_slideBackgroundImageFileName<<std::endl;
+            // OSG_NOTICE<<"Image loaded "<<image.get()<<"  "<<_slideBackgroundImageFileName<<std::endl;
 
             if (useTextureRectangle)
             {
@@ -453,7 +453,7 @@ void SlideShowConstructor::layerClickToDoOperation(Operation operation, bool rel
         {
             if (_currentLayer->getNumChildren()>0)
             {
-                osg::notify(osg::INFO)<<"creating new group within layer"<<std::endl;
+                OSG_INFO<<"creating new group within layer"<<std::endl;
                 osg::Group* group = new osg::Group;
                 _currentLayer->addChild(group);
                 _currentLayer = group;
@@ -461,7 +461,7 @@ void SlideShowConstructor::layerClickToDoOperation(Operation operation, bool rel
         }
         else
         {
-            osg::notify(osg::INFO)<<"creating secondary group within layer"<<std::endl;
+            OSG_INFO<<"creating secondary group within layer"<<std::endl;
             osg::Group* group = new osg::Group;
             _previousLayer->addChild(group);
             _currentLayer = group;
@@ -482,7 +482,7 @@ void SlideShowConstructor::layerClickToDoOperation(const std::string& command, O
         {
             if (_currentLayer->getNumChildren()>0)
             {
-                osg::notify(osg::INFO)<<"creating new group within layer"<<std::endl;
+                OSG_INFO<<"creating new group within layer"<<std::endl;
                 osg::Group* group = new osg::Group;
                 _currentLayer->addChild(group);
                 _currentLayer = group;
@@ -490,7 +490,7 @@ void SlideShowConstructor::layerClickToDoOperation(const std::string& command, O
         }
         else
         {
-            osg::notify(osg::INFO)<<"creating secondary group within layer"<<std::endl;
+            OSG_INFO<<"creating secondary group within layer"<<std::endl;
             osg::Group* group = new osg::Group;
             _previousLayer->addChild(group);
             _currentLayer = group;
@@ -511,7 +511,7 @@ void SlideShowConstructor::layerClickEventOperation(const KeyPosition& keyPos, b
         {
             if (_currentLayer->getNumChildren()>0)
             {
-                osg::notify(osg::INFO)<<"creating new group within layer"<<std::endl;
+                OSG_INFO<<"creating new group within layer"<<std::endl;
                 osg::Group* group = new osg::Group;
                 _currentLayer->addChild(group);
                 _currentLayer = group;
@@ -519,7 +519,7 @@ void SlideShowConstructor::layerClickEventOperation(const KeyPosition& keyPos, b
         }
         else
         {
-            osg::notify(osg::INFO)<<"creating secondary group within layer"<<std::endl;
+            OSG_INFO<<"creating secondary group within layer"<<std::endl;
             osg::Group* group = new osg::Group;
             _previousLayer->addChild(group);
             _currentLayer = group;
@@ -764,7 +764,7 @@ osg::Geometry* SlideShowConstructor::createTexturedQuadGeometry(const osg::Vec3&
     {
         imageStream->pause();
     
-        osg::notify(osg::INFO)<<"Reading video "<<imageStream->getFileName()<<std::endl; 
+        OSG_INFO<<"Reading video "<<imageStream->getFileName()<<std::endl; 
         
         // make sure that OSX uses the client storage extension to accelerate peformance where possible.
         texture->setClientStorageHint(true);
@@ -867,7 +867,7 @@ void SlideShowConstructor::addImage(const std::string& filename, const PositionD
     osg::AnimationPathCallback* animation = getAnimationPathCallback(positionData);
     if (animation)
     {
-        osg::notify(osg::INFO)<<"Have animation path for image"<<std::endl;
+        OSG_INFO<<"Have animation path for image"<<std::endl;
 
         osg::BoundingSphere::vec_type pivot = positionData.absolute_path ?
                 osg::BoundingSphere::vec_type(0.0f,0.0f,0.0f) :
@@ -1030,7 +1030,7 @@ void SlideShowConstructor::addStereoImagePair(const std::string& filenameLeft, c
     osg::AnimationPathCallback* animation = getAnimationPathCallback(positionData);
     if (animation)
     {
-        osg::notify(osg::INFO)<<"Have animation path for image"<<std::endl;
+        OSG_INFO<<"Have animation path for image"<<std::endl;
         
         osg::BoundingSphere::vec_type pivot = positionData.absolute_path ?
                 osg::BoundingSphere::vec_type(0.0f,0.0f,0.0f) :
@@ -1148,7 +1148,7 @@ public:
 
     virtual void operator() (osg::Node*) const
     {
-        osg::notify(osg::INFO)<<"PDF Page to be updated "<<_pageNum<<std::endl;
+        OSG_INFO<<"PDF Page to be updated "<<_pageNum<<std::endl;
     
         if (_pdfImage.valid() && _pdfImage->getPageNum()!=_pageNum)
         {
@@ -1167,7 +1167,7 @@ osg::Image* SlideShowConstructor::addInteractiveImage(const std::string& filenam
 
     osg::Image* image = osgDB::readImageFile(filename, _options.get());
     
-    osg::notify(osg::INFO)<<"addInteractiveImage("<<filename<<") "<<image<<std::endl;
+    OSG_INFO<<"addInteractiveImage("<<filename<<") "<<image<<std::endl;
     
     
     if (!image) return 0;
@@ -1238,7 +1238,7 @@ osg::Image* SlideShowConstructor::addInteractiveImage(const std::string& filenam
     osg::AnimationPathCallback* animation = getAnimationPathCallback(positionData);
     if (animation)
     {
-        osg::notify(osg::INFO)<<"Have animation path for image"<<std::endl;
+        OSG_INFO<<"Have animation path for image"<<std::endl;
         
         osg::BoundingSphere::vec_type pivot = positionData.absolute_path ?
                 osg::BoundingSphere::vec_type(0.0f,0.0f,0.0f) :
@@ -1267,7 +1267,7 @@ osg::Image* SlideShowConstructor::addInteractiveImage(const std::string& filenam
     {
         getOrCreateLayerAttributes(_currentLayer.get())->addEnterCallback(new SetPageCallback(pdfImage, imageData.page));
 
-        osg::notify(osg::INFO)<<"Setting pdf page num "<<imageData.page<<std::endl;
+        OSG_INFO<<"Setting pdf page num "<<imageData.page<<std::endl;
         pdfImage->setBackgroundColor(imageData.backgroundColor);
         pdfImage->page(imageData.page);
 
@@ -1289,7 +1289,7 @@ std::string SlideShowConstructor::findFileAndRecordPath(const std::string& filen
     std::string foundFile = osgDB::findDataFile(filename, _options.get());
     if (foundFile.empty()) return foundFile;
 
-    osg::notify(osg::INFO)<<"foundFile "<<foundFile<<std::endl;
+    OSG_INFO<<"foundFile "<<foundFile<<std::endl;
 
     std::string path = osgDB::getFilePath(foundFile);
     if (!path.empty() && _filePathData.valid())
@@ -1297,7 +1297,7 @@ std::string SlideShowConstructor::findFileAndRecordPath(const std::string& filen
         osgDB::FilePathList::iterator itr = std::find(_filePathData->filePathList.begin(),_filePathData->filePathList.end(),path);
         if (itr==_filePathData->filePathList.end())
         {
-            osg::notify(osg::INFO)<<"New path to record "<<path<<std::endl;
+            OSG_INFO<<"New path to record "<<path<<std::endl;
             _filePathData->filePathList.push_front(path);
         }
     }
@@ -1308,7 +1308,7 @@ std::string SlideShowConstructor::findFileAndRecordPath(const std::string& filen
 
 void SlideShowConstructor::addModel(const std::string& filename, const PositionData& positionData, const ModelData& modelData)
 {
-    osg::notify(osg::INFO)<<"SlideShowConstructor::addModel("<<filename<<")"<<std::endl;
+    OSG_INFO<<"SlideShowConstructor::addModel("<<filename<<")"<<std::endl;
 
     osg::Node* subgraph = 0;
 
@@ -1337,7 +1337,7 @@ void SlideShowConstructor::addModel(const std::string& filename, const PositionD
         addModel(subgraph, positionData, modelData);
     }
 
-    osg::notify(osg::INFO)<<"end of SlideShowConstructor::addModel("<<filename<<")"<<std::endl<<std::endl;
+    OSG_INFO<<"end of SlideShowConstructor::addModel("<<filename<<")"<<std::endl<<std::endl;
 
 }
 
@@ -1387,7 +1387,7 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos
         transform->setDataVariance(defaultMatrixDataVariance);
         transform->setMatrix(osg::Matrix::inverse(matrix));
         
-        osg::notify(osg::INFO)<<"Position Matrix "<<transform->getMatrix()<<std::endl;
+        OSG_INFO<<"Position Matrix "<<transform->getMatrix()<<std::endl;
 
         transform->addChild(subgraph);
 
@@ -1414,7 +1414,7 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos
 
         animation_transform->addChild(subgraph);
 
-        osg::notify(osg::INFO)<<"Rotation Matrix "<<animation_transform->getMatrix()<<std::endl;
+        OSG_INFO<<"Rotation Matrix "<<animation_transform->getMatrix()<<std::endl;
 
         subgraph = animation_transform;
     }
@@ -1424,7 +1424,7 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos
     osg::AnimationPathCallback* animation = getAnimationPathCallback(positionData);
     if (animation)
     {
-        osg::notify(osg::INFO)<<"Have animation path for model"<<std::endl;
+        OSG_INFO<<"Have animation path for model"<<std::endl;
 
         osg::BoundingSphere::vec_type pivot = positionData.absolute_path ?
             osg::BoundingSphere::vec_type(0.0f,0.0f,0.0f) :
@@ -1433,7 +1433,7 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos
         osg::AnimationPath* path = animation->getAnimationPath();
         if (positionData.animation_name=="wheel" && (path->getTimeControlPointMap()).size()>=2)
         {
-            osg::notify(osg::INFO)<<"****  Need to handle special wheel animation"<<std::endl;
+            OSG_INFO<<"****  Need to handle special wheel animation"<<std::endl;
 
             osg::AnimationPath::TimeControlPointMap& controlPoints = path->getTimeControlPointMap();
             
@@ -1475,7 +1475,7 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos
                 // direction - rotation about the z axis. 
                 rotation_z_axis = atan2f(delta_position.y(),delta_position.x());
 
-                osg::notify(osg::INFO)<<" rotation_y_axis="<<rotation_y_axis<<" rotation_z_axis="<<rotation_z_axis<<std::endl;
+                OSG_INFO<<" rotation_y_axis="<<rotation_y_axis<<" rotation_z_axis="<<rotation_z_axis<<std::endl;
                 
                 quat_y_axis.makeRotate(rotation_y_axis,0.0f,1.0f,0.0f);
                 quat_z_axis.makeRotate(rotation_z_axis,0.0f,0.0f,1.0f);
@@ -1561,7 +1561,7 @@ bool DraggerVolumeTileCallback::receive(const osgManipulator::MotionCommand& com
             // Transform by the localMotionMatrix
             _locator->setTransform(localMotionMatrix * _startMotionMatrix);
 
-            // osg::notify(osg::NOTICE)<<"New locator matrix "<<_locator->getTransform()<<std::endl;
+            // OSG_NOTICE<<"New locator matrix "<<_locator->getTransform()<<std::endl;
 
             return true;
         }
@@ -1863,7 +1863,7 @@ osg::AnimationPathCallback* SlideShowConstructor::getAnimationPathCallback(const
             apc->setTimeMultiplier(positionData.path_time_multiplier);
             apc->setUseInverseMatrix(positionData.inverse_path);
 
-            osg::notify(osg::INFO)<<"UseInverseMatrix "<<positionData.inverse_path<<std::endl;
+            OSG_INFO<<"UseInverseMatrix "<<positionData.inverse_path<<std::endl;
 
             return apc;
 
@@ -1877,12 +1877,12 @@ osg::Vec3 SlideShowConstructor::computePositionInModelCoords(const PositionData&
 {
     if (positionData.frame==SLIDE)
     {
-        osg::notify(osg::INFO)<<"********* Scaling from slide coords to model coords"<<std::endl;
+        OSG_INFO<<"********* Scaling from slide coords to model coords"<<std::endl;
         return convertSlideToModel(positionData.position);
     }
     else
     {
-        osg::notify(osg::INFO)<<"keeping original model coords"<<std::endl;
+        OSG_INFO<<"keeping original model coords"<<std::endl;
         return positionData.position;
     }
 }
@@ -1922,7 +1922,7 @@ void SlideShowConstructor::recordOptionsFilePath(const osgDB::Options* options)
             osgDB::FilePathList::iterator itr = std::find(_filePathData->filePathList.begin(),_filePathData->filePathList.end(),path);
             if (itr==_filePathData->filePathList.end())
             {
-                osg::notify(osg::INFO)<<"SlideShowConstructor::recordOptionsFilePath(..) - new path to record path="<<path<<" filename_used="<<filename_used<<std::endl;
+                OSG_INFO<<"SlideShowConstructor::recordOptionsFilePath(..) - new path to record path="<<path<<" filename_used="<<filename_used<<std::endl;
                 _filePathData->filePathList.push_front(path);
             }
         }