@@ -275,7 +275,7 @@ void Scanner::step() { | |||||
calcMixLUT(); | calcMixLUT(); | ||||
} | } | ||||
int numInputs = 0; | |||||
uint32_t numInputs = 0u; | |||||
int inputIdx[16]; | int inputIdx[16]; | ||||
float outWeights[16]; | float outWeights[16]; | ||||
for(int i = 0; i < 16; i++) | for(int i = 0; i < 16; i++) | ||||
@@ -321,10 +321,10 @@ void Scanner::step() { | |||||
{ | { | ||||
float pos = -params[POSITION_PARAM].value + 0.5f - (inputs[MOD_POSITION_INPUT].value * (1.0f/5.0f))*params[MOD_POSITION_AMOUNT_PARAM].value; | float pos = -params[POSITION_PARAM].value + 0.5f - (inputs[MOD_POSITION_INPUT].value * (1.0f/5.0f))*params[MOD_POSITION_AMOUNT_PARAM].value; | ||||
float posStep = 1.0f / numInputs; | float posStep = 1.0f / numInputs; | ||||
float xStep = float(MIX_LUT_SIZE) / numInputs; | |||||
// float xStep = float(MIX_LUT_SIZE) / numInputs; | |||||
float outWSum = 0.0f; | float outWSum = 0.0f; | ||||
for(int i = 0; i < numInputs; i++) | |||||
for(uint32_t i = 0u; i < numInputs; i++) | |||||
{ | { | ||||
if(pos < 0.0f) | if(pos < 0.0f) | ||||
pos += 1.0f; | pos += 1.0f; | ||||
@@ -363,7 +363,7 @@ void Scanner::step() { | |||||
float outWScale = (outWSum > 0.0f) ? (1.0f / outWSum) : 0.0f; | float outWScale = (outWSum > 0.0f) ? (1.0f / outWSum) : 0.0f; | ||||
for(int i = 0; i < numInputs; i++) | |||||
for(uint32_t i = 0u; i < numInputs; i++) | |||||
{ | { | ||||
int portIdx = inputIdx[input_shuffle_lut[i]]; | int portIdx = inputIdx[input_shuffle_lut[i]]; | ||||
@@ -142,7 +142,7 @@ void ModuleWidget::fromJson(json_t *rootJ) { | |||||
json_t *vst2_unique_param_base_idJ = json_object_get(rootJ, "vst2_unique_param_base_id"); | json_t *vst2_unique_param_base_idJ = json_object_get(rootJ, "vst2_unique_param_base_id"); | ||||
if (vst2_unique_param_base_idJ) { | if (vst2_unique_param_base_idJ) { | ||||
module->vst2_unique_param_base_id = json_integer_value(vst2_unique_param_base_idJ); | module->vst2_unique_param_base_id = json_integer_value(vst2_unique_param_base_idJ); | ||||
if((module->vst2_unique_param_base_id + module->params.size()) > global->vst2.next_unique_param_base_id) { | |||||
if(int(module->vst2_unique_param_base_id + module->params.size()) > global->vst2.next_unique_param_base_id) { | |||||
global->vst2.next_unique_param_base_id = (module->vst2_unique_param_base_id + module->params.size()); | global->vst2.next_unique_param_base_id = (module->vst2_unique_param_base_id + module->params.size()); | ||||
} | } | ||||
} | } | ||||
@@ -17,7 +17,7 @@ namespace rack { | |||||
#ifdef USE_VST2 | #ifdef USE_VST2 | ||||
struct ParamIdTextField : TextField { | struct ParamIdTextField : TextField { | ||||
void onTextEnter() override { | void onTextEnter() override { | ||||
printf("xxx ParamIdTextField: enter param id \"%s\"\n", text); | |||||
printf("xxx ParamIdTextField: enter param id \"%s\"\n", text.c_str()); | |||||
} | } | ||||
}; | }; | ||||
@@ -25,7 +25,7 @@ struct ParamValueTextField : TextField { | |||||
ParamIdTextField *tf_id; | ParamIdTextField *tf_id; | ||||
void onTextEnter() override { | void onTextEnter() override { | ||||
printf("xxx ParamValueTextField: enter param value \"%s\"\n", text); | |||||
printf("xxx ParamValueTextField: enter param value \"%s\"\n", text.c_str()); | |||||
int gid; | int gid; | ||||
float value; | float value; | ||||
sscanf(tf_id->text.c_str(), "%d", &gid); | sscanf(tf_id->text.c_str(), "%d", &gid); | ||||
@@ -339,7 +339,7 @@ static settings_win_size_entry_t loc_settings_win_sizes[] = { | |||||
{ 2500, 1980 }, | { 2500, 1980 }, | ||||
{ 3000, 1980 }, | { 3000, 1980 }, | ||||
}; | }; | ||||
#define NUM_SETTINGS_WIN_SIZE (sizeof(loc_settings_win_sizes) / sizeof(settings_win_size_entry_t)) | |||||
#define NUM_SETTINGS_WIN_SIZE (int(sizeof(loc_settings_win_sizes) / sizeof(settings_win_size_entry_t))) | |||||
struct SettingsWinSizeItem : MenuItem { | struct SettingsWinSizeItem : MenuItem { | ||||
const settings_win_size_entry_t *setting; | const settings_win_size_entry_t *setting; | ||||
@@ -366,7 +366,7 @@ static settings_refresh_rate_entry_t loc_settings_refresh_rates[] = { | |||||
{ 75, "75 fps" }, | { 75, "75 fps" }, | ||||
{ 100, "100 fps" }, | { 100, "100 fps" }, | ||||
}; | }; | ||||
#define NUM_SETTINGS_REFRESH_RATE (sizeof(loc_settings_refresh_rates) / sizeof(settings_refresh_rate_entry_t)) | |||||
#define NUM_SETTINGS_REFRESH_RATE (int(sizeof(loc_settings_refresh_rates) / sizeof(settings_refresh_rate_entry_t))) | |||||
struct SettingsRefreshRateItem : MenuItem { | struct SettingsRefreshRateItem : MenuItem { | ||||
const settings_refresh_rate_entry_t *setting; | const settings_refresh_rate_entry_t *setting; | ||||
@@ -259,7 +259,7 @@ static bool loc_vst2_find_module_and_paramid_by_unique_paramid(int uniqueParamId | |||||
// (todo) speed this up with a hashtable | // (todo) speed this up with a hashtable | ||||
for(Module *module : global->gModules) { | for(Module *module : global->gModules) { | ||||
if( (uniqueParamId >= module->vst2_unique_param_base_id) && | if( (uniqueParamId >= module->vst2_unique_param_base_id) && | ||||
(uniqueParamId < (module->vst2_unique_param_base_id + module->params.size())) | |||||
(uniqueParamId < int(module->vst2_unique_param_base_id + module->params.size())) | |||||
) | ) | ||||
{ | { | ||||
*retParamId = (uniqueParamId - module->vst2_unique_param_base_id); | *retParamId = (uniqueParamId - module->vst2_unique_param_base_id); | ||||
@@ -166,8 +166,8 @@ static bool loadPlugin(std::string path, bool _bFX) { | |||||
return true; | return true; | ||||
} | } | ||||
static bool syncPlugin(std::string slug, json_t *manifestJ, bool dryRun) { | |||||
#ifndef USE_VST2 | #ifndef USE_VST2 | ||||
static bool syncPlugin(std::string slug, json_t *manifestJ, bool dryRun) { | |||||
// Check that "status" is "available" | // Check that "status" is "available" | ||||
json_t *statusJ = json_object_get(manifestJ, "status"); | json_t *statusJ = json_object_get(manifestJ, "status"); | ||||
if (!statusJ) { | if (!statusJ) { | ||||
@@ -251,10 +251,8 @@ static bool syncPlugin(std::string slug, json_t *manifestJ, bool dryRun) { | |||||
global->plugin.downloadName = ""; | global->plugin.downloadName = ""; | ||||
return true; | return true; | ||||
} | } | ||||
#else | |||||
return false; | |||||
#endif // USE_VST2 | |||||
} | } | ||||
#endif // USE_VST2 | |||||
static void loadPlugins(std::string path, bool _bFX) { | static void loadPlugins(std::string path, bool _bFX) { | ||||
#ifdef RACK_HOST | #ifdef RACK_HOST | ||||
@@ -113,7 +113,6 @@ extern void init_plugin_unless_modules (rack::Plugin *p); | |||||
extern void init_plugin_Valley (rack::Plugin *p); | extern void init_plugin_Valley (rack::Plugin *p); | ||||
// extern void init_plugin_VultModules (rack::Plugin *p); | // extern void init_plugin_VultModules (rack::Plugin *p); | ||||
} | } | ||||
#endif // SKIP_STATIC_MODULES | |||||
static void vst2_load_static_rack_plugin(const char *_name, InitCallback _initCallback) { | static void vst2_load_static_rack_plugin(const char *_name, InitCallback _initCallback) { | ||||
@@ -140,6 +139,7 @@ static void vst2_load_static_rack_plugin(const char *_name, InitCallback _initCa | |||||
global->plugin.gPlugins.push_back(plugin); | global->plugin.gPlugins.push_back(plugin); | ||||
info("vcvrack: Loaded static plugin %s %s", plugin->slug.c_str(), plugin->version.c_str()); | info("vcvrack: Loaded static plugin %s %s", plugin->slug.c_str(), plugin->version.c_str()); | ||||
} | } | ||||
#endif // SKIP_STATIC_MODULES | |||||
void vst2_load_static_rack_plugins(void) { | void vst2_load_static_rack_plugins(void) { | ||||
#ifndef SKIP_STATIC_MODULES | #ifndef SKIP_STATIC_MODULES | ||||
@@ -647,6 +647,8 @@ void windowSetWindowPos(Vec pos) { | |||||
int x = pos.x; | int x = pos.x; | ||||
int y = pos.y; | int y = pos.y; | ||||
// (note) not supported | // (note) not supported | ||||
(void)x; | |||||
(void)y; | |||||
} | } | ||||
bool windowIsMaximized() { | bool windowIsMaximized() { | ||||