X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdiskstream.cc;h=18aeb329310bd7b739fb9e0862e7811b12fb2c5b;hb=c7e404a1c0ee9af941a335e4bdd2f667b0c6317a;hp=e9f8499981bd56612270f17318aa19f854bfda34;hpb=22e41063d5b0c4c80eab3e3a375b734ca7d76169;p=ardour.git

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index e9f8499981..18aeb32931 100644
--- 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);
 }
@@ -118,6 +114,7 @@ Diskstream::init (Flag f)
 	playback_distance = 0;
 	_read_data_count = 0;
 	_write_data_count = 0;
+	commit_should_unlock = false;
 
 	pending_overwrite = false;
 	overwrite_frame = 0;
@@ -127,11 +124,8 @@ Diskstream::init (Flag f)
 
 Diskstream::~Diskstream ()
 {
-	// Taken by derived class destrctors.. should assure locked here somehow?
-	//Glib::Mutex::Lock lm (state_lock);
-
 	if (_playlist)
-		_playlist->unref ();
+		_playlist->release ();
 }
 
 void
@@ -219,7 +213,9 @@ Diskstream::prepare ()
 void
 Diskstream::recover ()
 {
-	state_lock.unlock();
+	if (commit_should_unlock) {
+		state_lock.unlock();
+	}
 	_processed = false;
 }
 
@@ -305,7 +301,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);
@@ -314,26 +310,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;
 	}
@@ -360,14 +360,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
@@ -390,14 +397,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);
 }
+