commit 6be371c44d3e627a7c74dec325dec3dcfbe0ec0d parent b15af7397cb631bd10c849b22c72bb0901c6ee2b Author: dsp56300 <dsp56300@users.noreply.github.com> Date: Sat, 20 Apr 2024 15:58:13 +0200 more renames Diffstat:
19 files changed, 159 insertions(+), 179 deletions(-)
diff --git a/source/osTIrusJucePlugin/CMakeLists.txt b/source/osTIrusJucePlugin/CMakeLists.txt @@ -3,11 +3,10 @@ project(osTIrusJucePlugin VERSION ${CMAKE_PROJECT_VERSION}) set(SOURCES parameterDescriptions_TI.json - PluginEditorState.cpp - PluginEditorState.h - PluginProcessor.cpp - PluginProcessor.h - version.h + OsTIrusEditorState.cpp + OsTIrusEditorState.h + OsTIrusProcessor.cpp + OsTIrusProcessor.h ) SET(ASSETS "parameterDescriptions_TI.json") diff --git a/source/osTIrusJucePlugin/OsTIrusEditorState.cpp b/source/osTIrusJucePlugin/OsTIrusEditorState.cpp @@ -0,0 +1,11 @@ +#include "OsTIrusEditorState.h" +#include "OsTIrusProcessor.h" + +const std::vector<jucePluginEditorLib::PluginEditorState::Skin> g_includedSkins = +{ + {"TI Trancy", "VirusTI_Trancy.json", ""} +}; + +OsTIrusEditorState::OsTIrusEditorState(VirusProcessor& _processor, pluginLib::Controller& _controller) : VirusEditorState(_processor, _controller, g_includedSkins) +{ +} diff --git a/source/osTIrusJucePlugin/PluginEditorState.h b/source/osTIrusJucePlugin/OsTIrusEditorState.h diff --git a/source/osTIrusJucePlugin/OsTIrusProcessor.cpp b/source/osTIrusJucePlugin/OsTIrusProcessor.cpp @@ -0,0 +1,65 @@ +#include "OsTIrusProcessor.h" +#include "OsTIrusEditorState.h" +#include "BinaryData.h" + +#include "../virusLib/romloader.h" + +namespace +{ + juce::PropertiesFile::Options getConfigOptions() + { + juce::PropertiesFile::Options opts; + opts.applicationName = "DSP56300Emulator_OsTIrus"; + opts.filenameSuffix = ".settings"; + opts.folderName = "DSP56300Emulator_OsTIrus"; + opts.osxLibrarySubFolder = "Application Support/DSP56300Emulator_OsTIrus"; + return opts; + } +} + +//============================================================================== +OsTIrusProcessor::OsTIrusProcessor() : + VirusProcessor(BusesProperties() + .withInput("Input", juce::AudioChannelSet::stereo(), true) + .withOutput("Output", juce::AudioChannelSet::stereo(), true) +#if JucePlugin_IsSynth + .withOutput("Out 2", juce::AudioChannelSet::stereo(), true) + .withOutput("Out 3", juce::AudioChannelSet::stereo(), true) + .withOutput("USB 1", juce::AudioChannelSet::stereo(), true) + .withOutput("USB 2", juce::AudioChannelSet::stereo(), true) + .withOutput("USB 3", juce::AudioChannelSet::stereo(), true) +#endif + , ::getConfigOptions(), pluginLib::Processor::Properties{JucePlugin_Name, JucePlugin_IsSynth, JucePlugin_WantsMidiInput, JucePlugin_ProducesMidiOutput, JucePlugin_IsMidiEffect} + , virusLib::ROMLoader::findROMs(virusLib::DeviceModel::TI2, virusLib::DeviceModel::Snow)) +{ +} + +OsTIrusProcessor::~OsTIrusProcessor() +{ + destroyEditorState(); +} + +const char* OsTIrusProcessor::findEmbeddedResource(const char* _name, uint32_t& _size) const +{ + for(size_t i=0; i<BinaryData::namedResourceListSize; ++i) + { + if (std::string(BinaryData::originalFilenames[i]) != std::string(_name)) + continue; + + int size = 0; + const auto res = BinaryData::getNamedResource(BinaryData::namedResourceList[i], size); + _size = static_cast<uint32_t>(size); + return res; + } + return nullptr; +} + +jucePluginEditorLib::PluginEditorState* OsTIrusProcessor::createEditorState() +{ + return new OsTIrusEditorState(*this, getController()); +} + +juce::AudioProcessor* JUCE_CALLTYPE createPluginFilter() +{ + return new OsTIrusProcessor(); +} diff --git a/source/osTIrusJucePlugin/PluginProcessor.h b/source/osTIrusJucePlugin/OsTIrusProcessor.h diff --git a/source/osTIrusJucePlugin/PluginEditorState.cpp b/source/osTIrusJucePlugin/PluginEditorState.cpp @@ -1,12 +0,0 @@ -#include "PluginEditorState.h" - -#include "PluginProcessor.h" - -const std::vector<jucePluginEditorLib::PluginEditorState::Skin> g_includedSkins = -{ - {"TI Trancy", "VirusTI_Trancy.json", ""} -}; - -OsTIrusEditorState::OsTIrusEditorState(VirusProcessor& _processor, pluginLib::Controller& _controller) : VirusEditorState(_processor, _controller, g_includedSkins) -{ -} diff --git a/source/osTIrusJucePlugin/PluginProcessor.cpp b/source/osTIrusJucePlugin/PluginProcessor.cpp @@ -1,65 +0,0 @@ -#include "PluginProcessor.h" -#include "PluginEditorState.h" -#include "BinaryData.h" - -#include "../virusLib/romloader.h" - -namespace -{ - juce::PropertiesFile::Options getConfigOptions() - { - juce::PropertiesFile::Options opts; - opts.applicationName = "DSP56300Emulator_OsTIrus"; - opts.filenameSuffix = ".settings"; - opts.folderName = "DSP56300Emulator_OsTIrus"; - opts.osxLibrarySubFolder = "Application Support/DSP56300Emulator_OsTIrus"; - return opts; - } -} - -//============================================================================== -OsTIrusProcessor::OsTIrusProcessor() : - VirusProcessor(BusesProperties() - .withInput("Input", juce::AudioChannelSet::stereo(), true) - .withOutput("Output", juce::AudioChannelSet::stereo(), true) -#if JucePlugin_IsSynth - .withOutput("Out 2", juce::AudioChannelSet::stereo(), true) - .withOutput("Out 3", juce::AudioChannelSet::stereo(), true) - .withOutput("USB 1", juce::AudioChannelSet::stereo(), true) - .withOutput("USB 2", juce::AudioChannelSet::stereo(), true) - .withOutput("USB 3", juce::AudioChannelSet::stereo(), true) -#endif - , ::getConfigOptions(), pluginLib::Processor::Properties{JucePlugin_Name, JucePlugin_IsSynth, JucePlugin_WantsMidiInput, JucePlugin_ProducesMidiOutput, JucePlugin_IsMidiEffect} - , virusLib::ROMLoader::findROMs(virusLib::DeviceModel::TI2, virusLib::DeviceModel::Snow)) -{ -} - -OsTIrusProcessor::~OsTIrusProcessor() -{ - destroyEditorState(); -} - -const char* OsTIrusProcessor::findEmbeddedResource(const char* _name, uint32_t& _size) const -{ - for(size_t i=0; i<BinaryData::namedResourceListSize; ++i) - { - if (std::string(BinaryData::originalFilenames[i]) != std::string(_name)) - continue; - - int size = 0; - const auto res = BinaryData::getNamedResource(BinaryData::namedResourceList[i], size); - _size = static_cast<uint32_t>(size); - return res; - } - return nullptr; -} - -jucePluginEditorLib::PluginEditorState* OsTIrusProcessor::createEditorState() -{ - return new OsTIrusEditorState(*this, getController()); -} - -juce::AudioProcessor* JUCE_CALLTYPE createPluginFilter() -{ - return new OsTIrusProcessor(); -} diff --git a/source/osTIrusJucePlugin/version.h b/source/osTIrusJucePlugin/version.h @@ -1,4 +0,0 @@ -#pragma once - -static constexpr const char* const g_pluginVersionString = "1.3.12"; -static constexpr uint32_t g_pluginVersion = 1312; diff --git a/source/osTIrusJucePlugin/version.h.in b/source/osTIrusJucePlugin/version.h.in @@ -1,4 +0,0 @@ -#pragma once - -static constexpr const char* const g_pluginVersionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@"; -static constexpr uint32_t g_pluginVersion = @PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_PATCH@; diff --git a/source/osirusJucePlugin/CMakeLists.txt b/source/osirusJucePlugin/CMakeLists.txt @@ -3,11 +3,10 @@ project(osirusJucePlugin VERSION ${CMAKE_PROJECT_VERSION}) set(SOURCES parameterDescriptions_C.json - PluginEditorState.cpp - PluginEditorState.h - PluginProcessor.cpp - PluginProcessor.h - version.h + OsirusEditorState.cpp + OsirusEditorState.h + OsirusProcessor.cpp + OsirusProcessor.h ) SET(ASSETS "parameterDescriptions_C.json") diff --git a/source/osirusJucePlugin/OsirusEditorState.cpp b/source/osirusJucePlugin/OsirusEditorState.cpp @@ -0,0 +1,13 @@ +#include "OsirusEditorState.h" +#include "OsirusProcessor.h" + +const std::vector<jucePluginEditorLib::PluginEditorState::Skin> g_includedSkins = +{ + {"Hoverland", "VirusC_Hoverland.json", ""}, + {"Trancy", "VirusC_Trancy.json", ""}, + {"Galaxpel", "VirusC_Galaxpel.json", ""} +}; + +OsirusEditorState::OsirusEditorState(VirusProcessor& _processor, pluginLib::Controller& _controller) : VirusEditorState(_processor, _controller, g_includedSkins) +{ +} diff --git a/source/osirusJucePlugin/PluginEditorState.h b/source/osirusJucePlugin/OsirusEditorState.h diff --git a/source/osirusJucePlugin/OsirusProcessor.cpp b/source/osirusJucePlugin/OsirusProcessor.cpp @@ -0,0 +1,62 @@ +#include "OsirusProcessor.h" +#include "OsirusEditorState.h" +#include "BinaryData.h" + +#include "../virusLib/romloader.h" + +namespace +{ + juce::PropertiesFile::Options getConfigOptions() + { + juce::PropertiesFile::Options opts; + opts.applicationName = "DSP56300 Emulator"; + opts.filenameSuffix = ".settings"; + opts.folderName = "DSP56300 Emulator"; + opts.osxLibrarySubFolder = "Application Support/DSP56300 Emulator"; + return opts; + } +} + +//============================================================================== +OsirusProcessor::OsirusProcessor() : + VirusProcessor(BusesProperties() + .withInput("Input", juce::AudioChannelSet::stereo(), true) + .withOutput("Output", juce::AudioChannelSet::stereo(), true) +#if JucePlugin_IsSynth + .withOutput("Out 2", juce::AudioChannelSet::stereo(), true) + .withOutput("Out 3", juce::AudioChannelSet::stereo(), true) +#endif + , ::getConfigOptions(), pluginLib::Processor::Properties{JucePlugin_Name, JucePlugin_IsSynth, JucePlugin_WantsMidiInput, JucePlugin_ProducesMidiOutput, JucePlugin_IsMidiEffect} + , virusLib::ROMLoader::findROMs(virusLib::DeviceModel::ABC)) +{ +} + +OsirusProcessor::~OsirusProcessor() +{ + destroyEditorState(); +} + +const char* OsirusProcessor::findEmbeddedResource(const char* _name, uint32_t& _size) const +{ + for(size_t i=0; i<BinaryData::namedResourceListSize; ++i) + { + if (std::string(BinaryData::originalFilenames[i]) != std::string(_name)) + continue; + + int size = 0; + const auto res = BinaryData::getNamedResource(BinaryData::namedResourceList[i], size); + _size = static_cast<uint32_t>(size); + return res; + } + return nullptr; +} + +jucePluginEditorLib::PluginEditorState* OsirusProcessor::createEditorState() +{ + return new OsirusEditorState(*this, getController()); +} + +juce::AudioProcessor* JUCE_CALLTYPE createPluginFilter() +{ + return new OsirusProcessor(); +} diff --git a/source/osirusJucePlugin/PluginProcessor.h b/source/osirusJucePlugin/OsirusProcessor.h diff --git a/source/osirusJucePlugin/PluginEditorState.cpp b/source/osirusJucePlugin/PluginEditorState.cpp @@ -1,14 +0,0 @@ -#include "PluginEditorState.h" - -#include "PluginProcessor.h" - -const std::vector<jucePluginEditorLib::PluginEditorState::Skin> g_includedSkins = -{ - {"Hoverland", "VirusC_Hoverland.json", ""}, - {"Trancy", "VirusC_Trancy.json", ""}, - {"Galaxpel", "VirusC_Galaxpel.json", ""} -}; - -OsirusEditorState::OsirusEditorState(VirusProcessor& _processor, pluginLib::Controller& _controller) : VirusEditorState(_processor, _controller, g_includedSkins) -{ -} diff --git a/source/osirusJucePlugin/PluginProcessor.cpp b/source/osirusJucePlugin/PluginProcessor.cpp @@ -1,62 +0,0 @@ -#include "PluginProcessor.h" -#include "PluginEditorState.h" -#include "BinaryData.h" - -#include "../virusLib/romloader.h" - -namespace -{ - juce::PropertiesFile::Options getConfigOptions() - { - juce::PropertiesFile::Options opts; - opts.applicationName = "DSP56300 Emulator"; - opts.filenameSuffix = ".settings"; - opts.folderName = "DSP56300 Emulator"; - opts.osxLibrarySubFolder = "Application Support/DSP56300 Emulator"; - return opts; - } -} - -//============================================================================== -OsirusProcessor::OsirusProcessor() : - VirusProcessor(BusesProperties() - .withInput("Input", juce::AudioChannelSet::stereo(), true) - .withOutput("Output", juce::AudioChannelSet::stereo(), true) -#if JucePlugin_IsSynth - .withOutput("Out 2", juce::AudioChannelSet::stereo(), true) - .withOutput("Out 3", juce::AudioChannelSet::stereo(), true) -#endif - , ::getConfigOptions(), pluginLib::Processor::Properties{JucePlugin_Name, JucePlugin_IsSynth, JucePlugin_WantsMidiInput, JucePlugin_ProducesMidiOutput, JucePlugin_IsMidiEffect} - , virusLib::ROMLoader::findROMs(virusLib::DeviceModel::ABC)) -{ -} - -OsirusProcessor::~OsirusProcessor() -{ - destroyEditorState(); -} - -const char* OsirusProcessor::findEmbeddedResource(const char* _name, uint32_t& _size) const -{ - for(size_t i=0; i<BinaryData::namedResourceListSize; ++i) - { - if (std::string(BinaryData::originalFilenames[i]) != std::string(_name)) - continue; - - int size = 0; - const auto res = BinaryData::getNamedResource(BinaryData::namedResourceList[i], size); - _size = static_cast<uint32_t>(size); - return res; - } - return nullptr; -} - -jucePluginEditorLib::PluginEditorState* OsirusProcessor::createEditorState() -{ - return new OsirusEditorState(*this, getController()); -} - -juce::AudioProcessor* JUCE_CALLTYPE createPluginFilter() -{ - return new OsirusProcessor(); -} diff --git a/source/osirusJucePlugin/version.h.in b/source/osirusJucePlugin/version.h.in @@ -1,4 +0,0 @@ -#pragma once - -static constexpr const char* const g_pluginVersionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@"; -static constexpr uint32_t g_pluginVersion = @PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_PATCH@; diff --git a/source/osirusJucePlugin/.gitignore b/source/virusJucePlugin/.gitignore diff --git a/source/virusJucePlugin/version.h b/source/virusJucePlugin/version.h @@ -1,4 +0,0 @@ -#pragma once - -static constexpr const char* const g_pluginVersionString = "1.3.12"; -static constexpr uint32_t g_pluginVersion = 1312;