summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-05-30 13:54:44 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-05-30 13:54:44 +0000
commitd4d5b30aebb8a54358bfb203c84cfd641bff79f3 (patch)
treed25b48b46b83c35d143ae5497d42a315ede7378c /gtk2_ardour
parent6eba90adb3ef9726ef277e9abeeede0dec9b8454 (diff)
remove unused and useless "src" argument for a number of Region property modifying methods
git-svn-id: svn://localhost/ardour2/branches/3.0@9632 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/audio_streamview.cc10
-rw-r--r--gtk2_ardour/editor_drag.cc8
-rw-r--r--gtk2_ardour/editor_mouse.cc8
-rw-r--r--gtk2_ardour/editor_ops.cc44
-rw-r--r--gtk2_ardour/midi_region_view.cc4
-rw-r--r--gtk2_ardour/midi_streamview.cc6
-rwxr-xr-xgtk2_ardour/region_editor.cc6
-rw-r--r--gtk2_ardour/region_view.cc10
8 files changed, 48 insertions, 48 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 8e54c6c938..f1dda10516 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -494,7 +494,7 @@ AudioStreamView::setup_rec_box ()
boost::dynamic_pointer_cast<AudioRegion>(RegionFactory::create (sources, plist, false)));
assert(region);
- region->set_position (_trackview.session()->transport_frame(), this);
+ region->set_position (_trackview.session()->transport_frame());
rec_regions.push_back (make_pair(region, (RegionView*) 0));
}
@@ -670,8 +670,8 @@ AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt)
if (nlen != region->length()) {
region->suspend_property_changes ();
- region->set_position (_trackview.track()->get_capture_start_frame(n), this);
- region->set_length (nlen, this);
+ region->set_position (_trackview.track()->get_capture_start_frame(n));
+ region->set_length (nlen);
region->resume_property_changes ();
if (origlen == 1) {
@@ -697,8 +697,8 @@ AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt)
if (region->source_length(0) >= region->start() + nlen) {
region->suspend_property_changes ();
- region->set_position (_trackview.track()->get_capture_start_frame(n), this);
- region->set_length (nlen, this);
+ region->set_position (_trackview.track()->get_capture_start_frame(n));
+ region->set_length (nlen);
region->resume_property_changes ();
if (origlen == 1) {
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index f8078475d3..76b297a08c 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -757,7 +757,7 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move)
const boost::shared_ptr<const Region> original = rv->region();
boost::shared_ptr<Region> region_copy = RegionFactory::create (original, true);
- region_copy->set_position (original->position(), this);
+ region_copy->set_position (original->position());
RegionView* nrv;
if (arv) {
@@ -1037,7 +1037,7 @@ RegionMoveDrag::finished_no_copy (
playlist->clear_changes ();
}
- rv->region()->set_position (where, (void*) this);
+ rv->region()->set_position (where);
_editor->session()->add_command (new StatefulDiffCommand (rv->region()));
}
@@ -1407,7 +1407,7 @@ RegionCreateDrag::motion (GdkEvent* event, bool first_move)
if (_region) {
framepos_t const f = adjusted_current_frame (event);
if (f < grab_frame()) {
- _region->set_position (f, this);
+ _region->set_position (f);
}
/* Don't use a zero-length region, and subtract 1 frame from the snapped length
@@ -1418,7 +1418,7 @@ RegionCreateDrag::motion (GdkEvent* event, bool first_move)
*/
framecnt_t const len = abs (f - grab_frame () - 1);
- _region->set_length (len < 1 ? 1 : len, this);
+ _region->set_length (len < 1 ? 1 : len);
}
}
}
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 92a2b6ee5f..6bf5d92f99 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2227,7 +2227,7 @@ Editor::point_trim (GdkEvent* event, framepos_t new_bound)
if (!(*i)->region()->locked()) {
(*i)->region()->clear_changes ();
- (*i)->region()->trim_front (new_bound, this);
+ (*i)->region()->trim_front (new_bound);
_session->add_command(new StatefulDiffCommand ((*i)->region()));
}
}
@@ -2235,7 +2235,7 @@ Editor::point_trim (GdkEvent* event, framepos_t new_bound)
} else {
if (!rv->region()->locked()) {
rv->region()->clear_changes ();
- rv->region()->trim_front (new_bound, this);
+ rv->region()->trim_front (new_bound);
_session->add_command(new StatefulDiffCommand (rv->region()));
}
}
@@ -2252,7 +2252,7 @@ Editor::point_trim (GdkEvent* event, framepos_t new_bound)
{
if (!(*i)->region()->locked()) {
(*i)->region()->clear_changes();
- (*i)->region()->trim_end (new_bound, this);
+ (*i)->region()->trim_end (new_bound);
_session->add_command(new StatefulDiffCommand ((*i)->region()));
}
}
@@ -2261,7 +2261,7 @@ Editor::point_trim (GdkEvent* event, framepos_t new_bound)
if (!rv->region()->locked()) {
rv->region()->clear_changes ();
- rv->region()->trim_end (new_bound, this);
+ rv->region()->trim_end (new_bound);
_session->add_command (new StatefulDiffCommand (rv->region()));
}
}
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index b986976f9e..e1efaa268b 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -300,7 +300,7 @@ Editor::nudge_forward (bool next, bool force_playhead)
}
r->clear_changes ();
- r->set_position (r->position() + distance, this);
+ r->set_position (r->position() + distance);
_session->add_command (new StatefulDiffCommand (r));
}
@@ -383,9 +383,9 @@ Editor::nudge_backward (bool next, bool force_playhead)
r->clear_changes ();
if (r->position() > distance) {
- r->set_position (r->position() - distance, this);
+ r->set_position (r->position() - distance);
} else {
- r->set_position (0, this);
+ r->set_position (0);
}
_session->add_command (new StatefulDiffCommand (r));
}
@@ -466,7 +466,7 @@ Editor::nudge_forward_capture_offset ()
boost::shared_ptr<Region> r ((*i)->region());
r->clear_changes ();
- r->set_position (r->position() + distance, this);
+ r->set_position (r->position() + distance);
_session->add_command(new StatefulDiffCommand (r));
}
@@ -492,9 +492,9 @@ Editor::nudge_backward_capture_offset ()
r->clear_changes ();
if (r->position() > distance) {
- r->set_position (r->position() - distance, this);
+ r->set_position (r->position() - distance);
} else {
- r->set_position (0, this);
+ r->set_position (0);
}
_session->add_command(new StatefulDiffCommand (r));
}
@@ -2744,7 +2744,7 @@ Editor::crop_region_to (framepos_t start, framepos_t end)
cnt = the_end - the_start + 1;
region->clear_changes ();
- region->trim_to (the_start, cnt, this);
+ region->trim_to (the_start, cnt);
_session->add_command (new StatefulDiffCommand (region));
}
@@ -2905,7 +2905,7 @@ Editor::naturalize_region ()
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
(*i)->region()->clear_changes ();
- (*i)->region()->move_to_natural_position (this);
+ (*i)->region()->move_to_natural_position ();
_session->add_command (new StatefulDiffCommand ((*i)->region()));
}
@@ -3000,7 +3000,7 @@ Editor::align_regions_relative (RegionPoint point)
/* move first one specially */
r->clear_changes ();
- r->set_position (pos, this);
+ r->set_position (pos);
_session->add_command(new StatefulDiffCommand (r));
/* move rest by the same amount */
@@ -3014,9 +3014,9 @@ Editor::align_regions_relative (RegionPoint point)
region->clear_changes ();
if (dir > 0) {
- region->set_position (region->position() + distance, this);
+ region->set_position (region->position() + distance);
} else {
- region->set_position (region->position() - distance, this);
+ region->set_position (region->position() - distance);
}
_session->add_command(new StatefulDiffCommand (region));
@@ -3041,17 +3041,17 @@ Editor::align_region_internal (boost::shared_ptr<Region> region, RegionPoint poi
switch (point) {
case SyncPoint:
- region->set_position (region->adjust_to_sync (position), this);
+ region->set_position (region->adjust_to_sync (position));
break;
case End:
if (position > region->length()) {
- region->set_position (position - region->length(), this);
+ region->set_position (position - region->length());
}
break;
case Start:
- region->set_position (position, this);
+ region->set_position (position);
break;
}
@@ -3093,9 +3093,9 @@ Editor::trim_region (bool front)
(*i)->region()->clear_changes ();
if (front) {
- (*i)->region()->trim_front (where, this);
+ (*i)->region()->trim_front (where);
} else {
- (*i)->region()->trim_end (where, this);
+ (*i)->region()->trim_end (where);
}
_session->add_command (new StatefulDiffCommand ((*i)->region()));
@@ -3161,7 +3161,7 @@ Editor::trim_region_to_location (const Location& loc, const char* str)
end = session_frame_to_track_frame (loc.end(), speed);
rv->region()->clear_changes ();
- rv->region()->trim_to (start, (end - start), this);
+ rv->region()->trim_to (start, (end - start));
_session->add_command(new StatefulDiffCommand (rv->region()));
}
@@ -3223,7 +3223,7 @@ Editor::trim_to_region(bool forward)
continue;
}
- region->trim_end((framepos_t) ( (next_region->first_frame() - 1) * speed), this);
+ region->trim_end((framepos_t) ( (next_region->first_frame() - 1) * speed));
arv->region_changed (PropertyChange (ARDOUR::Properties::length));
}
else {
@@ -3234,7 +3234,7 @@ Editor::trim_to_region(bool forward)
continue;
}
- region->trim_front((framepos_t) ((next_region->last_frame() + 1) * speed), this);
+ region->trim_front((framepos_t) ((next_region->last_frame() + 1) * speed));
arv->region_changed (ARDOUR::bounds_change);
}
@@ -5712,7 +5712,7 @@ Editor::snap_regions_to_grid ()
framepos_t start_frame = (*r)->region()->first_frame ();
snap_to (start_frame);
- (*r)->region()->set_position (start_frame, this);
+ (*r)->region()->set_position (start_frame);
}
while (used_playlists.size() > 0) {
@@ -5808,8 +5808,8 @@ Editor::close_region_gaps ()
continue;
}
- (*r)->region()->trim_front( (position - pull_back_frames), this );
- last_region->trim_end( (position - pull_back_frames + crossfade_len), this );
+ (*r)->region()->trim_front( (position - pull_back_frames));
+ last_region->trim_end( (position - pull_back_frames + crossfade_len));
last_region = (*r)->region();
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index ca62e2dd05..d7ae77def5 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -1602,7 +1602,7 @@ MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity
framepos_t region_end = _region->position() + _region->length() - 1;
if (end_frame > region_end) {
- _region->set_length (end_frame - _region->position(), this);
+ _region->set_length (end_frame - _region->position());
}
MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
@@ -3047,7 +3047,7 @@ MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb)
DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste extended region from %1 to %2\n", region_end, end_frame));
_region->clear_changes ();
- _region->set_length (end_frame, this);
+ _region->set_length (end_frame);
trackview.session()->add_command (new StatefulDiffCommand (_region));
}
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 2fb3bba597..79b30502b8 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -489,8 +489,8 @@ MidiStreamView::setup_rec_box ()
(RegionFactory::create (sources, plist, false)));
assert(region);
- region->set_start (_trackview.track()->current_capture_start() - _trackview.track()->get_capture_start_frame (0), this);
- region->set_position (_trackview.track()->current_capture_start(), this);
+ region->set_start (_trackview.track()->current_capture_start() - _trackview.track()->get_capture_start_frame (0));
+ region->set_position (_trackview.track()->current_capture_start());
RegionView* rv = add_region_view_internal (region, false);
MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (rv);
mrv->begin_write ();
@@ -639,7 +639,7 @@ MidiStreamView::update_rec_box ()
/* Update the region being recorded to reflect where we currently are */
boost::shared_ptr<ARDOUR::Region> region = rec_regions.back().first;
- region->set_length (_trackview.track()->current_capture_end () - _trackview.track()->current_capture_start(), this);
+ region->set_length (_trackview.track()->current_capture_end () - _trackview.track()->current_capture_start());
MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (rec_regions.back().second);
mrv->extend_active_notes ();
diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index 5e9f13db43..1118ac977f 100755
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -278,7 +278,7 @@ RegionEditor::position_clock_changed ()
if (pl) {
_region->clear_changes ();
- _region->set_position (position_clock.current_time(), this);
+ _region->set_position (position_clock.current_time());
_session->add_command(new StatefulDiffCommand (_region));
}
@@ -294,7 +294,7 @@ RegionEditor::end_clock_changed ()
if (pl) {
_region->clear_changes ();
- _region->trim_end (end_clock.current_time(), this);
+ _region->trim_end (end_clock.current_time());
_session->add_command(new StatefulDiffCommand (_region));
}
@@ -314,7 +314,7 @@ RegionEditor::length_clock_changed ()
if (pl) {
_region->clear_changes ();
- _region->trim_end (_region->position() + frames - 1, this);
+ _region->trim_end (_region->position() + frames - 1);
_session->add_command(new StatefulDiffCommand (_region));
}
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 1debfd6a07..f9f99c5da5 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -841,7 +841,7 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap)
framepos_t const pre_trim_first_frame = _region->first_frame();
- _region->trim_front ((framepos_t) (new_bound * speed), this);
+ _region->trim_front ((framepos_t) (new_bound * speed));
if (no_overlap) {
// Get the next region on the left of this region and shrink/expand it.
@@ -856,7 +856,7 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap)
// Only trim region on the left if the first frame has gone beyond the left region's last frame.
if (region_left != 0 && (region_left->last_frame() > _region->first_frame() || regions_touching)) {
- region_left->trim_end (_region->first_frame() - 1, this);
+ region_left->trim_end (_region->first_frame() - 1);
}
}
@@ -875,7 +875,7 @@ RegionView::trim_end (framepos_t new_bound, bool no_overlap)
framepos_t const pre_trim_last_frame = _region->last_frame();
- _region->trim_end ((framepos_t) (new_bound * speed), this);
+ _region->trim_end ((framepos_t) (new_bound * speed));
if (no_overlap) {
// Get the next region on the right of this region and shrink/expand it.
@@ -890,7 +890,7 @@ RegionView::trim_end (framepos_t new_bound, bool no_overlap)
// Only trim region on the right if the last frame has gone beyond the right region's first frame.
if (region_right != 0 && (region_right->first_frame() < _region->last_frame() || regions_touching)) {
- region_right->trim_front (_region->last_frame() + 1, this);
+ region_right->trim_front (_region->last_frame() + 1);
}
region_changed (ARDOUR::bounds_change);
@@ -938,7 +938,7 @@ RegionView::trim_contents (framepos_t frame_delta, bool left_direction, bool swa
}
}
- _region->trim_start ((framepos_t) (new_bound * speed), this);
+ _region->trim_start ((framepos_t) (new_bound * speed));
region_changed (PropertyChange (ARDOUR::Properties::start));
}