X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fio.h;h=db0f2c3cf8ca9907e5a0033f589da65b29245418;hb=331bfef416b502c63a0498270a2bdcf7777f9fe0;hp=1688a2a36d2176dfc876fc3cd2ca3af38f66d06e;hpb=b0e4f81eb3a38b7236ec39f11d5211840a064d15;p=ardour.git

diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 1688a2a36d..db0f2c3cf8 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 #include <cmath>
-#include <jack/jack.h>
 
 #include <glibmm/threads.h>
 
@@ -75,8 +74,8 @@ class LIBARDOUR_API IO : public SessionObject, public Latent
 		Output
 	};
 
-        IO (Session&, const std::string& name, Direction, DataType default_type = DataType::AUDIO, bool sendish = false);
-        IO (Session&, const XMLNode&, DataType default_type = DataType::AUDIO, bool sendish = false);
+	IO (Session&, const std::string& name, Direction, DataType default_type = DataType::AUDIO, bool sendish = false);
+	IO (Session&, const XMLNode&, DataType default_type = DataType::AUDIO, bool sendish = false);
 
 	virtual ~IO();
 
@@ -89,13 +88,15 @@ class LIBARDOUR_API IO : public SessionObject, public Latent
 	void set_active(bool yn) { _active = yn; }
 
 	bool set_name (const std::string& str);
+	void set_pretty_name (const std::string& str);
+	std::string pretty_name () const { return _pretty_name_prefix; }
 
 	virtual void silence (framecnt_t);
 	void increment_port_buffer_offset (pframes_t offset);
 
 	int ensure_io (ChanCount cnt, bool clear, void *src);
 
-        int connect_ports_to_bundle (boost::shared_ptr<Bundle>, bool exclusive, void *);
+	int connect_ports_to_bundle (boost::shared_ptr<Bundle>, bool exclusive, void *);
 	int disconnect_ports_from_bundle (boost::shared_ptr<Bundle>, void *);
 
 	BundleList bundles_connected ();
@@ -193,7 +194,7 @@ class LIBARDOUR_API IO : public SessionObject, public Latent
 	/* three utility functions - this just seems to be simplest place to put them */
 
 	void collect_input (BufferSet& bufs, pframes_t nframes, ChanCount offset);
-	void process_input (boost::shared_ptr<Processor>, framepos_t start_frame, framepos_t end_frame, pframes_t nframes);
+	void process_input (boost::shared_ptr<Processor>, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes);
 	void copy_to_outputs (BufferSet& bufs, DataType type, pframes_t nframes, framecnt_t offset);
 
 	/* AudioTrack::deprecated_use_diskstream_connections() needs these */
@@ -208,7 +209,7 @@ class LIBARDOUR_API IO : public SessionObject, public Latent
 	Direction _direction;
 	DataType _default_type;
 	bool     _active;
-        bool     _sendish;
+	bool     _sendish;
 
   private:
 	int connecting_became_legal ();
@@ -249,6 +250,8 @@ class LIBARDOUR_API IO : public SessionObject, public Latent
 	void setup_bundle ();
 	std::string bundle_channel_name (uint32_t, uint32_t, DataType) const;
 
+	void apply_pretty_name ();
+	std::string _pretty_name_prefix;
 	BufferSet _buffers;
 	void disconnect_check (boost::shared_ptr<ARDOUR::Port>, boost::shared_ptr<ARDOUR::Port>);
 };