oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move OTIO macro to define.h

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
app/task/project/saveotio/saveotio.cpp
+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;
}