summaryrefslogtreecommitdiff
path: root/gtk2_ardour/marker.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-06-02 17:50:37 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-06-02 17:50:37 +0000
commit83f385d26336f58c1b2e3ce49c609fe86878b56d (patch)
tree5cc50c4afd705ad83ee4455bd4547eaffc7e7895 /gtk2_ardour/marker.cc
parentadd91aa2d723c15148d83dae7c8178ee6102146e (diff)
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way
git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.cc')
-rw-r--r--gtk2_ardour/marker.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 5b7ae840fd..351267af54 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -255,7 +255,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */
int width;
- layout->set_font_description (*name_font);
+ layout->set_font_description (name_font);
Gtkmm2ext::get_ink_pixel_size (layout, width, name_height);
name_pixbuf = new ArdourCanvas::Pixbuf(*group);
@@ -380,7 +380,7 @@ Marker::setup_name_display ()
}
/* Work out how wide the name can be */
- int name_width = min ((double) pixel_width (_name, *name_font) + 2, limit);
+ int name_width = min ((double) pixel_width (_name, name_font) + 2, limit);
if (name_width == 0) {
name_width = 1;
}