diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2009-05-21 17:30:45 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2009-05-21 17:30:45 +0000 |
| commit | 882e3a690a38b447f00bd14bfdfea88e9ad49f93 (patch) | |
| tree | 840071f5ecd2bdac73e3dcf2037f65bab0ad8c37 /gtk2_ardour/marker.h | |
| parent | d1ee2a06cab5b4e08e12f352d91721442d8851de (diff) | |
A different fix for 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), remove old include, remove first_action_message and some other unused methods.
git-svn-id: svn://localhost/ardour2/branches/3.0@5108 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.h')
| -rw-r--r-- | gtk2_ardour/marker.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index d1bc12561f..fe6cac75c4 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -22,6 +22,9 @@ #include <string> #include <glib.h> + +#include <libgnomecanvasmm/pixbuf.h> + #include "ardour/ardour.h" #include "pbd/destructible.h" @@ -79,10 +82,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,7 +95,8 @@ 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 (); }; |