From 1809818c94262982df464cd69ba7215aec2f2401 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 26 Dec 2019 23:57:04 +0100
Subject: [PATCH] Preferences/Config changes for image-surface settings

---
 gtk2_ardour/rc_option_editor.cc | 8 ++------
 gtk2_ardour/ui_config.cc        | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 2844e947db..49e31260d8 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -29,10 +29,6 @@
 #include "gtk2ardour-config.h"
 #endif
 
-#if !defined USE_CAIRO_IMAGE_SURFACE && !defined NDEBUG
-#define OPTIONAL_CAIRO_IMAGE_SURFACE
-#endif
-
 #include <cairo/cairo.h>
 
 #include <boost/algorithm/string.hpp>
@@ -3597,11 +3593,11 @@ RCOptionEditor::RCOptionEditor ()
 	add_option (_("Plugins"), new OptionEditorBlank ());
 
 	/* INTERFACE */
-#if (defined OPTIONAL_CAIRO_IMAGE_SURFACE || defined CAIRO_SUPPORTS_FORCE_BUGGY_GRADIENTS_ENVIRONMENT_VARIABLE)
+#if (!defined USE_CAIRO_IMAGE_SURFACE || defined CAIRO_SUPPORTS_FORCE_BUGGY_GRADIENTS_ENVIRONMENT_VARIABLE)
 	add_option (_("Appearance"), new OptionEditorHeading (_("Graphics Acceleration")));
 #endif
 
-#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
+#ifndef USE_CAIRO_IMAGE_SURFACE
 	BoolOption* bgc = new BoolOption (
 		"cairo-image-surface",
 		_("Disable Graphics Hardware Acceleration (requires restart)"),
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index ea81b9fa31..b2d302646f 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -20,10 +20,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined USE_CAIRO_IMAGE_SURFACE && !defined NDEBUG
-#define OPTIONAL_CAIRO_IMAGE_SURFACE
-#endif
-
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
@@ -204,7 +200,7 @@ UIConfiguration::pre_gui_init ()
 		g_setenv ("FORCE_BUGGY_GRADIENTS", "1", 1);
 	}
 #endif
-#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
+#ifndef USE_CAIRO_IMAGE_SURFACE
 	if (get_cairo_image_surface()) {
 		g_setenv ("ARDOUR_IMAGE_SURFACE", "1", 1);
 	}
-- 
2.30.2