fix mistaken "do not roll" conclusion in TransportFSM::compute_should_roll()

[ardour.git] / gtk2_ardour / utils.cc

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 7489b2e08b89ecbd34beb6750d024def23f78556..e1220527999b7ef668b8dd57bd861bdd08378e6a 100644 (file)
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -277,7 +277,8 @@ ARDOUR_UI_UTILS::sanitized_font (std::string const& name)
        Pango::FontDescription fd (name);
 
        if (fd.get_family().empty()) {
-               fd.set_family ("Sans");
+               /* default: "Sans" or "ArdourSans" */
+               fd.set_family (UIConfiguration::instance ().get_ui_font_family ());
        }
 
        return fd;
@@ -774,7 +775,7 @@ ARDOUR_UI_UTILS::samples_as_time_string (samplecnt_t s, float rate, bool show_sa
                snprintf (buf, sizeof (buf), "0");
        } else if (s < 1000 && show_samples) {
                /* 0 .. 999 spl */
-               snprintf (buf, sizeof (buf), "%ld spl", s);
+               snprintf (buf, sizeof (buf), "%" PRId64" spl", s);
        } else if (s < (rate / 1000.f)) {
                /* 0 .. 999 usec */
                snprintf (buf, sizeof (buf), "%.0f \u00B5s", s * 1e+6f / rate);