remove line parent member from Marker, part 3
git-svn-id: svn://localhost/ardour2/branches/3.0@8361 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
8cf32fddc5
commit
3fab3ead7d
@ -84,10 +84,10 @@ Editor::add_new_location (Location *location)
|
|||||||
if (location->is_mark()) {
|
if (location->is_mark()) {
|
||||||
|
|
||||||
if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
|
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;
|
group = cd_marker_group;
|
||||||
} else {
|
} 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;
|
group = marker_group;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,40 +96,40 @@ Editor::add_new_location (Location *location)
|
|||||||
} else if (location->is_auto_loop()) {
|
} else if (location->is_auto_loop()) {
|
||||||
|
|
||||||
// transport marker
|
// 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());
|
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());
|
location->name(), Marker::LoopEnd, location->end());
|
||||||
group = transport_marker_group;
|
group = transport_marker_group;
|
||||||
|
|
||||||
} else if (location->is_auto_punch()) {
|
} else if (location->is_auto_punch()) {
|
||||||
|
|
||||||
// transport marker
|
// 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());
|
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());
|
location->name(), Marker::PunchOut, location->end());
|
||||||
group = transport_marker_group;
|
group = transport_marker_group;
|
||||||
|
|
||||||
} else if (location->is_session_range()) {
|
} else if (location->is_session_range()) {
|
||||||
|
|
||||||
// session range
|
// session range
|
||||||
lam->start = new Marker (*this, *marker_group, *cursor_group, color, _("start"), Marker::SessionStart, location->start());
|
lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::SessionStart, location->start());
|
||||||
lam->end = new Marker (*this, *marker_group, *cursor_group, color, _("end"), Marker::SessionEnd, location->end());
|
lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::SessionEnd, location->end());
|
||||||
group = marker_group;
|
group = marker_group;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// range marker
|
// range marker
|
||||||
if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
|
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());
|
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());
|
location->name(), Marker::RangeEnd, location->end());
|
||||||
group = cd_marker_group;
|
group = cd_marker_group;
|
||||||
} else {
|
} 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());
|
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());
|
location->name(), Marker::RangeEnd, location->end());
|
||||||
group = range_marker_group;
|
group = range_marker_group;
|
||||||
}
|
}
|
||||||
|
@ -85,11 +85,11 @@ Editor::draw_metric_marks (const Metrics& metrics)
|
|||||||
|
|
||||||
if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
|
if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
|
||||||
snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
|
snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
|
||||||
metric_marks.push_back (new MeterMarker (*this, *meter_group, *cursor_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf,
|
metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf,
|
||||||
*(const_cast<MeterSection*>(ms))));
|
*(const_cast<MeterSection*>(ms))));
|
||||||
} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
|
} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
|
||||||
snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
|
snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
|
||||||
metric_marks.push_back (new TempoMarker (*this, *tempo_group, *cursor_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf,
|
metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf,
|
||||||
*(const_cast<TempoSection*>(ts))));
|
*(const_cast<TempoSection*>(ts))));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user