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
This commit is contained in:
Nick Mainsbridge 2009-05-21 17:30:45 +00:00
parent d1ee2a06ca
commit 882e3a690a
9 changed files with 113 additions and 99 deletions

View file

@ -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 ();
};