Skip to content

Commit 9f6ae76

Browse files
plutolessplutoless
committed
3.2.0 adapt
1 parent 3003550 commit 9f6ae76

File tree

16 files changed

+272
-14
lines changed

16 files changed

+272
-14
lines changed

‎iOS/APIExample.xcodeproj/project.pbxproj

+94
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,26 @@
8181
03BEED08251C35E7005E78F4 /* AudioMixing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03BEED06251C35E7005E78F4 /* AudioMixing.swift */; };
8282
03BEED0B251C4446005E78F4 /* audiomixing.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 03BEED0A251C4446005E78F4 /* audiomixing.mp3 */; };
8383
03BEED0D251CAB9C005E78F4 /* audioeffect.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 03BEED0C251CAB9C005E78F4 /* audioeffect.mp3 */; };
84+
03C1645325445115002C6F4E /* Agorafdkaac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1644E2544510C002C6F4E /* Agorafdkaac.framework */; };
85+
03C1645425445115002C6F4E /* Agorafdkaac.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1644E2544510C002C6F4E /* Agorafdkaac.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
86+
03C1645625445117002C6F4E /* Agoraffmpeg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1644B2544510B002C6F4E /* Agoraffmpeg.framework */; };
87+
03C1645725445117002C6F4E /* Agoraffmpeg.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1644B2544510B002C6F4E /* Agoraffmpeg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
88+
03C1645825445118002C6F4E /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1644C2544510C002C6F4E /* AgoraRtcKit.framework */; };
89+
03C1645925445118002C6F4E /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1644C2544510C002C6F4E /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
90+
03C1645A25445119002C6F4E /* AgoraSoundTouch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1644D2544510C002C6F4E /* AgoraSoundTouch.framework */; };
91+
03C1645B25445119002C6F4E /* AgoraSoundTouch.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1644D2544510C002C6F4E /* AgoraSoundTouch.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
92+
03C1646425445204002C6F4E /* Agorafdkaac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1645F254451FD002C6F4E /* Agorafdkaac.framework */; };
93+
03C1646525445204002C6F4E /* Agorafdkaac.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1645F254451FD002C6F4E /* Agorafdkaac.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
94+
03C1646725445205002C6F4E /* Agoraffmpeg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1645C254451FD002C6F4E /* Agoraffmpeg.framework */; };
95+
03C1646825445205002C6F4E /* Agoraffmpeg.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1645C254451FD002C6F4E /* Agoraffmpeg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
96+
03C1646925445206002C6F4E /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1645E254451FD002C6F4E /* AgoraRtcKit.framework */; };
97+
03C1646A25445206002C6F4E /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1645E254451FD002C6F4E /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
98+
03C1646B25445208002C6F4E /* AgoraSoundTouch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1645D254451FD002C6F4E /* AgoraSoundTouch.framework */; };
99+
03C1646C25445208002C6F4E /* AgoraSoundTouch.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03C1645D254451FD002C6F4E /* AgoraSoundTouch.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
100+
03C1646E25447201002C6F4E /* srmetal.metallib in Resources */ = {isa = PBXBuildFile; fileRef = 03C1646D25447201002C6F4E /* srmetal.metallib */; };
101+
03C1647225447249002C6F4E /* pvc_jnqd.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 03C1646F25447249002C6F4E /* pvc_jnqd.bundle */; };
102+
03C1647325447249002C6F4E /* model.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 03C1647025447249002C6F4E /* model.bundle */; };
103+
03C1647425447249002C6F4E /* pvc_kernels.metallib in Resources */ = {isa = PBXBuildFile; fileRef = 03C1647125447249002C6F4E /* pvc_kernels.metallib */; };
84104
03D13BD02448758900B599B3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D13BCF2448758900B599B3 /* AppDelegate.swift */; };
85105
03D13BD42448758900B599B3 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D13BD32448758900B599B3 /* ViewController.swift */; };
86106
03D13BD72448758900B599B3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 03D13BD52448758900B599B3 /* Main.storyboard */; };
@@ -124,6 +144,34 @@
124144
name = "Embed App Extensions";
125145
runOnlyForDeploymentPostprocessing = 0;
126146
};
147+
03C1645525445115002C6F4E /* Embed Frameworks */ = {
148+
isa = PBXCopyFilesBuildPhase;
149+
buildActionMask = 2147483647;
150+
dstPath = "";
151+
dstSubfolderSpec = 10;
152+
files = (
153+
03C1645925445118002C6F4E /* AgoraRtcKit.framework in Embed Frameworks */,
154+
03C1645725445117002C6F4E /* Agoraffmpeg.framework in Embed Frameworks */,
155+
03C1645425445115002C6F4E /* Agorafdkaac.framework in Embed Frameworks */,
156+
03C1645B25445119002C6F4E /* AgoraSoundTouch.framework in Embed Frameworks */,
157+
);
158+
name = "Embed Frameworks";
159+
runOnlyForDeploymentPostprocessing = 0;
160+
};
161+
03C1646625445204002C6F4E /* Embed Frameworks */ = {
162+
isa = PBXCopyFilesBuildPhase;
163+
buildActionMask = 2147483647;
164+
dstPath = "";
165+
dstSubfolderSpec = 10;
166+
files = (
167+
03C1646A25445206002C6F4E /* AgoraRtcKit.framework in Embed Frameworks */,
168+
03C1646825445205002C6F4E /* Agoraffmpeg.framework in Embed Frameworks */,
169+
03C1646525445204002C6F4E /* Agorafdkaac.framework in Embed Frameworks */,
170+
03C1646C25445208002C6F4E /* AgoraSoundTouch.framework in Embed Frameworks */,
171+
);
172+
name = "Embed Frameworks";
173+
runOnlyForDeploymentPostprocessing = 0;
174+
};
127175
/* End PBXCopyFilesBuildPhase section */
128176

129177
/* Begin PBXFileReference section */
@@ -243,6 +291,18 @@
243291
03BEED06251C35E7005E78F4 /* AudioMixing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioMixing.swift; sourceTree = "<group>"; };
244292
03BEED0A251C4446005E78F4 /* audiomixing.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = audiomixing.mp3; sourceTree = "<group>"; };
245293
03BEED0C251CAB9C005E78F4 /* audioeffect.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = audioeffect.mp3; sourceTree = "<group>"; };
294+
03C1644B2544510B002C6F4E /* Agoraffmpeg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Agoraffmpeg.framework; sourceTree = "<group>"; };
295+
03C1644C2544510C002C6F4E /* AgoraRtcKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AgoraRtcKit.framework; sourceTree = "<group>"; };
296+
03C1644D2544510C002C6F4E /* AgoraSoundTouch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AgoraSoundTouch.framework; sourceTree = "<group>"; };
297+
03C1644E2544510C002C6F4E /* Agorafdkaac.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Agorafdkaac.framework; sourceTree = "<group>"; };
298+
03C1645C254451FD002C6F4E /* Agoraffmpeg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Agoraffmpeg.framework; path = APIExample/Agoraffmpeg.framework; sourceTree = SOURCE_ROOT; };
299+
03C1645D254451FD002C6F4E /* AgoraSoundTouch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AgoraSoundTouch.framework; path = APIExample/AgoraSoundTouch.framework; sourceTree = SOURCE_ROOT; };
300+
03C1645E254451FD002C6F4E /* AgoraRtcKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AgoraRtcKit.framework; path = APIExample/AgoraRtcKit.framework; sourceTree = SOURCE_ROOT; };
301+
03C1645F254451FD002C6F4E /* Agorafdkaac.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Agorafdkaac.framework; path = APIExample/Agorafdkaac.framework; sourceTree = SOURCE_ROOT; };
302+
03C1646D25447201002C6F4E /* srmetal.metallib */ = {isa = PBXFileReference; lastKnownFileType = "archive.metal-library"; name = srmetal.metallib; path = APIExample/AgoraRtcKit.framework/AgoraResources/srmetal.metallib; sourceTree = SOURCE_ROOT; };
303+
03C1646F25447249002C6F4E /* pvc_jnqd.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = pvc_jnqd.bundle; path = APIExample/AgoraRtcKit.framework/AgoraResources/pvc_jnqd.bundle; sourceTree = SOURCE_ROOT; };
304+
03C1647025447249002C6F4E /* model.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = model.bundle; path = APIExample/AgoraRtcKit.framework/AgoraResources/model.bundle; sourceTree = SOURCE_ROOT; };
305+
03C1647125447249002C6F4E /* pvc_kernels.metallib */ = {isa = PBXFileReference; lastKnownFileType = "archive.metal-library"; name = pvc_kernels.metallib; path = APIExample/AgoraRtcKit.framework/AgoraResources/pvc_kernels.metallib; sourceTree = SOURCE_ROOT; };
246306
03D13BCC2448758900B599B3 /* APIExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = APIExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
247307
03D13BCF2448758900B599B3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
248308
03D13BD32448758900B599B3 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -284,9 +344,13 @@
284344
isa = PBXFrameworksBuildPhase;
285345
buildActionMask = 2147483647;
286346
files = (
347+
03C1646725445205002C6F4E /* Agoraffmpeg.framework in Frameworks */,
287348
0339BE9D25205B7F007D4FDD /* ReplayKit.framework in Frameworks */,
288349
0339BEC625207EA7007D4FDD /* Accelerate.framework in Frameworks */,
350+
03C1646B25445208002C6F4E /* AgoraSoundTouch.framework in Frameworks */,
351+
03C1646925445206002C6F4E /* AgoraRtcKit.framework in Frameworks */,
289352
0339BEC225205D1A007D4FDD /* libios_resampler.a in Frameworks */,
353+
03C1646425445204002C6F4E /* Agorafdkaac.framework in Frameworks */,
290354
CBCDE23FB64E60D6A79F3723 /* Pods_Agora_ScreenShare_Extension.framework in Frameworks */,
291355
);
292356
runOnlyForDeploymentPostprocessing = 0;
@@ -296,6 +360,10 @@
296360
buildActionMask = 2147483647;
297361
files = (
298362
D4046B5D3DE984062E3F6D92 /* Pods_APIExample.framework in Frameworks */,
363+
03C1645A25445119002C6F4E /* AgoraSoundTouch.framework in Frameworks */,
364+
03C1645825445118002C6F4E /* AgoraRtcKit.framework in Frameworks */,
365+
03C1645625445117002C6F4E /* Agoraffmpeg.framework in Frameworks */,
366+
03C1645325445115002C6F4E /* Agorafdkaac.framework in Frameworks */,
299367
);
300368
runOnlyForDeploymentPostprocessing = 0;
301369
};
@@ -373,6 +441,10 @@
373441
0339BE9E25205B7F007D4FDD /* Agora-ScreenShare-Extension */ = {
374442
isa = PBXGroup;
375443
children = (
444+
03C1645F254451FD002C6F4E /* Agorafdkaac.framework */,
445+
03C1645C254451FD002C6F4E /* Agoraffmpeg.framework */,
446+
03C1645E254451FD002C6F4E /* AgoraRtcKit.framework */,
447+
03C1645D254451FD002C6F4E /* AgoraSoundTouch.framework */,
376448
0339BEBF25205D1A007D4FDD /* AgoraAudioTube.h */,
377449
0339BEC025205D1A007D4FDD /* AgoraAudioTube.mm */,
378450
0339BEBE25205D1A007D4FDD /* AgoraUploader.swift */,
@@ -614,6 +686,10 @@
614686
03BEED09251C4446005E78F4 /* Resources */ = {
615687
isa = PBXGroup;
616688
children = (
689+
03C1647025447249002C6F4E /* model.bundle */,
690+
03C1646F25447249002C6F4E /* pvc_jnqd.bundle */,
691+
03C1647125447249002C6F4E /* pvc_kernels.metallib */,
692+
03C1646D25447201002C6F4E /* srmetal.metallib */,
617693
03BEED0C251CAB9C005E78F4 /* audioeffect.mp3 */,
618694
03BEED0A251C4446005E78F4 /* audiomixing.mp3 */,
619695
);
@@ -643,6 +719,10 @@
643719
03D13BCE2448758900B599B3 /* APIExample */ = {
644720
isa = PBXGroup;
645721
children = (
722+
03C1644E2544510C002C6F4E /* Agorafdkaac.framework */,
723+
03C1644B2544510B002C6F4E /* Agoraffmpeg.framework */,
724+
03C1644C2544510C002C6F4E /* AgoraRtcKit.framework */,
725+
03C1644D2544510C002C6F4E /* AgoraSoundTouch.framework */,
646726
03D13BD52448758900B599B3 /* Main.storyboard */,
647727
A7CA48C224553CF600507435 /* Popover.storyboard */,
648728
03D13BD32448758900B599B3 /* ViewController.swift */,
@@ -768,6 +848,7 @@
768848
0339BE9725205B7F007D4FDD /* Sources */,
769849
0339BE9825205B7F007D4FDD /* Frameworks */,
770850
0339BE9925205B7F007D4FDD /* Resources */,
851+
03C1646625445204002C6F4E /* Embed Frameworks */,
771852
);
772853
buildRules = (
773854
);
@@ -788,6 +869,7 @@
788869
03D13BCA2448758900B599B3 /* Resources */,
789870
1B6F6CF9B678035E221EAFDE /* [CP] Embed Pods Frameworks */,
790871
0339BEBA25205B80007D4FDD /* Embed App Extensions */,
872+
03C1645525445115002C6F4E /* Embed Frameworks */,
791873
);
792874
buildRules = (
793875
);
@@ -851,9 +933,11 @@
851933
isa = PBXResourcesBuildPhase;
852934
buildActionMask = 2147483647;
853935
files = (
936+
03C1647425447249002C6F4E /* pvc_kernels.metallib in Resources */,
854937
033A9F8E252D8FF300BC26E1 /* JoinMultiChannel.storyboard in Resources */,
855938
03BEED0B251C4446005E78F4 /* audiomixing.mp3 in Resources */,
856939
03B12DAC251127DC00E55818 /* VideoViewMetal.xib in Resources */,
940+
03C1646E25447201002C6F4E /* srmetal.metallib in Resources */,
857941
033A9F89252D8B6C00BC26E1 /* PrecallTest.storyboard in Resources */,
858942
033A9F61252D8B0A00BC26E1 /* VideoMetadata.storyboard in Resources */,
859943
033A9F3A252D89A600BC26E1 /* RTMPInjection.storyboard in Resources */,
@@ -862,6 +946,7 @@
862946
033A9F7F252D8B5900BC26E1 /* AudioMixing.storyboard in Resources */,
863947
033A9F70252D8B3E00BC26E1 /* SuperResolution.storyboard in Resources */,
864948
033A9F7A252D8B5000BC26E1 /* MediaPlayer.storyboard in Resources */,
949+
03C1647225447249002C6F4E /* pvc_jnqd.bundle in Resources */,
865950
033A9F35252D896100BC26E1 /* RawMediaData.storyboard in Resources */,
866951
0339D6D224E91B80008739CD /* QuickSwitchChannelVCItem.xib in Resources */,
867952
03BEED0D251CAB9C005E78F4 /* audioeffect.mp3 in Resources */,
@@ -873,6 +958,7 @@
873958
033A9F52252D89E600BC26E1 /* CustomVideoRender.storyboard in Resources */,
874959
03B12DAA251125B700E55818 /* VideoView.xib in Resources */,
875960
033A9F48252D89D000BC26E1 /* CustomAudioRender.storyboard in Resources */,
961+
03C1647325447249002C6F4E /* model.bundle in Resources */,
876962
033A9F4D252D89DB00BC26E1 /* CustomAudioSource.storyboard in Resources */,
877963
033A9F84252D8B6400BC26E1 /* StreamEncryption.storyboard in Resources */,
878964
033A9F30252D860100BC26E1 /* JoinChannelAudio.storyboard in Resources */,
@@ -1257,6 +1343,10 @@
12571343
CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)";
12581344
CODE_SIGN_STYLE = Manual;
12591345
DEVELOPMENT_TEAM = GM72UGLGZW;
1346+
FRAMEWORK_SEARCH_PATHS = (
1347+
"$(inherited)",
1348+
"$(PROJECT_DIR)/APIExample",
1349+
);
12601350
INFOPLIST_FILE = "Agora-ScreenShare-Extension/Info.plist";
12611351
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
12621352
LD_RUNPATH_SEARCH_PATHS = (
@@ -1287,6 +1377,10 @@
12871377
CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)";
12881378
CODE_SIGN_STYLE = Manual;
12891379
DEVELOPMENT_TEAM = GM72UGLGZW;
1380+
FRAMEWORK_SEARCH_PATHS = (
1381+
"$(inherited)",
1382+
"$(PROJECT_DIR)/APIExample",
1383+
);
12901384
INFOPLIST_FILE = "Agora-ScreenShare-Extension/Info.plist";
12911385
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
12921386
LD_RUNPATH_SEARCH_PATHS = (

‎iOS/APIExample/Assets.xcassets/btnPanelBackground.colorset/Contents.json

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0.570",
9+
"green" : "0.570",
10+
"red" : "0.570"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "1.000",
27+
"green" : "1.000",
28+
"red" : "1.000"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎iOS/APIExample/Assets.xcassets/btnPanelForeground.colorset/Contents.json

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "1.000",
9+
"green" : "1.000",
10+
"red" : "1.000"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "0.476",
27+
"green" : "0.476",
28+
"red" : "0.476"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎iOS/APIExample/Common/GlobalSettings.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import Foundation
1010

11-
1211
let SCREEN_SHARE_UID_MIN:UInt = 501
1312
let SCREEN_SHARE_UID_MAX:UInt = 1000
1413
let SCREEN_SHARE_BROADCASTER_UID_MIN:UInt = 1001

‎iOS/APIExample/Common/RtcChannelPublishPlugin/AgoraMediaPlayerEx.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by zhanxiaochao on 2020/5/26.
66
// Copyright © 2020 agora. All rights reserved.
77
//
8-
8+
#ifdef MEDIAPLAYER
99
#include "AgoraMediaPlayerEx.h"
1010
#include "AudioFrameObserver.h"
1111
#include <chrono>
@@ -123,3 +123,4 @@ class AgoraMediaPlayerEx : public IAgoraMediaPlayerEx,public agora::media::base:
123123
IAgoraMediaPlayerEx *createAgoraMediaPlayerFactory(){
124124
return new AgoraMediaPlayerEx;
125125
}
126+
#endif

‎iOS/APIExample/Common/RtcChannelPublishPlugin/AgoraMediaPlayerEx.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by zhanxiaochao on 2020/5/26.
66
// Copyright © 2020 agora. All rights reserved.
77
//
8-
8+
#ifdef MEDIAPLAYER
99
#ifndef AgoraMediaPlayerEx_h
1010
#define AgoraMediaPlayerEx_h
1111
#include <stdio.h>
@@ -80,3 +80,4 @@ IAgoraMediaPlayerEx * createAgoraMediaPlayerFactory();
8080

8181

8282
#endif /* AgoraMediaPlayerEx_hpp */
83+
#endif

‎iOS/APIExample/Common/RtcChannelPublishPlugin/AgoraRtcChannelPublishHelper.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by zhanxiaochao on 2020/1/13.
66
// Copyright © 2020 agora. All rights reserved.
77
//
8-
8+
#ifdef MEDIAPLAYER
99
#import <Foundation/Foundation.h>
1010
#import <AgoraMediaPlayer/AgoraMediaPlayerKit.h>
1111
#import <AgoraRtcKit/AgoraRtcEngineKit.h>
@@ -66,3 +66,4 @@ NS_ASSUME_NONNULL_BEGIN
6666
@end
6767

6868
NS_ASSUME_NONNULL_END
69+
#endif

‎iOS/APIExample/Common/RtcChannelPublishPlugin/AgoraRtcChannelPublishHelper.mm

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// Copyright © 2020 agora. All rights reserved.
77
//
88

9+
#ifdef MEDIAPLAYER
910
#import "AgoraRtcChannelPublishHelper.h"
1011
#import <AgoraRtcKit/IAgoraRtcEngine.h>
1112
#import <AgoraRtcKit/IAgoraMediaEngine.h>
@@ -271,3 +272,4 @@ - (void)executeBlock:(void (^)())block {
271272

272273
@end
273274

275+
#endif

‎iOS/APIExample/Common/UITypeAlias.swift

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ enum AssetsColor : String {
7373
case videoBackground
7474
case videoPlaceholder
7575
case textShadow
76+
case btnPanelBackground
7677
}
7778

7879
extension UIColor {

‎iOS/APIExample/Examples/Advanced/MediaPlayer/MediaPlayer.swift

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// Created by 张乾泽 on 2020/4/17.
66
// Copyright © 2020 Agora Corp. All rights reserved.
77
//
8+
#if false
89
import UIKit
910
import AGEVideoLayout
1011
import AgoraRtcKit
11-
1212
class MediaPlayerEntry : UIViewController
1313
{
1414
@IBOutlet weak var joinButton: UIButton!
@@ -284,3 +284,5 @@ extension MediaPlayerMain: AgoraRtcChannelPublishHelperDelegate
284284
}
285285
}
286286
}
287+
288+
#endif

‎iOS/APIExample/Examples/Advanced/PrecallTest/PrecallTest.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import UIKit
99
import AGEVideoLayout
1010
import AgoraRtcKit
11-
import AgoraRtcCryptoLoader
1211

1312
class PrecallTestEntry : UIViewController
1413
{

‎iOS/APIExample/Examples/Advanced/StreamEncryption/StreamEncryption.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import UIKit
99
import AGEVideoLayout
1010
import AgoraRtcKit
11-
import AgoraRtcCryptoLoader
1211

1312
class StreamEncryptionEntry : UIViewController
1413
{

0 commit comments

Comments
 (0)