gearmulator

commit 4ade67099bd718e77a41ccca6021212d1c158aee
parent 506bfbb987aebe04abec13f7104632b1b67e05fe
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Sun, 20 Mar 2022 13:09:19 +0100

add version number and device model

Diffstat:
M
source/jucePlugin/VirusController.cpp
 | 
2
+-
M
source/jucePlugin/VirusController.h
 | 
2
+-
M
source/jucePlugin/skins/Trancy/VirusC_Trancy.json
 | 
8
++++----
M
source/jucePlugin/ui3/VirusEditor.cpp
 | 
22
+++++++++++++++++++---

4 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/source/jucePlugin/VirusController.cpp b/source/jucePlugin/VirusController.cpp
@@ -302,7 +302,7 @@ namespace Virus
         ignored
          */
     }
-	uint8_t Controller::getVirusModel() const
+	virusLib::VirusModel Controller::getVirusModel() const
 	{
 		return parseAsciiText(m_singles[2][0].data, 128 + 112) == "Taurus  JS" ? virusLib::VirusModel::B : virusLib::VirusModel::C;
 	}
diff --git a/source/jucePlugin/VirusController.h b/source/jucePlugin/VirusController.h
@@ -64,7 +64,7 @@ namespace Virus
         juce::Value* getParamValue(ParameterType _param);
         Parameter* getParameter(ParameterType _param) const;
         Parameter *getParameter(ParameterType _param, uint8_t _part) const;
-		uint8_t getVirusModel() const;
+		virusLib::VirusModel getVirusModel() const;
         // bank - 0-1 (AB)
         juce::StringArray getSinglePresetNames(virusLib::BankNumber bank) const;
 
diff --git a/source/jucePlugin/skins/Trancy/VirusC_Trancy.json b/source/jucePlugin/skins/Trancy/VirusC_Trancy.json
@@ -5550,13 +5550,13 @@
             "name" : "VersionNumber",
             "label" : {
                 "text" : "1.12.34",
-                "textHeight" : "20",
+                "textHeight" : "18",
                 "color" : "009BFFFF",
-                "alignH" : "R",
+                "alignH" : "L",
                 "alignV" : "C",
-                "x" : "251.4",
+                "x" : "251.9017",
                 "y" : "1117",
-                "width" : "54.4257",
+                "width" : "56.1816",
                 "height" : "28"
             }
         },
diff --git a/source/jucePlugin/ui3/VirusEditor.cpp b/source/jucePlugin/ui3/VirusEditor.cpp
@@ -68,14 +68,30 @@ namespace genericVirusUI
 		m_focusedParameterName->setVisible(false);
 		m_focusedParameterValue->setVisible(false);
 
-		auto* versionInfo = findComponentT<juce::Label>("VersionInfo", false);
-
-		if(versionInfo)
+		if(auto* versionInfo = findComponentT<juce::Label>("VersionInfo", false))
 		{
 		    const std::string message = "DSP 56300 Emulator Version " + std::string(g_pluginVersionString) + " - " __DATE__ " " __TIME__;
 			versionInfo->setText(message, juce::dontSendNotification);
 		}
 
+		if(auto* versionNumber = findComponentT<juce::Label>("VersionNumber", false))
+		{
+			versionNumber->setText(g_pluginVersionString, juce::dontSendNotification);
+		}
+
+		if(auto* deviceModel = findComponentT<juce::Label>("DeviceModel", false))
+		{
+			std::string m;
+			switch(getController().getVirusModel())
+			{
+			case virusLib::A: m = "A";		break;
+			case virusLib::B: m = "B";		break;
+			case virusLib::C: m = "C";		break;
+			case virusLib::TI: m = "TI";	break;
+			}
+			deviceModel->setText(m, juce::dontSendNotification);
+		}
+
 		auto* presetSave = findComponentT<juce::Button>("PresetSave", false);
 		if(presetSave)
 			presetSave->onClick = [this] { savePreset(); };