projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
experiment - no space in meterbridge.
[ardour.git] / gtk2_ardour / audio_clock.cc
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 6c854939390588da65d6eb4e1612d993510292b7..a0b48b35573f66ff459d943586339c63fd33b725 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -53,13 +53,14 @@ using Gtkmm2ext::Keyboard;
 
 sigc::signal<void> AudioClock::ModeChanged;
 vector<AudioClock*> AudioClock::clocks;
-const double AudioClock::info_font_scale_factor = 0.5;
+const double AudioClock::info_font_scale_factor = 0.50;
 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)round(font_size * info_font_scale_factor))
+#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)
@@ -178,7 +179,7 @@ AudioClock::set_font ()
        /* now a smaller version of the same font */
 
        delete font_attr;
-       font.set_size ((int) lrint (font_size * info_font_scale_factor));
+       font.set_size (INFO_FONT_SIZE);
        font.set_weight (Pango::WEIGHT_NORMAL);
        font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
 
@@ -493,7 +494,7 @@ AudioClock::on_size_request (Gtk::Requisition* req)
                
                tmp->set_font_description (font);
 
-               font.set_size ((int) lrint (font.get_size() * info_font_scale_factor));
+               font.set_size (INFO_FONT_SIZE);
                font.set_weight (Pango::WEIGHT_NORMAL);
                tmp->set_font_description (font);
 
@@ -890,7 +891,7 @@ AudioClock::end_edit_relative (bool add)
 }
 
 void
-AudioClock::session_property_changed (const PropertyChange& p)
+AudioClock::session_property_changed (const PropertyChange&)
 {
        set (last_when, true);
 }
@@ -996,18 +997,18 @@ AudioClock::set_slave_info ()
 
                switch (sync_src) {
                case JACK:
-                       _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+                       _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 ("");
                        break;
                case MIDIClock:
                        if (slave) {
-                               _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+                               _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\" foreground=\"white\">%2</span>",
+                               _right_layout->set_markup (string_compose ("<span size=\"%1\">"TXTSPAN"%2</span></span>",
                                                        INFO_FONT_SIZE, slave->approximate_current_delta()));
                        } else {
-                               _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+                               _left_layout->set_markup (string_compose ("<span size=\"%1\">"TXTSPAN"%2</span></span>",
                                                        INFO_FONT_SIZE, _("--pending--")));
                                _right_layout->set_text ("");
                        }
@@ -1019,21 +1020,21 @@ 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\"><span foreground=\"white\">%2</span><span foreground=\"%3\">%4</span></span>",
+                                       _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\" foreground=\"white\">%2</span>",
+                                       _right_layout->set_markup (string_compose ("<span size=\"%1\">"TXTSPAN"%2</span></span>",
                                                                                   INFO_FONT_SIZE, slave->approximate_current_delta()));
                                }
                        } else {
-                               _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+                               _left_layout->set_markup (string_compose ("<span size=\"%1\">"TXTSPAN"%2</span></span>",
                                                        INFO_FONT_SIZE, _("--pending--")));
                                _right_layout->set_text ("");
                        }
                        break;
                }
        } else {
-               _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">INT/%2</span>",
+               _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 ("");
        }
@@ -1046,7 +1047,7 @@ AudioClock::set_frames (framepos_t when, bool /*force*/)
        bool negative = false;
 
        if (_off) {
-               _layout->set_text ("\u2012\u2012\u2012\u2012\u2012\u2012\u2012\u2012\u2012\u2012");
+               _layout->set_text (" ----------");
 
                if (_left_layout) {
                        _left_layout->set_text ("");
@@ -1078,17 +1079,17 @@ AudioClock::set_frames (framepos_t when, bool /*force*/)
                        sprintf (buf, "%" PRId64 "Hz", rate);
                }
 
-               _left_layout->set_markup (string_compose ("<span size=\"%1\"><span foreground=\"white\">%2 </span><span foreground=\"green\">%3</span></span>",
+               _left_layout->set_markup (string_compose ("<span size=\"%1\">"TXTSPAN"%2 </span><span foreground=\"green\">%3</span></span>",
                                INFO_FONT_SIZE, _("SR"), buf));
 
                float vid_pullup = _session->config.get_video_pullup();
 
                if (vid_pullup == 0.0) {
-                       _right_layout->set_markup (string_compose ("<span size=\"%1\"><span foreground=\"white\">%2 </span><span foreground=\"green\">off</span></span>",
+                       _right_layout->set_markup (string_compose ("<span size=\"%1\">"TXTSPAN"%2 </span><span foreground=\"green\">off</span></span>",
                                        INFO_FONT_SIZE, _("Pull")));
                } else {
                        sprintf (buf, _("%+.4f%%"), vid_pullup);
-                       _right_layout->set_markup (string_compose ("<span size=\"%1\"><span foreground=\"white\">%2 </span><span foreground=\"green\">%3</span></span>",
+                       _right_layout->set_markup (string_compose ("<span size=\"%1\">"TXTSPAN"%2 </span><span foreground=\"green\">%3</span></span>",
                                        INFO_FONT_SIZE, _("Pull"), buf));
                }
        }
@@ -1106,7 +1107,7 @@ AudioClock::set_minsec (framepos_t when, bool /*force*/)
        bool negative = false;
 
        if (_off) {
-               _layout->set_text ("\u2012\u2012:\u2012\u2012:\u2012\u2012.\u2012\u2012\u2012");
+               _layout->set_text (" --:--:--.---");
 
                if (_left_layout) {
                        _left_layout->set_text ("");
@@ -1147,7 +1148,7 @@ AudioClock::set_timecode (framepos_t when, bool /*force*/)
        bool negative = false;
 
        if (_off) {
-               _layout->set_text ("\u2012\u2012:\u2012\u2012:\u2012\u2012:\u2012\u2012");
+               _layout->set_text (" --:--:--:--");
                if (_left_layout) {
                        _left_layout->set_text ("");
                        _right_layout->set_text ("");
@@ -1182,7 +1183,7 @@ AudioClock::set_bbt (framepos_t when, bool /*force*/)
        bool negative = false;
 
        if (_off) {
-               _layout->set_text ("\u2012\u2012\u2012|\u2012\u2012|\u2012\u2012\u2012\u2012");
+               _layout->set_text (" ---|--|----");
                if (_left_layout) {
                        _left_layout->set_text ("");
                        _right_layout->set_text ("");
@@ -1231,12 +1232,12 @@ AudioClock::set_bbt (framepos_t when, bool /*force*/)
 
                TempoMetric m (_session->tempo_map().metric_at (pos));
 
-               sprintf (buf, "%-5.2f", m.tempo().beats_per_minute());
-               _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%3 <span foreground=\"green\">%2</span></span>",
+               sprintf (buf, "%-5.1f", m.tempo().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")));
 
                sprintf (buf, "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
-               _right_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%3 <span foreground=\"green\">%2</span></span>",
+               _right_layout->set_markup (string_compose ("<span size=\"%1\">"TXTSPAN"%3</span> <span foreground=\"green\">%2</span></span>",
                                                           INFO_FONT_SIZE, buf, _("Meter")));
        }
 }
@@ -2104,7 +2105,7 @@ AudioClock::set_mode (Mode m)
 
        switch (_mode) {
        case Timecode:
-               mode_based_info_ratio = 0.5;
+               mode_based_info_ratio = 0.6;
                insert_map.push_back (11);
                insert_map.push_back (10);
                insert_map.push_back (8);
@@ -2129,7 +2130,7 @@ AudioClock::set_mode (Mode m)
                break;
 
        case MinSec:
-               mode_based_info_ratio = 0.5;
+               mode_based_info_ratio = 0.6;
                insert_map.push_back (12);
                insert_map.push_back (11);
                insert_map.push_back (10);
@@ -2142,7 +2143,7 @@ AudioClock::set_mode (Mode m)
                break;
 
        case Frames:
-               mode_based_info_ratio = 0.5;
+               mode_based_info_ratio = 0.45;
                break;
        }
 
Unnamed repository; edit this file 'description' to name the repository.