More fixing on the toggling on/off of the track meters

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

5 files changed, 13 insertions, 9 deletions

diff --git a/ardour.rc.in b/ardour.rc.in
index 79ef80799b..fbec4ef748 100644
--- a/ardour.rc.in
+++ b/ardour.rc.in
@@ -36,6 +36,7 @@
     <Option name="destructive-xfade-msecs" value="20"/>
     <Option name="periodic-safety-backups" value="1"/>
     <Option name="periodic-safety-backup-interval" value="120"/>
+	<Option name="show-track-meters" value="1"/>
   </Config>
   <extra>
     <Keyboard edit-button="3" edit-modifier="4" delete-button="3" delete-modifier="1" snap-modifier="32"/>
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index fc2602dacf..0e484f3d64 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -417,6 +417,7 @@ ARDOUR_UI::install_actions ()
 	ActionManager::register_toggle_action (option_actions, X_("RegionEquivalentsOverlap"), _("Region equivalents overlap"), mem_fun (*this, &ARDOUR_UI::toggle_RegionEquivalentsOverlap));
 	ActionManager::register_toggle_action (option_actions, X_("PrimaryClockDeltaEditCursor"), _("Primary Clock delta to edit point"), mem_fun (*this, &ARDOUR_UI::toggle_PrimaryClockDeltaEditCursor));
 	ActionManager::register_toggle_action (option_actions, X_("SecondaryClockDeltaEditCursor"), _("Secondary Clock delta to edit point"), mem_fun (*this, &ARDOUR_UI::toggle_SecondaryClockDeltaEditCursor));	
+	ActionManager::register_toggle_action (option_actions, X_("ShowTrackMeters"), _("Display Editor Meters"), mem_fun (*this, &ARDOUR_UI::toggle_ShowTrackMeters));
 	ActionManager::register_toggle_action (option_actions, X_("OnlyCopyImportedFiles"), _("Always copy imported files"), mem_fun (*this, &ARDOUR_UI::toggle_only_copy_imported_files));	
 
 	RadioAction::Group denormal_group;
@@ -461,7 +462,6 @@ ARDOUR_UI::install_actions ()
 
 	act = ActionManager::register_toggle_action (option_actions, X_("DoNotRunPluginsWhileRecording"), _("Do not run plugins while recording"), mem_fun (*this, &ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording));
 	ActionManager::session_sensitive_actions.push_back (act);
-	act = ActionManager::register_toggle_action (option_actions, X_("ShowTrackMeters"), _("Display Editor Meters"), mem_fun (*this, &ARDOUR_UI::toggle_ShowTrackMeters));
 	act = ActionManager::register_toggle_action (option_actions, X_("LatchedSolo"), _("Latched solo"), mem_fun (*this, &ARDOUR_UI::toggle_LatchedSolo));
 	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_toggle_action (option_actions, X_("ShowSoloMutes"), _("Show solo muting"), mem_fun (*this, &ARDOUR_UI::toggle_ShowSoloMutes));
diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index db831bfd61..abea57e326 100644
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -112,6 +112,8 @@ Editor::start_updating ()
 gint
 Editor::stop_updating ()
 {
+
+	fast_screen_update_connection.disconnect();
 	AudioTimeAxisView* atv;
 
 	cerr << "Editor::stop_updating () called" << endl;
@@ -122,7 +124,7 @@ Editor::stop_updating ()
 			}
 		}
 	}
-    fast_screen_update_connection.disconnect();
+
     return 0;
 }
 
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index ec2fffaca2..98d674d22b 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -965,14 +965,15 @@ GainMeter::gain_automation_state_changed ()
 void GainMeter::setup_atv_meter (int len)
 {
 	set_no_show_all();
+	regular_meter_width = 3;
+	hide_all();
+	set_width(Narrow, len);
+	meter_packer.show_all();
+
+	cerr << "Config->get_show_track_meters() = " << Config->get_show_track_meters() << endl;
 
 	if (Config->get_show_track_meters()) {
-		set_no_show_all();
-		regular_meter_width = 3;
-		hide_all();
-		set_width(Narrow, len);
-		meter_packer.show_all();
-		hbox.show();
+		hbox.show();		
 		show();
 	}
 }
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 0e070fdaa3..dcdf41f2b7 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -1799,7 +1799,7 @@ RouteTimeAxisView::hide_meter ()
 void
 RouteTimeAxisView::show_meter ()
 {
-	gpm.show ();
+	reset_meter ();
 }
 
 void