commit 33ebb1d8d7bb42b4abd675a3ee787a0a55b4b406
parent 4d574948cfea1c3aa6e13c1871175ddacfe6cbda
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Thu, 6 Mar 2025 23:03:10 +0100
remove wave editor buttons
Diffstat:
4 files changed, 7 insertions(+), 173 deletions(-)
diff --git a/source/xtJucePlugin/skins/xtDefault/xtDefault.json b/source/xtJucePlugin/skins/xtDefault/xtDefault.json
@@ -8564,65 +8564,7 @@
"x" : "540",
"y" : "48",
"width" : "500",
- "height" : "1284.952"
- }
- },
- {
- "name" : "btWavetablePreview",
- "button" : {
- "isToggle" : "1",
- "normalImage" : "0",
- "overImage" : "0",
- "downImage" : "1",
- "normalImageOn" : "1",
- "overImageOn" : "1",
- "downImageOn" : "1",
- "x" : "638",
- "y" : "1372.377",
- "width" : "64",
- "height" : "64",
- "texture" : "xtknob_small",
- "tileSizeX" : "64",
- "tileSizeY" : "64"
- }
- },
- {
- "name" : "ledWavetablePreview",
- "button" : {
- "normalImage" : "0",
- "overImage" : "0",
- "downImage" : "0",
- "normalImageOn" : "1",
- "overImageOn" : "1",
- "downImageOn" : "1",
- "x" : "654",
- "y" : "1340.377",
- "width" : "32",
- "height" : "32",
- "texture" : "led",
- "tileSizeX" : "128",
- "tileSizeY" : "128"
- },
- "parameterAttachment" : {
- "parameter" : "O2Link"
- }
- },
- {
- "name" : "btWavetableSave",
- "button" : {
- "normalImage" : "0",
- "overImage" : "0",
- "downImage" : "1",
- "normalImageOn" : "1",
- "overImageOn" : "1",
- "downImageOn" : "1",
- "x" : "878",
- "y" : "1372.377",
- "width" : "64",
- "height" : "64",
- "texture" : "xtknob_small",
- "tileSizeX" : "64",
- "tileSizeY" : "64"
+ "height" : "1431.802"
}
},
{
@@ -8640,83 +8582,25 @@
"x" : "1620",
"y" : "48",
"width" : "1700",
- "height" : "614.5936"
- }
- },
- {
- "name" : "btWavePreview",
- "button" : {
- "isToggle" : "1",
- "normalImage" : "0",
- "overImage" : "0",
- "downImage" : "1",
- "normalImageOn" : "1",
- "overImageOn" : "1",
- "downImageOn" : "1",
- "x" : "1662",
- "y" : "705.9009",
- "width" : "64",
- "height" : "64",
- "texture" : "xtknob_small",
- "tileSizeX" : "64",
- "tileSizeY" : "64"
- }
- },
- {
- "name" : "ledWavePreview",
- "button" : {
- "normalImage" : "0",
- "overImage" : "0",
- "downImage" : "0",
- "normalImageOn" : "1",
- "overImageOn" : "1",
- "downImageOn" : "1",
- "x" : "1678",
- "y" : "673.9009",
- "width" : "32",
- "height" : "32",
- "texture" : "led",
- "tileSizeX" : "128",
- "tileSizeY" : "128"
- },
- "parameterAttachment" : {
- "parameter" : "O2Link"
- }
- },
- {
- "name" : "btWaveSave",
- "button" : {
- "normalImage" : "0",
- "overImage" : "0",
- "downImage" : "1",
- "normalImageOn" : "1",
- "overImageOn" : "1",
- "downImageOn" : "1",
- "x" : "1815",
- "y" : "705.9009",
- "width" : "64",
- "height" : "64",
- "texture" : "xtknob_small",
- "tileSizeX" : "64",
- "tileSizeY" : "64"
+ "height" : "776.4966"
}
},
{
"name" : "wecWaveFreq",
"component" : {
"x" : "1620",
- "y" : "865.2081",
+ "y" : "882.4966",
"width" : "830",
- "height" : "614.5936"
+ "height" : "597.3051"
}
},
{
"name" : "wecWavePhase",
"component" : {
"x" : "2490",
- "y" : "865.2081",
+ "y" : "882.4966",
"width" : "830",
- "height" : "614.5936"
+ "height" : "597.3051"
}
}
]
diff --git a/source/xtJucePlugin/skins/xtDefault/xtPageWave.png b/source/xtJucePlugin/skins/xtDefault/xtPageWave.png
Binary files differ.
diff --git a/source/xtJucePlugin/xtWaveEditor.cpp b/source/xtJucePlugin/xtWaveEditor.cpp
@@ -74,36 +74,6 @@ namespace xtJucePlugin
m_graphPhase->setColour(colourId, colour);
m_graphTime->setColour(colourId, colour);
- m_btWavePreview = m_editor.findComponentT<juce::Button>("btWavePreview");
- m_ledWavePreview = m_editor.findComponentT<juce::Button>("ledWavePreview");
- m_btWaveSave = m_editor.findComponentT<genericUI::Button<juce::DrawableButton>>("btWaveSave");
-
- m_btWavetablePreview = m_editor.findComponentT<juce::Button>("btWavetablePreview");
- m_ledWavetablePreview = m_editor.findComponentT<juce::Button>("ledWavetablePreview");
- m_btWavetableSave = m_editor.findComponentT<juce::Button>("btWavetableSave");
-
- m_btWavePreview->onClick = [this]
- {
- toggleWavePreview(m_btWavePreview->getToggleState());
- };
-
- m_btWavetablePreview->onClick = [this]
- {
- toggleWavetablePreview(m_btWavePreview->getToggleState());
- };
-
- m_btWaveSave->allowRightClick(true);
-
- m_btWaveSave->onClick = [this]
- {
- saveWave();
- };
-
- m_btWavetableSave->onClick = [this]
- {
- saveWavetable();
- };
-
m_tablesTree->setSelectedEntryFromCurrentPreset();
}
@@ -135,32 +105,21 @@ namespace xtJucePlugin
{
if(_enabled)
toggleWavetablePreview(false);
-
- m_btWavePreview->setToggleState(_enabled, juce::dontSendNotification);
- m_ledWavePreview->setToggleState(_enabled, juce::dontSendNotification);
}
void WaveEditor::toggleWavetablePreview(const bool _enabled)
{
if(_enabled)
toggleWavePreview(false);
-
- m_btWavetablePreview->setToggleState(_enabled, juce::dontSendNotification);
- m_ledWavetablePreview->setToggleState(_enabled, juce::dontSendNotification);
}
void WaveEditor::onWaveDataChanged(const xt::WaveData& _data) const
{
- if(m_btWavePreview->getToggleState())
- {
- const auto sysex = xt::State::createWaveData(_data, m_editor.getXtController().getCurrentPart(), true);
- m_editor.getXtController().sendSysEx(sysex);
- }
}
void WaveEditor::saveWave()
{
- if(xt::wave::isReadOnly(m_selectedWave) || m_btWaveSave->isRightClick())
+ if(xt::wave::isReadOnly(m_selectedWave))
{
// open menu and let user select one of the wave slots
juce::PopupMenu menu;
diff --git a/source/xtJucePlugin/xtWaveEditor.h b/source/xtJucePlugin/xtWaveEditor.h
@@ -86,15 +86,6 @@ namespace xtJucePlugin
std::unique_ptr<GraphPhase> m_graphPhase;
std::unique_ptr<GraphTime> m_graphTime;
- juce::Button* m_btWavePreview = nullptr;
- juce::Button* m_ledWavePreview = nullptr;
-
- juce::Button* m_btWavetablePreview = nullptr;
- juce::Button* m_ledWavetablePreview = nullptr;
-
- genericUI::Button<juce::DrawableButton>* m_btWaveSave = nullptr;
- juce::Button* m_btWavetableSave = nullptr;
-
WaveEditorData m_data;
GraphData m_graphData;
