From c1a5fad782a9fabdbf5ce24d5f00a896d870f346 Mon Sep 17 00:00:00 2001 From: bsp2 Date: Fri, 26 Oct 2018 20:15:58 +0200 Subject: [PATCH] clean up GCC warnings --- plugins/community/repos/bsp/src/Scanner.cpp | 8 ++++---- src/app/ModuleWidget.cpp | 2 +- src/app/PluginManagerWidget.cpp | 4 ++-- src/app/Toolbar.cpp | 4 ++-- src/engine.cpp | 2 +- src/plugin.cpp | 6 ++---- src/plugin_static.cpp | 2 +- src/window.cpp | 2 ++ 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/community/repos/bsp/src/Scanner.cpp b/plugins/community/repos/bsp/src/Scanner.cpp index 85c31cac..20ca6ee8 100644 --- a/plugins/community/repos/bsp/src/Scanner.cpp +++ b/plugins/community/repos/bsp/src/Scanner.cpp @@ -275,7 +275,7 @@ void Scanner::step() { calcMixLUT(); } - int numInputs = 0; + uint32_t numInputs = 0u; int inputIdx[16]; float outWeights[16]; 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 posStep = 1.0f / numInputs; - float xStep = float(MIX_LUT_SIZE) / numInputs; + // float xStep = float(MIX_LUT_SIZE) / numInputs; float outWSum = 0.0f; - for(int i = 0; i < numInputs; i++) + for(uint32_t i = 0u; i < numInputs; i++) { if(pos < 0.0f) pos += 1.0f; @@ -363,7 +363,7 @@ void Scanner::step() { 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]]; diff --git a/src/app/ModuleWidget.cpp b/src/app/ModuleWidget.cpp index 6a822e3c..a076d5f2 100644 --- a/src/app/ModuleWidget.cpp +++ b/src/app/ModuleWidget.cpp @@ -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"); if (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()); } } diff --git a/src/app/PluginManagerWidget.cpp b/src/app/PluginManagerWidget.cpp index 0e2a22e0..b10eae54 100644 --- a/src/app/PluginManagerWidget.cpp +++ b/src/app/PluginManagerWidget.cpp @@ -17,7 +17,7 @@ namespace rack { #ifdef USE_VST2 struct ParamIdTextField : TextField { 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; 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; float value; sscanf(tf_id->text.c_str(), "%d", &gid); diff --git a/src/app/Toolbar.cpp b/src/app/Toolbar.cpp index 18390638..756b8b5e 100644 --- a/src/app/Toolbar.cpp +++ b/src/app/Toolbar.cpp @@ -339,7 +339,7 @@ static settings_win_size_entry_t loc_settings_win_sizes[] = { { 2500, 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 { const settings_win_size_entry_t *setting; @@ -366,7 +366,7 @@ static settings_refresh_rate_entry_t loc_settings_refresh_rates[] = { { 75, "75 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 { const settings_refresh_rate_entry_t *setting; diff --git a/src/engine.cpp b/src/engine.cpp index 80ca34e0..609cb2a8 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -259,7 +259,7 @@ static bool loc_vst2_find_module_and_paramid_by_unique_paramid(int uniqueParamId // (todo) speed this up with a hashtable for(Module *module : global->gModules) { 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); diff --git a/src/plugin.cpp b/src/plugin.cpp index bc44e66f..2ce729e6 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -166,8 +166,8 @@ static bool loadPlugin(std::string path, bool _bFX) { return true; } -static bool syncPlugin(std::string slug, json_t *manifestJ, bool dryRun) { #ifndef USE_VST2 +static bool syncPlugin(std::string slug, json_t *manifestJ, bool dryRun) { // Check that "status" is "available" json_t *statusJ = json_object_get(manifestJ, "status"); if (!statusJ) { @@ -251,10 +251,8 @@ static bool syncPlugin(std::string slug, json_t *manifestJ, bool dryRun) { global->plugin.downloadName = ""; return true; } -#else - return false; -#endif // USE_VST2 } +#endif // USE_VST2 static void loadPlugins(std::string path, bool _bFX) { #ifdef RACK_HOST diff --git a/src/plugin_static.cpp b/src/plugin_static.cpp index 6cb6391a..35e62085 100644 --- a/src/plugin_static.cpp +++ b/src/plugin_static.cpp @@ -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_VultModules (rack::Plugin *p); } -#endif // SKIP_STATIC_MODULES 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); 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) { #ifndef SKIP_STATIC_MODULES diff --git a/src/window.cpp b/src/window.cpp index 8b272c94..81bf0e12 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -647,6 +647,8 @@ void windowSetWindowPos(Vec pos) { int x = pos.x; int y = pos.y; // (note) not supported + (void)x; + (void)y; } bool windowIsMaximized() {