Skip to content

Fix compilation of Swift bindings #834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meshula merged 3 commits into from
Dec 9, 2020
Merged

Fix compilation of Swift bindings #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
feeca52
Update project settings
meshula Dec 8, 2020
e564bd0
Remove signing identities
nporcino-pixar Dec 8, 2020
9469fa6
Conform the tests with the Python tests
nporcino-pixar Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/swift-opentimelineio/CxxAny.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
#endif


typedef union CxxAnyValue {
bool b;
int64_t i;
Expand All @@ -26,7 +27,7 @@ typedef union CxxAnyValue {
typedef struct CxxAny {
enum {
NONE = 0,
BOOL,
BOOL_, // avoid BOOL, as it conflicts with a macro in objc/objc.h
INT,
DOUBLE,
STRING,
Expand Down
4 changes: 2 additions & 2 deletions src/swift-opentimelineio/CxxAny.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
switch(cxxAny.type_code) {
case CxxAny::NONE:
return otio::any();
case CxxAny::BOOL:
case CxxAny::BOOL_:
return otio::any(cxxAny.value.b);
case CxxAny::INT:
if (cxxAny.value.i < -INT_MIN || cxxAny.value.i > INT_MAX) {
Expand Down Expand Up @@ -57,7 +57,7 @@

};
m[&typeid(bool)] = [](otio::any const& a, CxxAny* cxxAny) {
cxxAny->type_code = CxxAny::BOOL;
cxxAny->type_code = CxxAny::BOOL_;
cxxAny->value.b = otio::any_cast<bool>(a);
};
m[&typeid(int)] = [](otio::any const& a, CxxAny* cxxAny) {
Expand Down
2 changes: 1 addition & 1 deletion src/swift-opentimelineio/macos_Tests/testSO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class testSO: XCTestCase {
let c = Composable()
c.name = "composable"
c.metadata["abc"] = 8
c.metadata["blah"] = c
// c.metadata["blah"] = c // Cycles in the graph are currently disallowed


XCTAssert(c.parent == nil)
Expand Down
12 changes: 6 additions & 6 deletions src/swift-opentimelineio/macos_Tests/testTimeRange.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class testRange: XCTestCase {
XCTAssert(tr.contains(tstart))
XCTAssertFalse(tr.contains(tstart + tdur))
XCTAssertFalse(tr.contains(tstart - tdur))
XCTAssert(tr.contains(tr))
XCTAssertFalse(tr.contains(tr))

let tr_2 = TimeRange(startTime: tstart - tdur, duration: tdur)
XCTAssertFalse(tr.contains(tr_2))
Expand Down Expand Up @@ -111,25 +111,25 @@ class testRange: XCTestCase {
tdur = RationalTime(value: 3, rate: 25)
tr_t = TimeRange(startTime: tstart, duration: tdur)

XCTAssert(tr.overlaps(tr_t))
XCTAssertFalse(tr.overlaps(tr_t))

tstart = RationalTime(value: 13, rate: 25)
tdur = RationalTime(value: 1, rate: 25)
tr_t = TimeRange(startTime: tstart, duration: tdur)

XCTAssert(tr.overlaps(tr_t))
XCTAssertFalse(tr.overlaps(tr_t))

tstart = RationalTime(value: 2, rate: 25)
tdur = RationalTime(value: 30, rate: 25)
tr_t = TimeRange(startTime: tstart, duration: tdur)

XCTAssert(tr.overlaps(tr_t))
XCTAssertFalse(tr.overlaps(tr_t))

tstart = RationalTime(value: 2, rate: 50)
tdur = RationalTime(value: 60, rate: 50)
tr_t = TimeRange(startTime: tstart, duration: tdur)

XCTAssert(tr.overlaps(tr_t))
XCTAssertFalse(tr.overlaps(tr_t))

tstart = RationalTime(value: 2, rate: 50)
tdur = RationalTime(value: 14, rate: 50)
Expand All @@ -141,7 +141,7 @@ class testRange: XCTestCase {
tdur = RationalTime(value: 400, rate: 50)
tr_t = TimeRange(startTime: tstart, duration: tdur)

XCTAssert(tr.overlaps(tr_t))
XCTAssertFalse(tr.overlaps(tr_t))

tstart = RationalTime(value: 100, rate: 50)
tdur = RationalTime(value: 400, rate: 50)
Expand Down
3 changes: 2 additions & 1 deletion src/swift-opentimelineio/opentime.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ CxxRationalTime rational_time_from_timestring(NSString* timestring, double rate,

NSString* rational_time_to_timecode(CxxRationalTime rt, double rate, CxxErrorStruct* err) {
opentime::ErrorStatus error_status;
std::string result = otioRationalTime(rt).to_timecode(rate, &error_status);
opentime::RationalTime t = otioRationalTime(rt);
std::string result = t.to_timecode(rate, otio::IsDropFrameRate::InferFromRate, &error_status);
deal_with_error(error_status, err);
return [NSString stringWithUTF8String: result.c_str()];
}
Expand Down
34 changes: 18 additions & 16 deletions src/swift-opentimelineio/otio-swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,11 +484,11 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 83T3LQ9M77;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -509,11 +509,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"/Users/deb/Dropbox/build-otio/include",
"/Users/deb/Dropbox/build-otio/include/opentimelineio/deps",
"$(SOURCE_ROOT)/../deps",
"$(SOURCE_ROOT)/../deps/optional-lite/include",
);
LD_RUNPATH_SEARCH_PATHS = "/Users/deb/Dropbox/build-otio/lib";
LIBRARY_SEARCH_PATHS = "/Users/deb/Dropbox/build-otio/lib";
LD_RUNPATH_SEARCH_PATHS = "";
LIBRARY_SEARCH_PATHS = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand All @@ -522,6 +522,7 @@
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
"SYSTEM_HEADER_SEARCH_PATHS[arch=*]" = "$(SOURCE_ROOT)/..";
};
name = Debug;
};
Expand Down Expand Up @@ -557,11 +558,11 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 83T3LQ9M77;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
ENABLE_NS_ASSERTIONS = NO;
Expand All @@ -576,18 +577,19 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"/Users/deb/Dropbox/build-otio/include",
"/Users/deb/Dropbox/build-otio/include/opentimelineio/deps",
"$(SOURCE_ROOT)/../deps",
"$(SOURCE_ROOT)/../deps/optional-lite/include",
);
LD_RUNPATH_SEARCH_PATHS = "/Users/deb/Dropbox/build-otio/lib";
LIBRARY_SEARCH_PATHS = "/Users/deb/Dropbox/build-otio/lib";
LD_RUNPATH_SEARCH_PATHS = "";
LIBRARY_SEARCH_PATHS = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_NAME = otio;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SYSTEM_HEADER_SEARCH_PATHS = "$(SOURCE_ROOT)/..";
};
name = Release;
};
Expand Down Expand Up @@ -623,12 +625,12 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 83T3LQ9M77;
DEVELOPMENT_TEAM = "";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -696,12 +698,12 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 83T3LQ9M77;
DEVELOPMENT_TEAM = "";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down