Use shared_ptr for Port in the AudioEngine; improves thread-safety of the audio engin...

[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 874f842d835e9a346080468b7df58a3387d581bb..6b534afe621f43f9447667adae157cdd2820b303 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,26 +21,39 @@
 #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 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);
+       }
+
+       AudioBuffer& get_audio_buffer (pframes_t nframes);
 
-       void cycle_start (nframes_t nframes, nframes_t offset);
-       void cycle_end (nframes_t nframes, nframes_t offset);
-       
   protected:
        friend class AudioEngine;
 
-       AudioPort (const std::string&, Flags, bool external, nframes_t); 
+       AudioPort (std::string const &, Flags);
+
+  private:
+       AudioBuffer* _buffer;
 };
- 
+
 } // namespace ARDOUR
 
 #endif /* __ardour_audio_port_h__ */