use ActionManager namespace, rather than ActionMap objects, and remove all per-contex...

[ardour.git] / gtk2_ardour / nsm.cc

diff --git a/gtk2_ardour/nsm.cc b/gtk2_ardour/nsm.cc
index a208d4a3b2698896df37c29c9ff89a80451ccb7e..acbc7529d01bb56007b94306baee1960bf634bce 100644 (file)
--- a/gtk2_ardour/nsm.cc
+++ b/gtk2_ardour/nsm.cc
@@ -33,27 +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;
+       int r = ERR_OK;
 
-    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;
 
-    if (ARDOUR_UI::instance()->get_session_parameters(true, false, "")) {
-        return ERR_GENERAL;
-    }
-    return r;
+       if (ARDOUR_UI::instance()->get_session_parameters(true, false, "")) {
+               return ERR_GENERAL;
+       }
+       return r;
 }