diff options
-rw-r--r-- | gtk2_ardour/audio_streamview.cc | 10 | ||||
-rw-r--r-- | gtk2_ardour/editor_drag.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/editor_mouse.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 44 | ||||
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/midi_streamview.cc | 6 | ||||
-rwxr-xr-x | gtk2_ardour/region_editor.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/region_view.cc | 10 | ||||
-rw-r--r-- | libs/ardour/ardour/audioplaylist.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/playlist.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/region.h | 30 | ||||
-rw-r--r-- | libs/ardour/audio_diskstream.cc | 2 | ||||
-rw-r--r-- | libs/ardour/audio_playlist.cc | 8 | ||||
-rw-r--r-- | libs/ardour/audioregion.cc | 2 | ||||
-rw-r--r-- | libs/ardour/auditioner.cc | 2 | ||||
-rw-r--r-- | libs/ardour/midi_stretch.cc | 2 | ||||
-rw-r--r-- | libs/ardour/playlist.cc | 34 | ||||
-rw-r--r-- | libs/ardour/rb_effect.cc | 2 | ||||
-rw-r--r-- | libs/ardour/region.cc | 46 |
19 files changed, 114 insertions, 114 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)); } diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h index a0da358777..910fcee0d7 100644 --- a/libs/ardour/ardour/audioplaylist.h +++ b/libs/ardour/ardour/audioplaylist.h @@ -104,7 +104,7 @@ public: void refresh_dependents (boost::shared_ptr<Region> region); void check_dependents (boost::shared_ptr<Region> region, bool norefresh); void remove_dependents (boost::shared_ptr<Region> region); - void copy_dependents (const std::vector<TwoRegions>&, boost::shared_ptr<Playlist>); + void copy_dependents (const std::vector<TwoRegions>&, Playlist*) const; void pre_combine (std::vector<boost::shared_ptr<Region> >&); void post_combine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>); diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 7635d004bc..800984ac02 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -381,7 +381,7 @@ public: void _split_region (boost::shared_ptr<Region>, framepos_t position); typedef std::pair<boost::shared_ptr<Region>, boost::shared_ptr<Region> > TwoRegions; - virtual void copy_dependents (const std::vector<TwoRegions>&, boost::shared_ptr<Playlist>) { } + virtual void copy_dependents (const std::vector<TwoRegions>&, Playlist*) const { } struct RegionInfo { boost::shared_ptr<Region> region; diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index fdcaeaf249..c23d7f8bad 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -184,24 +184,24 @@ class Region /* EDITING OPERATIONS */ - void set_length (framecnt_t, void *src); - void set_start (framepos_t, void *src); - void set_position (framepos_t, void *src); - void set_position_on_top (framepos_t, void *src); + void set_length (framecnt_t); + void set_start (framepos_t); + void set_position (framepos_t); + void set_position_on_top (framepos_t); void special_set_position (framepos_t); void update_position_after_tempo_map_change (); - void nudge_position (frameoffset_t, void *src); + void nudge_position (frameoffset_t); bool at_natural_position () const; - void move_to_natural_position (void *src); + void move_to_natural_position (); - void trim_start (framepos_t new_position, void *src); - void trim_front (framepos_t new_position, void *src); - void trim_end (framepos_t new_position, void *src); - void trim_to (framepos_t position, framecnt_t length, void *src); + void trim_start (framepos_t new_position); + void trim_front (framepos_t new_position); + void trim_end (framepos_t new_position); + void trim_to (framepos_t position, framecnt_t length); - void cut_front (framepos_t new_position, void *src); - void cut_end (framepos_t new_position, void *src); + void cut_front (framepos_t new_position); + void cut_end (framepos_t new_position); void set_layer (layer_t l); /* ONLY Playlist can call this */ void raise (); @@ -335,11 +335,11 @@ class Region void send_change (const PBD::PropertyChange&); void mid_thaw (const PBD::PropertyChange&); - void trim_to_internal (framepos_t position, framecnt_t length, void *src); + void trim_to_internal (framepos_t position, framecnt_t length); virtual void set_position_internal (framepos_t pos, bool allow_bbt_recompute); virtual void set_length_internal (framepos_t pos); - void modify_front (framepos_t new_position, bool reset_fade, void* src); - void modify_end (framepos_t new_position, bool reset_fade, void* src); + void modify_front (framepos_t new_position, bool reset_fade); + void modify_end (framepos_t new_position, bool reset_fade); void maybe_uncopy (); void first_edit (); diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 109dfe41ed..ab43d410cf 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -363,7 +363,7 @@ AudioDiskstream::use_destructive_playlist () /* be sure to stretch the region out to the maximum length */ - region->set_length (max_framepos - region->position(), this); + region->set_length (max_framepos - region->position()); uint32_t n; ChannelList::iterator chan; diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 55a3733d54..c433fe4d0e 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -988,9 +988,9 @@ struct crossfade_triple { }; void -AudioPlaylist::copy_dependents (const vector<TwoRegions>& old_and_new, boost::shared_ptr<Playlist> other) +AudioPlaylist::copy_dependents (const vector<TwoRegions>& old_and_new, Playlist* other) const { - boost::shared_ptr<AudioPlaylist> other_audio = boost::dynamic_pointer_cast<AudioPlaylist>(other); + AudioPlaylist* other_audio = dynamic_cast<AudioPlaylist*>(other); if (!other_audio) { return; @@ -1012,7 +1012,7 @@ AudioPlaylist::copy_dependents (const vector<TwoRegions>& old_and_new, boost::sh for (vector<TwoRegions>::const_iterator on = old_and_new.begin(); on != old_and_new.end(); ++on) { - for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) { + for (Crossfades::const_iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) { if ((*i)->in() == on->first) { @@ -1089,7 +1089,7 @@ AudioPlaylist::copy_dependents (const vector<TwoRegions>& old_and_new, boost::sh * of the fade-in region */ - new_xfade->set_position (ci->second.new_in->position(), this); + new_xfade->set_position (ci->second.new_in->position()); other_audio->add_crossfade (new_xfade); } } diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 447e4b8d95..a68b7b1f65 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -1320,7 +1320,7 @@ AudioRegion::source_offset_changed () if (afs && afs->destructive()) { // set_start (source()->natural_position(), this); - set_position (source()->natural_position(), this); + set_position (source()->natural_position()); } } diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index a5db9a21dd..1874e3da7a 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -166,7 +166,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region) /* copy it */ boost::shared_ptr<AudioRegion> the_region (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region))); - the_region->set_position (0, this); + the_region->set_position (0); _diskstream->playlist()->drop_regions (); _diskstream->playlist()->add_region (the_region, 0, 1); diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc index af78e293dd..4d893d526e 100644 --- a/libs/ardour/midi_stretch.cc +++ b/libs/ardour/midi_stretch.cc @@ -110,7 +110,7 @@ MidiStretch::run (boost::shared_ptr<Region> r, Progress* progress) const int ret = finish (region, nsrcs, new_name); - results[0]->set_length((framecnt_t) floor (r->length() * _request.time_fraction), NULL); + results[0]->set_length((framecnt_t) floor (r->length() * _request.time_fraction)); return ret; } diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 1086163fb0..6dd230c1ab 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -787,7 +787,7 @@ Playlist::add_region_internal (boost::shared_ptr<Region> region, framepos_t posi region->set_playlist (boost::weak_ptr<Playlist>(foo)); } - region->set_position (position, this); + region->set_position (position); timestamp_layer_op (region); @@ -1045,7 +1045,7 @@ Playlist::partition_internal (framepos_t start, framepos_t end, bool cutting, Re current->suspend_property_changes (); thawlist.push_back (current); - current->cut_end (pos2 - 1, this); + current->cut_end (pos2 - 1); } else if (overlap == OverlapEnd) { @@ -1084,7 +1084,7 @@ Playlist::partition_internal (framepos_t start, framepos_t end, bool cutting, Re current->suspend_property_changes (); thawlist.push_back (current); - current->cut_end (pos2 - 1, this); + current->cut_end (pos2 - 1); } else if (overlap == OverlapStart) { @@ -1127,7 +1127,7 @@ Playlist::partition_internal (framepos_t start, framepos_t end, bool cutting, Re current->suspend_property_changes (); thawlist.push_back (current); - current->trim_front (pos3, this); + current->trim_front (pos3); } else if (overlap == OverlapExternal) { /* split: no split required. @@ -1355,7 +1355,7 @@ Playlist::shift (framepos_t at, frameoffset_t distance, bool move_intersected, b continue; } - (*r)->set_position ((*r)->position() + distance, this); + (*r)->set_position ((*r)->position() + distance); } for (RegionList::iterator r = fixup.begin(); r != fixup.end(); ++r) { @@ -1524,7 +1524,7 @@ Playlist::core_splice (framepos_t at, framecnt_t distance, boost::shared_ptr<Reg new_pos = max_framepos - (*i)->length(); } - (*i)->set_position (new_pos, this); + (*i)->set_position (new_pos); } } @@ -2725,7 +2725,7 @@ Playlist::nudge_after (framepos_t start, framecnt_t distance, bool forwards) } } - (*i)->set_position (new_pos, this); + (*i)->set_position (new_pos); moved = true; } } @@ -2876,8 +2876,8 @@ Playlist::shuffle (boost::shared_ptr<Region> region, int dir) new_pos = region->position() + (*next)->length(); } - (*next)->set_position (region->position(), this); - region->set_position (new_pos, this); + (*next)->set_position (region->position()); + region->set_position (new_pos); /* avoid a full sort */ @@ -2917,8 +2917,8 @@ Playlist::shuffle (boost::shared_ptr<Region> region, int dir) new_pos = (*prev)->position() + region->length(); } - region->set_position ((*prev)->position(), this); - (*prev)->set_position (new_pos, this); + region->set_position ((*prev)->position()); + (*prev)->set_position (new_pos); /* avoid a full sort */ @@ -3128,7 +3128,7 @@ Playlist::combine (const RegionList& r) /* add any dependent regions to the new playlist */ - copy_dependents (old_and_new_regions, pl); + copy_dependents (old_and_new_regions, pl.get()); /* now create a new PlaylistSource for each channel in the new playlist */ @@ -3258,7 +3258,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target) /* the pure copy constructor resets position() to zero, so fix that up. */ - original->set_position (pos, this); + original->set_position (pos); } /* check to see how the original region (in the @@ -3280,7 +3280,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target) /* overlap is just a small piece inside the * original so trim both ends */ - original->trim_to (adjusted_start, adjusted_end - adjusted_start, this); + original->trim_to (adjusted_start, adjusted_end - adjusted_start); modified_region = true; break; @@ -3294,7 +3294,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target) /* overlap starts within but covers end, so trim the front of the region */ - original->trim_front (adjusted_start, this); + original->trim_front (adjusted_start); modified_region = true; break; @@ -3302,7 +3302,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target) /* overlap covers start but ends within, so * trim the end of the region. */ - original->trim_end (adjusted_end, this); + original->trim_end (adjusted_end); modified_region = true; break; } @@ -3310,7 +3310,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target) if (move_offset) { /* fix the position to match any movement of the compound region. */ - original->set_position (original->position() + move_offset, this); + original->set_position (original->position() + move_offset); modified_region = true; } diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc index 805782807a..6b1dbdec93 100644 --- a/libs/ardour/rb_effect.cc +++ b/libs/ardour/rb_effect.cc @@ -355,7 +355,7 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress*) stretch, shift); (*x)->set_master_sources (region->master_sources()); - (*x)->set_length( (*x)->length() * stretch, this); + (*x)->set_length( (*x)->length() * stretch); } /* stretch region gain envelope */ diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 53c36ed5b5..7c064cd0fe 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -433,7 +433,7 @@ Region::set_name (const std::string& str) } void -Region::set_length (framecnt_t len, void */*src*/) +Region::set_length (framecnt_t len) { //cerr << "Region::set_length() len = " << len << endl; if (locked()) { @@ -519,7 +519,7 @@ Region::at_natural_position () const } void -Region::move_to_natural_position (void *src) +Region::move_to_natural_position () { boost::shared_ptr<Playlist> pl (playlist()); @@ -530,7 +530,7 @@ Region::move_to_natural_position (void *src) boost::shared_ptr<Region> whole_file_region = get_parent(); if (whole_file_region) { - set_position (whole_file_region->position() + _start, src); + set_position (whole_file_region->position() + _start); } } @@ -587,7 +587,7 @@ Region::update_position_after_tempo_map_change () } void -Region::set_position (framepos_t pos, void* /*src*/) +Region::set_position (framepos_t pos) { if (!can_move()) { return; @@ -629,7 +629,7 @@ Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute) } void -Region::set_position_on_top (framepos_t pos, void* /*src*/) +Region::set_position_on_top (framepos_t pos) { if (locked()) { return; @@ -660,7 +660,7 @@ Region::recompute_position_from_lock_style () } void -Region::nudge_position (frameoffset_t n, void* /*src*/) +Region::nudge_position (frameoffset_t n) { if (locked()) { return; @@ -701,7 +701,7 @@ Region::set_ancestral_data (framepos_t s, framecnt_t l, float st, float sh) } void -Region::set_start (framepos_t pos, void* /*src*/) +Region::set_start (framepos_t pos) { if (locked() || position_locked()) { return; @@ -727,7 +727,7 @@ Region::set_start (framepos_t pos, void* /*src*/) } void -Region::trim_start (framepos_t new_position, void */*src*/) +Region::trim_start (framepos_t new_position) { if (locked() || position_locked()) { return; @@ -771,25 +771,25 @@ Region::trim_start (framepos_t new_position, void */*src*/) } void -Region::trim_front (framepos_t new_position, void *src) +Region::trim_front (framepos_t new_position) { - modify_front (new_position, false, src); + modify_front (new_position, false); } void -Region::cut_front (framepos_t new_position, void *src) +Region::cut_front (framepos_t new_position) { - modify_front (new_position, true, src); + modify_front (new_position, true); } void -Region::cut_end (framepos_t new_endpoint, void *src) +Region::cut_end (framepos_t new_endpoint) { - modify_end (new_endpoint, true, src); + modify_end (new_endpoint, true); } void -Region::modify_front (framepos_t new_position, bool reset_fade, void *src) +Region::modify_front (framepos_t new_position, bool reset_fade) { if (locked()) { return; @@ -822,7 +822,7 @@ Region::modify_front (framepos_t new_position, bool reset_fade, void *src) delta = _position - new_position; } - trim_to_internal (new_position, newlen, src); + trim_to_internal (new_position, newlen); if (reset_fade) { _right_of_split = true; @@ -839,14 +839,14 @@ Region::modify_front (framepos_t new_position, bool reset_fade, void *src) } void -Region::modify_end (framepos_t new_endpoint, bool reset_fade, void* /*src*/) +Region::modify_end (framepos_t new_endpoint, bool reset_fade) { if (locked()) { return; } if (new_endpoint > _position) { - trim_to_internal (_position, new_endpoint - _position +1, this); + trim_to_internal (_position, new_endpoint - _position +1); if (reset_fade) { _left_of_split = true; } @@ -861,19 +861,19 @@ Region::modify_end (framepos_t new_endpoint, bool reset_fade, void* /*src*/) */ void -Region::trim_end (framepos_t new_endpoint, void* src) +Region::trim_end (framepos_t new_endpoint) { - modify_end (new_endpoint, false, src); + modify_end (new_endpoint, false); } void -Region::trim_to (framepos_t position, framecnt_t length, void *src) +Region::trim_to (framepos_t position, framecnt_t length) { if (locked()) { return; } - trim_to_internal (position, length, src); + trim_to_internal (position, length); if (!property_changes_suspended()) { recompute_at_start (); @@ -882,7 +882,7 @@ Region::trim_to (framepos_t position, framecnt_t length, void *src) } void -Region::trim_to_internal (framepos_t position, framecnt_t length, void */*src*/) +Region::trim_to_internal (framepos_t position, framecnt_t length) { framepos_t new_start; |