diff options
| author | David Robillard <d@drobilla.net> | 2008-01-12 23:45:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-12 23:45:50 +0000 |
| commit | e92c1669c1cdf857b8a3900abb9f891e6ca9fdad (patch) | |
| tree | f02725efdfd3473527cb7fa94471a7cff2528880 /gtk2_ardour/marker.h | |
| parent | bf256c168170de1b9e1411bb563c571d67470c05 (diff) | |
Merge with 2.0-ongoing R2885.
Fix loading of 2.0 sessions.
git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.h')
| -rw-r--r-- | gtk2_ardour/marker.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index fa252571fb..1a53726ede 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -57,10 +57,10 @@ class Marker : public PBD::Destructible ArdourCanvas::Item& the_item() const; - void add_line (ArdourCanvas::Group*, double initial_height); + void add_line (ArdourCanvas::Group*, double y_origin, double initial_height); void show_line (); void hide_line (); - void set_line_length (double); + void set_line_vpos (double y_origin, double height); void set_position (nframes_t); void set_name (const string&); @@ -84,7 +84,7 @@ class Marker : public PBD::Destructible ArdourCanvas::Polygon *mark; ArdourCanvas::Text *text; ArdourCanvas::Points *points; - ArdourCanvas::Line *line; + ArdourCanvas::SimpleLine *line; ArdourCanvas::Points *line_points; double unit_position; |