interpolation.cc/.h: Spline-Bugfixes: Crash bug at tempos close to 0, wrong calculati...

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

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 3f5665ee9957a8c48f17753beabd390279f092fd..705fbc4eab7c955234aa12b35c7d23e27366f692 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -17,6 +17,10 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #include <vector>
 
 #include <sys/time.h>
@@ -99,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)
@@ -303,7 +307,7 @@ 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;
@@ -345,8 +349,12 @@ AudioFileSource::safe_audio_file_extension(const ustring& file)
                ".vwe", ".VWE",
                ".paf", ".PAF",
                ".voc", ".VOC",
+#ifdef HAVE_OGG
+               ".ogg", ".OGG",
+#endif /* HAVE_OGG */
 #ifdef HAVE_FLAC
                ".flac", ".FLAC",
+#else
 #endif // HAVE_FLAC
 #ifdef HAVE_COREAUDIO
                ".mp3", ".MP3",