manual fixups for recent rebase conflicts left in the wrong state
This commit is contained in:
parent
5ea862ccc2
commit
04688292d6
@ -78,7 +78,7 @@ public:
|
||||
|
||||
bool destroy_region (boost::shared_ptr<Region>);
|
||||
|
||||
void _split_region (boost::shared_ptr<Region>, timepos_t const & position, Thawlist& thawlist);
|
||||
void _split_region (boost::shared_ptr<Region>, timepos_t const & position, ThawList& thawlist);
|
||||
|
||||
void set_note_mode (NoteMode m) { _note_mode = m; }
|
||||
|
||||
|
@ -434,14 +434,14 @@ protected:
|
||||
void sort_regions ();
|
||||
|
||||
void ripple_locked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude);
|
||||
void ripple_unlocked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude, Thawlist& thawlist);
|
||||
void ripple_unlocked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude, ThawList& thawlist);
|
||||
|
||||
virtual void remove_dependents (boost::shared_ptr<Region> /*region*/) {}
|
||||
virtual void region_going_away (boost::weak_ptr<Region> /*region*/) {}
|
||||
|
||||
virtual XMLNode& state (bool);
|
||||
|
||||
bool add_region_internal (boost::shared_ptr<Region>, timepos_t const & position, Thawlist& thawlist);
|
||||
bool add_region_internal (boost::shared_ptr<Region>, timepos_t const & position, ThawList& thawlist);
|
||||
|
||||
int remove_region_internal (boost::shared_ptr<Region>, ThawList& thawlist);
|
||||
void copy_regions (RegionList&) const;
|
||||
@ -460,7 +460,7 @@ protected:
|
||||
void begin_undo ();
|
||||
void end_undo ();
|
||||
|
||||
virtual void _split_region (boost::shared_ptr<Region>, timepos_t const & position, Thawlist& thawlist);
|
||||
virtual void _split_region (boost::shared_ptr<Region>, timepos_t const & position, ThawList& thawlist);
|
||||
|
||||
typedef std::pair<boost::shared_ptr<Region>, boost::shared_ptr<Region> > TwoRegions;
|
||||
|
||||
|
@ -196,7 +196,7 @@ MidiPlaylist::destroy_region (boost::shared_ptr<Region> region)
|
||||
return changed;
|
||||
}
|
||||
void
|
||||
MidiPlaylist::_split_region (boost::shared_ptr<Region> region, timepos_t const & playlist_position, Thawlist& thawlist)
|
||||
MidiPlaylist::_split_region (boost::shared_ptr<Region> region, timepos_t const & playlist_position, ThawList& thawlist)
|
||||
{
|
||||
if (!region->covers (playlist_position)) {
|
||||
return;
|
||||
|
@ -750,7 +750,7 @@ Playlist::set_region_ownership ()
|
||||
}
|
||||
|
||||
bool
|
||||
Playlist::add_region_internal (boost::shared_ptr<Region> region, timepos_t const & position, Thawlist& thawlist)
|
||||
Playlist::add_region_internal (boost::shared_ptr<Region> region, timepos_t const & position, ThawList& thawlist)
|
||||
{
|
||||
if (region->data_type () != _type) {
|
||||
return false;
|
||||
@ -1466,7 +1466,7 @@ Playlist::split_region (boost::shared_ptr<Region> region, timepos_t const & play
|
||||
}
|
||||
|
||||
void
|
||||
Playlist::_split_region (boost::shared_ptr<Region> region, timepos_t const & playlist_position, Thawlist& thawlist)
|
||||
Playlist::_split_region (boost::shared_ptr<Region> region, timepos_t const & playlist_position, ThawList& thawlist)
|
||||
{
|
||||
if (!region->covers (playlist_position)) {
|
||||
return;
|
||||
@ -1551,14 +1551,14 @@ Playlist::SoloSelectedActive ()
|
||||
}
|
||||
|
||||
void
|
||||
Playlist::ripple_locked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude, ThawList& thawlist)
|
||||
Playlist::ripple_locked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude)
|
||||
{
|
||||
RegionWriteLock rl (this);
|
||||
ripple_unlocked (at, distance, exclude, rl.thawlist);
|
||||
}
|
||||
|
||||
void
|
||||
Playlist::ripple_unlocked (samplepos_t at, samplecnt_t distance, RegionList* exclude, ThawList& thawlist, bool notify)
|
||||
Playlist::ripple_unlocked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude, ThawList& thawlist, bool notify)
|
||||
{
|
||||
if (distance.zero()) {
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user