Preferences/Config changes for image-surface settings

This commit is contained in:
Robin Gareus 2019-12-26 23:57:04 +01:00
parent 2edbda2526
commit 1809818c94
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 3 additions and 11 deletions

View file

@ -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)"),

View file

@ -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);
}