Be more tolerant to missing values or errors in io_config()

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

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 64d91b1ea827c5fd199aceb37409ec9f7acfb481..330b9d582acda0367d509993f54c0b1b2b98e339 100644 (file)
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -56,7 +56,7 @@
 #include "ardour/types.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;
@@ -359,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();
@@ -377,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;
@@ -2435,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();