Update Marker display style: consistent height & color

[ardour.git] / gtk2_ardour / audio_clock.cc

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 292ff557d43415df69eb93670c275599edfb3fe5..a11ae1c42ec4598a2f7a57f6f912b00ced2a2b1b 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -41,6 +41,7 @@
 #include "audio_clock.h"
 #include "gui_thread.h"
 #include "keyboard.h"
+#include "tooltips.h"
 #include "ui_config.h"
 #include "utils.h"
 
@@ -877,11 +878,15 @@ AudioClock::set (framepos_t when, bool force, framecnt_t offset)
                        _right_btn.set_elements (ArdourButton::Element(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text));
                        _left_btn.set_alignment (.5, .5);
                        _right_btn.set_alignment (.5, .5);
+                       set_tooltip (_left_btn, _("Change current tempo"));
+                       set_tooltip (_right_btn, _("Change current time signature"));
                } else {
                        _left_btn.set_elements (ArdourButton::Text);
                        _right_btn.set_elements (ArdourButton::Text);
                        _left_btn.set_alignment (0, .5);
                        _right_btn.set_alignment (1, .5);
+                       set_tooltip (_left_btn, _(""));
+                       set_tooltip (_right_btn, _(""));
                }
        }
 
@@ -1164,16 +1169,18 @@ AudioClock::set_bbt (framepos_t when, framecnt_t offset, bool /*force*/)
                TempoMetric m (_session->tempo_map().metric_at (pos));
 
                if (m.tempo().note_type() == 4) {
-                       snprintf (buf, sizeof(buf), "\u2669 = %.0f", _session->tempo_map().tempo_at_frame (pos).note_types_per_minute());
+                       snprintf (buf, sizeof(buf), "\u2669 = %.3f", _session->tempo_map().tempo_at_frame (pos).note_types_per_minute());
+                       _left_btn.set_text (string_compose ("%1", buf));
                } else if (m.tempo().note_type() == 8) {
-                       snprintf (buf, sizeof(buf), "\u266a = %.0f", _session->tempo_map().tempo_at_frame (pos).note_types_per_minute());
+                       snprintf (buf, sizeof(buf), "\u266a = %.3f", _session->tempo_map().tempo_at_frame (pos).note_types_per_minute());
+                       _left_btn.set_text (string_compose ("%1", buf));
                } else {
-                       snprintf (buf, sizeof(buf), "%.0f@%.0f", _session->tempo_map().tempo_at_frame (pos).note_types_per_minute(), m.tempo().note_type());
+                       snprintf (buf, sizeof(buf), "%.1f = %.3f", m.tempo().note_type(), _session->tempo_map().tempo_at_frame (pos).note_types_per_minute());
+                       _left_btn.set_text (string_compose ("%1: %2", S_("Tempo|T"), buf));
                }
-               _left_btn.set_text (string_compose ("%1: %2", _("Tempo"), buf));
 
                snprintf (buf, sizeof(buf), "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
-               _right_btn.set_text (string_compose ("%1: %2", _("Meter"), buf));
+               _right_btn.set_text (string_compose ("%1: %2", S_("TimeSignature|TS"), buf));
        }
 }