Remove beat entry from meter dialog (beats are not allowed in API), clean up some...

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

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 8aecbc3cdc4cc41bae78ca357f594f5c16b5b2ec..ffd9c8c752bc8c7bff9a5c87494cb78092aacf99 100644 (file)
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -25,6 +25,8 @@
 #include <sys/stat.h>
 
 #include <glibmm/miscutils.h>
+#include <glibmm/thread.h>
+#include <pbd/stacktrace.h>
 
 #include <ardour/sndfilesource.h>
 #include <ardour/sndfile_helpers.h>
@@ -44,6 +46,20 @@ const AudioFileSource::Flag SndFileSource::default_writable_flags = AudioFileSou
                                                                                           AudioFileSource::Removable|
                                                                                           AudioFileSource::RemovableIfEmpty|
                                                                                           AudioFileSource::CanRename);
+struct SizedSampleBuffer {
+    nframes_t size;
+    Sample* buf;
+
+    SizedSampleBuffer (nframes_t sz) : size (sz) { 
+           buf = new Sample[size];
+    }
+
+    ~SizedSampleBuffer() {
+           delete [] buf;
+    }
+};
+
+Glib::StaticPrivate<SizedSampleBuffer> thread_interleave_buffer = GLIBMM_STATIC_PRIVATE_INIT;
 
 SndFileSource::SndFileSource (Session& s, const XMLNode& node)
        : AudioFileSource (s, node)
@@ -122,6 +138,10 @@ SndFileSource::SndFileSource (Session& s, ustring path, SampleFormat sfmt, Heade
        case FormatInt24:
                fmt |= SF_FORMAT_PCM_24;
                break;
+
+       case FormatInt16:
+               fmt |= SF_FORMAT_PCM_16;
+               break;
        }
        
        _info.channels = 1;
@@ -182,8 +202,6 @@ SndFileSource::init ()
 
        // lets try to keep the object initalizations here at the top
        xfade_buf = 0;
-       interleave_buf = 0;
-       interleave_bufsize = 0;
        sf = 0;
        _broadcast_info = 0;
 
@@ -268,10 +286,6 @@ SndFileSource::~SndFileSource ()
                touch_peakfile ();
        }
 
-       if (interleave_buf) {
-               delete [] interleave_buf;
-       }
-
        if (_broadcast_info) {
                delete _broadcast_info;
        }
@@ -337,14 +351,7 @@ SndFileSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const
 
        real_cnt = cnt * _info.channels;
 
-       if (interleave_bufsize < real_cnt) {
-               
-               if (interleave_buf) {
-                       delete [] interleave_buf;
-               }
-               interleave_bufsize = real_cnt;
-               interleave_buf = new float[interleave_bufsize];
-       }
+       Sample* interleave_buf = get_interleave_buffer (real_cnt);
        
        nread = sf_read_float (sf, interleave_buf, real_cnt);
        ptr = interleave_buf + _channel;
@@ -397,7 +404,7 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, nframes_t cnt)
        update_length (oldlen, cnt);
 
        if (_build_peakfiles) {
-               compute_and_write_peaks (data, frame_pos, cnt, false);
+               compute_and_write_peaks (data, frame_pos, cnt, false, true);
        }
 
        _write_data_count = cnt;
@@ -489,7 +496,7 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt)
        update_length (file_pos, cnt);
 
        if (_build_peakfiles) {
-               compute_and_write_peaks (data, file_pos, cnt, false);
+               compute_and_write_peaks (data, file_pos, cnt, false, true);
        }
 
        file_pos += cnt;
@@ -860,7 +867,7 @@ SndFileSource::get_soundfile_info (const ustring& path, SoundFileInfo& info, str
        info.samplerate  = sf_info.samplerate;
        info.channels    = sf_info.channels;
        info.length      = sf_info.frames;
-       info.format_name = string_compose("Format: %1, %2",
+       info.format_name = string_compose("%1\n%2",
                                           sndfile_major_format(sf_info.format),
                                           sndfile_minor_format(sf_info.format));
 
@@ -894,3 +901,27 @@ SndFileSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binfo, bool& e
        ret |= (uint32_t) binfo->time_reference_low;
        return ret;
 }
+
+bool
+SndFileSource::one_of_several_channels () const
+{
+       return _info.channels > 1;
+}
+
+Sample*
+SndFileSource::get_interleave_buffer (nframes_t size)
+{
+       SizedSampleBuffer* ssb;
+
+       if ((ssb = thread_interleave_buffer.get()) == 0) {
+               ssb = new SizedSampleBuffer (size);
+               thread_interleave_buffer.set (ssb);
+       }
+
+       if (ssb->size < size) {
+               ssb = new SizedSampleBuffer (size);
+               thread_interleave_buffer.set (ssb);
+       }
+
+       return ssb->buf;
+}