From 4aba6ea02c4ce613cb3357f0a9d9ca84b85c61a4 Mon Sep 17 00:00:00 2001 From: psieg Date: Sat, 1 Aug 2015 17:01:33 +0200 Subject: [PATCH] Make DDupl the new default grabber --- Software/src/Settings.cpp | 2 ++ Software/src/SettingsDefaults.hpp | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Software/src/Settings.cpp b/Software/src/Settings.cpp index e5fc39b8a..03b27cb36 100644 --- a/Software/src/Settings.cpp +++ b/Software/src/Settings.cpp @@ -1470,6 +1470,8 @@ void Settings::initCurrentProfile(bool isResetDefault) setNewOption(Profile::Key::Grab::Slowdown, Profile::Grab::SlowdownDefault, isResetDefault); setNewOption(Profile::Key::Grab::LuminosityThreshold, Profile::Grab::MinimumLevelOfSensitivityDefault, isResetDefault); setNewOption(Profile::Key::Grab::IsMinimumLuminosityEnabled, Profile::Grab::IsMinimumLuminosityEnabledDefault, isResetDefault); + setNewOption(Profile::Key::Grab::IsDx1011GrabberEnabled, Profile::Grab::IsDx1011GrabberEnabledDefault, isResetDefault); + setNewOption(Profile::Key::Grab::IsDx9GrabbingEnabled, Profile::Grab::IsDx9GrabbingEnabledDefault, isResetDefault); // [MoodLamp] setNewOption(Profile::Key::MoodLamp::IsLiquidMode, Profile::MoodLamp::IsLiquidMode, isResetDefault); setNewOption(Profile::Key::MoodLamp::Color, Profile::MoodLamp::ColorDefault, isResetDefault); diff --git a/Software/src/SettingsDefaults.hpp b/Software/src/SettingsDefaults.hpp index 8719def6f..7954924df 100644 --- a/Software/src/SettingsDefaults.hpp +++ b/Software/src/SettingsDefaults.hpp @@ -37,7 +37,10 @@ # define SUPPORTED_DEVICES "Lightpack,Adalight,Ardulight,Virtual" #endif -#ifdef WINAPI_GRAB_SUPPORT +#ifdef DDUPL_GRAB_SUPPORT +# define GRABMODE_DEFAULT ::Grab::GrabberTypeDDupl +# define GRABMODE_DEFAULT_STR "DDupl" +#elif defined(WINAPI_GRAB_SUPPORT) # define GRABMODE_DEFAULT ::Grab::GrabberTypeWinAPI # define GRABMODE_DEFAULT_STR "WinAPI" #elif defined(X11_GRAB_SUPPORT) @@ -139,6 +142,8 @@ static const QString GrabberDefaultString = GRABMODE_DEFAULT_STR; static const bool IsAvgColorsEnabledDefault = false; static const bool IsSendDataOnlyIfColorsChangesDefault = true; static const bool IsMinimumLuminosityEnabledDefault = true; +static const bool IsDx1011GrabberEnabledDefault = false; +static const bool IsDx9GrabbingEnabledDefault = false; static const int SlowdownMin = 1; static const int SlowdownDefault = 50; static const int SlowdownMax = 1000;