From ae85663fa7d8951ea9363eb40bd05c480bae7b92 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 4 Mar 2013 20:00:51 +0000 Subject: use default (not monospace) font for clock text git-svn-id: svn://localhost/ardour2/branches/3.0@14137 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/audio_clock.cc | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'gtk2_ardour/audio_clock.cc') diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 7596142a7a..5dfdd12aa6 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -60,6 +60,7 @@ 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 "" AudioClock::AudioClock (const string& clock_name, bool transient, const string& widget_name, bool allow_edit, bool follows_playhead, bool duration, bool with_info) @@ -996,18 +997,18 @@ AudioClock::set_slave_info () switch (sync_src) { case JACK: - _left_layout->set_markup (string_compose ("%2", + _left_layout->set_markup (string_compose (""TXTSPAN"%2", 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 ("%2", + _left_layout->set_markup (string_compose (""TXTSPAN"%2", INFO_FONT_SIZE, sync_source_to_string(sync_src, true))); - _right_layout->set_markup (string_compose ("%2", + _right_layout->set_markup (string_compose (""TXTSPAN"%2", INFO_FONT_SIZE, slave->approximate_current_delta())); } else { - _left_layout->set_markup (string_compose ("%2", + _left_layout->set_markup (string_compose (""TXTSPAN"%2", INFO_FONT_SIZE, _("--pending--"))); _right_layout->set_text (""); } @@ -1019,21 +1020,21 @@ AudioClock::set_slave_info () TimecodeSlave* tcslave; if ((tcslave = dynamic_cast(_session->slave())) != 0) { matching = (tcslave->apparent_timecode_format() == _session->config.get_timecode_format()); - _left_layout->set_markup (string_compose ("%2%4", + _left_layout->set_markup (string_compose (""TXTSPAN"%2%4", INFO_FONT_SIZE, sync_source_to_string(sync_src, true)[0], (matching?"green":"red"), dynamic_cast(slave)->approximate_current_position())); - _right_layout->set_markup (string_compose ("%2", + _right_layout->set_markup (string_compose (""TXTSPAN"%2", INFO_FONT_SIZE, slave->approximate_current_delta())); } } else { - _left_layout->set_markup (string_compose ("%2", + _left_layout->set_markup (string_compose (""TXTSPAN"%2", INFO_FONT_SIZE, _("--pending--"))); _right_layout->set_text (""); } break; } } else { - _left_layout->set_markup (string_compose ("INT/%2", + _left_layout->set_markup (string_compose (""TXTSPAN"INT/%2", INFO_FONT_SIZE, sync_source_to_string(sync_src, true))); _right_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 ("%2 %3", + _left_layout->set_markup (string_compose (""TXTSPAN"%2 %3", INFO_FONT_SIZE, _("SR"), buf)); float vid_pullup = _session->config.get_video_pullup(); if (vid_pullup == 0.0) { - _right_layout->set_markup (string_compose ("%2 off", + _right_layout->set_markup (string_compose (""TXTSPAN"%2 off", INFO_FONT_SIZE, _("Pull"))); } else { sprintf (buf, _("%+.4f%%"), vid_pullup); - _right_layout->set_markup (string_compose ("%2 %3", + _right_layout->set_markup (string_compose (""TXTSPAN"%2 %3", INFO_FONT_SIZE, _("Pull"), buf)); } } @@ -1232,11 +1233,11 @@ 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 ("%3 %2", + _left_layout->set_markup (string_compose (""TXTSPAN"%3 %2", INFO_FONT_SIZE, buf, _("Tempo"))); sprintf (buf, "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor()); - _right_layout->set_markup (string_compose ("%3 %2", + _right_layout->set_markup (string_compose (""TXTSPAN"%3 %2", INFO_FONT_SIZE, buf, _("Meter"))); } } -- cgit v1.2.3