From 1828c2fd73137505b34d16db7e7d64f754825b30 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 1 Dec 2021 15:41:05 -0800 Subject: [PATCH] otio: update to be v0.14 compliant --- app/task/project/loadotio/loadotio.cpp | 4 ++-- app/task/project/saveotio/saveotio.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/task/project/loadotio/loadotio.cpp b/app/task/project/loadotio/loadotio.cpp index bc1983c41..96302d0ce 100644 --- a/app/task/project/loadotio/loadotio.cpp +++ b/app/task/project/loadotio/loadotio.cpp @@ -59,7 +59,7 @@ bool LoadOTIOTask::Run() auto root = OTIO::SerializableObjectWithMetadata::from_json_file(GetFilename().toStdString(), &es); - if (es != OTIO::ErrorStatus::OK) { + if (es.outcome != OTIO::ErrorStatus::Outcome::OK) { SetError(tr("Failed to load OpenTimelineIO from file \"%1\"").arg(GetFilename())); return false; } @@ -133,7 +133,7 @@ bool LoadOTIOTask::Run() // Get clips from track auto clip_map = otio_track->children(); - if (es != OTIO::ErrorStatus::OK) { + if (es.outcome != OTIO::ErrorStatus::Outcome::OK) { SetError(tr("Failed to load clip")); return false; } diff --git a/app/task/project/saveotio/saveotio.cpp b/app/task/project/saveotio/saveotio.cpp index 92af6753b..edee89ce5 100644 --- a/app/task/project/saveotio/saveotio.cpp +++ b/app/task/project/saveotio/saveotio.cpp @@ -91,7 +91,7 @@ bool SaveOTIOTask::Run() } } - return (es == OTIO::ErrorStatus::OK); + return (es.outcome == OTIO::ErrorStatus::Outcome::OK); } OTIO::Timeline *SaveOTIOTask::SerializeTimeline(Sequence *sequence) @@ -168,7 +168,7 @@ OTIO::Track *SaveOTIOTask::SerializeTrack(Track *track) otio_track->append_child(otio_block, &es); - if (es != OTIO::ErrorStatus::OK) { + if (es.outcome != OTIO::ErrorStatus::Outcome::OK) { goto fail; } } @@ -194,7 +194,7 @@ bool SaveOTIOTask::SerializeTrackList(TrackList *list, OTIO::Timeline* otio_time otio_timeline->tracks()->append_child(otio_track, &es); - if (es != OTIO::ErrorStatus::OK) { + if (es.outcome != OTIO::ErrorStatus::Outcome::OK) { otio_track->possibly_delete(); return false; }