Mercurial > hg > svapp

changeset 618:636a5908cf81 import-audio-data

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Tue, 04 Sep 2018 13:19:43 +0100
parents 6cdf2afebfd7 (diff) e98a42e94d90 (current diff)
children 0e95c30d6680
files framework/MainWindowBase.cpp
diffstat 2 files changed, 20 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Tue Sep 04 11:32:49 2018 +0100
+++ b/framework/MainWindowBase.cpp	Tue Sep 04 13:19:43 2018 +0100
@@ -1498,8 +1498,16 @@
         }
     }
 
-//    cerr << "mode = " << mode << endl;
-
+    return addOpenedAudioModel(source, newModel, mode, templateName, true);
+}
+
+MainWindowBase::FileOpenStatus
+MainWindowBase::addOpenedAudioModel(FileSource source,
+                                    WaveFileModel *newModel,
+                                    AudioFileOpenMode mode,
+                                    QString templateName,
+                                    bool registerSource)
+{
     if (mode == AskUser) {
         if (getMainModel()) {
 
@@ -1635,7 +1643,9 @@
             }
         }
 
-        if (!source.isRemote()) m_audioFile = source.getLocalFilename();
+        if (!source.isRemote() && registerSource) {
+            m_audioFile = source.getLocalFilename();
+        }
 
     } else if (mode == CreateAdditionalModel) {
 
@@ -1705,7 +1715,7 @@
 
     updateMenuStates();
     m_recentFiles.addFile(source.getLocation());
-    if (!source.isRemote()) {
+    if (!source.isRemote() && registerSource) {
         // for file dialog
         registerLastOpenedFilePath(FileFinder::AudioFile,
                                    source.getLocalFilename());
--- a/framework/MainWindowBase.h	Tue Sep 04 11:32:49 2018 +0100
+++ b/framework/MainWindowBase.h	Tue Sep 04 13:19:43 2018 +0100
@@ -396,6 +396,12 @@
     const WaveFileModel *getMainModel() const;
     void createDocument();
 
+    FileOpenStatus addOpenedAudioModel(FileSource source,
+                                       WaveFileModel *model,
+                                       AudioFileOpenMode mode,
+                                       QString templateName,
+                                       bool registerSource);
+    
     sv_frame_t getModelsStartFrame() const; // earliest across all views
     sv_frame_t getModelsEndFrame() const; // latest across all views