Skip to content

Commit f53e617

Browse files
CLuChengCLuCheng
committed
adapter 3.2.0
1 parent 935c931 commit f53e617

19 files changed

Lines changed: 200 additions & 157 deletions

‎windows/APIExample/APIExample/APIExample.rc‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,15 @@ BEGIN
253253
EDITTEXT IDC_EDIT_CHANNELNAME,71,326,218,13,ES_AUTOHSCROLL
254254
PUSHBUTTON "JoinChannel",IDC_BUTTON_JOINCHANNEL,307,326,60,14
255255
LTEXT "Audio Change",IDC_STATIC_AUDIO_CHANGER,11,352,48,8
256-
COMBOBOX IDC_COMBO_AUDIO_CHANGER,71,350,218,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
257-
LTEXT "",IDC_STATIC_DETAIL,442,325,181,58
256+
COMBOBOX IDC_COMBO_AUDIO_CHANGER,71,350,172,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
257+
LTEXT "",IDC_STATIC_DETAIL,456,325,167,58
258258
LTEXT "Reverb Preset",IDC_STATIC_BEAUTY_AUDIO_TYPE,12,374,48,8
259-
COMBOBOX IDC_COMBO_AUDIO_PERVERB_PRESET,71,373,218,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
260-
PUSHBUTTON "Button2",IDC_BUTTON_SET_BEAUTY_AUDIO,307,360,58,14
259+
COMBOBOX IDC_COMBO_AUDIO_PERVERB_PRESET,71,373,171,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
260+
PUSHBUTTON "Button2",IDC_BUTTON_SET_BEAUTY_AUDIO,355,358,58,14
261+
EDITTEXT IDC_EDIT_PARAM1,292,349,56,14,ES_AUTOHSCROLL
262+
LTEXT "param1",IDC_STATIC_PARAM1,251,351,36,8
263+
LTEXT "param2",IDC_STATIC_PARAM2,251,373,38,8
264+
EDITTEXT IDC_EDIT_PARAM2,292,371,56,14,ES_AUTOHSCROLL
261265
END
262266

263267
IDD_DIALOG_AUDIO_MIX DIALOGEX 0, 0, 632, 400

‎windows/APIExample/APIExample/APIExample.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115115
</ResourceCompile>
116116
<PostBuildEvent>
117-
<Command>if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\agora_rtc_sdk.dll $(SolutionDir)$(Configuration))
117+
<Command>if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\*.dll $(SolutionDir)$(Configuration))
118118
if exist zh-cn.ini (copy zh-cn.ini $(SolutionDir)$(Configuration))
119119
if exist en.ini (copy en.ini $(SolutionDir)$(Configuration))
120120
if exist $(SolutionDir)MediaPlayerPart (copy $(SolutionDir)MediaPlayerPart\dll\AgoraMediaPlayer.dll $(SolutionDir)$(Configuration))</Command>
@@ -195,7 +195,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
195195
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
196196
</ResourceCompile>
197197
<PostBuildEvent>
198-
<Command>if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\agora_rtc_sdk.dll $(SolutionDir)$(Configuration))
198+
<Command>if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\*.dll $(SolutionDir)$(Configuration))
199199
if exist zh-cn.ini (copy zh-cn.ini $(SolutionDir)$(Configuration))
200200
if exist en.ini (copy en.ini $(SolutionDir)$(Configuration))
201201
if exist $(SolutionDir)MediaPlayerPart (copy $(SolutionDir)MediaPlayerPart\dll\AgoraMediaPlayer.dll $(SolutionDir)$(Configuration))</Command>
@@ -264,7 +264,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
264264
<ClInclude Include="Advanced\MultiChannel\CAgoraMultiChannelDlg.h" />
265265
<ClInclude Include="Advanced\OriginalAudio\CAgoraOriginalAudioDlg.h" />
266266
<ClInclude Include="Advanced\OriginalVideo\CAgoraOriginalVideoDlg.h" />
267-
<ClInclude Include="Advanced\PerCallTest\CAgoraPerCallTestDlg.h" />
267+
<ClInclude Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.h" />
268268
<ClInclude Include="Advanced\RegionConn\CAgoraRegionConnDlg.h" />
269269
<ClInclude Include="Advanced\ReportInCall\CAgoraReportInCallDlg.h" />
270270
<ClInclude Include="Advanced\RTMPinject\AgoraRtmpInjectionDlg.h" />
@@ -317,7 +317,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
317317
<ClCompile Include="Advanced\MultiChannel\CAgoraMultiChannelDlg.cpp" />
318318
<ClCompile Include="Advanced\OriginalAudio\CAgoraOriginalAudioDlg.cpp" />
319319
<ClCompile Include="Advanced\OriginalVideo\CAgoraOriginalVideoDlg.cpp" />
320-
<ClCompile Include="Advanced\PerCallTest\CAgoraPerCallTestDlg.cpp" />
320+
<ClCompile Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.cpp" />
321321
<ClCompile Include="Advanced\RegionConn\CAgoraRegionConnDlg.cpp" />
322322
<ClCompile Include="Advanced\ReportInCall\CAgoraReportInCallDlg.cpp" />
323323
<ClCompile Include="Advanced\RTMPinject\AgoraRtmpInjectionDlg.cpp" />

‎windows/APIExample/APIExample/APIExample.vcxproj.filters‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@
9191
<Filter Include="Advanced\MultiChannel">
9292
<UniqueIdentifier>{4ea083f3-3c9b-4831-a8ea-b495e9a7b26f}</UniqueIdentifier>
9393
</Filter>
94-
<Filter Include="Advanced\PerCallTest">
95-
<UniqueIdentifier>{cf51ce8e-f1ab-472d-b82f-e64b2492abb8}</UniqueIdentifier>
96-
</Filter>
9794
<Filter Include="Advanced\AudioVolume">
9895
<UniqueIdentifier>{04bba177-86b2-4d30-8dc2-b4470312c0c9}</UniqueIdentifier>
9996
</Filter>
@@ -106,6 +103,9 @@
106103
<Filter Include="Advanced\CrossChannel">
107104
<UniqueIdentifier>{5674a9ae-823a-41eb-9101-c82700ecbfe4}</UniqueIdentifier>
108105
</Filter>
106+
<Filter Include="Advanced\PreCallTest">
107+
<UniqueIdentifier>{cf51ce8e-f1ab-472d-b82f-e64b2492abb8}</UniqueIdentifier>
108+
</Filter>
109109
</ItemGroup>
110110
<ItemGroup>
111111
<ClInclude Include="APIExample.h">
@@ -246,9 +246,6 @@
246246
<ClInclude Include="AGVideoTestWnd.h">
247247
<Filter>Header Files</Filter>
248248
</ClInclude>
249-
<ClInclude Include="Advanced\PerCallTest\CAgoraPerCallTestDlg.h">
250-
<Filter>Advanced\PerCallTest</Filter>
251-
</ClInclude>
252249
<ClInclude Include="Advanced\AudioVolume\CAgoraAudioVolumeDlg.h">
253250
<Filter>Advanced\AudioVolume</Filter>
254251
</ClInclude>
@@ -261,6 +258,9 @@
261258
<ClInclude Include="Advanced\CrossChannel\CAgoraCrossChannelDlg.h">
262259
<Filter>Advanced\CrossChannel</Filter>
263260
</ClInclude>
261+
<ClInclude Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.h">
262+
<Filter>Advanced\PreCallTest</Filter>
263+
</ClInclude>
264264
</ItemGroup>
265265
<ItemGroup>
266266
<ClCompile Include="APIExample.cpp">
@@ -377,9 +377,6 @@
377377
<ClCompile Include="AGVideoTestWnd.cpp">
378378
<Filter>Source Files</Filter>
379379
</ClCompile>
380-
<ClCompile Include="Advanced\PerCallTest\CAgoraPerCallTestDlg.cpp">
381-
<Filter>Advanced\PerCallTest</Filter>
382-
</ClCompile>
383380
<ClCompile Include="Advanced\AudioVolume\CAgoraAudioVolumeDlg.cpp">
384381
<Filter>Advanced\AudioVolume</Filter>
385382
</ClCompile>
@@ -392,6 +389,9 @@
392389
<ClCompile Include="Advanced\CrossChannel\CAgoraCrossChannelDlg.cpp">
393390
<Filter>Advanced\CrossChannel</Filter>
394391
</ClCompile>
392+
<ClCompile Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.cpp">
393+
<Filter>Advanced\PreCallTest</Filter>
394+
</ClCompile>
395395
</ItemGroup>
396396
<ItemGroup>
397397
<ResourceCompile Include="APIExample.rc">

‎windows/APIExample/APIExample/APIExampleDlg.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ void CAPIExampleDlg::InitSceneDialog()
334334
m_pMultiChannelDlg->MoveWindow(&rcWnd);
335335

336336
//per call test
337-
m_pPerCallTestDlg = new CAgoraPerCallTestDlg(&m_staMainArea);
338-
m_pPerCallTestDlg->Create(CAgoraPerCallTestDlg::IDD);
337+
m_pPerCallTestDlg = new CAgoraPreCallTestDlg(&m_staMainArea);
338+
m_pPerCallTestDlg->Create(CAgoraPreCallTestDlg::IDD);
339339
m_pPerCallTestDlg->MoveWindow(&rcWnd);
340340

341341
//audio volume

‎windows/APIExample/APIExample/APIExampleDlg.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "Advanced/MediaIOCustomVideoCaptrue/CAgoraMediaIOVideoCaptureDlg.h"
2424
#include "Advanced/AudioEffect/CAgoraEffectDlg.h"
2525
#include "Advanced/MultiChannel/CAgoraMultiChannelDlg.h"
26-
#include "Advanced/PerCallTest/CAgoraPerCallTestDlg.h"
26+
#include "Advanced/PreCallTest/CAgoraPreCallTestDlg.h"
2727
#include "Advanced/AudioVolume/CAgoraAudioVolumeDlg.h"
2828
#include "Advanced/ReportInCall/CAgoraReportInCallDlg.h"
2929
#include "Advanced/RegionConn/CAgoraRegionConnDlg.h"
@@ -94,7 +94,7 @@ class CAPIExampleDlg : public CDialogEx
9494
CAgoraMediaEncryptDlg *m_pMediaEncryptDlg = nullptr;
9595
CAgoraEffectDlg *m_pAudioEffectDlg = nullptr;
9696
CAgoraMultiChannelDlg *m_pMultiChannelDlg = nullptr;
97-
CAgoraPerCallTestDlg *m_pPerCallTestDlg = nullptr;
97+
CAgoraPreCallTestDlg *m_pPerCallTestDlg = nullptr;
9898
CAgoraAudioVolumeDlg *m_pAudioVolumeDlg = nullptr;
9999
CAgoraReportInCallDlg *m_pReportInCallDlg = nullptr;
100100
CAgoraRegionConnDlg *m_pRegionConnDlg = nullptr;

‎windows/APIExample/APIExample/Advanced/AudioProfile/CAgoraAudioProfile.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ BOOL CAgoraAudioProfile::OnInitDialog()
179179
m_cmbAudioProfile.InsertString(nIndex++, _T("AUDIO_PROFILE_MUSIC_STANDARD_STEREO"));
180180
m_cmbAudioProfile.InsertString(nIndex++, _T("AUDIO_PROFILE_MUSIC_HIGH_QUALITY"));
181181
m_cmbAudioProfile.InsertString(nIndex++, _T("AUDIO_PROFILE_MUSIC_HIGH_QUALITY_STEREO"));
182+
m_cmbAudioProfile.InsertString(nIndex++, _T("AUDIO_PROFILE_IOT"));
182183

183184
nIndex = 0;
184185
m_cmbAudioScenario.InsertString(nIndex++, _T("AUDIO_SCENARIO_DEFAULT"));
@@ -187,6 +188,10 @@ BOOL CAgoraAudioProfile::OnInitDialog()
187188
m_cmbAudioScenario.InsertString(nIndex++, _T("AUDIO_SCENARIO_GAME_STREAMING"));
188189
m_cmbAudioScenario.InsertString(nIndex++, _T("AUDIO_SCENARIO_SHOWROOM"));
189190
m_cmbAudioScenario.InsertString(nIndex++, _T("AUDIO_SCENARIO_CHATROOM_GAMING"));
191+
m_cmbAudioScenario.InsertString(nIndex++, _T("AUDIO_SCENARIO_IOT"));
192+
m_cmbAudioScenario.InsertString(8, _T("AUDIO_SCENARIO_MEETING"));
193+
194+
190195
ResumeStatus();
191196

192197
return TRUE;

0 commit comments

Comments
 (0)