Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Antonio Scandurra 2022-09-01 19:55:02 +02:00
parent 6c28b21728
commit 46abb1cbf6
5 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
LiveKitObjC/LKRoom.m
View file

@ -26,3 +26,7 @@
[self.room connectWithUrl:url token:token callback:callback]; [self.room connectWithUrl:url token:token callback:callback];
} }
@end @end
LKRoom* BuildLKRoom() {
return [[LKRoom alloc] init];
}

23
LiveKitObjC/LiveKitObjC.xcodeproj/project.pbxproj
View file

@ -10,7 +10,6 @@
AFA4DBD628C0F839001AD7BE /* LiveKit in Frameworks */ = {isa = PBXBuildFile; productRef = AFA4DBD528C0F839001AD7BE /* LiveKit */; }; AFA4DBD628C0F839001AD7BE /* LiveKit in Frameworks */ = {isa = PBXBuildFile; productRef = AFA4DBD528C0F839001AD7BE /* LiveKit */; };
AFA4DBD928C0F87F001AD7BE /* Room.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA4DBD828C0F87F001AD7BE /* Room.swift */; }; AFA4DBD928C0F87F001AD7BE /* Room.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA4DBD828C0F87F001AD7BE /* Room.swift */; };
AFA4DBDB28C0FBC0001AD7BE /* LKRoom.m in Sources */ = {isa = PBXBuildFile; fileRef = AFA4DBDA28C0FBC0001AD7BE /* LKRoom.m */; }; AFA4DBDB28C0FBC0001AD7BE /* LKRoom.m in Sources */ = {isa = PBXBuildFile; fileRef = AFA4DBDA28C0FBC0001AD7BE /* LKRoom.m */; };
AFA4DBDE28C121E6001AD7BE /* LiveKit in Frameworks */ = {isa = PBXBuildFile; productRef = AFA4DBDD28C121E6001AD7BE /* LiveKit */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
@ -26,7 +25,6 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
AFA4DBD628C0F839001AD7BE /* LiveKit in Frameworks */, AFA4DBD628C0F839001AD7BE /* LiveKit in Frameworks */,
AFA4DBDE28C121E6001AD7BE /* LiveKit in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -79,7 +77,6 @@
name = LiveKitObjC; name = LiveKitObjC;
packageProductDependencies = ( packageProductDependencies = (
AFA4DBD528C0F839001AD7BE /* LiveKit */, AFA4DBD528C0F839001AD7BE /* LiveKit */,
AFA4DBDD28C121E6001AD7BE /* LiveKit */,
); );
productName = LiveKitObjC; productName = LiveKitObjC;
productReference = AFA4DBCD28C0F7F5001AD7BE /* libLiveKitObjC.a */; productReference = AFA4DBCD28C0F7F5001AD7BE /* libLiveKitObjC.a */;
@ -111,7 +108,6 @@
mainGroup = AFA4DBC428C0F7F5001AD7BE; mainGroup = AFA4DBC428C0F7F5001AD7BE;
packageReferences = ( packageReferences = (
AFA4DBD428C0F839001AD7BE /* XCRemoteSwiftPackageReference "client-sdk-swift" */, AFA4DBD428C0F839001AD7BE /* XCRemoteSwiftPackageReference "client-sdk-swift" */,
AFA4DBDC28C121E6001AD7BE /* XCRemoteSwiftPackageReference "client-sdk-swift" */,
); );
productRefGroup = AFA4DBCE28C0F7F5001AD7BE /* Products */; productRefGroup = AFA4DBCE28C0F7F5001AD7BE /* Products */;
projectDirPath = ""; projectDirPath = "";
@ -247,10 +243,13 @@
AFA4DBD228C0F7F5001AD7BE /* Debug */ = { AFA4DBD228C0F7F5001AD7BE /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = NO; DEFINES_MODULE = NO;
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
KEEP_PRIVATE_EXTERNS = NO;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
@ -267,10 +266,13 @@
AFA4DBD328C0F7F5001AD7BE /* Release */ = { AFA4DBD328C0F7F5001AD7BE /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = NO; DEFINES_MODULE = NO;
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
KEEP_PRIVATE_EXTERNS = NO;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
@ -315,14 +317,6 @@
minimumVersion = 1.0.0; minimumVersion = 1.0.0;
}; };
}; };
AFA4DBDC28C121E6001AD7BE /* XCRemoteSwiftPackageReference "client-sdk-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/livekit/client-sdk-swift";
requirement = {
branch = main;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */ /* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */ /* Begin XCSwiftPackageProductDependency section */
@ -331,11 +325,6 @@
package = AFA4DBD428C0F839001AD7BE /* XCRemoteSwiftPackageReference "client-sdk-swift" */; package = AFA4DBD428C0F839001AD7BE /* XCRemoteSwiftPackageReference "client-sdk-swift" */;
productName = LiveKit; productName = LiveKit;
}; };
AFA4DBDD28C121E6001AD7BE /* LiveKit */ = {
isa = XCSwiftPackageProductDependency;
package = AFA4DBDC28C121E6001AD7BE /* XCRemoteSwiftPackageReference "client-sdk-swift" */;
productName = LiveKit;
};
/* End XCSwiftPackageProductDependency section */ /* End XCSwiftPackageProductDependency section */
}; };
rootObject = AFA4DBC528C0F7F5001AD7BE /* Project object */; rootObject = AFA4DBC528C0F7F5001AD7BE /* Project object */;

4
LiveKitObjC/LiveKitObjC.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file

@ -5,8 +5,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/livekit/client-sdk-swift", "location" : "https://github.com/livekit/client-sdk-swift",
"state" : { "state" : {
"branch" : "main", "revision" : "7e7decf3a09de4a169dfc0445a14d9fd2d8db58d",
"revision" : "e3de0d06e14825a7c9f1204f18f66898afb56cd6" "version" : "1.0.4"
} }
}, },
{ {

1
crates/capture/build.rs
View file

@ -1,6 +1,7 @@
use std::{env, path::PathBuf, process::Command}; use std::{env, path::PathBuf, process::Command};
fn main() { fn main() {
println!("cargo:rerun-if-changed=/Users/as-cii/Library/Developer/Xcode/DerivedData/LiveKitObjC-ftgpxknhsgkrocbhhgjkyyvkgkbj/Build/Products/Debug/libLiveKitObjC.a");
println!("cargo:rustc-link-search=/Users/as-cii/Library/Developer/Xcode/DerivedData/LiveKitObjC-ftgpxknhsgkrocbhhgjkyyvkgkbj/Build/Products/Debug"); println!("cargo:rustc-link-search=/Users/as-cii/Library/Developer/Xcode/DerivedData/LiveKitObjC-ftgpxknhsgkrocbhhgjkyyvkgkbj/Build/Products/Debug");
println!("cargo:rustc-link-lib=static=LiveKitObjC"); println!("cargo:rustc-link-lib=static=LiveKitObjC");
println!("cargo:rustc-link-lib=framework=ScreenCaptureKit"); println!("cargo:rustc-link-lib=framework=ScreenCaptureKit");

8
crates/capture/src/main.rs
View file

@ -47,8 +47,14 @@ const NSUTF8StringEncoding: NSUInteger = 4;
actions!(capture, [Quit]); actions!(capture, [Quit]);
extern "C" {
fn BuildLKRoom() -> *const c_void;
}
fn main() { fn main() {
class!(LKRoom); unsafe {
BuildLKRoom();
}
SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger"); SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");