Merge branch 'dev/4.4.0' of https://github.com/AgoraIO/API-Examples i…

…nto dev/4.4.0
AgoraIO · Jul 2, 2024 · 192c667 · 192c667
2 parents 412f5ba + b6bc776
commit 192c667
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/windows/APIExample/APIExample/APIExample.rc b/windows/APIExample/APIExample/APIExample.rc
@@ -109,7 +109,6 @@ BEGIN
     GROUPBOX        "Canvas",IDC_STATIC,169,346,150,43
     CONTROL         "Hidden",IDC_RADIO_CANVAS_HIDDEN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,177,359,38,10
     CONTROL         "Fit",IDC_RADIO_CANVAS_FIT,"Button",BS_AUTORADIOBUTTON,221,359,34,10
-    CONTROL         "Adaptive",IDC_RADIO_CANVAS_ADAPTIVE,"Button",BS_AUTORADIOBUTTON,262,359,45,10
     CONTROL         "",IDC_SLIDER_CANVAS_COLOR,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,176,371,99,15
     LTEXT           "",IDC_STATIC_CANVAS_COLOR,275,373,39,10
     CONTROL         "VideoImage",IDC_CHECK_VIDEO_IMAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,392,53,10

diff --git a/windows/APIExample/APIExample/Basic/LiveBroadcasting/CLiveBroadcastingDlg.cpp b/windows/APIExample/APIExample/Basic/LiveBroadcasting/CLiveBroadcastingDlg.cpp
@@ -181,7 +181,6 @@ BEGIN_MESSAGE_MAP(CLiveBroadcastingDlg, CDialogEx)
 	ON_BN_CLICKED(IDC_BUTTON_PRELOAD, &CLiveBroadcastingDlg::OnBnClickedButtonPreload)
 	ON_BN_CLICKED(IDC_RADIO_CANVAS_HIDDEN, &CLiveBroadcastingDlg::OnBnClickedRadioCanvasRenderMode)
 	ON_BN_CLICKED(IDC_RADIO_CANVAS_FIT, &CLiveBroadcastingDlg::OnBnClickedRadioCanvasRenderMode)
-	ON_BN_CLICKED(IDC_RADIO_CANVAS_ADAPTIVE, &CLiveBroadcastingDlg::OnBnClickedRadioCanvasRenderMode)
 	ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_CANVAS_COLOR, &CLiveBroadcastingDlg::OnNMCustomdrawSliderCanvasColor)
 	ON_BN_CLICKED(IDC_CHECK_VIDEO_IMAGE, &CLiveBroadcastingDlg::OnBnClickedCheckVideoImage)
 END_MESSAGE_MAP()
@@ -1171,7 +1170,7 @@ void CLiveBroadcastingDlg::OnBnClickedRadioCanvasRenderMode()
 		m_canvasRenderMode = media::base::RENDER_MODE_FIT;
 		break;
 	default:
-		m_canvasRenderMode = media::base::RENDER_MODE_ADAPTIVE;
+		m_canvasRenderMode = media::base::RENDER_MODE_HIDDEN;
 		break;
 	}
 	ResetVideoView();