[Opalvoip-svn] SF.net SVN: opalvoip:[34907] opal/branches/v3_16

[<rjo...@us...>]

Revision: 34907
          http://sourceforge.net/p/opalvoip/code/34907
Author:   rjongbloed
Date:     2016-08-03 16:58:08 +0000 (Wed, 03 Aug 2016)
Log Message:
-----------
Fixed some more compilation with various options disabled.

Modified Paths:
--------------
    opal/branches/v3_16/samples/ivr/main.cxx
    opal/branches/v3_16/src/opal/patch.cxx

Modified: opal/branches/v3_16/samples/ivr/main.cxx
===================================================================
--- opal/branches/v3_16/samples/ivr/main.cxx	2016-08-03 09:31:34 UTC (rev 34906)
+++ opal/branches/v3_16/samples/ivr/main.cxx	2016-08-03 16:58:08 UTC (rev 34907)
@@ -50,7 +50,9 @@
   MyIVREndPoint * ivr  = new MyIVREndPoint(*this);
   ivr->SetDefaultVXML(args[0]);
 
+#if OPAL_HAS_PCSS
   FindEndPointAs<OpalLocalEndPoint>(OPAL_PCSS_PREFIX)->SetDeferredAnswer(false);
+#endif
 
   switch (args.GetCount()) {
   default :

Modified: opal/branches/v3_16/src/opal/patch.cxx
===================================================================
--- opal/branches/v3_16/src/opal/patch.cxx	2016-08-03 09:31:34 UTC (rev 34906)
+++ opal/branches/v3_16/src/opal/patch.cxx	2016-08-03 16:58:08 UTC (rev 34907)
@@ -948,7 +948,7 @@
   if (m_primaryCodec != NULL)
     atLeastOne = m_primaryCodec->ExecuteCommand(command) || atLeastOne;
 
-#if OPAL_VIDEO
+#if OPAL_VIDEO && OPAL_STATISTICS
   if (atLeastOne) {
     const OpalVideoUpdatePicture * update = dynamic_cast<const OpalVideoUpdatePicture *>(&command);
     if (update != NULL) {
@@ -1029,18 +1029,20 @@
     }
   }
 
+#if OPAL_STATISTICS
   OpalVideoFormat::VideoFrameType frameType;
   if (m_videoFormat.IsValid())
     frameType = m_videoFormat.GetVideoFrameType(sourceFrame.GetPayloadPtr(), sourceFrame.GetPayloadSize(), m_keyFrameDetectContext);
   else
     frameType = OpalVideoFormat::e_UnknownFrameType;
+#endif // OPAL_STATISTICS
 #endif // OPAL_VIDEO
 
   if (bypassing || m_primaryCodec == NULL) {
     if (!m_stream->WritePacket(sourceFrame))
       return false;
 
-#if OPAL_VIDEO
+#if OPAL_VIDEO && OPAL_STATISTICS
     RTP_SyncSourceId ssrc;
     switch (frameType) {
     case OpalVideoFormat::e_IntraFrame :
@@ -1069,7 +1071,7 @@
       default :
         break;
     }
-#endif // OPAL_VIDEO
+#endif // OPAL_VIDEO && OPAL_STATISTICS
 
     PTRACE_IF(6, bypassing, "Bypassed packet " << setw(1) << sourceFrame);
     return true;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.