Fix rulers sometimes not refreshed on zoom, only auto connect physical inputs to tracks (was SAE only, now applies to all), prettify initial display for first run.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4113 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 19 insertions, 21 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index cb1ae4592d..06446aefb5 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4418,22 +4418,20 @@ Editor::idle_visual_changer ()
 	VisualChange::Type p = pending_visual_change.pending;
 	pending_visual_change.pending = (VisualChange::Type) 0;
 
-
+	double last_time_origin = horizontal_adjustment.get_value();
 	if (p & VisualChange::ZoomLevel) {
 		set_frames_per_unit (pending_visual_change.frames_per_unit);
 	}
 
 	if (p & VisualChange::TimeOrigin) {
-		double current_time_origin = horizontal_adjustment.get_value();
 		horizontal_adjustment.set_value (pending_visual_change.time_origin / frames_per_unit);
-
-		if (current_time_origin == pending_visual_change.time_origin) {
-			/* changed signal not emitted */
-			update_fixed_rulers ();
-			redisplay_tempo (true);
-		}
 	}
 
+	if (last_time_origin == horizontal_adjustment.get_value() ) {
+		/* changed signal not emitted */
+		update_fixed_rulers ();
+		redisplay_tempo (true);
+	}
 	//cerr << "Editor::idle_visual_changer () called ha v:l:u:ps:fpu = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << frames_per_unit << endl;//DEBUG
 	pending_visual_change.idle_handler_id = -1;
 	return 0; /* this is always a one-shot call */
diff --git a/instant.xml.sae b/instant.xml.sae
index 1cf5ce7c59..450abfbc84 100644
--- a/instant.xml.sae
+++ b/instant.xml.sae
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <instant>
-  <Editor id="12" mixer-width="Wide" zoom-focus="3" zoom="2048.000000" snap-to="12" snap-mode="1" edit-point="EditAtPlayhead" playhead="0" show-waveforms="yes" show-waveforms-recording="yes" show-measures="yes" follow-playhead="yes" xfades-visible="yes" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" show-editor-mixer="yes">
-    <geometry x_size="995" y_size="765" x_pos="1" y_pos="22" x_off="1" y_off="44" edit_pane_pos="823"/>
+  <Editor id="12" mixer-width="Wide" zoom-focus="3" zoom="512.000000" snap-to="12" snap-mode="1" edit-point="EditAtPlayhead" playhead="0" show-waveforms="yes" show-waveforms-recording="yes" show-measures="yes" follow-playhead="yes" xfades-visible="yes" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" show-editor-mixer="yes">
+    <geometry x_size="1242" y_size="768" x_pos="0" y_pos="0" x_off="0" y_off="0" edit_pane_pos="1024"/>
   </Editor>
   <Mixer narrow-strips="no" show-mixer="no"/>
 </instant>
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index d3c802ea40..e6d8fa9c67 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1966,20 +1966,20 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
 				      << endmsg;
 				goto failure;
 			}
-			if (! getenv("ARDOUR_SAE")) {
-				for (uint32_t x = 0; n_physical_audio_inputs && x < bus->n_inputs(); ++x) {
+			/*
+			for (uint32_t x = 0; n_physical_audio_inputs && x < bus->n_inputs(); ++x) {
 					
-					port = "";
-					
-					if (Config->get_input_auto_connect() & AutoConnectPhysical) {
-						port = physinputs[((n+x)%n_physical_audio_inputs)];
-					} 
-					
-					if (port.length() && bus->connect_input (bus->input (x), port, this)) {
-						break;
-					}
+				port = "";
+				
+				if (Config->get_input_auto_connect() & AutoConnectPhysical) {
+					port = physinputs[((n+x)%n_physical_audio_inputs)];
+				} 
+				
+				if (port.length() && bus->connect_input (bus->input (x), port, this)) {
+					break;
 				}
 			}
+			*/
 			for (uint32_t x = 0; n_physical_audio_outputs && x < bus->n_outputs(); ++x) {
 				
 				port = "";