mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-09 00:04:56 +01:00
fix argument name (post rebase conflict resolution)
This commit is contained in:
parent
83b9424082
commit
03bfb91aff
1 changed files with 2 additions and 2 deletions
|
|
@ -70,8 +70,8 @@ void ArdourMarker::setup_sizes(const double timebar_height)
|
||||||
marker_height = floor (timebar_height) - 2;
|
marker_height = floor (timebar_height) - 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation,
|
ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint32 rgba, const string& annotation,
|
||||||
Type type, timepos_t const & pos, bool handle_events, RegionView* rc)
|
Type type, timepos_t const & pos, bool handle_events, RegionView* rv)
|
||||||
|
|
||||||
: editor (ed)
|
: editor (ed)
|
||||||
, _parent (&parent)
|
, _parent (&parent)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue