diff --git a/currentGitHash.txt b/currentGitHash.txt index 9d7d7f4440..3ec5c538e0 100644 --- a/currentGitHash.txt +++ b/currentGitHash.txt @@ -1 +1 @@ -6cdf5de799ddc4f796aca7d242a990dfef10b733 +71af017983d5821bddf3898cc6215ce55ac88de3 diff --git a/hi_backend/backend/BackendEditor.cpp b/hi_backend/backend/BackendEditor.cpp index 12584be598..fd9426e874 100644 --- a/hi_backend/backend/BackendEditor.cpp +++ b/hi_backend/backend/BackendEditor.cpp @@ -1231,10 +1231,6 @@ void MainTopBar::togglePopup(PopupType t, bool shouldShow) ft->setSize(content->getContentWidth(), content->getContentHeight()); c = new OwningComponent(ft); - - int w = (int)((float)content->getContentWidth()*scaleFactor); - int h = (int)((float)content->getContentHeight()*scaleFactor); - c->setName("Interface Preview"); content->interfaceSizeBroadcaster.addListener(*c, [mc](Component& oc, int w, int h) @@ -1249,11 +1245,7 @@ void MainTopBar::togglePopup(PopupType t, bool shouldShow) oc.setSize(w, h); oc.resized(); }); - - } - - } else { diff --git a/hi_backend/backend/BackendToolbar.h b/hi_backend/backend/BackendToolbar.h index 1999ba35ce..4622526fe7 100644 --- a/hi_backend/backend/BackendToolbar.h +++ b/hi_backend/backend/BackendToolbar.h @@ -53,8 +53,10 @@ class MainToolbarFactory: public PathFactory }; -struct ImporterBase: public hlac::HlacArchiver::Listener +class ImporterBase: public hlac::HlacArchiver::Listener { +public: + ImporterBase(BackendRootWindow* bpe_): bpe(bpe_), ok(Result::ok()) diff --git a/hi_backend/backend/currentGit.h b/hi_backend/backend/currentGit.h index 1fcf74e668..8fc8a4b5a2 100644 --- a/hi_backend/backend/currentGit.h +++ b/hi_backend/backend/currentGit.h @@ -1 +1 @@ -#define PREVIOUS_HISE_COMMIT "6cdf5de799ddc4f796aca7d242a990dfef10b733" +#define PREVIOUS_HISE_COMMIT "71af017983d5821bddf3898cc6215ce55ac88de3" diff --git a/hi_backend/backend/debug_components/ProcessorCollection.h b/hi_backend/backend/debug_components/ProcessorCollection.h index 68b5581592..3d8cf6a741 100644 --- a/hi_backend/backend/debug_components/ProcessorCollection.h +++ b/hi_backend/backend/debug_components/ProcessorCollection.h @@ -273,7 +273,7 @@ class SearchableListComponent: public Component, void mouseDown(const MouseEvent& e) { - editor.setText("", sendNotificationAsync); + editor.setText("", true); } diff --git a/hi_backend/backend/dialog_library/dialog_library.cpp b/hi_backend/backend/dialog_library/dialog_library.cpp index faf563326d..b2e8511b01 100644 --- a/hi_backend/backend/dialog_library/dialog_library.cpp +++ b/hi_backend/backend/dialog_library/dialog_library.cpp @@ -698,7 +698,6 @@ var NewProjectCreator::onTemplateSelector(const var::NativeFunctionArgs& args) var NewProjectCreator::initFolder(const var::NativeFunctionArgs& args) { - auto chain = bpe->getBackendProcessor()->getMainSynthChain(); auto& sd = dynamic_cast(bpe->getBackendProcessor())->getSettingsObject(); auto s = sd.getSetting(HiseSettings::Compiler::DefaultProjectFolder).toString(); jassert(s.isNotEmpty()); diff --git a/hi_backend/backend/dialog_library/dialog_library.h b/hi_backend/backend/dialog_library/dialog_library.h index 880ffc6c17..0246d3537c 100644 --- a/hi_backend/backend/dialog_library/dialog_library.h +++ b/hi_backend/backend/dialog_library/dialog_library.h @@ -160,10 +160,12 @@ struct ReleaseStartOptionDialog: public multipage::EncodedDialogBase Component* root; }; -struct NewProjectCreator: public ImporterBase, +class NewProjectCreator: public ImporterBase, public multipage::EncodedDialogBase { +public: + NewProjectCreator(hise::BackendRootWindow* bpe_); void bindCallbacks() override diff --git a/hi_backend/backend/dialog_library/snippet_browser.cpp b/hi_backend/backend/dialog_library/snippet_browser.cpp index c6cf619acf..60e4b21610 100644 --- a/hi_backend/backend/dialog_library/snippet_browser.cpp +++ b/hi_backend/backend/dialog_library/snippet_browser.cpp @@ -55,8 +55,6 @@ var SnippetBrowser::rebuildTable(const var::NativeFunctionArgs& args) auto kv = StringArray::fromTokens(ml[j], ":", ""); auto key = kv[0]; - auto isDate = key == "date"; - if(key.isEmpty()) continue; @@ -396,12 +394,8 @@ var SnippetBrowser::initAddPage(const var::NativeFunctionArgs& args) { auto isEdit = (bool)readState("editButton"); - - writeState("saveFileButton", 0); - auto originalIndex = (int)readState("snippetList"); - if(!isEdit) { writeState("newName", ""); diff --git a/hi_backend/snex_workbench/WorkbenchProcessor.cpp b/hi_backend/snex_workbench/WorkbenchProcessor.cpp index 2e256f7505..3f5896a53c 100644 --- a/hi_backend/snex_workbench/WorkbenchProcessor.cpp +++ b/hi_backend/snex_workbench/WorkbenchProcessor.cpp @@ -501,10 +501,14 @@ void DspNetworkCompileExporter::run() auto ok = codeDestDir.getChildFile(code_path).copyFileTo(realCodeDestDir.getChildFile(code_path)); - if (code_path.size() > 0) + if (code_path.size() > 0 && ok) + { DBG("Wrote code file to " + code_path); + } else + { DBG("Writing generated code failed."); + } } #endif // HISE_INCLUDE_FAUST_JIT diff --git a/hi_core/hi_dsp/plugin_parameter/PluginParameterProcessor.cpp b/hi_core/hi_dsp/plugin_parameter/PluginParameterProcessor.cpp index 880c73a948..9119fc58b9 100644 --- a/hi_core/hi_dsp/plugin_parameter/PluginParameterProcessor.cpp +++ b/hi_core/hi_dsp/plugin_parameter/PluginParameterProcessor.cpp @@ -347,6 +347,8 @@ bool PluginParameterAudioProcessor::isBusesLayoutSupported(const BusesLayout& la auto inputs = layouts.getMainInputChannels(); auto outputs = layouts.getMainOutputChannels(); + ignoreUnused(inputs, outputs); + #if HISE_MIDIFX_PLUGIN return inputs == 0 && outputs == 0; #endif diff --git a/hi_core/hi_modules/effects/editors/DelayEditor.h b/hi_core/hi_modules/effects/editors/DelayEditor.h index 2f93c107ec..9a71508531 100644 --- a/hi_core/hi_modules/effects/editors/DelayEditor.h +++ b/hi_core/hi_modules/effects/editors/DelayEditor.h @@ -49,7 +49,6 @@ class DelayEditor : public ProcessorEditorBody, //[UserMethods] -- You can add your own custom methods in this section. void updateGui() { - const bool isSynced = leftTimeSlider->getRange().getRange() == HiSlider::getRangeForMode(HiSlider::Mode::TempoSync).getRange(); const bool shouldBeSynced = tempoSyncButton->getToggleState(); diff --git a/hi_lac/hlac/SampleBuffer.h b/hi_lac/hlac/SampleBuffer.h index bcd6911dc2..eaf5bb74cd 100644 --- a/hi_lac/hlac/SampleBuffer.h +++ b/hi_lac/hlac/SampleBuffer.h @@ -344,8 +344,6 @@ class HiseSampleBuffer applyGainRamp(channelIndex, startOffset, rampLength, startGain, endGain); else { - bool fadeIn = endGain > startGain; - jassert(getNumSamples() >= rampLength); jassert(getNumChannels() == 2); diff --git a/hi_scripting/scripting/api/ScriptComponentWrappers.cpp b/hi_scripting/scripting/api/ScriptComponentWrappers.cpp index 52924b074c..f4d5902b50 100644 --- a/hi_scripting/scripting/api/ScriptComponentWrappers.cpp +++ b/hi_scripting/scripting/api/ScriptComponentWrappers.cpp @@ -3332,10 +3332,6 @@ void ScriptCreatedComponentWrapper::ValuePopup::updateText() { auto thisText = parent.getTextForValuePopup(); - auto sf = UnblurryGraphics::getScaleFactorForComponent(parent.getComponent(), false); - - //setTransform(AffineTransform::scale(sf)); - if(auto laf = dynamic_cast(&parent.getComponent()->getLookAndFeel())) { auto area = laf->getValueLabelSize(*this, *parent.getComponent(), thisText); diff --git a/hi_scripting/scripting/components/PopupEditors.cpp b/hi_scripting/scripting/components/PopupEditors.cpp index 415f273da3..c4d1fcfea1 100644 --- a/hi_scripting/scripting/components/PopupEditors.cpp +++ b/hi_scripting/scripting/components/PopupEditors.cpp @@ -283,7 +283,7 @@ struct JavascriptLanguageManager : public mcl::LanguageManager ADD_HS_SNIPPET("timer (...)", "const var $TIMER_VAR$ = Engine.createTimerObject();\n\n$TIMER_VAR$.setTimerCallback(function()\n{\n\t$// timer callback$\n});\n\n$TIMER_VAR$.startTimer($30$);\n", "A code snippet that will create a UI timer definition with a callback and a default period of 30Hz"); - ADD_HS_SNIPPET("css_inline (...)", "const var $UI_CONTROL$_laf = Content.createLocalLookAndFeel();\n\$UI_CONTROL$_laf.setInlineStyleSheet(\"#$UI_CONTROL$ {\n background-color: blue;\n color: white;\n}\n\n#$UI_CONTROL$:hover {\n background-color: red;\n}\");\n\nContent.getComponent(\"$UI_CONTROL$\").setLocalLookAndFeel($UI_CONTROL$_laf);\n", + ADD_HS_SNIPPET("css_inline (...)", "const var $UI_CONTROL$_laf = Content.createLocalLookAndFeel();\n$UI_CONTROL$_laf.setInlineStyleSheet(\"#$UI_CONTROL$ {\n background-color: blue;\n color: white;\n}\n\n#$UI_CONTROL$:hover {\n background-color: red;\n}\");\n\nContent.getComponent(\"$UI_CONTROL$\").setLocalLookAndFeel($UI_CONTROL$_laf);\n", "A code snippet that will create a LAF class with an inline CSS style sheet that can be applied to a UI control using its id selector. \n>Use `Ctrl+D` for selecting all `UI_CONTROL` tokens and rename it to the control ID"); #undef ADD_HS_SNIPPET diff --git a/hi_scripting/scripting/engine/JavascriptEngineAdditionalMethods.cpp b/hi_scripting/scripting/engine/JavascriptEngineAdditionalMethods.cpp index 40253dbb1f..3393db90c9 100644 --- a/hi_scripting/scripting/engine/JavascriptEngineAdditionalMethods.cpp +++ b/hi_scripting/scripting/engine/JavascriptEngineAdditionalMethods.cpp @@ -342,8 +342,6 @@ var HiseJavascriptEngine::RootObject::FunctionCall::getResult(const Scope& s) co if (ConstScriptingObject* c = dynamic_cast(thisObject.getObject())) { - auto numExpectedArgs = arguments.size(); - c->getIndexAndNumArgsForFunction(dot->child, functionIndex, numArgs); #if ENABLE_SCRIPTING_SAFE_CHECKS diff --git a/hi_scripting/scripting/scriptnode/ui/NodeComponent.cpp b/hi_scripting/scripting/scriptnode/ui/NodeComponent.cpp index 67f3746806..da70d15c5a 100644 --- a/hi_scripting/scripting/scriptnode/ui/NodeComponent.cpp +++ b/hi_scripting/scripting/scriptnode/ui/NodeComponent.cpp @@ -38,34 +38,6 @@ using namespace hise; juce::String NodeComponent::Header::getPowerButtonId(bool getOff) const { return "on"; - - auto path = parent.node->getValueTree()[PropertyIds::FactoryPath].toString(); - - if (path.startsWith("container.")) - { - path = path.fromFirstOccurrenceOf("container.", false, false); - - if (getOff) - { - if (path.contains("frame") || - path.contains("oversample") || - path.contains("midi") || - path.startsWith("fix")) - return "chain"; - else - return "on"; - } - else - { - if (path == "soft_bypass" || - path == "offline") - return "on"; - - return path; - } - } - - return "on"; } diff --git a/hi_streaming/hi_streaming/StreamingSamplerSound.cpp b/hi_streaming/hi_streaming/StreamingSamplerSound.cpp index 69fbcf67d0..1116147bf5 100644 --- a/hi_streaming/hi_streaming/StreamingSamplerSound.cpp +++ b/hi_streaming/hi_streaming/StreamingSamplerSound.cpp @@ -843,8 +843,6 @@ void StreamingSamplerSound::fillSampleBuffer(hlac::HiseSampleBuffer &sampleBuffe if (sampleBuffer.getNumSamples() == samplesToCopy) sampleBuffer.clearNormalisation({}); - auto isEntireSampleWithLoopReleasePlay = entireSampleLoaded && isLoopEnabled() && isReleaseStartEnabled(); - if (!fileReader.isUsed() && !isEntireSampleLoaded()) return; int thisLoopStart = getLoopStart(isReversed()); @@ -865,7 +863,7 @@ void StreamingSamplerSound::fillSampleBuffer(hlac::HiseSampleBuffer &sampleBuffe if (smallLoopBuffer != nullptr) { - int numSamplesBeforeFirstWrap = 0; + int numSamplesBeforeFirstWrap; if (indexInLoop < 0) { diff --git a/hi_streaming/hi_streaming/StreamingSamplerSound.h b/hi_streaming/hi_streaming/StreamingSamplerSound.h index 43a133d2fb..0894e6d84e 100644 --- a/hi_streaming/hi_streaming/StreamingSamplerSound.h +++ b/hi_streaming/hi_streaming/StreamingSamplerSound.h @@ -645,8 +645,6 @@ class StreamingSamplerSound : public SynthesiserSound lastValue = value; } - - int x = 5; } std::vector> zeroCrossingIndexes; diff --git a/hi_tools/hi_multipage/ActionComponents.cpp b/hi_tools/hi_multipage/ActionComponents.cpp index 19d3ee7cd6..d139968e47 100644 --- a/hi_tools/hi_multipage/ActionComponents.cpp +++ b/hi_tools/hi_multipage/ActionComponents.cpp @@ -2035,8 +2035,6 @@ void UnzipTask::createEditor(Dialog::PageInfo& rootList) Result CopyAsset::performTaskStatic(WaitJob& t) { - bool overwrite = true; - if(auto a = t.getState().getAsset(t.getInfoObject(), mpid::Source)) { String fn; @@ -2867,8 +2865,7 @@ Result HiseActivator::performTaskStatic(WaitJob& t) { URL u(*url); - auto ms = Time::getMillisecondCounter(); - std::unique_ptr in(u.createInputStream(false, nullptr, nullptr, String(), 3000, nullptr)); + auto in = u.createInputStream(false, nullptr, nullptr, String(), 3000, nullptr); if (in != nullptr) return true; diff --git a/hi_tools/hi_multipage/State.cpp b/hi_tools/hi_multipage/State.cpp index 6d270ca635..1cb061c248 100644 --- a/hi_tools/hi_multipage/State.cpp +++ b/hi_tools/hi_multipage/State.cpp @@ -1211,7 +1211,7 @@ var MonolithData::getJSON() const { auto numToRead = input->readInt64(); MemoryBlock mb; - auto numRead = input->readIntoMemoryBlock(mb, numToRead); + auto numRead = (int64)input->readIntoMemoryBlock(mb, numToRead); if(numRead == numToRead) { @@ -1230,6 +1230,8 @@ var MonolithData::getJSON() const else throw String("Failed to read " + String(numToRead) + " bytes"); } + + return var(); } void HardcodedDialogWithState::setOnCloseFunction(const std::function& f) diff --git a/hi_tools/mcl_editor/code_editor/TextEditor.cpp b/hi_tools/mcl_editor/code_editor/TextEditor.cpp index 2c1f3c2e2b..b5eeed695b 100644 --- a/hi_tools/mcl_editor/code_editor/TextEditor.cpp +++ b/hi_tools/mcl_editor/code_editor/TextEditor.cpp @@ -153,8 +153,6 @@ void TextEditor::timerCallback() void TextEditor::setNewTokenCollectionForAllChildren(Component* any, const Identifier& languageId, TokenCollection::Ptr newCollection) { - return; - if(newCollection == nullptr) newCollection = new TokenCollection(languageId); diff --git a/hi_tools/simple_css/Animator.cpp b/hi_tools/simple_css/Animator.cpp index e4b424c7bd..e220adf148 100644 --- a/hi_tools/simple_css/Animator.cpp +++ b/hi_tools/simple_css/Animator.cpp @@ -248,33 +248,19 @@ void StateWatcher::checkChanges(Component* c, StyleSheet::Ptr ss, int currentSta i->resetWaitCounter(); // just a switch between the start and end state - auto stateToggle = currentState == i->startValue.state.stateFlag || - (i->reverse && currentState == i->endValue.state.stateFlag); - - if(false) - { - i->reverse = !i->reverse; - i->updateCurrentRange(); - - found = true; - break; - } - else - { - auto tv = ss->getTransitionValue(i->endValue); - - i->currentProgress = 0.0; - i->reverse = false; - - String m; - m << tv.startValue << "~" << tv.endValue << "~" << String(tv.progress, 3); - - i->intermediateStartValue = m; - i->endValue.state.stateFlag = currentState; - i->transitionData = thisTransition; - found = true; - break; - } + auto tv = ss->getTransitionValue(i->endValue); + + i->currentProgress = 0.0; + i->reverse = false; + + String m; + m << tv.startValue << "~" << tv.endValue << "~" << String(tv.progress, 3); + + i->intermediateStartValue = m; + i->endValue.state.stateFlag = currentState; + i->transitionData = thisTransition; + found = true; + break; } } diff --git a/hi_tools/simple_css/CSSLookAndFeel.h b/hi_tools/simple_css/CSSLookAndFeel.h index cab0a2489d..7f3bdfeaef 100644 --- a/hi_tools/simple_css/CSSLookAndFeel.h +++ b/hi_tools/simple_css/CSSLookAndFeel.h @@ -47,8 +47,7 @@ using namespace juce; * - popup menus * */ -struct StyleSheetLookAndFeel: public GlobalHiseLookAndFeel, - public ScrollBar::LookAndFeelMethods +struct StyleSheetLookAndFeel: public GlobalHiseLookAndFeel { ScrollbarFader::Laf fallback; diff --git a/hi_tools/simple_css/CssParser.cpp b/hi_tools/simple_css/CssParser.cpp index ecf25cbb6e..229aac1f33 100644 --- a/hi_tools/simple_css/CssParser.cpp +++ b/hi_tools/simple_css/CssParser.cpp @@ -1148,6 +1148,7 @@ float ExpressionParser::evaluate(const String& expression, const Context<>& cont } catch(Result& r) { + ignoreUnused(r); DBG(r.getErrorMessage()); return context.defaultFontSize; }