zynaddsubfx

commit e8a656ade4e651a54c67d200015ea47f6a4c64c4
parent 8af16d3da210dd84ba6741c63045a98613ed9ad0
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Tue, 15 Nov 2016 19:55:59 -0500

Merge branch 'nsm-fix'

Diffstat:
M
src/UI/NSM.C
 | 
33
++++++++++++---------------------
M
src/UI/NSM.H
 | 
4
+++-
M
src/main.cpp
 | 
2
+-

3 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/src/UI/NSM.C b/src/UI/NSM.C
@@ -22,7 +22,7 @@
 
 #include "../Nio/Nio.h"
 
-#ifndef NO_UI
+#if defined(FLTK_UI) || defined(NTK_UI)
 #include <FL/Fl.H>
 #endif
 #include <cstdio>
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 extern int Pexitprogram;
-#ifndef NO_UI
+#if defined(FLTK_UI) || defined(NTK_UI)
 #include "MasterUI.h"
 extern MasterUI *ui;
 #endif
@@ -41,10 +41,11 @@ extern MasterUI *ui;
 extern NSM_Client *nsm;
 extern char       *instance_name;
 
-NSM_Client::NSM_Client()
+NSM_Client::NSM_Client(MiddleWare *m)
+    :project_filename(0),
+     display_name(0),
+     middleware(m)
 {
-    project_filename = 0;
-    display_name     = 0;
 }
 
 int command_open(const char *name,
@@ -59,9 +60,7 @@ NSM_Client::command_save(char **out_msg)
     (void) out_msg;
     int r = ERR_OK;
 
-#ifndef NO_UI 
-    ui->do_save_master(project_filename);
-#endif
+    middleware->transmitMsg("/save_xmz", "s", project_filename);
 
     return r;
 }
@@ -92,18 +91,10 @@ NSM_Client::command_open(const char *name,
 
     int r = ERR_OK;
 
-#ifndef NO_UI
-    if(0 == stat(new_filename, &st)) {
-        if(ui->do_load_master_unconditional(new_filename, display_name) < 0) {
-            *out_msg = strdup("Failed to load for unknown reason");
-            r = ERR_GENERAL;
-
-            return r;
-        }
-    }
+    if(0 == stat(new_filename, &st))
+        middleware->transmitMsg("/load_xmz", "s", new_filename);
     else
-        ui->do_new_master_unconditional();
-#endif
+        middleware->transmitMsg("/reset_master", "");
 
     if(project_filename)
         free(project_filename);
@@ -118,7 +109,7 @@ NSM_Client::command_open(const char *name,
     return r;
 }
 
-#ifndef NO_UI
+#if defined(FLTK_UI) || defined(NTK_UI)
 static void save_callback(Fl_Widget *, void *v)
 {
     MasterUI *ui = static_cast<MasterUI*>(v);
@@ -129,7 +120,7 @@ static void save_callback(Fl_Widget *, void *v)
 void
 NSM_Client::command_active(bool active)
 {
-#ifndef NO_UI 
+#if defined(FLTK_UI) || defined(NTK_UI)
     if(active) {
         Fl_Menu_Item *m;
         //TODO see if there is a cleaner way of doing this without voiding
diff --git a/src/UI/NSM.H b/src/UI/NSM.H
@@ -21,6 +21,7 @@
 
 #if USE_NSM
 #include "NSM/Client.H"
+#include "../Misc/MiddleWare.h"
 
 class NSM_Client:public NSM::Client
 {
@@ -28,8 +29,9 @@ class NSM_Client:public NSM::Client
 
         char *project_filename;
         char *display_name;
+        MiddleWare *middleware;
 
-        NSM_Client();
+        NSM_Client(MiddleWare *m);
         ~NSM_Client() { }
 
     protected:
diff --git a/src/main.cpp b/src/main.cpp
@@ -609,7 +609,7 @@ int wmidi = -1;
     char *nsm_url = getenv("NSM_URL");
 
     if(nsm_url) {
-        nsm = new NSM_Client;
+        nsm = new NSM_Client(middleware);
 
         if(!nsm->init(nsm_url))
             nsm->announce("ZynAddSubFX", ":switch:", argv[0]);