From 779a17b1b2db32a3859ffe275a1aae56eb396e38 Mon Sep 17 00:00:00 2001 From: Martin Zuther Date: Sat, 25 Feb 2017 11:41:51 +0100 Subject: [PATCH 1/3] silence warnings about unused variables --- .../juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp b/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp index 9f75480f82..8d80f0e0cc 100644 --- a/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp @@ -13,6 +13,14 @@ #include "../utility/juce_CheckSettingMacros.h" #include "../../juce_core/system/juce_TargetPlatform.h" // for JUCE_LINUX + +// silence warnings about unused variables (found on +// https://stackoverflow.com/questions/1486904) +#ifndef UNUSED +#define UNUSED(x) (void)(x) +#endif + + #if JucePlugin_Build_LV2 /** Plugin requires processing with a fixed/constant block size */ @@ -1682,6 +1690,8 @@ public: uint32_t lv2GetOptions (LV2_Options_Option* options) { // currently unused + UNUSED(options); + return LV2_OPTIONS_SUCCESS; } @@ -1840,6 +1850,7 @@ public: info = curPosInfo; return true; #else + UNUSED(info); return false; #endif } From 5eb7347fe47059a44a4baae1fb986dce6e8a010f Mon Sep 17 00:00:00 2001 From: Martin Zuther Date: Sat, 25 Feb 2017 18:01:38 +0100 Subject: [PATCH 2/3] simplified LV2 wrapper (less obsolete constants) --- .../LV2/juce_LV2_Wrapper.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp b/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp index 8d80f0e0cc..8bb3e21d94 100644 --- a/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp @@ -251,7 +251,7 @@ const String makeManifestFile (AudioProcessor* const filter, const String& binar } /** Create the -plugin-.ttl file contents */ -const String makePluginFile (AudioProcessor* const filter) +const String makePluginFile (AudioProcessor* const filter, const int maxNumInputChannels, const int maxNumOutputChannels) { const String& pluginURI(getPluginURI()); String text; @@ -353,7 +353,7 @@ const String makePluginFile (AudioProcessor* const filter) #endif // Audio inputs - for (int i=0; i < JucePlugin_MaxNumInputChannels; ++i) + for (int i=0; i < maxNumInputChannels; ++i) { if (i == 0) text += " lv2:port [\n"; @@ -365,14 +365,14 @@ const String makePluginFile (AudioProcessor* const filter) text += " lv2:symbol \"lv2_audio_in_" + String(i+1) + "\" ;\n"; text += " lv2:name \"Audio Input " + String(i+1) + "\" ;\n"; - if (i+1 == JucePlugin_MaxNumInputChannels) + if (i+1 == maxNumInputChannels) text += " ] ;\n\n"; else text += " ] ,\n"; } // Audio outputs - for (int i=0; i < JucePlugin_MaxNumOutputChannels; ++i) + for (int i=0; i < maxNumOutputChannels; ++i) { if (i == 0) text += " lv2:port [\n"; @@ -384,7 +384,7 @@ const String makePluginFile (AudioProcessor* const filter) text += " lv2:symbol \"lv2_audio_out_" + String(i+1) + "\" ;\n"; text += " lv2:name \"Audio Output " + String(i+1) + "\" ;\n"; - if (i+1 == JucePlugin_MaxNumOutputChannels) + if (i+1 == maxNumOutputChannels) text += " ] ;\n\n"; else text += " ] ,\n"; @@ -527,7 +527,7 @@ void createLv2Files(const char* basename) std::cout << "Writing " << binary << ".ttl..."; std::cout.flush(); std::fstream plugin(binaryTTL.toUTF8(), std::ios::out); - plugin << makePluginFile(filter) << std::endl; + plugin << makePluginFile(filter, JucePlugin_MaxNumInputChannels, JucePlugin_MaxNumOutputChannels) << std::endl; plugin.close(); std::cout << " done!" << std::endl; From 02510e59c216b9d6034f7a9ef9bf2ad8bea538f0 Mon Sep 17 00:00:00 2001 From: Martin Zuther Date: Sun, 19 Mar 2017 13:48:05 +0100 Subject: [PATCH 3/3] silence warnings about unused variables #2 --- .../juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp b/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp index 8bb3e21d94..1748719fde 100644 --- a/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp @@ -14,13 +14,6 @@ #include "../../juce_core/system/juce_TargetPlatform.h" // for JUCE_LINUX -// silence warnings about unused variables (found on -// https://stackoverflow.com/questions/1486904) -#ifndef UNUSED -#define UNUSED(x) (void)(x) -#endif - - #if JucePlugin_Build_LV2 /** Plugin requires processing with a fixed/constant block size */ @@ -1690,7 +1683,7 @@ public: uint32_t lv2GetOptions (LV2_Options_Option* options) { // currently unused - UNUSED(options); + ignoreUnused(options); return LV2_OPTIONS_SUCCESS; } @@ -1850,7 +1843,7 @@ public: info = curPosInfo; return true; #else - UNUSED(info); + ignoreUnused(info); return false; #endif }