From 176515cee33b645129c84212338941d3c3214b22 Mon Sep 17 00:00:00 2001 From: Robin Davies Date: Fri, 4 Mar 2022 21:10:20 -0500 Subject: [PATCH 1/3] Fix broken build --- src/ConfigMain.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ConfigMain.cpp b/src/ConfigMain.cpp index b84688a..0f20353 100644 --- a/src/ConfigMain.cpp +++ b/src/ConfigMain.cpp @@ -187,7 +187,6 @@ static bool userExists(const char *userName) static void RemoveLine(const std::string&path, const std::string lineToRemove) { - std::string newLine = PAM_LINE; std::vector lines; try { From e454905aa627a3b2960571b64d8cee8ec28b93d0 Mon Sep 17 00:00:00 2001 From: Robin Davies Date: Fri, 4 Mar 2022 21:14:25 -0500 Subject: [PATCH 2/3] Fix broken build. --- lv2/x86_64/CabSim.ttl | 224 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 lv2/x86_64/CabSim.ttl diff --git a/lv2/x86_64/CabSim.ttl b/lv2/x86_64/CabSim.ttl new file mode 100644 index 0000000..66490c3 --- /dev/null +++ b/lv2/x86_64/CabSim.ttl @@ -0,0 +1,224 @@ +@prefix doap: . +@prefix lv2: . +@prefix rdf: . +@prefix rdfs: . +@prefix units: . +@prefix urid: . +@prefix atom: . +@prefix midi: . +@prefix epp: . +@prefix uiext: . +@prefix idpy: . +@prefix foaf: . +@prefix mod: . +@prefix param: . +@prefix work: . + +@prefix atom: . +@prefix patch: . +@prefix plug: . +@prefix rdfs: . +@prefix state: . +@prefix urid: . +@prefix xsd: . + + + + a lv2:Parameter ; + rdfs:label "frequencyResponseVector" ; + rdfs:range atom:Vector . + + + a lv2:Parameter ; + rdfs:label "uiState" ; + rdfs:range atom:Vector . + + + + a foaf:Person ; + foaf:name "Robin Davies" ; + foaf:mbox ; + foaf:homepage . + + + a lv2:Plugin , + lv2:SimulatorPlugin ; + doap:name "TooB Cab Simulator" , + "TooB Cab Simulator"@en-gb + ; + doap:license ; + doap:maintainer ; + lv2:minorVersion 0 ; + lv2:microVersion 13 ; + rdfs:comment "TooB amplifier cabinet simulator." ; + + mod:brand "TooB"; + mod:label "Cab Simulator"; + lv2:requiredFeature urid:map ; + lv2:optionalFeature lv2:hardRTCapable; + lv2:extensionData state:interface; + patch:readable + , + ; +rdfs:comment """ +The TooB Cabinet simulator provides EQ tools for emulating cabinet response. See the presets for +emulations of well-known cabinets. + +The TooB Cabinet Simulator is part of the TooB Amp Emulation Toolkit. Typically, you would +use the following plugins in the following order: + +- TooB Input Stage + +- TooB Tone Stack + +- Toob Power Stage + +- Toob Cabinet Simulator + + +"""; + lv2:port + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 0 ; + lv2:symbol "locut" ; + lv2:name "Lo Cut"; + lv2:default 120.0 ; + lv2:minimum 30.0 ; + lv2:maximum 300.0 ; + units:unit units:hz ; + lv2:scalePoint [ + rdfs:label "30Hz" ; + rdf:value 30.0 + ], [ + rdfs:label "300Hz" ; + rdf:value 300 + ]; + rdfs:comment "Low cutoff frequency. 30hz to 300hz. Set to minimum to disable." ; + ], [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 1 ; + lv2:symbol "bright" ; + lv2:name "Bright"; + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 20.0 ; + units:unit units:db; + lv2:scalePoint [ + rdfs:label "0dB" ; + rdf:value 0.0 + ] , [ + rdfs:label "10dB" ; + rdf:value 10 + ] , [ + rdfs:label "20dB" ; + rdf:value 20 + ]; + rdfs:comment "Bright boost (0db to 20db)." ; + + ], [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 2 ; + lv2:symbol "brightf" ; + lv2:name "BrightF"; + lv2:default 1300.0 ; + lv2:minimum 1000.0 ; + lv2:maximum 5000.0; + units:unit units:hz; + lv2:designation param:cutoffFrequency ; + rdfs:comment "Bright boost frequency. (1khz to 8khz)" ; + + ], [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 3 ; + lv2:symbol "hicut" ; + lv2:name "Hi Cut"; + lv2:default 6000.0 ; + lv2:minimum 2000.0 ; + lv2:maximum 13000.0; + units:unit units:hz; + lv2:portProperty epp:logarithmic; + lv2:designation param:cutoffFrequency ; + rdfs:comment "Hi cutoff frequency. 2khz to 13khz. Set to maximum to disable." ; + ], [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 4 ; + lv2:symbol "comb" ; + lv2:name "Comb"; + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 1.0; + rdfs:comment "Amount of comb filtering. 0 to 1. Set to minimum to disable." ; + ], [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 5 ; + lv2:symbol "combf" ; + lv2:name "Comb F"; + lv2:default 2000.0 ; + lv2:minimum 1000.0 ; + lv2:maximum 8000.0; + units:unit units:hz; + lv2:designation param:cutoffFrequency ; + rdfs:comment "Comb filter frequency. (1khz to 8khz)" ; + ], [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 6 ; + lv2:symbol "trim" ; + lv2:name "Trim"; + lv2:default 0.0 ; + lv2:minimum -30.0 ; + lv2:maximum 30.0; + units:unit units:db; + rdfs:comment "Master volume trim. (-30db to + 30db)" ; + ], + [ + a lv2:AudioPort , + lv2:InputPort ; + lv2:index 7 ; + lv2:symbol "in" ; + lv2:name "In" + ] , + [ + a lv2:AudioPort , + lv2:OutputPort ; + lv2:index 8 ; + lv2:symbol "out" ; + lv2:name "Out" + ], [ + a atom:AtomPort , + lv2:InputPort; + atom:bufferType atom:Sequence ; + atom:supports patch:Message; + lv2:designation lv2:control ; + lv2:index 9 ; + lv2:symbol "control" ; + lv2:name "Control" ; + rdfs:comment "Plugin to GUI communication" ; + ] , [ + a atom:AtomPort , + lv2:OutputPort ; + atom:bufferType atom:Sequence ; + atom:supports patch:Message; + lv2:designation lv2:control ; + lv2:index 10 ; + lv2:symbol "notify" ; + lv2:name "Notify" ; + rdfs:comment "Plugin to GUI communication" ; + ] + . + + From b763cbabfe79b4fcaba6a9cf44ba9169ca09598d Mon Sep 17 00:00:00 2001 From: Robin Davies Date: Fri, 4 Mar 2022 21:36:45 -0500 Subject: [PATCH 3/3] Fix build. --- src/ConfigMain.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ConfigMain.cpp b/src/ConfigMain.cpp index 0f20353..67c98e5 100644 --- a/src/ConfigMain.cpp +++ b/src/ConfigMain.cpp @@ -32,6 +32,8 @@ #include #include "JackServerSettings.hpp" +#define SS(x) ( ((std::stringstream&)(std::stringstream() << x )).str()) + using namespace std; using namespace pipedal; @@ -196,7 +198,7 @@ static void RemoveLine(const std::string&path, const std::string lineToRemove) ifstream f(path); if (!f.is_open()) { - throw PiPedalException((std::stringstream() << "Can't open " << path).str()); + throw PiPedalException(SS("Can't open " << path)); } while (true) { @@ -215,7 +217,7 @@ static void RemoveLine(const std::string&path, const std::string lineToRemove) std::ofstream f(path); if (!f.is_open()) { - throw PiPedalException("Can't write to file."); + throw PiPedalException(SS("Can't write to " << path)); } for (auto&line: lines) { @@ -251,7 +253,7 @@ void InstallPamEnv() ifstream f(path); if (!f.is_open()) { - throw PiPedalException((std::stringstream() << "Can't open " << path).str()); + throw PiPedalException(SS("Can't open " << path)); } while (true) { @@ -276,7 +278,7 @@ void InstallPamEnv() std::ofstream f(path); if (!f.is_open()) { - throw PiPedalException("Can't write to file."); + throw PiPedalException(SS("Can't write to " << path)); } for (auto&line: lines) {