X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_diskstream.cc;h=330b9d582acda0367d509993f54c0b1b2b98e339;hb=d92686afb4105b84b014372b6feb0ccc454a5171;hp=3d719cc30b122f6c57458973a9936a3a90e15239;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 3d719cc30b..330b9d582a 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -16,7 +16,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <fstream>
 #include <cstdio>
 #include <unistd.h>
 #include <cmath>
@@ -28,7 +27,7 @@
 #include <cstdlib>
 #include <ctime>
 
-#include <pbd/gstdio_compat.h>
+#include "pbd/gstdio_compat.h"
 #include "pbd/error.h"
 #include "pbd/xml++.h"
 #include "pbd/memento_command.h"
@@ -57,7 +56,7 @@
 #include "ardour/types.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;
@@ -169,7 +168,7 @@ AudioDiskstream::non_realtime_input_change ()
 			need_write_sources = true;
 		}
 
-		if (input_change_pending.type == IOChange::ConfigurationChanged) {
+		if (input_change_pending.type & IOChange::ConfigurationChanged) {
 			RCUWriter<ChannelList> writer (channels);
 			boost::shared_ptr<ChannelList> c = writer.get_copy();
 
@@ -360,7 +359,7 @@ AudioDiskstream::use_destructive_playlist ()
 
 	boost::shared_ptr<Region> rp;
 	{
-		const RegionList& rl (_playlist->region_list().rlist());
+		const RegionList& rl (_playlist->region_list_property().rlist());
 		if (rl.size() > 0) {
 			assert((rl.size() == 1));
 			rp = rl.front();
@@ -378,9 +377,9 @@ AudioDiskstream::use_destructive_playlist ()
 		throw failed_constructor();
 	}
 
-	/* be sure to stretch the region out to the maximum length */
+	/* be sure to stretch the region out to the maximum length (non-musical)*/
 
-	region->set_length (max_framepos - region->position());
+	region->set_length (max_framepos - region->position(), 0);
 
 	uint32_t n;
 	ChannelList::iterator chan;
@@ -1896,7 +1895,7 @@ AudioDiskstream::get_state ()
 {
 	XMLNode& node (Diskstream::get_state());
 	char buf[64] = "";
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg;
 
 	boost::shared_ptr<ChannelList> c = channels.reader();
 	snprintf (buf, sizeof(buf), "%u", (unsigned int) c->size());
@@ -1933,12 +1932,12 @@ AudioDiskstream::get_state ()
 int
 AudioDiskstream::set_state (const XMLNode& node, int version)
 {
-	const XMLProperty* prop;
+	XMLProperty const * prop;
 	XMLNodeList nlist = node.children();
 	XMLNodeIterator niter;
 	uint32_t nchans = 1;
 	XMLNode* capture_pending_node = 0;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg;
 
 	/* prevent write sources from being created */
 
@@ -2238,11 +2237,11 @@ AudioDiskstream::playback_buffer_load () const
 	boost::shared_ptr<ChannelList> c = channels.reader();
 
 	if (c->empty ()) {
-		return 0;
+		return 1.0;
 	}
 
 	return (float) ((double) c->front()->playback_buf->read_space()/
-			(double) c->front()->playback_buf->bufsize());
+	                   (double) c->front()->playback_buf->bufsize());
 }
 
 float
@@ -2251,7 +2250,7 @@ AudioDiskstream::capture_buffer_load () const
 	boost::shared_ptr<ChannelList> c = channels.reader();
 
 	if (c->empty ()) {
-		return 0;
+		return 1.0;
 	}
 
 	return (float) ((double) c->front()->capture_buf->write_space()/
@@ -2261,7 +2260,7 @@ AudioDiskstream::capture_buffer_load () const
 int
 AudioDiskstream::use_pending_capture_data (XMLNode& node)
 {
-	const XMLProperty* prop;
+	XMLProperty const * prop;
 	XMLNodeList nlist = node.children();
 	XMLNodeIterator niter;
 	boost::shared_ptr<AudioFileSource> fs;
@@ -2436,7 +2435,7 @@ AudioDiskstream::can_become_destructive (bool& requires_bounce) const
 
 	boost::shared_ptr<Region> first;
 	{
-		const RegionList& rl (_playlist->region_list().rlist());
+		const RegionList& rl (_playlist->region_list_property().rlist());
 		assert((rl.size() == 1));
 		first = rl.front();