Z991239-5263 #comment 解决音频播放没声音问题

Module/mod_localmediaplay/mod_localmediaplay.cpp

@@ -268,8 +268,8 @@ CServerSessionBase* CLocalMediaPlayEntity::OnNewSession(const char* pszRemoteEnt
 	return new CLocalMediaPlaySession(this, m_id_seq++);
 }
 
-#ifdef RVC_OS_WIN
 
+#ifdef RVC_OS_WIN
 BOOL CLocalMediaPlayEntity::LoadPlayConfig(CWmpPlayConfig &config, int CfgInx)
 {
 	if (CfgInx >= MAX_PLAY_CHANNELS || CfgInx < 0){

Other/unix/libmediaplayer/idatastruct.h

@@ -43,35 +43,33 @@ enum media_loglevel {
 
 enum PlayModeEnum
 {
-	UNKNOWN = -1,                               // δ֪
-	SINGLE,                                     // ��һ
-	SALESRECORD,                                // �ͻ�����
-	LOCALAUDIO,                                 // ������Ƶ
-	LOCALVIDEO,                                 // ������Ƶ
-	THRIDSALESRECORD							// 3.0�ͻ�����˫¼
+	UNKNOWN = -1,                               
+	SINGLE,                                      
+	LOCALAUDIO,                                 
+	LOCALVIDEO           					
 };
 
 struct CMediaPlayConfig
 {
-	char strVideoRunTime_S[TIME_LEN];			// ÿ��������Ƶ���ŵ���ʼʱ��
-	char strVideoRunTime_E[TIME_LEN];			// ÿ��������Ƶ���ŵ���ֹʱ��
+	char strVideoRunTime_S[TIME_LEN];			
+	char strVideoRunTime_E[TIME_LEN];			
 
-	bool bFullScreen;                           // �Ƿ�ȫ��
-	bool bPrimMonitor;                          // �Ƿ�������ʾ
-	bool bSimpleMode;                           // �Ƿ���ģʽ
-	PlayModeEnum eMode;                         // ����ģʽ
-	int nWndX;                                  // ����X����
-	int nWndY;                                  // ����Y����
-	int nWndWidth;                              // ���ڿ���
-	int nWndHeight;                             // ���ڸ߶�
-	int nFileCnt;		                        // �ļ�����
-	int nPlayCnt;		                        // ���Ŵ���
-	int nPlayInterval;		                    // ����ʱ����
-	char strNamePrefix[MAX_PATH];               // �ͻ�����¼����ǰ׺
-	char strRootPath[MAX_PATH];		            // ��Ŀ¼
-	char strFileNames[MAX_FILECOUNT][MAX_PATH]; // 文件名数组
+	bool bFullScreen;                           
+	bool bPrimMonitor;                          
+	bool bSimpleMode;                           
+	PlayModeEnum eMode;                         
+	int nWndX;                                  
+	int nWndY;                                  
+	int nWndWidth;                              
+	int nWndHeight;                             
+	int nFileCnt;		                        
+	int nPlayCnt;		                       
+	int nPlayInterval;		                    
+	char strNamePrefix[MAX_PATH];               
+	char strRootPath[MAX_PATH];		            
+	char strFileNames[MAX_FILECOUNT][MAX_PATH]; 
 
-	int nVolume;								// ����
+	int nVolume;								
 };
 
 

Other/win/libmediaplayer/idatastruct.h

@@ -44,11 +44,9 @@ enum media_loglevel {
 enum MediaPlayModeEnum
 {
 	MEDIA_UNKNOWN = -1,                               
-	MEDIA_SINGLE,                                     
-	MEDIA_SALESRECORD,                                
+	MEDIA_SINGLE,                                      
 	MEDIA_LOCALAUDIO,                                
-	MEDIA_LOCALVIDEO,                                 
-	MEDIA_THRIDSALESRECORD							  
+	MEDIA_LOCALVIDEO					  
 };
 
 struct CMediaPlayConfig

Other/win/libwmpplayer/CMakeLists.txt

@@ -54,6 +54,7 @@ set(${MODULE_PREFIX}_SRCS
     ${ThirdPartyHeadRoot}/wmpplayer/src/CWMPStringCollection2.cpp
     libwmpplayer.cpp
     CPlayerDlg.cpp
+    libwmpplayer.rc
 
 	${STDAFXCPP}
 )

Other/win/libwmpplayer/CPlayerDlg.cpp

@@ -133,55 +133,6 @@ BOOL CPlayerDlg::OnInitDialog()
 			::SetWindowPos(this->GetSafeHwnd(),HWND_TOP,m_monitorRect.left,m_monitorRect.top,0,0,SWP_HIDEWINDOW);//HWND_TOP
 			m_player->put_URL(m_pConfig->strRootPath);
 		}
-		else if (m_pConfig->eMode == SALESRECORD || m_pConfig->eMode == THRIDSALESRECORD) // 客户经理录像模式播放
-		{
-			if (SALESRECORD == m_pConfig->eMode)
-			{
-				::SetWindowPos(this->GetSafeHwnd(),HWND_TOP,m_monitorRect.left,m_monitorRect.top,0,0,SWP_HIDEWINDOW);//HWND_TOP
-			}
-			else{
-				if (m_pConfig->nWndWidth > m_monitorRect.Width())
-				{
-					m_pConfig->nWndWidth = m_monitorRect.Width();
-				}
-				if (m_pConfig->nWndHeight > m_monitorRect.Height())
-				{
-					m_pConfig->nWndHeight = m_monitorRect.Height();
-				}
-				::SetWindowPos(this->GetSafeHwnd(), HWND_TOPMOST, m_monitorRect.left+m_pConfig->nWndX,
-					m_monitorRect.top+m_pConfig->nWndY,m_pConfig->nWndWidth,m_pConfig->nWndHeight,SWP_HIDEWINDOW);//HWND_TOP
-			}
-
-			SetTimer(WNDTOPMOST_TIMERID, 10, 0);
-			SetTimer(FULLSCREEN_TIMERID, GetDoubleClickTime(), 0); // 开启Timer监视，防止WMP本身的全屏
-			m_bTimer = true;
-
-			m_settings = static_cast<CWMPSettings>(m_player->get_settings());
-			m_settings.put_autoStart(FALSE);
-			m_playlist = m_player->get_currentPlaylist();
-			if (strstr(m_pConfig->strNamePrefix, "S"))
-			{
-				m_playlist.put_name(_T("现场销售录音录像"));
-			}
-			else if (strstr(m_pConfig->strNamePrefix, "W"))
-			{
-				m_playlist.put_name(_T("二次见证录音录像"));
-			}
-			else if (strstr(m_pConfig->strNamePrefix, "OFL")) // edit by ly 20180224
-			{
-				m_playlist.put_name(_T("离线录音录像"));
-			}
-		
-			CString videoPath("");
-			for(int i = 0; i != m_pConfig->nFileCnt; ++i)
-			{
-				videoPath.Format(_T("%s%s_%d.wmv"), m_pConfig->strRootPath, m_pConfig->strNamePrefix, i);
-				m_playlist.appendItem(m_player->newMedia(videoPath));
-			}
-
-			m_control = static_cast<CWMPControls>(m_player->get_controls());
-			m_control.play();
-		}
 		else if (m_pConfig->eMode == LOCALAUDIO) // 本地音频模式播放
 		{
 			::SetWindowPos(this->GetSafeHwnd(),HWND_TOP,m_monitorRect.left,m_monitorRect.top,0,0,SWP_HIDEWINDOW);//HWND_TOP
@@ -216,7 +167,7 @@ BOOL CPlayerDlg::OnInitDialog()
 
 			m_settings = static_cast<CWMPSettings>(m_player->get_settings());
 			m_settings.put_autoStart(FALSE);
-			m_settings.put_volume(m_pConfig->nVolume); // 设置音量 add by ly 2017/06/06
+			m_settings.put_volume(m_pConfig->nVolume); 
 			m_playlist = m_player->get_currentPlaylist();
 			m_playlist.put_name(_T("可视柜台本地视频播放"));
 
@@ -361,7 +312,7 @@ void CPlayerDlg::PlayStateChangeOcx1(long NewState)
 		{
 			case 3: // 播放状态
 				{
-					if (m_pConfig->eMode == SINGLE || m_pConfig->eMode == SALESRECORD)
+					if (m_pConfig->eMode == SINGLE)
 					{
 						CWMPMedia m_media = m_player->get_currentMedia();
 						long width = m_media.get_imageSourceWidth();

Other/win/libwmpplayer/libwmpplayer.cpp

@@ -30,10 +30,6 @@ private:
 		{
 			case SINGLE:
 				break;
-			case SALESRECORD:
-				if (!_stricmp(m_stPlayConfig.strNamePrefix, "") || m_stPlayConfig.nFileCnt <= 0)
-					return;
-				break;
 			case LOCALAUDIO:
 				if (m_stPlayConfig.nPlayCnt < 0 || m_stPlayConfig.nPlayInterval < 0 
 					|| m_stPlayConfig.nFileCnt <= 0 || m_stPlayConfig.nFileCnt > MAX_FILECOUNT)
@@ -45,12 +41,6 @@ private:
 					|| m_stPlayConfig.nFileCnt <= 0 || m_stPlayConfig.nFileCnt > MAX_FILECOUNT)
 					return;
 				break;
-			case THRIDSALESRECORD:
-				if (m_stPlayConfig.nPlayCnt < 0 || m_stPlayConfig.nPlayInterval < 0 || m_stPlayConfig.nFileCnt <= 0 
-					|| m_stPlayConfig.nFileCnt > MAX_FILECOUNT || m_stPlayConfig.nWndX < 0 || m_stPlayConfig.nWndY < 0 
-					|| m_stPlayConfig.nWndWidth < 0 || m_stPlayConfig.nWndHeight < 0 )
-					return;
-				break;
 			case SALESNOTICE:
 				if (m_stPlayConfig.nWndX < 0 || m_stPlayConfig.nWndY < 0 || m_stPlayConfig.nWndWidth < 0 
 					|| m_stPlayConfig.nWndHeight < 0 || m_stPlayConfig.nFileCnt <= 0 || m_stPlayConfig.nFileCnt > MAX_FILECOUNT)
@@ -149,16 +139,10 @@ public:
 		}
 		
 		strcpy(m_stPlayConfig.strRootPath, pVideoDir);
-		if (pNamePrefix != NULL)
-		{
-			strcpy(m_stPlayConfig.strNamePrefix, pNamePrefix);
-			m_stPlayConfig.eMode = SALESRECORD;
-		}
-		else
-		{
-			strcpy(m_stPlayConfig.strNamePrefix, "");
-			m_stPlayConfig.eMode = SINGLE;
-		}
+
+		strcpy(m_stPlayConfig.strNamePrefix, "");
+		m_stPlayConfig.eMode = SINGLE;
+		
 		m_stPlayConfig.nFileCnt = nVideoCount;
 		m_stPlayConfig.bPrimMonitor = true;
 
@@ -198,14 +182,9 @@ public:
 		}
 
 		strcpy(m_stPlayConfig.strRootPath, pVideoDir);
-		if (pNamePrefix != NULL){
-			strcpy(m_stPlayConfig.strNamePrefix, pNamePrefix);
-			m_stPlayConfig.eMode = THRIDSALESRECORD;
-		}
-		else{
-			strcpy(m_stPlayConfig.strNamePrefix, "");
-			m_stPlayConfig.eMode = SINGLE;
-		}
+
+		strcpy(m_stPlayConfig.strNamePrefix, "");
+		m_stPlayConfig.eMode = SINGLE;
 
 		m_stPlayConfig.nFileCnt = nVideoCount;
 		m_stPlayConfig.bPrimMonitor = true;

Other/win/libwmpplayer/libwmpplayer.h

@@ -16,10 +16,8 @@ enum PlayModeEnum
 {
 	UNKNOWN = -1,                               // 未知
 	SINGLE,                                     // 单一
-	SALESRECORD,                                // 客户经理
 	LOCALAUDIO,                                 // 本地音频
 	LOCALVIDEO,                                 // 本地视频
-	THRIDSALESRECORD,							// 3.0客户经理双录
 	SALESNOTICE									// 产品销售提示		
 };
 

Other/win/libwmpplayer/res/LibWMPPlayer.rc2

@@ -0,0 +1,13 @@
+//
+// libwmpplayer.RC2 - Microsoft Visual C++ 不会直接编辑的资源
+//
+
+#ifdef APSTUDIO_INVOKED
+#error 此文件不能用 Microsoft Visual C++ 编辑
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// 在此处添加手动编辑的资源...
+
+/////////////////////////////////////////////////////////////////////////////