[Windows]adapt to 4003 version rtc sdk.

Author: xgfd3

windows/APIExample/APIExample/APIExample.rc

@@ -98,10 +98,6 @@ BEGIN
     CONTROL         "Report",IDC_CHECK_REPORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,368,59,10
     CONTROL         "Moderation",IDC_CHECK_MODERATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,380,52,10
     PUSHBUTTON      "Snapshot",IDC_BUTTON_SNAPSHOT,540,366,50,14
-    LTEXT           "Playback Device",IDC_STATIC_PLAYBACK,81,370,52,8
-    COMBOBOX        IDC_COMBO_PLAYBACK,134,367,203,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Loopback Device",IDC_STATIC_LOOPBACK,80,382,54,8
-    COMBOBOX        IDC_COMBO_LOOPBACK,134,381,203,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_DIALOG_RTMPINJECT DIALOGEX 0, 0, 632, 400
@@ -378,7 +374,6 @@ BEGIN
     LTEXT           "camera",IDC_STATIC_CAMERA,64,124,34,8
     COMBOBOX        IDC_COMBO_VIDEO,110,122,218,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Set AudioProfile",IDC_BUTTON_CAMERA,338,121,60,14
-    PUSHBUTTON      "GetNetworkType",IDC_BUTTON_GET_NETWORK_TYPE,65,19,60,14
 END
 
 IDD_DIALOG_VOLUME DIALOGEX 0, 0, 632, 400

windows/APIExample/APIExample/Advanced/OriginalAudio/CAgoraOriginalAudioDlg.cpp

@@ -45,20 +45,6 @@ BEGIN_MESSAGE_MAP(CAgoraOriginalAudioDlg, CDialogEx)
 	ON_BN_CLICKED(IDC_BUTTON_ENCODED_AUDIO, &CAgoraOriginalAudioDlg::OnBnClickedButtonEncodedAudio)
 END_MESSAGE_MAP()
 
-bool COriginalAudioProcFrameObserver::onEarMonitoringAudioFrame(AudioFrame& audioFrame)
-{
-	return false;
-}
-
-/*
-*	According to the setting of audio collection frame rate,
-*	the Agora SDK calls this callback function at an appropriate time
-*	to obtain the audio data collected by the user.
-*/
-IAudioFrameObserverBase::AudioParams COriginalAudioProcFrameObserver::getEarMonitoringAudioParams()
-{
-	return IAudioFrameObserverBase::AudioParams();
-}
 
 bool COriginalAudioProcFrameObserver::onRecordAudioFrame(const char* channelId, AudioFrame& audioFrame)
 {

windows/APIExample/APIExample/Advanced/OriginalAudio/CAgoraOriginalAudioDlg.h

@@ -37,25 +37,6 @@ class COriginalAudioProcFrameObserver :
 {
 public:
 
-	/**
-     * Occurs when the ear monitoring audio frame is received.
-     * @param audioFrame The reference to the audio frame: AudioFrame.
-     * @return
-     * - true: The ear monitoring audio data is valid and is encoded and sent.
-     * - false: The ear monitoring audio data is invalid and is not encoded or sent.
-     */
-	virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override;
-	/** Sets the ear monitoring audio format
-	   **Note**:
-	   - The SDK calculates the sample interval according to the `AudioParams`
-	   you set in the return value of this callback and triggers the
-	   `onEarMonitoringAudioFrame` callback at the calculated sample interval.
-	   Sample interval (seconds) = `samplesPerCall`/(`sampleRate` × `channel`).
-	   Ensure that the value of sample interval is equal to or greater than 0.01.
-
-	   @return Sets the audio format. See AgoraAudioParams.
-	   */
-	virtual IAudioFrameObserverBase::AudioParams getEarMonitoringAudioParams() override;
 	/*
 	*	According to the setting of audio collection frame rate,
 	*	the Agora SDK calls this callback function at an appropriate time

windows/APIExample/APIExample/Advanced/PreCallTest/CAgoraPreCallTestDlg.cpp

@@ -49,8 +49,7 @@ BEGIN_MESSAGE_MAP(CAgoraPreCallTestDlg, CDialogEx)
 	ON_MESSAGE(WM_MSGID(EID_LASTMILE_PROBE_RESULT), &CAgoraPreCallTestDlg::OnEIDLastmileProbeResult)
 	ON_MESSAGE(WM_MSGID(EID_LASTMILE_QUAILTY), &CAgoraPreCallTestDlg::OnEIDLastmileQuality)
 	ON_MESSAGE(WM_MSGID(EID_AUDIO_VOLUME_INDICATION), &CAgoraPreCallTestDlg::OnEIDAudioVolumeIndication)
-	ON_WM_PAINT()
-	ON_BN_CLICKED(IDC_BUTTON_GET_NETWORK_TYPE, &CAgoraPreCallTestDlg::OnBnClickedButtonGetNetworkType)
+	ON_WM_PAINT()
 END_MESSAGE_MAP()
 
 //init ctrl text.
@@ -400,32 +399,3 @@ void CAgoraPreCallTestDlg::OnPaint()
 }
 
 
-void CAgoraPreCallTestDlg::OnBnClickedButtonGetNetworkType()
-{
-	
-	int networkType = m_rtcEngine->getNetworkType();
-	CString infoStr;
-	switch (networkType) {
-	case NETWORK_TYPE_DISCONNECTED:
-		infoStr.Format(_T("Curr NetworkType: DISCONNECTED"));
-		break;
-	case NETWORK_TYPE_LAN:
-		infoStr.Format(_T("Curr NetworkType: LAN"));
-		break;
-	case NETWORK_TYPE_WIFI:
-		infoStr.Format(_T("Curr NetworkType: WIFI"));
-		break;
-	case NETWORK_TYPE_MOBILE_2G:
-		infoStr.Format(_T("Curr NetworkType: 2G"));
-		break;
-	case NETWORK_TYPE_MOBILE_3G:
-		infoStr.Format(_T("Curr NetworkType: 3G"));
-		break;
-	case NETWORK_TYPE_MOBILE_4G:
-		infoStr.Format(_T("Curr NetworkType: 4G"));
-		break;
-	default:
-		infoStr.Format(_T("Curr NetworkType: UNKNOWN"));
-	}
-	m_lstInfo.InsertString(m_lstInfo.GetCount(), infoStr);
-}

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

@@ -111,17 +111,13 @@ void CLiveBroadcastingDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_CHECK_REPORT, m_chkReport);
 	DDX_Control(pDX, IDC_CHECK_MODERATION, m_chkModeration);
 	DDX_Control(pDX, IDC_BUTTON_SNAPSHOT, m_chkSnapshot);
-	DDX_Control(pDX, IDC_COMBO_PLAYBACK, m_cmbPlayback);
-	DDX_Control(pDX, IDC_COMBO_LOOPBACK, m_cmbLoopback);
 }
 
 
 BEGIN_MESSAGE_MAP(CLiveBroadcastingDlg, CDialogEx)
     ON_BN_CLICKED(IDC_BUTTON_JOINCHANNEL, &CLiveBroadcastingDlg::OnBnClickedButtonJoinchannel)
     ON_CBN_SELCHANGE(IDC_COMBO_PERSONS, &CLiveBroadcastingDlg::OnSelchangeComboPersons)
     ON_CBN_SELCHANGE(IDC_COMBO_ROLE, &CLiveBroadcastingDlg::OnSelchangeComboRole)
-    ON_CBN_SELCHANGE(IDC_COMBO_PLAYBACK, &CLiveBroadcastingDlg::OnSelchangeComboPlayback)
-    ON_CBN_SELCHANGE(IDC_COMBO_LOOPBACK, &CLiveBroadcastingDlg::OnSelchangeComboLoopback)
     ON_MESSAGE(WM_MSGID(EID_JOINCHANNEL_SUCCESS), &CLiveBroadcastingDlg::OnEIDJoinChannelSuccess)
     ON_MESSAGE(WM_MSGID(EID_LEAVE_CHANNEL), &CLiveBroadcastingDlg::OnEIDLeaveChannel)
     ON_MESSAGE(WM_MSGID(EID_USER_JOINED), &CLiveBroadcastingDlg::OnEIDUserJoined)
@@ -333,8 +329,6 @@ void CLiveBroadcastingDlg::ResumeStatus()
 	m_lstInfo.ResetContent();
 	m_cmbRole.SetCurSel(0);
 	m_cmbPersons.SetCurSel(0);
-	m_cmbPlayback.SetCurSel(0);
-	m_cmbLoopback.SetCurSel(0);
 	m_cmbVideoEncoder.SetCurSel(1);
 	ShowVideoWnds();
 	InitCtrlText();
@@ -376,29 +370,6 @@ void CLiveBroadcastingDlg::StopLocalVideo()
 	}
 }
 
-void CLiveBroadcastingDlg::SetupAudioDeviceLayout()
-{
-	char szDeviceName[1024];
-	char szDeviceId[1024];
-
-	m_cmbPlayback.ResetContent();
-	m_cmbLoopback.ResetContent();
-	m_mapPlaybackDevices.clear();
-
-	//get audio record devices and add to combobox and insert map.
-	IAudioDeviceCollection* audioPlaybackDevices = (*m_audioDeviceManager)->enumeratePlaybackDevices();
-	for (int i = 0; i < audioPlaybackDevices->getCount(); i++)
-	{
-		int nRet = audioPlaybackDevices->getDevice(i, szDeviceName, szDeviceId);
-		m_cmbPlayback.AddString(utf82cs(szDeviceName));
-		m_cmbLoopback.AddString(utf82cs(szDeviceName));
-		m_mapPlaybackDevices.insert(std::make_pair(utf82cs(szDeviceName), szDeviceId));
-	}
-	audioPlaybackDevices->release();
-	m_cmbPlayback.SetCurSel(0);
-	m_cmbLoopback.SetCurSel(0);
-}
-
 
 void CLiveBroadcastingDlg::OnSelchangeComboPersons()
 {
@@ -424,51 +395,6 @@ void CLiveBroadcastingDlg::OnSelchangeComboRole()
     }
 }
 
-void CLiveBroadcastingDlg::OnSelchangeComboPlayback()
-{
-	if (!m_audioDeviceManager) {
-		return;
-	}
-
-	int nSel = m_cmbPlayback.GetCurSel();
-	if (nSel < 0) return;
-
-	CString strDeviceName;
-	m_cmbPlayback.GetLBText(nSel, strDeviceName);
-
-	const char* deviceId = m_mapPlaybackDevices[strDeviceName].c_str();
-	int ret = (*m_audioDeviceManager)->setPlaybackDevice(deviceId);
-	CString infoStr;
-	infoStr.Format(_T("PlaybackDeviceName : %s"), strDeviceName);
-	m_lstInfo.InsertString(m_lstInfo.GetCount(), infoStr);
-	infoStr.Format(_T("PlaybackDeviceId : %s"), utf82cs(deviceId));
-	m_lstInfo.InsertString(m_lstInfo.GetCount(), infoStr);
-	infoStr.Format(_T("setPlaybackDevice : %d"), ret);
-	m_lstInfo.InsertString(m_lstInfo.GetCount(), infoStr);
-}
-
-void CLiveBroadcastingDlg::OnSelchangeComboLoopback()
-{
-	if (!m_audioDeviceManager) {
-		return;
-	}
-
-	int nSel = m_cmbLoopback.GetCurSel();
-	if (nSel < 0) return;
-
-	CString strDeviceName;
-	m_cmbLoopback.GetLBText(nSel, strDeviceName);
-
-	const char* deviceId = m_mapPlaybackDevices[strDeviceName].c_str();
-	int ret = (*m_audioDeviceManager)->setLoopbackDevice(deviceId);
-	CString infoStr;
-	infoStr.Format(_T("LoopbackkDeviceName : %s"), strDeviceName);
-	m_lstInfo.InsertString(m_lstInfo.GetCount(), infoStr);
-	infoStr.Format(_T("LoopbackDeviceId : %s"), utf82cs(deviceId));
-	m_lstInfo.InsertString(m_lstInfo.GetCount(), infoStr);
-	infoStr.Format(_T("setLoopbackDevice : %d"), ret);
-	m_lstInfo.InsertString(m_lstInfo.GetCount(), infoStr);
-}
 
 void CLiveBroadcastingDlg::OnBnClickedButtonJoinchannel()
 {
@@ -482,7 +408,6 @@ void CLiveBroadcastingDlg::OnBnClickedButtonJoinchannel()
             AfxMessageBox(_T("Fill channel name first"));
             return;
         }
-		m_rtcEngine->enableLoopbackRecording(true);
 
 		VideoEncoderConfiguration config;
 		if (m_cmbVideoEncoder.GetCurSel() < 3)
@@ -521,7 +446,6 @@ void CLiveBroadcastingDlg::OnShowWindow(BOOL bShow, UINT nStatus)
 
     if (bShow) {
         RenderLocalVideo();
-		SetupAudioDeviceLayout();
 	}
 	else
 	{

windows/APIExample/APIExample/Basic/LiveBroadcasting/CLiveBroadcastingDlg.h

@@ -209,8 +209,6 @@ class CLiveBroadcastingDlg : public CDialogEx
 public:
     afx_msg void OnSelchangeComboPersons();
     afx_msg void OnSelchangeComboRole();
-    afx_msg void OnSelchangeComboPlayback();
-    afx_msg void OnSelchangeComboLoopback();
     afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
     //Agora Event handler
     afx_msg LRESULT OnEIDJoinChannelSuccess(WPARAM wParam, LPARAM lParam);
@@ -274,9 +272,6 @@ class CLiveBroadcastingDlg : public CDialogEx
 	CButton m_chkReport;
 	CButton m_chkModeration;
 	CButton m_chkSnapshot;
-	CComboBox m_cmbPlayback;
-	CComboBox m_cmbLoopback;
-	std::map<CString, std::string> m_mapPlaybackDevices;
 	afx_msg void OnBnClickedCheckReport();
 	afx_msg void OnBnClickedModeration();
 	afx_msg void OnBnClickedSnapshot();