#include "ardour/session_playlists.h"
#include "ardour/source_factory.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
pending_range_moves.clear ();
pending_region_extensions.clear ();
pending_contents_change = false;
+ pending_layering = false;
}
/*************************************************************
/** Note: this calls set_layer (..., DBL_MAX) so it will reset the layering index of region */
void
- Playlist::add_region (boost::shared_ptr<Region> region, framepos_t position, float times, bool auto_partition)
+ Playlist::add_region (boost::shared_ptr<Region> region, framepos_t position, float times, bool auto_partition, const int32_t sub_num)
{
RegionWriteLock rlock (this);
times = fabs (times);
framepos_t pos = position;
if (times == 1 && auto_partition){
- partition(pos - 1, (pos + region->length()), true);
+ RegionList thawlist;
+ partition_internal (pos - 1, (pos + region->length()), true, thawlist);
+ for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) {
+ (*i)->resume_property_changes ();
+ _session.add_command (new StatefulDiffCommand (*i));
+ }
}
if (itimes >= 1) {
- add_region_internal (region, pos);
+ add_region_internal (region, pos, sub_num);
set_layer (region, DBL_MAX);
pos += region->length();
--itimes;
*/
for (int i = 0; i < itimes; ++i) {
- boost::shared_ptr<Region> copy = RegionFactory::create (region, true);
- add_region_internal (copy, pos);
+ boost::shared_ptr<Region> copy = RegionFactory::create (region, true, sub_num);
+ add_region_internal (copy, pos, sub_num);
set_layer (copy, DBL_MAX);
pos += region->length();
}
plist.add (Properties::layer, region->layer());
boost::shared_ptr<Region> sub = RegionFactory::create (region, plist);
- add_region_internal (sub, pos);
+ add_region_internal (sub, pos, sub_num);
set_layer (sub, DBL_MAX);
}
}
}
bool
- Playlist::add_region_internal (boost::shared_ptr<Region> region, framepos_t position)
+ Playlist::add_region_internal (boost::shared_ptr<Region> region, framepos_t position, const int32_t sub_num)
{
if (region->data_type() != _type) {
return false;
region->set_playlist (boost::weak_ptr<Playlist>(foo));
}
- region->set_position (position);
+ region->set_position (position, sub_num);
regions.insert (upper_bound (regions.begin(), regions.end(), region, cmp), region);
all_regions.insert (region);
notify_region_added (region);
region->PropertyChanged.connect_same_thread (region_state_changed_connections, boost::bind (&Playlist::region_changed_proxy, this, _1, boost::weak_ptr<Region> (region)));
+ region->DropReferences.connect_same_thread (region_drop_references_connections, boost::bind (&Playlist::region_going_away, this, boost::weak_ptr<Region> (region)));
return true;
}
Playlist::partition (framepos_t start, framepos_t end, bool cut)
{
RegionList thawlist;
-
- partition_internal (start, end, cut, thawlist);
+ {
+ RegionWriteLock lock(this);
+ partition_internal (start, end, cut, thawlist);
+ }
for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) {
(*i)->resume_property_changes ();
RegionList new_regions;
{
- RegionWriteLock rlock (this);
boost::shared_ptr<Region> region;
boost::shared_ptr<Region> current;
/* "front" ***** */
+ current->clear_changes ();
current->suspend_property_changes ();
thawlist.push_back (current);
current->cut_end (pos2 - 1);
/* front ****** */
+ current->clear_changes ();
current->suspend_property_changes ();
thawlist.push_back (current);
current->cut_end (pos2 - 1);
/* end */
+ current->clear_changes ();
current->suspend_property_changes ();
thawlist.push_back (current);
current->trim_front (pos3);
//keep track of any dead space at end (for pasting into Ripple or Splice mode)
framepos_t wanted_length = end-start;
- _end_space = wanted_length - get_extent().second-get_extent().first;
+ _end_space = wanted_length - _get_extent().second - _get_extent().first;
}
boost::shared_ptr<Playlist>
chopped.
*/
- ret->paste (pl, (*i).start - start, 1.0f);
+ ret->paste (pl, (*i).start - start, 1.0f, 0);
}
}
return boost::shared_ptr<Playlist>();
}
- partition_internal (start, start+cnt-1, true, thawlist);
+ {
+ RegionWriteLock rlock (this);
+ partition_internal (start, start+cnt-1, true, thawlist);
+ }
for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) {
(*i)->resume_property_changes();
}
int
- Playlist::paste (boost::shared_ptr<Playlist> other, framepos_t position, float times)
+ Playlist::paste (boost::shared_ptr<Playlist> other, framepos_t position, float times, const int32_t sub_num)
{
times = fabs (times);
the ordering they had in the original playlist.
*/
- add_region_internal (copy_of_region, (*i)->position() + pos);
+ add_region_internal (copy_of_region, (*i)->position() + pos, sub_num);
set_layer (copy_of_region, copy_of_region->layer() + top);
}
pos += shift;
{
boost::shared_ptr<Playlist> pl = copy (range.start, range.length(), true);
framecnt_t offset = range.end - range.start;
- paste (pl, range.start + offset, times);
+ paste (pl, range.start + offset, times, 0);
}
void
-Playlist::duplicate_ranges (std::list<AudioRange>& ranges, float /* times */)
+Playlist::duplicate_ranges (std::list<AudioRange>& ranges, float times)
{
if (ranges.empty()) {
return;
framecnt_t offset = max_pos - min_pos;
- for (list<AudioRange>::iterator i = ranges.begin(); i != ranges.end(); ++i) {
- boost::shared_ptr<Playlist> pl = copy ((*i).start, (*i).length(), true);
- paste (pl, (*i).start + offset, 1.0f); // times ??
+ int count = 1;
+ int itimes = (int) floor (times);
+ while (itimes--) {
+ for (list<AudioRange>::iterator i = ranges.begin (); i != ranges.end (); ++i) {
+ boost::shared_ptr<Playlist> pl = copy ((*i).start, (*i).length (), true);
+ paste (pl, (*i).start + (offset * count), 1.0f, 0);
+ }
+ ++count;
}
}
}
void
- Playlist::split (framepos_t at, const int32_t& sub_num)
+ Playlist::split (framepos_t at, const int32_t sub_num)
{
RegionWriteLock rlock (this);
RegionList copy (regions.rlist());
}
void
- Playlist::split_region (boost::shared_ptr<Region> region, framepos_t playlist_position, const int32_t& sub_num)
+ Playlist::split_region (boost::shared_ptr<Region> region, framepos_t playlist_position, const int32_t sub_num)
{
RegionWriteLock rl (this);
_split_region (region, playlist_position, sub_num);
}
void
- Playlist::_split_region (boost::shared_ptr<Region> region, framepos_t playlist_position, const int32_t& sub_num)
+ Playlist::_split_region (boost::shared_ptr<Region> region, framepos_t playlist_position, const int32_t sub_num)
{
if (!region->covers (playlist_position)) {
return;
RegionWriteLock rl (this);
region_state_changed_connections.drop_connections ();
+ region_drop_references_connections.drop_connections ();
for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
pending_removes.insert (*i);
for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) {
(*i)->update_after_tempo_map_change ();
}
-
+ /* possibly causes a contents changed notification (flush_notifications()) */
thaw ();
- notify_contents_changed();
}
void