Browse Source

Merge branch 'v1' of https://github.com/The-XOR/Rack into v1-x

pull/1514/head^2
The XOR 5 years ago
parent
commit
1e693e9e1b
3 changed files with 1 additions and 9 deletions
  1. +0
    -1
      include/settings.hpp
  2. +1
    -1
      src/app/ModuleBrowser.cpp
  3. +0
    -7
      src/settings.cpp

+ 0
- 1
include/settings.hpp View File

@@ -29,7 +29,6 @@ extern float cableOpacity;
extern float cableTension; extern float cableTension;
extern bool allowCursorLock; extern bool allowCursorLock;
extern bool realTime; extern bool realTime;
extern bool keepPreviews;
extern float sampleRate; extern float sampleRate;
extern int threadCount; extern int threadCount;
extern bool paramTooltip; extern bool paramTooltip;


+ 1
- 1
src/app/ModuleBrowser.cpp View File

@@ -190,7 +190,7 @@ struct ModelBox : widget::OpaqueWidget {
} }


void step() override { void step() override {
if (!settings::keepPreviews && previewFb && ++visibleFrames >= 60) {
if (previewFb && ++visibleFrames >= 60) {
deletePreview(); deletePreview();
} }
OpaqueWidget::step(); OpaqueWidget::step();


+ 0
- 7
src/settings.cpp View File

@@ -24,7 +24,6 @@ float cableOpacity = 0.5;
float cableTension = 0.5; float cableTension = 0.5;
bool allowCursorLock = true; bool allowCursorLock = true;
bool realTime = false; bool realTime = false;
bool keepPreviews = true;
float sampleRate = 44100.0; float sampleRate = 44100.0;
int threadCount = 1; int threadCount = 1;
bool paramTooltip = false; bool paramTooltip = false;
@@ -65,8 +64,6 @@ json_t* toJson() {
json_object_set_new(rootJ, "allowCursorLock", json_boolean(allowCursorLock)); json_object_set_new(rootJ, "allowCursorLock", json_boolean(allowCursorLock));


json_object_set_new(rootJ, "realTime", json_boolean(realTime)); json_object_set_new(rootJ, "realTime", json_boolean(realTime));
json_object_set_new(rootJ, "keepPreviews", json_boolean(keepPreviews));


json_object_set_new(rootJ, "sampleRate", json_real(sampleRate)); json_object_set_new(rootJ, "sampleRate", json_real(sampleRate));


@@ -143,10 +140,6 @@ void fromJson(json_t* rootJ) {
if (realTimeJ) if (realTimeJ)
realTime = json_boolean_value(realTimeJ); realTime = json_boolean_value(realTimeJ);


json_t *keepPreviewsJ = json_object_get(rootJ, "keepPreviews");
if (keepPreviewsJ)
keepPreviews = json_boolean_value(keepPreviewsJ);

json_t *sampleRateJ = json_object_get(rootJ, "sampleRate"); json_t *sampleRateJ = json_object_get(rootJ, "sampleRate");
if (sampleRateJ) if (sampleRateJ)
sampleRate = json_number_value(sampleRateJ); sampleRate = json_number_value(sampleRateJ);


Loading…
Cancel
Save