allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

remove unused and useless "src" argument for a number of Region property modifying methods

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9632 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2011-05-30 13:54:44 +00:00
parent 6eba90adb3
commit d4d5b30aeb
19 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/audioplaylist.h
View File

@@ -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>);

2
libs/ardour/ardour/playlist.h
View File

@@ -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;

30
libs/ardour/ardour/region.h
View File

@@ -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 ();

2
libs/ardour/audio_diskstream.cc
View File

@@ -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;

8
libs/ardour/audio_playlist.cc
View File

@@ -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);
}
}

2
libs/ardour/audioregion.cc
View File

@@ -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());
}
}

2
libs/ardour/auditioner.cc
View File

@@ -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);

2
libs/ardour/midi_stretch.cc
View File

@@ -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;
}

34
libs/ardour/playlist.cc
View File

@@ -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;
}

2
libs/ardour/rb_effect.cc
View File

@@ -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 */

46
libs/ardour/region.cc
View File

@@ -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;