Removed unused session_control.cc.

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

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 9e83c5e21a1243edbb9c755b97c7ed6f74cb9c91..812709cda13670e8cffaa9d6e5e97e3b6c730c48 100644 (file)
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: diskstream.cc 567 2006-06-07 14:54:12Z trutkin $
 */
 
 #include <fstream>
@@ -45,7 +44,6 @@
 #include <ardour/utils.h>
 #include <ardour/configuration.h>
 #include <ardour/audiofilesource.h>
-#include <ardour/destructive_filesource.h>
 #include <ardour/send.h>
 #include <ardour/playlist.h>
 #include <ardour/cycle_timer.h>
@@ -71,14 +69,12 @@ sigc::signal<void>                Diskstream::DiskUnderrun;
 Diskstream::Diskstream (Session &sess, const string &name, Flag flag)
        : _name (name)
        , _session (sess)
-       , _playlist(NULL)
 {
        init (flag);
 }
        
 Diskstream::Diskstream (Session& sess, const XMLNode& node)
        : _session (sess)
-       , _playlist(NULL)
 {
        init (Recordable);
 }
@@ -133,7 +129,7 @@ Diskstream::~Diskstream ()
        //Glib::Mutex::Lock lm (state_lock);
 
        if (_playlist)
-               _playlist->unref ();
+               _playlist->release ();
 }
 
 void
@@ -307,7 +303,7 @@ Diskstream::set_speed (double sp)
 }
 
 int
-Diskstream::use_playlist (Playlist* playlist)
+Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
 {
        {
                Glib::Mutex::Lock lm (state_lock);
@@ -316,26 +312,30 @@ Diskstream::use_playlist (Playlist* playlist)
                        return 0;
                }
 
-               plstate_connection.disconnect();
                plmod_connection.disconnect ();
                plgone_connection.disconnect ();
 
                if (_playlist) {
-                       _playlist->unref();
+                       _playlist->release();
                }
                        
                _playlist = playlist;
-               _playlist->ref();
+               _playlist->use();
 
                if (!in_set_state && recordable()) {
                        reset_write_sources (false);
                }
                
                plmod_connection = _playlist->Modified.connect (mem_fun (*this, &Diskstream::playlist_modified));
-               plgone_connection = _playlist->GoingAway.connect (bind (mem_fun (*this, &Diskstream::playlist_deleted), _playlist));
+               plgone_connection = _playlist->GoingAway.connect (bind (mem_fun (*this, &Diskstream::playlist_deleted), boost::weak_ptr<Playlist>(_playlist)));
        }
 
-       if (!overwrite_queued) {
+       /* don't do this if we've already asked for it *or* if we are setting up
+          the diskstream for the very first time - the input changed handling will
+          take care of the buffer refill.
+       */
+
+       if (!overwrite_queued && !(_session.state_of_the_state() & Session::CannotSave)) {
                _session.request_overwrite_buffer (this);
                overwrite_queued = true;
        }
@@ -362,14 +362,21 @@ Diskstream::playlist_modified ()
 }
 
 void
-Diskstream::playlist_deleted (Playlist* pl)
+Diskstream::playlist_deleted (boost::weak_ptr<Playlist> wpl)
 {
-       /* this catches an ordering issue with session destruction. playlists 
-          are destroyed before diskstreams. we have to invalidate any handles
-          we have to the playlist.
-       */
+       boost::shared_ptr<Playlist> pl (wpl.lock());
+
+       if (pl == _playlist) {
 
-       _playlist = 0;
+               /* this catches an ordering issue with session destruction. playlists 
+                  are destroyed before diskstreams. we have to invalidate any handles
+                  we have to the playlist.
+               */
+               
+               if (_playlist) {
+                       _playlist.reset ();
+               } 
+       }
 }
 
 int
@@ -392,14 +399,14 @@ Diskstream::set_name (string str)
 }
 
 void
-Diskstream::set_destructive (bool yn)
+Diskstream::remove_region_from_last_capture (boost::weak_ptr<Region> wregion)
 {
-       if (yn != destructive()) {
-               reset_write_sources (true, true);
-               if (yn) {
-                       _flags |= Destructive;
-               } else {
-                       _flags &= ~Destructive;
-               }
+       boost::shared_ptr<Region> region (wregion.lock());
+
+       if (!region) {
+               return;
        }
+       
+       _last_capture_regions.remove (region);
 }
+