waf build works on OS X ; new bindings file and processing system in place for mnemon...

[ardour.git] / gtk2_ardour / midi_channel_selector.cc

diff --git a/gtk2_ardour/midi_channel_selector.cc b/gtk2_ardour/midi_channel_selector.cc
index 1b5baff7d5e86b097519b9fccb0c9ac946916031..4119b7ce05c3c49c0824eacf77eda6531382de74 100644 (file)
--- a/gtk2_ardour/midi_channel_selector.cc
+++ b/gtk2_ardour/midi_channel_selector.cc
@@ -28,13 +28,14 @@ using namespace Gtk;
 using namespace sigc;
 using namespace ARDOUR;
 
-MidiChannelSelector::MidiChannelSelector(int no_rows, int no_columns, int start_row, int start_column) : Table(no_rows, no_columns, true)
-        , _recursion_counter(0)
+MidiChannelSelector::MidiChannelSelector(int n_rows, int n_columns, int start_row, int start_column)
+       : Table(n_rows, n_columns, true)
+       , _recursion_counter(0)
 {      
-       assert(no_rows >= 4);
-       assert(no_rows >= start_row + 4);
-       assert(no_columns >=4);
-       assert(no_columns >= start_column + 4);
+       assert(n_rows >= 4);
+       assert(n_rows >= start_row + 4);
+       assert(n_columns >=4);
+       assert(n_columns >= start_column + 4);
        
        property_column_spacing() = 0;
        property_row_spacing() = 0;
@@ -180,7 +181,7 @@ MidiMultipleChannelSelector::set_channel_mode(ChannelMode mode, uint16_t mask)
        }
 }
 
-const uint16_t 
+uint16_t 
 MidiMultipleChannelSelector::get_selected_channels() const 
 { 
        uint16_t selected_channels = 0;
@@ -208,7 +209,7 @@ MidiMultipleChannelSelector::set_selected_channels(uint16_t selected_channels)
 }
 
 void
-MidiMultipleChannelSelector::button_toggled(ToggleButton *button, uint8_t channel)
+MidiMultipleChannelSelector::button_toggled(ToggleButton */*button*/, uint8_t channel)
 {
        ++_recursion_counter;
        if (_recursion_counter == 1) {