Fix crash on save of MIDI data.

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

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 48aaeb8d08ee6cc82a5c3c5ed65d44126b057234..8de786eb0e0901f94c64cf3d516a328651e0772d 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,10 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #include <vector>
 
 #include <sys/time.h>
@@ -50,7 +54,7 @@
 
 // if these headers come before sigc++ is included
 // the parser throws ObjC++ errors. (nil is a keyword)
-#ifdef HAVE_COREAUDIO 
+#ifdef HAVE_COREAUDIO
 #include "ardour/coreaudiosource.h"
 #include <AudioToolbox/ExtendedAudioFile.h>
 #include <AudioToolbox/AudioFormat.h>
@@ -58,6 +62,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Glib;
@@ -74,7 +79,7 @@ struct SizedSampleBuffer {
     nframes_t size;
     Sample* buf;
 
-    SizedSampleBuffer (nframes_t sz) : size (sz) { 
+    SizedSampleBuffer (nframes_t sz) : size (sz) {
            buf = new Sample[size];
     }
 
@@ -98,7 +103,7 @@ AudioFileSource::AudioFileSource (Session& s, const ustring& path, bool embedded
 
 /** Constructor used for new internal-to-session files. */
 AudioFileSource::AudioFileSource (Session& s, const ustring& path, bool embedded, Source::Flag flags,
-               SampleFormat samp_format, HeaderFormat hdr_format)
+                                 SampleFormat /*samp_format*/, HeaderFormat /*hdr_format*/)
        : Source (s, DataType::AUDIO, path, flags)
        , AudioSource (s, path)
        , FileSource (s, DataType::AUDIO, path, embedded, flags)
@@ -116,7 +121,7 @@ AudioFileSource::AudioFileSource (Session& s, const XMLNode& node, bool must_exi
        , AudioSource (s, node)
        , FileSource (s, node, must_exist)
 {
-       if (set_state (node)) {
+       if (set_state (node, Stateful::loading_state_version)) {
                throw failed_constructor ();
        }
 
@@ -158,33 +163,33 @@ 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 
+
+                       /* 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);       
+
+
+               str = old_peak_path (audio_path);
                if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
                        peak_path = str;
                }
@@ -253,17 +258,17 @@ AudioFileSource::get_state ()
 }
 
 int
-AudioFileSource::set_state (const XMLNode& node)
+AudioFileSource::set_state (const XMLNode& node, int version)
 {
-       if (Source::set_state (node)) {
+       if (Source::set_state (node, version)) {
                return -1;
        }
 
-       if (AudioSource::set_state (node)) {
+       if (AudioSource::set_state (node, version)) {
                return -1;
        }
-       
-       if (FileSource::set_state (node)) {
+
+       if (FileSource::set_state (node, version)) {
                return -1;
        }
 
@@ -276,7 +281,7 @@ AudioFileSource::mark_streaming_write_completed ()
        if (!writable()) {
                return;
        }
-       
+
        /* XXX notice that we're readers of _peaks_built
           but we must hold a solid lock on PeaksReady.
        */
@@ -302,14 +307,14 @@ AudioFileSource::set_header_position_offset (nframes_t offset)
 }
 
 bool
-AudioFileSource::is_empty (Session& s, ustring path)
+AudioFileSource::is_empty (Session& /*s*/, ustring path)
 {
        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 false;
        }
 
        return info.length == 0;
@@ -344,9 +349,8 @@ AudioFileSource::safe_audio_file_extension(const ustring& file)
                ".vwe", ".VWE",
                ".paf", ".PAF",
                ".voc", ".VOC",
-#ifdef HAVE_FLAC
+               ".ogg", ".OGG",
                ".flac", ".FLAC",
-#endif // HAVE_FLAC
 #ifdef HAVE_COREAUDIO
                ".mp3", ".MP3",
                ".aac", ".AAC",