Fixes for Windows

Signed-off-by: Darby Johnston <[email protected]>

Author: darbyjohnston

src/opentimelineio/CMakeLists.txt

@@ -101,8 +101,7 @@ target_link_libraries(opentimelineio
 set_target_properties(opentimelineio PROPERTIES
     DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}"
     LIBRARY_OUTPUT_NAME "opentimelineio"
-    POSITION_INDEPENDENT_CODE TRUE
-    WINDOWS_EXPORT_ALL_SYMBOLS true)
+    POSITION_INDEPENDENT_CODE TRUE)
 
 if(BUILD_SHARED_LIBS)
     set_target_properties(opentimelineio PROPERTIES

src/opentimelineio/algo/editAlgorithm.h

@@ -38,7 +38,7 @@ enum class ReferencePoint
 //            
 // If overwrite range starts and ends before A, a gap hole is filled with
 // fill_template.
-void overwrite(
+OTIO_API void overwrite(
     Item*            item,
     Composition*     composition,
     TimeRange const& range,
@@ -62,7 +62,7 @@ void overwrite(
 // If A and B's length is L1 and C's length is L2, the end result is L1 + L2.
 // A is split.
 //
-void insert(
+OTIO_API void insert(
     Item* const         item,
     Composition*        composition,
     RationalTime const& time,
@@ -88,7 +88,7 @@ void insert(
 // Fill now-"empty" time with gap or template
 // Unless item is meeting a Gap, then, existing Gap's duration will be augmented
 //    
-void trim(
+OTIO_API void trim(
     Item*               item,
     RationalTime const& delta_in,
     RationalTime const& delta_out,
@@ -101,7 +101,7 @@ void trim(
 //   ^
 // composition = usually a track item.
 //        time = time to slice at.
-void slice(
+OTIO_API void slice(
     Composition*        composition,
     RationalTime const& time,
     bool const          remove_transitions = true,
@@ -119,7 +119,7 @@ void slice(
 // Do not affect item duration.
 // Do not affect surrounding items.
 // Clamp to available_range of media (if available)
-void slip(Item* item, RationalTime const& delta);
+OTIO_API void slip(Item* item, RationalTime const& delta);
 
 //
 // Slide an item start_time by + or -, adjusting the previous item's duration.
@@ -133,7 +133,7 @@ void slip(Item* item, RationalTime const& delta);
 //
 // If item is the first clip, it does nothing.
 //
-void slide(Item* item, RationalTime const& delta);
+OTIO_API void slide(Item* item, RationalTime const& delta);
 
 //
 // Adjust a source_range without affecting any other items.
@@ -146,7 +146,7 @@ void slide(Item* item, RationalTime const& delta);
 //             will be adjusted by
 // delta_out = RationalTime that the item's
 //             source_range().end_time_exclusive() will be adjusted by
-void ripple(
+OTIO_API void ripple(
     Item*               item,
     RationalTime const& delta_in,
     RationalTime const& delta_out,
@@ -168,7 +168,7 @@ void ripple(
 //             will be adjusted by
 // delta_out = RationalTime that the item's
 //             source_range().end_time_exclusive() will be adjusted by
-void roll(
+OTIO_API void roll(
     Item*               item,
     RationalTime const& delta_in,
     RationalTime const& delta_out,
@@ -186,7 +186,7 @@ void roll(
 // reference_point = For 4 point editing, the reference point dictates what
 //                   transform to use when running the fill.
 //
-void fill(
+OTIO_API void fill(
     Item*                item,
     Composition*         track,
     RationalTime const&  track_time,
@@ -207,7 +207,7 @@ void fill(
 //
 // if fill is not set, A and B become concatenated, with no fill.
 //
-void remove(
+OTIO_API void remove(
     Composition*        composition,
     RationalTime const& time,
     bool         const  fill = true,

src/opentimelineio/anyDictionary.h

@@ -25,13 +25,13 @@ namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 /// This allows us to hand out iterators that can be aware of mutation and moves
 /// and take steps to safe-guard themselves from causing a crash.  (Yes, I'm
 /// talking to you, Python...)
-class OTIO_API AnyDictionary : private std::map<std::string, std::any>
+class OTIO_API_TYPE AnyDictionary : private std::map<std::string, std::any>
 {
 public:
     using map::map;
 
     /// @brief Create an empty dictionary.
-    OTIO_API AnyDictionary()
+    AnyDictionary()
         : map{}
         , _mutation_stamp{}
     {}
@@ -40,13 +40,13 @@ class OTIO_API AnyDictionary : private std::map<std::string, std::any>
     ///
     /// To be safe, avoid brace-initialization so as to not trigger
     /// list initialization behavior in older compilers:
-    OTIO_API AnyDictionary(const AnyDictionary& other)
+    AnyDictionary(const AnyDictionary& other)
         : map(other)
         , _mutation_stamp{}
     {}
 
     /// @brief Destructor.
-    OTIO_API ~AnyDictionary()
+    ~AnyDictionary()
     {
         if (_mutation_stamp)
         {
@@ -56,15 +56,15 @@ class OTIO_API AnyDictionary : private std::map<std::string, std::any>
     }
 
     /// @brief Copy operator.
-    OTIO_API AnyDictionary& operator=(const AnyDictionary& other)
+    AnyDictionary& operator=(const AnyDictionary& other)
     {
         mutate();
         map::operator=(other);
         return *this;
     }
 
     /// @brief Move operator.
-    OTIO_API AnyDictionary& operator=(AnyDictionary&& other)
+    AnyDictionary& operator=(AnyDictionary&& other)
     {
         mutate();
         other.mutate();
@@ -73,7 +73,7 @@ class OTIO_API AnyDictionary : private std::map<std::string, std::any>
     }
 
     /// @brief Copy operator.
-    OTIO_API AnyDictionary& operator=(std::initializer_list<value_type> ilist)
+    AnyDictionary& operator=(std::initializer_list<value_type> ilist)
     {
         mutate();
         map::operator=(ilist);
@@ -95,7 +95,7 @@ class OTIO_API AnyDictionary : private std::map<std::string, std::any>
     using map::rend;
 
     /// @brief Clear the dictionary.
-    OTIO_API void clear() noexcept
+    void clear() noexcept
     {
         mutate();
         map::clear();
@@ -105,28 +105,28 @@ class OTIO_API AnyDictionary : private std::map<std::string, std::any>
     using map::insert;
 
     /// @brief Erase an item.
-    OTIO_API iterator erase(const_iterator pos)
+    iterator erase(const_iterator pos)
     {
         mutate();
         return map::erase(pos);
     }
 
     /// @brief Erase a range of items.
-    OTIO_API iterator erase(const_iterator first, const_iterator last)
+    iterator erase(const_iterator first, const_iterator last)
     {
         mutate();
         return map::erase(first, last);
     }
 
     /// @brief Erase an item with the given key.
-    OTIO_API size_type erase(const key_type& key)
+    size_type erase(const key_type& key)
     {
         mutate();
         return map::erase(key);
     }
 
     /// @brief Swap dictionaries.
-    OTIO_API void swap(AnyDictionary& other)
+    void swap(AnyDictionary& other)
     {
         mutate();
         other.mutate();

src/opentimelineio/anyVector.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "opentimelineio/export.h"
 #include "opentimelineio/version.h"
 
 #include <any>
@@ -20,7 +21,7 @@ namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 ///
 /// This allows us to hand out iterators that can be aware of moves
 /// and take steps to safe-guard themselves from causing a crash.
-class AnyVector : private std::vector<std::any>
+class OTIO_API_TYPE AnyVector : private std::vector<std::any>
 {
 public:
     using vector::vector;

src/opentimelineio/clip.h

@@ -12,7 +12,7 @@ namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 /// @brief A clip is a segment of editable media (usually audio or video).
 ///
 /// Contains a MediaReference and a trim on that media reference.
-class Clip : public Item
+class OTIO_API_TYPE Clip : public Item
 {
 public:
     /// @brief The default media within a clip.
@@ -39,7 +39,7 @@ class Clip : public Item
     /// @param markers The list of markers for the clip. Note that the
     /// the clip keeps a retainer to each marker.
     /// @param active_media_reference_key The active media reference.
-    Clip(
+    OTIO_API Clip(
         std::string const&              name            = std::string(),
         MediaReference*                 media_reference = nullptr,
         std::optional<TimeRange> const& source_range    = std::nullopt,
@@ -54,37 +54,37 @@ class Clip : public Item
 
     /// @brief Set the media reference. Note that the Clip keeps a Retainer to
     /// the media reference.
-    void set_media_reference(MediaReference* media_reference);
+    OTIO_API void set_media_reference(MediaReference* media_reference);
 
     /// @brief Return the media reference.
-    MediaReference* media_reference() const noexcept;
+    OTIO_API MediaReference* media_reference() const noexcept;
 
     using MediaReferences = std::map<std::string, MediaReference*>;
 
     /// @brief Return the list of media references.
-    MediaReferences media_references() const noexcept;
+    OTIO_API MediaReferences media_references() const noexcept;
 
     /// @brief Set the list of media references. Note that the Clip keeps a
     /// Retainer to each media reference.
-    void set_media_references(
+    OTIO_API void set_media_references(
         MediaReferences const& media_references,
         std::string const&     new_active_key,
         ErrorStatus*           error_status = nullptr) noexcept;
 
     /// @brief Return the active media reference.
-    std::string active_media_reference_key() const noexcept;
+    OTIO_API std::string active_media_reference_key() const noexcept;
 
     /// @brief Set the active media reference.
-    void set_active_media_reference_key(
+    OTIO_API void set_active_media_reference_key(
         std::string const& new_active_key,
         ErrorStatus*       error_status = nullptr) noexcept;
 
     ///@}
 
-    TimeRange
+    OTIO_API TimeRange
     available_range(ErrorStatus* error_status = nullptr) const override;
 
-    std::optional<IMATH_NAMESPACE::Box2d>
+    OTIO_API std::optional<IMATH_NAMESPACE::Box2d>
     available_image_bounds(ErrorStatus* error_status = nullptr) const override;
 
 protected:

src/opentimelineio/color.h

@@ -6,6 +6,7 @@
 #include <cmath>
 #include <vector>
 
+#include "opentimelineio/export.h"
 #include "opentimelineio/version.h"
 
 namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
@@ -21,7 +22,7 @@ namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 /// Round-trip conversions may not be guaranteed outside that.
 /// This class is meant for use in user interface elements,
 // like marker or clip coloring, NOT for image pixel content.
-class Color
+class OTIO_API_TYPE Color
 {
 public:
     struct Schema
@@ -30,14 +31,14 @@ class Color
         static int constexpr version = 1;
     };
 
-    Color(
+    OTIO_API Color(
         double const         r        = 1.f,
         double const         g        = 1.f,
         double const         b        = 1.f,
         double const         a        = 1.f,
         std::string const&   name     = "");
 
-    Color(Color const& other);
+    OTIO_API Color(Color const& other);
 
     static const Color pink;
     static const Color red;
@@ -63,10 +64,10 @@ class Color
         return lhs.to_hex() == rhs.to_hex() && lhs.to_agbr_integer() == rhs.to_agbr_integer();
     }
 
-    std::string to_hex();
-    std::vector<int> to_rgba_int_list(int base);
-    unsigned int to_agbr_integer();
-    std::vector<double> to_rgba_float_list();
+    OTIO_API std::string to_hex();
+    OTIO_API std::vector<int> to_rgba_int_list(int base);
+    OTIO_API unsigned int     to_agbr_integer();
+    OTIO_API std::vector<double> to_rgba_float_list();
 
     double r() const { return _r; }
     double g() const { return _g; }

src/opentimelineio/composable.h

@@ -13,7 +13,7 @@ namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 class Composition;
 
 /// @brief An object that can be composed within a Composition (such as a Track or Stack).
-class Composable : public SerializableObjectWithMetadata
+class OTIO_API_TYPE Composable : public SerializableObjectWithMetadata
 {
 public:
     /// @brief This struct provides the Composable schema.
@@ -29,7 +29,7 @@ class Composable : public SerializableObjectWithMetadata
     ///
     /// @param name The name of the composable.
     /// @param metadata The metadata for the clip.
-    Composable(
+    OTIO_API Composable(
         std::string const&   name     = std::string(),
         AnyDictionary const& metadata = AnyDictionary());