Clean up touch popup options, remove unused variables

Author: timothyschoen

Source/Components/TouchSelectionHelper.h

@@ -64,8 +64,8 @@ class TouchSelectionHelper final : public Component
                 }
             }
 
-            bool active = object != nullptr && !locked;
-
+            bool objectSelectedInEdit = object && !locked;
+            bool connectionSelectedInEdit = selectedConnections.size() && !locked;
 
 
             TouchPopupMenu touchMenu;
@@ -74,14 +74,14 @@ class TouchSelectionHelper final : public Component
                 ApplicationCommandTarget::InvocationInfo info(CommandIDs::Cut);
                 info.invocationMethod = ApplicationCommandTarget::InvocationInfo::fromMenu;
                 editor->commandManager.invoke(info, true);
-            }, active);
+            }, objectSelectedInEdit);
 
             touchMenu.addItem("Copy", [this](){
                 editor->grabKeyboardFocus();
                 ApplicationCommandTarget::InvocationInfo info(CommandIDs::Copy);
                 info.invocationMethod = ApplicationCommandTarget::InvocationInfo::fromMenu;
                 editor->commandManager.invoke(info, true);
-            }, active);
+            }, objectSelectedInEdit);
 
             touchMenu.addItem("Paste", [this](){
                 editor->grabKeyboardFocus();
@@ -95,47 +95,47 @@ class TouchSelectionHelper final : public Component
                 ApplicationCommandTarget::InvocationInfo info(CommandIDs::Duplicate);
                 info.invocationMethod = ApplicationCommandTarget::InvocationInfo::fromMenu;
                 editor->commandManager.invoke(info, true);
-            }, active);
+            }, objectSelectedInEdit);
 
             touchMenu.addItem("Encapsulate", [this](){
                 editor->grabKeyboardFocus();
                 ApplicationCommandTarget::InvocationInfo info(CommandIDs::Encapsulate);
                 info.invocationMethod = ApplicationCommandTarget::InvocationInfo::fromMenu;
                 editor->commandManager.invoke(info, true);
-            }, active);
+            }, objectSelectedInEdit);
 
             touchMenu.addItem("Tidy Connection", [this](){
                 editor->grabKeyboardFocus();
                 ApplicationCommandTarget::InvocationInfo info(CommandIDs::ConnectionPathfind);
                 info.invocationMethod = ApplicationCommandTarget::InvocationInfo::fromMenu;
                 editor->commandManager.invoke(info, true);
-            }, selectedConnections.size());
+            }, connectionSelectedInEdit);
 
             TouchPopupMenu alignMenu;
             alignMenu.addItem("Align left", [cnv](){
                 cnv->alignObjects(Align::Left);
-            }, active);
+            });
             alignMenu.addItem("Align centre", [cnv](){
                 cnv->alignObjects(Align::HCentre);
-            }, active);
+            });
             alignMenu.addItem("Align right", [cnv](){
                 cnv->alignObjects(Align::Right);
-            }, active);
+            });
             alignMenu.addItem("Space horizonally", [cnv](){
                 cnv->alignObjects(Align::HDistribute);
-            }, active);
+            });
             alignMenu.addItem("Align top", [cnv](){
                 cnv->alignObjects(Align::Top);
-            }, active);
+            });
             alignMenu.addItem("Align middle", [cnv](){
                 cnv->alignObjects(Align::VCentre);
-            }, active);
+            });
             alignMenu.addItem("Align bottom", [cnv](){
                 cnv->alignObjects(Align::Bottom);
-            }, active);
+            });
             alignMenu.addItem("Space vertically", [cnv](){
                 cnv->alignObjects(Align::VDistribute);
-            }, active);
+            });
 
             TouchPopupMenu orderMenu;
             orderMenu.addItem("To Front", [cnv, selectedObjects]{
@@ -152,7 +152,7 @@ class TouchSelectionHelper final : public Component
                 }
                 cnv->patch.endUndoSequence("ToFront");
                 cnv->synchronise();
-            }, active);
+            });
             orderMenu.addItem("Move forward", [cnv, selectedObjects]{
                 auto objects = cnv->patch.getObjects();
                 cnv->patch.startUndoSequence("MoveForward");
@@ -167,7 +167,7 @@ class TouchSelectionHelper final : public Component
                 }
                 cnv->patch.endUndoSequence("MoveForward");
                 cnv->synchronise();
-            }, active);
+            });
             orderMenu.addItem("Move backward", [cnv, selectedObjects]{
                 auto objects = cnv->patch.getObjects();
 
@@ -183,7 +183,8 @@ class TouchSelectionHelper final : public Component
                 }
                 cnv->patch.endUndoSequence("MoveBackward");
                 cnv->synchronise();
-            }, active);
+            });
+            
             orderMenu.addItem("To Back", [cnv, selectedObjects]{
                 auto objects = cnv->patch.getObjects();
 
@@ -199,10 +200,10 @@ class TouchSelectionHelper final : public Component
                 }
                 cnv->patch.endUndoSequence("ToBack");
                 cnv->synchronise();
-            }, active);
+            });
 
-            touchMenu.addSubMenu("Align", alignMenu, active);
-            touchMenu.addSubMenu("Order", orderMenu, active);
+            touchMenu.addSubMenu("Align", alignMenu, objectSelectedInEdit && multiple);
+            touchMenu.addSubMenu("Order", orderMenu, objectSelectedInEdit);
 
             touchMenu.addItem("Properties", [this](){
                 showObjectProperties();

Source/Dialogs/Dialogs.cpp

@@ -181,7 +181,7 @@ void Dialogs::showMainMenu(PluginEditor* editor, Component* centre)
 
 #if !JUCE_IOS
         TouchPopupMenu heavyMenu;
-        heavyMenu.addItem("Toggle compiled mode", [editor]{
+        heavyMenu.addItem("Toggle compiled mode", []{
             auto settingsTree = SettingsFile::getInstance()->getValueTree();
             bool const ticked = settingsTree.hasProperty("hvcc_mode") && static_cast<bool>(settingsTree.getProperty("hvcc_mode"));
             settingsTree.setProperty("hvcc_mode", !ticked, nullptr);

Source/Dialogs/ObjectBrowserDialog.h

@@ -427,7 +427,7 @@ class ObjectViewer final : public Component {
 
         auto squareIolets = PlugDataLook::getUseSquareIolets();
 
-        auto drawIolet = [this, squareIolets](Graphics& g, Rectangle<float> const bounds, bool const type) mutable {
+        auto drawIolet = [squareIolets](Graphics& g, Rectangle<float> const bounds, bool const type) mutable {
             g.setColour(type ? PlugDataColours::signalColour : PlugDataColours::dataColour);
 
             if (squareIolets) {

Source/Dialogs/ObjectReferenceDialog.h

@@ -300,7 +300,7 @@ class ObjectReferenceDialog final : public Component {
 
         auto squareIolets = static_cast<bool>(themeTree.getProperty("square_iolets"));
 
-        auto drawIolet = [this, squareIolets](Graphics& g, Rectangle<float> const bounds, bool const type) mutable {
+        auto drawIolet = [squareIolets](Graphics& g, Rectangle<float> const bounds, bool const type) mutable {
             g.setColour(type ? PlugDataColours::signalColour : PlugDataColours::dataColour);
 
             if (squareIolets) {

Source/Dialogs/PatchStore.h

@@ -945,7 +945,7 @@ class PatchFullDisplay final : public Component
 
         auto const hasSizeInfo = currentPatch.size.isNotEmpty();
         int extraInfoItemWidth = getWidth() / (hasSizeInfo ? 3 : 2);
-        auto drawExtraInfo = [this, extraInfoItemWidth, &extraInfoBounds](Graphics& g, String const& icon, String const& label, String const& value) mutable {
+        auto drawExtraInfo = [extraInfoItemWidth, &extraInfoBounds](Graphics& g, String const& icon, String const& label, String const& value) mutable {
             auto infoBounds = extraInfoBounds.removeFromLeft(extraInfoItemWidth).withSizeKeepingCentre(110, 32).translated(-12, 0);
 
             g.setColour(PlugDataColours::panelTextColour);

Source/Standalone/PlugDataWindow.h

@@ -82,14 +82,10 @@ class StandalonePluginHolder final : private AudioIODeviceCallback
     {
 
         createPlugin();
-
-        auto const inChannels = channelConfiguration.size() > 0 ? channelConfiguration[0].numIns : processor->getMainBusNumInputChannels();
-
+        
         if (preferredSetupOptions != nullptr)
             options = std::make_unique<AudioDeviceManager::AudioDeviceSetup>(*preferredSetupOptions);
 
-        auto const audioInputRequired = inChannels > 0;
-
         MessageManager::callAsync([this, preferredDefaultDeviceName](){
             if (RuntimePermissions::isRequired(RuntimePermissions::recordAudio) && !RuntimePermissions::isGranted(RuntimePermissions::recordAudio))
                 RuntimePermissions::request(RuntimePermissions::recordAudio, [this, preferredDefaultDeviceName](bool const granted) { init(granted, preferredDefaultDeviceName); });