Browse Source

Fix klangfalter for latest juce

tags/2018-04-16
falkTX 7 years ago
parent
commit
3128f11fcd
1 changed files with 8 additions and 8 deletions
  1. +8
    -8
      ports/klangfalter/source/Persistence.cpp

+ 8
- 8
ports/klangfalter/source/Persistence.cpp View File

@@ -25,7 +25,7 @@
#include <map> #include <map>
namespace internal
namespace klanginternal
{ {
struct IRAgentConfiguration struct IRAgentConfiguration
@@ -63,7 +63,7 @@ namespace internal
return Parameters::Cut; return Parameters::Cut;
} }
} // End of namespace internal
} // End of namespace klanginternal
@@ -75,11 +75,11 @@ XmlElement* SaveState(const File& irDirectory, Processor& processor)
convolutionElement->setAttribute("wetDecibels", processor.getParameter(Parameters::WetDecibels)); convolutionElement->setAttribute("wetDecibels", processor.getParameter(Parameters::WetDecibels));
convolutionElement->setAttribute("dryOn", processor.getParameter(Parameters::DryOn)); convolutionElement->setAttribute("dryOn", processor.getParameter(Parameters::DryOn));
convolutionElement->setAttribute("dryDecibels", processor.getParameter(Parameters::DryDecibels)); convolutionElement->setAttribute("dryDecibels", processor.getParameter(Parameters::DryDecibels));
convolutionElement->setAttribute("eqLowType", internal::EqType2String(Parameters::EqType(processor.getParameter(Parameters::EqLowType))));
convolutionElement->setAttribute("eqLowType", klanginternal::EqType2String(Parameters::EqType(processor.getParameter(Parameters::EqLowType))));
convolutionElement->setAttribute("eqLowCutFreq", processor.getParameter(Parameters::EqLowCutFreq)); convolutionElement->setAttribute("eqLowCutFreq", processor.getParameter(Parameters::EqLowCutFreq));
convolutionElement->setAttribute("eqLowShelfFreq", processor.getParameter(Parameters::EqLowShelfFreq)); convolutionElement->setAttribute("eqLowShelfFreq", processor.getParameter(Parameters::EqLowShelfFreq));
convolutionElement->setAttribute("eqLowShelfDecibels", processor.getParameter(Parameters::EqLowShelfDecibels)); convolutionElement->setAttribute("eqLowShelfDecibels", processor.getParameter(Parameters::EqLowShelfDecibels));
convolutionElement->setAttribute("eqHighType", internal::EqType2String(Parameters::EqType(processor.getParameter(Parameters::EqHighType))));
convolutionElement->setAttribute("eqHighType", klanginternal::EqType2String(Parameters::EqType(processor.getParameter(Parameters::EqHighType))));
convolutionElement->setAttribute("eqHighCutFreq", processor.getParameter(Parameters::EqHighCutFreq)); convolutionElement->setAttribute("eqHighCutFreq", processor.getParameter(Parameters::EqHighCutFreq));
convolutionElement->setAttribute("eqHighShelfFreq", processor.getParameter(Parameters::EqHighShelfFreq)); convolutionElement->setAttribute("eqHighShelfFreq", processor.getParameter(Parameters::EqHighShelfFreq));
convolutionElement->setAttribute("eqHighShelfDecibels", processor.getParameter(Parameters::EqHighShelfDecibels)); convolutionElement->setAttribute("eqHighShelfDecibels", processor.getParameter(Parameters::EqHighShelfDecibels));
@@ -145,18 +145,18 @@ bool LoadState(const File& irDirectory, XmlElement& element, Processor& processo
double stereoWidth = element.getDoubleAttribute("stereoWidth", Parameters::StereoWidth.getDefaultValue()); double stereoWidth = element.getDoubleAttribute("stereoWidth", Parameters::StereoWidth.getDefaultValue());
bool reverse = element.getBoolAttribute("reverse", false); bool reverse = element.getBoolAttribute("reverse", false);
Parameters::EqType eqLoType = internal::String2EqType(element.getStringAttribute("eqLowType", juce::String()));
Parameters::EqType eqLoType = klanginternal::String2EqType(element.getStringAttribute("eqLowType", juce::String()));
double eqLoCutFreq = element.getDoubleAttribute("eqLowCutFreq", Parameters::EqLowCutFreq.getDefaultValue()); double eqLoCutFreq = element.getDoubleAttribute("eqLowCutFreq", Parameters::EqLowCutFreq.getDefaultValue());
double eqLoShelfFreq = element.getDoubleAttribute("eqLowShelfFreq", Parameters::EqLowShelfFreq.getDefaultValue()); double eqLoShelfFreq = element.getDoubleAttribute("eqLowShelfFreq", Parameters::EqLowShelfFreq.getDefaultValue());
double eqLoShelfDecibels = element.getDoubleAttribute("eqLowShelfDecibels", Parameters::EqLowShelfDecibels.getDefaultValue()); double eqLoShelfDecibels = element.getDoubleAttribute("eqLowShelfDecibels", Parameters::EqLowShelfDecibels.getDefaultValue());
Parameters::EqType eqHiType = internal::String2EqType(element.getStringAttribute("eqHighType", juce::String()));
Parameters::EqType eqHiType = klanginternal::String2EqType(element.getStringAttribute("eqHighType", juce::String()));
double eqHiCutFreq = element.getDoubleAttribute("eqHighCutFreq", Parameters::EqHighCutFreq.getDefaultValue()); double eqHiCutFreq = element.getDoubleAttribute("eqHighCutFreq", Parameters::EqHighCutFreq.getDefaultValue());
double eqHiShelfFreq = element.getDoubleAttribute("eqHighShelfFreq", Parameters::EqHighShelfFreq.getDefaultValue()); double eqHiShelfFreq = element.getDoubleAttribute("eqHighShelfFreq", Parameters::EqHighShelfFreq.getDefaultValue());
double eqHiShelfDecibels = element.getDoubleAttribute("eqHighShelfDecibels", Parameters::EqHighShelfDecibels.getDefaultValue()); double eqHiShelfDecibels = element.getDoubleAttribute("eqHighShelfDecibels", Parameters::EqHighShelfDecibels.getDefaultValue());
// IRs // IRs
std::vector<internal::IRAgentConfiguration> irConfigurations;
std::vector<klanginternal::IRAgentConfiguration> irConfigurations;
forEachXmlChildElementWithTagName (element, irElement, "ImpulseResponse") forEachXmlChildElementWithTagName (element, irElement, "ImpulseResponse")
{ {
const int inputChannel = irElement->getIntAttribute("input", -1); const int inputChannel = irElement->getIntAttribute("input", -1);
@@ -171,7 +171,7 @@ bool LoadState(const File& irDirectory, XmlElement& element, Processor& processo
{ {
return false; return false;
} }
internal::IRAgentConfiguration configuration;
klanginternal::IRAgentConfiguration configuration;
configuration._irAgent = irAgent; configuration._irAgent = irAgent;
configuration._file = irElement->getStringAttribute("file", String::empty); configuration._file = irElement->getStringAttribute("file", String::empty);
configuration._fileChannel = irElement->getIntAttribute("fileChannel", -1); configuration._fileChannel = irElement->getIntAttribute("fileChannel", -1);


Loading…
Cancel
Save