OpenToonz - An open-source full-featured 2D animation creation software
C
#assistants: fix collision with QuickTime includes
Ivan Mahonin8050b4afad8d
diff --git a/toonz/sources/image/3gp/tiio_3gp.h b/toonz/sources/image/3gp/tiio_3gp.hindex 6d1180016..c305ac216 100644--- a/toonz/sources/image/3gp/tiio_3gp.h+++ b/toonz/sources/image/3gp/tiio_3gp.h@@ -9,6 +9,9 @@#include <windows.h>+#include "tlevel_io.h"+#include "tthreadmessage.h"+namespace QuickTime {#define list List#define map Map@@ -36,9 +39,6 @@ namespace QuickTime {#undef QT_uint_fast16_t}-#include "tlevel_io.h"-#include "tthreadmessage.h"-using namespace QuickTime;class TImageWriter3gp;diff --git a/toonz/sources/image/3gp/tiio_3gpM.h b/toonz/sources/image/3gp/tiio_3gpM.hindex e77f67f0f..b300ed0e6 100644--- a/toonz/sources/image/3gp/tiio_3gpM.h+++ b/toonz/sources/image/3gp/tiio_3gpM.h@@ -7,6 +7,9 @@#include "tiio_3gp_proxy.h"#else+#include "tlevel_io.h"+#include "tthread.h"+#include <Carbon/Carbon.h>#include <QuickTime/Movies.h>#include <QuickTime/ImageCompression.h>@@ -15,9 +18,6 @@#include "tquicktime.h"#include "tthreadmessage.h"-#include "tlevel_io.h"-#include "tthread.h"-class TImageWriter3gp;class TImageReader3gp;diff --git a/toonz/sources/image/mov/tiio_mov.h b/toonz/sources/image/mov/tiio_mov.hindex 37990f647..6d63b8c20 100644--- a/toonz/sources/image/mov/tiio_mov.h+++ b/toonz/sources/image/mov/tiio_mov.h@@ -10,6 +10,11 @@// Windows include#include <windows.h>+// Toonz includes+#include "tlevel_io.h"+#include "tthreadmessage.h"+#include "tcommon.h"+// QuickTime includesnamespace QuickTime {#define list QuickTime_list@@ -40,11 +45,6 @@ namespace QuickTime {#include "tquicktime.h"} // namespace QuickTime-// Toonz includes-#include "tlevel_io.h"-#include "tthreadmessage.h"-#include "tcommon.h"-#undef DVAPI#undef DVVAR#ifdef IMAGE_EXPORTSdiff --git a/toonz/sources/image/mov/tiio_movM.h b/toonz/sources/image/mov/tiio_movM.hindex e57aabdaa..0e0681df4 100644--- a/toonz/sources/image/mov/tiio_movM.h+++ b/toonz/sources/image/mov/tiio_movM.h@@ -7,6 +7,11 @@#include "tiio_mov_proxy.h"#else+#include "tlevel_io.h"+#include "tthread.h"+#include "tthreadmessage.h"+#include "tquicktime.h"+//#include <Carbon/Carbon.h>//#include <Movies.h>//#include <ImageCompression.h>@@ -14,11 +19,6 @@#include <QuickTime/QuickTime.h>-#include "tquicktime.h"-#include "tlevel_io.h"-#include "tthread.h"-#include "tthreadmessage.h"-bool IsQuickTimeInstalled();class TLevelWriterMov : public TLevelWriter {diff --git a/toonz/sources/image/tiio.cpp b/toonz/sources/image/tiio.cppindex e0ccc015c..65a99a0e0 100644--- a/toonz/sources/image/tiio.cpp+++ b/toonz/sources/image/tiio.cpp@@ -21,6 +21,10 @@// Platform-specific includes#if defined(_WIN32)+#include "./mov/tiio_mov.h"+#include "./3gp/tiio_3gp.h"+#include "./zcc/tiio_zcc.h"+#if !defined(x64) && !defined(__GNUC__)#define list QuickTime_list@@ -46,10 +50,6 @@#endif-#include "./mov/tiio_mov.h"-#include "./3gp/tiio_3gp.h"-#include "./zcc/tiio_zcc.h"-#elif defined(MACOSX)#include "./mov/tiio_movM.h"#include "./3gp/tiio_3gpM.h"