diff options
author | David Robillard <d@drobilla.net> | 2006-08-01 17:19:38 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-08-01 17:19:38 +0000 |
commit | 79fc27de2ef9db51a8c7c69764b663a9921c5a40 (patch) | |
tree | 09d5e86fa212f2b8dde0811b2c9e8cc7cfbc7136 /libs/ardour/diskstream.cc | |
parent | 9d5d82b4df5b3510177fd31557ac765f46778fe8 (diff) |
Mostly Cosmetic/Design changes to bring trunk and midi branch closer
git-svn-id: svn://localhost/ardour2/branches/midi@733 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/diskstream.cc')
-rw-r--r-- | libs/ardour/diskstream.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index 9fc2ded0ce..9312de5bf1 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -58,7 +58,7 @@ using namespace PBD; jack_nframes_t Diskstream::disk_io_chunk_frames = 0; sigc::signal<void,Diskstream*> Diskstream::DiskstreamCreated; -//sigc::signal<void,list<AudioFileSource*>*> Diskstream::DeleteSources; +sigc::signal<void,list<Source*>*> Diskstream::DeleteSources; sigc::signal<void> Diskstream::DiskOverrun; sigc::signal<void> Diskstream::DiskUnderrun; @@ -124,7 +124,7 @@ Diskstream::init (Flag f) Diskstream::~Diskstream () { - // Taken by derived class destrctors.. assure lock? + // Taken by derived class destrctors.. should assure locked here somehow? //Glib::Mutex::Lock lm (state_lock); if (_playlist) @@ -369,7 +369,7 @@ Diskstream::playlist_deleted (Playlist* pl) } int -Diskstream::set_name (string str, void *src) +Diskstream::set_name (string str) { if (str != _name) { assert(playlist()); |