[Sv1-commits] SF.net SVN: sv1:[1704] sonic-visualiser/trunk/transform/FileFeatureWriter. cpp

[<ca...@us...>]

Revision: 1704
          http://sv1.svn.sourceforge.net/sv1/?rev=1704&view=rev
Author:   cannam
Date:     2010-05-24 16:04:10 +0000 (Mon, 24 May 2010)

Log Message:
-----------

* Avoid failing on second and subsequent input files in single-output-file
 mode (because first input file caused output file to be open, so second
 input file failed because output "already existed")

Modified Paths:
--------------
    sonic-visualiser/trunk/transform/FileFeatureWriter.cpp

Modified: sonic-visualiser/trunk/transform/FileFeatureWriter.cpp
===================================================================
--- sonic-visualiser/trunk/transform/FileFeatureWriter.cpp	2010-05-24 16:03:41 UTC (rev 1703)
+++ sonic-visualiser/trunk/transform/FileFeatureWriter.cpp	2010-05-24 16:04:10 UTC (rev 1704)
@@ -218,7 +218,14 @@
 FileFeatureWriter::testOutputFile(QString trackId,
                                   TransformId transformId)
 {
-    if (m_stdout) return;
+    // Obviously, if we're writing to stdout we can't test for an
+    // openable output file. But when writing a single file we don't
+    // want to either, because this test would fail on the second and
+    // subsequent input files (because the file would already exist).
+    // getOutputFile does the right thing in this case, so we just
+    // leave it to it
+    if (m_stdout || m_singleFileName != "") return;
+
     QString filename = getOutputFilename(trackId, transformId);
     if (filename == "") {
         throw FailedToOpenOutputStream(trackId, transformId);
@@ -266,7 +273,7 @@
             m_files[key] = 0;
             throw FailedToOpenFile(filename);
         }
-
+        
         m_files[key] = file;
     }
 
@@ -281,7 +288,7 @@
     if (!file && !m_stdout) {
         return 0;
     }
-
+    
     if (m_streams.find(file) == m_streams.end()) {
         if (m_stdout) {
             m_streams[file] = new QTextStream(stdout);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.