diff --git a/.gitignore b/.gitignore index d0c9e65c..b8fe6da8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,10 @@ build32 buildXcode release/1.* mobile/Builds +.DS_Store + +release/CoLabs +release/tmp +release/macpkg/CoLabsTemp.pkgproj +release/macpkg/CoLabs_All.pkgproj +release/CoLabsPkg diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..1b572c6d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "*.mm": "cpp" + } +} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index cbe8e8e7..7d51ec9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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.1) +project(SonoBus VERSION 1.6.2) -set(BUILDVERSION 76) +set(BUILDVERSION 77) # If you've installed JUCE somehow (via a package manager, or directly using the CMake install @@ -118,10 +118,10 @@ set (MacPList " CFBundleURLName - net.sonobus + com.amunsonaudio.Sonobus CFBundleURLSchemes - sonobus + colabs @@ -150,8 +150,8 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr NEEDS_MIDI_INPUT TRUE NEEDS_MIDI_OUTPUT TRUE EDITOR_WANTS_KEYBOARD_FOCUS TRUE - COMPANY_NAME "Sonosaurus" - BUNDLE_ID "com.Sonosaurus.SonoBus" + COMPANY_NAME "amunsonaudio" + BUNDLE_ID "com.amunsonaudio.CoLabs" MICROPHONE_PERMISSION_ENABLED TRUE ICON_BIG "images/sonobus_icon_mac_1024.png" @@ -173,7 +173,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr PLUGIN_MANUFACTURER_CODE Sono PLUGIN_CODE ${plugincode} FORMATS ${formats} - DESCRIPTION "SonoBus - Network Audio" + DESCRIPTION "Amunson Audio" PRODUCT_NAME "${product_name}") juce_generate_juce_header("${target_name}") @@ -450,6 +450,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/BricolageGrotesque-Regular.ttf localization/localized_de.txt localization/localized_es.txt localization/localized_fr.txt @@ -545,6 +546,9 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr images/triangle_disclosure_right.svg images/urei_main.wav images/x_icon.svg + images/AmunsonAudio172x96.jpg + images/AmunsonAudioTransparent.png + images/AmunsonAudioWide.png ) set_target_properties(${target_name}_SBData PROPERTIES FOLDER "Targets") @@ -605,11 +609,11 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr endfunction() # most of the targets -sono_add_custom_plugin_target(SonoBus SonoBus "${FormatsToBuild}" FALSE "NBus") +sono_add_custom_plugin_target(CoLabs CoLabs "${FormatsToBuild}" FALSE "NBus") # Mobile targets #sono_add_custom_plugin_target(SonoBusMobile "AUv3 Standalone" FALSE "NBus") # add VSTi target -sono_add_custom_plugin_target(SonoBusInst "SonoBusInstrument" "VST3" TRUE "IBus") +sono_add_custom_plugin_target(CoLabsInst "CoLabsInstrument" "VST3" TRUE "IBus") diff --git a/Source/AutoUpdater.cpp b/Source/AutoUpdater.cpp index 680d93fb..54b6520f 100644 --- a/Source/AutoUpdater.cpp +++ b/Source/AutoUpdater.cpp @@ -76,7 +76,7 @@ void LatestVersionCheckerAndUpdater::run() if (showAlertWindows) AlertWindow::showMessageBoxAsync (AlertWindow::InfoIcon, "No New Version Available", - "Your SonoBus version is up to date."); + "Your CoLabs version is up to date."); return; } @@ -557,9 +557,9 @@ void restartProcess (const File& targetFolder) #if JUCE_MAC || JUCE_LINUX #if JUCE_MAC - auto newProcess = targetFolder.getChildFile ("SonoBus.app").getChildFile ("Contents").getChildFile ("MacOS").getChildFile ("SonoBus"); + auto newProcess = targetFolder.getChildFile ("CoLabs.app").getChildFile ("Contents").getChildFile ("MacOS").getChildFile ("CoLabs"); #elif JUCE_LINUX - auto newProcess = targetFolder.getChildFile ("SonoBus"); + auto newProcess = targetFolder.getChildFile ("CoLabs"); #endif StringArray command ("/bin/sh", "-c", "while killall -0 SonoBus; do sleep 5; done; " + newProcess.getFullPathName().quoted()); diff --git a/Source/BeatToggleGrid.cpp b/Source/BeatToggleGrid.cpp index 84872978..191873a0 100644 --- a/Source/BeatToggleGrid.cpp +++ b/Source/BeatToggleGrid.cpp @@ -47,7 +47,7 @@ void BeatToggleGrid::setupStuff() activeColor = Colour::fromFloatRGBA(0.1, 0.7, 0.5, 1.0); - accentedColor = Colour::fromFloatRGBA(0.5, 0.4, 0.6, 0.9); + accentedColor = Colour(0xFF002CFF); //self.backgroundColor = [UIColor colorWithRed:0.4 green:0.5 blue:0.6 alpha:1.0 ]; diff --git a/Source/BricolageGrotesque-Regular.ttf b/Source/BricolageGrotesque-Regular.ttf new file mode 100644 index 00000000..970fa8fe Binary files /dev/null and b/Source/BricolageGrotesque-Regular.ttf differ diff --git a/Source/ChatView.cpp b/Source/ChatView.cpp index a8cc001b..b1b2e7e7 100644 --- a/Source/ChatView.cpp +++ b/Source/ChatView.cpp @@ -654,7 +654,7 @@ void ChatView::showSaveChat() // 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"); + String filename = String("AmunsonAudioChat_") + Time::getCurrentTime().formatted("%Y-%m-%d_%H.%M.%S"); recdir = File::getSpecialLocation(File::userDocumentsDirectory).getNonexistentChildFile (filename, ".txt"); //#endif diff --git a/Source/ConnectView.cpp b/Source/ConnectView.cpp index 89d3e0e4..f9b33806 100644 --- a/Source/ConnectView.cpp +++ b/Source/ConnectView.cpp @@ -46,8 +46,8 @@ publicGroupsListModel(this) mConnectTab->setOutline(0); mConnectTab->setTabBarDepth(36); mConnectTab->getTabbedButtonBar().setMinimumTabScaleFactor(0.1f); - mConnectTab->getTabbedButtonBar().setColour(TabbedButtonBar::frontTextColourId, Colour::fromFloatRGBA(0.4, 0.8, 1.0, 1.0)); - mConnectTab->getTabbedButtonBar().setColour(TabbedButtonBar::frontOutlineColourId, Colour::fromFloatRGBA(0.4, 0.8, 1.0, 0.5)); + mConnectTab->getTabbedButtonBar().setColour(TabbedButtonBar::frontTextColourId, Colour(0xFFFFFFFF)); + mConnectTab->getTabbedButtonBar().setColour(TabbedButtonBar::frontOutlineColourId, Colour(0xFFFF2E61)); mDirectConnectContainer = std::make_unique(); mServerConnectContainer = std::make_unique(); @@ -86,7 +86,7 @@ publicGroupsListModel(this) mRemoteAddressStaticLabel = std::make_unique