Skip to content

Commit ed62a4e

Browse files
committed
0.31.2
1 parent b6f3839 commit ed62a4e

23 files changed

+619
-206
lines changed

buildspec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@
4747
"uuids": {
4848
"windowsApp": "ad885c58-5ca9-44de-8f4f-1c12676626a9"
4949
},
50-
"version": "0.31.1",
50+
"version": "0.31.2",
5151
"website": "https://www.atkaudio.com"
5252
}

lib/atkaudio/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ target_compile_definitions(
5050
JUCE_USE_CURL=1
5151
JUCE_WEB_BROWSER=0
5252
JUCE_MODAL_LOOPS_PERMITTED=1 # we use QT event loop, so this is needed
53-
JUCE_DIRECT2D=0 # Disable Direct2D to avoid crash in applySingleChannelBoxBlurEffectInArea
5453
# Disable DBG() output in CI/GitHub Actions RelWithDebInfo builds (keeps debug symbols but no console spam in CI)
5554
$<$<AND:$<CONFIG:RelWithDebInfo>,$<OR:$<BOOL:$ENV{CI}>,$<BOOL:$ENV{GITHUB_ACTIONS}>>>:JUCE_DISABLE_ASSERTIONS>
5655
)

lib/atkaudio/src/atkaudio/DeviceIo/DeviceIo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "../AudioModule.h"
3+
#include "../atkAudioModule.h"
44

55
#include <string>
66

lib/atkaudio/src/atkaudio/DeviceIo/DeviceIoApp.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// #include "../FifoBuffer.h"
44
#include "../FifoBuffer2.h"
55
#include "../LookAndFeel.h"
6+
#include "../QtParentedWindow.h"
67
#include "SettingsComponent.h"
78

89
#include <juce_audio_utils/juce_audio_utils.h>
@@ -109,23 +110,22 @@ class DeviceIoApp final : public AudioAppComponent
109110
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DeviceIoApp)
110111
};
111112

112-
class AudioAppMainWindow final : public DocumentWindow
113+
class AudioAppMainWindow final : public atk::QtParentedDocumentWindow
113114
{
114115
public:
115116
AudioAppMainWindow(DeviceIoApp& demo)
116-
: DocumentWindow(
117-
"Audio Device Settings",
118-
Colours::lightgrey,
119-
DocumentWindow::minimiseButton | DocumentWindow::closeButton,
120-
false
117+
: atk::QtParentedDocumentWindow(
118+
"DeviceIo Audio Settings",
119+
juce::LookAndFeel::getDefaultLookAndFeel().findColour(juce::ResizableWindow::backgroundColourId),
120+
DocumentWindow::allButtons
121121
)
122122
, audioApp(demo)
123123
{
124-
setUsingNativeTitleBar(true);
125-
setContentOwned(&audioApp, false); // Don't take ownership - Impl owns it
124+
setTitleBarButtonsRequired(DocumentWindow::closeButton, false);
125+
setContentOwned(&demo, false); // Don't take ownership - Impl owns it
126126
setResizable(true, false);
127127

128-
// Don't add to desktop yet - AudioModule will handle this on first setVisible(true)
128+
centreWithSize(demo.getWidth(), demo.getHeight());
129129
}
130130

131131
~AudioAppMainWindow() override

lib/atkaudio/src/atkaudio/DeviceIo2/DeviceIo2.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <atkaudio/ModuleInfrastructure/AudioServer/ChannelRoutingMatrix.h>
55
#include <atkaudio/ModuleInfrastructure/Bridge/ModuleBridge.h>
66
#include <atkaudio/LookAndFeel.h>
7+
#include <atkaudio/QtParentedWindow.h>
78

89
#include <juce_audio_utils/juce_audio_utils.h>
910
#include <juce_dsp/juce_dsp.h>
@@ -330,20 +331,20 @@ struct atk::DeviceIo2::Impl : public juce::AsyncUpdater
330331
// Lazy creation of settings window
331332
if (settingsWindow == nullptr)
332333
{
333-
class SettingsWindow : public juce::DocumentWindow
334+
class SettingsWindow : public atk::QtParentedDocumentWindow
334335
{
335336
public:
336337
SettingsWindow(atk::AudioClient* client, juce::AudioDeviceManager* devManager, int numCh)
337-
: juce::DocumentWindow(
338+
: atk::QtParentedDocumentWindow(
338339
"DeviceIo2 Audio Settings",
339340
juce::LookAndFeel::getDefaultLookAndFeel().findColour(
340341
juce::ResizableWindow::backgroundColourId
341342
),
342-
juce::DocumentWindow::closeButton
343+
juce::DocumentWindow::allButtons
343344
)
344345
, numChannels(numCh)
345346
{
346-
setUsingNativeTitleBar(true);
347+
setTitleBarButtonsRequired(juce::DocumentWindow::closeButton, false);
347348
setResizable(true, false);
348349

349350
auto* audioComponent = new atk::AudioServerSettingsComponent(client);

lib/atkaudio/src/atkaudio/DeviceIo2/DeviceIo2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "../AudioModule.h"
3+
#include "../atkAudioModule.h"
44

55
#include <string>
66
#include <vector>

lib/atkaudio/src/atkaudio/DeviceIo2/DeviceIo2App.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "../FifoBuffer2.h"
44
#include "../LookAndFeel.h"
5+
#include "../QtParentedWindow.h"
56
#include "DeviceIo2SettingsComponent.h"
67

78
#include <juce_audio_utils/juce_audio_utils.h>
@@ -110,21 +111,18 @@ class DeviceIo2App final : public AudioAppComponent
110111
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DeviceIo2App)
111112
};
112113

113-
class AudioAppMainWindow final : public DocumentWindow
114+
class AudioAppMainWindow final : public atk::QtParentedDocumentWindow
114115
{
115116
public:
116117
AudioAppMainWindow(DeviceIo2App& demo)
117-
: DocumentWindow("", Colours::lightgrey, DocumentWindow::minimiseButton | DocumentWindow::closeButton, false)
118+
: atk::QtParentedDocumentWindow("", Colours::lightgrey, DocumentWindow::allButtons)
118119
, audioApp(demo)
119120
{
121+
setTitleBarButtonsRequired(DocumentWindow::minimiseButton | DocumentWindow::closeButton, false);
120122
setContentOwned(&demo, true);
121123
setResizable(true, false);
122124

123-
// Position title bar buttons on the right (Windows-style), like Plugin Host
124-
setTitleBarButtonsRequired(DocumentWindow::minimiseButton | DocumentWindow::closeButton, false);
125-
126125
centreWithSize(demo.getWidth(), demo.getHeight());
127-
setVisible(false);
128126
}
129127

130128
~AudioAppMainWindow() override

0 commit comments

Comments
 (0)