Skip to content

Commit bae584b

Browse files
committed
Merge branch 'tne-lab-audio-settings-button-tweak' into testing
2 parents c156e02 + 73cb439 commit bae584b

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

Source/Processors/AudioNode/AudioEditor.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,16 +219,15 @@ void AudioEditor::buttonClicked (Button* button)
219219
{
220220
audioConfigurationWindow = new AudioConfigurationWindow (AccessClass::getAudioComponent()->deviceManager,
221221
audioWindowButton);
222+
audioConfigurationWindow->addComponentListener(this);
222223
}
223224

224225
AccessClass::getAudioComponent()->restartDevice();
225226
audioConfigurationWindow->setVisible (true);
226227
}
227228
else
228229
{
229-
updateBufferSizeText();
230230
audioConfigurationWindow->setVisible (false);
231-
AccessClass::getAudioComponent()->stopDevice();
232231
}
233232
}
234233

@@ -243,6 +242,14 @@ void AudioEditor::sliderValueChanged (Slider* slider)
243242
getAudioProcessor()->setParameter (2, slider->getValue());
244243
}
245244

245+
void AudioEditor::componentVisibilityChanged(Component& component)
246+
{
247+
if (component.getName() == audioConfigurationWindow->getName() && !component.isVisible())
248+
{
249+
updateBufferSizeText();
250+
AccessClass::getAudioComponent()->stopDevice();
251+
}
252+
}
246253

247254
void AudioEditor::paint (Graphics& g)
248255
{
@@ -318,11 +325,6 @@ AudioConfigurationWindow::~AudioConfigurationWindow()
318325
void AudioConfigurationWindow::closeButtonPressed()
319326
{
320327
controlButton->setToggleState (false, dontSendNotification);
321-
322-
String t = String (AccessClass::getAudioComponent()->getBufferSizeMs());
323-
t += " ms";
324-
controlButton->setText (t);
325-
AccessClass::getAudioComponent()->stopDevice();
326328
setVisible (false);
327329
}
328330

Source/Processors/AudioNode/AudioEditor.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ class AudioConfigurationWindow : public DocumentWindow
9999
class AudioEditor : public AudioProcessorEditor
100100
, public Button::Listener
101101
, public Slider::Listener
102+
, public ComponentListener
102103
{
103104
public:
104105
AudioEditor (AudioNode* owner);
@@ -122,6 +123,7 @@ class AudioEditor : public AudioProcessorEditor
122123

123124
void sliderValueChanged (Slider* slider) override;
124125

126+
void componentVisibilityChanged(Component& component) override;
125127

126128
float lastValue;
127129

0 commit comments

Comments
 (0)