Remove unused backend channel count config API

libs/ardour/ardour/audio_backend.h

@@ -406,23 +406,6 @@ public:
 	{
 		return 1024;
 	}
-
-	/** Returns the maximum number of input channels that are potentially
-	 * usable with the hardware identified by \p device . Any number from 1
-	 * to the value returned may be supplied in other calls to this backend as
-	 * the input channel count to use with the name device, but the requested
-	 * count may turn out to be unavailable, or become invalid at any time.
-	 */
-	virtual uint32_t available_input_channel_count (const std::string& device) const = 0;
-
-	/** Returns the maximum number of output channels that are potentially
-	 * usable with the hardware identified by \p device . Any number from 1
-	 * to the value returned may be supplied in other calls to this backend as
-	 * the output channel count to use with the name device, but the requested
-	 * count may turn out to be unavailable, or become invalid at any time.
-	 */
-	virtual uint32_t available_output_channel_count (const std::string& device) const = 0;
-
 	/* Return true if the derived class can change the sample rate of the
 	 * device in use while the device is already being used. Return false
 	 * otherwise. (example: JACK cannot do this as of September 2013)
@@ -511,12 +494,6 @@ public:
 	 */
 	virtual int set_interleaved (bool yn) = 0;
 
-	/** Set the number of input channels that should be used */
-	virtual int set_input_channels (uint32_t) = 0;
-
-	/** Set the number of output channels that should be used */
-	virtual int set_output_channels (uint32_t) = 0;
-
 	/** Set the (additional) input latency that cannot be determined via
 	 * the implementation's underlying code (e.g. latency from
 	 * external D-A/D-A converters. Units are samples.
@@ -555,8 +532,6 @@ public:
 	virtual float    sample_rate () const                                   = 0;
 	virtual uint32_t buffer_size () const                                   = 0;
 	virtual bool     interleaved () const                                   = 0;
-	virtual uint32_t input_channels () const                                = 0;
-	virtual uint32_t output_channels () const                               = 0;
 	virtual uint32_t systemic_input_latency () const                        = 0;
 	virtual uint32_t systemic_output_latency () const                       = 0;
 	virtual uint32_t systemic_midi_input_latency (std::string const) const  = 0;

libs/ardour/ardour/audioengine.h

@@ -124,8 +124,6 @@ class LIBARDOUR_API AudioEngine : public PortManager, public SessionHandlePtr
 	int set_sample_rate (float);
 	int set_buffer_size (uint32_t);
 	int set_interleaved (bool yn);
-	int set_input_channels (uint32_t);
-	int set_output_channels (uint32_t);
 	int set_systemic_input_latency (uint32_t);
 	int set_systemic_output_latency (uint32_t);
 

libs/ardour/audioengine.cc

@@ -1411,24 +1411,6 @@ AudioEngine::set_interleaved (bool yn)
 	return _backend->set_interleaved  (yn);
 }
 
-int
-AudioEngine::set_input_channels (uint32_t ic)
-{
-	if (!_backend) {
-		return -1;
-	}
-	return _backend->set_input_channels  (ic);
-}
-
-int
-AudioEngine::set_output_channels (uint32_t oc)
-{
-	if (!_backend) {
-		return -1;
-	}
-	return _backend->set_output_channels (oc);
-}
-
 int
 AudioEngine::set_systemic_input_latency (uint32_t il)
 {

libs/ardour/luabindings.cc

@@ -2866,8 +2866,6 @@ LuaBindings::common (lua_State* L)
 		.addFunction ("sample_rate", &AudioBackend::sample_rate)
 		.addFunction ("buffer_size", &AudioBackend::buffer_size)
 		.addFunction ("period_size", &AudioBackend::period_size)
-		.addFunction ("input_channels", &AudioBackend::input_channels)
-		.addFunction ("output_channels", &AudioBackend::output_channels)
 		.addFunction ("dsp_load", &AudioBackend::dsp_load)
 
 		.addFunction ("set_sample_rate", &AudioBackend::set_sample_rate)

libs/backends/alsa/alsa_audiobackend.cc

@@ -258,30 +258,6 @@ AlsaAudioBackend::available_buffer_sizes (const std::string& device) const
 	return bs;
 }
 
-uint32_t
-AlsaAudioBackend::available_input_channel_count (const std::string& device) const
-{
-	if (device == get_standard_device_name (DeviceNone)) {
-		return 0;
-	}
-	if (device == _input_audio_device && _input_audio_device_info.valid) {
-		return _input_audio_device_info.max_channels;
-	}
-	return 128;
-}
-
-uint32_t
-AlsaAudioBackend::available_output_channel_count (const std::string& device) const
-{
-	if (device == get_standard_device_name (DeviceNone)) {
-		return 0;
-	}
-	if (device == _output_audio_device && _output_audio_device_info.valid) {
-		return _output_audio_device_info.max_channels;
-	}
-	return 128;
-}
-
 std::vector<uint32_t>
 AlsaAudioBackend::available_period_sizes (const std::string& driver, const std::string& device) const
 {
@@ -446,20 +422,6 @@ AlsaAudioBackend::set_interleaved (bool yn)
 	return -1;
 }
 
-int
-AlsaAudioBackend::set_input_channels (uint32_t cc)
-{
-	_n_inputs = cc;
-	return 0;
-}
-
-int
-AlsaAudioBackend::set_output_channels (uint32_t cc)
-{
-	_n_outputs = cc;
-	return 0;
-}
-
 int
 AlsaAudioBackend::set_systemic_input_latency (uint32_t sl)
 {
@@ -610,18 +572,6 @@ AlsaAudioBackend::interleaved () const
 	return false;
 }
 
-uint32_t
-AlsaAudioBackend::input_channels () const
-{
-	return _n_inputs;
-}
-
-uint32_t
-AlsaAudioBackend::output_channels () const
-{
-	return _n_outputs;
-}
-
 uint32_t
 AlsaAudioBackend::systemic_input_latency () const
 {

libs/backends/alsa/alsa_audiobackend.h

@@ -139,8 +139,6 @@ class AlsaAudioBackend : public AudioBackend, public PortEngineSharedImpl
 		std::vector<uint32_t> available_buffer_sizes (const std::string& device) const;
 		std::vector<uint32_t> available_buffer_sizes2 (const std::string&, const std::string&) const;
 		std::vector<uint32_t> available_period_sizes (const std::string& driver, const std::string& device) const;
-		uint32_t available_input_channel_count (const std::string& device) const;
-		uint32_t available_output_channel_count (const std::string& device) const;
 
 		bool can_change_sample_rate_when_running () const;
 		bool can_change_buffer_size_when_running () const;
@@ -158,8 +156,6 @@ class AlsaAudioBackend : public AudioBackend, public PortEngineSharedImpl
 		int set_buffer_size (uint32_t);
 		int set_peridod_size (uint32_t);
 		int set_interleaved (bool yn);
-		int set_input_channels (uint32_t);
-		int set_output_channels (uint32_t);
 		int set_systemic_input_latency (uint32_t);
 		int set_systemic_output_latency (uint32_t);
 		int set_systemic_midi_input_latency (std::string const, uint32_t);
@@ -175,8 +171,6 @@ class AlsaAudioBackend : public AudioBackend, public PortEngineSharedImpl
 		uint32_t     buffer_size () const;
 		uint32_t     period_size () const;
 		bool         interleaved () const;
-		uint32_t     input_channels () const;
-		uint32_t     output_channels () const;
 		uint32_t     systemic_input_latency () const;
 		uint32_t     systemic_output_latency () const;
 		uint32_t     systemic_midi_input_latency (std::string const) const;

libs/backends/coreaudio/coreaudio_backend.cc

@@ -270,18 +270,6 @@ CoreAudioBackend::available_buffer_sizes2 (const std::string& input_device, cons
 	}
 }
 
-uint32_t
-CoreAudioBackend::available_input_channel_count (const std::string&) const
-{
-	return 128; // TODO query current device
-}
-
-uint32_t
-CoreAudioBackend::available_output_channel_count (const std::string&) const
-{
-	return 128; // TODO query current device
-}
-
 bool
 CoreAudioBackend::can_change_sample_rate_when_running () const
 {
@@ -361,20 +349,6 @@ CoreAudioBackend::set_interleaved (bool yn)
 	return -1;
 }
 
-int
-CoreAudioBackend::set_input_channels (uint32_t cc)
-{
-	_n_inputs = cc;
-	return 0;
-}
-
-int
-CoreAudioBackend::set_output_channels (uint32_t cc)
-{
-	_n_outputs = cc;
-	return 0;
-}
-
 int
 CoreAudioBackend::set_systemic_input_latency (uint32_t sl)
 {
@@ -426,18 +400,6 @@ CoreAudioBackend::interleaved () const
 	return false;
 }
 
-uint32_t
-CoreAudioBackend::input_channels () const
-{
-	return _n_inputs;
-}
-
-uint32_t
-CoreAudioBackend::output_channels () const
-{
-	return _n_outputs;
-}
-
 uint32_t
 CoreAudioBackend::systemic_input_latency () const
 {

libs/backends/coreaudio/coreaudio_backend.h

@@ -171,8 +171,6 @@ class CoreAudioBackend : public AudioBackend, public PortEngineSharedImpl {
 	std::vector<float> available_sample_rates2 (const std::string&, const std::string&) const;
 	std::vector<uint32_t> available_buffer_sizes (const std::string& device) const;
 	std::vector<uint32_t> available_buffer_sizes2 (const std::string&, const std::string&) const;
-	uint32_t available_input_channel_count (const std::string& device) const;
-	uint32_t available_output_channel_count (const std::string& device) const;
 
 	bool can_change_sample_rate_when_running () const;
 	bool can_change_buffer_size_when_running () const;
@@ -184,8 +182,6 @@ class CoreAudioBackend : public AudioBackend, public PortEngineSharedImpl {
 	int set_sample_rate (float);
 	int set_buffer_size (uint32_t);
 	int set_interleaved (bool yn);
-	int set_input_channels (uint32_t);
-	int set_output_channels (uint32_t);
 	int set_systemic_input_latency (uint32_t);
 	int set_systemic_output_latency (uint32_t);
 	int set_systemic_midi_input_latency (std::string const, uint32_t) { return 0; }
@@ -200,8 +196,6 @@ class CoreAudioBackend : public AudioBackend, public PortEngineSharedImpl {
 	float        sample_rate () const;
 	uint32_t     buffer_size () const;
 	bool         interleaved () const;
-	uint32_t     input_channels () const;
-	uint32_t     output_channels () const;
 	uint32_t     systemic_input_latency () const;
 	uint32_t     systemic_output_latency () const;
 	uint32_t     systemic_midi_input_latency (std::string const) const { return 0; }

libs/backends/dummy/dummy_audiobackend.cc

@@ -179,18 +179,6 @@ DummyAudioBackend::available_buffer_sizes (const std::string&) const
 	return bs;
 }
 
-uint32_t
-DummyAudioBackend::available_input_channel_count (const std::string&) const
-{
-	return 128;
-}
-
-uint32_t
-DummyAudioBackend::available_output_channel_count (const std::string&) const
-{
-	return 128;
-}
-
 bool
 DummyAudioBackend::can_change_sample_rate_when_running () const
 {
@@ -295,20 +283,6 @@ DummyAudioBackend::set_interleaved (bool yn)
 	return -1;
 }
 
-int
-DummyAudioBackend::set_input_channels (uint32_t cc)
-{
-	_n_inputs = cc;
-	return 0;
-}
-
-int
-DummyAudioBackend::set_output_channels (uint32_t cc)
-{
-	_n_outputs = cc;
-	return 0;
-}
-
 int
 DummyAudioBackend::set_systemic_input_latency (uint32_t sl)
 {
@@ -348,18 +322,6 @@ DummyAudioBackend::interleaved () const
 	return false;
 }
 
-uint32_t
-DummyAudioBackend::input_channels () const
-{
-	return _n_inputs;
-}
-
-uint32_t
-DummyAudioBackend::output_channels () const
-{
-	return _n_outputs;
-}
-
 uint32_t
 DummyAudioBackend::systemic_input_latency () const
 {

libs/backends/dummy/dummy_audiobackend.h

@@ -204,8 +204,6 @@ class DummyAudioBackend : public AudioBackend, public PortEngineSharedImpl
 		std::vector<DeviceStatus> enumerate_devices () const;
 		std::vector<float> available_sample_rates (const std::string& device) const;
 		std::vector<uint32_t> available_buffer_sizes (const std::string& device) const;
-		uint32_t available_input_channel_count (const std::string& device) const;
-		uint32_t available_output_channel_count (const std::string& device) const;
 
 		bool can_change_sample_rate_when_running () const;
 		bool can_change_buffer_size_when_running () const;
@@ -215,8 +213,6 @@ class DummyAudioBackend : public AudioBackend, public PortEngineSharedImpl
 		int set_sample_rate (float);
 		int set_buffer_size (uint32_t);
 		int set_interleaved (bool yn);
-		int set_input_channels (uint32_t);
-		int set_output_channels (uint32_t);
 		int set_systemic_input_latency (uint32_t);
 		int set_systemic_output_latency (uint32_t);
 		int set_systemic_midi_input_latency (std::string const, uint32_t) { return 0; }
@@ -229,8 +225,6 @@ class DummyAudioBackend : public AudioBackend, public PortEngineSharedImpl
 		float        sample_rate () const;
 		uint32_t     buffer_size () const;
 		bool         interleaved () const;
-		uint32_t     input_channels () const;
-		uint32_t     output_channels () const;
 		uint32_t     systemic_input_latency () const;
 		uint32_t     systemic_output_latency () const;
 		uint32_t     systemic_midi_input_latency (std::string const) const { return 0; }

libs/backends/jack/jack_audiobackend.cc

@@ -227,18 +227,6 @@ JACKAudioBackend::available_period_sizes (const std::string& driver, const std::
 	return s;
 }
 
-uint32_t
-JACKAudioBackend::available_input_channel_count (const string& /*device*/) const
-{
-	return 128;
-}
-
-uint32_t
-JACKAudioBackend::available_output_channel_count (const string& /*device*/) const
-{
-	return 128;
-}
-
 /* -- parameter setting -- */
 
 int
@@ -309,36 +297,6 @@ JACKAudioBackend::set_interleaved (bool yn)
 	return -1;
 }
 
-int
-JACKAudioBackend::set_input_channels (uint32_t cnt)
-{
-	if (available()) {
-		if (cnt != 0) {
-			/* can't set a real value for this while JACK runs */
-			return -1;
-		}
-	}
-
-	_target_input_channels = cnt;
-
-	return 0;
-}
-
-int
-JACKAudioBackend::set_output_channels (uint32_t cnt)
-{
-	if (available()) {
-		if (cnt != 0) {
-			/* can't set a real value for this while JACK runs */
-			return -1;
-		}
-	}
-
-	_target_output_channels = cnt;
-
-	return 0;
-}
-
 int
 JACKAudioBackend::set_systemic_input_latency (uint32_t l)
 {
@@ -433,42 +391,6 @@ JACKAudioBackend::midi_option () const
 	return _target_midi_option;
 }
 
-uint32_t
-JACKAudioBackend::input_channels () const
-{
-	if (!_jack_connection->in_control()) {
-		if (available()) {
-			return n_physical (JackPortIsInput).n_audio();
-		} else {
-			return 0;
-		}
-	} else {
-		if (available()) {
-			return n_physical (JackPortIsInput).n_audio();
-		} else {
-			return _target_input_channels;
-		}
-	}
-}
-
-uint32_t
-JACKAudioBackend::output_channels () const
-{
-	if (!_jack_connection->in_control()) {
-		if (available()) {
-			return n_physical (JackPortIsOutput).n_audio();
-		} else {
-			return 0;
-		}
-	} else {
-		if (available()) {
-			return n_physical (JackPortIsOutput).n_audio();
-		} else {
-			return _target_output_channels;
-		}
-	}
-}
-
 uint32_t
 JACKAudioBackend::systemic_input_latency () const
 {

libs/backends/jack/jack_audiobackend.h

@@ -69,8 +69,6 @@ class JACKAudioBackend : public AudioBackend {
 	std::vector<float> available_sample_rates (const std::string& device) const;
 	std::vector<uint32_t> available_buffer_sizes (const std::string& device) const;
 	std::vector<uint32_t> available_period_sizes (const std::string& driver, const std::string& device) const;
-	uint32_t available_input_channel_count (const std::string& device) const;
-	uint32_t available_output_channel_count (const std::string& device) const;
 
 	bool can_change_sample_rate_when_running() const;
 	bool can_change_buffer_size_when_running() const;
@@ -80,8 +78,6 @@ class JACKAudioBackend : public AudioBackend {
 	int set_buffer_size (uint32_t);
 	int set_peridod_size (uint32_t);
 	int set_interleaved (bool yn);
-	int set_input_channels (uint32_t);
-	int set_output_channels (uint32_t);
 	int set_systemic_input_latency (uint32_t);
 	int set_systemic_output_latency (uint32_t);
 	int set_systemic_midi_input_latency (std::string const, uint32_t) { return 0; }
@@ -94,8 +90,6 @@ class JACKAudioBackend : public AudioBackend {
 	uint32_t     buffer_size () const;
 	uint32_t     period_size () const;
 	bool         interleaved () const;
-	uint32_t     input_channels () const;
-	uint32_t     output_channels () const;
 	uint32_t     systemic_input_latency () const;
 	uint32_t     systemic_output_latency () const;
 	uint32_t     systemic_midi_input_latency (std::string const) const { return 0; }

libs/backends/portaudio/portaudio_backend.cc

@@ -245,18 +245,6 @@ PortAudioBackend::available_buffer_sizes (const std::string&) const
 	return bs;
 }
 
-uint32_t
-PortAudioBackend::available_input_channel_count (const std::string&) const
-{
-	return 128; // TODO query current device
-}
-
-uint32_t
-PortAudioBackend::available_output_channel_count (const std::string&) const
-{
-	return 128; // TODO query current device
-}
-
 bool
 PortAudioBackend::can_change_sample_rate_when_running () const
 {
@@ -320,20 +308,6 @@ PortAudioBackend::set_interleaved (bool yn)
 	return -1;
 }
 
-int
-PortAudioBackend::set_input_channels (uint32_t cc)
-{
-	_n_inputs = cc;
-	return 0;
-}
-
-int
-PortAudioBackend::set_output_channels (uint32_t cc)
-{
-	_n_outputs = cc;
-	return 0;
-}
-
 int
 PortAudioBackend::set_systemic_input_latency (uint32_t sl)
 {
@@ -409,18 +383,6 @@ PortAudioBackend::interleaved () const
 	return false;
 }
 
-uint32_t
-PortAudioBackend::input_channels () const
-{
-	return _n_inputs;
-}
-
-uint32_t
-PortAudioBackend::output_channels () const
-{
-	return _n_outputs;
-}
-
 uint32_t
 PortAudioBackend::systemic_input_latency () const
 {

libs/backends/portaudio/portaudio_backend.h

@@ -120,8 +120,6 @@ class PortAudioBackend : public AudioBackend, public PortEngineSharedImpl {
 
 		std::vector<float> available_sample_rates (const std::string& device) const;
 		std::vector<uint32_t> available_buffer_sizes (const std::string& device) const;
-		uint32_t available_input_channel_count (const std::string& device) const;
-		uint32_t available_output_channel_count (const std::string& device) const;
 
 		bool can_change_sample_rate_when_running () const;
 		bool can_change_buffer_size_when_running () const;
@@ -132,8 +130,6 @@ class PortAudioBackend : public AudioBackend, public PortEngineSharedImpl {
 		int set_sample_rate (float);
 		int set_buffer_size (uint32_t);
 		int set_interleaved (bool yn);
-		int set_input_channels (uint32_t);
-		int set_output_channels (uint32_t);
 		int set_systemic_input_latency (uint32_t);
 		int set_systemic_output_latency (uint32_t);
 		int set_systemic_midi_input_latency (std::string const, uint32_t);
@@ -148,8 +144,6 @@ class PortAudioBackend : public AudioBackend, public PortEngineSharedImpl {
 		float        sample_rate () const;
 		uint32_t     buffer_size () const;
 		bool         interleaved () const;
-		uint32_t     input_channels () const;
-		uint32_t     output_channels () const;
 		uint32_t     systemic_input_latency () const;
 		uint32_t     systemic_output_latency () const;
 		uint32_t     systemic_midi_input_latency (std::string const) const;

libs/backends/pulseaudio/pulseaudio_backend.cc

@@ -377,18 +377,6 @@ PulseAudioBackend::available_buffer_sizes (const std::string&) const
 	return bs;
 }
 
-uint32_t
-PulseAudioBackend::available_input_channel_count (const std::string&) const
-{
-	return 0;
-}
-
-uint32_t
-PulseAudioBackend::available_output_channel_count (const std::string&) const
-{
-	return N_CHANNELS;
-}
-
 bool
 PulseAudioBackend::can_change_sample_rate_when_running () const
 {
@@ -440,18 +428,6 @@ PulseAudioBackend::set_interleaved (bool yn)
 	return -1;
 }
 
-int
-PulseAudioBackend::set_input_channels (uint32_t cc)
-{
-	return 0;
-}
-
-int
-PulseAudioBackend::set_output_channels (uint32_t cc)
-{
-	return 0;
-}
-
 int
 PulseAudioBackend::set_systemic_input_latency (uint32_t sl)
 {
@@ -489,18 +465,6 @@ PulseAudioBackend::interleaved () const
 	return false;
 }
 
-uint32_t
-PulseAudioBackend::input_channels () const
-{
-	return 0;
-}
-
-uint32_t
-PulseAudioBackend::output_channels () const
-{
-	return N_CHANNELS;
-}
-
 uint32_t
 PulseAudioBackend::systemic_input_latency () const
 {

libs/backends/pulseaudio/pulseaudio_backend.h

@@ -107,8 +107,6 @@ public:
 	std::vector<DeviceStatus> enumerate_devices () const;
 	std::vector<float> available_sample_rates (const std::string& device) const;
 	std::vector<uint32_t> available_buffer_sizes (const std::string& device) const;
-	uint32_t available_input_channel_count (const std::string& device) const;
-	uint32_t available_output_channel_count (const std::string& device) const;
 
 	bool can_change_sample_rate_when_running () const;
 	bool can_change_buffer_size_when_running () const;
@@ -118,8 +116,6 @@ public:
 	int set_sample_rate (float);
 	int set_buffer_size (uint32_t);
 	int set_interleaved (bool yn);
-	int set_input_channels (uint32_t);
-	int set_output_channels (uint32_t);
 	int set_systemic_input_latency (uint32_t);
 	int set_systemic_output_latency (uint32_t);
 
@@ -133,8 +129,6 @@ public:
 	float       sample_rate () const;
 	uint32_t    buffer_size () const;
 	bool        interleaved () const;
-	uint32_t    input_channels () const;
-	uint32_t    output_channels () const;
 	uint32_t    systemic_input_latency () const;
 	uint32_t    systemic_output_latency () const;
 	uint32_t    systemic_midi_input_latency (std::string const) const { return 0; }