mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-13 20:45:38 +00:00
Code Issues Projects Releases Wiki Activity

Fix for glsl threading crash #97 2/?

Browse Source
This commit is contained in:
deltaoscarmike
2018-09-02 20:05:30 +02:00
parent 73dc5ccbd9
commit 9f8db27a3b
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libprojectM/projectM.cpp
View File

@ -228,7 +228,7 @@ void projectM::readConfig (const std::string & configFile )
_settings.easterEgg = config.read<float> ( "Easter Egg Parameter", 0.0);
_settings.softCutRatingsEnabled =
config.read<float> ( "Soft Cut Ratings Enabled", false);
config.read<bool> ( "Soft Cut Ratings Enabled", false);
projectM_init ( _settings.meshX, _settings.meshY, _settings.fps,
_settings.textureSize, _settings.windowWidth,_settings.windowHeight);

15
src/libprojectM/projectM.hpp
View File

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