From 2f037add7d77d53408d5be5dff915034dc07d17e Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <jonathan@openshot.org>
Date: Thu, 2 Jan 2020 16:04:54 -0600
Subject: [PATCH] Revert "Remove JUCE defines"

---
 include/AudioBufferSource.h |  8 ++++++++
 include/AudioReaderSource.h |  8 ++++++++
 include/AudioResampler.h    | 10 ++++++++++
 include/Clip.h              |  5 +++++
 include/ClipBase.h          |  5 +++++
 include/Frame.h             |  9 +++++++++
 6 files changed, 45 insertions(+)

diff --git a/include/AudioBufferSource.h b/include/AudioBufferSource.h
index 3a17feb3..42e55c94 100644
--- a/include/AudioBufferSource.h
+++ b/include/AudioBufferSource.h
@@ -31,6 +31,14 @@
 #ifndef OPENSHOT_AUDIOBUFFERSOURCE_H
 #define OPENSHOT_AUDIOBUFFERSOURCE_H
 
+/// Do not include the juce unittest headers, because it collides with unittest++
+#define __JUCE_UNITTEST_JUCEHEADER__
+
+#ifndef _NDEBUG
+	/// Define NO debug for JUCE on mac os
+	#define _NDEBUG
+#endif
+
 #include <iomanip>
 #include "JuceHeader.h"
 
diff --git a/include/AudioReaderSource.h b/include/AudioReaderSource.h
index c4e2d248..33030adf 100644
--- a/include/AudioReaderSource.h
+++ b/include/AudioReaderSource.h
@@ -31,6 +31,14 @@
 #ifndef OPENSHOT_AUDIOREADERSOURCE_H
 #define OPENSHOT_AUDIOREADERSOURCE_H
 
+/// Do not include the juce unittest headers, because it collides with unittest++
+#define __JUCE_UNITTEST_JUCEHEADER__
+
+#ifndef _NDEBUG
+	/// Define NO debug for JUCE on mac os
+	#define _NDEBUG
+#endif
+
 #include <iomanip>
 #include "ReaderBase.h"
 #include "JuceHeader.h"
diff --git a/include/AudioResampler.h b/include/AudioResampler.h
index d88eb7cb..96615cb3 100644
--- a/include/AudioResampler.h
+++ b/include/AudioResampler.h
@@ -31,6 +31,16 @@
 #ifndef OPENSHOT_RESAMPLER_H
 #define OPENSHOT_RESAMPLER_H
 
+/// Do not include the juce unittest headers, because it collides with unittest++
+#ifndef __JUCE_UNITTEST_JUCEHEADER__
+	#define __JUCE_UNITTEST_JUCEHEADER__
+#endif
+
+#ifndef _NDEBUG
+	// Define NO debug for JUCE on mac os
+	#define _NDEBUG
+#endif
+
 #include "AudioBufferSource.h"
 #include "Exceptions.h"
 #include "JuceHeader.h"
diff --git a/include/Clip.h b/include/Clip.h
index 6fa02c9a..4fdccea9 100644
--- a/include/Clip.h
+++ b/include/Clip.h
@@ -31,6 +31,11 @@
 #ifndef OPENSHOT_CLIP_H
 #define OPENSHOT_CLIP_H
 
+/// Do not include the juce unittest headers, because it collides with unittest++
+#ifndef __JUCE_UNITTEST_JUCEHEADER__
+	#define __JUCE_UNITTEST_JUCEHEADER__
+#endif
+
 #include <memory>
 #include <string>
 #include <QtGui/QImage>
diff --git a/include/ClipBase.h b/include/ClipBase.h
index cf0d11fa..2890f5d8 100644
--- a/include/ClipBase.h
+++ b/include/ClipBase.h
@@ -31,6 +31,11 @@
 #ifndef OPENSHOT_CLIPBASE_H
 #define OPENSHOT_CLIPBASE_H
 
+/// Do not include the juce unittest headers, because it collides with unittest++
+#ifndef __JUCE_UNITTEST_JUCEHEADER__
+	#define __JUCE_UNITTEST_JUCEHEADER__
+#endif
+
 #include <memory>
 #include <sstream>
 #include "Exceptions.h"
diff --git a/include/Frame.h b/include/Frame.h
index f4ff54d4..b9b989a5 100644
--- a/include/Frame.h
+++ b/include/Frame.h
@@ -31,6 +31,15 @@
 #ifndef OPENSHOT_FRAME_H
 #define OPENSHOT_FRAME_H
 
+/// Do not include the juce unittest headers, because it collides with unittest++
+#ifndef __JUCE_UNITTEST_JUCEHEADER__
+	#define __JUCE_UNITTEST_JUCEHEADER__
+#endif
+#ifndef _NDEBUG
+	// Define NO debug for JUCE on mac os
+	#define _NDEBUG
+#endif
+
 #include <iomanip>
 #include <sstream>
 #include <queue>