Move OTIO macro to define.h

Move the OTIO macro to define.h to avoid having to add it to all
required files.

Also add some cleanup.
This commit is contained in:
Thomas Wilshaw
2020-11-12 13:44:50 +00:00
parent a1d967efe6
commit 7f4b676318
4 changed files with 5 additions and 7 deletions
+2
View File
@@ -27,6 +27,8 @@
#define OLIVE_NAMESPACE_EXIT }
#define OTIO opentimelineio::OPENTIMELINEIO_VERSION
OLIVE_NAMESPACE_ENTER
const int kHSVChannels = 3;
-2
View File
@@ -34,8 +34,6 @@
#include "project/item/folder/folder.h"
#include "project/item/sequence/sequence.h"
#define OTIO opentimelineio::OPENTIMELINEIO_VERSION
OLIVE_NAMESPACE_ENTER
LoadOTIOTask::LoadOTIOTask(const QString& s) :
+3 -3
View File
@@ -95,7 +95,7 @@ bool SaveOTIOTask::Run()
OTIO::Timeline *SaveOTIOTask::SerializeTimeline(SequencePtr sequence)
{
auto otio_timeline = new OTIO::Timeline(sequence->name().toStdString());
OTIO::Timeline::Retainer<OTIO::Timeline>* time_retainer = new OTIO::Timeline::Retainer<OTIO::Timeline>(otio_timeline);
OTIO::Timeline::Retainer<OTIO::Timeline>* timeline_retainer = new OTIO::Timeline::Retainer<OTIO::Timeline>(otio_timeline);
if (!SerializeTrackList(sequence->viewer_output()->track_list(Timeline::kTrackTypeVideo), otio_timeline)
|| !SerializeTrackList(sequence->viewer_output()->track_list(Timeline::kTrackTypeAudio), otio_timeline)) {
@@ -147,8 +147,8 @@ OTIO::Track *SaveOTIOTask::SerializeTrack(TrackOutput *track)
case Block::kGap:
{
otio_block = new OTIO::Gap(OTIO::TimeRange(block->in().toRationalTime(),
block->length().toRationalTime()),
block->GetLabel().toStdString()
block->length().toRationalTime()),
block->GetLabel().toStdString()
);
break;
}
-2
View File
@@ -27,8 +27,6 @@
#include "project/project.h"
#include "task/task.h"
#define OTIO opentimelineio::OPENTIMELINEIO_VERSION
OLIVE_NAMESPACE_ENTER
class SaveOTIOTask : public Task