provide support for playhead-to-next/previous-region-boundary actions, and bindings...

[ardour.git] / libs / ardour / audiofilesource.cc

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 3a02c4c4b0ccf6416a766283e14833692c75218b..73629368267bafcc59cf6e84e3a86343466286ea 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -21,10 +21,13 @@
 
 #include <sys/time.h>
 #include <sys/stat.h>
+#include <stdio.h> // for rename(), sigh
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
+#include <pbd/convert.h>
+#include <pbd/basename.h>
 #include <pbd/mountpoint.h>
 #include <pbd/pathscanner.h>
 #include <pbd/stl_delete.h>
@@ -153,7 +156,66 @@ AudioFileSource::init (ustring pathstr, bool must_exist)
 ustring
 AudioFileSource::peak_path (ustring audio_path)
 {
-       return _session.peak_path_from_audio_path (audio_path);
+       ustring base;
+
+       base = PBD::basename_nosuffix (audio_path);
+       base += '%';
+       base += (char) ('A' + _channel);
+
+       return _session.peak_path (base);
+}
+
+ustring
+AudioFileSource::find_broken_peakfile (ustring peak_path, ustring audio_path)
+{
+       ustring str;
+
+       /* check for the broken location in use by 2.0 for several months */
+       
+       str = broken_peak_path (audio_path);
+       
+       if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
+               
+               if (is_embedded()) {
+                       
+                       /* it would be nice to rename it but the nature of 
+                          the bug means that we can't reliably use it.
+                       */
+                       
+                       peak_path = str;
+                       
+               } else {
+                       /* all native files are mono, so we can just rename
+                          it.
+                       */
+                       ::rename (str.c_str(), peak_path.c_str());
+               }
+               
+       } else {
+               /* Nasty band-aid for older sessions that were created before we
+                  used libsndfile for all audio files.
+               */
+               
+               
+               str = old_peak_path (audio_path);       
+               if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
+                       peak_path = str;
+               }
+       }
+
+       return peak_path;
+}
+
+ustring
+AudioFileSource::broken_peak_path (ustring audio_path)
+{
+       ustring res;
+
+       res = _session.peak_dir ();
+       res += PBD::basename_nosuffix (audio_path);
+       res += ".peak";
+
+       return res;
 }
 
 ustring
@@ -248,7 +310,10 @@ AudioFileSource::set_state (const XMLNode& node)
 void
 AudioFileSource::mark_for_remove ()
 {
-       if (!writable()) {
+       // This operation is not allowed for sources for destructive tracks or embedded files.
+       // Fortunately mark_for_remove() is never called for embedded files. This function
+       // must be fixed if that ever happens.
+       if (_flags & Destructive) {
                return;
        }
 
@@ -262,8 +327,12 @@ AudioFileSource::mark_streaming_write_completed ()
                return;
        }
 
-       Glib::Mutex::Lock lm (_lock);
+       /* XXX notice that we're readers of _peaks_built
+          but we must hold a solid lock on PeaksReady.
+       */
 
+       Glib::Mutex::Lock lm (_lock);
+       
        if (_peaks_built) {
                PeaksReady (); /* EMIT SIGNAL */
        }
@@ -590,14 +659,15 @@ AudioFileSource::set_name (ustring newname, bool destructive)
 bool
 AudioFileSource::is_empty (Session& s, ustring path)
 {
-       bool ret = false;
-       boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (s, path, 0, NoPeakFile, false));
-
-       if (afs) {
-               ret = (afs->length() == 0);
+       SoundFileInfo info;
+       string err;
+       
+       if (!get_soundfile_info (path, info, err)) {
+               /* dangerous: we can't get info, so assume that its not empty */
+               return false; 
        }
 
-       return ret;
+       return info.length == 0;
 }
 
 int