made timerangelist a encapsulation rather than a derivation
Locks off functionality that really shouldn't be used.
This commit is contained in:
@@ -531,7 +531,7 @@ void TimelineWidget::DeleteSelected(bool ripple)
|
||||
TimeRangeList range_list;
|
||||
|
||||
foreach (Block* b, blocks_to_delete) {
|
||||
range_list.InsertTimeRange(TimeRange(b->in(), b->out()));
|
||||
range_list.insert(TimeRange(b->in(), b->out()));
|
||||
}
|
||||
|
||||
new TimelineRippleDeleteGapsAtRegionsCommand(GetConnectedNode(), range_list, command);
|
||||
@@ -1512,7 +1512,7 @@ void TimelineWidget::EndRubberBandSelect()
|
||||
|
||||
void TimelineWidget::AddSelection(const TimeRange &time, const TrackReference &track)
|
||||
{
|
||||
selections_[track].InsertTimeRange(time);
|
||||
selections_[track].insert(time);
|
||||
|
||||
UpdateViewports(track.type());
|
||||
}
|
||||
@@ -1524,7 +1524,7 @@ void TimelineWidget::AddSelection(TimelineViewBlockItem *item)
|
||||
|
||||
void TimelineWidget::RemoveSelection(const TimeRange &time, const TrackReference &track)
|
||||
{
|
||||
selections_[track].RemoveTimeRange(time);
|
||||
selections_[track].remove(time);
|
||||
|
||||
UpdateViewports(track.type());
|
||||
}
|
||||
|
||||
@@ -25,9 +25,7 @@ OLIVE_NAMESPACE_ENTER
|
||||
void TimelineWidgetSelections::ShiftTime(const rational &diff)
|
||||
{
|
||||
for (auto it=this->begin(); it!=this->end(); it++) {
|
||||
for (auto it2=it.value().begin(); it2!=it.value().end(); it2++) {
|
||||
(*it2) += diff;
|
||||
}
|
||||
it.value().shift(diff);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,18 +57,14 @@ void TimelineWidgetSelections::ShiftTracks(Timeline::TrackType type, int diff)
|
||||
void TimelineWidgetSelections::TrimIn(const rational &diff)
|
||||
{
|
||||
for (auto it=this->begin(); it!=this->end(); it++) {
|
||||
for (auto it2=it.value().begin(); it2!=it.value().end(); it2++) {
|
||||
(*it2).set_in((*it2).in() + diff);
|
||||
}
|
||||
it.value().trim_in(diff);
|
||||
}
|
||||
}
|
||||
|
||||
void TimelineWidgetSelections::TrimOut(const rational &diff)
|
||||
{
|
||||
for (auto it=this->begin(); it!=this->end(); it++) {
|
||||
for (auto it2=it.value().begin(); it2!=it.value().end(); it2++) {
|
||||
(*it2).set_out((*it2).out() + diff);
|
||||
}
|
||||
it.value().trim_out(diff);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user