ardour/livetrax
13
0
Fork 0
Code

Merge branch 'chaot4-fix_fill_track'

Browse Source
This commit is contained in:
Paul Davis 2015-12-02 14:59:55 -05:00
commit 535d25c141
3 changed files with 56 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gtk2_ardour/editor_ops.cc
View File

@ -3306,56 +3306,49 @@ Editor::crop_region_to (framepos_t start, framepos_t end)
void
Editor::region_fill_track ()
{
RegionSelection rs = get_regions_from_selection_and_entered ();
boost::shared_ptr<Playlist> playlist;
RegionSelection regions = get_regions_from_selection_and_entered ();
RegionSelection foo;
if (!_session || rs.empty()) {
framepos_t const end = _session->current_end_frame ();
if (regions.empty () || regions.end_frame () + 1 >= end) {
return;
}
framepos_t const end = _session->current_end_frame ();
RegionSelection foo;
bool in_command = false;
framepos_t const start_frame = regions.start ();
framepos_t const end_frame = regions.end_frame ();
framecnt_t const gap = end_frame - start_frame + 1;
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
begin_reversible_command (Operations::region_fill);
boost::shared_ptr<Region> region ((*i)->region());
selection->clear_regions ();
boost::shared_ptr<Playlist> pl = region->playlist();
for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) {
if (end <= region->last_frame()) {
continue;
}
boost::shared_ptr<Region> r ((*i)->region());
double times = (double) (end - region->last_frame()) / (double) region->length();
if (times == 0) {
continue;
}
if (!in_command) {
begin_reversible_command (Operations::region_fill);
in_command = true;
}
TimeAxisView& tv = (*i)->get_time_axis_view();
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
latest_regionviews.clear ();
sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view));
pl->clear_changes ();
pl->add_region (RegionFactory::create (region, true), region->last_frame(), times);
_session->add_command (new StatefulDiffCommand (pl));
framepos_t const position = end_frame + (r->first_frame() - start_frame + 1);
playlist = (*i)->region()->playlist();
playlist->clear_changes ();
playlist->duplicate_until (r, position, gap, end);
_session->add_command(new StatefulDiffCommand (playlist));
c.disconnect ();
foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end());
}
if (in_command) {
if (!foo.empty()) {
selection->set (foo);
}
commit_reversible_command ();
if (!foo.empty()) {
selection->set (foo);
}
commit_reversible_command ();
}
void

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

@ -141,6 +141,7 @@ public:
void partition (framepos_t start, framepos_t end, bool cut = false);
void duplicate (boost::shared_ptr<Region>, framepos_t position, float times);
void duplicate (boost::shared_ptr<Region>, framepos_t position, framecnt_t gap, float times);
void duplicate_until (boost::shared_ptr<Region>, framepos_t position, framecnt_t gap, framepos_t end);
void nudge_after (framepos_t start, framecnt_t distance, bool forwards);
boost::shared_ptr<Region> combine (const RegionList&);
void uncombine (boost::shared_ptr<Region>);

33
libs/ardour/playlist.cc
View File

@ -1283,6 +1283,39 @@ Playlist::flush_notifications (bool from_undo)
}
}
/** @param gap from the beginning of the region to the next beginning */
/** @param end the first frame that does _not_ contain a duplicated frame */
void
Playlist::duplicate_until (boost::shared_ptr<Region> region, framepos_t position, framecnt_t gap, framepos_t end)
{
RegionWriteLock rl (this);
while (position + region->length() - 1 < end) {
boost::shared_ptr<Region> copy = RegionFactory::create (region, true);
add_region_internal (copy, position);
set_layer (copy, DBL_MAX);
position += gap;
}
if (position < end) {
framecnt_t length = min (region->length(), end - position);
string name;
RegionFactory::region_name (name, region->name(), false);
{
PropertyList plist;
plist.add (Properties::start, region->start());
plist.add (Properties::length, length);
plist.add (Properties::name, name);
boost::shared_ptr<Region> sub = RegionFactory::create (region, plist);
add_region_internal (sub, position);
set_layer (sub, DBL_MAX);
}
}
}
void
Playlist::shift (framepos_t at, frameoffset_t distance, bool move_intersected, bool ignore_music_glue)
{