summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-04-27 00:59:31 +0000
committerCarl Hetherington <carl@carlh.net>2010-04-27 00:59:31 +0000
commit56469c195640b561119852fd6d27a4b56e5af7e2 (patch)
tree3fabbc408f32e74fab6634d08f553344085b4315
parent581376e0ed7d8934b384766ee4500dd6abeb755d (diff)
Revert my revision 6996, which was wrong. Sources need to stay around in the session even when they are no longer being used as the write source for a Diskstream.
git-svn-id: svn://localhost/ardour2/branches/3.0@7000 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--libs/ardour/midi_diskstream.cc1
-rw-r--r--libs/ardour/session.cc1
2 files changed, 0 insertions, 2 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index f45331a5b1..8db5a277db 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -924,7 +924,6 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
if (_write_source) {
_write_source->mark_for_remove ();
- _write_source->drop_references ();
_write_source.reset();
}
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 4ac6f9ebbc..f41b4f8fba 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -2427,7 +2427,6 @@ Session::add_source (boost::shared_ptr<Source> source)
}
if (result.second) {
- source->DropReferences.connect_same_thread (*this, boost::bind (&Session::remove_source, this, boost::weak_ptr<Source> (source)));
set_dirty();
}