clean up debugging

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

diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index c62d31a6d02d6da7860e554ffce669bd2be841c4..aad56748c319395564a0ffb413e1a13726c60ef4 100644 (file)
--- a/libs/ardour/audio_port.cc
+++ b/libs/ardour/audio_port.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
@@ -25,6 +25,8 @@
 using namespace ARDOUR;
 using namespace std;
 
+framecnt_t AudioPort::_port_offset = 0;
+
 AudioPort::AudioPort (const std::string& name, Flags flags)
        : Port (name, DataType::AUDIO, flags)
        , _buffer (new AudioBuffer (0))
@@ -38,14 +40,14 @@ AudioPort::~AudioPort ()
 }
 
 void
-AudioPort::cycle_start (nframes_t nframes)
+AudioPort::cycle_start (pframes_t nframes)
 {
        /* caller must hold process lock */
 
        /* get_buffer() must only be run on outputs here in cycle_start().
 
-          Inputs must be done in the correct processing order, which 
-          requires interleaving with route processing. that will 
+          Inputs must be done in the correct processing order, which
+          requires interleaving with route processing. that will
           happen when Port::get_buffer() is called.
        */
 
@@ -63,7 +65,7 @@ AudioPort::cycle_start (nframes_t nframes)
 }
 
 void
-AudioPort::cycle_end (nframes_t nframes)
+AudioPort::cycle_end (pframes_t nframes)
 {
        if (sends_output() && !_buffer->written()) {
                _buffer->silence (nframes);
@@ -76,7 +78,7 @@ AudioPort::cycle_split ()
 }
 
 AudioBuffer&
-AudioPort::get_audio_buffer (nframes_t nframes, nframes_t offset)
+AudioPort::get_audio_buffer (framecnt_t nframes, framecnt_t offset)
 {
        /* caller must hold process lock */
 
@@ -89,11 +91,17 @@ AudioPort::get_audio_buffer (nframes_t nframes, nframes_t offset)
                */
 
                _buffer->set_data ((Sample *) jack_port_get_buffer (_jack_port, nframes) + offset + _port_offset, nframes);
-       } 
-       
+       }
+
        /* output ports set their _buffer data information during ::cycle_start()
         */
 
        return *_buffer;
 }
 
+size_t
+AudioPort::raw_buffer_size (pframes_t nframes) const
+{
+       return nframes * sizeof (Sample);
+}
+