From fd1898da4d7f9c2bfd67a044834739bab2a8ed02 Mon Sep 17 00:00:00 2001 From: Visaj Nirav Shah Date: Fri, 20 May 2022 22:29:44 +0530 Subject: [PATCH 1/2] #1186: Add enabled Flag to Transitions Signed-off-by: Visaj Nirav Shah --- src/opentimelineio/transition.cpp | 3 +++ src/opentimelineio/transition.h | 8 ++++++++ .../opentimelineio-bindings/otio_serializableObjects.cpp | 1 + 3 files changed, 12 insertions(+) diff --git a/src/opentimelineio/transition.cpp b/src/opentimelineio/transition.cpp index ee19c2360d..a736f37b12 100644 --- a/src/opentimelineio/transition.cpp +++ b/src/opentimelineio/transition.cpp @@ -16,6 +16,7 @@ Transition::Transition( , _transition_type(transition_type) , _in_offset(in_offset) , _out_offset(out_offset) + , _enabled(true) {} Transition::~Transition() @@ -33,6 +34,7 @@ Transition::read_from(Reader& reader) return reader.read("in_offset", &_in_offset) && reader.read("out_offset", &_out_offset) && reader.read("transition_type", &_transition_type) && + reader.read("enabled", &_enabled) && Parent::read_from(reader); } @@ -43,6 +45,7 @@ Transition::write_to(Writer& writer) const writer.write("in_offset", _in_offset); writer.write("out_offset", _out_offset); writer.write("transition_type", _transition_type); + writer.write("enabled", _enabled); } RationalTime diff --git a/src/opentimelineio/transition.h b/src/opentimelineio/transition.h index e55b543fa0..05a51690fb 100644 --- a/src/opentimelineio/transition.h +++ b/src/opentimelineio/transition.h @@ -34,6 +34,13 @@ class Transition : public Composable virtual bool overlapping() const; + bool enabled() const { return _enabled; }; + + void set_enabled(bool enabled) + { + _enabled = enabled; + } + std::string transition_type() const noexcept { return _transition_type; } void set_transition_type(std::string const& transition_type) @@ -73,6 +80,7 @@ class Transition : public Composable private: std::string _transition_type; RationalTime _in_offset, _out_offset; + bool _enabled; }; }} // namespace opentimelineio::OPENTIMELINEIO_VERSION diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp index 9e843ceb64..4bf4a6c87e 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp @@ -365,6 +365,7 @@ static void define_items_and_compositions(py::module m) { .def_property("transition_type", &Transition::transition_type, &Transition::set_transition_type) .def_property("in_offset", &Transition::in_offset, &Transition::set_in_offset) .def_property("out_offset", &Transition::out_offset, &Transition::set_out_offset) + .def_property("enabled", &Transition::enabled, &Transition::set_enabled) .def("duration", [](Transition* t) { return t->duration(ErrorStatusHandler()); }) From 5c4521e5ce57b333cb398fef7fcc6d1127d8b79c Mon Sep 17 00:00:00 2001 From: Visaj Nirav Shah Date: Fri, 20 May 2022 23:57:49 +0530 Subject: [PATCH 2/2] Update Test Signed-off-by: Visaj Nirav Shah --- tests/baselines/empty_transition.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/baselines/empty_transition.json b/tests/baselines/empty_transition.json index 6858ac7583..177156cc1d 100644 --- a/tests/baselines/empty_transition.json +++ b/tests/baselines/empty_transition.json @@ -8,5 +8,6 @@ }, "out_offset": { "FROM_TEST_FILE" : "empty_rationaltime.json" - } + }, + "enabled": true }