smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

Tweak some naming slightly.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8210 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-12-07 17:16:59 +00:00
parent eead73098d
commit 6df5d5d87a
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/editor_drag.cc
View file

@ -1538,7 +1538,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*)
} else { } else {
/* These will get overridden for a point trim.*/ /* These will get overridden for a point trim.*/
if (pf < (region_start + region_length/2)) { if (pf < (region_start + region_length/2)) {
/* closer to start */ /* closer to front */
_operation = StartTrim; _operation = StartTrim;
Drag::start_grab (event, _editor->cursors()->left_side_trim); Drag::start_grab (event, _editor->cursors()->left_side_trim);
} else { } else {
@ -1552,7 +1552,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*)
case StartTrim: case StartTrim:
_editor->show_verbose_time_cursor (region_start, 10); _editor->show_verbose_time_cursor (region_start, 10);
for (list<DraggingView>::iterator i = _views.begin(); i != _views.end(); ++i) { for (list<DraggingView>::iterator i = _views.begin(); i != _views.end(); ++i) {
i->view->trim_start_starting (); i->view->trim_front_starting ();
} }
break; break;
case EndTrim: case EndTrim:
@ -1633,7 +1633,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
switch (_operation) { switch (_operation) {
case StartTrim: case StartTrim:
for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) { 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; break;
@ -1721,7 +1721,7 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) { for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
if (_operation == StartTrim) { if (_operation == StartTrim) {
i->view->trim_start_ending (); i->view->trim_front_ending ();
} }
i->view->region()->resume_property_changes (); i->view->region()->resume_property_changes ();
} }

4
gtk2_ardour/midi_region_view.cc
View file

@ -3230,7 +3230,7 @@ MidiRegionView::data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_pt
} }
void 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 /* Reparent the note group to the region view's parent, so that it doesn't change
when the region view is trimmed. when the region view is trimmed.
@ -3241,7 +3241,7 @@ MidiRegionView::trim_start_starting ()
} }
void void
MidiRegionView::trim_start_ending () MidiRegionView::trim_front_ending ()
{ {
_note_group->reparent (*group); _note_group->reparent (*group);
delete _temporary_note_group; delete _temporary_note_group;

4
gtk2_ardour/midi_region_view.h
View file

@ -283,8 +283,8 @@ class MidiRegionView : public RegionView
void enable_display (bool); void enable_display (bool);
void trim_start_starting (); void trim_front_starting ();
void trim_start_ending (); void trim_front_ending ();
protected: protected:
/** Allows derived types to specify their visibility requirements /** Allows derived types to specify their visibility requirements

2
gtk2_ardour/region_view.cc
View file

@ -696,7 +696,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
} }
void void
RegionView::trim_start (framepos_t new_bound, bool no_overlap) RegionView::trim_front (framepos_t new_bound, bool no_overlap)
{ {
if (_region->locked()) { if (_region->locked()) {
return; return;

8
gtk2_ardour/region_view.h
View file

@ -96,13 +96,13 @@ class RegionView : public TimeAxisViewItem
return _time_converter; return _time_converter;
} }
/** Called when a start trim is about to begin */ /** Called when a front trim is about to begin */
virtual void trim_start_starting () {} virtual void trim_front_starting () {}
void trim_start (framepos_t, bool); void trim_front (framepos_t, bool);
/** Called when a start trim has finished */ /** 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_end (framepos_t, bool);
void trim_contents (framepos_t, bool, bool); void trim_contents (framepos_t, bool, bool);