From 7c45502f461bf62c25a109fe347e71c9a1aa33e4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 10 Aug 2021 15:47:49 +0200 Subject: [PATCH] Remove --novst option It was for windows only, and nobody on MS Windows will launch Ardour from the commandline with a --novst switch. In the past it was potentially useful for linux/wine builds --- gtk2_ardour/opts.cc | 14 +------------- gtk2_ardour/opts.h | 19 +++++++++---------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc index 326085b856..4e49666a19 100644 --- a/gtk2_ardour/opts.cc +++ b/gtk2_ardour/opts.cc @@ -46,7 +46,6 @@ 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; bool ARDOUR_COMMAND_LINE::try_hw_optimization = true; bool ARDOUR_COMMAND_LINE::no_connect_ports = false; @@ -88,21 +87,17 @@ print_help (const char *execname) << _(" -S, --sync Draw the GUI synchronously\n") << _(" -T, --template Use given template for new session\n") << _(" -v, --version Print version and exit\n") -#ifdef WINDOWS_VST_SUPPORT - << _(" -V, --novst Disable WindowsVST support\n") -#endif << "\n\n" << _("Report bugs to http://tracker.ardour.org\n") << _("Website http://ardour.org\n") ; return 1; - } int ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) { - const char *optstring = "aAbBc:C:dD:hHk:E:m:N:nOp:PST:U:vV"; + const char *optstring = "aAbBc:C:dD:hHk:E:m:N:nOp:PST:U:v"; const char *execname = strrchr (argv[0], '/'); if (execname == 0) { @@ -123,7 +118,6 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) { "no-splash", 0, 0, 'n' }, { "menus", 1, 0, 'm' }, { "name", 1, 0, 'c' }, - { "novst", 0, 0, 'V' }, { "new", 1, 0, 'N' }, { "no-hw-optimizations", 0, 0, 'O' }, { "sync", 0, 0, 'S' }, @@ -220,12 +214,6 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) no_connect_ports = true; break; - case 'V': -#ifdef WINDOWS_VST_SUPPORT - use_vst = false; -#endif /* WINDOWS_VST_SUPPORT */ - break; - case 'c': backend_client_name = optarg; break; diff --git a/gtk2_ardour/opts.h b/gtk2_ardour/opts.h index d132791167..aa47b30b23 100644 --- a/gtk2_ardour/opts.h +++ b/gtk2_ardour/opts.h @@ -26,19 +26,18 @@ namespace ARDOUR_COMMAND_LINE { extern std::string session_name; -extern bool show_key_actions; -extern bool show_actions; -extern bool no_splash; -extern bool just_version; +extern bool show_key_actions; +extern bool show_actions; +extern bool no_splash; +extern bool just_version; extern std::string backend_client_name; -extern bool use_vst; -extern bool new_session; -extern bool try_hw_optimization; -extern bool no_connect_ports; -extern bool use_gtk_theme; +extern bool new_session; +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 bool finder_invoked_ardour; extern std::string load_template; extern bool check_announcements;