diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-29 13:47:36 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-29 13:47:36 +0000 |
| commit | 92bd44e01266254015a712bc61a2cef6c7ae84ca (patch) | |
| tree | 745d1d66cd885b963b7d030b1cbc18229be0f3a5 /gtk2_ardour/marker.h | |
| parent | 6e0330a304e06311502f82ac1ebc969121695aa5 (diff) | |
remove line parent member from Marker
git-svn-id: svn://localhost/ardour2/branches/3.0@8359 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.h')
| -rw-r--r-- | gtk2_ardour/marker.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index fbc7e18a50..ea01856565 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -56,7 +56,7 @@ class Marker : public sigc::trackable }; - Marker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type, + Marker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type, framepos_t frame = 0, bool handle_events = true); virtual ~Marker (); @@ -99,7 +99,6 @@ class Marker : public sigc::trackable Pango::FontDescription* name_font; ArdourCanvas::Group* _parent; - ArdourCanvas::Group* _line_parent; ArdourCanvas::Group *group; ArdourCanvas::Polygon *mark; ArdourCanvas::Pixbuf *name_pixbuf; @@ -131,7 +130,7 @@ class Marker : public sigc::trackable class TempoMarker : public Marker { public: - TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&); + TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&); ~TempoMarker (); ARDOUR::TempoSection& tempo() const { return _tempo; } @@ -143,7 +142,7 @@ class TempoMarker : public Marker class MeterMarker : public Marker { public: - MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&); + MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&); ~MeterMarker (); ARDOUR::MeterSection& meter() const { return _meter; } |