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

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

diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 3f86fb8fd2158e1b52cedaf5122978ed39631cbb..8b2b3dcbd3f873f1fc923ae92e23e347242f6196 100644 (file)
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 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
@@ -25,16 +25,17 @@
 #include <vector>
 #include <jack/jack.h>
 #include <boost/utility.hpp>
-#include <sigc++/trackable.h>
+#include "pbd/signals.h"
+
 #include "ardour/data_type.h"
 #include "ardour/types.h"
 
 namespace ARDOUR {
 
 class AudioEngine;
-class Buffer;  
+class Buffer;
 
-class Port : public sigc::trackable, public boost::noncopyable
+class Port : public boost::noncopyable
 {
 public:
        enum Flags {
@@ -44,17 +45,15 @@ 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;
        }
+       static void set_connecting_blocked( bool yn ) { 
+               _connecting_blocked = yn;
+       }
+       static bool connecting_blocked() { 
+               return _connecting_blocked;
+       }
 
        /** @return Port short name */
        std::string name () const {
@@ -101,7 +100,7 @@ public:
        void set_latency (nframes_t);
 
        virtual void reset ();
-       
+
        /** @return the size of the raw buffer (bytes) for duration @a nframes (audio frames) */
        virtual size_t raw_buffer_size(jack_nframes_t nframes) const = 0;
 
@@ -110,28 +109,33 @@ public:
        virtual void cycle_end (nframes_t) = 0;
        virtual void cycle_split () = 0;
        virtual Buffer& get_buffer (nframes_t nframes, nframes_t offset = 0) = 0;
-       virtual void flush_buffers (nframes_t, nframes_t offset = 0) {}
-       
+       virtual void flush_buffers (nframes_t nframes, nframes64_t /*time*/, nframes_t offset = 0) {
+               assert(offset < nframes);
+       }
+       virtual void transport_stopped () {}
+
+        bool physically_connected () const;
+
        static void set_engine (AudioEngine *);
 
-       sigc::signal<void, bool> MonitorInputChanged;
+       PBD::Signal1<void,bool> MonitorInputChanged;
 
 protected:
-       
+
        Port (std::string const &, DataType, Flags);
 
        jack_port_t* _jack_port; ///< JACK port
 
-       static nframes_t _port_offset;
        static nframes_t _buffer_size;
-
+       static bool      _connecting_blocked;
+        
        static AudioEngine* _engine; ///< the AudioEngine
 
 private:
        friend class AudioEngine;
 
        void recompute_total_latency () const;
-       
+
        /* XXX */
        bool _last_monitor;