summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_markers.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-11-12 18:53:15 +0000
committerCarl Hetherington <carl@carlh.net>2010-11-12 18:53:15 +0000
commitaf5bd3df3033c168c4564cb0dd951bc8571d958d (patch)
treea1669af1762f4f83c8f205eae247668a2e0cbdcd /gtk2_ardour/editor_markers.cc
parent4527566217563bb524b60c23e925e4ff20aebccb (diff)
Fix update of range marker names. Fixes #3533.
git-svn-id: svn://localhost/ardour2/branches/3.0@8012 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
-rw-r--r--gtk2_ardour/editor_markers.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 00a71ed430..7b0f56776c 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -103,22 +103,22 @@ Editor::add_new_location (Location *location)
} else if (location->is_session_range()) {
// session range
- lam->start = new Marker (*this, *marker_group, *cursor_group, color, _("start"), Marker::Start, location->start());
- lam->end = new Marker (*this, *marker_group, *cursor_group, color, _("end"), Marker::End, location->end());
+ 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());
} 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,
- location->name(), Marker::Start, location->start());
+ location->name(), Marker::RangeStart, location->start());
lam->end = new Marker (*this, *cd_marker_group, *cursor_group, color,
- location->name(), Marker::End, location->end());
+ location->name(), Marker::RangeEnd, location->end());
}
else {
lam->start = new Marker (*this, *range_marker_group, *cursor_group, color,
- location->name(), Marker::Start, location->start());
+ location->name(), Marker::RangeStart, location->start());
lam->end = new Marker (*this, *range_marker_group, *cursor_group, color,
- location->name(), Marker::End, location->end());
+ location->name(), Marker::RangeEnd, location->end());
}
}
@@ -386,12 +386,12 @@ void
Editor::LocationMarkers::set_name (const string& str)
{
/* XXX: hack: don't change names of session start/end markers */
-
- if (start->type() != Marker::Start) {
+
+ if (start->type() != Marker::SessionStart) {
start->set_name (str);
}
- if (end && end->type() != Marker::End) {
+ if (end && end->type() != Marker::SessionEnd) {
end->set_name (str);
}
}