Merge pull request #188 from AgoraIO/dev/3.6.200-win

fix windows bug

Author: xia ning

windows/APIExample/APIExample/Advanced/AudioEffect/CAgoraEffectDlg.cpp

@@ -107,7 +107,7 @@ bool CAgoraEffectDlg::InitAgora()
 	//create Agora RTC engine
 	m_rtcEngine = createAgoraRtcEngine();
 	if (!m_rtcEngine) {
-		m_lstInfo.InsertString(m_lstInfo.GetCount() - 1, _T("createAgoraRtcEngine failed"));
+		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("createAgoraRtcEngine failed"));
 		return false;
 	}
 	//set message notify receiver window
@@ -345,12 +345,14 @@ void CAgoraEffectDlg::OnBnClickedButtonPlayEffect()
 	}
 	CString strEffect;
 	m_cmbEffect.GetWindowText(strEffect);
-	std::string strFile;
-	strFile = cs2utf8(strEffect).c_str();
+	std::string strFile = cs2utf8(strEffect);
 	CString strLoops;
 	m_edtLoops.GetWindowText(strLoops);
 	int loops = _ttol(strLoops);
-
+	if (loops == 0) {
+		m_edtLoops.SetWindowText(_T("1"));
+		loops = 1;
+	}
 	CString strPitch;
 	m_edtPitch.GetWindowText(strPitch);
 	double pitch = _ttof(strPitch);
@@ -365,11 +367,13 @@ void CAgoraEffectDlg::OnBnClickedButtonPlayEffect()
 
 	BOOL publish = m_chkPublish.GetCheck();
 	//play effect by effect path.
-	m_rtcEngine->playEffect(m_mapEffect[strEffect], strFile.c_str(), loops, pitch, pan, gain, publish);
+	int ret = m_rtcEngine->playEffect(m_mapEffect[strEffect], strFile.c_str(), loops, pitch, pan, gain, publish);
 
 	CString strInfo;
-	strInfo.Format(_T("play effect :path:%s,loops:%d,pitch:%.1f,pan:%.0f,gain:%d,publish:%d"),
-		strEffect, loops, pitch, pan, gain, publish);
+	strInfo.Format(_T("play effect :path:%s, ret:%d"), strEffect, ret);
+	m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
+	strInfo.Format(_T("loops:%d,pitch:%.1f,pan:%.0f,gain:%d,publish:%d"),
+		loops, pitch, pan, gain, publish);
 	m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
 }
 

windows/APIExample/APIExample/Advanced/AudioMixing/CAgoraAudioMixingDlg.cpp

@@ -248,7 +248,9 @@ void CAgoraAudioMixingDlg::OnBnClickedButtonSetAudioMix()
 {
 	CString strPath;
 	m_edtAudioMix.GetWindowText(strPath);
+	strPath.Replace(_T("file\/files"), _T("file\/api\/download"));
 	std::string strAudioPath = cs2utf8(strPath);
+	strAudioPath = UrlANSI(strAudioPath.c_str());
 	BOOL bOnlyLocal = FALSE;
 	BOOL bReplaceMicroPhone = TRUE;
 	int iRepeatTimes = 1;
@@ -270,6 +272,7 @@ void CAgoraAudioMixingDlg::OnBnClickedButtonSetAudioMix()
 			m_edtRepatTimes.SetWindowText(_T("1"));
 		}
 		//start audio mixing in the engine.
+		//strAudioPath = "http://10.70.1.19:9091/file/api/download/electron-wayang/\%E5\%B9\%B4\%E5\%B0\%91\%E6\%9C\%89\%E4\%B8\%BA\%E6\%9D\%8E\%E8\%8D\%A3\%E6\%B5\%A9.mp3";
 		int nRet = m_rtcEngine->startAudioMixing(strAudioPath.c_str(),
 			bOnlyLocal,
 			bReplaceMicroPhone,

windows/APIExample/APIExample/Advanced/MediaPlayer/CAgoraMediaPlayer.cpp

@@ -163,7 +163,7 @@ void CAgoraMediaPlayer::ResumeStatus()
 	InitCtrlText();
 	m_staDetail.SetWindowText(_T(""));
 	m_edtChannel.SetWindowText(_T(""));
-	m_edtVideoSource.SetWindowText(_T("D:\\VID_20201109_120733.mp4"));
+	
 	m_lstInfo.ResetContent();
 	m_sldVideo.SetPos(0);
 
@@ -347,25 +347,29 @@ void CAgoraMediaPlayer::OnBnClickedButtonPublishVideo()
 		ChannelMediaOptions op;
 		op.clientRoleType = CLIENT_ROLE_BROADCASTER;
 		op.publishMediaPlayerVideoTrack = false;
+		op.publishMediaPlayerAudioTrack = false;
 		op.publishMediaPlayerId = m_mediaPlayer->getMediaPlayerId();
 		int ret = m_rtcEngine->updateChannelMediaOptions(op);
 		ChannelMediaOptions op2;
 		op2.clientRoleType = CLIENT_ROLE_BROADCASTER;
 		op2.publishCameraTrack = true;
 		ret = m_rtcEngine->updateChannelMediaOptions(op2);
 		m_publishMeidaplayer = false;
+		m_btnPublishVideo.SetWindowText(mediaPlayerCtrlPublishVideo);
 	}
 	else {
 		ChannelMediaOptions options;
 		options.clientRoleType = CLIENT_ROLE_BROADCASTER;
 		options.publishMediaPlayerVideoTrack = true;
+		options.publishMediaPlayerAudioTrack = true;
 		options.publishMediaPlayerId = m_mediaPlayer->getMediaPlayerId();
 		options.publishCameraTrack = false;
 		options.publishAudioTrack = false;
 		options.autoSubscribeAudio = false;
 		options.autoSubscribeVideo = false;
 		m_rtcEngine->updateChannelMediaOptions(options);
 		m_publishMeidaplayer = true;
+		m_btnPublishVideo.SetWindowText(mediaPlayerCtrlUnPublishVideo);
 	}
 }
 
@@ -631,6 +635,9 @@ void CAgoraMediaPlayer::OnReleasedcaptureSliderVideo(NMHDR *pNMHDR, LRESULT *pRe
 {
 	LPNMCUSTOMDRAW pNMCD = reinterpret_cast<LPNMCUSTOMDRAW>(pNMHDR);
 	int pos = m_sldVideo.GetPos();
-	//m_mediaPlayer->seek(pos);
+
+	int64_t playPos = 0;
+	//m_mediaPlayer->getPlayPosition(playPos);
+	m_mediaPlayer->seek(pos);
 	*pResult = 0;
 }

windows/APIExample/APIExample/Advanced/PerCallTest/CAgoraPerCallTestDlg.cpp

@@ -266,7 +266,6 @@ void CAgoraPerCallTestDlg::OnBnClickedButtonAudioInputTest()
 		//set audio recording device with device id.
 		int ret = (*m_audioDeviceManager)->setRecordingDevice(m_mapAudioInput[strAudioInputName].c_str());
 		//enable audio volume indication
-		ret |= m_rtcEngine->enableAudioVolumeIndication(1000, 10);
 		//start audio recording device test
 		ret |= (*m_audioDeviceManager)->startRecordingDeviceTest(1000);
 		if (ret == 0)
@@ -284,7 +283,6 @@ void CAgoraPerCallTestDlg::OnBnClickedButtonAudioInputTest()
 		//stop audio recording device test.
 		(*m_audioDeviceManager)->stopRecordingDeviceTest();
 		//disable audio volume indication.
-		m_rtcEngine->enableAudioVolumeIndication(1000, 10);
 		m_btnAudioInputTest.SetWindowText(PerCallTestCtrlStartTest);
 		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("stop audio recording device test."));
 	}

windows/APIExample/APIExample/Basic/LiveBroadcasting/CLiveBroadcastingDlg.cpp

@@ -288,8 +288,9 @@ void CLiveBroadcastingDlg::UnInitAgora()
 		if(m_joinChannel)
 		//leave channel
 		m_rtcEngine->leaveChannel();
+		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("leaveChannel"));
         //stop preview in the engine.
-        m_rtcEngine->stopPreview();
+       // m_rtcEngine->stopPreview();
         m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("stopPreview"));
         //disable video in the engine.
         m_rtcEngine->disableVideo();

windows/APIExample/APIExample/stdafx.cpp

@@ -289,13 +289,52 @@ std::string cs2utf8(CString str)
     return szBuf;
 }
 
+std::string cs2ANSI(CString str)
+{
+	char szBuf[2 * MAX_PATH] = { 0 };
+	WideCharToMultiByte(CP_ACP, 0, str.GetBuffer(0), str.GetLength(), szBuf, 2 * MAX_PATH, NULL, NULL);
+	return szBuf;
+}
 CString utf82cs(std::string utf8)
 {
     TCHAR szBuf[2 * MAX_PATH] = { 0 };
     MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), 2 * MAX_PATH, szBuf, 2 * MAX_PATH);
     return szBuf;
 }
 
+
+std::string UrlANSI(const char *str)
+{
+	std::string dd;
+	std::string tt = str;
+	size_t len = tt.length();
+	for (size_t i = 0; i < len; i++)
+	{
+		BYTE b = (BYTE)tt.at(i);
+		/*if (isalnum(b)
+			|| b == '/'
+			|| b == '.'
+			|| b == ':')*/
+		if (b >= 0 && b < 127)
+		{
+			char tempbuff[2] = { 0 };
+			sprintf(tempbuff, "%c", (BYTE)tt.at(i));
+			dd.append(tempbuff);
+		}
+		else if (isspace(b))
+		{
+			dd.append("+");
+		}
+		else
+		{
+			char tempbuff[4];
+			sprintf(tempbuff, "%%%X%X", ((BYTE)tt.at(i)) >> 4, ((BYTE)tt.at(i)) % 16);
+			dd.append(tempbuff);
+		}
+	}
+	return dd;
+}
+
 CString getCurrentTime()
 {
     SYSTEMTIME st = { 0 };

windows/APIExample/APIExample/stdafx.h

@@ -118,11 +118,12 @@ typedef struct _tagAudioMixingState {
 	int error;
 
 }AudioMixingState, *PAudioMixingState;
-
+std::string cs2ANSI(CString str);
 std::string cs2utf8(CString str);
 CString utf82cs(std::string utf8);
 CString getCurrentTime();
 CString GetExePath();
+std::string UrlANSI(const char *str);
 BOOL PASCAL SaveResourceToFile(LPCTSTR lpResourceType, WORD wResourceID, LPCTSTR lpFilePath);