Merge branch 'develop' for release 1.7.1

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.7.0)
+project(SonoBus VERSION 1.7.1)
 
-set(BUILDVERSION 79)
+set(BUILDVERSION 80)
 
 
 # If you've installed JUCE somehow (via a package manager, or directly using the CMake install
@@ -417,7 +417,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
  # This cleans up the folder organization, especially on Xcode.
  # It tucks the Plugin varieties into a "Targets" folder and generate an Xcode Scheme manually
  # Xcode scheme generation is turned off globally to limit noise from other targets
- # The non-hacky way of doing this is via the global PREDEFINED_TARGETS_FOLDER propety
+ # The non-hacky way of doing this is via the global PREDEFINED_TARGETS_FOLDER property
  # However that doesn't seem to be working in Xcode
  # Not all plugin types (au, vst) available on each build type (win, macos, linux)
  foreach(target ${formats} "All")
@@ -558,6 +558,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
  images/triangle_disclosure.svg
  images/triangle_disclosure_right.svg
  images/urei_main.wav
+ images/videocam-outline.svg
  images/x_icon.svg
  )
 

Source/ChannelGroup.h

@@ -50,7 +50,7 @@ struct ChannelGroupParams
  float pan[MAX_CHANNELS] = { 0.0f };
  // used when numChannels == 2
  float panStereo[2] = {-1.0f, 1.0f }; // only use 2
- float centerPanLaw = 0.596f; // center pan attentuation (default -4.5dB)
+ float centerPanLaw = 0.596f; // center pan attenuation (default -4.5dB)
 
  int panDestStartIndex = 0; // destination channel index
  int panDestChannels = 2; // destination number of channels

Source/ChannelGroupsView.cpp

@@ -71,7 +71,18 @@ ChannelGroupEffectsView::ChannelGroupEffectsView(SonobusAudioProcessor& proc, bo
  updateLayout();
 }
 
-ChannelGroupEffectsView::~ChannelGroupEffectsView() {}
+ChannelGroupEffectsView::~ChannelGroupEffectsView() {
+
+ compressorView->removeListener(this);
+ expanderView->removeListener(this);
+ expanderView->removeHeaderListener(this);
+ reverbSendView->removeHeaderListener(this);
+ reverbSendView->removeListener(this);
+ polarityInvertView->removeHeaderListener(this);
+ polarityInvertView->removeListener(this);
+
+ effectsConcertina.reset();
+}
 
 juce::Rectangle<int> ChannelGroupEffectsView::getMinimumContentBounds() const {
  auto minbounds = compressorView->getMinimumContentBounds();
@@ -444,6 +455,11 @@ ChannelGroupMonitorEffectsView::ChannelGroupMonitorEffectsView(SonobusAudioProce
 
 ChannelGroupMonitorEffectsView::~ChannelGroupMonitorEffectsView()
 {
+ reverbSendView->removeListener(this);
+ delayView->removeListener(this);
+ delayView->removeHeaderListener(this);
+
+ effectsConcertina.reset();
 }
 
 juce::Rectangle<int> ChannelGroupMonitorEffectsView::getMinimumContentBounds() const {
@@ -744,6 +760,8 @@ ChannelGroupReverbEffectsView::ChannelGroupReverbEffectsView(SonobusAudioProcess
 
 ChannelGroupReverbEffectsView::~ChannelGroupReverbEffectsView()
 {
+ reverbView->removeListener(this);
+ effectsConcertina.reset();
 }
 
 juce::Rectangle<int> ChannelGroupReverbEffectsView::getMinimumContentBounds() const {
@@ -879,7 +897,7 @@ void ChannelGroupView::resized()
  mainbox.performLayout(getLocalBounds());
 
  if (panLabel) {
- panLabel->setBounds(panSlider->getBounds().removeFromTop(12).translated(0, 0));
+ panLabel->setBounds(panSlider->getBounds().removeFromTop(16).translated(0, -2));
  }
 
 
@@ -2889,7 +2907,7 @@ void ChannelGroupsView::updateInputModeChannelViews(int specific)
 
  } else {
  pvf->panLabel->setVisible(true);
- pvf->panSlider->setDoubleClickReturnValue(true, (chi & 2) ? 1.0f : -1.0f); // double click defaults to altenating left/right
+ pvf->panSlider->setDoubleClickReturnValue(true, (chi & 2) ? 1.0f : -1.0f); // double click defaults to alternating left/right
  pvf->panSlider->setVisible(true);
 
  }

Source/ChatView.cpp

@@ -830,7 +830,7 @@ void ChatView::processNewChatMessages(int index, int count)
  auto & event = allChatEvents.getReference(i);
 
  if (event.targets.isNotEmpty()) {
- // targetted message
+ // targeted message
  auto targetnames = StringArray::fromTokens(event.targets, "|", "");
 
  // append a private tab for them if necessary
@@ -858,7 +858,7 @@ void ChatView::processNewChatMessages(int index, int count)
  mLastPrivateChatViewEventIndex[event.from] = i;
  }
  else {
- // we are showing global, so skip any targetted things
+ // we are showing global, so skip any targeted things
 
  if (event.type == SBChatEvent::UserType) {
  // but mark unread on the chat tab from this person

Source/ConnectView.cpp

@@ -151,7 +151,7 @@ publicGroupsListModel(this)
 
  mServerUserStaticLabel = std::make_unique<Label>("serveruserst", TRANS("Your Displayed Name:"));
  configServerLabel(mServerUserStaticLabel.get());
- mServerUserStaticLabel->setMinimumHorizontalScale(0.8);
+ mServerUserStaticLabel->setMinimumHorizontalScale(0.7);
 
  mServerUserPassStaticLabel = std::make_unique<Label>("serveruserpassst", TRANS("Password:"));
  configServerLabel(mServerUserPassStaticLabel.get());
@@ -502,7 +502,7 @@ void ConnectView::updateLayout()
  int sliderheight = 44;
  int inmeterwidth = 22 ;
  int outmeterwidth = 22 ;
- int servLabelWidth = 72;
+ int servLabelWidth = 82;
  int iconheight = 24;
  int iconwidth = iconheight;
  int knoblabelheight = 18;
@@ -785,7 +785,7 @@ void ConnectView::visibilityChanged ()
  if (!isVisible()) {
  // force password show to off here
  mServerGroupPasswordShowButton->setToggleState(false, dontSendNotification);
- currConnectionInfo.userName = mServerUsernameEditor->getText();
+ currConnectionInfo.userName = mServerUsernameEditor->getText().trim();
  currConnectionInfo.groupName = mServerGroupEditor->getText().trim();
  currConnectionInfo.groupPassword = mServerGroupPasswordEditor->getText();
  updateState();
@@ -806,7 +806,7 @@ void ConnectView::connectTabChanged (int newCurrentTabIndex)
  }
  publicGroupLogin();
 
- currConnectionInfo.userName = mServerUsernameEditor->getText();
+ currConnectionInfo.userName = mServerUsernameEditor->getText().trim();
  currConnectionInfo.groupName = mServerGroupEditor->getText().trim();
  currConnectionInfo.groupPassword = mServerGroupPasswordEditor->getText();
  }
@@ -833,7 +833,7 @@ void ConnectView::publicGroupLogin()
  }
 
  AooServerConnectionInfo info;
- info.userName = mPublicServerUsernameEditor->getText();
+ info.userName = mPublicServerUsernameEditor->getText().trim();
  info.serverHost = host;
  info.serverPort = port;
 
@@ -973,7 +973,7 @@ void ConnectView::textEditorTextChanged (TextEditor& ed)
 {
  if (&ed == mPublicServerUsernameEditor.get() || &ed == mServerUsernameEditor.get()) {
  // try to set the current username, it will fail if we are connected, no big deal
- processor.setCurrentUsername(ed.getText());
+ processor.setCurrentUsername(ed.getText().trim());
  }
 }
 
@@ -1042,7 +1042,7 @@ void ConnectView::buttonClicked (Button* buttonThatWasClicked)
  }
 
  AooServerConnectionInfo info;
- info.userName = mServerUsernameEditor->getText();
+ info.userName = mServerUsernameEditor->getText().trim();
  info.groupName = mServerGroupEditor->getText().trim();
  info.groupPassword = mServerGroupPasswordEditor->getText();
  info.groupIsPublic = false;
@@ -1073,7 +1073,7 @@ void ConnectView::buttonClicked (Button* buttonThatWasClicked)
  }
 
  AooServerConnectionInfo info;
- info.userName = mPublicServerUsernameEditor->getText();
+ info.userName = mPublicServerUsernameEditor->getText().trim();
  info.groupName = mPublicServerGroupEditor->getText().trim();
  info.groupPassword = "";
  info.groupIsPublic = true;
@@ -1089,7 +1089,7 @@ void ConnectView::buttonClicked (Button* buttonThatWasClicked)
  }
  else if (buttonThatWasClicked == mServerGroupPasswordShowButton.get()) {
  mServerGroupPasswordShowButton->setToggleState(!mServerGroupPasswordShowButton->getToggleState(), dontSendNotification);
- currConnectionInfo.userName = mServerUsernameEditor->getText();
+ currConnectionInfo.userName = mServerUsernameEditor->getText().trim();
  currConnectionInfo.groupName = mServerGroupEditor->getText().trim();
  currConnectionInfo.groupPassword = mServerGroupPasswordEditor->getText();
  updateState();
@@ -1229,7 +1229,7 @@ void ConnectView::connectWithInfo(const AooServerConnectionInfo & info, bool all
  mPublicServerGroupEditor->repaint();
  }
 
- if (currConnectionInfo.userName.isEmpty()) {
+ if (currConnectionInfo.userName.trim().isEmpty()) {
  String mesg = TRANS("You need to specify a user name!");
 
  if (info.groupIsPublic) {
@@ -1761,7 +1761,7 @@ void ConnectView::PublicGroupsListModel::groupSelected(int rowNumber)
  else {
 
  AooServerConnectionInfo cinfo;
- cinfo.userName = parent->mPublicServerUsernameEditor->getText();
+ cinfo.userName = parent->mPublicServerUsernameEditor->getText().trim();
  cinfo.groupName = ginfo.groupName;
  cinfo.groupIsPublic = true;
  cinfo.serverHost = parent->currConnectionInfo.serverHost;

Source/LatencyMatchView.cpp

@@ -237,7 +237,7 @@ void LatencyMatchView::updatePeerSliders()
 
 
  String peerstr;
- peerstr << latinfo.sourceName << String(juce::CharPointer_UTF8 (" \xe2\x86\x92 ")) << latinfo.destName;
+ peerstr << latinfo.sourceName << String(" -> ") << latinfo.destName;
  label->setText(peerstr, dontSendNotification);
 
  peerSlidersBox.items.add(FlexItem(minButtonWidth, minitemheight, *slider).withMargin(1).withFlex(0));

Source/MVerb.h

@@ -552,7 +552,7 @@ class StaticDelayLineFourTap
  Clear();
  }
 
- //get ouput and iterate
+ //get output and iterate
  T operator()(T input)
  {
  T output = buffer[index1];
@@ -641,7 +641,7 @@ class StaticDelayLineEightTap
  Clear();
  }
 
- //get ouput and iterate
+ //get output and iterate
  T operator()(T input)
  {
  T output = buffer[index1];

Source/OptionsView.cpp

@@ -62,7 +62,7 @@ void OptionsView::initializeLanguages()
  languages.add(TRANS("Russian")); languagesNative.add(juce::CharPointer_UTF8 ("p\xd1\x83\xd1\x81\xd1\x81\xd0\xba\xd0\xb8\xd0\xb9")); codes.add("ru");
 
 
- // TOOD - parse any user files with localized_%s.txt in our settings folder and add as options if not existing already
+ // TODO - parse any user files with localized_%s.txt in our settings folder and add as options if not existing already
 
 }
 

Source/RandomSentenceGenerator.cpp

@@ -50,7 +50,7 @@ RandomSentenceGenerator::RandomSentenceGenerator(const std::string & fileName)
  ifstream inFile(fileName);
 
 
- //if the file doesnt open
+ //if the file doesn't open
  if ( !inFile.is_open() )
  {
  cerr << "Unable to open " << fileName << " for reading. "; 

Source/ReverbSendView.h

@@ -122,7 +122,7 @@ class ReverbSendView : public EffectsBaseView,
  infoBox.flexDirection = FlexBox::Direction::row;
  //timeBox.items.add(FlexItem(minKnobWidth, knoblabelheight, timeLabel).withMargin(0).withFlex(0));
  infoBox.items.add(FlexItem(12, 4).withMargin(0));
- infoBox.items.add(FlexItem(minKnobWidth, minitemheight, infoLabel).withMargin(0).withFlex(1));
+ infoBox.items.add(FlexItem(minKnobWidth, headerheight, infoLabel).withMargin(0).withFlex(1));
 
 
  checkBox.items.clear();
@@ -158,7 +158,7 @@ class ReverbSendView : public EffectsBaseView,
  mainBox.items.add(FlexItem(6, 5).withMargin(0).withFlex(0));
  mainBox.items.add(FlexItem(100, minitemheight, sendBox).withMargin(0).withFlex(1));
  mainBox.items.add(FlexItem(6, 4).withMargin(0).withFlex(0));
- mainBox.items.add(FlexItem(100, minitemheight, infoBox).withMargin(0).withFlex(1));
+ mainBox.items.add(FlexItem(100, headerheight, infoBox).withMargin(0).withFlex(1));
  mainBox.items.add(FlexItem(6, 4).withMargin(0).withFlex(0));
 
  int iph = 0;

Source/SampleEditView.h

@@ -308,7 +308,7 @@ class SampleEditView : public Component
  std::unique_ptr<SonoDrawableButton> createColourButton(const int index);
 
  /**
- * Updates the colour buttons to show a checkmark if its colour is slected and hide the checkmark if that colour
+ * Updates the colour buttons to show a checkmark if its colour is selected and hide the checkmark if that colour
  * has not been selected.
  */
  void updateColourButtonCheckmark();

Source/SonoLookAndFeel.cpp

@@ -7,10 +7,14 @@
 //#include "ConfigurationRowView.h"
 #include "SonoTextButton.h"
 
+#include <JuceHeader.h>
+
 #if JUCE_ANDROID
 float SonoLookAndFeel::fontScale = 1.0f;
+#elif JUCE_WINDOWS
+float SonoLookAndFeel::fontScale = 1.35f;
 #else
-float SonoLookAndFeel::fontScale = 1.2f;
+float SonoLookAndFeel::fontScale = 1.25f;
 #endif
 
 //==============================================================================

Source/SonoStandaloneFilterApp.cpp

@@ -251,7 +251,7 @@ class SonobusStandaloneFilterApp : public JUCEApplication, public Timer
  username = SystemStats::getComputerName();
  }
 
- cmdlineConnInfo.userName = username;
+ cmdlineConnInfo.userName = username.trim();
 
  cmdlineConnInfo.serverHost = DEFAULT_SERVER_HOST;
  cmdlineConnInfo.serverPort = DEFAULT_SERVER_PORT;
@@ -391,7 +391,7 @@ class SonobusStandaloneFilterApp : public JUCEApplication, public Timer
 
  auto groupname = arglist.removeValueForOption(groupSpec);
  if (groupname.isNotEmpty()) {
- cmdlineConnInfo.groupName = groupname;
+ cmdlineConnInfo.groupName = groupname.trim();
  doInitialConnect = true;
  copyInfo = true;
  }
@@ -404,7 +404,7 @@ class SonobusStandaloneFilterApp : public JUCEApplication, public Timer
 
  auto username = arglist.removeValueForOption(userNameSpec);
  if (username.isNotEmpty()) {
- cmdlineConnInfo.userName = username;
+ cmdlineConnInfo.userName = username.trim();
  copyInfo = true;
  }
 
@@ -792,7 +792,7 @@ class SonobusStandaloneFilterApp : public JUCEApplication, public Timer
  }
  }
  else {
- DBG("was not actve: restarting");
+ DBG("was not active: restarting");
  mainWindow->getDeviceManager().restartLastAudioDevice();
  }