Move _port_offset up to AudioPort, as MidiPort does not use it.

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

diff --git a/libs/ardour/ardour/audio_port.h b/libs/ardour/ardour/audio_port.h
index 02454655a9a2b40d28db40db87cbad0dfc2814fe..895cae99a645384e44d47290ad8a685713a8df75 100644 (file)
--- a/libs/ardour/ardour/audio_port.h
+++ b/libs/ardour/ardour/audio_port.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2009 Paul Davis 
+    Copyright (C) 2002-2009 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
@@ -21,39 +21,53 @@
 #ifndef __ardour_audio_port_h__
 #define __ardour_audio_port_h__
 
-#include <ardour/port.h>
-#include <ardour/audio_buffer.h>
+#include "ardour/port.h"
+#include "ardour/audio_buffer.h"
 
 namespace ARDOUR {
 
-class AudioPort : public Port 
+class AudioPort : public Port
 {
    public:
        ~AudioPort ();
-       
+
        DataType type () const {
                return DataType::AUDIO;
        }
-       
-       void cycle_start (nframes_t, nframes_t);
-       void cycle_end (nframes_t, nframes_t);
 
-       Buffer& get_buffer (nframes_t nframes, nframes_t offset) {
+       void cycle_start (nframes_t);
+       void cycle_end (nframes_t);
+       void cycle_split ();
+
+       size_t raw_buffer_size(jack_nframes_t nframes) const;
+
+       Buffer& get_buffer (nframes_t nframes, nframes_t offset = 0) {
                return get_audio_buffer (nframes, offset);
        }
-       
-       AudioBuffer& get_audio_buffer (nframes_t, nframes_t);
 
+       AudioBuffer& get_audio_buffer (nframes_t nframes, nframes_t offset = 0);
+
+       static nframes_t port_offset() { return _port_offset; }
+
+       static void set_port_offset (nframes_t off) {
+               _port_offset = off;
+       }
+       
+       static void increment_port_offset (nframes_t n) {
+               _port_offset += n;
+       }
+       
   protected:
        friend class AudioEngine;
 
        AudioPort (std::string const &, Flags);
-  
+
   private:
-       bool _buffer_data_set;
        AudioBuffer* _buffer;
+
+       static nframes_t _port_offset;
 };
- 
+
 } // namespace ARDOUR
 
 #endif /* __ardour_audio_port_h__ */