summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/ardour_ui.cc5
-rw-r--r--gtk2_ardour/main.cc4
-rw-r--r--gtk2_ardour/opts.cc23
-rw-r--r--gtk2_ardour/opts.h3
4 files changed, 0 insertions, 35 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 12f5e46e2e..6a20b44071 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -3501,11 +3501,6 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
exit (EXIT_FAILURE);
}
- if (!ARDOUR_COMMAND_LINE::immediate_save.empty()) {
- _session->save_state (ARDOUR_COMMAND_LINE::immediate_save, false);
- exit (EXIT_FAILURE);
- }
-
/* clear this to avoid endless attempts to load the
same session.
*/
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index c4611179e3..ea75744f51 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -393,10 +393,6 @@ int main (int argc, char *argv[])
exit (EXIT_FAILURE);
}
- if (curvetest_file) {
- return curvetest (curvetest_file);
- }
-
#ifndef PLATFORM_WINDOWS
if (::signal (SIGPIPE, sigpipe_handler)) {
cerr << _("Cannot xinstall SIGPIPE error handler") << endl;
diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index 172e103a10..3860434263 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -37,20 +37,17 @@ using namespace std;
string ARDOUR_COMMAND_LINE::session_name = "";
string ARDOUR_COMMAND_LINE::backend_client_name = "ardour";
-string ARDOUR_COMMAND_LINE::backend_session_uuid;
bool ARDOUR_COMMAND_LINE::show_key_actions = false;
bool ARDOUR_COMMAND_LINE::show_actions = false;
bool ARDOUR_COMMAND_LINE::no_splash = false;
bool ARDOUR_COMMAND_LINE::just_version = false;
bool ARDOUR_COMMAND_LINE::use_vst = true;
bool ARDOUR_COMMAND_LINE::new_session = false;
-char* ARDOUR_COMMAND_LINE::curvetest_file = 0;
bool ARDOUR_COMMAND_LINE::try_hw_optimization = true;
bool ARDOUR_COMMAND_LINE::no_connect_ports = false;
string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */
std::string ARDOUR_COMMAND_LINE::menus_file = "ardour.menus";
bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false;
-string ARDOUR_COMMAND_LINE::immediate_save;
string ARDOUR_COMMAND_LINE::load_template;
bool ARDOUR_COMMAND_LINE::check_announcements = true;
@@ -72,14 +69,10 @@ print_help (const char *execname)
<< _(" -b, --bindings Display all current key bindings\n")
<< _(" -B, --bypass-plugins Bypass all plugins in an existing session\n")
<< _(" -c, --name <name> Use a specific backend client name, default is ardour\n")
-#ifndef NDEBUG
- << _(" -C, --curvetest filename Curve algorithm debugger\n")
-#endif
<< _(" -d, --disable-plugins Disable all plugins (safe mode)\n")
#ifndef NDEBUG
<< _(" -D, --debug <options> Set debug flags. Use \"-D list\" to see available options\n")
#endif
- << _(" -E, --save <file> Load the specified session, save it to <file> and then quit\n")
<< _(" -h, --help Print this message\n")
<< _(" -k, --keybindings <file> Name of key bindings to load\n")
<< _(" -m, --menus file Use \"file\" to define menus\n")
@@ -89,7 +82,6 @@ print_help (const char *execname)
<< _(" -P, --no-connect-ports Do not connect any ports at startup\n")
<< _(" -S, --sync Draw the GUI synchronously\n")
<< _(" -T, --template <name> Use given template for new session\n")
- << _(" -U, --uuid <uuid> Set (jack) backend UUID\n")
<< _(" -v, --version Print version and exit\n")
#ifdef WINDOWS_VST_SUPPORT
<< _(" -V, --novst Disable WindowsVST support\n")
@@ -130,9 +122,6 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
{ "new", 1, 0, 'N' },
{ "no-hw-optimizations", 0, 0, 'O' },
{ "sync", 0, 0, 'S' },
- { "curvetest", 1, 0, 'C' },
- { "save", 1, 0, 'E' },
- { "uuid", 1, 0, 'U' },
{ "template", 1, 0, 'T' },
{ "no-connect-ports", 0, 0, 'P' },
{ 0, 0, 0, 0 }
@@ -234,22 +223,10 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
backend_client_name = optarg;
break;
- case 'C':
- curvetest_file = optarg;
- break;
-
case 'k':
keybindings_path = optarg;
break;
- case 'E':
- immediate_save = optarg;
- break;
-
- case 'U':
- backend_session_uuid = optarg;
- break;
-
default:
return print_help(execname);
}
diff --git a/gtk2_ardour/opts.h b/gtk2_ardour/opts.h
index b95d931cc7..ee24572bc1 100644
--- a/gtk2_ardour/opts.h
+++ b/gtk2_ardour/opts.h
@@ -30,17 +30,14 @@ extern bool show_actions;
extern bool no_splash;
extern bool just_version;
extern std::string backend_client_name;
-extern std::string backend_session_uuid;
extern bool use_vst;
extern bool new_session;
-extern char* curvetest_file;
extern bool try_hw_optimization;
extern bool no_connect_ports;
extern bool use_gtk_theme;
extern std::string keybindings_path;
extern std::string menus_file;
extern bool finder_invoked_ardour;
-extern std::string immediate_save;
extern std::string load_template;
extern bool check_announcements;