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

List:       helix-server-cvs
Subject:    [Server-cvs] engine/core server_context.cpp,1.34.4.4,1.34.4.5
From:       ryuan () helixcommunity ! org
Date:       2013-12-18 3:43:48
[Download RAW message or body]

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

Modified Files:
      Tag: SERVER_15_1_0
	server_context.cpp 
Log Message:
Synopsis:
=========
Beesmart archive update

Branches: SERVER_15_1_0, head
Suggested Reviewers: Anyone

Description:
============
Beesmart archive update

Files affected
==============
server_rn/datatype/mpeg2ts/streamhandler.cpp
server_rn/datatype/mpeg2ts/pub/streamhandler.h
datatype_rn/mpeg2/ts/filewriter/ctsarchiver.cpp
server_rn/appext/hlsrec/hlsrecfsys.cpp

Test perform
==============
Only win platform.

Integration Tests:
None

Leak Tests: None
Performance Tests: N/A

Platforms Tested: win-x86_64-vc10.
Builds Verified: win-x86_64-vc10.

QA Hints
========
None.



Index: server_context.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/server_context.cpp,v
retrieving revision 1.34.4.4
retrieving revision 1.34.4.5
diff -u -d -r1.34.4.4 -r1.34.4.5
--- server_context.cpp	11 Dec 2013 07:44:32 -0000	1.34.4.4
+++ server_context.cpp	18 Dec 2013 03:43:43 -0000	1.34.4.5
@@ -200,15 +200,15 @@
     }
 #endif
 #ifdef HELIX_FEATURE_SERVER_BEESMART
-    else if (IsEqualIID(riid, IID_IHXBSProviderStatus))
+    else if (IsEqualIID(riid, IID_IHXBSProviderStatus) && m_proc->pc->cid_manage_ctrl)
     {
         return m_proc->pc->cid_manage_ctrl->QueryInterface(riid, ppvObj);
     }
-    else if (IsEqualIID(riid, IID_IHXRecordingIDManager))
+    else if (IsEqualIID(riid, IID_IHXRecordingIDManager) && m_proc->pc->cid_manage_ctrl)
     {
         return m_proc->pc->cid_manage_ctrl->QueryInterface(riid, ppvObj);
     }
-    else if (IsEqualIID(riid, IID_IHXBSProviderContent))
+    else if (IsEqualIID(riid, IID_IHXBSProviderContent) && m_proc->pc->cid_manage_ctrl)
     {
         return m_proc->pc->cid_manage_ctrl->QueryInterface(riid, ppvObj);
     }
@@ -225,7 +225,7 @@
         }
     }
 #endif
-    else if (IsEqualIID(riid, IID_IHXContentIDManager))
+    else if (IsEqualIID(riid, IID_IHXContentIDManager) && m_proc->pc->cid_manage_ctrl)
     {
         return m_proc->pc->cid_manage_ctrl->QueryInterface(riid, ppvObj);
     }


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