Make editor route list rec button respect group settings.

[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 e026c1232527d69983ffc3a8a226d40fe56f8094..f604d0ccd33f4e4929ad47dc92607fc58d705046 100644 (file)
--- a/gtk2_ardour/midi_channel_selector.h
+++ b/gtk2_ardour/midi_channel_selector.h
@@ -27,13 +27,13 @@
 #include "gtkmm/button.h"
 #include "gtkmm/togglebutton.h"
 #include "gtkmm/label.h"
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 
 class MidiChannelSelector : public Gtk::Table
 {
 public:
-       MidiChannelSelector(int no_rows = 4, int no_columns = 4, int start_row = 0, int start_column = 0);
+       MidiChannelSelector(int n_rows = 4, int n_columns = 4, int start_row = 0, int start_column = 0);
        virtual ~MidiChannelSelector() = 0;
        
        sigc::signal<void, ARDOUR::ChannelMode, uint16_t> mode_changed;
@@ -53,7 +53,7 @@ class SingleMidiChannelSelector : public MidiChannelSelector
 public:
        SingleMidiChannelSelector(uint8_t active_channel = 0);
        
-       const uint8_t get_active_channel() const { return _active_channel; }
+       uint8_t get_active_channel() const { return _active_channel; }
        
        sigc::signal<void, uint8_t> channel_selected;
        
@@ -72,15 +72,15 @@ public:
        
        virtual ~MidiMultipleChannelSelector();
        
-       void set_channel_mode(ARDOUR::ChannelMode mode, uint8_t mask);
+       void set_channel_mode(ARDOUR::ChannelMode mode, uint16_t mask);
 
        /**
         * @return each bit in the returned word represents a midi channel, eg. 
         *         bit 0 represents channel 0 and bit 15 represents channel 15
         *          
         */
-       const uint16_t get_selected_channels() const;
-       void           set_selected_channels(uint16_t selected_channels);
+       uint16_t get_selected_channels() const;
+       void     set_selected_channels(uint16_t selected_channels);
        
 protected:
        ARDOUR::ChannelMode _channel_mode;