Merge branch 'master' into windows

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

diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index 776749fb5723eaaef0150ec1a11833a07b25682e..65540d4e3dd153a8b00e9caa9068f36a143ea0bb 100644 (file)
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -30,8 +30,11 @@
 #include <algorithm>
 #include <vector>
 
-#include <boost/scoped_ptr.hpp>
+#include <glib.h>
+#include <glib/gstdio.h>
+
 #include <boost/scoped_array.hpp>
+#include <boost/scoped_ptr.hpp>
 
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
@@ -179,16 +182,16 @@ AudioSource::touch_peakfile ()
 {
        struct stat statbuf;
 
-       if (stat (peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) {
+       if (g_stat (peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) {
                return;
        }
 
        struct utimbuf tbuf;
 
        tbuf.actime = statbuf.st_atime;
-       tbuf.modtime = time ((time_t) 0);
+       tbuf.modtime = time ((time_t*) 0);
 
-       utime (peakpath.c_str(), &tbuf);
+       g_utime (peakpath.c_str(), &tbuf);
 }
 
 int
@@ -199,7 +202,7 @@ AudioSource::rename_peakfile (string newpath)
        string oldpath = peakpath;
 
        if (Glib::file_test (oldpath, Glib::FILE_TEST_EXISTS)) {
-               if (rename (oldpath.c_str(), newpath.c_str()) != 0) {
+               if (g_rename (oldpath.c_str(), newpath.c_str()) != 0) {
                        error << string_compose (_("cannot rename peakfile for %1 from %2 to %3 (%4)"), _name, oldpath, newpath, strerror (errno)) << endmsg;
                        return -1;
                }
@@ -225,7 +228,7 @@ AudioSource::initialize_peakfile (string audio_path)
                peakpath = find_broken_peakfile (peakpath, audio_path);
        }
 
-       if (stat (peakpath.c_str(), &statbuf)) {
+       if (g_stat (peakpath.c_str(), &statbuf)) {
                if (errno != ENOENT) {
                        /* it exists in the peaks dir, but there is some kind of error */
 
@@ -650,7 +653,7 @@ AudioSource::build_peaks_from_scratch ()
   out:
        if (ret) {
                DEBUG_TRACE (DEBUG::Peaks, string_compose("Could not write peak data, attempting to remove peakfile %1\n", peakpath));
-               unlink (peakpath.c_str());
+               ::g_unlink (peakpath.c_str());
        }
 
        return ret;
@@ -725,12 +728,18 @@ AudioSource::compute_and_write_peaks (Sample* buf, framecnt_t first_frame, frame
 
                        off_t byte = (peak_leftover_frame / fpp) * sizeof (PeakData);
 
-#ifndef WIN32
-                       if (::pwrite (_peakfile_fd, &x, sizeof (PeakData), byte) != sizeof (PeakData)) {
+                       off_t offset = lseek (_peakfile_fd, byte, SEEK_SET);
+
+                       if (offset != byte) {
+                               error << string_compose(_("%1: could not seek in peak file data (%2)"), _name, strerror (errno)) << endmsg;
+                               return -1;
+                       }
+
+                       if (::write (_peakfile_fd, &x, sizeof (PeakData)) != sizeof (PeakData)) {
                                error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg;
                                return -1;
                        }
-#endif
+
                        _peak_byte_max = max (_peak_byte_max, (off_t) (byte + sizeof(PeakData)));
 
                        {
@@ -840,14 +849,24 @@ AudioSource::compute_and_write_peaks (Sample* buf, framecnt_t first_frame, frame
                }
        }
 
-#ifndef WIN32
-       if (::pwrite (_peakfile_fd, peakbuf.get(), sizeof (PeakData) * peaks_computed, first_peak_byte) != (ssize_t) (sizeof (PeakData) * peaks_computed)) {
+
+       off_t offset = lseek(_peakfile_fd, first_peak_byte, SEEK_SET);
+
+       if (offset != first_peak_byte) {
+               error << string_compose(_("%1: could not seek in peak file data (%2)"), _name, strerror (errno)) << endmsg;
+               return -1;
+       }
+
+       ssize_t bytes_to_write = sizeof (PeakData) * peaks_computed;
+
+       ssize_t bytes_written = ::write (_peakfile_fd, peakbuf.get(), bytes_to_write);
+
+       if (bytes_written != bytes_to_write) {
                error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg;
                return -1;
        }
-#endif
 
-       _peak_byte_max = max (_peak_byte_max, (off_t) (first_peak_byte + sizeof(PeakData)*peaks_computed));
+       _peak_byte_max = max (_peak_byte_max, (off_t) (first_peak_byte + bytes_to_write));
 
        if (frames_done) {
                Glib::Threads::Mutex::Lock lm (_peaks_ready_lock);