Fix yet another oversight for the windows icon file update
[ardour.git] / gtk2_ardour / audio_clock.cc
index 7e490b4fdcec6f936a051a3f0d301d1b897e111d..cfffd9c0e34fb2be553ac27c612d74d07e79e9f5 100644 (file)
@@ -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"
 
@@ -56,14 +57,9 @@ using Gtkmm2ext::Keyboard;
 
 sigc::signal<void> AudioClock::ModeChanged;
 vector<AudioClock*> AudioClock::clocks;
-const double AudioClock::info_font_scale_factor = 0.68;
-const double AudioClock::separator_height = 0.0;
-const double AudioClock::x_leading_padding = 6.0;
 
 #define BBT_BAR_CHAR "|"
 #define BBT_SCANF_FORMAT "%" PRIu32 "%*c%" PRIu32 "%*c%" PRIu32
-#define INFO_FONT_SIZE ((int)lrint(font_size * info_font_scale_factor))
-#define TXTSPAN "<span font-family=\"Sans\" foreground=\"white\">"
 
 AudioClock::AudioClock (const string& clock_name, bool transient, const string& widget_name,
                        bool allow_edit, bool follows_playhead, bool duration, bool with_info,
@@ -80,6 +76,7 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
        , _edit_by_click_field (false)
        , _negative_allowed (false)
        , edit_is_negative (false)
+       , _with_info (with_info)
        , editing_attr (0)
        , foreground_attr (0)
        , first_height (0)
@@ -87,9 +84,6 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
        , style_resets_first (true)
        , layout_height (0)
        , layout_width (0)
-       , info_height (0)
-       , upper_height (0)
-       , mode_based_info_ratio (1.0)
        , corner_radius (4)
        , font_size (10240)
        , editing (false)
@@ -107,11 +101,6 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
        _layout = Pango::Layout::create (get_pango_context());
        _layout->set_attributes (normal_attributes);
 
-       if (with_info) {
-               _left_layout = Pango::Layout::create (get_pango_context());
-               _right_layout = Pango::Layout::create (get_pango_context());
-       }
-
        set_widget_name (widget_name);
 
        _mode = BBT; /* lie to force mode switch */
@@ -122,6 +111,12 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
                clocks.push_back (this);
        }
 
+       _left_btn.set_sizing_text (_("0000000000000"));
+       // NB right_btn is in a size-group
+
+       _left_btn.set_layout_font (UIConfiguration::instance().get_SmallFont());
+       _right_btn.set_layout_font (UIConfiguration::instance().get_SmallFont());
+
        UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &AudioClock::set_colors));
        UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &AudioClock::dpi_reset));
 }
@@ -175,18 +170,6 @@ AudioClock::set_font (Pango::FontDescription font)
 
        normal_attributes.change (*font_attr);
        editing_attributes.change (*font_attr);
-
-       /* now a smaller version of the same font */
-
-       delete font_attr;
-       font.set_size (INFO_FONT_SIZE);
-       font.set_weight (Pango::WEIGHT_NORMAL);
-       font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
-
-       info_attributes.change (*font_attr);
-
-       /* and an even smaller one */
-
        delete font_attr;
 
        /* get the figure width for the font. This doesn't have to super
@@ -270,7 +253,6 @@ AudioClock::set_colors ()
        editing_attr = new Pango::AttrColor (Pango::Attribute::create_attr_foreground (r, g, b));
 
        normal_attributes.change (*foreground_attr);
-       info_attributes.change (*foreground_attr);
        editing_attributes.change (*foreground_attr);
        editing_attributes.change (*editing_attr);
 
@@ -300,13 +282,9 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
        if (_need_bg) {
                cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a);
                if (corner_radius) {
-                       if (_left_layout) {
-                               Gtkmm2ext::rounded_top_half_rectangle (cr, 0, 0, get_width(), upper_height, corner_radius);
-                       } else {
-                               Gtkmm2ext::rounded_rectangle (cr, 0, 0, get_width(), upper_height, corner_radius);
-                       }
+                       Gtkmm2ext::rounded_rectangle (cr, 0, 0, get_width(), get_height(), corner_radius);
                } else {
-                       cairo_rectangle (cr, 0, 0, get_width(), upper_height);
+                       cairo_rectangle (cr, 0, 0, get_width(), get_height());
                }
                cairo_fill (cr);
        }
@@ -314,7 +292,7 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
        double lw = layout_width * xscale;
        double lh = layout_height * yscale;
 
-       cairo_move_to (cr, (get_width() - lw) / 2.0, (upper_height - lh) / 2.0);
+       cairo_move_to (cr, (get_width() - lw) / 2.0, (get_height() - lh) / 2.0);
 
        if (xscale != 1.0 || yscale != 1.0) {
                cairo_save (cr);
@@ -327,81 +305,6 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
                cairo_restore (cr);
        }
 
-       if (_left_layout) {
-
-               double h = get_height() - upper_height - separator_height;
-
-               if (_need_bg) {
-                       cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a);
-               }
-
-               if (mode_based_info_ratio != 1.0) {
-
-                       double left_rect_width = get_left_rect_width();
-
-                       if (_need_bg) {
-                               if (corner_radius) {
-                                       Gtkmm2ext::rounded_bottom_half_rectangle (cr, 0, upper_height + separator_height,
-                                                       left_rect_width + (separator_height == 0 ? corner_radius : 0),
-                                                       h, corner_radius);
-                               } else {
-                                       cairo_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h);
-                               }
-                               cairo_fill (cr);
-                       }
-
-                       cairo_move_to (cr, x_leading_padding, upper_height + separator_height + ((h - info_height)/2.0));
-                       pango_cairo_show_layout (cr, _left_layout->gobj());
-
-                       if (_need_bg) {
-                               if (corner_radius) {
-                                       Gtkmm2ext::rounded_bottom_half_rectangle (cr, left_rect_width + separator_height,
-                                                       upper_height + separator_height,
-                                                       get_width() - separator_height - left_rect_width,
-                                                       h, corner_radius);
-                               } else {
-                                       cairo_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height,
-                                                        get_width() - separator_height - left_rect_width, h);
-                               }
-                               cairo_fill (cr);
-                       }
-
-
-                       if (_right_layout->get_alignment() == Pango::ALIGN_RIGHT) {
-                               /* right-align does not work per se beacuse layout width is unset.
-                                * Using _right_layout->set_width([value >=0]) would also enable
-                                * word-wrapping which is not wanted here.
-                                * The solution is to custom align the layout depending on its size.
-                                * if it is larger than the available space it will be cropped on the
-                                * right edge rather than override text on the left side.
-                                */
-                               int x, rw, rh;
-                               _right_layout->get_pixel_size(rw, rh);
-                               x = get_width() - rw - separator_height - x_leading_padding;
-                               if (x < x_leading_padding + left_rect_width + separator_height) {
-                                       /* rather cut off the right end than overlap with the text on the left */
-                                       x = x_leading_padding + left_rect_width + separator_height;
-                               }
-                               cairo_move_to (cr, x, upper_height + separator_height + ((h - info_height)/2.0));
-                       } else {
-                               cairo_move_to (cr, x_leading_padding + left_rect_width + separator_height, upper_height + separator_height + ((h - info_height)/2.0));
-                       }
-                       pango_cairo_show_layout (cr, _right_layout->gobj());
-
-               } else {
-                       /* no info to display, or just one */
-
-                       if (_need_bg) {
-                               if (corner_radius) {
-                                       Gtkmm2ext::rounded_bottom_half_rectangle (cr, 0, upper_height + separator_height, get_width(), h, corner_radius);
-                               } else {
-                                       cairo_rectangle (cr, 0, upper_height + separator_height, get_width(), h);
-                               }
-                               cairo_fill (cr);
-                       }
-               }
-       }
-
        if (editing) {
                if (!insert_map.empty()) {
 
@@ -423,7 +326,7 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
                                cairo_rectangle (cr,
                                                 min (get_width() - 2.0,
                                                      (double) xcenter + cursor.get_x()/PANGO_SCALE + em_width),
-                                                (upper_height - layout_height)/2.0,
+                                                (get_height() - layout_height)/2.0,
                                                 2.0, cursor.get_height()/PANGO_SCALE);
                                cairo_fill (cr);
                        } else {
@@ -435,26 +338,14 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
                                cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a);
                                cairo_rectangle (cr,
                                                 (get_width()/2.0),
-                                                (upper_height - layout_height)/2.0,
-                                                2.0, upper_height);
+                                                (get_height() - layout_height)/2.0,
+                                                2.0, get_height());
                                cairo_fill (cr);
                        }
                }
        }
 }
 
-void
-AudioClock::on_size_allocate (Gtk::Allocation& alloc)
-{
-       CairoWidget::on_size_allocate (alloc);
-
-       if (_left_layout) {
-               upper_height = (get_height()/2.0) - 1.0;
-       } else {
-               upper_height = get_height();
-       }
-}
-
 void
 AudioClock::set_clock_dimensions (Gtk::Requisition& req)
 {
@@ -502,42 +393,6 @@ AudioClock::on_size_request (Gtk::Requisition* req)
        /* now tackle height, for which we need to know the height of the lower
         * layout
         */
-
-       if (_left_layout) {
-
-               Glib::RefPtr<Pango::Layout> tmp;
-               Glib::RefPtr<Gtk::Style> style = get_style ();
-               Pango::FontDescription font;
-               int w;
-
-               tmp = Pango::Layout::create (get_pango_context());
-
-               if (!is_realized()) {
-                       font = get_font_for_style (get_name());
-               } else {
-                       font = style->get_font();
-               }
-
-               tmp->set_font_description (font);
-
-               font.set_size (INFO_FONT_SIZE);
-               font.set_weight (Pango::WEIGHT_NORMAL);
-               tmp->set_font_description (font);
-
-               /* we only care about height, so put as much stuff in here
-                  as possible that might change the height.
-               */
-               tmp->set_text ("qyhH|"); /* one ascender, one descender */
-
-               tmp->get_pixel_size (w, info_height);
-
-               /* silly extra padding that seems necessary to correct the info
-                * that pango just gave us. I have no idea why.
-                */
-
-               req->height += info_height;
-               req->height += separator_height;
-       }
 }
 
 void
@@ -670,7 +525,7 @@ AudioClock::end_edit (bool modify)
 
                        case BBT:
                                if (is_duration) {
-                                       pos = frame_duration_from_bbt_string (0, edit_string);
+                                       pos = frame_duration_from_bbt_string (bbt_reference_time, edit_string);
                                } else {
                                        pos = frames_from_bbt_string (0, edit_string);
                                }
@@ -918,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)
 {
@@ -989,27 +838,21 @@ AudioClock::set (framepos_t when, bool force, framecnt_t offset)
 #endif
        }
 
+       bool btn_en = false;
+
        if (!editing) {
-               if (_right_layout) {
-                       _right_layout->set_alignment(Pango::ALIGN_LEFT);
-               }
 
                switch (_mode) {
                case Timecode:
-                       if (_right_layout) {
-                               _right_layout->set_alignment(Pango::ALIGN_RIGHT);
-                       }
                        set_timecode (when, force);
                        break;
 
                case BBT:
                        set_bbt (when, offset, force);
+                       btn_en = true;
                        break;
 
                case MinSec:
-                       if (_right_layout) {
-                               _right_layout->set_alignment(Pango::ALIGN_RIGHT);
-                       }
                        set_minsec (when, force);
                        break;
 
@@ -1019,6 +862,28 @@ AudioClock::set (framepos_t when, bool force, framecnt_t offset)
                }
        }
 
+       if (_with_info) {
+               _left_btn.set_sensitive (btn_en);
+               _right_btn.set_sensitive (btn_en);
+               _left_btn.set_visual_state (Gtkmm2ext::NoVisualState);
+               _right_btn.set_visual_state (Gtkmm2ext::NoVisualState);
+               if (btn_en) {
+                       _left_btn.set_elements (ArdourButton::Element(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text));
+                       _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, _(""));
+               }
+       }
+
        queue_draw ();
        last_when = when;
 }
@@ -1026,7 +891,7 @@ AudioClock::set (framepos_t when, bool force, framecnt_t offset)
 void
 AudioClock::set_slave_info ()
 {
-       if (!_left_layout || !_right_layout) {
+       if (!_with_info) {
                return;
        }
 
@@ -1037,20 +902,16 @@ AudioClock::set_slave_info ()
 
                switch (sync_src) {
                case Engine:
-                       _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
-                                               INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
-                       _right_layout->set_text ("");
+                       _left_btn.set_text (sync_source_to_string (sync_src, true), true);
+                       _right_btn.set_text ("", true);
                        break;
                case MIDIClock:
                        if (slave) {
-                               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
-                                                       INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
-                               _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
-                                                       INFO_FONT_SIZE, slave->approximate_current_delta()));
+                               _left_btn.set_text (sync_source_to_string (sync_src, true), true);
+                               _right_btn.set_text (slave->approximate_current_delta (), true);
                        } else {
-                               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
-                                                       INFO_FONT_SIZE, _("--pending--")));
-                               _right_layout->set_text ("");
+                               _left_btn.set_text (_("--pending--"), true);
+                               _right_btn.set_text ("", true);
                        }
                        break;
                case LTC:
@@ -1060,23 +921,23 @@ 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_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span><span foreground=\"%3\">%4</span></span>",
-                                                                                 INFO_FONT_SIZE, sync_source_to_string(sync_src, true)[0], (matching?"green":"red"),
-                                                                                 dynamic_cast<TimecodeSlave*>(slave)->approximate_current_position()));
-                                       _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
-                                                                                  INFO_FONT_SIZE, slave->approximate_current_delta()));
+                                       _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"
+                                                               ), true);
+                                       _right_btn.set_text (slave->approximate_current_delta (), true);
                                }
                        } else {
-                               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
-                                                       INFO_FONT_SIZE, _("--pending--")));
-                               _right_layout->set_text ("");
+                               _left_btn.set_text (_("--pending--"), true);
+                               _right_btn.set_text ("", true);
                        }
                        break;
                }
        } else {
-               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "INT/%2</span></span>",
-                                       INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
-               _right_layout->set_text ("");
+               _left_btn.set_text (string_compose ("%1/%2",
+                                       _("INT"), sync_source_to_string(sync_src, true)), true);
+               _right_btn.set_text ("", true);
        }
 }
 
@@ -1088,12 +949,8 @@ AudioClock::set_frames (framepos_t when, bool /*force*/)
 
        if (_off) {
                _layout->set_text (" ----------");
-
-               if (_left_layout) {
-                       _left_layout->set_text ("");
-                       _right_layout->set_text ("");
-               }
-
+               _left_btn.set_text ("", true);
+               _right_btn.set_text ("", true);
                return;
        }
 
@@ -1110,7 +967,7 @@ AudioClock::set_frames (framepos_t when, bool /*force*/)
 
        _layout->set_text (buf);
 
-       if (_left_layout) {
+       if (_with_info) {
                framecnt_t rate = _session->frame_rate();
 
                if (fmod (rate, 100.0) == 0.0) {
@@ -1119,18 +976,15 @@ AudioClock::set_frames (framepos_t when, bool /*force*/)
                        sprintf (buf, "%" PRId64 "Hz", rate);
                }
 
-               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2 </span><span foreground=\"green\">%3</span></span>",
-                               INFO_FONT_SIZE, _("SR"), buf));
+               _left_btn.set_text (string_compose ("%1 %2", _("SR"), buf), true);
 
                float vid_pullup = _session->config.get_video_pullup();
 
                if (vid_pullup == 0.0) {
-                       _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2 </span><span foreground=\"green\">off</span></span>",
-                                       INFO_FONT_SIZE, _("Pull")));
+                       _right_btn.set_text ("", true);
                } else {
                        sprintf (buf, _("%+.4f%%"), vid_pullup);
-                       _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2 </span><span foreground=\"green\">%3</span></span>",
-                                       INFO_FONT_SIZE, _("Pull"), buf));
+                       _right_btn.set_text (string_compose ("%1 %2", _("Pull"), buf), true);
                }
        }
 }
@@ -1176,11 +1030,8 @@ AudioClock::set_minsec (framepos_t when, bool /*force*/)
 
        if (_off) {
                _layout->set_text (" --:--:--.---");
-
-               if (_left_layout) {
-                       _left_layout->set_text ("");
-                       _right_layout->set_text ("");
-               }
+               _left_btn.set_text ("", true);
+               _right_btn.set_text ("", true);
 
                return;
        }
@@ -1199,11 +1050,8 @@ AudioClock::set_timecode (framepos_t when, bool /*force*/)
 
        if (_off) {
                _layout->set_text (" --:--:--:--");
-               if (_left_layout) {
-                       _left_layout->set_text ("");
-                       _right_layout->set_text ("");
-               }
-
+               _left_btn.set_text ("", true);
+               _right_btn.set_text ("", true);
                return;
        }
 
@@ -1228,16 +1076,14 @@ AudioClock::set_timecode (framepos_t when, bool /*force*/)
 void
 AudioClock::set_bbt (framepos_t when, framecnt_t offset, bool /*force*/)
 {
-       char buf[16];
+       char buf[64];
        Timecode::BBT_Time BBT;
        bool negative = false;
 
        if (_off) {
                _layout->set_text (" ---|--|----");
-               if (_left_layout) {
-                       _left_layout->set_text ("");
-                       _right_layout->set_text ("");
-               }
+               _left_btn.set_text ("", true);
+               _right_btn.set_text ("", true);
                return;
        }
 
@@ -1254,56 +1100,41 @@ AudioClock::set_bbt (framepos_t when, framecnt_t offset, bool /*force*/)
                        BBT.ticks = 0;
                } else {
                        TempoMap& tmap (_session->tempo_map());
+
+                       if (offset == 0) {
+                               offset = bbt_reference_time;
+                       }
+
                        const double divisions = tmap.meter_section_at_frame (offset).divisions_per_bar();
+                       Timecode::BBT_Time sub_bbt;
 
                        if (negative) {
                                BBT = tmap.bbt_at_beat (tmap.beat_at_frame (offset));
-                               Timecode::BBT_Time when_bbt = tmap.bbt_at_frame (offset - when);
-
-                               BBT.bars -= when_bbt.bars;
-
-                               if (BBT.ticks < when_bbt.ticks) {
-                                       if (BBT.beats == 1) {
-                                               BBT.bars--;
-                                               BBT.beats = divisions;
-                                       } else {
-                                               BBT.beats--;
-                                       }
-                                       BBT.ticks = Timecode::BBT_Time::ticks_per_beat - (when_bbt.ticks - BBT.ticks);
-                               } else {
-                                       BBT.ticks -= when_bbt.ticks;
-                               }
-
-                               if (BBT.beats < when_bbt.beats) {
-                                       BBT.bars--;
-                                       BBT.beats = divisions - (when_bbt.beats - BBT.beats);
-                               } else {
-                                       BBT.beats -= when_bbt.beats;
-                               }
+                               sub_bbt = tmap.bbt_at_frame (offset - when);
                        } else {
                                BBT = tmap.bbt_at_beat (tmap.beat_at_frame (when + offset));
-                               Timecode::BBT_Time when_bbt = tmap.bbt_at_frame (offset);
-
-                               BBT.bars -= when_bbt.bars;
+                               sub_bbt = tmap.bbt_at_frame (offset);
+                       }
 
-                               if (BBT.ticks < when_bbt.ticks) {
-                                       if (BBT.beats == 1) {
-                                               BBT.bars--;
-                                               BBT.beats = divisions;
-                                       } else {
-                                               BBT.beats--;
-                                       }
-                                       BBT.ticks = Timecode::BBT_Time::ticks_per_beat - (when_bbt.ticks - BBT.ticks);
-                               } else {
-                                       BBT.ticks -= when_bbt.ticks;
-                               }
+                       BBT.bars -= sub_bbt.bars;
 
-                               if (BBT.beats < when_bbt.beats) {
+                       if (BBT.ticks < sub_bbt.ticks) {
+                               if (BBT.beats == 1) {
                                        BBT.bars--;
-                                       BBT.beats = divisions - (when_bbt.beats - BBT.beats);
+                                       BBT.beats = divisions;
                                } else {
-                                       BBT.beats -= when_bbt.beats;
+                                       BBT.beats--;
                                }
+                               BBT.ticks = Timecode::BBT_Time::ticks_per_beat - (sub_bbt.ticks - BBT.ticks);
+                       } else {
+                               BBT.ticks -= sub_bbt.ticks;
+                       }
+
+                       if (BBT.beats < sub_bbt.beats) {
+                               BBT.bars--;
+                               BBT.beats = divisions - (sub_bbt.beats - BBT.beats);
+                       } else {
+                               BBT.beats -= sub_bbt.beats;
                        }
                }
        } else {
@@ -1320,7 +1151,7 @@ AudioClock::set_bbt (framepos_t when, framecnt_t offset, bool /*force*/)
 
        _layout->set_text (buf);
 
-       if (_right_layout) {
+       if (_with_info) {
                framepos_t pos;
 
                if (bbt_reference_time < 0) {
@@ -1331,13 +1162,19 @@ AudioClock::set_bbt (framepos_t when, framecnt_t offset, bool /*force*/)
 
                TempoMetric m (_session->tempo_map().metric_at (pos));
 
-               sprintf (buf, "%-5.3f", _session->tempo_map().tempo_at_frame (pos).beats_per_minute());
-               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%3</span> <span foreground=\"green\">%2</span></span>",
-                                                         INFO_FONT_SIZE, buf, _("Tempo")));
+               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), true);
+               } 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), true);
+               } else {
+                       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), true);
+               }
 
-               sprintf (buf, "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
-               _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%3</span> <span foreground=\"green\">%2</span></span>",
-                                                          INFO_FONT_SIZE, buf, _("Meter")));
+               snprintf (buf, sizeof(buf), "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
+               _right_btn.set_text (string_compose ("%1: %2", S_("TimeSignature|TS"), buf), true);
        }
 }
 
@@ -1348,9 +1185,10 @@ AudioClock::set_session (Session *s)
 
        if (_session) {
 
+               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"));
@@ -1652,7 +1490,7 @@ AudioClock::on_button_press_event (GdkEventButton *ev)
                         */
                        int xcenter = (get_width() - layout_width) /2;
 
-                       y = ev->y - ((upper_height - layout_height)/2);
+                       y = ev->y - ((get_height() - layout_height)/2);
                        x = ev->x - xcenter;
 
                        if (!_layout->xy_to_index (x * PANGO_SCALE, y * PANGO_SCALE, index, trailing)) {
@@ -1698,7 +1536,7 @@ AudioClock::on_button_release_event (GdkEventButton *ev)
                                                int xcenter = (get_width() - layout_width) /2;
                                                int index = 0;
                                                int trailing;
-                                               int y = ev->y - ((upper_height - layout_height)/2);
+                                               int y = ev->y - ((get_height() - layout_height)/2);
                                                int x = ev->x - xcenter;
                                                Field f;
 
@@ -1767,7 +1605,7 @@ AudioClock::on_scroll_event (GdkEventScroll *ev)
         */
 
        int xcenter = (get_width() - layout_width) /2;
-       y = ev->y - ((upper_height - layout_height)/2);
+       y = ev->y - ((get_height() - layout_height)/2);
        x = ev->x - xcenter;
 
        if (!_layout->xy_to_index (x * PANGO_SCALE, y * PANGO_SCALE, index, trailing)) {
@@ -2214,22 +2052,8 @@ AudioClock::set_mode (Mode m, bool noemit)
        Gtk::Requisition req;
        set_clock_dimensions (req);
 
-       if (_left_layout) {
-
-               _left_layout->set_attributes (info_attributes);
-               _right_layout->set_attributes (info_attributes);
-               /* adjust info_height according to font size */
-               int ignored;
-               _left_layout->set_text (" 1234567890");
-               _left_layout->get_pixel_size (ignored, info_height);
-
-               _left_layout->set_text ("");
-               _right_layout->set_text ("");
-       }
-
        switch (_mode) {
        case Timecode:
-               mode_based_info_ratio = 0.6;
                insert_map.push_back (11);
                insert_map.push_back (10);
                insert_map.push_back (8);
@@ -2241,7 +2065,6 @@ AudioClock::set_mode (Mode m, bool noemit)
                break;
 
        case BBT:
-               mode_based_info_ratio = 0.5;
                insert_map.push_back (11);
                insert_map.push_back (10);
                insert_map.push_back (9);
@@ -2254,7 +2077,6 @@ AudioClock::set_mode (Mode m, bool noemit)
                break;
 
        case MinSec:
-               mode_based_info_ratio = 0.6;
                insert_map.push_back (12);
                insert_map.push_back (11);
                insert_map.push_back (10);
@@ -2267,7 +2089,6 @@ AudioClock::set_mode (Mode m, bool noemit)
                break;
 
        case Frames:
-               mode_based_info_ratio = 0.45;
                break;
        }