fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 7d34b9d9a52c5aabb81fa4bbfa7d11c13acbb774..bb0b4da77446235869ecb83cb3f43e7659bcbbd5 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -30,8 +30,10 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include "pbd/gstdio_compat.h"
 #include "pbd/convert.h"
 #include "pbd/basename.h"
+#include "pbd/file_utils.h"
 #include "pbd/mountpoint.h"
 #include "pbd/stl_delete.h"
 #include "pbd/strsplit.h"
@@ -41,7 +43,6 @@
 
 #include <sndfile.h>
 
-#include <glib/gstdio.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/threads.h>
@@ -60,15 +61,13 @@
 #include <AudioToolbox/AudioFormat.h>
 #endif // HAVE_COREAUDIO
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Glib;
 
-string AudioFileSource::peak_dir = "";
-
 PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
 framecnt_t         AudioFileSource::header_position_offset = 0;
 
@@ -152,7 +151,7 @@ AudioFileSource::~AudioFileSource ()
        DEBUG_TRACE (DEBUG::Destruction, string_compose ("AudioFileSource destructor %1, removable? %2\n", _path, removable()));
        if (removable()) {
                ::g_unlink (_path.c_str());
-               ::g_unlink (peakpath.c_str());
+               ::g_unlink (_peakpath.c_str());
        }
 }
 
@@ -163,93 +162,21 @@ AudioFileSource::init (const string& pathstr, bool must_exist)
 }
 
 string
-AudioFileSource::peak_path (string audio_path)
+AudioFileSource::construct_peak_filepath (const string& audio_path, const bool in_session, const bool old_peak_name) const
 {
        string base;
-
-       base = PBD::basename_nosuffix (audio_path);
-       base += '%';
-       base += (char) ('A' + _channel);
-
-       return _session.peak_path (base);
-}
-
-string
-AudioFileSource::find_broken_peakfile (string peak_path, string audio_path)
-{
-       string 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 (!within_session()) {
-
-                       /* 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());
-               }
-
+       if (old_peak_name) {
+               base = audio_path.substr (0, audio_path.find_last_of ('.'));
        } 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;
-               }
+               base = audio_path;
        }
-
-       return peak_path;
-}
-
-string
-AudioFileSource::broken_peak_path (string audio_path)
-{
-       return _session.peak_path (basename_nosuffix (audio_path));
-}
-
-string
-AudioFileSource::old_peak_path (string audio_path)
-{
-       /* XXX hardly bombproof! fix me */
-
-       struct stat stat_file;
-       struct stat stat_mount;
-
-       string mp = mountpoint (audio_path);
-
-       stat (audio_path.c_str(), &stat_file);
-       stat (mp.c_str(), &stat_mount);
-
-       char buf[32];
-#ifdef __APPLE__
-       snprintf (buf, sizeof (buf), "%u-%u-%d.peak", stat_mount.st_ino, stat_file.st_ino, _channel);
-#else
-       snprintf (buf, sizeof (buf), "%" PRId64 "-%" PRId64 "-%d.peak", (int64_t) stat_mount.st_ino, (int64_t) stat_file.st_ino, _channel);
-#endif
-
-       string res = peak_dir;
-       res += buf;
-       res += peakfile_suffix;
-
-       return res;
+       base += '%';
+       base += (char) ('A' + _channel);
+       return _session.construct_peak_filepath (base, in_session, old_peak_name);
 }
 
 bool
-AudioFileSource::get_soundfile_info (string path, SoundFileInfo& _info, string& error_msg)
+AudioFileSource::get_soundfile_info (const string& path, SoundFileInfo& _info, string& error_msg)
 {
         /* try sndfile first because it gets timecode info from .wav (BWF) if it exists,
            which at present, ExtAudioFile from Apple seems unable to do.
@@ -298,19 +225,19 @@ AudioFileSource::set_state (const XMLNode& node, int version)
 }
 
 void
-AudioFileSource::mark_streaming_write_completed ()
+AudioFileSource::mark_streaming_write_completed (const Lock& lock)
 {
        if (!writable()) {
                return;
        }
 
-       AudioSource::mark_streaming_write_completed ();
+       AudioSource::mark_streaming_write_completed (lock);
 }
 
 int
 AudioFileSource::move_dependents_to_trash()
 {
-       return ::g_unlink (peakpath.c_str());
+       return ::g_unlink (_peakpath.c_str());
 }
 
 void
@@ -337,8 +264,11 @@ AudioFileSource::is_empty (Session& /*s*/, string path)
 int
 AudioFileSource::setup_peakfile ()
 {
+       if (_session.deletion_in_progress()) {
+               return 0;
+       }
        if (!(_flags & NoPeakFile)) {
-               return initialize_peakfile (_path);
+               return initialize_peakfile (_path, within_session());
        } else {
                return 0;
        }
@@ -413,3 +343,4 @@ AudioFileSource::get_interleave_buffer (framecnt_t size)
 
        return ssb->buf;
 }
+