many small changes, see ardour-dev for more

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

15 files changed, 213 insertions, 131 deletions

diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index 163ac981b9..af81a28d80 100644
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -61,7 +61,7 @@ AnalysisWindow::AnalysisWindow()
 	tlmodel = Gtk::ListStore::create(tlcols);
 	track_list.set_model (tlmodel);
 	track_list.append_column(_("Track"), tlcols.trackname);
-	track_list.append_column_editable(_("Visible"), tlcols.visible);
+	track_list.append_column_editable(_("Show"), tlcols.visible);
 	track_list.set_headers_visible(true);
 	track_list.set_reorderable(false);
 	track_list.get_selection()->set_mode (Gtk::SELECTION_NONE);
diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index 4f97a42cb7..047b896631 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -1170,6 +1170,7 @@ widget "*MixerStripSpeedBase*" style "small_entry"
 widget "*MixerStripSpeedBaseNotOne" style "small_red_on_black_entry"
 widget "*MixerStripSpeedBaseNotOne*" style "small_red_on_black_entry"
 widget "*MixerStripGainDisplay" style "small_entry"
+widget "*MixerStripGainDisplay*" style "small_entry"
 widget "*MixerStripGainUnitButton" style "very_small_button"
 widget "*MixerStripGainUnitButton*" style "very_small_button"
 widget "*MixerStripMeterPreButton" style "very_small_button"
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 768a27e5b5..00acc7d5d6 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -444,7 +444,7 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
 
 	save_the_session = 0;
 
-	editor->ensure_float (window);
+	window.present ();
 
 	ResponseType r = (ResponseType) window.run();
 
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 44c100fd37..cdb978fb84 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -21,6 +21,7 @@
 #include <cmath>
 #include <climits>
 #include <vector>
+#include <fstream>
 
 #include <pbd/stl_delete.h>
 #include <pbd/memento_command.h>
@@ -416,7 +417,7 @@ AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool wi
 			ControlPoint* after;
 			
 			/* find the first point that can't move */
-			
+
 			for (uint32_t n = cp.view_index + 1; (after = nth (n)) != 0; ++n) {
 				if (!after->can_slide) {
 					x_limit = after->get_x() - 1.0;
@@ -748,7 +749,8 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
  
  		if (view_index && pi != npoints && /* not the first, not the last */
 		    (((this_rx == prev_rx) && (this_ry == prev_ry)) || /* same point */
-		     (((this_rx - prev_rx) < (box_size + 2)) &&  /* too close horizontally */
+		     (this_rx == prev_rx) || /* identical x coordinate */
+		     (((this_rx - prev_rx) < (box_size + 2)) &&  /* not identical, but still too close horizontally */
 		      ((abs ((int)(this_ry - prev_ry)) < (int) (box_size + 2)))))) { /* too close vertically */
   			continue;
 		}
@@ -849,9 +851,11 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
 		if (_visible) {
 			line->show ();
 		}
+
 	} 
 
 	set_selected_points (trackview.editor.get_selection().points);
+
 }
 
 string
@@ -901,7 +905,7 @@ AutomationLine::start_drag (ControlPoint* cp, float fraction)
 	}
 
 	trackview.editor.current_session()->begin_reversible_command (str);
-	trackview.editor.current_session()->add_command (new MementoCommand<AutomationLine>(*this, &get_state(), 0));
+	trackview.editor.current_session()->add_command (new MementoCommand<AutomationList>(alist, &get_state(), 0));
 	
 	first_drag_fraction = fraction;
 	last_drag_fraction = fraction;
@@ -950,7 +954,7 @@ AutomationLine::end_drag (ControlPoint* cp)
 
 		update_pending = false;
 
-		trackview.editor.current_session()->add_command (new MementoCommand<AutomationLine>(*this, 0, &get_state()));
+		trackview.editor.current_session()->add_command (new MementoCommand<AutomationList>(alist, 0, &alist.get_state()));
 		trackview.editor.current_session()->commit_reversible_command ();
 		trackview.editor.current_session()->set_dirty ();
 	}
@@ -1027,11 +1031,11 @@ AutomationLine::remove_point (ControlPoint& cp)
 	model_representation (cp, mr);
 
 	trackview.editor.current_session()->begin_reversible_command (_("remove control point"));
-        XMLNode &before = get_state();
+        XMLNode &before = alist.get_state();
 
 	alist.erase (mr.start, mr.end);
 
-	trackview.editor.current_session()->add_command(new MementoCommand<AutomationLine>(*this, &before, &get_state()));
+	trackview.editor.current_session()->add_command(new MementoCommand<AutomationList>(alist, &before, &alist.get_state()));
 	trackview.editor.current_session()->commit_reversible_command ();
 	trackview.editor.current_session()->set_dirty ();
 }
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 424564f18b..e99d755615 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -153,10 +153,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 
 	if (xml_node) {
 		set_state (*xml_node);
-	} else {
-		cerr << _name << ": looked for state named \"" << _state_name << "\" in parent ("
-		     << get_parent_with_state()->name() << ") but found nothing\n";
-	}
+	} 
 
 	/* make sure labels etc. are correct */
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 462564cd77..c15950d97d 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -450,7 +450,7 @@ Editor::Editor (AudioEngine& eng)
 
 	route_display_model = ListStore::create(route_display_columns);
 	route_list_display.set_model (route_display_model);
-	route_list_display.append_column (_("Visible"), route_display_columns.visible);
+	route_list_display.append_column (_("Show"), route_display_columns.visible);
 	route_list_display.append_column (_("Name"), route_display_columns.text);
 	route_list_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
 	route_list_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
@@ -476,7 +476,7 @@ Editor::Editor (AudioEngine& eng)
 	edit_group_display.set_model (group_model);
 	edit_group_display.append_column (_("Name"), group_columns.text);
 	edit_group_display.append_column (_("Active"), group_columns.is_active);
-	edit_group_display.append_column (_("Visible"), group_columns.is_visible);
+	edit_group_display.append_column (_("Show"), group_columns.is_visible);
 	edit_group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
 	edit_group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
 	edit_group_display.get_column (2)->set_data (X_("colnum"), GUINT_TO_POINTER(2));
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 55f8e16f81..cc45d6b769 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -60,7 +60,7 @@ Editor::register_actions ()
 
 	act = ActionManager::register_toggle_action (editor_actions, "toggle-xfades-active", _("Active"), mem_fun(*this, &Editor::toggle_xfades_active));
 	ActionManager::session_sensitive_actions.push_back (act);
-	act = ActionManager::register_toggle_action (editor_actions, "toggle-xfades-visible", _("Visible"), mem_fun(*this, &Editor::toggle_xfade_visibility));
+	act = ActionManager::register_toggle_action (editor_actions, "toggle-xfades-visible", _("Show"), mem_fun(*this, &Editor::toggle_xfade_visibility));
 	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_toggle_action (editor_actions, "toggle-auto-xfades", _("Created Automatically"), mem_fun(*this, &Editor::toggle_auto_xfade));
 	ActionManager::session_sensitive_actions.push_back (act);
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index fad0becd54..5e98b831a0 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -72,7 +72,6 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
 	  gain_slider (0),
 	  // 0.781787 is the value needed for gain to be set to 0.
 	  gain_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1),
-	  gain_display (&gain_adjustment, "MixerStripGainDisplay"),
 	  gain_automation_style_button (""),
 	  gain_automation_state_button ("")
 	
@@ -93,23 +92,19 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
 	gain_slider->signal_button_release_event().connect (mem_fun(*this, &GainMeter::end_gain_touch));
 	gain_slider->set_name ("MixerGainMeter");
 
-	gain_display.set_print_func (_gain_printer, this);
+	gain_display.set_name ("MixerStripGainDisplay");
+	set_size_request_to_display_given_text (gain_display, "-86.g", 2, 6); /* note the descender */
+	gain_display.signal_activate().connect (mem_fun (*this, &GainMeter::gain_entered));
 
-	gain_display_box.set_spacing (2);
-	set_size_request_to_display_given_text (gain_display_frame, "-86.g", 2, 6); /* note the descender */
-	gain_display_frame.set_shadow_type (Gtk::SHADOW_IN);
-	gain_display_frame.set_name ("BaseFrame");
-	gain_display_frame.add (gain_display);
-	gain_display_box.pack_start (gain_display_frame,  Gtk::PACK_SHRINK);
+	gain_display_box.set_homogeneous (true);
+	gain_display_box.pack_start (gain_display, true, true);
 
 	peak_display.set_name ("MixerStripPeakDisplay");
-	peak_display.add (peak_display_label);
-	set_size_request_to_display_given_text (peak_display_frame, "-86.g", 2, 6); /* note the descender */
-	peak_display_frame.set_shadow_type (Gtk::SHADOW_IN);
-	peak_display_frame.set_name ("BaseFrame");
-	peak_display_frame.add (peak_display);
+	peak_display.set_editable (false);
+	set_size_request_to_display_given_text  (peak_display, "-86.g", 2, 6); /* note the descender */
 	max_peak = minus_infinity();
-	peak_display_label.set_text (_("-inf"));
+	peak_display.set_text (_("-inf"));
+	peak_display.unset_flags (Gtk::CAN_FOCUS);
 
 	meter_metric_area.set_size_request (25, -1);
 	meter_metric_area.set_name ("MeterMetricsStrip");
@@ -128,24 +123,28 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
 	gain_automation_state_button.set_size_request(15, 15);
 	gain_automation_style_button.set_size_request(15, 15);
 
+	HBox* fader_centering_box = manage (new HBox);
+	fader_centering_box->pack_start (*gain_slider, false, true);
+
 	fader_vbox = manage (new Gtk::VBox());
 	fader_vbox->set_spacing (0);
-	fader_vbox->pack_start (*gain_slider, false, false, 0);
+	fader_vbox->pack_start (*fader_centering_box, false, false, 0);
 
-	hbox.set_spacing (0);
-	hbox.pack_start (*fader_vbox, false, false, 2);
+	hbox.set_spacing (2);
+	hbox.pack_start (*fader_vbox, true, true, 7);
 
 	set_width(Narrow);
 
 	Route* r;
 
 	if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
+
 	        /* 
-		   if we don't have a route (if we're the click), 
+		   if we have a route (ie. we're not the click), 
 		   pack some route-dependent stuff.
 		*/
 
-	        gain_display_box.pack_end (peak_display_frame,  Gtk::PACK_SHRINK);
+	        gain_display_box.pack_end (peak_display, true, true);
 
 		hbox.pack_start (meter_packer, true, false);
 
@@ -177,7 +176,7 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
 	}
 
 
-	set_spacing (4);
+	set_spacing (2);
 
 	pack_start (gain_display_box,  Gtk::PACK_SHRINK);
 	pack_start (hbox,  Gtk::PACK_SHRINK);
@@ -186,13 +185,16 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
 
 	meter_metric_area.signal_expose_event().connect (mem_fun(*this, &GainMeter::meter_metrics_expose));
 	gain_adjustment.signal_value_changed().connect (mem_fun(*this, &GainMeter::gain_adjusted));
-	peak_display.signal_button_release_event().connect (mem_fun(*this, &GainMeter::peak_button_release));
+	peak_display.signal_button_release_event().connect (mem_fun(*this, &GainMeter::peak_button_release), false);
+	gain_display.signal_key_press_event().connect (mem_fun(*this, &GainMeter::gain_key_press), false);
 
 	Config->ParameterChanged.connect (mem_fun (*this, &GainMeter::parameter_changed));
 
 	gain_changed (0);
-	update_gain_sensitive ();
+	show_gain ();
 
+	update_gain_sensitive ();
+	
 	ResetAllPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_peak_display));
 	ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_group_peak_display));
 }
@@ -202,10 +204,10 @@ GainMeter::set_width (Width w)
 {
 	switch (w) {
 	case Wide:
-		peak_display_frame.show_all();
+		peak_display.show();
 		break;
 	case Narrow:
-		peak_display_frame.hide_all();
+		peak_display.hide();
 		break;
 	}
 
@@ -315,13 +317,13 @@ GainMeter::update_meters ()
 			(*i).meter->set (log_meter (peak), peak);
 						
 			if (peak > max_peak) {
-            	max_peak = peak;
-                /* set peak display */
+				max_peak = peak;
+				/* set peak display */
 				if (max_peak <= -200.0f) {
-					peak_display_label.set_text (_("-inf"));
+					peak_display.set_text (_("-inf"));
 				} else {
 					snprintf (buf, sizeof(buf), "%.1f", max_peak);
-					peak_display_label.set_text (buf);
+					peak_display.set_text (buf);
 				}
 
 				if (max_peak >= 0.0f) {
@@ -436,7 +438,58 @@ GainMeter::setup_meters ()
 	}
 }	
 
-gint
+bool
+GainMeter::gain_key_press (GdkEventKey* ev)
+{
+	cerr << "kp " << ev->keyval << endl;
+
+	switch (ev->keyval) {
+	case GDK_minus:
+	case GDK_plus:
+	case GDK_period:
+	case GDK_comma:
+	case GDK_0:
+	case GDK_1:
+	case GDK_2:
+	case GDK_3:
+	case GDK_4:
+	case GDK_5:
+	case GDK_6:
+	case GDK_7:
+	case GDK_8:
+	case GDK_9:
+	case GDK_KP_Add:
+	case GDK_KP_Subtract:
+	case GDK_KP_Decimal:
+	case GDK_KP_0:
+	case GDK_KP_1:
+	case GDK_KP_2:
+	case GDK_KP_3:
+	case GDK_KP_4:
+	case GDK_KP_5:
+	case GDK_KP_6:
+	case GDK_KP_7:
+	case GDK_KP_8:
+	case GDK_KP_9:
+	case GDK_Return:
+	case GDK_BackSpace:
+	case GDK_Delete:
+	case GDK_KP_Enter:
+	case GDK_Home:
+	case GDK_End:
+	case GDK_Left:
+	case GDK_Right:
+		cerr << "allow " << ev->keyval << " to drop through\n";
+		return false;
+		
+	default:
+		break;
+	}
+
+	return true;
+}
+
+bool
 GainMeter::peak_button_release (GdkEventButton* ev)
 {
 	/* reset peak label */
@@ -451,14 +504,15 @@ GainMeter::peak_button_release (GdkEventButton* ev)
 	} else {
 		reset_peak_display ();
 	}
-	return TRUE;
+
+	return true;
 }
 
 void
 GainMeter::reset_peak_display ()
 {
 	max_peak = minus_infinity();
-	peak_display_label.set_text (_("-Inf"));
+	peak_display.set_text (_("-Inf"));
 	peak_display.set_name ("MixerStripPeakDisplay");
 }
 
@@ -480,7 +534,7 @@ GainMeter::meter_button_release (GdkEventButton* ev, uint32_t which)
 	case 1:
 		meters[which].meter->clear();
 		max_peak = minus_infinity();
-		peak_display_label.set_text (_("-inf"));
+		peak_display.set_text (_("-inf"));
 		peak_display.set_name ("MixerStripPeakDisplay");
 		break;
 
@@ -514,21 +568,34 @@ GainMeter::popup_meter_menu (GdkEventButton *ev)
 }
 
 void
-GainMeter::_gain_printer (char buf[32], Gtk::Adjustment& adj, void *arg)
+GainMeter::gain_entered ()
 {
-	static_cast<GainMeter *>(arg)->gain_printer (buf, adj);
+	float f;
+
+	if (sscanf (gain_display.get_text().c_str(), "%f", &f) == 1) {
+
+		/* clamp to displayable values */
+
+		f = min (f, 6.0f);
+
+		_io->set_gain (dB_to_coefficient (f), this);
+	}
 }
 
 void
-GainMeter::gain_printer (char buf[32], Gtk::Adjustment& adj)
+GainMeter::show_gain ()
 {
-	float v = adj.get_value();
+	char buf[32];
 
+	float v = gain_adjustment.get_value();
+	
 	if (v == 0.0) {
 		strcpy (buf, _("-inf"));
 	} else {
 		snprintf (buf, 32, "%.1f", coefficient_to_dB (slider_position_to_gain (v)));
 	}
+	
+	gain_display.set_text (buf);
 }
 
 void
@@ -537,6 +604,7 @@ GainMeter::gain_adjusted ()
 	if (!ignore_toggle) {
 		_io->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this);
 	}
+	show_gain ();
 }
 
 void
@@ -545,7 +613,7 @@ GainMeter::effective_gain_display ()
 	gfloat value = gain_to_slider_position (_io->effective_gain());
 	
 	if (gain_adjustment.get_value() != value) {
-		ignore_toggle = true;
+		ignore_toggle = true; 
 		gain_adjustment.set_value (value);
 		ignore_toggle = false;
 	}
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index bbc12ccb6c..8d80e36781 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -82,11 +82,8 @@ class GainMeter : public Gtk::VBox
 
 	Gtkmm2ext::VSliderController *gain_slider;
 	Gtk::Adjustment              gain_adjustment;
-	Gtk::Frame                   gain_display_frame;
-	Gtkmm2ext::ClickBox           gain_display;
-	Gtk::Frame                   peak_display_frame;
-	Gtk::EventBox                peak_display;
-	Gtk::Label                   peak_display_label;
+	Gtk::Entry                   gain_display;
+	Gtk::Entry                   peak_display;
 	Gtk::HBox                    gain_display_box;
 	Gtk::HBox                    fader_box;
 	Gtk::DrawingArea             meter_metric_area;
@@ -122,9 +119,9 @@ class GainMeter : public Gtk::VBox
 
 	gint meter_metrics_expose (GdkEventExpose *);
 
-	static void _gain_printer (char buf[32], Gtk::Adjustment&, void *);
-	void gain_printer (char buf[32], Gtk::Adjustment&);
-	
+	void show_gain ();
+	void gain_entered ();
+
 	struct MeterInfo {
 	    Gtkmm2ext::FastMeter *meter;
 	    gint16          width;   
@@ -157,7 +154,8 @@ class GainMeter : public Gtk::VBox
 	gint meter_button_press (GdkEventButton*, uint32_t);
 	gint meter_button_release (GdkEventButton*, uint32_t);
 
-	gint peak_button_release (GdkEventButton*);
+	bool peak_button_release (GdkEventButton*);
+	bool gain_key_press (GdkEventKey*);
 	
 	Gtk::Menu* meter_menu;
 	void popup_meter_menu (GdkEventButton*);
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 0f5f5987a3..10f65536af 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -235,15 +235,17 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 	global_vpacker.set_border_width (0);
 	global_vpacker.set_spacing (0);
 
-	Gtk::VBox *whvbox = manage (new Gtk::VBox);
+	VBox *whvbox = manage (new VBox);
 
 	width_button.set_name ("MixerWidthButton");
 	hide_button.set_name ("MixerHideButton");
+	top_event_box.set_name ("MixerTopEventBox");
 
 	width_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::width_clicked));
 	hide_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::hide_clicked));
 
 	width_hide_box.pack_start (width_button, false, true);
+	width_hide_box.pack_start (top_event_box, true, true);
 	width_hide_box.pack_end (hide_button, false, true);
 	Gtk::Alignment *gain_meter_alignment = Gtk::manage(new Gtk::Alignment());
 	gain_meter_alignment->set_padding(0, 4, 0, 0);
@@ -427,8 +429,8 @@ MixerStrip::set_width (Width w)
 		if (rec_enable_button) {
 			rec_enable_button->set_label (_("record"));
 		}
-		mute_button->set_label  (_("mute"));
-		solo_button->set_label (_("solo"));
+		mute_button->set_label  (_("Mute"));
+		solo_button->set_label (_("Solo"));
 
 		if (_route->comment() == "") {
 		       comment_button.unset_bg (STATE_NORMAL);
@@ -964,6 +966,7 @@ void
 MixerStrip::show_route_color ()
 {
 	name_button.modify_bg (STATE_NORMAL, color());
+	top_event_box.modify_bg (STATE_NORMAL, color());
 	route_active_changed ();
 }
 
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 92da4c13fe..430f774eb6 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -111,6 +111,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	Gtk::Button         hide_button;
 	Gtk::Button         width_button;
 	Gtk::HBox           width_hide_box;
+	Gtk::EventBox       top_event_box;
 
 	void hide_clicked();
 	void width_clicked ();
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index d983689e31..45b6eecee9 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -81,7 +81,7 @@ Mixer_UI::Mixer_UI (AudioEngine& eng)
 	track_model = ListStore::create (track_columns);
 	track_display.set_model (track_model);
 	track_display.append_column (_("Strips"), track_columns.text);
-	track_display.append_column (_("Visible"), track_columns.visible);
+	track_display.append_column (_("Show"), track_columns.visible);
 	track_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
 	track_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
 	track_display.get_column (0)->set_expand(true);
@@ -107,7 +107,7 @@ Mixer_UI::Mixer_UI (AudioEngine& eng)
 	group_display.set_model (group_model);
 	group_display.append_column (_("Group"), group_columns.text);
 	group_display.append_column (_("Active"), group_columns.active);
-	group_display.append_column (_("Visible"), group_columns.visible);
+	group_display.append_column (_("Show"), group_columns.visible);
 	group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
 	group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
 	group_display.get_column (2)->set_data (X_("colnum"), GUINT_TO_POINTER(2));
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index f1349b5b04..70f5b9e2d4 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -672,7 +672,7 @@ RouteUI::set_color (const Gdk::Color & c)
 	snprintf (buf, sizeof (buf), "%d:%d:%d", c.get_red(), c.get_green(), c.get_blue());
 	xml_node->add_property ("color", buf);
 
-	 _route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
+	_route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
 }
 
 
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index b0ad4472bb..1be0f66125 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -779,49 +779,49 @@ AudioRegion::set_fade_in (FadeShape shape, nframes_t len)
 
 	switch (shape) {
 	case Linear:
-		_fade_in.add (0.0, 0.0);
-		_fade_in.add (len, 1.0);
+		_fade_in.fast_simple_add (0.0, 0.0);
+		_fade_in.fast_simple_add (len, 1.0);
 		break;
 
 	case Fast:
-		_fade_in.add (0, 0);
-		_fade_in.add (len * 0.389401, 0.0333333);
-		_fade_in.add (len * 0.629032, 0.0861111);
-		_fade_in.add (len * 0.829493, 0.233333);
-		_fade_in.add (len * 0.9447, 0.483333);
-		_fade_in.add (len * 0.976959, 0.697222);
-		_fade_in.add (len, 1);
+		_fade_in.fast_simple_add (0, 0);
+		_fade_in.fast_simple_add (len * 0.389401, 0.0333333);
+		_fade_in.fast_simple_add (len * 0.629032, 0.0861111);
+		_fade_in.fast_simple_add (len * 0.829493, 0.233333);
+		_fade_in.fast_simple_add (len * 0.9447, 0.483333);
+		_fade_in.fast_simple_add (len * 0.976959, 0.697222);
+		_fade_in.fast_simple_add (len, 1);
 		break;
 
 	case Slow:
-		_fade_in.add (0, 0);
-		_fade_in.add (len * 0.0207373, 0.197222);
-		_fade_in.add (len * 0.0645161, 0.525);
-		_fade_in.add (len * 0.152074, 0.802778);
-		_fade_in.add (len * 0.276498, 0.919444);
-		_fade_in.add (len * 0.481567, 0.980556);
-		_fade_in.add (len * 0.767281, 1);
-		_fade_in.add (len, 1);
+		_fade_in.fast_simple_add (0, 0);
+		_fade_in.fast_simple_add (len * 0.0207373, 0.197222);
+		_fade_in.fast_simple_add (len * 0.0645161, 0.525);
+		_fade_in.fast_simple_add (len * 0.152074, 0.802778);
+		_fade_in.fast_simple_add (len * 0.276498, 0.919444);
+		_fade_in.fast_simple_add (len * 0.481567, 0.980556);
+		_fade_in.fast_simple_add (len * 0.767281, 1);
+		_fade_in.fast_simple_add (len, 1);
 		break;
 
 	case LogA:
-		_fade_in.add (0, 0);
-		_fade_in.add (len * 0.0737327, 0.308333);
-		_fade_in.add (len * 0.246544, 0.658333);
-		_fade_in.add (len * 0.470046, 0.886111);
-		_fade_in.add (len * 0.652074, 0.972222);
-		_fade_in.add (len * 0.771889, 0.988889);
-		_fade_in.add (len, 1);
+		_fade_in.fast_simple_add (0, 0);
+		_fade_in.fast_simple_add (len * 0.0737327, 0.308333);
+		_fade_in.fast_simple_add (len * 0.246544, 0.658333);
+		_fade_in.fast_simple_add (len * 0.470046, 0.886111);
+		_fade_in.fast_simple_add (len * 0.652074, 0.972222);
+		_fade_in.fast_simple_add (len * 0.771889, 0.988889);
+		_fade_in.fast_simple_add (len, 1);
 		break;
 
 	case LogB:
-		_fade_in.add (0, 0);
-		_fade_in.add (len * 0.304147, 0.0694444);
-		_fade_in.add (len * 0.529954, 0.152778);
-		_fade_in.add (len * 0.725806, 0.333333);
-		_fade_in.add (len * 0.847926, 0.558333);
-		_fade_in.add (len * 0.919355, 0.730556);
-		_fade_in.add (len, 1);
+		_fade_in.fast_simple_add (0, 0);
+		_fade_in.fast_simple_add (len * 0.304147, 0.0694444);
+		_fade_in.fast_simple_add (len * 0.529954, 0.152778);
+		_fade_in.fast_simple_add (len * 0.725806, 0.333333);
+		_fade_in.fast_simple_add (len * 0.847926, 0.558333);
+		_fade_in.fast_simple_add (len * 0.919355, 0.730556);
+		_fade_in.fast_simple_add (len, 1);
 		break;
 	}
 
@@ -839,47 +839,47 @@ AudioRegion::set_fade_out (FadeShape shape, nframes_t len)
 
 	switch (shape) {
 	case Fast:
-		_fade_out.add (len * 0, 1);
-		_fade_out.add (len * 0.023041, 0.697222);
-		_fade_out.add (len * 0.0553,   0.483333);
-		_fade_out.add (len * 0.170507, 0.233333);
-		_fade_out.add (len * 0.370968, 0.0861111);
-		_fade_out.add (len * 0.610599, 0.0333333);
-		_fade_out.add (len * 1, 0);
+		_fade_out.fast_simple_add (len * 0, 1);
+		_fade_out.fast_simple_add (len * 0.023041, 0.697222);
+		_fade_out.fast_simple_add (len * 0.0553,   0.483333);
+		_fade_out.fast_simple_add (len * 0.170507, 0.233333);
+		_fade_out.fast_simple_add (len * 0.370968, 0.0861111);
+		_fade_out.fast_simple_add (len * 0.610599, 0.0333333);
+		_fade_out.fast_simple_add (len * 1, 0);
 		break;
 
 	case LogA:
-		_fade_out.add (len * 0, 1);
-		_fade_out.add (len * 0.228111, 0.988889);
-		_fade_out.add (len * 0.347926, 0.972222);
-		_fade_out.add (len * 0.529954, 0.886111);
-		_fade_out.add (len * 0.753456, 0.658333);
-		_fade_out.add (len * 0.9262673, 0.308333);
-		_fade_out.add (len * 1, 0);
+		_fade_out.fast_simple_add (len * 0, 1);
+		_fade_out.fast_simple_add (len * 0.228111, 0.988889);
+		_fade_out.fast_simple_add (len * 0.347926, 0.972222);
+		_fade_out.fast_simple_add (len * 0.529954, 0.886111);
+		_fade_out.fast_simple_add (len * 0.753456, 0.658333);
+		_fade_out.fast_simple_add (len * 0.9262673, 0.308333);
+		_fade_out.fast_simple_add (len * 1, 0);
 		break;
 
 	case Slow:
-		_fade_out.add (len * 0, 1);
-		_fade_out.add (len * 0.305556, 1);
-		_fade_out.add (len * 0.548611, 0.991736);
-		_fade_out.add (len * 0.759259, 0.931129);
-		_fade_out.add (len * 0.918981, 0.68595);
-		_fade_out.add (len * 0.976852, 0.22865);
-		_fade_out.add (len * 1, 0);
+		_fade_out.fast_simple_add (len * 0, 1);
+		_fade_out.fast_simple_add (len * 0.305556, 1);
+		_fade_out.fast_simple_add (len * 0.548611, 0.991736);
+		_fade_out.fast_simple_add (len * 0.759259, 0.931129);
+		_fade_out.fast_simple_add (len * 0.918981, 0.68595);
+		_fade_out.fast_simple_add (len * 0.976852, 0.22865);
+		_fade_out.fast_simple_add (len * 1, 0);
 		break;
 
 	case LogB:
-		_fade_out.add (len * 0, 1);
-		_fade_out.add (len * 0.080645, 0.730556);
-		_fade_out.add (len * 0.277778, 0.289256);
-		_fade_out.add (len * 0.470046, 0.152778);
-		_fade_out.add (len * 0.695853, 0.0694444);
-		_fade_out.add (len * 1, 0);
+		_fade_out.fast_simple_add (len * 0, 1);
+		_fade_out.fast_simple_add (len * 0.080645, 0.730556);
+		_fade_out.fast_simple_add (len * 0.277778, 0.289256);
+		_fade_out.fast_simple_add (len * 0.470046, 0.152778);
+		_fade_out.fast_simple_add (len * 0.695853, 0.0694444);
+		_fade_out.fast_simple_add (len * 1, 0);
 		break;
 
 	case Linear:
-		_fade_out.add (len * 0, 1);
-		_fade_out.add (len * 1, 0);
+		_fade_out.fast_simple_add (len * 0, 1);
+		_fade_out.fast_simple_add (len * 1, 0);
 		break;
 	}
 
@@ -968,8 +968,8 @@ AudioRegion::set_default_envelope ()
 {
 	_envelope.freeze ();
 	_envelope.clear ();
-	_envelope.add (0, 1.0f);
-	_envelope.add (_length, 1.0f);
+	_envelope.fast_simple_add (0, 1.0f);
+	_envelope.fast_simple_add (_length, 1.0f);
 	_envelope.thaw ();
 }
 
diff --git a/libs/ardour/automation_event.cc b/libs/ardour/automation_event.cc
index f5c9d3609a..0fa1f09bb1 100644
--- a/libs/ardour/automation_event.cc
+++ b/libs/ardour/automation_event.cc
@@ -401,7 +401,7 @@ AutomationList::add (double when, double value)
 		}
 
 		if (insert) {
-
+			
 			events.insert (insertion_point, point_factory (when, value));
 			reposition_for_rt_add (0);
 
@@ -511,6 +511,9 @@ AutomationList::move_range (iterator start, iterator end, double xdelta, double
 		while (start != end) {
 			(*start)->when += xdelta;
 			(*start)->value += ydelta;
+			if (isnan ((*start)->value)) {
+				abort ();
+			}
 			++start;
 		}
 
@@ -532,6 +535,9 @@ AutomationList::modify (iterator iter, double when, double val)
 		Glib::Mutex::Lock lm (lock);
 		(*iter)->when = when;
 		(*iter)->value = val;
+		if (isnan (val)) {
+			abort ();
+		}
 		mark_dirty ();
 	}
 	
@@ -1239,6 +1245,7 @@ AutomationList::deserialize_events (const XMLNode& node)
 	}
 
 	thaw ();
+
 	return 0;
 }
 
@@ -1270,6 +1277,7 @@ AutomationList::set_state (const XMLNode& node)
 		jack_nframes_t x;
 		double y;
 		
+		freeze ();
 		clear ();
 		
 		for (i = elist.begin(); i != elist.end(); ++i) {
@@ -1286,9 +1294,11 @@ AutomationList::set_state (const XMLNode& node)
 			}
 			y = atof (prop->value().c_str());
 			
-			add (x, y);
+			fast_simple_add (x, y);
 		}
 		
+		thaw ();
+
 		return 0;
 	}