smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

merge changes from harrison branch back into trunk, by hand

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@878 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-08-31 13:23:43 +00:00
parent dde980289a
commit 21d85f1854
27 changed files with 287 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/ardour/audio_diskstream.cc
View file

@ -250,8 +250,7 @@ AudioDiskstream::non_realtime_input_change ()
if (speed() != 1.0f || speed() != -1.0f) {
seek ((jack_nframes_t) (_session.transport_frame() * (double) speed()));
}
else {
} else {
seek (_session.transport_frame());
}
}
@ -384,8 +383,12 @@ AudioDiskstream::setup_destructive_playlist ()
void
AudioDiskstream::use_destructive_playlist ()
{
/* use the sources associated with the single full-extent region */
/* this is called from the XML-based constructor. when its done,
we already have a playlist and a region, but we need to
set up our sources for write. we use the sources associated
with the (presumed single, full-extent) region.
*/
Playlist::RegionList* rl = _playlist->regions_at (0);
if (rl->empty()) {