cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropRefe...

[ardour.git] / libs / ardour / audio_diskstream.cc

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 6c96f5c598fae3f89b4f84ffb34d298421f6cab7..fb225671e9ba8198ea1a8bb557803c2946d0a7c8 100644 (file)
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -44,6 +44,7 @@
 #include "ardour/audio_port.h"
 #include "ardour/audioengine.h"
 #include "ardour/audiofilesource.h"
+
 #include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
 #include "ardour/butler.h"
@@ -57,6 +58,7 @@
 #include "ardour/session.h"
 #include "ardour/source_factory.h"
 #include "ardour/utils.h"
+#include "ardour/session_playlists.h"
 
 #include "i18n.h"
 #include <locale.h>
@@ -125,8 +127,6 @@ AudioDiskstream::~AudioDiskstream ()
 {
        DEBUG_TRACE (DEBUG::Destruction, string_compose ("Audio Diskstream %1 destructor\n", _name));
 
-       notify_callbacks ();
-
        {
                RCUWriter<ChannelList> writer (channels);
                boost::shared_ptr<ChannelList> c = writer.get_copy();
@@ -257,7 +257,7 @@ AudioDiskstream::find_and_use_playlist (const string& name)
 {
        boost::shared_ptr<AudioPlaylist> playlist;
 
-       if ((playlist = boost::dynamic_pointer_cast<AudioPlaylist> (_session.playlist_by_name (name))) == 0) {
+       if ((playlist = boost::dynamic_pointer_cast<AudioPlaylist> (_session.playlists->by_name (name))) == 0) {
                playlist = boost::dynamic_pointer_cast<AudioPlaylist> (PlaylistFactory::create (DataType::AUDIO, _session, name));
        }
 
@@ -1505,7 +1505,7 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
                                continue; /* XXX is this OK? */
                        }
 
-                       region->GoingAway.connect (bind (mem_fun (*this, &Diskstream::remove_region_from_last_capture), boost::weak_ptr<Region>(region)));
+                       region->DropReferences.connect_same_thread (*this, boost::bind (&Diskstream::remove_region_from_last_capture, this, boost::weak_ptr<Region>(region)));
 
                        _last_capture_regions.push_back (region);
 
@@ -1651,15 +1651,6 @@ AudioDiskstream::set_record_enabled (bool yn)
                return;
        }
 
-       if (yn && channels.reader()->front()->source == 0) {
-
-               /* pick up connections not initiated *from* the IO object
-                  we're associated with.
-               */
-
-               get_input_sources ();
-       }
-
        /* yes, i know that this not proof against race conditions, but its
           good enough. i think.
        */
@@ -2312,7 +2303,7 @@ AudioDiskstream::can_become_destructive (bool& requires_bounce) const
 
        assert (afirst);
 
-       if (_session.source_use_count (afirst->source()) > 1) {
+       if (_session.playlists->source_use_count (afirst->source()) > 1) {
                requires_bounce = true;
                return false;
        }