Add NAMFileBrowserControl to group Model/IR loading controls #242

olilarkin · 2023-05-06T23:15:02Z

This PR adds a new control NAMFileBrowserControl, which is used for the Model and IR loading. It

Groups all controls into a meta control
Implements browsing through adjacent files in the same directory as the chosen file with left/right arrows
Implements a pop-up menu with all .nam. or .wav files in the folder that the original file was from
Eliipsizes long file names that are displayed in the UI
Enables tooltips, and shows the full filename in the tooltip for the child control that displays the current model/ir name
Reworks the model-view communication to remove non realtime safe code - the previous approach was calling SendControlMsgFromDelegate() which you shouldn't do on the audio thread

NAMFileBrowseControl.mov

sdatkinson

All of the main changes are 10/10. Awesome to have them! And the metacontrol definition is awesome.

One critical issue that I'm not sure how to solve yet & I'd like to either have a fix or at least a plan before I can merge: The code in OnUIOpen doesn't seem to be executing anymore: when I reopen the UI, the model & IR text are back to their defaults "Select model..." etc. It looks like the code that affects what we see is now mFileNameButton->SetLabelStr()? Is there a way that this can be accessed from OnUIOpen?

As soon as either there's a fix or I understand how to clean it up, I'm good to merge this.

NeuralAmpModeler/NeuralAmpModeler.cpp

NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj

olilarkin · 2023-05-07T16:14:38Z

All of the main changes are 10/10. Awesome to have them! And the metacontrol definition is awesome.

One critical issue that I'm not sure how to solve yet & I'd like to either have a fix or at least a plan before I can merge: The code in OnUIOpen doesn't seem to be executing anymore: when I reopen the UI, the model & IR text are back to their defaults "Select model..." etc. It looks like the code that affects what we see is now mFileNameButton->SetLabelStr()? Is there a way that this can be accessed from OnUIOpen?

As soon as either there's a fix or I understand how to clean it up, I'm good to merge this.

yeah i am aware that this is not working yet, this PR is a draft it's not quite ready to be merged

sdatkinson · 2023-05-07T16:46:33Z

this PR is a draft it's not quite ready to be merged

Right, apologies. Still an unintuitive feature to me (drafts that are visible to others) 😅

olilarkin · 2023-05-13T08:57:35Z

Possibly blocked by #254

sdatkinson · 2023-05-14T15:53:53Z

Possibly blocked by #254

If we want to add the entitlement to ~/Music/NeuralAmpModeler just to demonstrate that it works, then that's fine and we can pick up the details (eg ensuring its existence) in a follow-up PR.

Just in case that helps manage scope to this PR.

James-F2 · 2023-05-17T06:28:07Z

This glorious PR can't come fast enough. 😍
Windows explorer is slow as heck.

towner96 · 2023-05-17T19:57:21Z

Thank you! Great advancement. Loading nam files will be faster now.

jimc4893 · 2023-05-28T12:33:25Z

is this almost good to go?

Update iPlug2

olilarkin · 2023-05-29T13:05:37Z

@sdatkinson This is now ready for review. The model and IR path should be updated when the UI opens. There is a tonne of code clean-up around this and a bunch more UI rework that I would like to do, but one thing at a time I guess.

olilarkin · 2023-05-29T13:18:49Z

I would suggest that you don't squash-merge the PR and make a merge commit for the PR.

SoulReaverFan · 2023-06-08T12:33:18Z

Looking forward to this one! Hope it’s coming in the next update 🙂

sdatkinson · 2023-06-10T02:34:21Z

Deleted the comments with invalid issues.

Please excuse me--I had the wrong commit on my local clone 😅

Windows is looking good. macOS looking good in the DAW; currently checking the standalone.

sdatkinson · 2023-06-10T19:30:49Z

Update looking into macOS.

There seems to be an issue with loading models and IRs. The behavior is that after clicking "Open" on the file selection dialog, the dialog closes, but the standalone continues with no model loaded.

The model is located at /Users/steve/Documents/NAM Models/model.nam.

Putting a breakpoint in ProcessBlock, I see that mStagedNAM is still nullptr.

Looking closer, I've identified that loadModelCompletionHandler isn't visited after clicking "Open".

First guess would be that this is related to the entitlements issue Oli called out in a separate Issue.

Continuing to look, will update.

Looks like ScanDirectory() is the culprit. I'm going to venture a guess that opendir() in d.First() is returning a null (edit: yep) because it can't be accessed (presumably bc missing entitlements.)

If that's the case, then I'll be happy to approve this PR and address the entitlements next as I said 🙂 . We'll want to get it squared up before the next release. Might be able to get it today or this weekend yet.

sdatkinson

This introduces a bug where laoding NAMs and IRs on the macOS standalone is broken. This is probably because of entitlements and is more or less anticipated in #254.

But we'll merge this and tackle that next.

sdatkinson · 2023-06-10T01:49:45Z

NeuralAmpModeler/NeuralAmpModeler.cpp

@@ -207,6 +97,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
    pGraphics->AttachCornerResizer(EUIResizerMode::Scale, false);
    pGraphics->AttachPanelBackground(COLOR_BLACK);
    pGraphics->EnableMouseOver(true);
+    pGraphics->EnableTooltips(true);


sdatkinson · 2023-06-10T20:23:25Z

Update/Correction: Seems that Entitlements for the Music directory are already set.

Standalone works if the models are under the Music directory 😄 🎉

Question is how to inform users about this requirement. It will be a breaking change because users who have stored their models somewhere else will not be able to load them up at all anymore. Some modal would be great. I'll make an Issue for it.

This was referenced May 6, 2023

Cleanup IR bypass code, removing overlay control and using groups #235

Merged

[FEATURE] Open folder instead of single files #167

Closed

[FEATURE] Click through models in a directory #63

Closed

sdatkinson self-requested a review May 7, 2023 05:20

sdatkinson requested changes May 7, 2023

View reviewed changes

NeuralAmpModeler/NeuralAmpModeler.cpp Outdated Show resolved Hide resolved

NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj Show resolved Hide resolved

olilarkin force-pushed the nam-file-browser-control branch from a564c35 to 462fdb8 Compare May 7, 2023 15:57

olilarkin force-pushed the nam-file-browser-control branch 3 times, most recently from bbbc24d to 5149474 Compare May 10, 2023 19:00

Petervos2018 mentioned this pull request May 13, 2023

[FEATURE] Left And Right Navigation Arrows For Loading Files #253

Closed

olilarkin mentioned this pull request May 13, 2023

[FEATURE] There should be a pre-defined folder for nam/ir files (on macOS at least) #254

Open

olilarkin force-pushed the nam-file-browser-control branch 2 times, most recently from 5d99c65 to 643a469 Compare May 22, 2023 13:08

sdatkinson mentioned this pull request May 27, 2023

[FEATURE] Use "name" in metadata to populate model name string #264

Open

Update iPlug2 submodule

d5ee69e

Update iPlug2

olilarkin force-pushed the nam-file-browser-control branch 2 times, most recently from 082939a to 8ca8225 Compare May 29, 2023 09:17

olilarkin marked this pull request as ready for review May 29, 2023 09:20

olilarkin force-pushed the nam-file-browser-control branch 2 times, most recently from b76cf73 to 1a31ddb Compare May 29, 2023 10:04

olilarkin marked this pull request as draft May 29, 2023 10:19

olilarkin force-pushed the nam-file-browser-control branch 2 times, most recently from 341a00b to c7ace54 Compare May 29, 2023 12:35

olilarkin force-pushed the nam-file-browser-control branch from c7ace54 to b9c1919 Compare May 29, 2023 12:41

olilarkin added 5 commits May 29, 2023 14:54

Move custom controls to dedicated header

c037ec1

Enable tooltips

62c9c3e

Draw Round Squares in SquareButton

261f490

Introduce NAMFileBrowserControl & fix non-real-time safe code

bd850f1

Rename all custom controls

fbce0d6

olilarkin force-pushed the nam-file-browser-control branch from b9c1919 to fbce0d6 Compare May 29, 2023 12:56

olilarkin marked this pull request as ready for review May 29, 2023 13:02

Run clang-format

348f2be

olilarkin requested a review from sdatkinson May 29, 2023 13:19

This was referenced May 29, 2023

[FEATURE] Code cleanup. #267

Closed

Cleanup naming of methods and variables #268

Merged

xcactuzx mentioned this pull request Jun 7, 2023

This PR adds a new control NAMFileBrowserControl, which is used for the Model and IR loading. It #279

Closed

sdatkinson approved these changes Jun 10, 2023

View reviewed changes

sdatkinson merged commit 4bddb7f into sdatkinson:main Jun 10, 2023
2 checks passed

This was referenced Jun 10, 2023

[BUG] No input from standalone on macOS #280

Closed

[BUG] macOS standalone: Warn users with models not in Music/ directory #281

Closed

[BUG] Model and IR browsers don't open to their respective last folder #62

Closed

olilarkin deleted the nam-file-browser-control branch June 17, 2023 08:51

sdatkinson mentioned this pull request Jul 5, 2023

Please make "Select model" and "Select IR" text labels clickable, would improve GUI accessibility #124

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add NAMFileBrowserControl to group Model/IR loading controls #242

Add NAMFileBrowserControl to group Model/IR loading controls #242

olilarkin commented May 6, 2023 •

edited

Loading

sdatkinson left a comment

olilarkin commented May 7, 2023

sdatkinson commented May 7, 2023

olilarkin commented May 13, 2023

sdatkinson commented May 14, 2023

James-F2 commented May 17, 2023

towner96 commented May 17, 2023

jimc4893 commented May 28, 2023

olilarkin commented May 29, 2023 •

edited

Loading

olilarkin commented May 29, 2023

SoulReaverFan commented Jun 8, 2023

sdatkinson commented Jun 10, 2023

sdatkinson commented Jun 10, 2023 •

edited

Loading

sdatkinson left a comment

sdatkinson Jun 10, 2023

sdatkinson commented Jun 10, 2023

Add NAMFileBrowserControl to group Model/IR loading controls #242

Add NAMFileBrowserControl to group Model/IR loading controls #242

Conversation

olilarkin commented May 6, 2023 • edited Loading

sdatkinson left a comment

Choose a reason for hiding this comment

olilarkin commented May 7, 2023

sdatkinson commented May 7, 2023

olilarkin commented May 13, 2023

sdatkinson commented May 14, 2023

James-F2 commented May 17, 2023

towner96 commented May 17, 2023

jimc4893 commented May 28, 2023

olilarkin commented May 29, 2023 • edited Loading

olilarkin commented May 29, 2023

SoulReaverFan commented Jun 8, 2023

sdatkinson commented Jun 10, 2023

sdatkinson commented Jun 10, 2023 • edited Loading

sdatkinson left a comment

Choose a reason for hiding this comment

sdatkinson Jun 10, 2023

Choose a reason for hiding this comment

sdatkinson commented Jun 10, 2023

olilarkin commented May 6, 2023 •

edited

Loading

olilarkin commented May 29, 2023 •

edited

Loading

sdatkinson commented Jun 10, 2023 •

edited

Loading