fix namespace error (post rebase conflict resolution)
This commit is contained in:
parent
857ca46a95
commit
83b9424082
@ -68,8 +68,8 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
ArdourMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type,
|
ArdourMarker (PublicEditor& editor, ArdourCanvas::Item &, guint32 rgba, const std::string& text, Type,
|
||||||
ARDOUR::timepos_t const & position, bool handle_events = true, RegionView* rv = 0);
|
Temporal::timepos_t const & position, bool handle_events = true, RegionView* rv = 0);
|
||||||
|
|
||||||
virtual ~ArdourMarker ();
|
virtual ~ArdourMarker ();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user