Squashed commit of the following:

commit fdbae82077db53add90df7448a06869dac89acc6
Author: Paul Davis <paul@linuxaudiosystems.com>
Date:   Wed Mar 27 21:45:28 2013 -0400

    mammoth changes in basic signal flow, total redesign of MIDI channel filtering and more.

commit 59343a8283698e02bc0f622313b29e98f449e4c8
Author: Paul Davis <paul@linuxaudiosystems.com>
Date:   Wed Mar 27 01:58:53 2013 -0400

    initial working version after changes to MIDI channel filtering. may affect metering input too. testing not yet finished

this commit merges many deep changes in ardour's internal architecture,
combined with a total redesign of how MIDI channel filtering works.

data in a track used to flow from JACK port buffers to diskstream's ringbuffers
and was then copied from the ringbuffers into a BufferSet for use during
Route::process_output_buffers(). The butler thread would handle the movement of
data between the ringbuffers and disk.

with this commit, data now flows from JACK port buffers into the BufferSet used
for Route processing, and is copied from the BufferSet into the diskstream's
ringbuffers (the butler thread continues to handle interactions with disk as
usual).

this change allowed a dramatic consolidation of code and simplification of most
aspects of Track/Route::roll() and Track/Route::no_roll(). in particular, see
Route::fill_buffers_with_input() which now concisely describes how we move data
from JACK port buffers into the BufferSet for all Route types (including Tracks).

this work was initially motivated by changing MIDI channel filtering so that we
can process capture and playback independently. there is now a very clean
pathway for this - see MidiTrack::roll() (NOTE: This needs implementing in the
no-roll case too - a TODO item).

the channel selector for MIDI tracks has been moved out of the track header and
is now accessible via the context menu. more work is likely here, to make it
(more) obvious to the user when filtering is going on.

1 files changed, 60 insertions, 0 deletions

diff --git a/gtk2_ardour/midi_channel_selector.h b/gtk2_ardour/midi_channel_selector.h
index 5764a8d813..f6d3206c31 100644
--- a/gtk2_ardour/midi_channel_selector.h
+++ b/gtk2_ardour/midi_channel_selector.h
@@ -26,11 +26,18 @@
 
 #include "gtkmm/table.h"
 #include "gtkmm/button.h"
+#include "gtkmm/radiobutton.h"
 #include "gtkmm/label.h"
 #include "gtkmm2ext/stateful_button.h"
 
 #include "ardour/types.h"
 
+#include "ardour_window.h"
+
+namespace ARDOUR {
+	class MidiTrack;
+}
+
 class MidiChannelSelector : public Gtk::Table
 {
 public:
@@ -108,4 +115,57 @@ protected:
 	Gtk::ToggleButton _force_channel;
 };
 
+class MidiChannelSelectorWindow : public ArdourWindow, public PBD::ScopedConnectionList
+{
+  public:
+    MidiChannelSelectorWindow (boost::shared_ptr<ARDOUR::MidiTrack>);
+    ~MidiChannelSelectorWindow ();
+
+    void set_channel_colors (const uint32_t new_channel_colors[16]);
+    void set_default_channel_color();
+
+  private:
+    boost::shared_ptr<ARDOUR::MidiTrack> track;
+    std::vector<Gtk::ToggleButton*> playback_buttons;
+    std::vector<Gtk::ToggleButton*> capture_buttons;
+
+    Gtk::ToggleButton* playback_all_button;
+    Gtk::ToggleButton* playback_filter_button;
+    Gtk::ToggleButton* playback_force_button;
+    Gtk::ToggleButton* capture_all_button;
+    Gtk::ToggleButton* capture_filter_button;
+    Gtk::ToggleButton* capture_force_button;
+
+    void build();
+    void set_capture_selected_channels (uint16_t);
+    void set_playback_selected_channels (uint16_t);
+
+    void fill_playback_mask ();
+    void zero_playback_mask ();
+    void invert_playback_mask ();
+
+    void fill_capture_mask ();
+    void zero_capture_mask ();
+    void invert_capture_mask ();
+
+    void playback_mask_changed ();
+    void capture_mask_changed ();
+    void playback_mode_changed ();
+    void capture_mode_changed ();
+
+    void playback_channel_clicked (uint16_t);
+    void capture_channel_clicked (uint16_t);
+
+    void playback_all_clicked();
+    void playback_none_clicked();
+    void playback_invert_clicked();
+
+    void capture_all_clicked();
+    void capture_none_clicked();
+    void capture_invert_clicked();
+
+    void capture_mode_toggled (ARDOUR::ChannelMode);
+    void playback_mode_toggled (ARDOUR::ChannelMode);
+};
+
 #endif /*__ardour_ui_midi_channel_selector_h__*/