Create OTIO namespace in otioutils.h
This commit is contained in:
@@ -37,6 +37,7 @@ set(OLIVE_SOURCES
|
|||||||
common/lerp.h
|
common/lerp.h
|
||||||
common/memorypool.h
|
common/memorypool.h
|
||||||
common/memorypool.cpp
|
common/memorypool.cpp
|
||||||
|
common/otioutils.h
|
||||||
common/qtutils.h
|
common/qtutils.h
|
||||||
common/qtutils.cpp
|
common/qtutils.cpp
|
||||||
common/range.h
|
common/range.h
|
||||||
|
|||||||
@@ -27,7 +27,6 @@
|
|||||||
|
|
||||||
#define OLIVE_NAMESPACE_EXIT }
|
#define OLIVE_NAMESPACE_EXIT }
|
||||||
|
|
||||||
#define OTIO opentimelineio::OPENTIMELINEIO_VERSION
|
|
||||||
|
|
||||||
OLIVE_NAMESPACE_ENTER
|
OLIVE_NAMESPACE_ENTER
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
/***
|
||||||
|
|
||||||
|
Olive - Non-Linear Video Editor
|
||||||
|
Copyright (C) 2019 Olive Team
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
***/
|
||||||
|
|
||||||
|
#ifndef OTIOUTILS_H
|
||||||
|
#define OTIOUTILS_H
|
||||||
|
|
||||||
|
#ifdef USE_OTIO
|
||||||
|
#include <opentimelineio/version.h>
|
||||||
|
namespace OTIO = opentimelineio::OPENTIMELINEIO_VERSION;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // OTIOUTILS
|
||||||
@@ -21,6 +21,8 @@
|
|||||||
#ifndef OTIODECODER_H
|
#ifndef OTIODECODER_H
|
||||||
#define OTIODECODER_H
|
#define OTIODECODER_H
|
||||||
|
|
||||||
|
|
||||||
|
#include "common/otioutils.h"
|
||||||
#include "project/project.h"
|
#include "project/project.h"
|
||||||
#include "task/project/load/loadbasetask.h"
|
#include "task/project/load/loadbasetask.h"
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
#include <opentimelineio/timeline.h>
|
#include <opentimelineio/timeline.h>
|
||||||
#include <opentimelineio/track.h>
|
#include <opentimelineio/track.h>
|
||||||
|
|
||||||
|
#include "common/otioutils.h"
|
||||||
#include "project/project.h"
|
#include "project/project.h"
|
||||||
#include "task/task.h"
|
#include "task/task.h"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user