- Replaced integer port counts (and input/output maximum/minimum) with ChanCount, which can count multiple types and does the reasonable thing for all comparison operators

- Removed the fader/meters from MIDI mixer strips, at least until they do something
- Made the Add Route dialog refuse to create MIDI busses, Spifftacular warning dialog and all

Changes a bit more widespread than I was hoping, but worked out really well - lots of code will continue to work fine even when multi-typed (eg instrument) IOs come around, just ignoring the types it doesn't care about.  Most all changes related to counts are little search/replace deals, logic doesn't need to change.  Hopefully SVN can handle (automatic) merging with the other SoC projects if the buffer change goes as well.

Next step: do for buffers what the last two commits did for ports.


git-svn-id: svn://localhost/ardour2/branches/midi@787 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 190 insertions, 27 deletions

diff --git a/libs/ardour/ardour/buffer_set.h b/libs/ardour/ardour/buffer_set.h
new file mode 100644
index 0000000000..1799858794
--- /dev/null
+++ b/libs/ardour/ardour/buffer_set.h
@@ -0,0 +1,110 @@
+/*
+    Copyright (C) 2006 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_buffer_set_h__
+#define __ardour_buffer_set_h__
+
+#include <vector>
+#include <ardour/buffer.h>
+#include <ardour/chan_count.h>
+#include <ardour/data_type.h>
+#include <ardour/port_set.h>
+
+namespace ARDOUR {
+
+
+/** A set of buffers of various types.
+ *
+ * These are mainly accessed from Session and passed around as scratch buffers
+ * (eg as parameters to run() methods) to do in-place signal processing.
+ *
+ * There are two types of counts associated with a BufferSet - available,
+ * and the 'use count'.  Available is the actual number of allocated buffers
+ * (and so is the maximum acceptable value for the use counts).
+ *
+ * The use counts are how things determine the form of their input and inform
+ * others the form of their output (eg what they did to the BufferSet).
+ * Setting the use counts is realtime safe.
+ */
+class BufferSet
+{
+public:
+	BufferSet(const PortSet& ports);
+	BufferSet();
+	~BufferSet();
+
+	void clear();
+	
+	void ensure_buffers(const ChanCount& chan_count, size_t buffer_capacity);
+	void ensure_buffers(size_t num_buffers, DataType type, size_t buffer_capacity);
+
+	// FIXME: add these
+	//const ChanCount& available() const { return _count; }
+	//ChanCount&       available()       { return _count; }
+
+	const ChanCount& count() const { return _count; }
+	ChanCount&       count()       { return _count; }
+
+	size_t available_buffers(DataType type) const;
+	size_t buffer_capacity(DataType type) const;
+
+	Buffer& buffer(DataType type, size_t i)
+	{
+		assert(i <= _count.get(type));
+		return *_buffers[type.to_index()][i];
+	}
+
+	AudioBuffer& audio_buffer(size_t i)
+	{
+		return (AudioBuffer&)buffer(DataType::AUDIO, i);
+	}
+	#if 0
+	/** See PortInsert::run for an example of usage */
+	class IndexSet {
+	public:
+		IndexSet() { reset(); }
+		
+		void reset() { _is[0] = 0; _is[1] = 0; }
+
+		size_t index(DataType type)     { return _is[type.to_index()]; }
+		void   increment(DataType type) { _is[type.to_index()] += 1; }
+
+	private:
+		int _is[2];
+	};
+	#endif
+	
+	const ChanCount& chan_count() const { return _count; }
+	
+private:
+	typedef std::vector<Buffer*> BufferVec;
+
+	/// Vector of vectors, indexed by DataType::to_index()
+	std::vector<BufferVec> _buffers;
+
+	/// Use counts (there may be more actual buffers than this)
+	ChanCount _count;
+
+	/// Whether we (don't) 'own' the contained buffers (are a mirror of a PortSet)
+	bool _is_mirror;
+};
+
+
+} // namespace ARDOUR
+
+#endif // __ardour_buffer_set_h__
diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h
index 2ef49793d1..67ad5406e3 100644
--- a/libs/ardour/ardour/chan_count.h
+++ b/libs/ardour/ardour/chan_count.h
@@ -34,7 +34,7 @@ public:
 	ChanCount(DataType type, size_t channels)
 	{
 		reset();
-		set_count(type, channels);
+		set(type, channels);
 	}
 
 	void reset()
@@ -44,10 +44,10 @@ public:
 		}
 	}
 
-	void   set_count(DataType type, size_t count) { _counts[type.to_index()] = count; }
-	size_t get_count(DataType type) const { return _counts[type.to_index()]; }
+	void   set(DataType type, size_t count) { _counts[type.to_index()] = count; }
+	size_t get(DataType type) const { return _counts[type.to_index()]; }
 	
-	size_t get_total_count() const
+	size_t get_total() const
 	{
 		size_t ret = 0;
 		for (size_t i=0; i < DataType::num_types; ++i)
@@ -70,7 +70,51 @@ public:
 		return ! (*this == other);
 	}
 
+	bool operator<(const ChanCount& other) const
+	{
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			if (_counts[(*t).to_index()] >= other._counts[(*t).to_index()]) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	bool operator<=(const ChanCount& other) const
+	{
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			if (_counts[(*t).to_index()] > other._counts[(*t).to_index()]) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	bool operator>(const ChanCount& other) const
+	{
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			if (_counts[(*t).to_index()] <= other._counts[(*t).to_index()]) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	bool operator>=(const ChanCount& other) const
+	{
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			if (_counts[(*t).to_index()] < other._counts[(*t).to_index()]) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	static const ChanCount INFINITE;
+	static const ChanCount ZERO;
+
 private:
+	
 	size_t _counts[DataType::num_types];
 };
 
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 818916f185..a4b50618bb 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -41,6 +41,7 @@
 #include <ardour/types.h>
 #include <ardour/data_type.h>
 #include <ardour/port_set.h>
+#include <ardour/chan_count.h>
 
 using std::string;
 using std::vector;
@@ -72,14 +73,20 @@ class IO : public Stateful, public ARDOUR::StateManager
 	    int input_min = -1, int input_max = -1, 
 	    int output_min = -1, int output_max = -1,
 		DataType default_type = DataType::AUDIO);
-
+	
 	virtual ~IO();
 
-	int input_minimum() const { return _input_minimum; }
-	int input_maximum() const { return _input_maximum; }
-	int output_minimum() const { return _output_minimum; }
-	int output_maximum() const { return _output_maximum; }
+	ChanCount input_minimum() const { return _input_minimum; }
+	ChanCount input_maximum() const { return _input_maximum; }
+	ChanCount output_minimum() const { return _output_minimum; }
+	ChanCount output_maximum() const { return _output_maximum; }
 
+	void set_input_minimum (ChanCount n);
+	void set_input_maximum (ChanCount n);
+	void set_output_minimum (ChanCount n);
+	void set_output_maximum (ChanCount n);
+	
+	// Do not write any new code using these
 	void set_input_minimum (int n);
 	void set_input_maximum (int n);
 	void set_output_minimum (int n);
@@ -162,8 +169,8 @@ class IO : public Stateful, public ARDOUR::StateManager
 	MidiPort*  midi_input(uint32_t n) const;
 	MidiPort*  midi_output(uint32_t n) const;
 
-	uint32_t n_inputs () const { return _inputs.num_ports(); }
-	uint32_t n_outputs () const { return _outputs.num_ports(); }
+	const ChanCount& n_inputs ()  const { return _inputs.chan_count(); }
+	const ChanCount& n_outputs () const { return _outputs.chan_count(); }
 
 	sigc::signal<void,IOChange,void*> input_changed;
 	sigc::signal<void,IOChange,void*> output_changed;
@@ -193,7 +200,7 @@ class IO : public Stateful, public ARDOUR::StateManager
 	static sigc::signal<int> PortsLegal;
 	static sigc::signal<int> PannersLegal;
 	static sigc::signal<int> ConnectingLegal;
-	static sigc::signal<void,uint32_t> MoreOutputs;
+	static sigc::signal<void,ChanCount> MoreOutputs;
 	static sigc::signal<int> PortsCreated;
 
 	PBD::Controllable& gain_control() {
@@ -203,7 +210,8 @@ class IO : public Stateful, public ARDOUR::StateManager
 	/* Peak metering */
 
 	float peak_input_power (uint32_t n) { 
-		if (n < std::max (n_inputs(), n_outputs())) {
+		if (n < std::max (_inputs.chan_count().get(DataType::AUDIO),
+		                  _outputs.chan_count().get(DataType::AUDIO))) {
 			return _visible_peak_power[n];
 		} else {
 			return minus_infinity();
@@ -300,7 +308,8 @@ public:
 	void reset_peak_meters();
 	void reset_panner ();
 
-	virtual uint32_t pans_required() const { return n_inputs(); }
+	virtual uint32_t pans_required() const
+		{ return _inputs.chan_count().get(DataType::AUDIO); }
 
 	static void apply_declick (vector<Sample*>&, uint32_t nbufs, jack_nframes_t nframes, 
 				   gain_t initial, gain_t target, bool invert_polarity);
@@ -363,10 +372,10 @@ public:
 	sigc::connection port_legal_c;
 	sigc::connection panner_legal_c;
 
-	int _input_minimum;
-	int _input_maximum;
-	int _output_minimum;
-	int _output_maximum;
+	ChanCount _input_minimum;
+	ChanCount _input_maximum;
+	ChanCount _output_minimum;
+	ChanCount _output_maximum;
 
 
 	static int parse_io_string (const string&, vector<string>& chns);
diff --git a/libs/ardour/ardour/port_set.h b/libs/ardour/ardour/port_set.h
index f8975325a0..d38aab2c4b 100644
--- a/libs/ardour/ardour/port_set.h
+++ b/libs/ardour/ardour/port_set.h
@@ -60,7 +60,7 @@ public:
 
 	const ChanCount& chan_count() const { return _chan_count; }
 
-	bool empty() const { return (_chan_count.get_total_count() == 0); }
+	bool empty() const { return (_chan_count.get_total() == 0); }
 
 	// ITERATORS
 	
@@ -85,7 +85,7 @@ public:
 	};
 
 	iterator begin() { return iterator(*this, 0); }
-	iterator end()   { return iterator(*this, _chan_count.get_total_count()); }
+	iterator end()   { return iterator(*this, _chan_count.get_total()); }
 	
 	class const_iterator {
 	public:
@@ -105,7 +105,7 @@ public:
 	};
 
 	const_iterator begin() const { return const_iterator(*this, 0); }
-	const_iterator end()   const { return const_iterator(*this, _chan_count.get_total_count()); }
+	const_iterator end()   const { return const_iterator(*this, _chan_count.get_total()); }
 
 	
 
@@ -127,7 +127,7 @@ public:
 	};
 
 	audio_iterator audio_begin() { return audio_iterator(*this, 0); }
-	audio_iterator audio_end()   { return audio_iterator(*this, _chan_count.get_count(DataType::AUDIO)); }
+	audio_iterator audio_end()   { return audio_iterator(*this, _chan_count.get(DataType::AUDIO)); }
 
 
 
diff --git a/libs/ardour/ardour/redirect.h b/libs/ardour/ardour/redirect.h
index 658cab5d3b..4e6ef5124c 100644
--- a/libs/ardour/ardour/redirect.h
+++ b/libs/ardour/ardour/redirect.h
@@ -70,10 +70,10 @@ class Redirect : public IO
 	bool active () const { return _active; }
 	void set_active (bool yn, void *src);
 
-	virtual uint32_t output_streams() const { return n_outputs(); }
-	virtual uint32_t input_streams () const { return n_inputs(); }
-	virtual uint32_t natural_output_streams() const { return n_outputs(); }
-	virtual uint32_t natural_input_streams () const { return n_inputs(); }
+	virtual uint32_t output_streams() const { return n_outputs().get(_default_type); }
+	virtual uint32_t input_streams () const { return n_inputs().get(_default_type); }
+	virtual uint32_t natural_output_streams() const { return n_outputs().get(_default_type); }
+	virtual uint32_t natural_input_streams () const { return n_inputs().get(_default_type); }
 
 	uint32_t sort_key() const { return _sort_key; }
 	void set_sort_key (uint32_t key);
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 7331cbb5db..5cffe8a7c6 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1091,7 +1091,7 @@ class Session : public sigc::trackable, public Stateful
 
 	void update_latency_compensation_proxy (void* ignored);
 
-	void ensure_passthru_buffers (uint32_t howmany);
+	void ensure_passthru_buffers (ChanCount howmany);
 	
 	void process_scrub          (jack_nframes_t);
 	void process_without_events (jack_nframes_t);