Introduce a macro for imprecise configurations

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

diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index 9deda7a861d0dc329156cdd2e73054f211f17449..33e41c10ad49cc309615af9d4778e0d5d426b610 100644 (file)
--- a/libs/ardour/audio_port.cc
+++ b/libs/ardour/audio_port.cc
@@ -20,15 +20,18 @@
 
 #include "pbd/stacktrace.h"
 
-#include "ardour/audio_port.h"
+#include "ardour/audio_buffer.h"
 #include "ardour/audioengine.h"
+#include "ardour/audio_port.h"
 #include "ardour/data_type.h"
-#include "ardour/audio_buffer.h"
+#include "ardour/port_engine.h"
 
 using namespace ARDOUR;
 using namespace std;
 
-AudioPort::AudioPort (const std::string& name, Flags flags)
+#define port_engine AudioEngine::instance()->port_engine()
+
+AudioPort::AudioPort (const std::string& name, PortFlags flags)
        : Port (name, DataType::AUDIO, flags)
        , _buffer (new AudioBuffer (0))
 {
@@ -45,6 +48,8 @@ AudioPort::cycle_start (pframes_t nframes)
 {
        /* caller must hold process lock */
 
+        Port::cycle_start (nframes);
+
        if (sends_output()) {
                _buffer->prepare ();
        }
@@ -54,10 +59,12 @@ void
 AudioPort::cycle_end (pframes_t nframes)
 {
         if (sends_output() && !_buffer->written()) {
-                /* we can't use nframes here because the current buffer capacity may 
-                   be shorter than the full buffer size if we split the cycle.
-                */
-               _buffer->silence (_buffer->capacity());
+               if (!_buffer->data (0)) {
+                       get_audio_buffer (nframes);
+               }
+               if (_buffer->capacity() >= nframes) {
+                       _buffer->silence (nframes);
+               }
        }
 }
 
@@ -67,16 +74,21 @@ AudioPort::cycle_split ()
 }
 
 AudioBuffer&
-AudioPort::get_audio_buffer (framecnt_t nframes)
+AudioPort::get_audio_buffer (pframes_t nframes)
 {
        /* caller must hold process lock */
-       _buffer->set_data ((Sample *) jack_port_get_buffer (_jack_port, nframes) + _port_offset, nframes);
+       _buffer->set_data ((Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes) +
+                          _global_port_buffer_offset + _port_buffer_offset, nframes);
        return *_buffer;
 }
 
-size_t
-AudioPort::raw_buffer_size (pframes_t nframes) const
+Sample*
+AudioPort::engine_get_whole_audio_buffer ()
 {
-       return nframes * sizeof (Sample);
+       /* caller must hold process lock */
+       return (Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes);
 }
 
+
+
+