Skip to content

Commit cb3098b

Browse files
CLuChengCLuCheng
committed
insert audio mixing
1 parent fba5588 commit cb3098b

21 files changed

Lines changed: 758 additions & 19 deletions

‎windows/APIExample/APIExample/APIExample.rc‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,25 @@ BEGIN
247247
LTEXT "",IDC_STATIC_DETAIL,442,325,181,58
248248
END
249249

250+
IDD_DIALOG_AUDIO_MIX DIALOGEX 0, 0, 632, 400
251+
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
252+
FONT 8, "MS Shell Dlg", 400, 0, 0x1
253+
BEGIN
254+
LTEXT "",IDC_STATIC_VIDEO,1,0,483,310,NOT WS_VISIBLE
255+
LISTBOX IDC_LIST_INFO_BROADCASTING,491,0,139,312,LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
256+
LTEXT "Channel Name",IDC_STATIC_CHANNELNAME,11,328,48,8
257+
EDITTEXT IDC_EDIT_CHANNELNAME,71,326,218,13,ES_AUTOHSCROLL
258+
PUSHBUTTON "JoinChannel",IDC_BUTTON_JOINCHANNEL,307,326,60,14
259+
LTEXT "Audio Change",IDC_STATIC_AUDIO_MIX,11,352,48,8
260+
PUSHBUTTON "Set AudioChange",IDC_BUTTON_SET_AUDIO_MIX,307,351,60,14
261+
LTEXT "",IDC_STATIC_DETAIL,442,325,181,58
262+
EDITTEXT IDC_EDIT_AUDIO_MIX_PATH,71,352,218,13,ES_AUTOHSCROLL
263+
CONTROL "only local play",IDC_CHK_ONLY_LOCAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,307,375,61,10
264+
CONTROL "replace microphone",IDC_CHK_REPLACE_MICROPHONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,374,375,78,10
265+
LTEXT "repeat times",IDC_STATIC_AUDIO_REPEAT,11,373,48,8
266+
EDITTEXT IDC_EDIT_AUDIO_REPEAT_TIMES,71,373,218,13,ES_AUTOHSCROLL
267+
END
268+
250269

251270
/////////////////////////////////////////////////////////////////////////////
252271
//
@@ -316,6 +335,12 @@ BEGIN
316335
RIGHTMARGIN, 630
317336
BOTTOMMARGIN, 397
318337
END
338+
339+
IDD_DIALOG_AUDIO_MIX, DIALOG
340+
BEGIN
341+
RIGHTMARGIN, 630
342+
BOTTOMMARGIN, 397
343+
END
319344
END
320345
#endif // APSTUDIO_INVOKED
321346

@@ -375,6 +400,11 @@ BEGIN
375400
0
376401
END
377402

403+
IDD_DIALOG_AUDIO_MIX AFX_DIALOG_LAYOUT
404+
BEGIN
405+
0
406+
END
407+
378408
#endif // ����(���壬�й�) resources
379409
/////////////////////////////////////////////////////////////////////////////
380410

‎windows/APIExample/APIExample/APIExample.vcxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
<SDLCheck>false</SDLCheck>
9595
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9696
<AdditionalIncludeDirectories>$(SolutionDir)libs\include;$(solutionDir)ThirdParty\libYUV;$(ProjectDir)</AdditionalIncludeDirectories>
97+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9798
</ClCompile>
9899
<Link>
99100
<SubSystem>Windows</SubSystem>
@@ -123,6 +124,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Configuration))</Command>
123124
<SDLCheck>true</SDLCheck>
124125
<PreprocessorDefinitions>_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125126
<AdditionalIncludeDirectories>$(SolutionDir)\libs\include;..\libs\include;</AdditionalIncludeDirectories>
127+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
126128
</ClCompile>
127129
<Link>
128130
<SubSystem>Windows</SubSystem>
@@ -155,6 +157,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
155157
<SDLCheck>false</SDLCheck>
156158
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
157159
<AdditionalIncludeDirectories>$(SolutionDir)libs\include;$(solutionDir)ThirdParty\libYUV;$(ProjectDir)</AdditionalIncludeDirectories>
160+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
158161
</ClCompile>
159162
<Link>
160163
<SubSystem>Windows</SubSystem>
@@ -189,6 +192,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Configuration))
189192
<SDLCheck>true</SDLCheck>
190193
<PreprocessorDefinitions>_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
191194
<AdditionalIncludeDirectories>$(SolutionDir)libs\include</AdditionalIncludeDirectories>
195+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
192196
</ClCompile>
193197
<Link>
194198
<SubSystem>Windows</SubSystem>
@@ -214,6 +218,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
214218
</PostBuildEvent>
215219
</ItemDefinitionGroup>
216220
<ItemGroup>
221+
<ClInclude Include="Advanced\AudioMixing\CAgoraAudioMixingDlg.h" />
217222
<ClInclude Include="Advanced\AudioProfile\CAgoraAudioProfile.h" />
218223
<ClInclude Include="Advanced\BeautyAudio\CAgoraBeautyAudio.h" />
219224
<ClInclude Include="Advanced\Beauty\CAgoraBeautyDlg.h" />
@@ -242,6 +247,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
242247
<ClInclude Include="targetver.h" />
243248
</ItemGroup>
244249
<ItemGroup>
250+
<ClCompile Include="Advanced\AudioMixing\CAgoraAudioMixingDlg.cpp" />
245251
<ClCompile Include="Advanced\AudioProfile\CAgoraAudioProfile.cpp" />
246252
<ClCompile Include="Advanced\BeautyAudio\CAgoraBeautyAudio.cpp" />
247253
<ClCompile Include="Advanced\Beauty\CAgoraBeautyDlg.cpp" />

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
<Filter Include="Advanced\BeautyAudio">
5353
<UniqueIdentifier>{1008b46e-9830-4fb5-a3a3-cddbc96d8a48}</UniqueIdentifier>
5454
</Filter>
55+
<Filter Include="Advanced\AudioMixing">
56+
<UniqueIdentifier>{dfe1f155-efc1-492e-8ecf-35d55d7bf53c}</UniqueIdentifier>
57+
</Filter>
5558
</ItemGroup>
5659
<ItemGroup>
5760
<ClInclude Include="APIExample.h">
@@ -132,6 +135,9 @@
132135
<ClInclude Include="Advanced\BeautyAudio\CAgoraBeautyAudio.h">
133136
<Filter>Advanced\BeautyAudio</Filter>
134137
</ClInclude>
138+
<ClInclude Include="Advanced\AudioMixing\CAgoraAudioMixingDlg.h">
139+
<Filter>Advanced\AudioMixing</Filter>
140+
</ClInclude>
135141
</ItemGroup>
136142
<ItemGroup>
137143
<ClCompile Include="APIExample.cpp">
@@ -200,6 +206,9 @@
200206
<ClCompile Include="Advanced\BeautyAudio\CAgoraBeautyAudio.cpp">
201207
<Filter>Advanced\BeautyAudio</Filter>
202208
</ClCompile>
209+
<ClCompile Include="Advanced\AudioMixing\CAgoraAudioMixingDlg.cpp">
210+
<Filter>Advanced\AudioMixing</Filter>
211+
</ClCompile>
203212
</ItemGroup>
204213
<ItemGroup>
205214
<ResourceCompile Include="APIExample.rc">

‎windows/APIExample/APIExample/APIExampleDlg.cpp‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,10 @@ void CAPIExampleDlg::InitSceneDialog()
219219
m_vecAdvanced.push_back(advancedBeauty);
220220
m_vecAdvanced.push_back(advancedBeautyAudio);
221221
m_vecAdvanced.push_back(advancedAudioProfile);
222+
m_vecAdvanced.push_back(advancedAudioMixing);
222223
m_vecAdvanced.push_back(advancedCustomVideoCapture);
223224
m_vecAdvanced.push_back(advancedCustomAudioCapture);
224-
225+
225226
//inject
226227
m_pRtmpInjectDlg = new CAgoraRtmpInjectionDlg(&m_staMainArea);
227228
m_pRtmpInjectDlg->Create(CAgoraRtmpInjectionDlg::IDD);
@@ -256,6 +257,11 @@ void CAPIExampleDlg::InitSceneDialog()
256257
m_pAudioProfileDlg->Create(CAgoraAudioProfile::IDD);
257258
m_pAudioProfileDlg->MoveWindow(&rcWnd);
258259

260+
//audio mixing
261+
m_pAudioMixingDlg = new CAgoraAudioMixingDlg(&m_staMainArea);
262+
m_pAudioMixingDlg->Create(CAgoraAudioMixingDlg::IDD);
263+
m_pAudioMixingDlg->MoveWindow(&rcWnd);
264+
259265
//custom video capture
260266
m_pCaputreVideoDlg = new CAgoraCaptureVideoDlg(&m_staMainArea);
261267
m_pCaputreVideoDlg->Create(CAgoraCaptureVideoDlg::IDD);
@@ -421,6 +427,9 @@ void CAPIExampleDlg::CreateScene(CTreeCtrl& treeScene, CString selectedText)
421427
}else if (selectedText.Compare(advancedBeautyAudio) == 0) {
422428
m_pBeautyAudio->InitAgora();
423429
m_pBeautyAudio->ShowWindow(SW_SHOW);
430+
}else if (selectedText.Compare(advancedAudioMixing) == 0) {
431+
m_pAudioMixingDlg->InitAgora();
432+
m_pAudioMixingDlg->ShowWindow(SW_SHOW);
424433
}
425434
}
426435

@@ -458,6 +467,9 @@ void CAPIExampleDlg::ReleaseScene(CTreeCtrl& treeScene, HTREEITEM& hSelectItem)
458467
}else if (str.Compare(advancedBeautyAudio) == 0) {
459468
m_pBeautyAudio->UnInitAgora();
460469
m_pBeautyAudio->ShowWindow(SW_HIDE);
470+
}else if (str.Compare(advancedAudioMixing) == 0) {
471+
m_pAudioMixingDlg->UnInitAgora();
472+
m_pAudioMixingDlg->ShowWindow(SW_HIDE);
461473
}
462474
}
463475

‎windows/APIExample/APIExample/APIExampleDlg.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "Advanced/Beauty/CAgoraBeautyDlg.h"
1414
#include "Advanced/AudioProfile/CAgoraAudioProfile.h"
1515
#include "Advanced/BeautyAudio/CAgoraBeautyAudio.h"
16+
#include "Advanced/AudioMixing/CAgoraAudioMixingDlg.h"
1617

1718

1819
#include <vector>
@@ -69,7 +70,7 @@ class CAPIExampleDlg : public CDialogEx
6970
CAgoraBeautyDlg *m_pBeautyDlg = nullptr;
7071
CAgoraAudioProfile *m_pAudioProfileDlg = nullptr;
7172
CAgoraBeautyAudio *m_pBeautyAudio = nullptr;
72-
73+
CAgoraAudioMixingDlg *m_pAudioMixingDlg = nullptr;
7374
CString m_preSelectedItemText = _T("");
7475
std::vector<CString> m_vecBasic, m_vecAdvanced;
7576

0 commit comments

Comments
 (0)