From 9f8db27a3b02a00a1daf0530041df86f69cea42f Mon Sep 17 00:00:00 2001 From: deltaoscarmike <37912794+deltaoscarmike@users.noreply.github.com> Date: Sun, 2 Sep 2018 20:05:30 +0200 Subject: [PATCH] Fix for glsl threading crash #97 2/? --- src/libprojectM/projectM.cpp | 2 +- src/libprojectM/projectM.hpp | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/libprojectM/projectM.cpp b/src/libprojectM/projectM.cpp index d9431495e..da8b7c2e0 100755 --- a/src/libprojectM/projectM.cpp +++ b/src/libprojectM/projectM.cpp @@ -228,7 +228,7 @@ void projectM::readConfig (const std::string & configFile ) _settings.easterEgg = config.read ( "Easter Egg Parameter", 0.0); _settings.softCutRatingsEnabled = - config.read ( "Soft Cut Ratings Enabled", false); + config.read ( "Soft Cut Ratings Enabled", false); projectM_init ( _settings.meshX, _settings.meshY, _settings.fps, _settings.textureSize, _settings.windowWidth,_settings.windowHeight); diff --git a/src/libprojectM/projectM.hpp b/src/libprojectM/projectM.hpp index b50f40283..6dda32a2f 100755 --- a/src/libprojectM/projectM.hpp +++ b/src/libprojectM/projectM.hpp @@ -135,6 +135,21 @@ public: float easterEgg; bool shuffleEnabled; bool softCutRatingsEnabled; + + Settings() : + meshX(32), + meshY(24), + fps(35), + textureSize(512), + windowWidth(512), + windowHeight(512), + smoothPresetDuration(10), + presetDuration(15), + beatSensitivity(10.0), + aspectCorrection(true), + easterEgg(0.0), + shuffleEnabled(true), + softCutRatingsEnabled(false) {} }; projectM(std::string config_file, int flags = FLAG_NONE);