change name of a Session method to makes its intended function clear

[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 fa416864e951535940ee264eca90a1043da3fd70..384de3ef5d0bcd8aad241547780c1e63e34e366b 100644 (file)
--- a/libs/ardour/ardour/audio_port.h
+++ b/libs/ardour/ardour/audio_port.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 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,30 +21,42 @@
 #ifndef __ardour_audio_port_h__
 #define __ardour_audio_port_h__
 
-#include <ardour/base_audio_port.h>
+#include "ardour/port.h"
+#include "ardour/audio_buffer.h"
 
 namespace ARDOUR {
 
-class AudioPort : public BaseAudioPort, public PortFacade {
-
+class LIBARDOUR_API AudioPort : public Port
+{
    public:
-       ~AudioPort();
+       ~AudioPort ();
+
+       DataType type () const {
+               return DataType::AUDIO;
+       }
+
+       void cycle_start (pframes_t);
+       void cycle_end (pframes_t);
+       void cycle_split ();
 
-       void reset ();
+       Buffer& get_buffer (pframes_t nframes) {
+               return get_audio_buffer (nframes);
+       }
 
-       void cycle_start (nframes_t nframes, nframes_t offset);
-       void cycle_end (nframes_t nframes, nframes_t offset);
-       
-       AudioBuffer& get_audio_buffer( nframes_t nframes, nframes_t offset );
+       AudioBuffer& get_audio_buffer (pframes_t nframes);
 
   protected:
-       friend class AudioEngine;
+       friend class PortManager;
+       AudioPort (std::string const &, PortFlags);
+
+        /* special access for PortManager only (hah, C++) */
+        Sample* engine_get_whole_audio_buffer ();
 
-       AudioPort (const std::string&, Flags, bool external, nframes_t); 
   private:
-       bool _has_been_mixed_down;
+       AudioBuffer* _buffer;
+        bool         _buf_valid;
 };
- 
+
 } // namespace ARDOUR
 
 #endif /* __ardour_audio_port_h__ */