commit 5ab5f8b3ae1ed24f6ec1aa8eaee1b6cadd88a4f5
parent 979951ab82154aadfbcd2b87db744fdf91fd04a5
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Fri, 25 Oct 2024 18:26:55 +0200
fix Osirus not finding rom in public documents folder because roms enumerated before search paths defined
Diffstat:
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/source/osTIrusJucePlugin/OsTIrusProcessor.cpp b/source/osTIrusJucePlugin/OsTIrusProcessor.cpp
@@ -41,9 +41,9 @@ OsTIrusProcessor::OsTIrusProcessor() :
.withOutput("USB 3", juce::AudioChannelSet::stereo(), true)
#endif
, ::getConfigOptions(), pluginLib::Processor::Properties{JucePlugin_Name, JucePlugin_IsSynth, JucePlugin_WantsMidiInput, JucePlugin_ProducesMidiOutput, JucePlugin_IsMidiEffect, JucePlugin_Lv2Uri, getBinaryData()}
- , virusLib::ROMLoader::findROMs(virusLib::DeviceModel::TI2, virusLib::DeviceModel::Snow), virusLib::DeviceModel::TI2)
+ , virusLib::DeviceModel::TI2)
{
- postConstruct();
+ postConstruct(virusLib::ROMLoader::findROMs(virusLib::DeviceModel::TI2, virusLib::DeviceModel::Snow));
}
OsTIrusProcessor::~OsTIrusProcessor()
diff --git a/source/osirusJucePlugin/OsirusProcessor.cpp b/source/osirusJucePlugin/OsirusProcessor.cpp
@@ -38,9 +38,9 @@ OsirusProcessor::OsirusProcessor() :
.withOutput("Out 3", juce::AudioChannelSet::stereo(), true)
#endif
, ::getConfigOptions(), pluginLib::Processor::Properties{JucePlugin_Name, JucePlugin_IsSynth, JucePlugin_WantsMidiInput, JucePlugin_ProducesMidiOutput, JucePlugin_IsMidiEffect, JucePlugin_Lv2Uri, getBinaryData()}
- , virusLib::ROMLoader::findROMs(virusLib::DeviceModel::ABC), virusLib::DeviceModel::ABC)
+ , virusLib::DeviceModel::ABC)
{
- postConstruct();
+ postConstruct(virusLib::ROMLoader::findROMs(virusLib::DeviceModel::ABC));
}
OsirusProcessor::~OsirusProcessor()
diff --git a/source/virusJucePlugin/VirusProcessor.cpp b/source/virusJucePlugin/VirusProcessor.cpp
@@ -12,12 +12,10 @@
namespace virus
{
- VirusProcessor::VirusProcessor(const BusesProperties& _busesProperties, const juce::PropertiesFile::Options& _configOptions, const pluginLib::Processor::Properties& _properties, const std::vector<virusLib::ROMFile>& _roms, const virusLib::DeviceModel _defaultModel)
+ VirusProcessor::VirusProcessor(const BusesProperties& _busesProperties, const juce::PropertiesFile::Options& _configOptions, const pluginLib::Processor::Properties& _properties, const virusLib::DeviceModel _defaultModel)
: Processor(_busesProperties, _configOptions, _properties)
- , m_roms(_roms)
, m_defaultModel(_defaultModel)
{
- zynthianExportLv2Presets();
}
VirusProcessor::~VirusProcessor()
@@ -72,14 +70,18 @@ namespace virus
}
}
- void VirusProcessor::postConstruct()
+ void VirusProcessor::postConstruct(std::vector<virusLib::ROMFile>&& _roms)
{
+ m_roms = std::move(_roms);
+
evRomChanged.retain(getSelectedRom());
m_clockTempoParam = getController().getParameterIndexByName(virus::g_paramClockTempo);
const auto latencyBlocks = getConfig().getIntValue("latencyBlocks", static_cast<int>(getPlugin().getLatencyBlocks()));
Processor::setLatencyBlocks(latencyBlocks);
+
+ zynthianExportLv2Presets();
}
synthLib::Device* VirusProcessor::createDevice()
diff --git a/source/virusJucePlugin/VirusProcessor.h b/source/virusJucePlugin/VirusProcessor.h
@@ -14,7 +14,7 @@ namespace virus
class VirusProcessor : public jucePluginEditorLib::Processor
{
public:
- VirusProcessor(const BusesProperties& _busesProperties, const juce::PropertiesFile::Options& _configOptions, const pluginLib::Processor::Properties& _properties, const std::vector<virusLib::ROMFile>& _roms, virusLib::DeviceModel _defaultModel);
+ VirusProcessor(const BusesProperties& _busesProperties, const juce::PropertiesFile::Options& _configOptions, const pluginLib::Processor::Properties& _properties, virusLib::DeviceModel _defaultModel);
~VirusProcessor() override;
void processBpm(float _bpm) override;
@@ -54,7 +54,7 @@ namespace virus
}
protected:
- void postConstruct();
+ void postConstruct(std::vector<virusLib::ROMFile>&& _roms);
// _____________
//