Switch to nativefiledialog from frogtoss. Better handling of SampledAudioNode in UI

Author: meshula

CMakeLists.txt

@@ -159,9 +159,18 @@ endforeach()
 add_custom_target(ProcessPlaygroundShaderFiles ALL DEPENDS ${PLAYGROUND_SHADERS_SRC})
 
 if(APPLE)
-    set(NFD src/nfd.h src/nfd.mm)
+    set(NFD third/nativefiledialog/include/nfd.h 
+        third/nativefiledialog/nfd_cocoa_arc.m third/nativefiledialog/nfd_common.c
+        third/nativefiledialog/nfd_common.h)
+elseif(WIN32)
+    set(NFD third/nativefiledialog/include/nfd.h 
+        third/nativefiledialog/nfd_win.cpp third/nativefiledialog/nfd_common.c
+        third/nativefiledialog/nfd_common.h)
 else()
-    set(NFD src/nfd.h src/nfd.cc)
+    # nb: there is a zenity variant, but haven't had a call for it yet
+    set(NFD third/nativefiledialog/include/nfd.h
+        third/nativefiledialog/nfd_gtk.cpp third/nativefiledialog/nfd_common.c
+        third/nativefiledialog/nfd_common.h)
 endif()
 
 add_executable(LabSoundGraphToy
@@ -191,6 +200,7 @@ target_include_directories(LabSoundGraphToy SYSTEM
 target_include_directories(LabSoundGraphToy
     PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/generated_src"
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/third/nativefiledialog/include"
     PRIVATE third/imgui/examples)
 
 set_property(TARGET LabSoundGraphToy PROPERTY CXX_STANDARD 17)

src/LabSoundInterface.cpp

@@ -424,17 +424,25 @@ void LabSoundProvider::node_start_stop(ln_Node node_id, float when)
     if (!in_node)
         return;
 
-    lab::AudioScheduledSourceNode* n = dynamic_cast<lab::AudioScheduledSourceNode*>(in_node.get());
-    if (n)
-    {
-        if (n->isPlayingOrScheduled()) {
-            printf("Stop %lld\n", node_id.id);
-            n->stop(when);
-        }
-        else {
-            printf("Start %lld\n", node_id.id);
-            n->start(when);
-        }
+    lab::SampledAudioNode* san =
+        dynamic_cast<lab::SampledAudioNode*>(in_node.get());
+    if (san) {
+        san->schedule(0);
+        return;
+    }
+
+    lab::AudioScheduledSourceNode* n =
+        dynamic_cast<lab::AudioScheduledSourceNode*>(in_node.get());
+    if (!n)
+        return;
+    
+    if (n->isPlayingOrScheduled()) {
+        printf("Stop %lld\n", node_id.id);
+        n->stop(when);
+    }
+    else {
+        printf("Start %lld\n", node_id.id);
+        n->start(when);
     }
 }
 

src/lab_noodle.cpp

@@ -817,7 +817,8 @@ namespace noodle {
             {
                 if (ImGui::Button("Load Audio File..."))
                 {
-                    const char* file = noc_file_dialog_open(NOC_FILE_DIALOG_OPEN, "*.*", ".", "*.*");
+                    char* file = nullptr;
+                    nfdresult_t open_result = NFD_OpenDialog("", "", &file);
                     if (file)
                     {
                         {

src/main.cpp

@@ -307,7 +307,8 @@ void frame()
             {
                 if (ImGui::Button("Save and Quit"))
                 {
-                    const char* file = noc_file_dialog_open(NOC_FILE_DIALOG_SAVE, "*.ls", ".", "*.*");
+                    char* file = nullptr;
+                    nfdresult_t result = NFD_SaveDialog("*.ls", "", &file);
                     if (file)
                     {
                         config.save(file);
@@ -345,7 +346,8 @@ void frame()
             {
                 if (ImGui::Button("Save work in progress"))
                 {
-                    const char* file = noc_file_dialog_open(NOC_FILE_DIALOG_SAVE, "*.ls", ".", "*.*");
+                    char* file = nullptr;
+                    nfdresult_t result = NFD_SaveDialog("*.ls", "", &file);
                     if (file)
                     {
                         config.save(file);
@@ -377,7 +379,8 @@ void frame()
 
     case Command::Save:
     {
-        const char* file = noc_file_dialog_open(NOC_FILE_DIALOG_SAVE, "*.ls\0", ".", "*.*");
+        char* file = nullptr;
+        nfdresult_t result = NFD_SaveDialog("*.ls", "", &file);
         if (file)
         {
             config.save(file);
@@ -388,7 +391,8 @@ void frame()
 
     case Command::ExportCpp:
     {
-        const char* file = noc_file_dialog_open(NOC_FILE_DIALOG_SAVE, "*.cpp\0", ".", "*.*");
+        char* file = nullptr;
+        nfdresult_t result = NFD_SaveDialog("*.cpp", "", &file);
         if (file)
         {
             config.export_cpp(file);
@@ -405,7 +409,8 @@ void frame()
             {
                 if (ImGui::Button("Save work in progress?"))
                 {
-                    const char* file = noc_file_dialog_open(NOC_FILE_DIALOG_SAVE, "*.ls", ".", "*.*");
+                    char* file = nullptr;
+                    nfdresult_t result = NFD_SaveDialog("*.ls", "", &file);
                     if (file)
                     {
                         config.save(file);
@@ -431,7 +436,8 @@ void frame()
         {
             command = Command::None;
         }
-        const char* file = noc_file_dialog_open(NOC_FILE_DIALOG_OPEN, "*.ls", ".", "*.*");
+        char* file = nullptr;
+        nfdresult_t result = NFD_OpenDialog("*.ls", "", &file);
         if (file)
         {
             config.clear_all();