do not manage the remote control menu, since it is explicitly deleted during destruct...

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 2a0ec5908592706016809d725ae10ca261321b61..47218e518b28d476b93ff3a63659b0d6b85d109d 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -115,7 +115,7 @@ ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuff
        } else if (strcmp (prefix, _("[INFO]: ")) == 0) {
                text = "<span color=\"green\" weight=\"bold\">";
        } else {
-               text = "<span color=\"blue\" weight=\"bold\">???";
+               text = "<span color=\"white\" weight=\"bold\">???";
        }
 
        text += prefix;
@@ -344,15 +344,12 @@ ARDOUR_UI::setup_transport ()
        solo_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::solo_alert_toggle));
        auditioning_alert_button.set_name ("TransportAuditioningAlert");
        auditioning_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle));
-       midi_panic_button.set_name("TransportMidiPanic");
-       midi_panic_button.signal_pressed().connect (mem_fun(*this, &ARDOUR_UI::midi_panic_toggle));
 
        tooltips().set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything"));
        tooltips().set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition"));
 
        alert_box.pack_start (solo_alert_button, false, false);
        alert_box.pack_start (auditioning_alert_button, false, false);
-       alert_box.pack_start (midi_panic_button, false, false);
 
        transport_tearoff_hbox.set_border_width (3);
 
@@ -453,7 +450,7 @@ ARDOUR_UI::setup_transport ()
 
        transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
        transport_tearoff_hbox.pack_start (alert_box, false, false);
-
+       
        if (Profile->get_sae()) {
                Image* img = manage (new Image ((::get_icon (X_("sae")))));
                transport_tearoff_hbox.pack_end (*img, false, false, 6);
@@ -521,16 +518,6 @@ ARDOUR_UI::solo_alert_toggle ()
        }
 }
 
-void
-ARDOUR_UI::midi_panic_toggle ()
-{
-       if (session) {
-               session->midi_panic();
-               midi_panic_button.set_active (false);
-               midi_panic_button.set_state (STATE_NORMAL);
-       }
-}
-
 void
 ARDOUR_UI::solo_blink (bool onoff)
 {
@@ -769,17 +756,13 @@ ARDOUR_UI::set_shuttle_fract (double f)
 void
 ARDOUR_UI::use_shuttle_fract (bool force)
 {
-       struct timeval now;
-       struct timeval diff;
+       microseconds_t now = get_microseconds();
        
        /* do not attempt to submit a motion-driven transport speed request
           more than once per process cycle.
         */
 
-       gettimeofday (&now, 0);
-       timersub (&now, &last_shuttle_request, &diff);
-
-       if (!force && (diff.tv_usec + (diff.tv_sec * 1000000)) < engine->usecs_per_cycle()) {
+       if (!force && (last_shuttle_request - now) < (microseconds_t) engine->usecs_per_cycle()) {
                return;
        }