New session dialog fixups:

 - The name specified on the command line for the new
   session comes up in the dialog
 - The editor will not appear below the NSD at startup

Command line parameter fixups:
 - You can't specify both a new session and a old
   session to load at the same time.
 - Ardour will abort if command line parameters are
   incorrect

Declick faster. Fixes audible and annoying volume ramps 
when running ardour at large buffer sizes.

Make it impossible to arm tracks which have un-connected
inputs.




git-svn-id: svn://localhost/ardour2/trunk@765 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 1 deletions

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index 69b8128824..fcd62de512 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -143,14 +143,19 @@ GTK_ARDOUR::parse_opts (int argc, char *argv[])
 			break;
 
 		default:
-			break;
+			return print_help(execname);
 		}
 	}
 
 	if (optind < argc) {
+		if (new_session) {
+			cerr << "Illogical combination: you can either create a new session, or a load an existing session but not both!" << endl;
+			return print_help(execname);
+		}
 		session_name = argv[optind++];
 	}
 
+
 	return 0;
 }