Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.DS_Store
cmake-build-*
.idea
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "deps/juce"]
path = deps/juce
url = https://github.com/kcoul/JUCE.git
25 changes: 17 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endif()
option(UniversalBinary "Build universal binary for mac" ON)

if (APPLE)
set (CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE INTERNAL "")
set (CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE INTERNAL "")
if (UniversalBinary)
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE INTERNAL "")
#set(CMAKE_OSX_ARCHITECTURES arm64 x86_64)
Expand Down Expand Up @@ -396,20 +396,29 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
JUCE_VST3_CAN_REPLACE_VST2=0
JUCE_DISPLAY_SPLASH_SCREEN=0
JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1
JUCE_USE_WINDOWS_MEDIA_FORMAT=1
JUCE_LOAD_CURL_SYMBOLS_LAZILY=1
JUCE_ASIO=1
JUCE_WASAPI=1
JUCE_DIRECTSOUND=0
JUCE_JACK=1
JUCE_ALSA=1
JUCE_USE_ANDROID_OBOE=1
JUCE_USE_OBOE_STABILIZED_CALLBACK=1
JUCE_LOAD_CURL_SYMBOLS_LAZILY=1
FF_AUDIO_ALLOW_ALLOCATIONS_IN_MEASURE_BLOCK=0
PAULXSTRETCH_BUILD_VERSION="${VERSION}"
${PLAT_COMPILE_DEFS} )

if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
target_compile_definitions("${target_name}"
PUBLIC
JUCE_ASIO=1
JUCE_WASAPI=1
JUCE_DIRECTSOUND=0
JUCE_USE_WINDOWS_MEDIA_FORMAT=1
)
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
target_compile_definitions("${target_name}"
PUBLIC
JUCE_JACK=1
JUCE_ALSA=1
)
endif()

juce_add_binary_data("${target_name}_PSData" SOURCES
images/freeze.svg
images/loop_icon.svg
Expand Down
13 changes: 7 additions & 6 deletions Source/CustomLookAndFeel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ Rectangle<int> CustomLookAndFeel::getTabButtonExtraComponentBounds (const TabBar
default: jassertfalse; break;
}
}
/*
else if (button.getExtraComponentPlacement() == TabBarButton::aboveText)
{
switch (orientation)
Expand Down Expand Up @@ -235,7 +236,7 @@ Rectangle<int> CustomLookAndFeel::getTabButtonExtraComponentBounds (const TabBar
default: jassertfalse; break;
}
}

*/
return extraComp;
}

Expand Down Expand Up @@ -1182,12 +1183,12 @@ void CustomLookAndFeel::drawDrawableButton (Graphics& g, DrawableButton& button,
// imageratio = sonobutt->getForegroundImageRatio();
//}

if (button.getStyle() == DrawableButton::ImageAboveTextLabel || button.getStyle() == DrawableButton::ImageBelowTextLabel) {
if (button.getStyle() == DrawableButton::ImageAboveTextLabel /*|| button.getStyle() == DrawableButton::ImageBelowTextLabel*/) {
textH = jmin (14, button.proportionOfHeight (0.2f));
} else if (button.getStyle() == DrawableButton::ImageLeftOfTextLabel || button.getStyle() == DrawableButton::ImageRightOfTextLabel) {
} /*else if (button.getStyle() == DrawableButton::ImageLeftOfTextLabel || button.getStyle() == DrawableButton::ImageRightOfTextLabel) {
textH = jmin (14, button.proportionOfHeight (0.8f));
textW = jmax (20, button.proportionOfWidth (1.0f - imageratio));
}
}*/


if (textH > 0)
Expand All @@ -1205,7 +1206,7 @@ void CustomLookAndFeel::drawDrawableButton (Graphics& g, DrawableButton& button,
button.getWidth() - 4, textH,
Justification::centred, 1);
}
else if (button.getStyle() == DrawableButton::ImageBelowTextLabel) {
/*else if (button.getStyle() == DrawableButton::ImageBelowTextLabel) {
g.drawFittedText (button.getButtonText(),
2, 1,
button.getWidth() - 4, textH,
Expand All @@ -1222,7 +1223,7 @@ void CustomLookAndFeel::drawDrawableButton (Graphics& g, DrawableButton& button,
button.getWidth() - textW - 4 , 1,
textW , button.getHeight() - 2,
Justification::centred, 2, 0.6f);
}
}*/
}
}

Expand Down
18 changes: 12 additions & 6 deletions Source/CustomStandaloneFilterApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@
#include "../JuceLibraryCode/JuceHeader.h"

#include "juce_core/system/juce_TargetPlatform.h"
#include "juce_audio_plugin_client/utility/juce_CheckSettingMacros.h"
//#include "juce_audio_plugin_client/utility/juce_CheckSettingMacros.h"

#include "juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h"
#include "juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h"
#include "juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h"
#include "juce_audio_plugin_client/utility/juce_WindowsHooks.h"
//#include "juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h"
//#include "juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h"
//#include "juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h"
//#include "juce_audio_plugin_client/utility/juce_WindowsHooks.h"

#include <juce_audio_devices/juce_audio_devices.h>
#include <juce_gui_extra/juce_gui_extra.h>
#include <juce_audio_utils/juce_audio_utils.h>

#include "PluginProcessor.h"

// #include "DebugLogC.h"

// You can set this flag in your build if you need to specify a different
Expand Down Expand Up @@ -63,11 +65,15 @@ class StandaloneFilterApp : public JUCEApplication

}

void urlOpened(const URL& url) override {
bool urlOpened(const URL& url) override {

DBG("URL opened: " << url.toString(false));
if (mainWindow.get() != nullptr)
{
mainWindow->pluginHolder->urlOpened(url);
return true;
}
return false;
}

CustomLookAndFeel sonoLNF;
Expand Down
Loading