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

List:       helix-server-cvs
Subject:    [Server-cvs] fs/sdpgenfsys sdpgenfobj.cpp,1.12,1.13
From:       svaidhya () helixcommunity ! org
Date:       2008-09-30 0:19:40
Message-ID: 200809300025.m8U0PASa010485 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/fs/sdpgenfsys
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv29835

Modified Files:
	sdpgenfobj.cpp 
Log Message:
Synopsis
========
- Fix for 'Helix DNA Server' and 'Helix DNA Server Plus' builds

Branches:  SERVER_CURRENT, SERVER_12_1
Reviewer(s): JJ

Description
===========
Builds failed because the "ifdef HELIX_SERVER_FEATURE_SSPL" flag ws not
present around SSPL_specific code.
Rectified it.

Files Affected
==============

Changed Files
~~~~~~~~~~~~~
/server/fs/sdpgenfsys/Umakefil
/server/fs/sdpgenfsys/sdpgenfsys.h
/server/fs/sdpgenfsys/sdpgenfsys.cpp


Testing Performed
=================

Unit Tests:
None.

Integration Tests:
- 'Helix DNA Server' and 'Helix DNA Server Plus' builds w/o errors

Leak Tests:
None.

Performance Tests:
None.

Platforms Tested: : linux-rhel4-i686
Build verified: linux-rhel4-i686 


Index: sdpgenfobj.cpp
===================================================================
RCS file: /cvsroot/server/fs/sdpgenfsys/sdpgenfobj.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sdpgenfobj.cpp	25 Sep 2008 00:32:09 -0000	1.12
+++ sdpgenfobj.cpp	30 Sep 2008 00:19:37 -0000	1.13
@@ -82,8 +82,10 @@
 #include "fcsutil.h"
 #endif /* HELIX_FEATURE_SERVER_FCS */
 
+#ifdef HELIX_FEATURE_SERVER_SSPL
 #include "playlist_handler.h"
 #include "ssplutil.h"
+#endif //HELIX_FEATURE_SERVER_SSPL
 
 #if defined _WINDOWS && !defined snprintf
 #define snprintf _snprintf
@@ -479,6 +481,7 @@
     m_pFileExistsResponse = pFileResponse;
     m_pFileExistsResponse->AddRef();
 
+#ifdef HELIX_FEATURE_SERVER_SSPL
     /**
      * Check if its a .hpl file
      * If it is, then extract the first element of the playlist
@@ -491,12 +494,12 @@
         HX_ADDREF(m_pPlaylistHandler);
         m_pPlaylistHandler->Init(pPath);
         //Continues in CPlaylistHandler::InitDone
+        return rc;
     }
-    else  //It is a Regular File
-    {
-        rc = DoDoesExist(pPath);
-    }
-
+#endif
+    
+    //It is a Regular File
+    rc = DoDoesExist(pPath);
     return rc;
 }
 
@@ -508,11 +511,13 @@
     // Clear any old SDP buffers we may have
     HX_RELEASE(m_pSDPBuffer);
 
+#ifdef HELIX_FEATURE_SERVER_SSPL
     //We dont need the playlist handler anymore, so Release all its members
     //by calling ::Done() now because it adds a reference to SDPGenFileObject.
     if(m_pPlaylistHandler)
         m_pPlaylistHandler->Done();
-
+#endif //HELIX_FEATURE_SERVER_SSPL
+    
     // Initialize the file format plugin
     // Use IHXSourceFinderObject to figure out which file format plugin to use
     rc = m_pCCF->CreateInstance(CLSID_IHXSourceFinderObject,
@@ -667,8 +672,10 @@
   , m_ulFileATime(0)
   , m_ulFileMTime(0)
   , m_ulFileMode(0)
+#ifdef HELIX_FEATURE_SERVER_SSPL
   , m_bIsPlaylistFile(FALSE)
   , m_pPlaylistHandler(NULL)
+#endif  //HELIX_FEATURE_SERVER_SSPL
 {
 
     HX_ASSERT (m_pContext);
@@ -705,7 +712,9 @@
     HX_RELEASE(m_pServerAddrBuff);
     HX_RELEASE(m_pRegistry);
     HX_RELEASE(m_pSessionStats);
+#ifdef HELIX_FEATURE_SERVER_SSPL
     HX_RELEASE(m_pPlaylistHandler);
+#endif HELIX_FEATURE_SERVER_SSPL
 }
 
 HX_RESULT
@@ -726,8 +735,10 @@
     
     if (rc != HXR_OK)
     {
+#ifdef HELIX_FEATURE_SERVER_SSPL
         if(m_pPlaylistHandler)
             m_pPlaylistHandler->Done();
+#endif
         SendDoesExistResponse(bSDPReady);
         return rc;
     }
@@ -750,6 +761,7 @@
         // Always generate a spec compliant SDP file
         ppSDPHeaders[0]->SetPropertyULONG32("SdpFileType", INTEROP_SDP);
 
+#ifdef HELIX_FEATURE_SERVER_SSPL
         /**
          * If it it is a .hpl file (Playlist), the duration is the
          * "duration" of the whole playlist. So set it here.
@@ -782,6 +794,7 @@
             else //It is Live PL
                 ppSDPHeaders[1]->SetPropertyULONG32("OpenDuration", 1);
         }
+#endif //HELIX_FEATURE_SERVER_SSPL
 
         // Set file modification time
         if (!m_ulFileMTime && m_pScheduler)


_______________________________________________
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]