Consider size of port matrix column labels for size of row labels

[ardour.git] / gtk2_ardour / nsm.cc

diff --git a/gtk2_ardour/nsm.cc b/gtk2_ardour/nsm.cc
index 295022ac9aca01b19b2501e7db1bab9d9fa42d77..acbc7529d01bb56007b94306baee1960bf634bce 100644 (file)
--- a/gtk2_ardour/nsm.cc
+++ b/gtk2_ardour/nsm.cc
@@ -23,8 +23,6 @@
 #include "ardour_ui.h"
 
 #include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 
@@ -35,33 +33,27 @@ NSM_Client::NSM_Client()
 int
 NSM_Client::command_save(char **out_msg)
 {
-    (void) out_msg;
+       (void) out_msg;
 
-    ARDOUR_UI::instance()->save_state();
-    int r = ERR_OK;
+       ARDOUR_UI::instance()->save_state();
+       int r = ERR_OK;
 
-    return r;
+       return r;
 }
 
 int
-NSM_Client::command_open(const char *name,
-                         const char *display_name,
-                         const char *client_id,
-                         char **out_msg)
+NSM_Client::command_open(const char* name,
+                         const char* /*display_name*/,
+                         const char* client_id,
+                         char** /*out_msg*/)
 {
-    int r = ERR_OK;
-    struct stat buffer;
+       int r = ERR_OK;
 
-    ARDOUR_COMMAND_LINE::new_session = true;
-    ARDOUR_COMMAND_LINE::session_name = name;
-    ARDOUR_COMMAND_LINE::jack_client_name = client_id;
+       ARDOUR_COMMAND_LINE::session_name = name;
+       ARDOUR_COMMAND_LINE::backend_client_name = client_id;
 
-    int f = stat(name, &buffer);
-
-    if (f == 0 && S_ISDIR(buffer.st_mode))
-    {
-        ARDOUR_COMMAND_LINE::new_session = false;
-    }
-
-    return r;
+       if (ARDOUR_UI::instance()->get_session_parameters(true, false, "")) {
+               return ERR_GENERAL;
+       }
+       return r;
 }