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, 6 insertions, 4 deletions

diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 0b8c84a459..7b5e72742d 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -101,11 +101,9 @@ class IO : public Stateful, public ARDOUR::StateManager
 	
 	virtual void silence  (jack_nframes_t, jack_nframes_t offset);
 
-	void pan (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset, gain_t gain_coeff);
-	void pan_automated (BufferSet& bufs, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t nframes, jack_nframes_t offset);
 	void collect_input  (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset);
-	void deliver_output (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset);
-	void deliver_output_no_pan (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset);
+	void deliver_output (BufferSet& bufs, jack_nframes_t start_frame, jack_nframes_t end_frame,
+	                                      jack_nframes_t nframes, jack_nframes_t offset);
 	void just_meter_input (jack_nframes_t start_frame, jack_nframes_t end_frame, 
 			       jack_nframes_t nframes, jack_nframes_t offset);
 
@@ -115,6 +113,9 @@ class IO : public Stateful, public ARDOUR::StateManager
 	void           inc_gain (gain_t delta, void *src);
 	gain_t         gain () const { return _desired_gain; }
 	virtual gain_t effective_gain () const;
+	
+	void set_phase_invert (bool yn, void *src);
+	bool phase_invert() const { return _phase_invert; }
 
 	Panner& panner()        { return *_panner; }
 	PeakMeter& peak_meter() { return *_meter; }
@@ -295,6 +296,7 @@ public:
 	Connection* _output_connection;
 	PBD::ID     _id;
 	bool         no_panner_reset;
+	bool        _phase_invert;
 	XMLNode*     deferred_state;
 	DataType    _default_type;