smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

remove -C,-E and -U command line options

Browse source
This commit is contained in:
Paul Davis 2019-07-18 14:01:09 -06:00
parent b058356d1e
commit 0d1d6d6975
4 changed files with 0 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/ardour_ui.cc
View file

@ -3501,11 +3501,6 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
exit (EXIT_FAILURE); 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 /* clear this to avoid endless attempts to load the
same session. same session.
*/ */

4
gtk2_ardour/main.cc
View file

@ -393,10 +393,6 @@ int main (int argc, char *argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
if (curvetest_file) {
return curvetest (curvetest_file);
}
#ifndef PLATFORM_WINDOWS #ifndef PLATFORM_WINDOWS
if (::signal (SIGPIPE, sigpipe_handler)) { if (::signal (SIGPIPE, sigpipe_handler)) {
cerr << _("Cannot xinstall SIGPIPE error handler") << endl; cerr << _("Cannot xinstall SIGPIPE error handler") << endl;

23
gtk2_ardour/opts.cc
View file

@ -37,20 +37,17 @@ using namespace std;
string ARDOUR_COMMAND_LINE::session_name = ""; string ARDOUR_COMMAND_LINE::session_name = "";
string ARDOUR_COMMAND_LINE::backend_client_name = "ardour"; 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_key_actions = false;
bool ARDOUR_COMMAND_LINE::show_actions = false; bool ARDOUR_COMMAND_LINE::show_actions = false;
bool ARDOUR_COMMAND_LINE::no_splash = false; bool ARDOUR_COMMAND_LINE::no_splash = false;
bool ARDOUR_COMMAND_LINE::just_version = false; bool ARDOUR_COMMAND_LINE::just_version = false;
bool ARDOUR_COMMAND_LINE::use_vst = true; bool ARDOUR_COMMAND_LINE::use_vst = true;
bool ARDOUR_COMMAND_LINE::new_session = false; 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::try_hw_optimization = true;
bool ARDOUR_COMMAND_LINE::no_connect_ports = false; bool ARDOUR_COMMAND_LINE::no_connect_ports = false;
string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */ string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */
std::string ARDOUR_COMMAND_LINE::menus_file = "ardour.menus"; std::string ARDOUR_COMMAND_LINE::menus_file = "ardour.menus";
bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false; bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false;
string ARDOUR_COMMAND_LINE::immediate_save;
string ARDOUR_COMMAND_LINE::load_template; string ARDOUR_COMMAND_LINE::load_template;
bool ARDOUR_COMMAND_LINE::check_announcements = true; 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, --bindings Display all current key bindings\n")
<< _(" -B, --bypass-plugins Bypass all plugins in an existing session\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") << _(" -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") << _(" -d, --disable-plugins Disable all plugins (safe mode)\n")
#ifndef NDEBUG #ifndef NDEBUG
<< _(" -D, --debug <options> Set debug flags. Use \"-D list\" to see available options\n") << _(" -D, --debug <options> Set debug flags. Use \"-D list\" to see available options\n")
#endif #endif
<< _(" -E, --save <file> Load the specified session, save it to <file> and then quit\n")
<< _(" -h, --help Print this message\n") << _(" -h, --help Print this message\n")
<< _(" -k, --keybindings <file> Name of key bindings to load\n") << _(" -k, --keybindings <file> Name of key bindings to load\n")
<< _(" -m, --menus file Use \"file\" to define menus\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") << _(" -P, --no-connect-ports Do not connect any ports at startup\n")
<< _(" -S, --sync Draw the GUI synchronously\n") << _(" -S, --sync Draw the GUI synchronously\n")
<< _(" -T, --template <name> Use given template for new session\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") << _(" -v, --version Print version and exit\n")
#ifdef WINDOWS_VST_SUPPORT #ifdef WINDOWS_VST_SUPPORT
<< _(" -V, --novst Disable WindowsVST support\n") << _(" -V, --novst Disable WindowsVST support\n")
@ -130,9 +122,6 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
{ "new", 1, 0, 'N' }, { "new", 1, 0, 'N' },
{ "no-hw-optimizations", 0, 0, 'O' }, { "no-hw-optimizations", 0, 0, 'O' },
{ "sync", 0, 0, 'S' }, { "sync", 0, 0, 'S' },
{ "curvetest", 1, 0, 'C' },
{ "save", 1, 0, 'E' },
{ "uuid", 1, 0, 'U' },
{ "template", 1, 0, 'T' }, { "template", 1, 0, 'T' },
{ "no-connect-ports", 0, 0, 'P' }, { "no-connect-ports", 0, 0, 'P' },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
@ -234,22 +223,10 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
backend_client_name = optarg; backend_client_name = optarg;
break; break;
case 'C':
curvetest_file = optarg;
break;
case 'k': case 'k':
keybindings_path = optarg; keybindings_path = optarg;
break; break;
case 'E':
immediate_save = optarg;
break;
case 'U':
backend_session_uuid = optarg;
break;
default: default:
return print_help(execname); return print_help(execname);
} }

3
gtk2_ardour/opts.h
View file

@ -30,17 +30,14 @@ extern bool show_actions;
extern bool no_splash; extern bool no_splash;
extern bool just_version; extern bool just_version;
extern std::string backend_client_name; extern std::string backend_client_name;
extern std::string backend_session_uuid;
extern bool use_vst; extern bool use_vst;
extern bool new_session; extern bool new_session;
extern char* curvetest_file;
extern bool try_hw_optimization; extern bool try_hw_optimization;
extern bool no_connect_ports; extern bool no_connect_ports;
extern bool use_gtk_theme; extern bool use_gtk_theme;
extern std::string keybindings_path; extern std::string keybindings_path;
extern std::string menus_file; extern std::string menus_file;
extern bool finder_invoked_ardour; extern bool finder_invoked_ardour;
extern std::string immediate_save;
extern std::string load_template; extern std::string load_template;
extern bool check_announcements; extern bool check_announcements;