diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-29 13:48:25 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-29 13:48:25 +0000 |
commit | 3fab3ead7dc0ead67dd5c2b330d165bbcffdf799 (patch) | |
tree | ede5b8b3719aab66214ed6d86869b17a9b948615 /gtk2_ardour/editor_markers.cc | |
parent | 8cf32fddc557afd52014616b3097bd77ced9f6aa (diff) |
remove line parent member from Marker, part 3
git-svn-id: svn://localhost/ardour2/branches/3.0@8361 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
-rw-r--r-- | gtk2_ardour/editor_markers.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 78c1edb8b0..c4aaed42e5 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -84,10 +84,10 @@ Editor::add_new_location (Location *location) if (location->is_mark()) { if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) { - lam->start = new Marker (*this, *cd_marker_group, *cursor_group, color, location->name(), Marker::Mark, location->start()); + lam->start = new Marker (*this, *cd_marker_group, color, location->name(), Marker::Mark, location->start()); group = cd_marker_group; } else { - lam->start = new Marker (*this, *marker_group, *cursor_group, color, location->name(), Marker::Mark, location->start()); + lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start()); group = marker_group; } @@ -96,40 +96,40 @@ Editor::add_new_location (Location *location) } else if (location->is_auto_loop()) { // transport marker - lam->start = new Marker (*this, *transport_marker_group, *cursor_group, color, + lam->start = new Marker (*this, *transport_marker_group, color, location->name(), Marker::LoopStart, location->start()); - lam->end = new Marker (*this, *transport_marker_group, *cursor_group, color, + lam->end = new Marker (*this, *transport_marker_group, color, location->name(), Marker::LoopEnd, location->end()); group = transport_marker_group; } else if (location->is_auto_punch()) { // transport marker - lam->start = new Marker (*this, *transport_marker_group, *cursor_group, color, + lam->start = new Marker (*this, *transport_marker_group, color, location->name(), Marker::PunchIn, location->start()); - lam->end = new Marker (*this, *transport_marker_group, *cursor_group, color, + lam->end = new Marker (*this, *transport_marker_group, color, location->name(), Marker::PunchOut, location->end()); group = transport_marker_group; } else if (location->is_session_range()) { // session range - lam->start = new Marker (*this, *marker_group, *cursor_group, color, _("start"), Marker::SessionStart, location->start()); - lam->end = new Marker (*this, *marker_group, *cursor_group, color, _("end"), Marker::SessionEnd, location->end()); + lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::SessionStart, location->start()); + lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::SessionEnd, location->end()); group = marker_group; } else { // range marker if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) { - lam->start = new Marker (*this, *cd_marker_group, *cursor_group, color, + lam->start = new Marker (*this, *cd_marker_group, color, location->name(), Marker::RangeStart, location->start()); - lam->end = new Marker (*this, *cd_marker_group, *cursor_group, color, + lam->end = new Marker (*this, *cd_marker_group, color, location->name(), Marker::RangeEnd, location->end()); group = cd_marker_group; } else { - lam->start = new Marker (*this, *range_marker_group, *cursor_group, color, + lam->start = new Marker (*this, *range_marker_group, color, location->name(), Marker::RangeStart, location->start()); - lam->end = new Marker (*this, *range_marker_group, *cursor_group, color, + lam->end = new Marker (*this, *range_marker_group, color, location->name(), Marker::RangeEnd, location->end()); group = range_marker_group; } |