More signal path cleanup, IO now has one deliver_output function that should do the reasonable thing in all cases.

Including deliver MIDI.

You can now create a MIDI Track, run some MIDI through it, and toggle the mute button on and off, hearing either
silence or a large amount of stuck notes depending on your luck.  Woooo.


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

1 files changed, 3 insertions, 6 deletions

diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index 5ea9f95f7a..a88180701e 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -241,13 +241,8 @@ class Panner : public std::vector<StreamPanner*>, public Stateful, public sigc::
 	Panner (string name, Session&);
 	virtual ~Panner ();
 
-	// FIXME: unify these two
-	
 	/// The fundamental Panner function
-	void distribute (BufferSet& src, BufferSet& dest, jack_nframes_t nframes, jack_nframes_t offset, gain_t gain_coeff);
-
-	/// The other fundamental Panner function
-	void distribute_automated (BufferSet& src, BufferSet& dest, jack_nframes_t start_frame, jack_nframes_t end_frames, jack_nframes_t nframes, jack_nframes_t offset);
+	void distribute(BufferSet& src, BufferSet& dest, jack_nframes_t start_frame, jack_nframes_t end_frames, jack_nframes_t nframes, jack_nframes_t offset);
 
 	void set_name (string);
 
@@ -311,6 +306,8 @@ class Panner : public std::vector<StreamPanner*>, public Stateful, public sigc::
 	void set_position (float x, float y, float z, StreamPanner& orig);
 	
   private:
+	void distribute_no_automation(BufferSet& src, BufferSet& dest, jack_nframes_t nframes, jack_nframes_t offset, gain_t gain_coeff);
+
 
 	string            automation_path;
 	Session&         _session;