Skip to content

Commit

Permalink
Merge branch 'develop' prior to 1.7.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@essej
essej committed Nov 28, 2023
2 parents c9d9fd8 + 8653086 commit 5f04c02
Show file tree
Hide file tree
Showing 1,516 changed files with 292,410 additions and 58,964 deletions.
26 changes: 20 additions & 6 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ endif()
# `project()` command. `project()` sets up some helpful variables that describe source/binary
# directories, and the current project version. This is a standard CMake command.

project(SonoBus VERSION 1.6.2)
project(SonoBus VERSION 1.7.0)

set(BUILDVERSION 77)
set(BUILDVERSION 79)


# If you've installed JUCE somehow (via a package manager, or directly using the CMake install
Expand Down Expand Up @@ -89,6 +89,11 @@ if (APPLE)
list (APPEND FormatsToBuild AU)
endif()

# On Linux, LV2 will be built too
if (UNIX)
list (APPEND FormatsToBuild LV2)
endif()

# If you are building a VST2 or AAX plugin, CMake needs to be told where to find these SDKs on your
# system. This setup should be done before calling `juce_add_plugin`.

Expand Down Expand Up @@ -161,7 +166,8 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
VST3_CATEGORIES "${vst3cats}"
AAX_CATEGORY "AAX_ePlugInCategory_None"


LV2URI "https://sonobus.net/lv2/sonobus"

# mac settings
HARDENED_RUNTIME_ENABLED TRUE
HARDENED_RUNTIME_OPTIONS "com.apple.security.device.audio-input"
Expand Down Expand Up @@ -281,6 +287,8 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
Source/RunningCumulant.h
Source/SampleEditView.cpp
Source/SampleEditView.h
Source/SonoCallOutBox.cpp
Source/SonoCallOutBox.h
Source/SonoChoiceButton.cpp
Source/SonoChoiceButton.h
Source/SonoDrawableButton.cpp
Expand Down Expand Up @@ -314,6 +322,8 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
Source/SonobusPluginProcessor.cpp
Source/SonobusPluginProcessor.h
Source/SonobusTypes.h
Source/SuggestNewGroupView.cpp
Source/SuggestNewGroupView.h
Source/VDONinjaView.h
Source/VersionInfo.cpp
Source/VersionInfo.h
Expand Down Expand Up @@ -449,7 +459,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr

juce_add_binary_data("${target_name}_SBData" SOURCES
Source/wordmaker.g
Source/DejaVuSans.ttf
Source/GoNotoKurrent-Regular.ttf
localization/localized_de.txt
localization/localized_es.txt
localization/localized_fr.txt
Expand All @@ -460,6 +470,10 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
localization/localized_pt-pt.txt
localization/localized_ko.txt
localization/localized_ru.txt
localization/localized_zh-hans.txt
images/arrow-up-narrow.svg
images/arrow-down-narrow.svg
images/dots.svg
images/bar_click.wav
images/beat_click.wav
images/chat.svg
Expand Down Expand Up @@ -487,8 +501,8 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
images/incoming_disallowed.svg
images/keyboard.svg
images/keyboard_disabled.svg
images/keypad-num-disabled.svg
images/keypad-num.svg
images/keypad-num-disabled.svg
images/keypad-num.svg
images/lgc_bar.wav
images/link.svg
images/link_all.svg
Expand Down
8 changes: 4 additions & 4 deletions Source/ChannelGroupsView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ void ChannelGroupsView::configLabel(Label *label, int ltype)
label->setMinimumHorizontalScale(0.3);
}
else if (ltype == LabelTypeSmall) {
label->setFont(12);
label->setFont(12 );
label->setColour(Label::textColourId, regularTextColor);
label->setJustificationType(Justification::centredRight);
label->setMinimumHorizontalScale(0.3);
Expand Down Expand Up @@ -1166,7 +1166,7 @@ void ChannelGroupsView::showPopTip(const String & message, int timeoutMs, Compon
AttributedString text(message);
text.setJustification (Justification::centred);
text.setColour (findColour (TextButton::textColourOffId));
text.setFont(Font(12));
text.setFont(Font(12* SonoLookAndFeel::getFontScale()));
if (target) {
popTip->showAt(target, text, timeoutMs);
}
Expand Down Expand Up @@ -1203,7 +1203,7 @@ ChannelGroupView * ChannelGroupsView::createChannelGroupView(bool first)
pvf->nameLabel->setFont(15);

pvf->nameEditor = std::make_unique<TextEditor>("name");
pvf->nameEditor->setFont(15);
pvf->nameEditor->setFont(15 * SonoLookAndFeel::getFontScale());
//pvf->nameEditor->setReadOnly(mPeerMode);
auto edcb = [this,pvf]() {
auto changroup = pvf->group;
Expand Down Expand Up @@ -1298,7 +1298,7 @@ ChannelGroupView * ChannelGroupsView::createChannelGroupView(bool first)
pvf->levelSlider->setLookAndFeel(&pvf->sonoSliderLNF);

pvf->monitorSlider = std::make_unique<Slider>(Slider::RotaryHorizontalVerticalDrag, Slider::TextBoxRight);
pvf->monitorSlider->setName("level");
pvf->monitorSlider->setName("monitor");
pvf->monitorSlider->addListener(this);

configLevelSlider(pvf->monitorSlider.get(), true);
Expand Down
63 changes: 29 additions & 34 deletions Source/ChatView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include "ChatView.h"
#include "GenericItemChooser.h"
#include "SonoLookAndFeel.h"

void FocusTextEditor::focusGained (FocusChangeType gtype)
{
Expand Down Expand Up @@ -282,10 +283,10 @@ void ChatView::updateFontSizes()
{
auto offset = processor.getChatFontSizeOffset();

mChatNameFont = Font(13 + offset);
mChatMesgFont = Font(16 + offset);
mChatNameFont = Font((13 + offset) * SonoLookAndFeel::getFontScale());
mChatMesgFont = Font((16 + offset) * SonoLookAndFeel::getFontScale());
mChatMesgFixedFont = Font(Font::getDefaultMonospacedFontName(), 15+offset, Font::plain);
mChatEditFont = Font(14 + offset);
mChatEditFont = Font((14 + offset) * SonoLookAndFeel::getFontScale());
mChatEditFixedFont = Font(Font::getDefaultMonospacedFontName(), 15+offset, Font::plain);
mChatSpacerFont = Font(6+offset);

Expand All @@ -312,7 +313,7 @@ void ChatView::updateTitles()

mChatSendTextEditor->setEnabled(enabled);
if (enabled) {
mesg = TRANS("Enter message here...") + String(juce::CharPointer_UTF8 (" \xe2\x86\x92 ")) + name;
mesg = TRANS("Enter message here...") + String(" -> ") + name;
}
else {
mesg = name + TRANS(" is not connected");
Expand Down Expand Up @@ -648,50 +649,44 @@ void ChatView::showSaveChat()
{
SafePointer<ChatView> safeThis (this);

if (FileChooser::isPlatformDialogAvailable())
{
File recdir; // = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("SonoBus Setups");
File recdir; // = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("SonoBus Setups");

// TODO - on iOS we need to give it a name first
// TODO - on iOS we need to give it a name first
//#if (JUCE_IOS || JUCE_ANDROID)
String filename = String("SonoBusChat_") + Time::getCurrentTime().formatted("%Y-%m-%d_%H.%M.%S");
recdir = File::getSpecialLocation(File::userDocumentsDirectory).getNonexistentChildFile (filename, ".txt");
String filename = String("SonoBusChat_") + Time::getCurrentTime().formatted("%Y-%m-%d_%H.%M.%S");
recdir = File::getSpecialLocation(File::userDocumentsDirectory).getNonexistentChildFile (filename, ".txt");
//#endif

mFileChooser.reset(new FileChooser(TRANS("Choose a location and name to store the setup"),
recdir,
"*.txt",
true, false, getTopLevelComponent()));
mFileChooser.reset(new FileChooser(TRANS("Choose a location and name to store the setup"),
recdir,
"*.txt",
true, false, getTopLevelComponent()));



mFileChooser->launchAsync (FileBrowserComponent::saveMode | FileBrowserComponent::doNotClearFileNameOnRootChange,
[safeThis] (const FileChooser& chooser) mutable
{
auto results = chooser.getURLResults();
if (safeThis != nullptr && results.size() > 0)
{
auto url = results.getReference (0);
mFileChooser->launchAsync (FileBrowserComponent::saveMode | FileBrowserComponent::doNotClearFileNameOnRootChange,
[safeThis] (const FileChooser& chooser) mutable
{
auto results = chooser.getURLResults();
if (safeThis != nullptr && results.size() > 0)
{
auto url = results.getReference (0);

DBG("Chose file to save chat: " << url.toString(false));
DBG("Chose file to save chat: " << url.toString(false));

if (url.isLocalFile()) {
File lfile = url.getLocalFile();
if (url.isLocalFile()) {
File lfile = url.getLocalFile();

lfile.replaceWithText(safeThis->mChatTextEditor->getText());
}
lfile.replaceWithText(safeThis->mChatTextEditor->getText());
}
}

if (safeThis) {
safeThis->mFileChooser.reset();
}
if (safeThis) {
safeThis->mFileChooser.reset();
}

}, nullptr);
}, nullptr);

}
else {
DBG("Need to enable code signing");
}
}


Expand Down
Loading

0 comments on commit 5f04c02

Please sign in to comment.