Trying out OTIO PR#1993

AcademySoftwareFoundation/OpenTimelineIO#1993

Author: jminor

Examples/Sources/cxx_example/main.cpp

@@ -8,7 +8,7 @@
 #include "opentime/timeRange.h"
 #include "opentimelineio/optional.h"
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 otio::SerializableObject* create_stuff() {
     auto x = new otio::SerializableObjectWithMetadata;
@@ -20,7 +20,7 @@ otio::SerializableObject* create_stuff() {
     x->metadata()["stuff4"] = 3.14159;
     x->metadata()["stuff5"] = opentime::RationalTime();
     x->metadata()["stuff6"] = opentime::TimeRange();
-    
+
     otio::AnyVector junk;
     junk.push_back(13);
     junk.push_back("hello");
@@ -34,4 +34,3 @@ int main() {
     std::string s = so->to_json_string(&status);
     printf("%s\n", s.c_str());
 }
-

OpenTimelineIO

@@ -36,9 +36,7 @@ let package = Package(
             exclude: ["CMakeLists.txt", "OpenTimeConfig.cmake.in", "version.h.in"],
             sources: ["."],
             publicHeadersPath: ".",
-            cxxSettings: [
-                .headerSearchPath("."),
-                .headerSearchPath("../../../Sources/cpp")]),
+            cxxSettings: [.headerSearchPath(".")]),
 
         .target(name: "OpenTimelineIO_CXX",
             dependencies: ["OpenTime_CXX"],

Package.swift

@@ -12,7 +12,7 @@
 
 #if defined(__cplusplus)
 #import <opentimelineio/anyDictionary.h>
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 #endif
 
 NS_ASSUME_NONNULL_BEGIN

Sources/cpp/opentime/version.h

@@ -12,7 +12,7 @@
 
 #if defined(__cplusplus)
 #import <opentimelineio/anyVector.h>
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 #endif
 
 NS_ASSUME_NONNULL_BEGIN

Sources/cpp/opentimelineio/version.h

@@ -9,7 +9,7 @@
 
 #if defined(__cplusplus)
 #import <opentimelineio/serializableObject.h>
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 #endif
 
 NS_ASSUME_NONNULL_BEGIN

Sources/objc/include/CxxAnyDictionaryMutationStamp.h

@@ -10,19 +10,19 @@
 
 #if defined(__cplusplus)
 #import <opentimelineio/serializableObject.h>
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 class CxxSOVectorBase {
 public:
     CxxSOVectorBase();
     CxxSOVectorBase& operator=(CxxSOVectorBase const&) = delete;
     CxxSOVectorBase(CxxSOVectorBase const&) = delete;
     virtual ~CxxSOVectorBase();
-    
+
     virtual otio::SerializableObject* _Nullable fetch(int index) = 0;
     virtual int size() = 0;
     virtual void clear() = 0;
-    
+
     virtual void store(int index, otio::SerializableObject* _Nonnull) = 0;
     virtual void moveIndex(int fromIndex, int toIndex) = 0;
     virtual void removeAtEnd() = 0;
@@ -38,25 +38,25 @@ class CxxSOVector : public CxxSOVectorBase {
     : _v{* new std::vector<otio::SerializableObject::Retainer<T>>}, _owner{true}
     {
     }
-    
+
     CxxSOVector(std::vector<otio::SerializableObject::Retainer<T>>& v)
     : _v{v}, _owner{false} {
     }
 
     virtual otio::SerializableObject* _Nullable fetch(int index) {
         return index < _v.size() ? _v[index] : nullptr;
     }
-    
+
     virtual int size() {
         return int(_v.size());
     }
-    
+
     virtual ~CxxSOVector() {
         if (_owner) {
             delete &_v;
         }
     }
-    
+
     virtual void clear() {
         _v.clear();
     }
@@ -69,19 +69,19 @@ class CxxSOVector : public CxxSOVectorBase {
             _v.emplace_back(otio::SerializableObject::Retainer<T>((T*)so));
         }
     }
-    
+
     virtual void moveIndex(int fromIndex, int toIndex) {
         std::swap(_v[fromIndex], _v[toIndex]);
     }
-    
+
     virtual void append(otio::SerializableObject* _Nonnull so) {
         _v.emplace_back(otio::SerializableObject::Retainer<T>((T*)so));
     }
-    
+
     virtual void removeAtEnd() {
         _v.pop_back();
     }
-    
+
     virtual void shrinkOrGrow(int n, bool grow) {
         if (grow) {
             for (int i = 0; i < n; i++) {
@@ -93,13 +93,13 @@ class CxxSOVector : public CxxSOVectorBase {
                 _v.clear();
                 return;
             }
-            
+
             for (int i = 0; i < n; i++) {
                 _v.pop_back();
             }
         }
     }
-    
+
     virtual void setContents(CxxSOVectorBase* _Nonnull src, bool destroyingSrc) {
         CxxSOVector* typedSrc = (CxxSOVector*) src;
         if (destroyingSrc) {

Sources/objc/include/CxxAnyVectorMutationStamp.h

@@ -28,7 +28,7 @@ typedef struct CxxNonsense {
 #import <opentime/timeRange.h>
 #import <opentime/timeTransform.h>
 
-namespace ot = opentime::OPENTIME_VERSION;
+namespace ot = opentime::OPENTIME_VERSION_NS;
 
 inline ot::RationalTime const& otioRationalTime(CxxRationalTime const& rt) {
     return *((ot::RationalTime const*)(&rt));