From f9e2a83ee4f4726bbf7df06dfa93f5326df97a29 Mon Sep 17 00:00:00 2001
From: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date: Mon, 16 Nov 2020 16:47:31 +0000
Subject: [PATCH] Create OTIO namespace in otioutils.h

---
 app/common/CMakeLists.txt            |  1 +
 app/common/define.h                  |  1 -
 app/common/otioutils.h               | 29 ++++++++++++++++++++++++++++
 app/task/project/loadotio/loadotio.h |  2 ++
 app/task/project/saveotio/saveotio.h |  1 +
 5 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 app/common/otioutils.h

diff --git a/app/common/CMakeLists.txt b/app/common/CMakeLists.txt
index 99521453c..5c2daad49 100644
--- a/app/common/CMakeLists.txt
+++ b/app/common/CMakeLists.txt
@@ -37,6 +37,7 @@ set(OLIVE_SOURCES
   common/lerp.h
   common/memorypool.h
   common/memorypool.cpp
+  common/otioutils.h
   common/qtutils.h
   common/qtutils.cpp
   common/range.h
diff --git a/app/common/define.h b/app/common/define.h
index 4421b9f3a..28c400b8b 100644
--- a/app/common/define.h
+++ b/app/common/define.h
@@ -27,7 +27,6 @@
 
 #define OLIVE_NAMESPACE_EXIT }
 
-#define OTIO opentimelineio::OPENTIMELINEIO_VERSION
 
 OLIVE_NAMESPACE_ENTER
 
diff --git a/app/common/otioutils.h b/app/common/otioutils.h
new file mode 100644
index 000000000..1a3a32dd0
--- /dev/null
+++ b/app/common/otioutils.h
@@ -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
diff --git a/app/task/project/loadotio/loadotio.h b/app/task/project/loadotio/loadotio.h
index 5e44bb67d..639884310 100644
--- a/app/task/project/loadotio/loadotio.h
+++ b/app/task/project/loadotio/loadotio.h
@@ -21,6 +21,8 @@
 #ifndef OTIODECODER_H
 #define OTIODECODER_H
 
+
+#include "common/otioutils.h"
 #include "project/project.h"
 #include "task/project/load/loadbasetask.h"
 
diff --git a/app/task/project/saveotio/saveotio.h b/app/task/project/saveotio/saveotio.h
index 69338f16a..a360dab5d 100644
--- a/app/task/project/saveotio/saveotio.h
+++ b/app/task/project/saveotio/saveotio.h
@@ -24,6 +24,7 @@
 #include <opentimelineio/timeline.h>
 #include <opentimelineio/track.h>
 
+#include "common/otioutils.h"
 #include "project/project.h"
 #include "task/task.h"