vtl: video-monitor letterbox & orig-zoom to menu

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 19f48e992551cc23a78eeb1014b21651cbc8b148..d147b48fa5e07e95607e530c036faa5e20496bd3 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -38,7 +38,7 @@
 
 #include <jack/jack.h>
 
-#include "ardour/svn_revision.h"
+#include "ardour/revision.h"
 #include "ardour/version.h"
 #include "ardour/ardour.h"
 #include "ardour/audioengine.h"
@@ -60,7 +60,7 @@
 
 #include "i18n.h"
 
-#if (defined __APPLE__ && defined OSX_CUSTOM_FONT)
+#ifdef __APPLE__
 #include <Carbon/Carbon.h>
 #endif
 
@@ -222,6 +222,11 @@ fixup_bundle_environment (int, char* [])
 }
 
 static void load_custom_fonts() {
+/* this code will only compile on OS X 10.6 and above, and we currently do not
+ * need it for earlier versions since we fall back on a non-monospace,
+ * non-custom font.
+ */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
        std::string ardour_mono_file;
 
        if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
@@ -239,6 +244,7 @@ static void load_custom_fonts() {
        if (CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error) != true) {
                cerr << _("Cannot load ArdourMono TrueType font.") << endl;
        }
+#endif
 }
 
 #else
@@ -479,7 +485,7 @@ int main (int argc, char *argv[])
        cout << PROGRAM_NAME
             << VERSIONSTRING
             << _(" (built using ")
-            << svn_revision
+            << revision
 #ifdef __GNUC__
             << _(" and GCC version ") << __VERSION__
 #endif