Skip to content

Commit 5a49399

Browse files
authored
Merge branch 'Tracktion:master' into master
2 parents fe3defe + 0a5f4e6 commit 5a49399

File tree

153 files changed

+3684
-4161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+3684
-4161
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ bin
7676
doxygen/doc
7777
**/3rd_party/rubberband
7878
**/cmake-build**
79+
**/cmake-ios**
7980
**/.idea/**
8081
coverage.xml
8182
CoverageReport-*

CHANGELIST.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelist
22

3+
## v3.2
4+
- Automation modes (read/write/touch/latch)
5+
- AutomationCurve bypass
6+
37
## v3
48
- Clip launcher for non-linear composition
59
- Launch clips quantised to timeline

VERSION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.0
1+
3.2.0

examples/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,11 @@ include_guard()
33
add_subdirectory(Benchmarks)
44
add_subdirectory(TestRunner)
55
add_subdirectory(DemoRunner)
6-
add_subdirectory(EngineInPluginDemo)
6+
add_subdirectory(EngineInPluginDemo)
7+
8+
add_custom_target("AllExamples")
9+
add_dependencies("AllExamples"
10+
Benchmarks
11+
TestRunner
12+
DemoRunner
13+
EngineInPluginDemo_common)

examples/DemoRunner/CMakeLists.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ if (MSVC)
1717
endif()
1818

1919
# If we are compiling for macOS we want to target OS versions down to 10.13
20-
if (APPLE)
20+
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
21+
message ("-- building for macOS")
2122
set (CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE INTERNAL "")
23+
elseif(${CMAKE_SYSTEM_NAME} MATCHES "iOS")
24+
set (CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "17.0" CACHE INTERNAL "")
25+
set (CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Development" CACHE INTERNAL "")
2226
endif()
2327

2428
# Adds all the module sources so they appear correctly in the IDE
@@ -32,7 +36,14 @@ else()
3236
MESSAGE(STATUS "Not building with VST2")
3337
endif()
3438

35-
juce_add_pip (${TARGET_NAME}.h)
39+
#juce_add_pip (${TARGET_NAME}.h)
40+
juce_add_gui_app(${TARGET_NAME}
41+
BUNDLE_ID "com.tracktion.DemoRunner"
42+
MICROPHONE_PERMISSION_ENABLED TRUE
43+
MICROPHONE_PERMISSION_TEXT "Audio recording"
44+
REQUIRES_FULL_SCREEN TRUE
45+
STATUS_BAR_HIDDEN TRUE
46+
PLUGINHOST_AU TRUE)
3647

3748
juce_generate_juce_header(${TARGET_NAME})
3849

@@ -51,6 +62,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES
5162

5263
set(SourceFiles
5364
${TARGET_NAME}.h
65+
${TARGET_NAME}.cpp
5466
demos/AbletonLinkDemo.h
5567
demos/ContainerClipDemo.h
5668
demos/DistortionEffectDemo.h

examples/DemoRunner/DemoRunner.cpp

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/*
2+
==============================================================================
3+
4+
This file contains the startup code for a PIP.
5+
6+
==============================================================================
7+
*/
8+
9+
#include <JuceHeader.h>
10+
#include "DemoRunner.h"
11+
12+
class Application : public juce::JUCEApplication
13+
{
14+
public:
15+
//==============================================================================
16+
Application() = default;
17+
18+
const juce::String getApplicationName() override { return "DemoRunner"; }
19+
const juce::String getApplicationVersion() override { return "3.1.0"; }
20+
21+
void initialise (const juce::String&) override
22+
{
23+
mainWindow.reset (new MainWindow ("DemoRunner", new DemoRunner, *this));
24+
}
25+
26+
void shutdown() override { mainWindow = nullptr; }
27+
28+
private:
29+
class MainWindow : public juce::DocumentWindow
30+
{
31+
public:
32+
MainWindow (const juce::String& name, juce::Component* c, JUCEApplication& a)
33+
: DocumentWindow (name, juce::Desktop::getInstance().getDefaultLookAndFeel()
34+
.findColour (ResizableWindow::backgroundColourId),
35+
juce::DocumentWindow::allButtons),
36+
app (a)
37+
{
38+
setUsingNativeTitleBar (true);
39+
setContentOwned (c, true);
40+
41+
#if JUCE_ANDROID || JUCE_IOS
42+
setFullScreen (true);
43+
#else
44+
setResizable (true, false);
45+
setResizeLimits (300, 250, 10000, 10000);
46+
centreWithSize (getWidth(), getHeight());
47+
#endif
48+
49+
setVisible (true);
50+
}
51+
52+
void closeButtonPressed() override
53+
{
54+
app.systemRequestedQuit();
55+
}
56+
57+
private:
58+
JUCEApplication& app;
59+
60+
//==============================================================================
61+
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindow)
62+
};
63+
64+
std::unique_ptr<MainWindow> mainWindow;
65+
};
66+
67+
//==============================================================================
68+
START_JUCE_APPLICATION (Application)

examples/DemoRunner/DemoRunner.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ struct DemoTypeBase
106106
#include "demos/PluginDemo.h"
107107
#include "demos/RecordingDemo.h"
108108
#include "demos/StepSequencerDemo.h"
109+
#include "demos/SimplePluginDemo.h"
109110
#include "demos/ClipLauncherDemo.h"
110111

111112

@@ -136,7 +137,8 @@ class DemoRunner : public Component
136137
auto v = new PluginListComponent (engine.getPluginManager().pluginFormatManager,
137138
engine.getPluginManager().knownPluginList,
138139
engine.getTemporaryFileManager().getTempFile ("PluginScanDeadMansPedal"),
139-
std::addressof (engine.getPropertyStorage().getPropertiesFile()));
140+
std::addressof (engine.getPropertyStorage().getPropertiesFile()),
141+
true);
140142
v->setSize (800, 600);
141143
o.content.setOwned (v);
142144
o.launchAsync();

examples/DemoRunner/demos/AbletonLinkDemo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#pragma once
1212

13-
#include "../common/Utilities.h"
14-
#include "../common/PlaybackDemoAudio.h"
13+
#include "../../common/Utilities.h"
14+
#include "../../common/PlaybackDemoAudio.h"
1515

1616
using namespace tracktion::literals;
1717
using namespace std::literals;

examples/DemoRunner/demos/ClipLauncherDemo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#pragma once
1313

1414
#include "../../common/BinaryData.h"
15-
#include "../../modules/3rd_party/magic_enum/tracktion_magic_enum.hpp"
15+
#include "../../../modules/3rd_party/magic_enum/tracktion_magic_enum.hpp"
1616

1717
//==============================================================================
1818
//==============================================================================

examples/DemoRunner/demos/ContainerClipDemo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
#pragma once
1212

13-
#include "../common/Utilities.h"
13+
#include "../../common/Utilities.h"
1414
#include "DistortionEffectDemo.h"
15-
#include "../common/PlaybackDemoAudio.h"
15+
#include "../../common/PlaybackDemoAudio.h"
1616
#include <BinaryData.h>
1717

1818
using namespace tracktion_engine;

0 commit comments

Comments
 (0)