Skip to content

Commit 1c2367c

Browse files
author
zhaoyongqiang
committed
调整Mac功能
1 parent d2247da commit 1c2367c

File tree

10 files changed

+1153
-501
lines changed

10 files changed

+1153
-501
lines changed

‎macOS/APIExample.xcodeproj/project.pbxproj‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
57AF397B259B31AA00601E02 /* RawAudioData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57AF397A259B31AA00601E02 /* RawAudioData.swift */; };
7878
57AF3981259B329B00601E02 /* RawAudioData.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 57AF3980259B329B00601E02 /* RawAudioData.storyboard */; };
7979
67033723279E76560069F4B3 /* VideoProcess.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67033721279E76560069F4B3 /* VideoProcess.swift */; };
80-
67033724279E76560069F4B3 /* VideoProcess.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 67033722279E76560069F4B3 /* VideoProcess.storyboard */; };
8180
67033726279E81DF0069F4B3 /* bg.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 67033725279E81DF0069F4B3 /* bg.jpg */; };
8281
671BD66927DF3FAF0076D5E1 /* AgoraMetalRender.swift in Sources */ = {isa = PBXBuildFile; fileRef = 671BD66827DF3FAF0076D5E1 /* AgoraMetalRender.swift */; };
8382
671BD67127DF478A0076D5E1 /* CustomVideoRender.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 671BD66D27DF478A0076D5E1 /* CustomVideoRender.storyboard */; };
@@ -97,17 +96,20 @@
9796
8BD4AE73272513FF00E95B87 /* SimpleFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD4AE72272513FF00E95B87 /* SimpleFilter.swift */; };
9897
8BE63B4227253CB000597DB1 /* SimpleFilter.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8BE63B4427253CB000597DB1 /* SimpleFilter.storyboard */; };
9998
8BF22438275F704600B65EF8 /* Pods_APIExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F65EF2B97B89DE4581B426B /* Pods_APIExample.framework */; };
100-
8BF2243A275F82CF00B65EF8 /* SimpleFilter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BD4AE79272518D600E95B87 /* SimpleFilter.framework */; };
10199
8BF2243B275F82CF00B65EF8 /* SimpleFilter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8BD4AE79272518D600E95B87 /* SimpleFilter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
102-
E763A82D288AA99B00FE99FA /* SimpleFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = E763A81E288AA99B00FE99FA /* SimpleFilter.h */; };
100+
E71E7B0B289B7D7900B846C7 /* SimpleFilter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BD4AE79272518D600E95B87 /* SimpleFilter.framework */; };
101+
E71E7B0C289B96FA00B846C7 /* VideoProcess.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E71E7B0E289B96FA00B846C7 /* VideoProcess.storyboard */; };
102+
E71E7B17289BA78D00B846C7 /* QuickSwitchChannel.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E71E7B15289BA78D00B846C7 /* QuickSwitchChannel.storyboard */; };
103+
E71E7B18289BA78D00B846C7 /* QuickSwitchChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E71E7B16289BA78D00B846C7 /* QuickSwitchChannel.swift */; };
104+
E763A82D288AA99B00FE99FA /* SimpleFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = E763A81E288AA99B00FE99FA /* SimpleFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
103105
E763A82E288AA99B00FE99FA /* VideoProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E763A81F288AA99B00FE99FA /* VideoProcessor.cpp */; };
104106
E763A82F288AA99B00FE99FA /* ExtensionVideoFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E763A820288AA99B00FE99FA /* ExtensionVideoFilter.cpp */; };
105107
E763A830288AA99B00FE99FA /* ExtensionProvider.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E763A821288AA99B00FE99FA /* ExtensionProvider.hpp */; };
106108
E763A831288AA99B00FE99FA /* ExtensionProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E763A822288AA99B00FE99FA /* ExtensionProvider.cpp */; };
107109
E763A832288AA99B00FE99FA /* ExtensionAudioFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E763A823288AA99B00FE99FA /* ExtensionAudioFilter.cpp */; };
108110
E763A833288AA99B00FE99FA /* AudioProcessor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E763A824288AA99B00FE99FA /* AudioProcessor.hpp */; };
109111
E763A834288AA99B00FE99FA /* SimpleFilterManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = E763A825288AA99B00FE99FA /* SimpleFilterManager.mm */; };
110-
E763A835288AA99B00FE99FA /* SimpleFilterManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E763A826288AA99B00FE99FA /* SimpleFilterManager.h */; };
112+
E763A835288AA99B00FE99FA /* SimpleFilterManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E763A826288AA99B00FE99FA /* SimpleFilterManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
111113
E763A836288AA99B00FE99FA /* external_thread_pool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E763A827288AA99B00FE99FA /* external_thread_pool.cpp */; };
112114
E763A837288AA99B00FE99FA /* external_thread_pool.h in Headers */ = {isa = PBXBuildFile; fileRef = E763A828288AA99B00FE99FA /* external_thread_pool.h */; };
113115
E763A838288AA99B00FE99FA /* VideoProcessor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E763A829288AA99B00FE99FA /* VideoProcessor.hpp */; };
@@ -224,7 +226,6 @@
224226
57AF397A259B31AA00601E02 /* RawAudioData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RawAudioData.swift; sourceTree = "<group>"; };
225227
57AF3980259B329B00601E02 /* RawAudioData.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = RawAudioData.storyboard; sourceTree = "<group>"; };
226228
67033721279E76560069F4B3 /* VideoProcess.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoProcess.swift; sourceTree = "<group>"; };
227-
67033722279E76560069F4B3 /* VideoProcess.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = VideoProcess.storyboard; sourceTree = "<group>"; };
228229
67033725279E81DF0069F4B3 /* bg.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = bg.jpg; sourceTree = "<group>"; };
229230
671BD66827DF3FAF0076D5E1 /* AgoraMetalRender.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AgoraMetalRender.swift; sourceTree = "<group>"; };
230231
671BD66E27DF478A0076D5E1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/CustomVideoRender.storyboard; sourceTree = "<group>"; };
@@ -249,6 +250,11 @@
249250
8BD4AE72272513FF00E95B87 /* SimpleFilter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleFilter.swift; sourceTree = "<group>"; };
250251
8BD4AE79272518D600E95B87 /* SimpleFilter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SimpleFilter.framework; sourceTree = BUILT_PRODUCTS_DIR; };
251252
8BE63B4527253CD900597DB1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/SimpleFilter.storyboard; sourceTree = "<group>"; };
253+
E71E7B0D289B96FA00B846C7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/VideoProcess.storyboard; sourceTree = "<group>"; };
254+
E71E7B12289B971900B846C7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/VideoProcess.strings; sourceTree = "<group>"; };
255+
E71E7B13289B9C2C00B846C7 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/VideoProcess.strings"; sourceTree = "<group>"; };
256+
E71E7B15289BA78D00B846C7 /* QuickSwitchChannel.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = QuickSwitchChannel.storyboard; sourceTree = "<group>"; };
257+
E71E7B16289BA78D00B846C7 /* QuickSwitchChannel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickSwitchChannel.swift; sourceTree = "<group>"; };
252258
E763A81E288AA99B00FE99FA /* SimpleFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleFilter.h; sourceTree = "<group>"; };
253259
E763A81F288AA99B00FE99FA /* VideoProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoProcessor.cpp; sourceTree = "<group>"; };
254260
E763A820288AA99B00FE99FA /* ExtensionVideoFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtensionVideoFilter.cpp; sourceTree = "<group>"; };
@@ -272,7 +278,7 @@
272278
isa = PBXFrameworksBuildPhase;
273279
buildActionMask = 2147483647;
274280
files = (
275-
8BF2243A275F82CF00B65EF8 /* SimpleFilter.framework in Frameworks */,
281+
E71E7B0B289B7D7900B846C7 /* SimpleFilter.framework in Frameworks */,
276282
8BF22438275F704600B65EF8 /* Pods_APIExample.framework in Frameworks */,
277283
);
278284
runOnlyForDeploymentPostprocessing = 0;
@@ -473,6 +479,7 @@
473479
036D3AA524FB797700B1D8DC /* Advanced */ = {
474480
isa = PBXGroup;
475481
children = (
482+
E71E7B14289BA78D00B846C7 /* QuickSwitchChannel */,
476483
67033720279E75770069F4B3 /* VideoProcess */,
477484
8BD4AE6F272513D000E95B87 /* SimpleFilter */,
478485
57AF3979259B30BB00601E02 /* RawAudioData */,
@@ -627,8 +634,8 @@
627634
67033720279E75770069F4B3 /* VideoProcess */ = {
628635
isa = PBXGroup;
629636
children = (
637+
E71E7B0E289B96FA00B846C7 /* VideoProcess.storyboard */,
630638
67033721279E76560069F4B3 /* VideoProcess.swift */,
631-
67033722279E76560069F4B3 /* VideoProcess.storyboard */,
632639
);
633640
path = VideoProcess;
634641
sourceTree = "<group>";
@@ -729,6 +736,15 @@
729736
path = SimpleFilter;
730737
sourceTree = "<group>";
731738
};
739+
E71E7B14289BA78D00B846C7 /* QuickSwitchChannel */ = {
740+
isa = PBXGroup;
741+
children = (
742+
E71E7B15289BA78D00B846C7 /* QuickSwitchChannel.storyboard */,
743+
E71E7B16289BA78D00B846C7 /* QuickSwitchChannel.swift */,
744+
);
745+
path = QuickSwitchChannel;
746+
sourceTree = "<group>";
747+
};
732748
E8D399FF8F860CE7DAAA9D91 /* Frameworks */ = {
733749
isa = PBXGroup;
734750
children = (
@@ -867,15 +883,16 @@
867883
033A9FB3252EAEB500BC26E1 /* JoinChannelVideo.storyboard in Resources */,
868884
036D3AA024FA40EB00B1D8DC /* VideoView.xib in Resources */,
869885
033A9FEB252EB5CC00BC26E1 /* AudioMixing.storyboard in Resources */,
870-
67033724279E76560069F4B3 /* VideoProcess.storyboard in Resources */,
871886
67E40B2427EC82F900C7A6E9 /* SpatialAudio.storyboard in Resources */,
872887
671BD67B27E0A4F50076D5E1 /* output.raw in Resources */,
888+
E71E7B0C289B96FA00B846C7 /* VideoProcess.storyboard in Resources */,
873889
033A9FCC252EB03F00BC26E1 /* CustomVideoSourcePush.storyboard in Resources */,
874890
671BD67127DF478A0076D5E1 /* CustomVideoRender.storyboard in Resources */,
875891
57A635F42593544600EDC2F7 /* effectA.wav in Resources */,
876892
033A9FF5252EB5F400BC26E1 /* JoinMultiChannel.storyboard in Resources */,
877893
033A9FD6252EB05200BC26E1 /* RTMPStreaming.storyboard in Resources */,
878894
033A9FF0252EB5EB00BC26E1 /* ChannelMediaRelay.storyboard in Resources */,
895+
E71E7B17289BA78D00B846C7 /* QuickSwitchChannel.storyboard in Resources */,
879896
034C62A125297ABB00296ECF /* audiomixing.mp3 in Resources */,
880897
);
881898
runOnlyForDeploymentPostprocessing = 0;
@@ -983,6 +1000,7 @@
9831000
0336A1CB25034F4700D61B7F /* AudioController.m in Sources */,
9841001
034C62672525857200296ECF /* JoinChannelAudio.swift in Sources */,
9851002
5770E2DF258CDCA600812A80 /* Picker.swift in Sources */,
1003+
E71E7B18289BA78D00B846C7 /* QuickSwitchChannel.swift in Sources */,
9861004
67B8C89C28058AB600195106 /* RawVideoData.swift in Sources */,
9871005
57887A87258889ED006E962A /* SettingsViewController.swift in Sources */,
9881006
57A635D82591BC0C00EDC2F7 /* Slider.swift in Sources */,
@@ -1192,6 +1210,16 @@
11921210
name = SimpleFilter.storyboard;
11931211
sourceTree = "<group>";
11941212
};
1213+
E71E7B0E289B96FA00B846C7 /* VideoProcess.storyboard */ = {
1214+
isa = PBXVariantGroup;
1215+
children = (
1216+
E71E7B0D289B96FA00B846C7 /* Base */,
1217+
E71E7B12289B971900B846C7 /* en */,
1218+
E71E7B13289B9C2C00B846C7 /* zh-Hans */,
1219+
);
1220+
name = VideoProcess.storyboard;
1221+
sourceTree = "<group>";
1222+
};
11951223
/* End PBXVariantGroup section */
11961224

11971225
/* Begin XCBuildConfiguration section */

0 commit comments

Comments
 (0)