From a1d967efe69432d19426b144d17762848cdf6e41 Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Wed, 11 Nov 2020 22:13:14 +0000 Subject: [PATCH] OTIO: Use macro OTIO for opentimelineio::v1_0 Exapnd the use of the OTIO macro and add the version number macro. --- app/task/project/loadotio/loadotio.cpp | 2 +- app/task/project/saveotio/saveotio.cpp | 42 ++++++++++++-------------- app/task/project/saveotio/saveotio.h | 8 +++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/task/project/loadotio/loadotio.cpp b/app/task/project/loadotio/loadotio.cpp index 78799e389..25b83658f 100644 --- a/app/task/project/loadotio/loadotio.cpp +++ b/app/task/project/loadotio/loadotio.cpp @@ -34,7 +34,7 @@ #include "project/item/folder/folder.h" #include "project/item/sequence/sequence.h" -#define OTIO opentimelineio::v1_0 +#define OTIO opentimelineio::OPENTIMELINEIO_VERSION OLIVE_NAMESPACE_ENTER diff --git a/app/task/project/saveotio/saveotio.cpp b/app/task/project/saveotio/saveotio.cpp index ab3933ed9..37e8f5f90 100644 --- a/app/task/project/saveotio/saveotio.cpp +++ b/app/task/project/saveotio/saveotio.cpp @@ -30,8 +30,6 @@ #include "node/block/transition/transition.h" #include "node/input/media/media.h" -#define OTIO opentimelineio::OPENTIMELINEIO_VERSION - OLIVE_NAMESPACE_ENTER SaveOTIOTask::SaveOTIOTask(ProjectPtr project) : @@ -49,7 +47,7 @@ bool SaveOTIOTask::Run() return false; } - std::vector serialized; + std::vector serialized; foreach (ItemPtr item, sequences) { SequencePtr seq = std::static_pointer_cast(sequences.first()); @@ -72,7 +70,7 @@ bool SaveOTIOTask::Run() } } - opentimelineio::v1_0::ErrorStatus es; + OTIO::ErrorStatus es; if (serialized.size() == 1) { // Serialize timeline on its own @@ -81,7 +79,7 @@ bool SaveOTIOTask::Run() t->possibly_delete(); } else { // Serialize all into a SerializableCollection - auto collection = new opentimelineio::v1_0::SerializableCollection("Sequences", serialized); + auto collection = new OTIO::SerializableCollection("Sequences", serialized); collection->to_json_file(project_->filename().toStdString(), &es); collection->possibly_delete(); @@ -91,12 +89,12 @@ bool SaveOTIOTask::Run() } } - return (es == opentimelineio::v1_0::ErrorStatus::OK); + return (es == OTIO::ErrorStatus::OK); } -opentimelineio::v1_0::Timeline *SaveOTIOTask::SerializeTimeline(SequencePtr sequence) +OTIO::Timeline *SaveOTIOTask::SerializeTimeline(SequencePtr sequence) { - auto otio_timeline = new opentimelineio::v1_0::Timeline(sequence->name().toStdString()); + auto otio_timeline = new OTIO::Timeline(sequence->name().toStdString()); OTIO::Timeline::Retainer* time_retainer = new OTIO::Timeline::Retainer(otio_timeline); if (!SerializeTrackList(sequence->viewer_output()->track_list(Timeline::kTrackTypeVideo), otio_timeline) @@ -108,11 +106,11 @@ opentimelineio::v1_0::Timeline *SaveOTIOTask::SerializeTimeline(SequencePtr sequ return otio_timeline; } -opentimelineio::v1_0::Track *SaveOTIOTask::SerializeTrack(TrackOutput *track) +OTIO::Track *SaveOTIOTask::SerializeTrack(TrackOutput *track) { - auto otio_track = new opentimelineio::v1_0::Track(); + auto otio_track = new OTIO::Track(); - opentimelineio::v1_0::ErrorStatus es; + OTIO::ErrorStatus es; switch (track->track_type()) { case Timeline::kTrackTypeVideo: @@ -127,19 +125,19 @@ opentimelineio::v1_0::Track *SaveOTIOTask::SerializeTrack(TrackOutput *track) } foreach (Block* block, track->Blocks()) { - opentimelineio::v1_0::Composable* otio_block = nullptr; + OTIO::Composable* otio_block = nullptr; switch (block->type()) { case Block::kClip: { - auto otio_clip = new opentimelineio::v1_0::Clip(block->GetLabel().toStdString()); + auto otio_clip = new OTIO::Clip(block->GetLabel().toStdString()); - otio_clip->set_source_range(opentimelineio::v1_0::TimeRange(block->in().toRationalTime(), + otio_clip->set_source_range(OTIO::TimeRange(block->in().toRationalTime(), block->length().toRationalTime())); QList media_nodes = block->FindInputNodes(); if (!media_nodes.isEmpty()) { - auto media_ref = new opentimelineio::v1_0::ExternalReference(media_nodes.first()->stream()->footage()->filename().toStdString()); + auto media_ref = new OTIO::ExternalReference(media_nodes.first()->stream()->footage()->filename().toStdString()); otio_clip->set_media_reference(media_ref); } @@ -148,7 +146,7 @@ opentimelineio::v1_0::Track *SaveOTIOTask::SerializeTrack(TrackOutput *track) } case Block::kGap: { - otio_block = new opentimelineio::v1_0::Gap(opentimelineio::v1_0::TimeRange(block->in().toRationalTime(), + otio_block = new OTIO::Gap(OTIO::TimeRange(block->in().toRationalTime(), block->length().toRationalTime()), block->GetLabel().toStdString() ); @@ -156,14 +154,14 @@ opentimelineio::v1_0::Track *SaveOTIOTask::SerializeTrack(TrackOutput *track) } case Block::kTransition: { - auto otio_transition = new opentimelineio::v1_0::Transition(block->GetLabel().toStdString()); + auto otio_transition = new OTIO::Transition(block->GetLabel().toStdString()); TransitionBlock* our_transition = static_cast(block); otio_transition->set_in_offset(our_transition->in_offset().toRationalTime()); otio_transition->set_out_offset(our_transition->out_offset().toRationalTime()); - otio_block = new opentimelineio::v1_0::Transition(); + otio_block = new OTIO::Transition(); break; } } @@ -175,7 +173,7 @@ opentimelineio::v1_0::Track *SaveOTIOTask::SerializeTrack(TrackOutput *track) otio_track->append_child(otio_block, &es); - if (es != opentimelineio::v1_0::ErrorStatus::OK) { + if (es != OTIO::ErrorStatus::OK) { goto fail; } } @@ -188,9 +186,9 @@ fail: return nullptr; } -bool SaveOTIOTask::SerializeTrackList(TrackList *list, opentimelineio::v1_0::Timeline* otio_timeline) +bool SaveOTIOTask::SerializeTrackList(TrackList *list, OTIO::Timeline* otio_timeline) { - opentimelineio::v1_0::ErrorStatus es; + OTIO::ErrorStatus es; foreach (TrackOutput* track, list->GetTracks()) { auto otio_track = SerializeTrack(track); @@ -201,7 +199,7 @@ bool SaveOTIOTask::SerializeTrackList(TrackList *list, opentimelineio::v1_0::Tim otio_timeline->tracks()->append_child(otio_track, &es); - if (es != opentimelineio::v1_0::ErrorStatus::OK) { + if (es != OTIO::ErrorStatus::OK) { otio_track->possibly_delete(); return false; } diff --git a/app/task/project/saveotio/saveotio.h b/app/task/project/saveotio/saveotio.h index 2a380cddc..b939739d9 100644 --- a/app/task/project/saveotio/saveotio.h +++ b/app/task/project/saveotio/saveotio.h @@ -27,6 +27,8 @@ #include "project/project.h" #include "task/task.h" +#define OTIO opentimelineio::OPENTIMELINEIO_VERSION + OLIVE_NAMESPACE_ENTER class SaveOTIOTask : public Task @@ -39,11 +41,11 @@ protected: virtual bool Run() override; private: - opentimelineio::v1_0::Timeline* SerializeTimeline(SequencePtr sequence); + OTIO::Timeline* SerializeTimeline(SequencePtr sequence); - opentimelineio::v1_0::Track* SerializeTrack(TrackOutput* track); + OTIO::Track* SerializeTrack(TrackOutput* track); - bool SerializeTrackList(TrackList* list, opentimelineio::v1_0::Timeline *otio_timeline); + bool SerializeTrackList(TrackList* list, OTIO::Timeline *otio_timeline); ProjectPtr project_;