remove all MIDI-specific editing modes by making standard work either at object level or within (e.g. notes, etc) ; make tool buttons proxies for GtkActions ; internal sends have their own BufferSet now, instead of using Session ones; don't make internal sends to the monitor bus active when added to the Route

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

6 files changed, 39 insertions, 12 deletions

diff --git a/libs/ardour/ardour/buffer_set.h b/libs/ardour/ardour/buffer_set.h
index 284609a988..49c392ce6a 100644
--- a/libs/ardour/ardour/buffer_set.h
+++ b/libs/ardour/ardour/buffer_set.h
@@ -62,6 +62,11 @@ public:
 	
 	void attach_buffers(PortSet& ports, nframes_t nframes, nframes_t offset = 0);
 
+	/* the capacity here is a size_t and has a different interpretation depending
+	   on the DataType of the buffers. for audio, its a frame count. for MIDI
+	   its a byte count.
+	*/
+
 	void ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capacity);
 	void ensure_buffers(const ChanCount& chns, size_t buffer_capacity);
 
diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h
index 3e89b8aec6..4cca8e2c89 100644
--- a/libs/ardour/ardour/internal_send.h
+++ b/libs/ardour/ardour/internal_send.h
@@ -43,10 +43,13 @@ class InternalSend : public Send
 	void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
 	bool feeds (boost::shared_ptr<Route> other) const;
 	bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
+	bool configure_io (ChanCount in, ChanCount out);
+	void set_block_size (nframes_t);
 
 	boost::shared_ptr<Route> target_route() const { return _send_to; }
 
   private:
+	BufferSet  mixbufs;
 	BufferSet* target;
 	boost::shared_ptr<Route> _send_to;
 	PBD::ID _send_to_id;
diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index f11c6037b3..bbf15166d4 100644
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -80,10 +80,9 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 	// we have to copy the input, because we may alter the buffers with the amp
 	// in-place, which a send must never do.
 	
-	BufferSet& sendbufs = _session.get_mix_buffers (bufs.count());
-	sendbufs.read_from (bufs, nframes);
-	assert(sendbufs.count() == bufs.count());
-
+	assert(mixbufs.available() >= bufs.count());
+	mixbufs.read_from (bufs, nframes);
+	
 	/* gain control */
 
 	gain_t tgain = target_gain ();
@@ -92,7 +91,7 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 		
 		/* target gain has changed */
 
-		Amp::apply_gain (sendbufs, nframes, _current_gain, tgain);
+		Amp::apply_gain (mixbufs, nframes, _current_gain, tgain);
 		_current_gain = tgain;
 
 	} else if (tgain == 0.0) {
@@ -101,13 +100,13 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 		*/
 
 		_meter->reset ();
-		Amp::apply_simple_gain (sendbufs, nframes, 0.0);
+		Amp::apply_simple_gain (mixbufs, nframes, 0.0);
 		goto out;
 
 	} else if (tgain != 1.0) {
 
 		/* target gain has not changed, but is not zero or unity */
-		Amp::apply_simple_gain (sendbufs, nframes, tgain);
+		Amp::apply_simple_gain (mixbufs, nframes, tgain);
 	}
 
 	
@@ -115,7 +114,7 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 	// so that we don't overwrite the main automation data for the route amp
 	// _amp->setup_gain_automation (start_frame, end_frame, nframes);
 
-	_amp->run (sendbufs, start_frame, end_frame, nframes);
+	_amp->run (mixbufs, start_frame, end_frame, nframes);
 
 	/* XXX NEED TO PAN */
 
@@ -125,18 +124,24 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 		if (_amp->gain_control()->get_value() == 0) {
 			_meter->reset();
 		} else {
-			_meter->run (sendbufs, start_frame, end_frame, nframes);
+			_meter->run (mixbufs, start_frame, end_frame, nframes);
 		}
 	}
 
 	/* deliver to target */
 
-	target->merge_from (sendbufs, nframes);
+	target->merge_from (mixbufs, nframes);
 
   out:
 	_active = _pending_active;
 }
 
+void
+InternalSend::set_block_size (nframes_t nframes)
+{
+	mixbufs.ensure_buffers (_configured_input, nframes);
+}
+
 bool
 InternalSend::feeds (boost::shared_ptr<Route> other) const
 {
@@ -222,6 +227,14 @@ InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 }
 
 bool
+InternalSend::configure_io (ChanCount in, ChanCount out)
+{
+	bool ret = Send::configure_io (in, out);
+	set_block_size (_session.get_block_size());
+	return ret;
+}
+
+bool
 InternalSend::set_name (const std::string& str)
 {
 	/* rules for external sends don't apply to us */
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 56311c975d..e9c09e33bb 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -694,8 +694,10 @@ Route::add_processor (boost::shared_ptr<Processor> processor, ProcessorList::ite
 			
 		}
 		
-		// XXX: do we want to emit the signal here ? change call order.
-		processor->activate ();
+		if (_control_outs != processor) {
+			// XXX: do we want to emit the signal here ? change call order.
+			processor->activate ();
+		}
 		processor->ActiveChanged.connect (bind (mem_fun (_session, &Session::update_latency_compensation), false, false));
 
 		_output->set_user_latency (0);
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index ba4e6db37d..06967127ee 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -62,6 +62,7 @@
 #include "ardour/cycle_timer.h"
 #include "ardour/data_type.h"
 #include "ardour/filename_extensions.h"
+#include "ardour/internal_send.h"
 #include "ardour/io_processor.h"
 #include "ardour/midi_diskstream.h"
 #include "ardour/midi_playlist.h"
diff --git a/libs/gtkmm2ext/tearoff.cc b/libs/gtkmm2ext/tearoff.cc
index aad14308a4..eb5dc8f7ef 100644
--- a/libs/gtkmm2ext/tearoff.cc
+++ b/libs/gtkmm2ext/tearoff.cc
@@ -19,6 +19,7 @@
 */
 
 #include <cmath>
+#include <iostream>
 #include <gtkmm2ext/tearoff.h>
 #include <gtkmm2ext/utils.h>
 
@@ -124,6 +125,8 @@ TearOff::tearoff_click (GdkEventButton* /*ev*/)
 		own_window.set_name (get_name());
 		close_event_box.set_name (get_name());
 		own_window.show_all ();
+		own_window.present ();
+		std::cerr << "own window should be visible\n";
 		hide ();
 		Detach ();
 	}