diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2009-05-19 14:38:37 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2009-05-19 14:38:37 +0000 |
| commit | 337fae8183800ecd4967206507e16f285b34e88d (patch) | |
| tree | 7f30c96ce03ce25dd13270d1193dd7a0d1b21535 /gtk2_ardour/marker.h | |
| parent | c04d9d1975402c514d2feb44d997f0941d1f34c3 (diff) | |
Fix record crash, use pixfufs instead of canvas text in markers, use leftmost_frame instead of querying canvas coords when scrolling (speeds up canvas scrolling somewhat).
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5101 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.h')
| -rw-r--r-- | gtk2_ardour/marker.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index 1a53726ede..0f01f1d794 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -25,6 +25,8 @@ #include <ardour/ardour.h> #include <pbd/destructible.h> +#include <libgnomecanvasmm/pixbuf.h> + #include "canvas.h" namespace ARDOUR { @@ -79,10 +81,12 @@ class Marker : public PBD::Destructible protected: PublicEditor& editor; + Pango::FontDescription* name_font; + ArdourCanvas::Group * _parent; ArdourCanvas::Group *group; ArdourCanvas::Polygon *mark; - ArdourCanvas::Text *text; + ArdourCanvas::Pixbuf *name_pixbuf; ArdourCanvas::Points *points; ArdourCanvas::SimpleLine *line; ArdourCanvas::Points *line_points; @@ -90,8 +94,9 @@ class Marker : public PBD::Destructible double unit_position; nframes64_t frame_position; unsigned char shift; /* should be double, but its always small and integral */ - Type _type; - + Type _type; + int name_height; + void reposition (); }; |