MIDI fixes, welcome panel fixes

Author: timothyschoen

Source/Components/WelcomePanel.h

@@ -70,7 +70,7 @@ class WelcomePanel : public Component
 
         void setSearchQuery(String const& searchQuery)
         {
-            setVisible(tileName.upToFirstOccurrenceOf(".pd", false, false).containsIgnoreCase(searchQuery));
+            setVisible(tileName.containsIgnoreCase(searchQuery));
         }
 
         void paint(Graphics& g) override
@@ -247,16 +247,16 @@ class WelcomePanel : public Component
         : NVGComponent(this)
         , editor(pluginEditor)
     {
-        recentlyOpenedViewport.setViewedComponent(&recentlyOpenedComponent, false);
-        recentlyOpenedViewport.setScrollBarsShown(true, false, false, false);
-        recentlyOpenedComponent.setVisible(true);
+        viewport.setViewedComponent(&contentComponent, false);
+        viewport.setScrollBarsShown(true, false, false, false);
+        contentComponent.setVisible(true);
 #if JUCE_IOS
-        recentlyOpenedViewport.setVisible(OSUtils::isIPad());
+        viewport.setVisible(OSUtils::isIPad());
 #else
-        recentlyOpenedViewport.setVisible(true);
+        viewport.setVisible(true);
 #endif
 
-        addChildComponent(recentlyOpenedViewport);
+        addChildComponent(viewport);
 
         // A top rectangle component that hides anything behind (we use this instead of scissoring)
         topFillAllRect.setBGColour(findColour(PlugDataColour::panelBackgroundColourId));
@@ -286,6 +286,7 @@ class WelcomePanel : public Component
         if(newPatchTile) newPatchTile->setVisible(searchQuery.isEmpty());
         if(openPatchTile) openPatchTile->setVisible(searchQuery.isEmpty());
 
+        auto& tiles = currentTab == Home ? recentlyOpenedTiles : libraryTiles;
         for (auto* tile : tiles) {
             tile->setSearchQuery(searchQuery);
         }
@@ -306,31 +307,29 @@ class WelcomePanel : public Component
         // Adjust the tile width to fit within the available width
         int actualTileWidth = (totalWidth - (numColumns - 1) * tileSpacing) / numColumns;
 
-        if (newPatchTile && newPatchTile->isVisible())
+        if (newPatchTile && currentTab == Home)
             newPatchTile->setBounds(rowBounds.removeFromLeft(actualTileWidth));
         rowBounds.removeFromLeft(4);
-        if (openPatchTile && openPatchTile->isVisible())
+        if (openPatchTile && currentTab == Home)
             openPatchTile->setBounds(rowBounds.removeFromLeft(actualTileWidth));
 
-        auto viewPos = recentlyOpenedViewport.getViewPosition();
-        recentlyOpenedViewport.setBounds(getLocalBounds().withTrimmedTop((newPatchTile && newPatchTile->isVisible()) ? 200 : 0));
-
-        // Place a rectangle directly behind the newTile & openTile so to hide any content that draws behind it.
-        topFillAllRect.setBounds(0, 0, getWidth(), recentlyOpenedViewport.getY());
+        auto viewPos = viewport.getViewPosition();
+        viewport.setBounds(getLocalBounds());
 
+        auto& tiles = currentTab == Home ? recentlyOpenedTiles : libraryTiles;
         int numRows = (tiles.size() + numColumns - 1) / numColumns;
-        int totalHeight = numRows * 160;
+        int totalHeight = (numRows * 160) + 200;
 
-        auto scrollable = Rectangle<int>(24, 6, totalWidth + 24, totalHeight + 24);
-        recentlyOpenedComponent.setBounds(scrollable);
+        auto tilesBounds = Rectangle<int>(24, currentTab == Home ? 206 : 6, totalWidth + 24, totalHeight + 24);
+        contentComponent.setBounds(tilesBounds);
 
-        // Start positioning the tiles
-        rowBounds = scrollable.removeFromTop(160);
+        // Start positioning the recentlyOpenedTiles
+        rowBounds = tilesBounds.removeFromTop(160);
         for (auto* tile : tiles) {
             if(!tile->isVisible()) continue;
             if (tile->isFavourited) {
                 if (rowBounds.getWidth() < actualTileWidth) {
-                    rowBounds = scrollable.removeFromTop(160);
+                    rowBounds = tilesBounds.removeFromTop(160);
                 }
                 tile->setBounds(rowBounds.removeFromLeft(actualTileWidth));
                 rowBounds.removeFromLeft(tileSpacing);
@@ -341,13 +340,13 @@ class WelcomePanel : public Component
             if(!tile->isVisible()) continue;
             if (!tile->isFavourited) {
                 if (rowBounds.getWidth() < actualTileWidth) {
-                    rowBounds = scrollable.removeFromTop(160);
+                    rowBounds = tilesBounds.removeFromTop(160);
                 }
                 tile->setBounds(rowBounds.removeFromLeft(actualTileWidth));
                 rowBounds.removeFromLeft(tileSpacing);
             }
         }
-        recentlyOpenedViewport.setViewPosition(viewPos);
+        viewport.setViewPosition(viewPos);
     }
 
     void setShownTab(WelcomePanel::Tab tab)
@@ -357,23 +356,34 @@ class WelcomePanel : public Component
         {
             newPatchTile->setVisible(true);
             openPatchTile->setVisible(true);
-            for(auto* tile : tiles)
+            for(auto* tile : recentlyOpenedTiles)
             {
                 tile->setVisible(true);
             }
+            for(auto* tile : libraryTiles)
+            {
+                tile->setVisible(false);
+            }
         }
         else {
             newPatchTile->setVisible(false);
             openPatchTile->setVisible(false);
-            for(auto* tile : tiles)
+            for(auto* tile : recentlyOpenedTiles)
             {
                 tile->setVisible(false);
             }
+            for(auto* tile : libraryTiles)
+            {
+                tile->setVisible(true);
+            }
         }
+        
+        triggerAsyncUpdate();
     }
 
     void handleAsyncUpdate() override
     {
+        // TODO: why are we updating this??
         newPatchTile = std::make_unique<WelcomePanelTile>(*this, "New Patch", "Create a new empty patch", newIcon, findColour(PlugDataColour::panelTextColourId), 0.33f, false);
         openPatchTile = std::make_unique<WelcomePanelTile>(*this, "Open Patch", "Browse for a patch to open", openIcon, findColour(PlugDataColour::panelTextColourId), 0.33f, false);
 
@@ -383,10 +393,10 @@ class WelcomePanel : public Component
         topFillAllRect.setBGColour(findColour(PlugDataColour::panelBackgroundColourId));
         addAndMakeVisible(topFillAllRect);
 
-        addAndMakeVisible(*newPatchTile);
-        addAndMakeVisible(*openPatchTile);
+        contentComponent.addAndMakeVisible(*newPatchTile);
+        contentComponent.addAndMakeVisible(*openPatchTile);
 
-        tiles.clear();
+        recentlyOpenedTiles.clear();
 
         auto settingsTree = SettingsFile::getInstance()->getValueTree();
         auto recentlyOpenedTree = settingsTree.getChildWithName("RecentlyOpened");
@@ -435,7 +445,7 @@ class WelcomePanel : public Component
                 String time = openTime.toString(false, true, false, true);
                 String timeDescription = date + ", " + time;
 
-                auto* tile = tiles.add(new WelcomePanelTile(*this, patchFile.getFileName(), timeDescription, silhoutteSvg, snapshotColour, 1.0f, favourited, thumbImage));
+                auto* tile = recentlyOpenedTiles.add(new WelcomePanelTile(*this, patchFile.getFileNameWithoutExtension(), timeDescription, silhoutteSvg, snapshotColour, 1.0f, favourited, thumbImage));
                 tile->onClick = [this, patchFile]() mutable {
                     if (patchFile.existsAsFile()) {
                         editor->pd->autosave->checkForMoreRecentAutosave(patchFile, editor, [this, patchFile]() {
@@ -456,12 +466,77 @@ class WelcomePanel : public Component
                     subTree.setProperty("Pinned", shouldBeFavourite, nullptr);
                     resized();
                 };
-                recentlyOpenedComponent.addAndMakeVisible(tile);
+                contentComponent.addAndMakeVisible(tile);
             }
         }
 
+        findLibraryPatches();
         resized();
     }
+        
+    void findLibraryPatches()
+    {
+        libraryTiles.clear();
+        
+        auto addTile = [this](File& patchFile){
+            auto patchThumbnailBase = File(patchFile.getParentDirectory().getFullPathName() + "\\" + patchFile.getFileNameWithoutExtension() + "_thumb");
+            StringArray possibleExtensions { ".png", ".jpg", ".jpeg", ".gif" };
+            
+            float scale = 1.0f;
+            Image thumbImage;
+            for (auto& ext : possibleExtensions) {
+                auto patchThumbnail = patchThumbnailBase.withFileExtension(ext);
+                if (patchThumbnail.existsAsFile()) {
+                    FileInputStream fileStream(patchThumbnail);
+                    if (fileStream.openedOk()) {
+                        thumbImage = ImageFileFormat::loadFrom(fileStream).convertedToFormat(Image::ARGB);
+                        break;
+                    }
+                }
+            }
+            String placeholderIcon;
+            if(!thumbImage.isValid())
+            {
+                scale = 0.6f;
+                placeholderIcon = libraryPlaceholderIcon;
+            }
+            auto snapshotColour = LookAndFeel::getDefaultLookAndFeel().findColour(PlugDataColour::objectSelectedOutlineColourId).withAlpha(0.3f);
+
+            auto* tile = libraryTiles.add(new WelcomePanelTile(*this, patchFile.getFileNameWithoutExtension(), "", placeholderIcon, snapshotColour, scale, false, thumbImage));
+            tile->onClick = [this, patchFile]() mutable {
+                if (patchFile.existsAsFile()) {
+                    editor->pd->autosave->checkForMoreRecentAutosave(patchFile, editor, [this, patchFile]() {
+                        editor->getTabComponent().openPatch(URL(patchFile));
+                        SettingsFile::getInstance()->addToRecentlyOpened(patchFile);
+                    });
+                } else {
+                    editor->pd->logError("Patch not found");
+                }
+            };
+            contentComponent.addAndMakeVisible(tile);
+        };
+        auto patchesFolder = ProjectInfo::appDataDir.getChildFile("Patches");
+        for(auto& file : OSUtils::iterateDirectory(patchesFolder, false, false))
+        {
+            if(OSUtils::isDirectoryFast(file.getFullPathName()))
+            {
+                for(auto& subfile : OSUtils::iterateDirectory(file, false, false))
+                {
+                    if(subfile.hasFileExtension("pd"))
+                    {
+                        addTile(subfile);
+                        break;
+                    }
+                }
+            }
+            else {
+                if(file.hasFileExtension("pd"))
+                {
+                    addTile(file);
+                }
+            }
+        }
+    }
 
     void show()
     {
@@ -486,10 +561,10 @@ class WelcomePanel : public Component
         g.reduceClipRegion(editor->nvgSurface.getInvalidArea());
         paintEntireComponent(g, false);
 
-        auto gradient = nvgLinearGradient(nvg, 0, recentlyOpenedViewport.getY(), 0, recentlyOpenedViewport.getY() + 20, convertColour(findColour(PlugDataColour::panelBackgroundColourId)), nvgRGBA(255, 255, 255, 0));
+        auto gradient = nvgLinearGradient(nvg, 0, viewport.getY(), 0, viewport.getY() + 20, convertColour(findColour(PlugDataColour::panelBackgroundColourId)), nvgRGBA(255, 255, 255, 0));
 
         nvgFillPaint(nvg, gradient);
-        nvgFillRect(nvg, recentlyOpenedViewport.getX() + 8, recentlyOpenedViewport.getY(), recentlyOpenedViewport.getWidth() - 16, 20);
+        nvgFillRect(nvg, viewport.getX() + 8, viewport.getY(), viewport.getWidth() - 16, 20);
     }
 
     void lookAndFeelChanged() override
@@ -511,22 +586,39 @@ class WelcomePanel : public Component
                                           "d=\"M1180 555h506q72 0 126 47t64 118v13l2 14v768q0 76 -52 131t-128 60h-12h-1324q-76 0 -131 -51.5t-59 -127.5l-2 -12v-620l530 2l17 -2q51 -4 92 -33l4 -3t6 -5l4 -2zM700 342q59 0 109 32l14 11l181 149l-263 219l-8 4q-10 8 -24 11h-9h-530v-236q0 -76 52 -131\n"
                                           "t128 -59h12h338z\" />\n"
                                           "</svg>\n";
+        
+    static inline String const libraryPlaceholderIcon = "<svg width=\"864\" height=\"864\" viewBox=\"0 0 864 864\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n"
+        "<path d=\"M538.114 201.488C550.72 201.488 560.94 191.268 560.94 178.662C560.94 166.055 550.72 155.836 538.114 155.836C525.507 155.836 515.288 166.055 515.288 178.662C515.288 191.268 525.507 201.488 538.114 201.488Z\" fill=\"black\"/>\n"
+        "<path d=\"M178.662 560.94C191.268 560.94 201.488 550.72 201.488 538.114C201.488 525.507 191.268 515.288 178.662 515.288C166.055 515.288 155.836 525.507 155.836 538.114C155.836 550.72 166.055 560.94 178.662 560.94Z\" fill=\"black\"/>\n"
+        "<path d=\"M695.922 201.488C708.528 201.488 718.748 191.268 718.748 178.662C718.748 166.055 708.528 155.836 695.922 155.836C683.315 155.836 673.096 166.055 673.096 178.662C673.096 191.268 683.315 201.488 695.922 201.488Z\" fill=\"black\"/>\n"
+        "<path d=\"M336.47 560.94C349.076 560.94 359.296 550.72 359.296 538.114C359.296 525.507 349.076 515.288 336.47 515.288C323.863 515.288 313.644 525.507 313.644 538.114C313.644 550.72 323.863 560.94 336.47 560.94Z\" fill=\"black\"/>\n"
+        "<path d=\"M695.922 359.296C708.528 359.296 718.748 349.076 718.748 336.47C718.748 323.863 708.528 313.644 695.922 313.644C683.315 313.644 673.096 323.863 673.096 336.47C673.096 349.076 683.315 359.296 695.922 359.296Z\" fill=\"black\"/>\n"
+        "<path d=\"M336.47 718.748C349.076 718.748 359.296 708.528 359.296 695.922C359.296 683.315 349.076 673.096 336.47 673.096C323.863 673.096 313.644 683.315 313.644 695.922C313.644 708.528 323.863 718.748 336.47 718.748Z\" fill=\"black\"/>\n"
+        "<path d=\"M538.114 359.296C550.72 359.296 560.94 349.076 560.94 336.47C560.94 323.863 550.72 313.644 538.114 313.644C525.507 313.644 515.288 323.863 515.288 336.47C515.288 349.076 525.507 359.296 538.114 359.296Z\" fill=\"black\"/>\n"
+        "<path d=\"M178.662 718.748C191.268 718.748 201.488 708.528 201.488 695.922C201.488 683.315 191.268 673.096 178.662 673.096C166.055 673.096 155.836 683.315 155.836 695.922C155.836 708.528 166.055 718.748 178.662 718.748Z\" fill=\"black\"/>\n"
+        "<path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M216.158 112L287.842 112C324.06 112 337.194 115.771 350.434 122.852C363.675 129.933 374.066 140.325 381.148 153.566C388.229 166.806 392 179.94 392 216.158V287.842C392 324.06 388.229 337.194 381.148 350.434C374.066 363.675 363.675 374.066 350.434 381.148C337.194 388.229 324.06 392 287.842 392H216.158C179.94 392 166.806 388.229 153.566 381.148C140.325 374.066 129.933 363.675 122.852 350.434C115.771 337.194 112 324.06 112 287.842V216.158C112 179.94 115.771 166.806 122.852 153.566C129.933 140.325 140.325 129.933 153.566 122.852C166.806 115.771 179.94 112 216.158 112Z\" fill=\"black\"/>\n"
+        "<path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M576.158 472H647.842C684.06 472 697.194 475.771 710.434 482.852C723.675 489.933 734.066 500.325 741.148 513.566C748.229 526.806 752 539.94 752 576.158V647.842C752 684.06 748.229 697.194 741.148 710.434C734.066 723.675 723.675 734.066 710.434 741.148C697.194 748.229 684.06 752 647.842 752H576.158C539.94 752 526.806 748.229 513.566 741.148C500.325 734.066 489.933 723.675 482.852 710.434C475.771 697.194 472 684.06 472 647.842V576.158C472 539.94 475.771 526.806 482.852 513.566C489.933 500.325 500.325 489.933 513.566 482.852C526.806 475.771 539.94 472 576.158 472Z\" fill=\"black\"/>\n"
+        "<rect x=\"30\" y=\"30\" width=\"804\" height=\"804\" rx=\"172\" stroke=\"black\" stroke-width=\"8\"/>\n"
+        "</svg>\n";
 
     std::unique_ptr<WelcomePanelTile> newPatchTile;
     std::unique_ptr<WelcomePanelTile> openPatchTile;
 
-    Component recentlyOpenedComponent;
-    BouncingViewport recentlyOpenedViewport;
+    Component contentComponent;
+    BouncingViewport viewport;
 
     TopFillAllRect topFillAllRect;
 
     std::unique_ptr<NanoVGGraphicsContext> nvgContext = nullptr;
 
     NVGImage shadowImage;
-    OwnedArray<WelcomePanelTile> tiles;
+    OwnedArray<WelcomePanelTile> recentlyOpenedTiles;
+    OwnedArray<WelcomePanelTile> libraryTiles;
     PluginEditor* editor;
+    
+        static inline Image logo = ImageFileFormat::loadFrom(BinaryData::plugdata_logo_png, BinaryData::plugdata_logo_pngSize).rescaled(128, 128);
 
     String searchQuery;
-    Tab currentTab;
+    Tab currentTab = Home;
 
 };

Source/PluginEditor.cpp

@@ -686,7 +686,7 @@ void PluginEditor::resized()
     runButton.setBounds(startX + buttonSize - 1, 1, buttonSize, buttonSize - 2);
     presentButton.setBounds(startX + (2 * buttonSize) - 2, 1, buttonSize, buttonSize - 2);
 
-    auto welcomeSelectorBounds = getLocalBounds().removeFromTop(toolbarHeight + 8).withSizeKeepingCentre(200, toolbarHeight);
+    auto welcomeSelectorBounds = getLocalBounds().removeFromTop(toolbarHeight + 8).withSizeKeepingCentre(200, toolbarHeight).translated(0, -1);
     recentlyOpenedPanelSelector.setBounds(welcomeSelectorBounds.removeFromLeft(100));
     libraryPanelSelector.setBounds(welcomeSelectorBounds.removeFromLeft(100));
 

Source/Utility/MidiDeviceManager.h

@@ -219,15 +219,20 @@ class MidiDeviceManager : public ChangeListener
     void enqueueMidiOutput(int port, MidiMessage const& message, int samplePosition)
     {
         ScopedLock lock(midiDeviceLock);
-        midiBufferOut[port].addEvent(message, samplePosition);
+        auto midiOutputBufferIter = midiBufferOut.find(port);
+        if (midiOutputBufferIter == midiBufferOut.end()) {
+            midiOutputBufferIter->second.addEvent(message, samplePosition);
+        }
     }
 
     // Read output buffer for a port. Used to pass back into the DAW or into the internal GM synth
     void dequeueMidiOutput(int port, MidiBuffer& buffer, int numSamples)
     {
         ScopedLock lock(midiDeviceLock);
-        auto& outputBuffer = midiBufferOut[port];
-        buffer.addEvents(outputBuffer, 0, numSamples, 0);
+        auto midiOutputBufferIter = midiBufferOut.find(port);
+        if (midiOutputBufferIter == midiBufferOut.end()) {
+            buffer.addEvents(midiOutputBufferIter->second, 0, numSamples, 0);
+        }
     }
 
     // Send all MIDI output to target devices