Skip to content

Commit

Permalink
make model consts static
Browse files Browse the repository at this point in the history
  • Loading branch information
dan-german committed Apr 14, 2024
1 parent acc7015 commit 81680a1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
18 changes: 8 additions & 10 deletions Source/model/ModelConstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,16 @@

#pragma once

// #include "model/Module.h"

namespace model {
const StringArray waveforms { "sine", "was", "saw", "square", "triangle" };
const std::vector<std::string> modulators { "lfo", "envelope", "random" };
const StringArray effects { "filter", "drive", "reverb", "delay", "chorus", "flanger", "phaser", "comp" };
const StringArray tabs { "oscillator", "modulator", "effect" };
const int rows = 7;
const int columns = 5;
static const StringArray waveforms { "sine", "was", "saw", "square", "triangle" };
static const std::vector<std::string> modulators { "lfo", "envelope", "random" };
static const StringArray effects { "filter", "drive", "reverb", "delay", "chorus", "flanger", "phaser", "comp" };
static const StringArray tabs { "oscillator", "modulator", "effect" };
static const int rows = 7;
static const int columns = 5;

const std::vector<std::string> block_popup_column_one { "osc", "noise", "filter", "drive", "flanger" };
const std::vector<std::string> block_popup_column_two { "reverb", "delay", "chorus", "phaser" };
static const std::vector<std::string> block_popup_column_one { "osc", "noise", "filter", "drive", "flanger" };
static const std::vector<std::string> block_popup_column_two { "reverb", "delay", "chorus", "phaser" };

constexpr int MAX_MODULES_PER_TYPE = 8;
}
3 changes: 0 additions & 3 deletions Source/module_new.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
using ValueScale = vital::ValueDetails::ValueScale;

namespace model {



class Module {
public:
ID id;
Expand Down

0 comments on commit 81680a1

Please sign in to comment.