[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] engine/session clientsession.cpp,1.46,1.47
From:       jgordon () helixcommunity ! org
Date:       2007-08-31 19:20:41
Message-ID: 200708311920.l7VJKlHo000039 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/engine/session
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv22492

Modified Files:
	clientsession.cpp 
Log Message:
Synopsis
========
Fixes a build buster in the DNA server build.

Branches: SERVER_BORABORA, HEAD (SERVER_CURRENT)
Reviewer: dcollins


Description
===========
I forgot to fix up FCS ifdefs on a checkin yesterday.


Files Affected
==============
server/engine/session/clientsession.cpp
server/engine/session/pub/clientsession.h


Testing Performed
=================
Unit Tests:
None

Integration Tests:
None

Leak Tests:
None

Performance Tests:
None

Platforms Tested:
Build verified: linux-rhel4-i686


Index: clientsession.cpp
===================================================================
RCS file: /cvsroot/server/engine/session/clientsession.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- clientsession.cpp	31 Aug 2007 03:57:21 -0000	1.46
+++ clientsession.cpp	31 Aug 2007 19:20:35 -0000	1.47
@@ -5333,10 +5333,12 @@
     HX_ASSERT(m_pClipStats);
     HX_ASSERT(m_pStats3);
 
+#ifdef HELIX_FEATURE_SERVER_FCS
     if (m_pPPMShim)
     {
         m_ulEndTime = m_pPPMShim->GetClipEndTime();
     }
+#endif /* HELIX_FEATURE_SERVER_FCS */
 
     // Set final clip stats
     UINT32 ulSessionPlayTime = m_pStats3->GetPlayTime();
@@ -5372,6 +5374,7 @@
 
     // Set these values now if we are switching.
     // If this is the first clip, they will be set later.
+#ifdef HELIX_FEATURE_SERVER_FCS
     if (m_pCurrentSwitch)
     {
         m_pClipStats->SetURL(m_pCurrentSwitch->m_pURL);
@@ -5381,6 +5384,7 @@
             m_pClipStats->SetDuration(ulFileDur);
         }
     }
+#endif /* HELIX_FEATURE_SERVER_FCS */
 
     m_pStats3->SetClip(m_pClipStats);
 }


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]