summaryrefslogtreecommitdiff
path: root/libs/ardour/audio_track.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-12-13 16:52:33 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-12-13 16:52:33 +0000
commit88d49cdb5734632ada27d2de018533ecd13ac31e (patch)
tree73af68bc87738020aef6b37b2de22d6c0615b147 /libs/ardour/audio_track.cc
parent9f897d097a72601b9a032c0474422d40d6c415f5 (diff)
fix up mess with unassigned Playlist::orig_track_id
git-svn-id: svn://localhost/ardour2/branches/3.0@10998 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_track.cc')
-rw-r--r--libs/ardour/audio_track.cc12
1 files changed, 3 insertions, 9 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index a8f43c4758..74be81c909 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -61,8 +61,8 @@ AudioTrack::~AudioTrack ()
{
}
-void
-AudioTrack::use_new_diskstream ()
+boost::shared_ptr<Diskstream>
+AudioTrack::create_diskstream ()
{
AudioDiskstream::Flag dflags = AudioDiskstream::Flag (0);
@@ -78,13 +78,7 @@ AudioTrack::use_new_diskstream ()
dflags = AudioDiskstream::Flag(dflags | AudioDiskstream::NonLayered);
}
- AudioDiskstream* dsp (new AudioDiskstream (_session, name(), dflags));
- boost::shared_ptr<AudioDiskstream> ds (dsp);
-
- ds->do_refill_with_alloc ();
- ds->set_block_size (_session.get_block_size ());
-
- set_diskstream (ds);
+ return boost::shared_ptr<AudioDiskstream> (new AudioDiskstream (_session, name(), dflags));
}
void