From 3364fda3decc12360bd15faa9210ede0a47ba1fc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 13 Aug 2010 02:13:12 +0000 Subject: Move _port_offset up to AudioPort, as MidiPort does not use it. git-svn-id: svn://localhost/ardour2/branches/3.0@7614 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/audio_port.h | 11 +++++++++++ libs/ardour/ardour/port.h | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/audio_port.h b/libs/ardour/ardour/audio_port.h index 0c08795819..895cae99a6 100644 --- a/libs/ardour/ardour/audio_port.h +++ b/libs/ardour/ardour/audio_port.h @@ -47,6 +47,16 @@ class AudioPort : public Port 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; @@ -55,6 +65,7 @@ class AudioPort : public Port private: AudioBuffer* _buffer; + static nframes_t _port_offset; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index 3a677d293f..8b2b3dcbd3 100644 --- a/libs/ardour/ardour/port.h +++ b/libs/ardour/ardour/port.h @@ -45,14 +45,6 @@ public: virtual ~Port (); - 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; - } static void set_buffer_size (nframes_t sz) { _buffer_size = sz; } @@ -63,7 +55,6 @@ public: return _connecting_blocked; } - /** @return Port short name */ std::string name () const { return _name; @@ -135,7 +126,6 @@ protected: jack_port_t* _jack_port; ///< JACK port - static nframes_t _port_offset; static nframes_t _buffer_size; static bool _connecting_blocked; -- cgit v1.2.3