Remove internal ports.

git-svn-id: svn://localhost/ardour2/branches/3.0@4525 d708f5d6-7413-0410-9779-e7cbd77b26cf

8 files changed, 17 insertions, 123 deletions

diff --git a/libs/ardour/ardour/audio_port.h b/libs/ardour/ardour/audio_port.h
index 304902bccb..02454655a9 100644
--- a/libs/ardour/ardour/audio_port.h
+++ b/libs/ardour/ardour/audio_port.h
@@ -29,8 +29,8 @@ namespace ARDOUR {
 class AudioPort : public Port 
 {
    public:
-	~AudioPort();
-
+	~AudioPort ();
+	
 	DataType type () const {
 		return DataType::AUDIO;
 	}
@@ -44,23 +44,14 @@ class AudioPort : public Port
 	
 	AudioBuffer& get_audio_buffer (nframes_t, nframes_t);
 
-	void reset ();
-
   protected:
 	friend class AudioEngine;
 
-	AudioPort (std::string const &, Flags, bool, nframes_t);
+	AudioPort (std::string const &, Flags);
   
-	bool using_internal_data() const;
-	void use_internal_data ();
-	void use_external_data (); 
-
   private:
-	void mixdown (nframes_t, nframes_t, bool);
-
-	bool _has_been_mixed_down;
+	bool _buffer_data_set;
 	AudioBuffer* _buffer;
-	bool _internal_buffer;
 };
  
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index 48609271d7..fe7dcb58ff 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -73,10 +73,6 @@ class AudioTrack : public Track
 	int  deprecated_use_diskstream_connections ();
 	void set_state_part_two ();
 	void set_state_part_three ();
-
-	void catch_up_on_busses (ARDOUR::RouteList&);
-	void add_internal_send (boost::shared_ptr<ARDOUR::Route>);
-
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index e891547042..0793e07ed6 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -120,8 +120,8 @@ class AudioEngine : public sigc::trackable
 		virtual const char *what() const throw() { return "could not connect to engine backend"; }
 	};
 
-	Port *register_input_port (DataType, const std::string& portname, bool publish);
-	Port *register_output_port (DataType, const std::string& portname, bool publish);
+	Port *register_input_port (DataType, const std::string& portname);
+	Port *register_output_port (DataType, const std::string& portname);
 	int   unregister_port (Port &);
 	
 	int connect (const std::string& source, const std::string& destination);
@@ -228,7 +228,7 @@ class AudioEngine : public sigc::trackable
 
 	SerializedRCUManager<Ports> ports;
 
-	Port *register_port (DataType type, const std::string& portname, bool input, bool publish);
+	Port *register_port (DataType type, const std::string& portname, bool input);
 
 	int    process_callback (nframes_t nframes);
 	void   remove_all_ports ();
diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h
deleted file mode 100644
index 8d2ea7b1c3..0000000000
--- a/libs/ardour/ardour/internal_send.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-    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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __ardour_internal_send_h__
-#define __ardour_internal_send_h__
-
-#include <sigc++/signal.h>
-#include <string>
-
-
-#include <pbd/stateful.h> 
-#include <ardour/ardour.h>
-#include <ardour/audioengine.h>
-#include <ardour/io_processor.h>
-
-namespace ARDOUR {
-
-class InternalSend : public IOProcessor 
-{
-  public:	
-	InternalSend (Session&, Placement, boost::shared_ptr<IO> destination);
-	virtual ~InternalSend ();
-
-	ChanCount output_streams() const;
-	ChanCount input_streams () const;
-	
-	void run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset);
-	
-	void set_metering (bool yn);
-
-	void activate ();
-	void deactivate ();
-
-	XMLNode& get_state(void);
-	int set_state(const XMLNode& node);
-
-	uint32_t pans_required() const { return _configured_input.n_audio(); }
-	void expect_inputs (const ChanCount&);
-
-	bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
-	bool configure_io (ChanCount in, ChanCount out);
-
-	static uint32_t how_many_sends();
-
-  private:
-	boost::shared_ptr<IO> destination;
-	bool      _metering;
-	ChanCount expected_inputs;
-	uint32_t  bitslot;
-
-	void destination_io_config_changed (IOChange,void*);
-};
-
-} // namespace ARDOUR
-
-#endif /* __ardour_internal_send_h__ */
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index dd40e30837..c5f90bcd90 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -77,8 +77,7 @@ class IO : public SessionObject, public AutomatableControls, public Latent
 	IO (Session&, const string& name, 
 	    int input_min = -1, int input_max = -1, 
 	    int output_min = -1, int output_max = -1,
-	    DataType default_type = DataType::AUDIO,
-	    bool public_ports = true);
+	    DataType default_type = DataType::AUDIO);
 	
 	IO (Session&, const XMLNode&, DataType default_type = DataType::AUDIO);
 	
@@ -286,7 +285,6 @@ class IO : public SessionObject, public AutomatableControls, public Latent
 	bool                _denormal_protection;
 	XMLNode*             deferred_state;
 	DataType            _default_type;
-	bool                _public_ports;
 
 	virtual void prepare_inputs (nframes_t nframes, nframes_t offset);
 	virtual void flush_outputs (nframes_t nframes, nframes_t offset);
diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h
index 1c9da68767..af11e8cacf 100644
--- a/libs/ardour/ardour/io_processor.h
+++ b/libs/ardour/ardour/io_processor.h
@@ -47,8 +47,7 @@ class IOProcessor : public Processor
   public:
 	IOProcessor (Session&, const string& name, Placement,
 		     int input_min = -1, int input_max = -1, int output_min = -1, int output_max = -1,
-		     ARDOUR::DataType default_type = DataType::AUDIO,
-		     bool public_ports = true);
+		     ARDOUR::DataType default_type = DataType::AUDIO);
 	IOProcessor (const IOProcessor&);
 	virtual ~IOProcessor ();
 	
diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 34cffd7f3d..1a0115cb1f 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -49,11 +49,10 @@ class MidiPort : public Port {
   protected:
 	friend class AudioEngine;
 
-	MidiPort (const std::string& name, Flags, bool external, nframes_t bufsize);
+	MidiPort (const std::string& name, Flags);
   
   private:
-	void mixdown (nframes_t, nframes_t, bool);
-	
+
 	MidiBuffer* _buffer;
 	bool _has_been_mixed_down;
 };
diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 896b35e734..c63faa162d 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -65,13 +65,7 @@ public:
 		return _flags & IsOutput;
 	}
 
-	/* @return true if this port is visible outside Ardour (via JACK) */
-	bool external () const {
-		return _jack_port != 0;
-	}
-
 	bool connected () const;
-	bool externally_connected () const;
 	int disconnect_all ();
 	int get_connections (std::vector<std::string> &) const;
 
@@ -90,9 +84,8 @@ public:
 	nframes_t total_latency () const;
 	int reestablish ();
 	int reconnect ();
-	void set_latency (nframes_t);
 	void request_monitor_input (bool);
-	void make_external ();
+	void set_latency (nframes_t);
 
 	virtual void reset ();
 
@@ -108,36 +101,26 @@ public:
 
 protected:
 	
-	Port (std::string const &, DataType, Flags, bool);
+	Port (std::string const &, DataType, Flags);
 
-	jack_port_t* _jack_port; ///< JACK port, or 0 if we don't have one
-	std::set<Port*> _connections; ///< internal Ports that we are connected to
+	jack_port_t* _jack_port; ///< JACK port
 
 	static AudioEngine* _engine; ///< the AudioEngine
 
-	virtual bool using_internal_data() const { return false; }
-	virtual void use_internal_data () {}
-	virtual void use_external_data () {} 
-
-	void check_buffer_status ();
-	
 private:
 	friend class AudioEngine;
 
 	void recompute_total_latency () const;
-	void do_make_external (DataType);
 	
 	/* XXX */
 	bool _last_monitor;
-	nframes_t _latency;
 
 	std::string _name; ///< port short name
 	Flags _flags; ///< flags
 
-	/// list of JACK ports that we are connected to; we only keep this around
-	/// so that we can implement ::reconnect ()
-	std::set<std::string> _named_connections;
-
+	/** ports that we are connected to, kept so that we can
+	    reconnect to JACK when required */
+	std::set<std::string> _connections;
 };
 
 }