# HG changeset patch
# User Chris Cannam
# Date 1556188251 -3600
# Node ID 718ce5fb9fec8db4ccdac347c9a1bfd876b9365c
# Parent  73077ec5aed62c406aaf57df0a1e8295e2724a47# Parent  d08b560102a14744b6b7f4dcdbec0902fa54835b
Merge

diff -r 73077ec5aed6 -r 718ce5fb9fec data/fileio/FileFinder.h
--- a/data/fileio/FileFinder.h	Thu Apr 25 11:30:38 2019 +0100
+++ b/data/fileio/FileFinder.h	Thu Apr 25 11:30:51 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 73077ec5aed6 -r 718ce5fb9fec data/model/AlignmentModel.cpp
--- a/data/model/AlignmentModel.cpp	Thu Apr 25 11:30:38 2019 +0100
+++ b/data/model/AlignmentModel.cpp	Thu Apr 25 11:30:51 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
         }
     }