From 1ca430babd9682fc403b561117f122bbd5e8adae Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 11 Jun 2013 01:26:49 +0200
Subject: [PATCH] separate general vs temporary(no vtl) OSX defines

---
 gtk2_ardour/ardour.menus.in | 10 +++++-----
 gtk2_ardour/wscript         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 632136c734..f666262f16 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -35,7 +35,7 @@
       <menuitem action='addExistingAudioFiles'/>
       <!--menuitem action='importFromSession'/-->
 
-#ifndef GTKOSX
+#ifndef NOVIDEOTIMELINE
       <menuitem action='OpenVideo'/>
       <menuitem action='CloseVideo'/>
 #endif
@@ -282,7 +282,7 @@
         <menuitem action='snap-regions-to-grid'/>
         <menuitem action='toggle-region-lock'/>
         <menuitem action='toggle-region-lock-style'/>
-#ifndef GTKOSX
+#ifndef NOVIDEOTIMELINE
         <menuitem action='toggle-region-video-lock'/>
 #endif
         <menuitem action='set-region-sync-position'/>
@@ -437,7 +437,7 @@
         <menuitem action="toggle-cd-marker-ruler"/>
         <menuitem action="toggle-marker-ruler"/>
         <separator/>
-#ifndef GTKOSX
+#ifndef NOVIDEOTIMELINE
         <menuitem action="toggle-video-ruler"/>
 #endif
       </menu>
@@ -557,7 +557,7 @@
     <menuitem action="toggle-marker-ruler"/>
     <menuitem action="toggle-cd-marker-ruler"/>
     <menuitem action="toggle-loop-punch-ruler"/>
-#ifndef GTKOSX
+#ifndef NOVIDEOTIMELINE
     <separator/>
     <menuitem action="toggle-video-ruler"/>
 #endif
@@ -656,7 +656,7 @@
       <menuitem action='naturalize-region'/>
       <menuitem action='toggle-region-lock'/>
       <menuitem action='toggle-region-lock-style'/>
-#ifndef GTKOSX
+#ifndef NOVIDEOTIMELINE
       <menuitem action='toggle-region-video-lock'/>
 #endif
       <menuitem action='snap-regions-to-grid'/>
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index a9dc2ceff7..c25338a343 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -649,7 +649,7 @@ def build(bld):
     # Menus
     menus_argv = []
     if bld.is_defined('GTKOSX'):
-        menus_argv = [ '-E', '-P', '-DGTKOSX' ]
+        menus_argv = [ '-E', '-P', '-DGTKOSX', '-DNOVIDEOTIMELINE' ]
     else:
         menus_argv = [ '-E', '-P' ]