Skip to content

Commit 3bcf4c2

Browse files
committed
fix: fix bugs
1 parent 5bd8efb commit 3bcf4c2

9 files changed

Lines changed: 30 additions & 5 deletions

File tree

windows/APIExample/APIExample/APIExample.rc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,10 @@ END
879879

880880
IDB_BITMAP_NETWORK_STATE BITMAP "res\\IDB_NETWORK_QUALITY.bmp"
881881

882+
IDB_BITMAP1 BITMAP "res\\local.bmp"
883+
884+
IDB_BITMAP2 BITMAP "res\\remote.bmp"
885+
882886

883887
/////////////////////////////////////////////////////////////////////////////
884888
//
@@ -887,6 +891,8 @@ IDB_BITMAP_NETWORK_STATE BITMAP "res\\IDB_NETWORK_QUALITY.bmp"
887891

888892
IDR_TEST_WAVE WAVE "res\\ID_TEST_AUDIO.wav"
889893

894+
IDR_WAVE1 WAVE "res\\audiomixing.wav"
895+
890896
#endif // ����(���壬�й�) resources
891897
/////////////////////////////////////////////////////////////////////////////
892898

windows/APIExample/APIExample/APIExample.vcxproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5252
<ConfigurationType>Application</ConfigurationType>
5353
<UseDebugLibraries>false</UseDebugLibraries>
54-
<PlatformToolset>v141</PlatformToolset>
54+
<PlatformToolset>v142</PlatformToolset>
5555
<WholeProgramOptimization>true</WholeProgramOptimization>
5656
<CharacterSet>Unicode</CharacterSet>
5757
<UseOfMfc>Dynamic</UseOfMfc>
@@ -367,8 +367,13 @@ copy $(SolutionDir)APIExample\Advanced\LocalVideoTranscoding\agora.jpg $(Solutio
367367
<ItemGroup>
368368
<Image Include="res\APIExample.ico" />
369369
<Image Include="res\IDB_NETWORK_QUALITY.bmp" />
370+
<Image Include="res\local.bmp" />
371+
<Image Include="res\remote.bmp" />
370372
</ItemGroup>
371373
<ItemGroup>
374+
<CopyFileToFolders Include="res\audiomixing.wav">
375+
<FileType>Document</FileType>
376+
</CopyFileToFolders>
372377
<Media Include="res\ID_TEST_AUDIO.wav" />
373378
</ItemGroup>
374379
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

windows/APIExample/APIExample/APIExample.vcxproj.filters

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,21 @@
374374
<Image Include="res\IDB_NETWORK_QUALITY.bmp">
375375
<Filter>Resource Files</Filter>
376376
</Image>
377+
<Image Include="res\local.bmp">
378+
<Filter>Resource Files</Filter>
379+
</Image>
380+
<Image Include="res\remote.bmp">
381+
<Filter>Resource Files</Filter>
382+
</Image>
377383
</ItemGroup>
378384
<ItemGroup>
379385
<Media Include="res\ID_TEST_AUDIO.wav">
380386
<Filter>Resource Files</Filter>
381387
</Media>
382388
</ItemGroup>
389+
<ItemGroup>
390+
<CopyFileToFolders Include="res\audiomixing.wav">
391+
<Filter>Resource Files</Filter>
392+
</CopyFileToFolders>
393+
</ItemGroup>
383394
</Project>

windows/APIExample/APIExample/Advanced/Beauty/CDlgBeauty.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void CDlgBeauty::OnBnClickedButtonJoinchannel()
9898

9999
//join channel
100100
agora::rtc::ChannelMediaOptions op;
101-
op.publishTrancodedVideoTrack = true;
101+
op.publishCameraTrack = true;
102102
op.channelProfile = CHANNEL_PROFILE_LIVE_BROADCASTING;
103103
op.clientRoleType = agora::rtc::CLIENT_ROLE_BROADCASTER;
104104
if (0 == m_rtcEngine->joinChannel(APP_TOKEN, szChannelId.data(), 0, op)) {
@@ -153,7 +153,7 @@ bool CDlgBeauty::InitAgora()
153153
strInfo.Format(_T("libagora_segmentation_extension: %d"), ret);
154154
m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
155155
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("libagora_segmentation_extension.dll"));
156-
ret = m_rtcEngine->enableExtension("agora_segmentation", "PortraitSegmentation", true);
156+
ret = m_rtcEngine->enableExtension("agora_video_filters_segmentation", "portrait_segmentation", true);
157157
strInfo.Format(_T("enableExtension: %d"), ret);
158158
m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
159159
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("agora_segmentation"));

windows/APIExample/APIExample/Advanced/SpatialAudio/CAgoraSpatialAudioDlg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ BOOL CAgoraSpatialAudioDlg::OnInitDialog()
214214
m_staRemote.MoveWindow(x, y, remoteWidth, remoteWidth);
215215
m_staRemote.ShowWindow(SW_SHOW);
216216

217-
m_audioPath = GetExePath() + _T("\\audiomixing.mp3");
217+
m_audioPath = GetExePath() + _T("\\audiomixing.wav");
218218

219219
int deltaX = abs(rcRemote.left - rcLocal.left);
220220
int deltaY = abs(rcRemote.top - rcLocal.top);
239 KB
Binary file not shown.
File renamed without changes.
1.24 KB
Binary file not shown.

windows/APIExample/APIExample/resource.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@
3434
#define IDD_DIALOG_VOLUME 152
3535
#define IDD_DIALOG_PEPORT_IN_CALL 153
3636
#define IDD_DIALOG_REGIONAL_CONNECTION 154
37+
#define IDB_BITMAP1 154
3738
#define IDD_DIALOG_CROSS_CHANNEL 155
39+
#define IDB_BITMAP2 155
3840
#define IDD_DIALOG_MULTICAMERA 156
41+
#define IDR_WAVE1 156
3942
#define IDD_DIALOG_LOCAL_VIDEO_TRANSCODING 157
4043
#define IDD_DIALOG_SPATIAL_AUDIO 158
4144
#define IDC_BUTTON_FAQ 1000
@@ -290,7 +293,7 @@
290293
//
291294
#ifdef APSTUDIO_INVOKED
292295
#ifndef APSTUDIO_READONLY_SYMBOLS
293-
#define _APS_NEXT_RESOURCE_VALUE 149
296+
#define _APS_NEXT_RESOURCE_VALUE 157
294297
#define _APS_NEXT_COMMAND_VALUE 32771
295298
#define _APS_NEXT_CONTROL_VALUE 1103
296299
#define _APS_NEXT_SYMED_VALUE 101

0 commit comments

Comments
 (0)