Z991239-5916 #comment 清理已下线接口

Module/mod_mediacontroller/ExternalCameraMsg.h

@@ -1,15 +0,0 @@
-#ifndef _HEXTERNALCAMERAMSG_H_
-#define _HEXTERNALCAMERAMSG_H_
-#pragma once
-
-#define SwitchFailed_StartFault						"外接摄像头启动故障，将切换到内置摄像头"
-#define SwitchFailed_Ambiguous						"请拔出外接摄像头后重新插入"
-#define SwitchFailed_NoUnique						"请拔出所有外接摄像头后插入唯一外接摄像头"
-#define SwitchFailed_StartInnerFrontCameraFault		"启动内置前摄像头故障，尝试恢复中（预计10s内），请稍等"
-#define SwitchFailed_StartInnerRearCameraFault		"启动内置后摄像头故障，尝试恢复中（预计10s内），请稍等"
-#define SwitchFailed_StartInnerBothCameraFault		"启动内置前、后摄像头故障，尝试恢复中（预计10s内），请稍等"
-#define SwitchFailed_StartInnerAudioInFault			"启动内置麦克风故障，尝试恢复中（预计10s内），请稍等"
-#define SwitchFailed_StartInnerAudioOutFault		"启动内置扬声器故障，尝试恢复中（预计10s内），请稍等"
-#define SwitchFailed_StartInnerMediaOtherFault		"启动内置媒体设备出现其他故障，尝试恢复中（预计10s内），请稍等"
-
-#endif

Module/mod_mediacontroller/MediaController_client_g.h

@@ -58,223 +58,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum GetVideoDeviceName(MediaService_GetVideoDeviceName_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(MediaService_Method_GetVideoDeviceName, MediaService_MethodSignature_GetVideoDeviceName, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum GetVideoDeviceName(MediaService_GetVideoDeviceName_Req &Req, MediaService_GetVideoDeviceName_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetVideoDeviceName(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum GetVideoDeviceName(MediaService_GetVideoDeviceName_Req &Req, MediaService_GetVideoDeviceName_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetVideoDeviceName(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum GetVideoDeviceName(MediaService_GetVideoDeviceName_Req &Req, MediaService_GetVideoDeviceName_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetVideoDeviceName(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum StartCamera()
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->OnewayCall(MediaService_Method_StartCamera, MediaService_MethodSignature_StartCamera, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum StopCamera()
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->OnewayCall(MediaService_Method_StopCamera, MediaService_MethodSignature_StopCamera, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum StartEnvCamera(MediaService_StartEnvCamera_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(MediaService_Method_StartEnvCamera, MediaService_MethodSignature_StartEnvCamera, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum StartEnvCamera(MediaService_StartEnvCamera_Req &Req, MediaService_StartEnvCamera_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = StartEnvCamera(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum StartEnvCamera(MediaService_StartEnvCamera_Req &Req, MediaService_StartEnvCamera_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = StartEnvCamera(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum StartEnvCamera(MediaService_StartEnvCamera_Req &Req, MediaService_StartEnvCamera_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = StartEnvCamera(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum StopEnvCamera()
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->OnewayCall(MediaService_Method_StopEnvCamera, MediaService_MethodSignature_StopEnvCamera, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum StartSpeakerRender()
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->OnewayCall(MediaService_Method_StartSpeakerRender, MediaService_MethodSignature_StartSpeakerRender, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum StopSpeakerRender()
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->OnewayCall(MediaService_Method_StopSpeakerRender, MediaService_MethodSignature_StopSpeakerRender, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum ManipulateMediaDevice(MediaService_ManipulateMediaDevice_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(MediaService_Method_ManipulateMediaDevice, MediaService_MethodSignature_ManipulateMediaDevice, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum ManipulateMediaDevice(MediaService_ManipulateMediaDevice_Req &Req, MediaService_ManipulateMediaDevice_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ManipulateMediaDevice(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum ManipulateMediaDevice(MediaService_ManipulateMediaDevice_Req &Req, MediaService_ManipulateMediaDevice_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ManipulateMediaDevice(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum ManipulateMediaDevice(MediaService_ManipulateMediaDevice_Req &Req, MediaService_ManipulateMediaDevice_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ManipulateMediaDevice(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 	ErrorCodeEnum GetAudioDevices(MediaService_GetAudioDevices_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();

Module/mod_mediacontroller/MediaController_def_g.h

@@ -11,15 +11,6 @@ namespace MediaController {
 //
 // const goes here
 //
-
-#define MediaService_Method_GetVideoDeviceName 0
-#define MediaService_Method_StartCamera 1
-#define MediaService_Method_StopCamera 2
-#define MediaService_Method_StartEnvCamera 3
-#define MediaService_Method_StopEnvCamera 4
-#define MediaService_Method_StartSpeakerRender 5
-#define MediaService_Method_StopSpeakerRender 6
-#define MediaService_Method_ManipulateMediaDevice 7
 #define MediaService_Method_GetAudioDevices 8
 #define MediaService_Method_GetVideoDevices 9
 #define MediaService_Method_GetCameraInfos 10
@@ -31,14 +22,6 @@ namespace MediaController {
 #define MediaService_Method_TurnOffCamera 16
 #define MediaService_Method_IsCameraOnStatus 17
 
-#define MediaService_MethodSignature_GetVideoDeviceName -496217232
-#define MediaService_MethodSignature_StartCamera 749460891
-#define MediaService_MethodSignature_StopCamera -1102036124
-#define MediaService_MethodSignature_StartEnvCamera -628264124
-#define MediaService_MethodSignature_StopEnvCamera -1214187442
-#define MediaService_MethodSignature_StartSpeakerRender -803727657
-#define MediaService_MethodSignature_StopSpeakerRender -1325509398
-#define MediaService_MethodSignature_ManipulateMediaDevice -461255211
 #define MediaService_MethodSignature_GetAudioDevices -819377328
 #define MediaService_MethodSignature_GetVideoDevices 616397805
 #define MediaService_MethodSignature_GetCameraInfos -2116637958
@@ -50,14 +33,7 @@ namespace MediaController {
 #define MediaService_MethodSignature_TurnOffCamera -1380301309
 #define MediaService_MethodSignature_IsCameraOnStatus -491616205
 
-#define MediaService_LogCode_GetVideoDeviceName "QLR040220800"
-#define MediaService_LogCode_StartCamera "QLR040220801"
-#define MediaService_LogCode_StopCamera "QLR040220802"
-#define MediaService_LogCode_StartEnvCamera "QLR040220803"
-#define MediaService_LogCode_StopEnvCamera "QLR040220804"
-#define MediaService_LogCode_StartSpeakerRender "QLR040220805"
-#define MediaService_LogCode_StopSpeakerRender "QLR040220806"
-#define MediaService_LogCode_ManipulateMediaDevice "QLR040220807"
+
 #define MediaService_LogCode_GetAudioDevices "QLR040220808"
 #define MediaService_LogCode_GetVideoDevices "QLR040220809"
 #define MediaService_LogCode_GetCameraInfos "QLR040220810"
@@ -69,119 +45,6 @@ namespace MediaController {
 #define MediaService_LogCode_TurnOffCamera "QLR040220816"
 #define MediaService_LogCode_IsCameraOnStatus "QLR040220817"
 
-struct MediaService_GetVideoDeviceName_Req
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct MediaService_GetVideoDeviceName_Ans
-{
-	CSimpleStringA frontcam;
-	CSimpleStringA rearcam;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & frontcam & rearcam;
-	}
-
-};
-
-struct MediaService_StartCamera_Info
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct MediaService_StopCamera_Info
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct MediaService_StartEnvCamera_Req
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct MediaService_StartEnvCamera_Ans
-{
-	int returncod;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & returncod;
-	}
-
-};
-
-struct MediaService_StopEnvCamera_Info
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct MediaService_StartSpeakerRender_Info
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct MediaService_StopSpeakerRender_Info
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct MediaService_ManipulateMediaDevice_Req
-{
-	int cmdType;
-	int devType;
-	int reserved1;
-	CSimpleStringA reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & cmdType & devType & reserved1 & reserved2;
-	}
-
-};
-
-struct MediaService_ManipulateMediaDevice_Ans
-{
-	int retCode;
-	int reserved1;
-	CSimpleStringA reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & retCode & reserved1 & reserved2;
-	}
-
-};
-
 struct MediaService_GetAudioDevices_Req
 {
 	int audioType;

Module/mod_mediacontroller/MediaController_msg_g.h

@@ -9,71 +9,10 @@
 #include "SpHelper.h"
 
 namespace MediaController {
-#define eMsg_ExternalCameraSwitchFailed 0
-#define eMsg_ExternalCameraInserted 1
-#define eMsg_ExternalCameraRemoved 2
-#define eMsg_ExternalCameraStateChanged 3
 #define eMsg_EnvCameraCapInfo 4
 
-#define eMsgSig_ExternalCameraSwitchFailed 637170259
-#define eMsgSig_ExternalCameraInserted 1355033794
-#define eMsgSig_ExternalCameraRemoved -2086712549
-#define eMsgSig_ExternalCameraStateChanged -181183885
 #define eMsgSig_EnvCameraCapInfo -1158933893
 
-struct ExternalCameraSwitchFailed
-{
-	CSimpleStringW failedmsg;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & failedmsg;
-	}
-
-};
-
-///////////////////////////
-
-struct ExternalCameraInserted
-{
-	CSimpleStringW camname;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & camname;
-	}
-
-};
-
-///////////////////////////
-
-struct ExternalCameraRemoved
-{
-	CSimpleStringW camname;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & camname;
-	}
-
-};
-
-///////////////////////////
-
-struct ExternalCameraStateChanged
-{
-	CSimpleStringW statemsg;
-	CSimpleStringW camname;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & statemsg & camname;
-	}
-
-};
-
-///////////////////////////
-
 struct EnvCameraCapInfo
 {
 	CSimpleStringW cameracapmsg;

Module/mod_mediacontroller/MediaController_server_g.h

@@ -30,62 +30,6 @@ public:
 	{
 		ErrorCodeEnum Error = Error_Succeed;
 		switch (dwMessageID) {
-		case MediaService_Method_GetVideoDeviceName:
-			if (dwSignature == MediaService_MethodSignature_GetVideoDeviceName) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StartCamera:
-			if (dwSignature == MediaService_MethodSignature_StartCamera) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StopCamera:
-			if (dwSignature == MediaService_MethodSignature_StopCamera) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StartEnvCamera:
-			if (dwSignature == MediaService_MethodSignature_StartEnvCamera) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StopEnvCamera:
-			if (dwSignature == MediaService_MethodSignature_StopEnvCamera) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StartSpeakerRender:
-			if (dwSignature == MediaService_MethodSignature_StartSpeakerRender) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StopSpeakerRender:
-			if (dwSignature == MediaService_MethodSignature_StopSpeakerRender) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_ManipulateMediaDevice:
-			if (dwSignature == MediaService_MethodSignature_ManipulateMediaDevice) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case MediaService_Method_GetAudioDevices:
 			if (dwSignature == MediaService_MethodSignature_GetAudioDevices) {
 				bOverlap = true;
@@ -167,46 +111,6 @@ public:
 	{
 		ErrorCodeEnum Error = Error_Succeed;
 		switch (dwMessageID) {
-		case MediaService_Method_GetVideoDeviceName:
-			if (dwSignature != MediaService_MethodSignature_GetVideoDeviceName) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StartCamera:
-			if (dwSignature != MediaService_MethodSignature_StartCamera) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StopCamera:
-			if (dwSignature != MediaService_MethodSignature_StopCamera) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StartEnvCamera:
-			if (dwSignature != MediaService_MethodSignature_StartEnvCamera) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StopEnvCamera:
-			if (dwSignature != MediaService_MethodSignature_StopEnvCamera) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StartSpeakerRender:
-			if (dwSignature != MediaService_MethodSignature_StartSpeakerRender) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_StopSpeakerRender:
-			if (dwSignature != MediaService_MethodSignature_StopSpeakerRender) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case MediaService_Method_ManipulateMediaDevice:
-			if (dwSignature != MediaService_MethodSignature_ManipulateMediaDevice) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case MediaService_Method_GetAudioDevices:
 			if (dwSignature != MediaService_MethodSignature_GetAudioDevices) {
 				Error = Error_MethodSignatureFailed;
@@ -264,46 +168,6 @@ public:
 		return Error;
 	}
 
-	virtual void Handle_GetVideoDeviceName(SpReqAnsContext<MediaService_GetVideoDeviceName_Req, MediaService_GetVideoDeviceName_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_StartCamera(SpOnewayCallContext<MediaService_StartCamera_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_StopCamera(SpOnewayCallContext<MediaService_StopCamera_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_StartEnvCamera(SpReqAnsContext<MediaService_StartEnvCamera_Req, MediaService_StartEnvCamera_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_StopEnvCamera(SpOnewayCallContext<MediaService_StopEnvCamera_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_StartSpeakerRender(SpOnewayCallContext<MediaService_StartSpeakerRender_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_StopSpeakerRender(SpOnewayCallContext<MediaService_StopSpeakerRender_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_ManipulateMediaDevice(SpReqAnsContext<MediaService_ManipulateMediaDevice_Req, MediaService_ManipulateMediaDevice_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_GetAudioDevices(SpReqAnsContext<MediaService_GetAudioDevices_Req, MediaService_GetAudioDevices_Ans>::Pointer ctx)
 	{
 	/// override by user
@@ -370,86 +234,6 @@ public:
 			}
 #endif
 			switch (dwMessageID) {
-				case MediaService_Method_GetVideoDeviceName:
-					{
-						SpReqAnsContext<MediaService_GetVideoDeviceName_Req,MediaService_GetVideoDeviceName_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<MediaService_GetVideoDeviceName_Req,MediaService_GetVideoDeviceName_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_GetVideoDeviceName(ctx);
-					}
-					break;
-				case MediaService_Method_StartCamera:
-					{
-						SpOnewayCallContext<MediaService_StartCamera_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<MediaService_StartCamera_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_StartCamera(ctx);
-					}
-					break;
-				case MediaService_Method_StopCamera:
-					{
-						SpOnewayCallContext<MediaService_StopCamera_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<MediaService_StopCamera_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_StopCamera(ctx);
-					}
-					break;
-				case MediaService_Method_StartEnvCamera:
-					{
-						SpReqAnsContext<MediaService_StartEnvCamera_Req,MediaService_StartEnvCamera_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<MediaService_StartEnvCamera_Req,MediaService_StartEnvCamera_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_StartEnvCamera(ctx);
-					}
-					break;
-				case MediaService_Method_StopEnvCamera:
-					{
-						SpOnewayCallContext<MediaService_StopEnvCamera_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<MediaService_StopEnvCamera_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_StopEnvCamera(ctx);
-					}
-					break;
-				case MediaService_Method_StartSpeakerRender:
-					{
-						SpOnewayCallContext<MediaService_StartSpeakerRender_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<MediaService_StartSpeakerRender_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_StartSpeakerRender(ctx);
-					}
-					break;
-				case MediaService_Method_StopSpeakerRender:
-					{
-						SpOnewayCallContext<MediaService_StopSpeakerRender_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<MediaService_StopSpeakerRender_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_StopSpeakerRender(ctx);
-					}
-					break;
-				case MediaService_Method_ManipulateMediaDevice:
-					{
-						SpReqAnsContext<MediaService_ManipulateMediaDevice_Req,MediaService_ManipulateMediaDevice_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<MediaService_ManipulateMediaDevice_Req,MediaService_ManipulateMediaDevice_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_ManipulateMediaDevice(ctx);
-					}
-					break;
 				case MediaService_Method_GetAudioDevices:
 					{
 						SpReqAnsContext<MediaService_GetAudioDevices_Req,MediaService_GetAudioDevices_Ans>::Pointer ctx;

Module/mod_mediacontroller/MediaService.xml

@@ -1,86 +1,48 @@
 <?xml version="1.0" encoding="gb2312" ?>
 <entity name="MediaController">
 	<class name="MediaService" overlap="true" exclusive="false">
-		<twoway name="GetVideoDeviceName" overlap="true">
-			<res>
-				<param name="frontcam" type="string"/>
-				<param name="rearcam" type="string"/>
-			</res>
-		</twoway>
-		<oneway name="StartCamera" overlap="true">
-		</oneway>
-		<oneway name="StopCamera" overlap="true">
-		</oneway>
-		<twoway name="StartEnvCamera" overlap="true">
-			<res>
-				<param name="returncod" type="int"/>
-			</res>
-		</twoway>
-		<oneway name="StopEnvCamera" overlap="true">
-		</oneway>
-		<oneway name="StartSpeakerRender" overlap="true">
-		</oneway>
-		<oneway name="StopSpeakerRender" overlap="true">
-		</oneway>
-		<twoway name="ManipulateMediaDevice" overlap="true">
-            <req>
-            	<!--操作意图指令： 0:获取并接管设备权限；1：归还设备权限，不再占用-->
-            	<param name="cmdType" type="int"/>
-            	<!--设备类型：0：无效参数；1：ENV环境摄像头；2：OPT操作摄像头；3：EWS外部广角摄像头；4：高拍仪文档摄像头；5：高拍仪上接摄像头-->
-            	<param name="devType" type="int"/>
-            	<param name="reserved1" type="int"/>
-            	<param name="reserved2" type="string"/>
-            </req>
-            <!--实体收到接口请求时无论操作成功与否返回Answer(Error_Succeed)，具体操作成功与否通过retCode标识-->
-            <res>
-            	<!--retCode：0:表示成功，非0:表示失败 -->
-            	<param name="retCode" type="int"/>
-            	<param name="reserved1" type="int"/>
-            	<param name="reserved2" type="string"/>
-            </res>
-    </twoway>
 		<twoway name="GetAudioDevices" overlap="true">
-            <req>
-            	<param name="audioType" type="int"/>
-            </req>
-            <res>
-            	<param name="retCode" type="int"/>
-		<param name="deviceCount" type="int"/>
-              <param name="strNames" type="string"/>
-            </res>
+      <req>
+        <param name="audioType" type="int"/>
+      </req>
+      <res>
+       	<param name="retCode" type="int"/>
+		    <param name="deviceCount" type="int"/>
+        <param name="strNames" type="string"/>
+      </res>
     </twoway>
     <twoway name="GetVideoDevices" overlap="true">
-            <res>
-              <param name="retCode" type="int"/>
+      <res>
+        <param name="retCode" type="int"/>
 	      <param name="deviceCount" type="int"/>
-              <param name="strNames" type="string"/>
-           </res>
-     </twoway>
-     <twoway name="GetCameraInfos" overlap="true">
-             <res>
-		<param name="retCode" type="int"/>
-		<param name="EnvCamera" type="string"/>
-		<param name="EnvUsbPort" type="string"/>
-		<param name="EnvReserved" type="string"/>
-		<param name="OptCamera" type="string"/>
-		<param name="OptUsbPort" type="string"/>
-		<param name="OptReserved" type="string"/>
-             </res>
-     </twoway>
-     <twoway name="ManipulateCameras" overlap="true">
+        <param name="strNames" type="string"/>
+      </res>
+    </twoway>
+    <twoway name="GetCameraInfos" overlap="true">
+      <res>
+		    <param name="retCode" type="int"/>
+		    <param name="EnvCamera" type="string"/>
+		    <param name="EnvUsbPort" type="string"/>
+		    <param name="EnvReserved" type="string"/>
+		    <param name="OptCamera" type="string"/>
+		    <param name="OptUsbPort" type="string"/>
+		    <param name="OptReserved" type="string"/>
+      </res>
+    </twoway>
+    <twoway name="ManipulateCameras" overlap="true">
      	<req>
-         	<!--操作意图指令： 0:获取并接管设备权限；1：归还设备权限，不再占用-->
-                <param name="cmdType" type="int"/>
-        	<param name="reserved1" type="int"/>
-         	<param name="reserved2" type="string"/>
-        </req>
+        <!--操作意图指令： 0:获取并接管设备权限；1：归还设备权限，不再占用-->
+        <param name="cmdType" type="int"/>
+        <param name="reserved1" type="int"/>
+        <param name="reserved2" type="string"/>
+      </req>
         <!--实体收到接口请求时无论操作成功与否返回Answer(Error_Succeed)，具体操作成功与否通过retCode标识-->
-        <res>
+      <res>
         <!--retCode：0:表示成功，非0:表示失败 -->
-         	<param name="retCode" type="int"/>
-         	<param name="reserved1" type="int"/>
-         	<param name="reserved2" type="string"/>
-        </res>
+        <param name="retCode" type="int"/>
+        <param name="reserved1" type="int"/>
+        <param name="reserved2" type="string"/>
+      </res>
     </twoway>
     <twoway name="GetEnvCameraVideoCaptureInfo" overlap="true">
       <req>
@@ -129,30 +91,8 @@
       </res>
     </twoway>
 	</class>
-	<!-- 内置摄像头切换外接摄像头失败消息 -->
-	<message name="ExternalCameraSwitchFailed">
-		<!-- 失败提示 -->
-		<param name="failedmsg" type="wstring"/>
-	</message>
-	<!-- 外接摄像头插入消息 -->
-	<message name="ExternalCameraInserted">
-		<!-- 摄像头名称 -->
-		<param name="camname" type="wstring"/>
-	</message>
-	<!-- 外接摄像头移除消息 -->
-	<message name="ExternalCameraRemoved">
-		<!-- 摄像头名称 -->
-		<param name="camname" type="wstring"/>
-	</message>
-	<!-- 外接摄像头启动状态变化消息 -->
-	<message name="ExternalCameraStateChanged">
-		<!-- 状态消息 -->
-		<param name="statemsg" type="wstring"/>
-		<!-- 摄像头名称 -->
-		<param name="camname" type="wstring"/>
-	</message>
-  	<!-- 上摄像头稳定性数据 -->
-  	<message name="EnvCameraCapInfo">
-    		<param name="cameracapmsg" type="wstring"/>
-  	</message>
+  <!-- 上摄像头稳定性数据 -->
+  <message name="EnvCameraCapInfo">
+  	<param name="cameracapmsg" type="wstring"/>
+  </message>
 </entity>

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -2228,60 +2228,6 @@ void ChannelMediaControllerClient::OnMessage( ErrorCodeEnum Error, ChannelServic
 		pEntity->OnReceivePkt(Msg.sub_type, (const char*)Msg.data.m_pData, Msg.data.m_iLength);
 	}
 }
-
-
-void MediaServiceSession::Handle_GetVideoDeviceName(SpReqAnsContext<MediaService_GetVideoDeviceName_Req, MediaService_GetVideoDeviceName_Ans>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-
-	ctx->Answer(Error_Succeed);
-}
-
-
-void MediaServiceSession::Handle_StartCamera(SpOnewayCallContext<MediaService_StartCamera_Info>::Pointer ctx)
-{
-
-}
-
-
-void MediaServiceSession::Handle_StopCamera(SpOnewayCallContext<MediaService_StopCamera_Info>::Pointer ctx)
-{
-
-}
-
-
-void MediaServiceSession::Handle_StartEnvCamera(SpReqAnsContext<MediaService_StartEnvCamera_Req, MediaService_StartEnvCamera_Ans>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	ctx->Answer(Error_Succeed);
-}
-
-
-void MediaServiceSession::Handle_StopEnvCamera(SpOnewayCallContext<MediaService_StopEnvCamera_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-}
-
-
-void MediaServiceSession::Handle_StartSpeakerRender(SpOnewayCallContext<MediaService_StartSpeakerRender_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-}
-
-
-void MediaServiceSession::Handle_StopSpeakerRender(SpOnewayCallContext<MediaService_StopSpeakerRender_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-}
-
-void MediaServiceSession::Handle_ManipulateMediaDevice(SpReqAnsContext<MediaService_ManipulateMediaDevice_Req, MediaService_ManipulateMediaDevice_Ans>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	ErrorCodeEnum Error = Error_NotImpl;
-
-	ctx->Ans.retCode = (int)Error;
-	ctx->Answer(Error_Succeed);
-}
 	
 void MediaServiceSession::Handle_GetAudioDevices(SpReqAnsContext<MediaService_GetAudioDevices_Req, MediaService_GetAudioDevices_Ans>::Pointer ctx)
 {

Module/mod_mediacontroller/mod_mediacontroller.h

@@ -5,7 +5,7 @@
 
 #include "MediaController_server_g.h"
 #include "MediaController_msg_g.h"
-#include "ExternalCameraMsg.h"
+//#include "ExternalCameraMsg.h"
 
 #include "../mod_healthmanager/HealthManager_client_g.h"
 #include "../mod_healthmanager/HealthManager_def_g.h"
@@ -44,14 +44,6 @@ class MediaServiceSession : public MediaService_ServerSessionBase
 {
 public:
 	MediaServiceSession(CMediaControllerEntity *pEntity) : m_pEntity(pEntity){}
-	virtual void Handle_GetVideoDeviceName(SpReqAnsContext<MediaService_GetVideoDeviceName_Req, MediaService_GetVideoDeviceName_Ans>::Pointer ctx);
-	virtual void Handle_StartCamera(SpOnewayCallContext<MediaService_StartCamera_Info>::Pointer ctx);
-	virtual void Handle_StopCamera(SpOnewayCallContext<MediaService_StopCamera_Info>::Pointer ctx);
-	virtual void Handle_StartEnvCamera(SpReqAnsContext<MediaService_StartEnvCamera_Req, MediaService_StartEnvCamera_Ans>::Pointer ctx);
-	virtual void Handle_StopEnvCamera(SpOnewayCallContext<MediaService_StopEnvCamera_Info>::Pointer ctx);
-	virtual void Handle_StartSpeakerRender(SpOnewayCallContext<MediaService_StartSpeakerRender_Info>::Pointer ctx);
-	virtual void Handle_StopSpeakerRender(SpOnewayCallContext<MediaService_StopSpeakerRender_Info>::Pointer ctx);
-	virtual void Handle_ManipulateMediaDevice(SpReqAnsContext<MediaService_ManipulateMediaDevice_Req, MediaService_ManipulateMediaDevice_Ans>::Pointer ctx);
 	virtual void Handle_GetAudioDevices(SpReqAnsContext<MediaService_GetAudioDevices_Req, MediaService_GetAudioDevices_Ans>::Pointer ctx);
 	virtual void Handle_GetVideoDevices(SpReqAnsContext<MediaService_GetVideoDevices_Req, MediaService_GetVideoDevices_Ans>::Pointer ctx);
 	virtual void Handle_GetCameraInfos(SpReqAnsContext<MediaService_GetCameraInfos_Req, MediaService_GetCameraInfos_Ans>::Pointer ctx);