Fix MIDI selection/tool issues (issue #0002415 and other bugs).

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

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index b07f70be1f8aa99f7afdca4875b645375a58e130..915fdeb948adc75ec1d988ca2638cd59891dc962 100644 (file)
--- a/libs/ardour/audio_buffer.cc
+++ b/libs/ardour/audio_buffer.cc
@@ -17,6 +17,10 @@
 */
 
 #include <ardour/audio_buffer.h>
+#include <pbd/error.h>
+#include <errno.h>
+
+#include "i18n.h"
 
 #ifdef __x86_64__
 static const int CPU_CACHE_ALIGN = 64;
@@ -24,6 +28,8 @@ static const int CPU_CACHE_ALIGN = 64;
 static const int CPU_CACHE_ALIGN = 16; /* arguably 32 on most arches, but it matters less */
 #endif
 
+using namespace PBD;
+
 namespace ARDOUR {
 
 
@@ -32,7 +38,7 @@ AudioBuffer::AudioBuffer(size_t capacity)
        , _owns_data (false)
        , _data (0)
 {
-       if (_capacity) {
+       if (_capacity > 0) {
                _owns_data = true; // prevent resize() from gagging
                resize (_capacity);
                silence (_capacity);
@@ -48,9 +54,7 @@ AudioBuffer::~AudioBuffer()
 void
 AudioBuffer::resize (size_t size)
 {
-       assert (_owns_data);
-
-       if (size < _capacity) {
+       if (!_owns_data || (size < _capacity)) {
                return;
        }
 
@@ -65,7 +69,10 @@ AudioBuffer::resize (size_t size)
 #ifdef NO_POSIX_MEMALIGN
        _data =  (Sample *) malloc(sizeof(Sample) * _capacity);
 #else
-       posix_memalign((void**)&_data, CPU_CACHE_ALIGN, sizeof(Sample) * _capacity);
+       if (posix_memalign((void**)&_data, CPU_CACHE_ALIGN, sizeof(Sample) * _capacity)) {
+               fatal << string_compose (_("Memory allocation error: posix_memalign (%1 * %2) failed (%3)"),
+                               CPU_CACHE_ALIGN, sizeof (Sample) * _capacity, strerror (errno)) << endmsg;
+       }
 #endif 
        
        _owns_data = true;