diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-05 12:00:42 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-05 12:00:42 -0400 |
| commit | fcf7530676f840e4444213a27afb53255010d0d8 (patch) | |
| tree | 9066930357fdb73427c259e673f76dd6e5e46453 | |
| parent | 55a10480945f2a41fe6cfda2173bed12d3d5bc89 (diff) | |
| parent | 11747ab16c873412c667a8876d12c2232f58ffa2 (diff) | |
Merge branch 'nsm' of https://github.com/royvegard/ardour
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/nsm.cc | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ac7e493fe3..c29c8136a0 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -689,7 +689,6 @@ ARDOUR_UI::startup () // nsm requires these actions disabled vector<string> action_names; - action_names.push_back("Snapshot"); action_names.push_back("SaveAs"); action_names.push_back("Rename"); action_names.push_back("New"); diff --git a/gtk2_ardour/nsm.cc b/gtk2_ardour/nsm.cc index 7c5fcfbf6e..08c1636025 100644 --- a/gtk2_ardour/nsm.cc +++ b/gtk2_ardour/nsm.cc @@ -51,7 +51,6 @@ NSM_Client::command_open(const char *name, ARDOUR_COMMAND_LINE::session_name = name; ARDOUR_COMMAND_LINE::jack_client_name = client_id; - ARDOUR_COMMAND_LINE::no_connect_ports = true; if (ARDOUR_UI::instance()->get_session_parameters(true, false, "")) { return ERR_GENERAL; |