Add magic lines to put the DVD-o-matic window at the front on OS X so that it gets a menu bar. Put our Rect in a namespace to hide from Carbon's version.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/lib/util.h b/src/lib/util.h
index d0c350a56..3e1d7f4b4 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -44,6 +44,8 @@ extern "C" {
 #define TIMING(...)
 #endif
 
+#undef check
+
 /** The maximum number of audio channels that we can cope with */
 #define MAX_AUDIO_CHANNELS 6
 
@@ -150,6 +152,9 @@ struct Position
 	int y;
 };
 
+namespace dvdomatic
+{
+	
 /** @struct Rect
  *  @brief A rectangle.
  */
@@ -185,6 +190,8 @@ struct Rect
 	Rect intersection (Rect const & other) const;
 };
 
+}
+
 extern std::string crop_string (Position, libdcp::Size);
 extern int dcp_audio_sample_rate (int);
 extern std::string colour_lut_index_to_name (int index);