Browse Source

revert my changes to the v1 branch and move them to the keep-previews branch.

pull/1474/head
Mark Sanders 5 years ago
parent
commit
bf6e241092
3 changed files with 10 additions and 18 deletions
  1. +0
    -1
      include/settings.hpp
  2. +10
    -10
      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;


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

@@ -192,7 +192,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();
@@ -249,16 +249,16 @@ struct ModelBox : widget::OpaqueWidget {
std::string text; std::string text;
text = model->plugin->brand; text = model->plugin->brand;
text += " " + model->name; text += " " + model->name;
// Tags
text += "\nTags: ";
for (size_t i = 0; i < model->tags.size(); i++) {
if (i > 0)
text += ", ";
text += model->tags[i];
}
// Description
if (model->description != "") {
if (model->description != "")
text += "\n" + model->description; text += "\n" + model->description;
// Tags
if (!model->tags.empty()) {
text += "\nTags: ";
for (size_t i = 0; i < model->tags.size(); i++) {
if (i > 0)
text += ", ";
text += model->tags[i];
}
} }
ui::Tooltip *tooltip = new ui::Tooltip; ui::Tooltip *tooltip = new ui::Tooltip;
tooltip->text = text; tooltip->text = text;


+ 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;
@@ -66,8 +65,6 @@ json_t *toJson() {


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


json_object_set_new(rootJ, "threadCount", json_integer(threadCount)); json_object_set_new(rootJ, "threadCount", json_integer(threadCount));
@@ -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