projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix compiler warning
[ardour.git]
/
gtk2_ardour
/
opts.cc
diff --git
a/gtk2_ardour/opts.cc
b/gtk2_ardour/opts.cc
index b5075daa2f3622679e613a1ac50801de0ec5ea08..c3becd1471212dd9e3468cc9377744e719307f01 100644
(file)
--- a/
gtk2_ardour/opts.cc
+++ b/
gtk2_ardour/opts.cc
@@
-34,16
+34,19
@@
using namespace std;
string ARDOUR_COMMAND_LINE::session_name = "";
string ARDOUR_COMMAND_LINE::jack_client_name = "ardour";
bool ARDOUR_COMMAND_LINE::show_key_actions = false;
string ARDOUR_COMMAND_LINE::session_name = "";
string ARDOUR_COMMAND_LINE::jack_client_name = "ardour";
bool ARDOUR_COMMAND_LINE::show_key_actions = false;
-bool ARDOUR_COMMAND_LINE::no_splash =
tru
e;
+bool ARDOUR_COMMAND_LINE::no_splash =
fals
e;
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::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 */
string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */
-
Glib::u
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;
string ARDOUR_COMMAND_LINE::immediate_save;
bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false;
string ARDOUR_COMMAND_LINE::immediate_save;
+string ARDOUR_COMMAND_LINE::jack_session_uuid;
+string ARDOUR_COMMAND_LINE::load_template;
using namespace ARDOUR_COMMAND_LINE;
using namespace ARDOUR_COMMAND_LINE;
@@
-58,12
+61,12
@@
print_help (const char *execname)
<< _(" -c, --name <name> Use a specific jack client name, default is ardour\n")
<< _(" -d, --disable-plugins Disable all plugins in an existing session\n")
<< _(" -D, --debug <options> Set debug flags. Use \"-D list\" to see available options\n")
<< _(" -c, --name <name> Use a specific jack client name, default is ardour\n")
<< _(" -d, --disable-plugins Disable all plugins in an existing session\n")
<< _(" -D, --debug <options> Set debug flags. Use \"-D list\" to see available options\n")
- << _(" -n, --
show-splash S
how splash screen\n")
- << _(" -m, --menus file Use \"file\"
for Ardour
menus\n")
+ << _(" -n, --
no-splash Do not s
how splash screen\n")
+ << _(" -m, --menus file Use \"file\"
to define
menus\n")
<< _(" -N, --new session-name Create a new session from the command line\n")
<< _(" -O, --no-hw-optimizations Disable h/w specific optimizations\n")
<< _(" -S, --sync Draw the gui synchronously \n")
<< _(" -N, --new session-name Create a new session from the command line\n")
<< _(" -O, --no-hw-optimizations Disable h/w specific optimizations\n")
<< _(" -S, --sync Draw the gui synchronously \n")
-#ifdef VST_SUPPORT
+#ifdef
WINDOWS_
VST_SUPPORT
<< _(" -V, --novst Do not use VST support\n")
#endif
<< _(" -E, --save <file> Load the specified session, save it to <file> and then quit\n")
<< _(" -V, --novst Do not use VST support\n")
#endif
<< _(" -E, --save <file> Load the specified session, save it to <file> and then quit\n")
@@
-77,7
+80,7
@@
print_help (const char *execname)
int
ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
{
int
ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
{
- const char *optstring = "bc:C:dD:hk:E:m:N:nOp:
S
U:vV";
+ const char *optstring = "bc:C:dD:hk:E:m:N:nOp:
PST:
U:vV";
const char *execname = strrchr (argv[0], '/');
if (getenv ("ARDOUR_SAE")) {
const char *execname = strrchr (argv[0], '/');
if (getenv ("ARDOUR_SAE")) {
@@
-95,8
+98,9
@@
ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
{ "version", 0, 0, 'v' },
{ "help", 0, 0, 'h' },
{ "bindings", 0, 0, 'b' },
{ "version", 0, 0, 'v' },
{ "help", 0, 0, 'h' },
{ "bindings", 0, 0, 'b' },
+ { "disable-plugins", 1, 0, 'd' },
{ "debug", 1, 0, 'D' },
{ "debug", 1, 0, 'D' },
- { "
show
-splash", 0, 0, 'n' },
+ { "
no
-splash", 0, 0, 'n' },
{ "menus", 1, 0, 'm' },
{ "name", 1, 0, 'c' },
{ "novst", 0, 0, 'V' },
{ "menus", 1, 0, 'm' },
{ "name", 1, 0, 'c' },
{ "novst", 0, 0, 'V' },
@@
-105,6
+109,9
@@
ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
{ "sync", 0, 0, 'S' },
{ "curvetest", 1, 0, 'C' },
{ "save", 1, 0, 'E' },
{ "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 }
};
{ 0, 0, 0, 0 }
};
@@
-139,17
+146,17
@@
ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
break;
case 'D':
break;
case 'D':
- if (
ARDOUR
::parse_debug_options (optarg)) {
+ if (
PBD
::parse_debug_options (optarg)) {
exit (0);
}
break;
exit (0);
}
break;
-
+
case 'm':
menus_file = optarg;
break;
case 'n':
case 'm':
menus_file = optarg;
break;
case 'n':
- no_splash =
fals
e;
+ no_splash =
tru
e;
break;
case 'p':
break;
case 'p':
@@
-160,6
+167,9
@@
ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
case 'S':
// ; just pass this through to gtk it will figure it out
break;
case 'S':
// ; just pass this through to gtk it will figure it out
break;
+ case 'T':
+ load_template = optarg;
+ break;
case 'N':
new_session = true;
case 'N':
new_session = true;
@@
-170,10
+180,14
@@
ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
try_hw_optimization = false;
break;
try_hw_optimization = false;
break;
+ case 'P':
+ no_connect_ports = true;
+ break;
+
case 'V':
case 'V':
-#ifdef VST_SUPPORT
+#ifdef
WINDOWS_
VST_SUPPORT
use_vst = false;
use_vst = false;
-#endif /* VST_SUPPORT */
+#endif /*
WINDOWS_
VST_SUPPORT */
break;
case 'c':
break;
case 'c':
@@
-192,6
+206,10
@@
ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
immediate_save = optarg;
break;
immediate_save = optarg;
break;
+ case 'U':
+ jack_session_uuid = optarg;
+ break;
+
default:
return print_help(execname);
}
default:
return print_help(execname);
}