Tweak some naming slightly.
git-svn-id: svn://localhost/ardour2/branches/3.0@8210 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
eead73098d
commit
6df5d5d87a
@ -1538,7 +1538,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*)
|
||||
} else {
|
||||
/* These will get overridden for a point trim.*/
|
||||
if (pf < (region_start + region_length/2)) {
|
||||
/* closer to start */
|
||||
/* closer to front */
|
||||
_operation = StartTrim;
|
||||
Drag::start_grab (event, _editor->cursors()->left_side_trim);
|
||||
} else {
|
||||
@ -1552,7 +1552,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*)
|
||||
case StartTrim:
|
||||
_editor->show_verbose_time_cursor (region_start, 10);
|
||||
for (list<DraggingView>::iterator i = _views.begin(); i != _views.end(); ++i) {
|
||||
i->view->trim_start_starting ();
|
||||
i->view->trim_front_starting ();
|
||||
}
|
||||
break;
|
||||
case EndTrim:
|
||||
@ -1633,7 +1633,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
|
||||
switch (_operation) {
|
||||
case StartTrim:
|
||||
for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
|
||||
i->view->trim_start (i->initial_position + dt, non_overlap_trim);
|
||||
i->view->trim_front (i->initial_position + dt, non_overlap_trim);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1721,7 +1721,7 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
|
||||
for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
|
||||
if (_operation == StartTrim) {
|
||||
i->view->trim_start_ending ();
|
||||
i->view->trim_front_ending ();
|
||||
}
|
||||
i->view->region()->resume_property_changes ();
|
||||
}
|
||||
|
@ -3230,7 +3230,7 @@ MidiRegionView::data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_pt
|
||||
}
|
||||
|
||||
void
|
||||
MidiRegionView::trim_start_starting ()
|
||||
MidiRegionView::trim_front_starting ()
|
||||
{
|
||||
/* Reparent the note group to the region view's parent, so that it doesn't change
|
||||
when the region view is trimmed.
|
||||
@ -3241,7 +3241,7 @@ MidiRegionView::trim_start_starting ()
|
||||
}
|
||||
|
||||
void
|
||||
MidiRegionView::trim_start_ending ()
|
||||
MidiRegionView::trim_front_ending ()
|
||||
{
|
||||
_note_group->reparent (*group);
|
||||
delete _temporary_note_group;
|
||||
|
@ -283,8 +283,8 @@ class MidiRegionView : public RegionView
|
||||
|
||||
void enable_display (bool);
|
||||
|
||||
void trim_start_starting ();
|
||||
void trim_start_ending ();
|
||||
void trim_front_starting ();
|
||||
void trim_front_ending ();
|
||||
|
||||
protected:
|
||||
/** Allows derived types to specify their visibility requirements
|
||||
|
@ -696,7 +696,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
|
||||
}
|
||||
|
||||
void
|
||||
RegionView::trim_start (framepos_t new_bound, bool no_overlap)
|
||||
RegionView::trim_front (framepos_t new_bound, bool no_overlap)
|
||||
{
|
||||
if (_region->locked()) {
|
||||
return;
|
||||
|
@ -96,13 +96,13 @@ class RegionView : public TimeAxisViewItem
|
||||
return _time_converter;
|
||||
}
|
||||
|
||||
/** Called when a start trim is about to begin */
|
||||
virtual void trim_start_starting () {}
|
||||
/** Called when a front trim is about to begin */
|
||||
virtual void trim_front_starting () {}
|
||||
|
||||
void trim_start (framepos_t, bool);
|
||||
void trim_front (framepos_t, bool);
|
||||
|
||||
/** Called when a start trim has finished */
|
||||
virtual void trim_start_ending () {}
|
||||
virtual void trim_front_ending () {}
|
||||
|
||||
void trim_end (framepos_t, bool);
|
||||
void trim_contents (framepos_t, bool, bool);
|
||||
|
Loading…
Reference in New Issue
Block a user