X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=f940890244da0576b50e7ee11f23151db4b209e6;hb=e133709def199e8a28e34abc56791b05d6079a90;hp=db32c7b7e298dff78c829b84b6592e467e59bf85;hpb=84bb14efdc07b5c6a18f02aa61d46bbf76c4a077;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index db32c7b7e2..f940890244 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -114,6 +114,7 @@ ARDOUR_UI::setup_windows ()
 	editor->add_toplevel_controls (top_packer);
 
 	setup_transport();
+
 	build_menu_bar ();
 
 	setup_tooltips ();
@@ -296,8 +297,8 @@ ARDOUR_UI::setup_transport ()
 
 	/* clocks, etc. */
 
-	ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (primary_clock, &AudioClock::set), 'p'));
-	ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (secondary_clock, &AudioClock::set), 's'));
+	ARDOUR_UI::Clock.connect (sigc::mem_fun (primary_clock, &AudioClock::set));
+	ARDOUR_UI::Clock.connect (sigc::mem_fun (secondary_clock, &AudioClock::set));
 
 	primary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed));
 	secondary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
@@ -370,6 +371,7 @@ ARDOUR_UI::setup_transport ()
 	tbox->pack_start (rec_button, false, false, 6);
 
 	HBox* clock_box = manage (new HBox);
+
 	primary_clock->set_border_width (2);
 	clock_box->pack_start (*primary_clock, false, false);
 	if (!ARDOUR::Profile->get_small_screen()) {
@@ -377,7 +379,6 @@ ARDOUR_UI::setup_transport ()
 		clock_box->pack_start (*secondary_clock, false, false);
 	}
 
-
 	shuttle_box = new ShuttleControl;
 	shuttle_box->show ();
 
@@ -461,10 +462,8 @@ ARDOUR_UI::soloing_changed (bool onoff)
 void
 ARDOUR_UI::_auditioning_changed (bool onoff)
 {
-	if (auditioning_alert_button.get_active() != onoff) {
-		auditioning_alert_button.set_active (onoff);
-		set_transport_sensitivity (!onoff);
-	}
+	auditioning_alert_button.set_active (onoff);
+	set_transport_sensitivity (!onoff);
 }
 
 void
@@ -510,13 +509,12 @@ ARDOUR_UI::solo_blink (bool onoff)
 
 	if (_session->soloing() || _session->listening()) {
 		if (onoff) {
-			solo_alert_button.set_state (STATE_ACTIVE);
+			solo_alert_button.set_active (true);
 		} else {
-			solo_alert_button.set_state (STATE_NORMAL);
+			solo_alert_button.set_active (false);
 		}
 	} else {
 		solo_alert_button.set_active (false);
-		solo_alert_button.set_state (STATE_NORMAL);
 	}
 }
 
@@ -525,7 +523,7 @@ ARDOUR_UI::sync_blink (bool onoff)
 {
 	if (_session == 0 || !_session->config.get_external_sync()) {
 		/* internal sync */
-		sync_button.unset_active_state ();
+		sync_button.set_active (false);
 		return;
 	}
 
@@ -533,13 +531,13 @@ ARDOUR_UI::sync_blink (bool onoff)
 		/* not locked, so blink on and off according to the onoff argument */
 
 		if (onoff) {
-			sync_button.set_active_state (Gtkmm2ext::Active); // "-active"
+			sync_button.set_active (true);
 		} else {
-			sync_button.unset_active_state (); // normal
+			sync_button.set_active (false);
 		}
 	} else {
 		/* locked */
-		  sync_button.set_active_state (Gtkmm2ext::Active); // "-active"
+		sync_button.set_active (true);
 	}
 }
 
@@ -552,12 +550,12 @@ ARDOUR_UI::audition_blink (bool onoff)
 
 	if (_session->is_auditioning()) {
 		if (onoff) {
-			auditioning_alert_button.set_active_state (Gtkmm2ext::Active);
+			auditioning_alert_button.set_active (true);
 		} else {
-			auditioning_alert_button.unset_active_state();
+			auditioning_alert_button.set_active (false);
 		}
 	} else {
-		auditioning_alert_button.unset_active_state ();
+		auditioning_alert_button.set_active (false);
 	}
 }