Mercurial > hg > svcore

changeset 1691:d08b560102a1 single-point

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Wed, 24 Apr 2019 11:44:32 +0100
parents d7b04b0ed056 (current diff) ea1aa24ebf89 (diff)
children 718ce5fb9fec
files data/model/AggregateWaveModel.cpp data/model/AlignmentModel.cpp data/model/AlignmentModel.h data/model/FFTModel.cpp
diffstat 2 files changed, 20 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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();
--- 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
         }
     }