} else if (location->is_session_range()) {
// session range
} 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,
} 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,
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,
}
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,
lam->end = new Marker (*this, *range_marker_group, *cursor_group, color,
- location->name(), Marker::End, location->end());
+ location->name(), Marker::RangeEnd, location->end());
Editor::LocationMarkers::set_name (const string& str)
{
/* XXX: hack: don't change names of session start/end markers */
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) {
- if (end && end->type() != Marker::End) {
+ if (end && end->type() != Marker::SessionEnd) {
LocationEditRow::name_entry_changed ()
{
ENSURE_GUI_THREAD (*this, &LocationEditRow::name_entry_changed)
LocationEditRow::name_entry_changed ()
{
ENSURE_GUI_THREAD (*this, &LocationEditRow::name_entry_changed)
- if (i_am_the_modifier || !location) return;
+
+ if (i_am_the_modifier || !location) {
+ return;
+ }
location->set_name (name_entry.get_text());
}
location->set_name (name_entry.get_text());
}
label_offset = 8.0;
break;
label_offset = 8.0;
break;
+ case SessionStart:
+ case RangeStart:
+
points = new ArdourCanvas::Points ();
points->push_back (Gnome::Art::Point (0.0, 0.0));
points->push_back (Gnome::Art::Point (6.5, 6.5));
points = new ArdourCanvas::Points ();
points->push_back (Gnome::Art::Point (0.0, 0.0));
points->push_back (Gnome::Art::Point (6.5, 6.5));
label_offset = 13.0;
break;
label_offset = 13.0;
break;
+ case SessionEnd:
+ case RangeEnd:
points = new ArdourCanvas::Points ();
points->push_back (Gnome::Art::Point (6.5, 6.5));
points->push_back (Gnome::Art::Point (13.0, 0.0));
points = new ArdourCanvas::Points ();
points->push_back (Gnome::Art::Point (6.5, 6.5));
points->push_back (Gnome::Art::Point (13.0, 0.0));
name_pixbuf->property_pixbuf() = pixbuf_from_string(new_name, name_font, name_width, name_height, Gdk::Color ("#000000"));
name_pixbuf->property_pixbuf() = pixbuf_from_string(new_name, name_font, name_width, name_height, Gdk::Color ("#000000"));
- if (_type == End || _type == LoopEnd || _type == PunchOut) {
+ if (_type == SessionEnd || _type == RangeEnd || _type == LoopEnd || _type == PunchOut) {
name_pixbuf->property_x() = - (name_width);
}
}
name_pixbuf->property_x() = - (name_width);
}
}
- Start, ///< session start
- End, ///< session end
+ SessionStart, ///< session start
+ SessionEnd, ///< session end
+ RangeStart,
+ RangeEnd,
LoopStart,
LoopEnd,
PunchIn,
LoopStart,
LoopEnd,
PunchIn,