diff options
| author | David Robillard <d@drobilla.net> | 2006-07-05 19:47:25 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-05 19:47:25 +0000 |
| commit | 22c20ab6f215c0ab24702a479aa6821c25a7d058 (patch) | |
| tree | 3f606773d2082fd3f28857e1c1ef876d2e007559 /libs/ardour/audio_diskstream.cc | |
| parent | 5dc4abef7951c1a1b85fb6b9dbb194d73b8c4c2b (diff) | |
Merged with trunk, and a few trivial GUI updates etc.
git-svn-id: svn://localhost/ardour2/branches/midi@664 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_diskstream.cc')
| -rw-r--r-- | libs/ardour/audio_diskstream.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 277fad0ae8..f24993b87b 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -55,10 +55,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -//sigc::signal<void,AudioDiskstream*> AudioDiskstream::AudioDiskstreamCreated; sigc::signal<void,list<AudioFileSource*>*> AudioDiskstream::DeleteSources; -//sigc::signal<void> AudioDiskstream::DiskOverrun; -//sigc::signal<void> AudioDiskstream::DiskUnderrun; AudioDiskstream::AudioDiskstream (Session &sess, const string &name, Diskstream::Flag flag) : Diskstream(sess, name, flag) @@ -295,9 +292,9 @@ AudioDiskstream::find_and_use_playlist (const string& name) Playlist* pl; AudioPlaylist* playlist; - if ((pl = _session.get_playlist (name)) == 0) { - error << string_compose(_("AudioDiskstream: Session doesn't know about a Playlist called \"%1\""), name) << endmsg; - return -1; + if ((pl = _session.playlist_by_name (name)) == 0) { + playlist = new AudioPlaylist(_session, name); + pl = playlist; } if ((playlist = dynamic_cast<AudioPlaylist*> (pl)) == 0) { @@ -1630,6 +1627,7 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca srcs.push_back (s); if ((fsrc = dynamic_cast<AudioFileSource *>(s)) != 0) { + cerr << "updating source after capture\n"; fsrc->update_header (capture_info.front()->start, when, twhen); } |