NO-OP: whitespace and some guaranteed assertion removal

[ardour.git] / gtk2_ardour / midi_channel_selector.h

diff --git a/gtk2_ardour/midi_channel_selector.h b/gtk2_ardour/midi_channel_selector.h
index f6d3206c31503681d880fe95b15cccca78e3d997..c7c754c2b74ba642fd5825a0b45d5b5233dc3297 100644 (file)
--- a/gtk2_ardour/midi_channel_selector.h
+++ b/gtk2_ardour/midi_channel_selector.h
@@ -25,10 +25,12 @@
 #include "sigc++/trackable.h"
 
 #include "gtkmm/table.h"
+#include "gtkmm/box.h"
 #include "gtkmm/button.h"
 #include "gtkmm/radiobutton.h"
 #include "gtkmm/label.h"
-#include "gtkmm2ext/stateful_button.h"
+
+#include "widgets/stateful_button.h"
 
 #include "ardour/types.h"
 
@@ -51,11 +53,11 @@ public:
 
 protected:
        virtual void button_toggled(Gtk::ToggleButton* button, uint8_t button_nr) = 0;
-       Gtk::Label                      _button_labels[4][4];
-       Gtkmm2ext::StatefulToggleButton _buttons[4][4];
-       int                             _recursion_counter;
+       Gtk::Label                          _button_labels[4][4];
+       ArdourWidgets::StatefulToggleButton _buttons[4][4];
+       int                                 _recursion_counter;
 
-       bool              was_clicked (GdkEventButton*);
+       bool was_clicked (GdkEventButton*);
 };
 
 class SingleMidiChannelSelector : public MidiChannelSelector
@@ -78,7 +80,7 @@ class MidiMultipleChannelSelector : public MidiChannelSelector
 {
 public:
        MidiMultipleChannelSelector(ARDOUR::ChannelMode mode = ARDOUR::FilterChannels,
-                                   uint16_t initial_selection = 0xFFFF);
+                       uint16_t initial_selection = 0xFFFF);
 
        virtual ~MidiMultipleChannelSelector();
 
@@ -117,55 +119,65 @@ protected:
 
 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);
+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;
+
+       std::vector<Gtk::Widget*> playback_mask_controls;
+       std::vector<Gtk::Widget*> capture_mask_controls;
+
+       Gtk::HBox         capture_mask_box;
+       Gtk::HBox         playback_mask_box;
+       Gtk::RadioButtonGroup playback_button_group;
+       Gtk::RadioButton playback_all_button;
+       Gtk::RadioButton playback_filter_button;
+       Gtk::RadioButton playback_force_button;
+       Gtk::RadioButtonGroup capture_button_group;
+       Gtk::RadioButton capture_all_button;
+       Gtk::RadioButton capture_filter_button;
+       Gtk::RadioButton capture_force_button;
+
+       ARDOUR::ChannelMode last_drawn_capture_mode;
+       ARDOUR::ChannelMode last_drawn_playback_mode;
+
+       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__*/