Merge branch 'master' into windows

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

diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index 93a1c6ceb563582bdcaf39e1046f645d250efeb4..65540d4e3dd153a8b00e9caa9068f36a143ea0bb 100644 (file)
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -189,7 +189,7 @@ AudioSource::touch_peakfile ()
        struct utimbuf tbuf;
 
        tbuf.actime = statbuf.st_atime;
-       tbuf.modtime = time ((time_t) 0);
+       tbuf.modtime = time ((time_t*) 0);
 
        g_utime (peakpath.c_str(), &tbuf);
 }
@@ -202,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;
                }
@@ -228,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 */
 
@@ -653,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;