Revert "Allow loading sessions with missing external files #7067"

This reverts commit feed9648e19f5750b102a161a1028bb143ea16c5.

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index b833ee1807c4b231ba581a20b60aeba01f02ff47..d91280284de7d766e94ff1444311a5f09c03a1dc 100644 (file)
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -88,7 +88,7 @@ protected:
                        SampleFormat samp_format, HeaderFormat hdr_format);
 
        /** Constructor to be called for existing in-session files */
-       AudioFileSource (Session&, const XMLNode&, bool must_exist = true, bool optional_origin = false);
+       AudioFileSource (Session&, const XMLNode&, bool must_exist = true);
 
        /** Constructor to be called for crash recovery. Final argument is not
         * used but exists to differentiate from the external-to-session

diff --git a/libs/ardour/ardour/silentfilesource.h b/libs/ardour/ardour/silentfilesource.h
index ebc295d08d7ddf8bba5cf41eed5b33d4de76e0ca..80f4b361b233517693003840722d45967ab46f86 100644 (file)
--- a/libs/ardour/ardour/silentfilesource.h
+++ b/libs/ardour/ardour/silentfilesource.h
@@ -45,7 +45,7 @@ protected:
 
        SilentFileSource (Session& s, const XMLNode& x, framecnt_t len, float srate)
                : Source (s, x)
-               , AudioFileSource (s, x, false, true)
+               , AudioFileSource (s, x, false)
                , _sample_rate(srate)
        {
                _length = len;

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 8e1f50a55dea2ccd3aff80898a9a0d57a98a361b..a25e19ea5ac1aa5b0075a3d49d54f6ca2b07131e 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -135,7 +135,7 @@ AudioFileSource::AudioFileSource (Session& s, const string& path, Source::Flag f
  * is an absolute path after ::set_state(), then the file is external to the
  * session.
  */
-AudioFileSource::AudioFileSource (Session& s, const XMLNode& node, bool must_exist, bool optional_origin)
+AudioFileSource::AudioFileSource (Session& s, const XMLNode& node, bool must_exist)
        : Source (s, node)
        , AudioSource (s, node)
        , FileSource (s, node, must_exist)
@@ -146,7 +146,7 @@ AudioFileSource::AudioFileSource (Session& s, const XMLNode& node, bool must_exi
 
        if (Glib::path_is_absolute (_origin)) {
                _path = _origin;
-               must_exist = !optional_origin;
+               must_exist = true;
        }
 
        if (init (_path, must_exist)) {