# HG changeset patch
# User Chris Cannam
# Date 1556102672 -3600
# Node ID d08b560102a14744b6b7f4dcdbec0902fa54835b
# Parent  d7b04b0ed056135a190f23bce4bc8f3a6f956d5e# Parent  ea1aa24ebf89b3b08d5d0c138b5987235abcece5
Merge from default branch

diff -r d7b04b0ed056 -r d08b560102a1 data/fileio/FileFinder.h
--- a/data/fileio/FileFinder.h	Fri Apr 05 13:40:08 2019 +0100
+++ b/data/fileio/FileFinder.h	Wed Apr 24 11:44:32 2019 +0100
@@ -35,11 +35,21 @@
         LayerFileNoMidiNonSV,
     };
 
-    virtual QString getOpenFileName(FileType type, QString fallbackLocation = "") = 0;
-    virtual QString getSaveFileName(FileType type, QString fallbackLocation = "") = 0;
-    virtual void registerLastOpenedFilePath(FileType type, QString path) = 0;
+    virtual QString getOpenFileName(FileType type,
+                                    QString fallbackLocation = "") = 0;
 
-    virtual QString find(FileType type, QString location, QString lastKnownLocation = "") = 0;
+    virtual QStringList getOpenFileNames(FileType type,
+                                         QString fallbackLocation = "") = 0;
+
+    virtual QString getSaveFileName(FileType type,
+                                    QString fallbackLocation = "") = 0;
+
+    virtual void registerLastOpenedFilePath(FileType type,
+                                            QString path) = 0;
+
+    virtual QString find(FileType type,
+                         QString location,
+                         QString lastKnownLocation = "") = 0;
 
     static FileFinder *getInstance() {
         FFContainer *container = FFContainer::getInstance();
diff -r d7b04b0ed056 -r d08b560102a1 data/model/AlignmentModel.cpp
--- a/data/model/AlignmentModel.cpp	Fri Apr 05 13:40:08 2019 +0100
+++ b/data/model/AlignmentModel.cpp	Wed Apr 24 11:44:32 2019 +0100
@@ -52,7 +52,9 @@
 
 AlignmentModel::~AlignmentModel()
 {
-    SVDEBUG << "AlignmentModel(" << this << ")::~AlignmentModel()" << endl;
+#ifdef DEBUG_ALIGNMENT_MODEL
+    SVCERR << "AlignmentModel(" << this << ")::~AlignmentModel()" << endl;
+#endif
 
     if (m_rawPath) m_rawPath->aboutToDelete();
     delete m_rawPath;
@@ -209,7 +211,9 @@
             constructPath();
             constructReversePath();
 
-            SVDEBUG << "AlignmentModel: path complete" << endl;
+#ifdef DEBUG_ALIGNMENT_MODEL
+            SVCERR << "AlignmentModel: path complete" << endl;
+#endif
         }
     }