first part of MIDI cut/copy/paste ; fix for input/output_streams of an IOProcessor being reported in a misleading way; in/out translation fix from 2.X, sort of

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

5 files changed, 11 insertions, 17 deletions

diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h
index ff985c6e79..d591962733 100644
--- a/libs/ardour/ardour/io_processor.h
+++ b/libs/ardour/ardour/io_processor.h
@@ -53,8 +53,6 @@ class IOProcessor : public Processor
 	
 	bool set_name (const std::string& str);
 
-	virtual ChanCount output_streams() const;
-	virtual ChanCount input_streams () const;
 	virtual ChanCount natural_output_streams() const;
 	virtual ChanCount natural_input_streams () const;
 
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 7a97ce0d6b..2749b9f405 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -1061,10 +1061,16 @@ IO::build_legal_port_name (DataType type)
 		throw unknown_type();
 	}
 	
+	/* note that if "in" or "out" are translated it will break a session
+	   across locale switches because a port's connection list will
+	   show (old) translated names, but the current port name will
+	   use the (new) translated name.
+	*/
+
 	if (_direction == Input) {
-		suffix += _("_in");
+		suffix += X_("_in");
 	} else {
-		suffix += _("_out");
+		suffix += X_("_out");
 	}
 
 	// allow up to 4 digits for the output port number, plus the slash, suffix and extra space
diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc
index 708820cdca..505d33a1b0 100644
--- a/libs/ardour/io_processor.cc
+++ b/libs/ardour/io_processor.cc
@@ -221,18 +221,6 @@ IOProcessor::silence (nframes_t nframes)
 }
 
 ChanCount
-IOProcessor::output_streams() const
-{
-	return _output ? _output->n_ports() : ChanCount::ZERO;
-}
-
-ChanCount
-IOProcessor::input_streams () const
-{
-	return _input ? _input->n_ports() : ChanCount::ZERO;
-}
-
-ChanCount
 IOProcessor::natural_output_streams() const
 {
 	return _output ? _output->n_ports() : ChanCount::ZERO;
diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index 04706c0c2d..101bc29ab4 100644
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -232,6 +232,8 @@ Processor::configure_io (ChanCount in, ChanCount out)
 	_configured_output = out; 
 	_configured = true;
 
+	std::cerr << "******* CONF IN for " << _name << " set to " << in << std::endl;
+
 	ConfigurationChanged.emit (in, out);
 
 	return true;
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 9895cf1e18..989cecdd6b 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -422,7 +422,7 @@ Route::process_output_buffers (BufferSet& bufs,
 		for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
 			if (bufs.count() != (*i)->input_streams()) {
 				cerr << _name << " bufs = " << bufs.count()
-				     << " input = " << (*i)->input_streams()
+				     << " input for " << (*i)->name() << " = " << (*i)->input_streams()
 				     << endl;
 			}
 			assert (bufs.count() == (*i)->input_streams());