[Sv1-commits] SF.net SVN: sv1:[1585] sonic-annotator/trunk/runner

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

Revision: 1585
          http://sv1.svn.sourceforge.net/sv1/?rev=1585&view=rev
Author:   cannam
Date:     2009-07-07 10:50:24 +0000 (Tue, 07 Jul 2009)

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

* fixes to --force option

Modified Paths:
--------------
    sonic-annotator/trunk/runner/FeatureExtractionManager.cpp
    sonic-annotator/trunk/runner/main.cpp

Modified: sonic-annotator/trunk/runner/FeatureExtractionManager.cpp
===================================================================
--- sonic-annotator/trunk/runner/FeatureExtractionManager.cpp	2009-07-07 10:34:27 UTC (rev 1584)
+++ sonic-annotator/trunk/runner/FeatureExtractionManager.cpp	2009-07-07 10:50:24 UTC (rev 1585)
@@ -577,7 +577,7 @@
         if (progress > pp) extractionProgress.setProgress(progress);
     }
 
-    std::cerr << "FeatureExtractionManager: deleting audio file reader" << std::endl;
+//    std::cerr << "FeatureExtractionManager: deleting audio file reader" << std::endl;
 
     delete reader;
     

Modified: sonic-annotator/trunk/runner/main.cpp
===================================================================
--- sonic-annotator/trunk/runner/main.cpp	2009-07-07 10:34:27 UTC (rev 1584)
+++ sonic-annotator/trunk/runner/main.cpp	2009-07-07 10:50:24 UTC (rev 1585)
@@ -725,11 +725,18 @@
         std::cerr << "Extracting features for: \"" << i->toStdString() << "\"" << std::endl;
         try {
             manager.extractFeatures(*i);
-        } catch (std::exception e) {
+        } catch (const std::exception &e) {
             cerr << "ERROR: Failed to process file \"" << i->toStdString()
                  << "\": " << e.what() << endl;
-            if (force) continue;
-            else break;
+            if (force) {
+                // print a note only if we have more files to process
+                QStringList::const_iterator j = i;
+                if (++j != sources.end()) {
+                    cerr << "NOTE: \"--force\" option was provided, continuing (more errors may occur)" << endl;
+                }
+            } else {
+                break;
+            }
         }
     }
     


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