Preferences/Config changes for image-surface settings

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 2844e947dbe4d1bf15459f03fe558470c988be27..49e31260d8282082d845789032454408b6931267 100644 (file)
--- 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 ea81b9fa31c1d0d363c817762b401bd435acf923..b2d302646f1972dfbab5f3d6bef1a08fdd71ff1b 100644 (file)
--- 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);
        }