Changeset 11529 for OpenSceneGraph/trunk/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp

Timestamp:

05/28/10 19:05:46 (3 years ago)

Author:

robert

Message:

Converted osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp (modified) (24 diffs)

OpenSceneGraph/trunk/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp

@@ -60 +60 @@
 void QuicktimeLiveImageStream::play()
 {
-   osg::notify(osg::DEBUG_INFO)<<"Sending play"<<this<<std::endl;
+   OSG_DEBUG<<"Sending play"<<this<<std::endl;
   /* if (g_s_use_sg)
    {
@@ -66 +66 @@
        result = SGStartPreview(m_gSeqGrabber);
        if (result != noErr)
-           osg::notify(osg::FATAL) << "SGStartPreview : error" << std::endl;
+           OSG_FATAL << "SGStartPreview : error" << std::endl;
    }*/
 }
@@ -72 +72 @@
 void QuicktimeLiveImageStream::pause()
 {
-   osg::notify(osg::DEBUG_INFO)<<"Sending pause"<<this<<std::endl;
+   OSG_DEBUG<<"Sending pause"<<this<<std::endl;
 }
 /// stop playing 
 void QuicktimeLiveImageStream::quit(bool wiatForThreadToExit)
 {
-   osg::notify(osg::DEBUG_INFO)<<"Sending quit"<<this<<std::endl;
+   OSG_DEBUG<<"Sending quit"<<this<<std::endl;
 }
 
@@ -93 +93 @@
 void QuicktimeLiveImageStream::load(std::string fileName)
 {
-   osg::notify(osg::DEBUG_INFO)<<"QuicktimeLive Loading..."<<this<<std::endl;
+   OSG_DEBUG<<"QuicktimeLive Loading..."<<this<<std::endl;
    // CreateAndRunWithSequenceGrabber
    if (g_s_use_sg)
@@ -134 +134 @@
     if (err !=0 )
     {
-        osg::notify(osg::DEBUG_INFO) << "Could not create gWorld" << std::endl;
+        OSG_DEBUG << "Could not create gWorld" << std::endl;
     }
     else
@@ -146 +146 @@
              if (!LockPixels (m_pixmap)) // lock offscreen pixel map
              {
-                 osg::notify(osg::FATAL) << "Could not lock PixMap" << std::endl;
+                 OSG_FATAL << "Could not lock PixMap" << std::endl;
              }
          }
@@ -161 +161 @@
    if (idx == std::string::npos)
    {
-       osg::notify(osg::FATAL) << "Error while parsing deviceID:deviceInputID.live path : " << fileName << std::endl;        
+       OSG_FATAL << "Error while parsing deviceID:deviceInputID.live path : " << fileName << std::endl;        
    }
    // Better c++ code is to use istrstream
@@ -195 +195 @@
    result = SGPrepare( m_gSeqGrabber, TRUE, FALSE);
    if (result != noErr)
-       osg::notify(osg::FATAL) << "SGPrepare : error" << std::endl;
+   {
+       OSG_FATAL << "SGPrepare : error" << std::endl;
+   }
+
    if (g_s_use_sg_record)
    {
        result = SGStartRecord(m_gSeqGrabber);
        if (result != noErr)
-           osg::notify(osg::FATAL) << "SGStartRecord : error" << std::endl;
+       {
+           OSG_FATAL << "SGStartRecord : error" << std::endl;
+       }
    }
    else
@@ -206 +211 @@
        result = SGStartPreview(m_gSeqGrabber);
        if (result != noErr)
-           osg::notify(osg::FATAL) << "SGStartPreview : error" << std::endl;
+       {
+           OSG_FATAL << "SGStartPreview : error" << std::endl;
+       }
    }
  
@@ -252 +259 @@
                     if (result != noErr)
                     {
-                        osg::notify(osg::FATAL) << "Could not set GWorld on SG" << std::endl;
+                        OSG_FATAL << "Could not set GWorld on SG" << std::endl;
                     }
                 }
@@ -287 +294 @@
         //  result = SGSetUseScreenBuffer(m_gVideoChannel, FALSE);
         // Set
-        osg::notify(osg::DEBUG_INFO) << "Setting up vdig from input prefs" << std::endl;
+        OSG_DEBUG << "Setting up vdig from input prefs" << std::endl;
         result = SGSetChannelDevice     ( m_gVideoChannel, m_videoDeviceIDStr);
         result = SGSetChannelDeviceInput( m_gVideoChannel, m_videoDeviceInputID);
@@ -296 +303 @@
         VideoDigitizerError vid_err;
         vid_err = VDSetInputStandard (vdig, palIn);
-        osg::notify(osg::DEBUG_INFO) << "Setup vdig from input prefs:" << std::endl;
+        OSG_DEBUG << "Setup vdig from input prefs:" << std::endl;
         print_video_component_capability(vdig);
 
@@ -318 +325 @@
         vid_err = VDGetSoundInputDriver(vdig, sound_driver_name);
         sound_driver_name_cstr = pstr_printable(sound_driver_name);
-        osg::notify(osg::DEBUG_INFO) << "vdig sound driver name :" << sound_driver_name_cstr << std::endl;
-        osg::notify(osg::DEBUG_INFO) << "vdig sound driver id   :" << sound_id << std::endl;
+        OSG_DEBUG << "vdig sound driver name :" << sound_driver_name_cstr << std::endl;
+        OSG_DEBUG << "vdig sound driver id   :" << sound_id << std::endl;
         */
     }
     else
     {
-        osg::notify(osg::FATAL) << "Could not create SGNewChannel for Video Channel" << std::endl;
+        OSG_FATAL << "Could not create SGNewChannel for Video Channel" << std::endl;
     }
     // Set GWorld back
@@ -341 +348 @@
     OSErr err = noErr;
     //
-    osg::notify(osg::INFO) << " Video " << refCon << std::endl;
+    OSG_INFO << " Video " << refCon << std::endl;
     dirty();
     //
@@ -353 +360 @@
     err = SGSetDataRef(m_gSeqGrabber, 0, 0, seqGrabToMemory | seqGrabDontMakeMovie);
     if (err != noErr)
-       osg::notify(osg::FATAL) << "SGSetDataRef : error" << std::endl;
+    {
+       OSG_FATAL << "SGSetDataRef : error" << std::endl;
+    }
+
     // specify a sequence grabber data function
     err = SGSetDataProc(m_gSeqGrabber, NewSGDataUPP(MySGDataProc), (long)this);
     if (err != noErr)
-       osg::notify(osg::FATAL) << "SGSetDataProc : error" << std::endl;
+    {
+       OSG_FATAL << "SGSetDataProc : error" << std::endl;
+    }
 }
 
@@ -392 +404 @@
 
         // Set
-        // osg::notify(osg::DEBUG_INFO) << "Setting up audio component from input prefs" << std::endl;
+        // OSG_DEBUG << "Setting up audio component from input prefs" << std::endl;
         result = SGSetChannelDevice     ( m_gSoundChannel, m_soundDeviceIDStr);
         result = SGSetChannelDeviceInput( m_gSoundChannel, m_soundDeviceInputID);
@@ -405 +417 @@
     else
     {
-        osg::notify(osg::FATAL) << "Could not create SGNewChannel for Sound Channel" << std::endl;
+        OSG_FATAL << "Could not create SGNewChannel for Sound Channel" << std::endl;
     }
     // Set GWorld back
@@ -443 +455 @@
             double dur = osg::Timer::instance()->delta_s(start, finish);
             double fps = 100.0 / dur;
-            osg::notify(osg::NOTICE) << "Executed 100 frames in " << dur << " seconds : ~" << fps << " fps" << std::endl;
+            OSG_NOTICE << "Executed 100 frames in " << dur << " seconds : ~" << fps << " fps" << std::endl;
             fps_counter = 0;
         }
@@ -481 +493 @@
    if (idx == std::string::npos)
    {
-       osg::notify(osg::FATAL) << "Error while parsing deviceID:deviceInputID.live path : " << fileName << std::endl;        
+       OSG_FATAL << "Error while parsing deviceID:deviceInputID.live path : " << fileName << std::endl;        
    }
    // Better c++ code is to use istrstream
@@ -501 +513 @@
    VideoDigitizerError error = VDSetPlayThruOnOff(m_vdig, vdPlayThruOn);
    if (error != noErr)
-       osg::notify(osg::FATAL) << "VDSetPlayThruOnOff : error" << std::endl;
+   {
+       OSG_FATAL << "VDSetPlayThruOnOff : error" << std::endl;
+   }
    // Ticker
    start();
@@ -518 +532 @@
     video_component_description.componentFlagsMask    = 0;      /* Mask for specifying which flags to consider in search, zero during registration */
     long num_video_components = CountComponents (&video_component_description);
-    osg::notify(osg::DEBUG_INFO) << " available Video DigitizerComponents : " << num_video_components << std::endl;
+    OSG_DEBUG << " available Video DigitizerComponents : " << num_video_components << std::endl;
     if (num_video_components)
     {
@@ -529 +543 @@
             if (aComponent && (aDeviceID == m_videoDeviceID))
             {
-                osg::notify(osg::DEBUG_INFO) << "Component" << std::endl;
+                OSG_DEBUG << "Component" << std::endl;
                 OSErr                err;
                 Handle compName = NewHandle(256);
                 Handle compInfo = NewHandle(256);
                 err = GetComponentInfo( aComponent, &full_video_component_description, compName,compInfo,0);
-                osg::notify(osg::DEBUG_INFO) << "    Name: " << pstr_printable((StringPtr)*compName) << std::endl;
-                osg::notify(osg::DEBUG_INFO) << "    Desc: " << pstr_printable((StringPtr)*compInfo) << std::endl;
+                OSG_DEBUG << "    Name: " << pstr_printable((StringPtr)*compName) << std::endl;
+                OSG_DEBUG << "    Desc: " << pstr_printable((StringPtr)*compInfo) << std::endl;
                 //Capabilities
                 VideoDigitizerComponent component_instance = OpenComponent(aComponent);
@@ -554 +568 @@
                 //error = VDSetPlayThruGlobalRect(m_vdig, (GrafPtr)origPort, &destinationBounds);
                 if (error != noErr)
-                    osg::notify(osg::FATAL) << "VDSetPlayThruDestination : error" << std::endl;
+                {
+                    OSG_FATAL << "VDSetPlayThruDestination : error" << std::endl;
+                }
                 print_video_component_capability(component_instance);
                 break;
@@ -583 +599 @@
            result = SGIdle(m_gSeqGrabber);
            if (result != noErr)
-               osg::notify(osg::FATAL) << "SGIdle : error" << std::endl;
+           {
+               OSG_FATAL << "SGIdle : error" << std::endl;
+           }
        }
        //OpenThreads::Thread::microSleep(250000); // 25fps (1,000,000 = 1 fps)