use VCA full name in strips and track headers

[ardour.git] / gtk2_ardour / audio_clock.cc

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index f373f3f710d36a16d0277e6399dbff2aa0279880..61253ad16dd90d89a7992825374fb4079d1e6513 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -773,12 +773,6 @@ AudioClock::session_property_changed (const PropertyChange&)
        set (last_when, true);
 }
 
-void
-AudioClock::metric_position_changed ()
-{
-       set (last_when, true);
-}
-
 void
 AudioClock::session_configuration_changed (std::string p)
 {
@@ -927,7 +921,7 @@ AudioClock::set_slave_info ()
                                TimecodeSlave* tcslave;
                                if ((tcslave = dynamic_cast<TimecodeSlave*>(_session->slave())) != 0) {
                                        matching = (tcslave->apparent_timecode_format() == _session->config.get_timecode_format());
-                                       _left_btn.set_text (string_compose ("%1 <span face=\"monospace\" foreground=\"%3\">%2</span>",
+                                       _left_btn.set_text (string_compose ("%1<span face=\"monospace\" foreground=\"%3\">%2</span>",
                                                                sync_source_to_string(sync_src, true)[0],
                                                                dynamic_cast<TimecodeSlave*>(slave)->approximate_current_position (),
                                                                matching ? "#66ff66" : "#ff3333"
@@ -987,7 +981,7 @@ AudioClock::set_frames (framepos_t when, bool /*force*/)
                float vid_pullup = _session->config.get_video_pullup();
 
                if (vid_pullup == 0.0) {
-                       _right_btn.set_text (string_compose ("%1 off", _("Pull")));
+                       _right_btn.set_text ("");
                } else {
                        sprintf (buf, _("%+.4f%%"), vid_pullup);
                        _right_btn.set_text (string_compose ("%1 %2", _("Pull"), buf));
@@ -1170,15 +1164,17 @@ AudioClock::set_bbt (framepos_t when, framecnt_t offset, bool /*force*/)
 
                if (m.tempo().note_type() == 4) {
                        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 = %.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), "%.1f@%.3f", _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", S_("Tempo|T"), buf));
 
                snprintf (buf, sizeof(buf), "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
-               _right_btn.set_text (string_compose ("%1: %2", S_("Meter|M"), buf));
+               _right_btn.set_text (string_compose ("%1: %2", S_("TimeSignature|TS"), buf));
        }
 }
 
@@ -1192,7 +1188,7 @@ AudioClock::set_session (Session *s)
                Config->ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context());
                _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context());
                _session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_property_changed, this, _1), gui_context());
-               _session->tempo_map().MetricPositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::metric_position_changed, this), gui_context());
+               _session->tempo_map().MetricPositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_property_changed, this, _1), gui_context());
 
                XMLProperty const * prop;
                XMLNode* node = _session->extra_xml (X_("ClockModes"));