a variety of mostly unused parameter errors from OS X Lion's compiler

git-svn-id: svn://localhost/ardour2/branches/3.0@12148 d708f5d6-7413-0410-9779-e7cbd77b26cf

26 files changed, 143 insertions, 143 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index e97745e946..8063164eb5 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -925,7 +925,7 @@ ARDOUR_UI::update_sample_rate (framecnt_t)
 
 	if (!engine->connected()) {
 
-		snprintf (buf, sizeof (buf), _("disconnected"));
+		snprintf (buf, sizeof (buf), "%s", _("disconnected"));
 
 	} else {
 
@@ -1063,7 +1063,7 @@ ARDOUR_UI::update_disk_space()
 	framecnt_t fr = _session->frame_rate();
 
 	if (frames == max_framecnt) {
-		snprintf (buf, sizeof (buf), _("Disk: <span foreground=\"green\">24hrs+</span>"));
+		snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">24hrs+</span>"));
 	} else {
 		rec_enabled_streams = 0;
 		_session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
@@ -1079,7 +1079,7 @@ ARDOUR_UI::update_disk_space()
 		hrs  = frames / (fr * 3600);
 
 		if (hrs > 24) {
-			snprintf (buf, sizeof (buf), _("Disk: <span foreground=\"green\">&gt;24 hrs</span>"));
+			snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">&gt;24 hrs</span>"));
 		} else {
 			frames -= hrs * fr * 3600;
 			mins = frames / (fr * 60);
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index f5ee554c3f..35100e940b 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -706,7 +706,7 @@ ARDOUR_UI::float_big_clock (Gtk::Window* parent)
 }
 
 void
-ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation& alloc)
+ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation&)
 {
 	if (!big_clock_resize_in_progress) {
 		Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::idle_big_clock_text_resizer), 0, 0));
diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc
index 94d3f55d12..8d3821fe87 100644
--- a/gtk2_ardour/ardour_window.cc
+++ b/gtk2_ardour/ardour_window.cc
@@ -36,7 +36,7 @@ ArdourWindow::ArdourWindow (string title)
 	init ();
 }
 
-ArdourWindow::ArdourWindow (Gtk::Window& parent, string title)
+ArdourWindow::ArdourWindow (Gtk::Window& parent, string /*title*/)
 	: Window ()
 {
 	init ();
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index a4cb473a72..76abb9d6bb 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -796,7 +796,7 @@ AudioClock::parse_as_timecode_distance (const std::string& str)
 }
 
 framecnt_t 
-AudioClock::parse_as_bbt_distance (const std::string& str)
+AudioClock::parse_as_bbt_distance (const std::string&)
 {
 	return 0;
 }
@@ -1001,7 +1001,7 @@ AudioClock::set_frames (framepos_t when, bool /*force*/)
 }
 
 void
-AudioClock::set_minsec (framepos_t when, bool force)
+AudioClock::set_minsec (framepos_t when, bool /*force*/)
 {
 	char buf[32];
 	framecnt_t left;
@@ -1046,7 +1046,7 @@ AudioClock::set_minsec (framepos_t when, bool force)
 }
 
 void
-AudioClock::set_timecode (framepos_t when, bool force)
+AudioClock::set_timecode (framepos_t when, bool /*force*/)
 {
 	char buf[32];
 	Timecode::Time TC;
@@ -1112,7 +1112,7 @@ AudioClock::set_timecode (framepos_t when, bool force)
 }
 
 void
-AudioClock::set_bbt (framepos_t when, bool force)
+AudioClock::set_bbt (framepos_t when, bool /*force*/)
 {
 	char buf[16];
 	Timecode::BBT_Time BBT;
@@ -1740,7 +1740,7 @@ AudioClock::get_frame_step (Field field, framepos_t pos, int dir)
 }
 
 framepos_t
-AudioClock::current_time (framepos_t pos) const
+AudioClock::current_time (framepos_t) const
 {
 	return last_when;
 }
@@ -1795,7 +1795,7 @@ AudioClock::bbt_validate_edit (const string& str)
 }
 
 bool
-AudioClock::timecode_validate_edit (const string& str)
+AudioClock::timecode_validate_edit (const string&)
 {
 	Timecode::Time TC;
 
diff --git a/gtk2_ardour/button_joiner.cc b/gtk2_ardour/button_joiner.cc
index 86bb055d01..085d5d30b2 100644
--- a/gtk2_ardour/button_joiner.cc
+++ b/gtk2_ardour/button_joiner.cc
@@ -138,7 +138,7 @@ ButtonJoiner::on_size_allocate (Allocation& alloc)
 }
 
 bool
-ButtonJoiner::on_button_release_event (GdkEventButton* ev)
+ButtonJoiner::on_button_release_event (GdkEventButton*)
 {
 	if (_action) {
 		_action->activate ();
diff --git a/gtk2_ardour/canvas-simpleline.c b/gtk2_ardour/canvas-simpleline.c
index 39a1901f57..efff5034f9 100644
--- a/gtk2_ardour/canvas-simpleline.c
+++ b/gtk2_ardour/canvas-simpleline.c
@@ -389,8 +389,8 @@ gnome_canvas_simpleline_render (GnomeCanvasItem *item,
 }
 
 static void
-gnome_canvas_simpleline_draw (GnomeCanvasItem *canvas,
-                              GdkDrawable *drawable,
+gnome_canvas_simpleline_draw (GnomeCanvasItem* canvas,
+                              GdkDrawable* drawable,
                               int x, int y,
                               int width, int height)
 {
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index c418e85018..7d10d0969c 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -4360,7 +4360,7 @@ MidiRubberbandSelectDrag::MidiRubberbandSelectDrag (Editor* e, MidiRegionView* r
 }
 
 void
-MidiRubberbandSelectDrag::select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool drag_in_progress)
+MidiRubberbandSelectDrag::select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool /*drag_in_progress*/)
 {
 	framepos_t const p = _region_view->region()->position ();
 	double const y = _region_view->midi_view()->y_position ();
@@ -4393,7 +4393,7 @@ MidiVerticalSelectDrag::MidiVerticalSelectDrag (Editor* e, MidiRegionView* rv)
 }
 
 void
-MidiVerticalSelectDrag::select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool drag_in_progress)
+MidiVerticalSelectDrag::select_things (int button_state, framepos_t /*x1*/, framepos_t /*x2*/, double y1, double y2, bool /*drag_in_progress*/)
 {
 	double const y = _region_view->midi_view()->y_position ();
 
@@ -4516,7 +4516,7 @@ NoteCreateDrag::motion (GdkEvent* event, bool)
 }
 
 void
-NoteCreateDrag::finished (GdkEvent* event, bool had_movement)
+NoteCreateDrag::finished (GdkEvent*, bool had_movement)
 {
 	if (!had_movement) {
 		return;
diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 1b72425032..2fd08e7609 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -380,7 +380,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 }
 
 void
-EditorRouteGroups::row_change (const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter)
+EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter)
 {
 	RouteGroup* group;
 
@@ -487,7 +487,7 @@ EditorRouteGroups::groups_changed ()
 }
 
 void
-EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& change)
+EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
 {
 	_in_row_change = true;
 
diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 9fa9c8bf73..5dbeeffd09 100644
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -180,7 +180,7 @@ GroupTabs::on_motion_notify_event (GdkEventMotion* ev)
 
 
 bool
-GroupTabs::on_button_release_event (GdkEventButton* ev)
+GroupTabs::on_button_release_event (GdkEventButton*)
 {
 	if (_dragging == 0) {
 		return false;
diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c
index 7332299bfb..1e5768040e 100644
--- a/gtk2_ardour/gtk_pianokeyboard.c
+++ b/gtk2_ardour/gtk_pianokeyboard.c
@@ -527,7 +527,7 @@ piano_keyboard_expose(GtkWidget *widget, GdkEventExpose *event)
 }
 
 static void
-piano_keyboard_size_request(GtkWidget* widget, GtkRequisition *requisition)
+piano_keyboard_size_request(GtkWidget* w, GtkRequisition *requisition)
 {
 	requisition->width = PIANO_KEYBOARD_DEFAULT_WIDTH;
 	requisition->height = PIANO_KEYBOARD_DEFAULT_HEIGHT;
diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 75040eca06..56527e1eb9 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -199,7 +199,7 @@ PluginSelector::~PluginSelector ()
 }
 
 void
-PluginSelector::row_activated(Gtk::TreeModel::Path path, Gtk::TreeViewColumn* col)
+PluginSelector::row_activated(Gtk::TreeModel::Path, Gtk::TreeViewColumn*)
 {
 	btn_add_clicked();
 }
diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index d942c99c89..a259f357ce 100644
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -444,10 +444,8 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t)
 				if (bc[dim].channel != -1) {
 					add_remove_option (sub, w, bc[dim].channel);
 				} else {
-
-					snprintf (buf, sizeof (buf), _("Remove all"));
 					sub.push_back (
-						MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::remove_all_channels), w))
+						MenuElem (_("Remove all"), sigc::bind (sigc::mem_fun (*this, &PortMatrix::remove_all_channels), w))
 						);
 
 					if (bc[dim].bundle->nchannels().n_total() > 1) {
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index e2d33b9891..1bba2c8af1 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -965,7 +965,7 @@ ProcessorBox::enter_notify (GdkEventCrossing*)
 }
 
 bool
-ProcessorBox::leave_notify (GdkEventCrossing* ev)
+ProcessorBox::leave_notify (GdkEventCrossing*)
 {
 	return false;
 }
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 8d8c4224b0..64ba5b067d 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -629,7 +629,7 @@ RouteUI::update_monitoring_display ()
 }
 
 bool
-RouteUI::monitor_input_press(GdkEventButton* ev)
+RouteUI::monitor_input_press(GdkEventButton*)
 {
 	return true;
 }
@@ -641,7 +641,7 @@ RouteUI::monitor_input_release(GdkEventButton* ev)
 }
 
 bool
-RouteUI::monitor_disk_press (GdkEventButton* ev)
+RouteUI::monitor_disk_press (GdkEventButton*)
 {
 	return true;
 }
diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc
index 7e13c4f68b..70d04abb66 100644
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -369,7 +369,7 @@ std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID,
 }

 

 //---------

-int Mootcher::progress_callback(void *caller, double dltotal, double dlnow, double ultotal, double ulnow)

+int Mootcher::progress_callback(void *caller, double dltotal, double dlnow, double /*ultotal*/, double /*ulnow*/)

 {

 

 SoundFileBrowser *sfb = (SoundFileBrowser *) caller;

diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 3b5f8dbb78..abbd39ac16 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -522,7 +522,7 @@ ShuttleControl::on_expose_event (GdkEventExpose*)
 		if (Config->get_shuttle_units() == Percentage) {
 
 			if (speed == 1.0) {
-				snprintf (buf, sizeof (buf), _("Playing"));
+				snprintf (buf, sizeof (buf), "%s", _("Playing"));
 			} else {
 				if (speed < 0.0) {
 					snprintf (buf, sizeof (buf), "<<< %d%%", (int) round (-speed * 100));
@@ -544,7 +544,7 @@ ShuttleControl::on_expose_event (GdkEventExpose*)
 		}
 
 	} else {
-		snprintf (buf, sizeof (buf), _("Stopped"));
+		snprintf (buf, sizeof (buf), "%s", _("Stopped"));
 	}
 
 	last_speed_displayed = speed;
@@ -559,10 +559,10 @@ ShuttleControl::on_expose_event (GdkEventExpose*)
 
 	switch (Config->get_shuttle_behaviour()) {
 	case Sprung:
-		snprintf (buf, sizeof (buf), _("Sprung"));
+		snprintf (buf, sizeof (buf), "%s", _("Sprung"));
 		break;
 	case Wheel:
-		snprintf (buf, sizeof (buf), _("Wheel"));
+		snprintf (buf, sizeof (buf), "%s", _("Wheel"));
 		break;
 	}
 
diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index bceb009b75..730ef58910 100644
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -111,7 +111,7 @@ StereoPanner::set_drag_data ()
 }
 
 bool
-StereoPanner::on_expose_event (GdkEventExpose* ev)
+StereoPanner::on_expose_event (GdkEventExpose*)
 {
 	Glib::RefPtr<Gdk::Window> win (get_window());
 	Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state()));
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index d3c4ef17b8..3557727394 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -36,7 +36,7 @@ using namespace Gtkmm2ext;
 using namespace ARDOUR;
 using namespace PBD;
 
-TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string & action)
+TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&)
 	: ArdourDialog (_("New Tempo"))
 	, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
 	, bpm_spinner (bpm_adjustment)
@@ -51,7 +51,7 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string & action
 	init (when, tempo.beats_per_minute(), tempo.note_type(), true);
 }
 
-TempoDialog::TempoDialog (TempoSection& section, const string & action)
+TempoDialog::TempoDialog (TempoSection& section, const string&)
 	: ArdourDialog ("Edit Tempo")
 	, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
 	, bpm_spinner (bpm_adjustment)
@@ -251,7 +251,7 @@ TempoDialog::pulse_change ()
 }
 
 
-MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string & action)
+MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&)
 	: ArdourDialog ("New Meter")
 {
 	Timecode::BBT_Time when;
@@ -262,7 +262,7 @@ MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string & action
 	init (when, meter.divisions_per_bar(), meter.note_divisor(), true);
 }
 
-MeterDialog::MeterDialog (MeterSection& section, const string & action)
+MeterDialog::MeterDialog (MeterSection& section, const string&)
 	: ArdourDialog ("Edit Meter")
 {
 	init (section.start(), section.divisions_per_bar(), section.note_divisor(), section.movable());
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 0b3bc3cd18..46c09a1227 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -175,7 +175,8 @@ LV2Plugin::LV2Plugin (AudioEngine& engine,
                       Session&     session,
                       void*        c_plugin,
                       framecnt_t   rate)
-	: Plugin(engine, session)
+	: Plugin (engine, session)
+	, Workee ()
 	, _impl(new Impl())
 	, _features(NULL)
 	, _worker(NULL)
@@ -185,7 +186,8 @@ LV2Plugin::LV2Plugin (AudioEngine& engine,
 }
 
 LV2Plugin::LV2Plugin (const LV2Plugin& other)
-	: Plugin(other)
+	: Plugin (other)
+	, Workee ()
 	, _impl(new Impl())
 	, _features(NULL)
 	, _worker(NULL)
diff --git a/libs/ardour/midi_playlist_source.cc b/libs/ardour/midi_playlist_source.cc
index 208b2b0460..957531f520 100644
--- a/libs/ardour/midi_playlist_source.cc
+++ b/libs/ardour/midi_playlist_source.cc
@@ -142,7 +142,7 @@ MidiPlaylistSource::read_unlocked (Evoral::EventSink<framepos_t>& dst,
 }
 
 framecnt_t
-MidiPlaylistSource::write_unlocked (MidiRingBuffer<framepos_t>& dst,
+MidiPlaylistSource::write_unlocked (MidiRingBuffer<framepos_t>&,
 				    framepos_t,
 				    framecnt_t)
 {
diff --git a/libs/ardour/session_metadata.cc b/libs/ardour/session_metadata.cc
index 00f5d31ed8..e1eb166bb6 100644
--- a/libs/ardour/session_metadata.cc
+++ b/libs/ardour/session_metadata.cc
@@ -182,7 +182,7 @@ SessionMetadata::get_state ()
 }
 
 int
-SessionMetadata::set_state (const XMLNode & state, int version_num)
+SessionMetadata::set_state (const XMLNode & state, int /*version_num*/)
 {
 	const XMLNodeList & children = state.children();
 	string name;
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index df3dddbd6d..f9b2bbca51 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1195,7 +1195,7 @@ TempoMap::bbt_duration_at (framepos_t pos, const BBT_Time& bbt, int dir)
 }
 
 framecnt_t
-TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int dir) 
+TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int /*dir*/) 
 {
 	if (bbt.bars == 0 && bbt.beats == 0 && bbt.ticks == 0) {
 		return 0;
diff --git a/libs/gtkmm2ext/cairo_packer.cc b/libs/gtkmm2ext/cairo_packer.cc
index 70f51281dd..6145f7dd50 100644
--- a/libs/gtkmm2ext/cairo_packer.cc
+++ b/libs/gtkmm2ext/cairo_packer.cc
@@ -3,7 +3,7 @@
 #include "gtkmm2ext/cairo_packer.h"
 
 void
-CairoPacker::draw_background (Gtk::Widget& w, GdkEventExpose* ev)
+CairoPacker::draw_background (Gtk::Widget& w, GdkEventExpose*)
 {
 	int x, y;
 	Gtk::Widget* window_parent;
diff --git a/libs/surfaces/mackie/button.cc b/libs/surfaces/mackie/button.cc
index dc26429a63..836e7390df 100644
--- a/libs/surfaces/mackie/button.cc
+++ b/libs/surfaces/mackie/button.cc
@@ -39,102 +39,102 @@ Button::factory (Surface& surface, Button::ID bid, int id, const std::string& na
 int
 Button::name_to_id (const std::string& name)
 {
-	if (!g_strcasecmp (name.c_str(), "IO")) { return IO; }
-	if (!g_strcasecmp (name.c_str(), "Sends")) { return Sends; }
-	if (!g_strcasecmp (name.c_str(), "Pan")) { return Pan; }
-	if (!g_strcasecmp (name.c_str(), "Plugin")) { return Plugin; }
-	if (!g_strcasecmp (name.c_str(), "Eq")) { return Eq; }
-	if (!g_strcasecmp (name.c_str(), "Dyn")) { return Dyn; }
-	if (!g_strcasecmp (name.c_str(), "Left")) { return Left; }
-	if (!g_strcasecmp (name.c_str(), "Right")) { return Right; }
-	if (!g_strcasecmp (name.c_str(), "ChannelLeft")) { return ChannelLeft; }
-	if (!g_strcasecmp (name.c_str(), "ChannelRight")) { return ChannelRight; }
-	if (!g_strcasecmp (name.c_str(), "Flip")) { return Flip; }
-	if (!g_strcasecmp (name.c_str(), "Edit")) { return Edit; }
-	if (!g_strcasecmp (name.c_str(), "Name/Value")) { return NameValue; }
-	if (!g_strcasecmp (name.c_str(), "Timecode/Beats")) { return TimecodeBeats; }
-	if (!g_strcasecmp (name.c_str(), "F1")) { return F1; }
-	if (!g_strcasecmp (name.c_str(), "F2")) { return F2; }
-	if (!g_strcasecmp (name.c_str(), "F3")) { return F3; }
-	if (!g_strcasecmp (name.c_str(), "F4")) { return F4; }
-	if (!g_strcasecmp (name.c_str(), "F5")) { return F5; }
-	if (!g_strcasecmp (name.c_str(), "F6")) { return F6; }
-	if (!g_strcasecmp (name.c_str(), "F7")) { return F7; }
-	if (!g_strcasecmp (name.c_str(), "F8")) { return F8; }
-	if (!g_strcasecmp (name.c_str(), "F9")) { return F9; }
-	if (!g_strcasecmp (name.c_str(), "F10")) { return F10; }
-	if (!g_strcasecmp (name.c_str(), "F11")) { return F11; }
-	if (!g_strcasecmp (name.c_str(), "F12")) { return F12; }
-	if (!g_strcasecmp (name.c_str(), "F13")) { return F13; }
-	if (!g_strcasecmp (name.c_str(), "F14")) { return F14; }
-	if (!g_strcasecmp (name.c_str(), "F15")) { return F15; }
-	if (!g_strcasecmp (name.c_str(), "F16")) { return F16; }
-	if (!g_strcasecmp (name.c_str(), "Shift")) { return Shift; }
-	if (!g_strcasecmp (name.c_str(), "Option")) { return Option; }
-	if (!g_strcasecmp (name.c_str(), "Ctrl")) { return Ctrl; }
-	if (!g_strcasecmp (name.c_str(), "CmdAlt")) { return CmdAlt; }
-	if (!g_strcasecmp (name.c_str(), "On")) { return On; }
-	if (!g_strcasecmp (name.c_str(), "RecReady")) { return RecReady; }
-	if (!g_strcasecmp (name.c_str(), "Undo")) { return Undo; }
-	if (!g_strcasecmp (name.c_str(), "Save")) { return Save; }
-	if (!g_strcasecmp (name.c_str(), "Touch")) { return Touch; }
-	if (!g_strcasecmp (name.c_str(), "Redo")) { return Redo; }
-	if (!g_strcasecmp (name.c_str(), "Marker")) { return Marker; }
-	if (!g_strcasecmp (name.c_str(), "Enter")) { return Enter; }
-	if (!g_strcasecmp (name.c_str(), "Cancel")) { return Cancel; }
-	if (!g_strcasecmp (name.c_str(), "Mixer")) { return Mixer; }
-	if (!g_strcasecmp (name.c_str(), "FrmLeft")) { return FrmLeft; }
-	if (!g_strcasecmp (name.c_str(), "FrmRight")) { return FrmRight; }
-	if (!g_strcasecmp (name.c_str(), "Loop")) { return Loop; }
-	if (!g_strcasecmp (name.c_str(), "PunchIn")) { return PunchIn; }
-	if (!g_strcasecmp (name.c_str(), "PunchOut")) { return PunchOut; }
-	if (!g_strcasecmp (name.c_str(), "Home")) { return Home; }
-	if (!g_strcasecmp (name.c_str(), "End")) { return End; }
-	if (!g_strcasecmp (name.c_str(), "Rewind")) { return Rewind; }
-	if (!g_strcasecmp (name.c_str(), "Ffwd")) { return Ffwd; }
-	if (!g_strcasecmp (name.c_str(), "Stop")) { return Stop; }
-	if (!g_strcasecmp (name.c_str(), "Play")) { return Play; }
-	if (!g_strcasecmp (name.c_str(), "Record")) { return Record; }
-	if (!g_strcasecmp (name.c_str(), "CursorUp")) { return CursorUp; }
-	if (!g_strcasecmp (name.c_str(), "CursorDown")) { return CursorDown; }
-	if (!g_strcasecmp (name.c_str(), "CursorLeft")) { return CursorLeft; }
-	if (!g_strcasecmp (name.c_str(), "CursorRight")) { return CursorRight; }
-	if (!g_strcasecmp (name.c_str(), "Zoom")) { return Zoom; }
-	if (!g_strcasecmp (name.c_str(), "Scrub")) { return Scrub; }
-	if (!g_strcasecmp (name.c_str(), "UserA")) { return UserA; }
-	if (!g_strcasecmp (name.c_str(), "UserB")) { return UserB; }
-	if (!g_strcasecmp (name.c_str(), "Snapshot")) { return Snapshot; }
-	if (!g_strcasecmp (name.c_str(), "Read")) { return Read; }
-	if (!g_strcasecmp (name.c_str(), "Write")) { return Write; }
-	if (!g_strcasecmp (name.c_str(), "FdrGroup")) { return FdrGroup; }
-	if (!g_strcasecmp (name.c_str(), "ClearSolo")) { return ClearSolo; }
-	if (!g_strcasecmp (name.c_str(), "Track")) { return Track; }
-	if (!g_strcasecmp (name.c_str(), "Send")) { return Send; }
-	if (!g_strcasecmp (name.c_str(), "MidiTracks")) { return MidiTracks; }
-	if (!g_strcasecmp (name.c_str(), "Inputs")) { return Inputs; }
-	if (!g_strcasecmp (name.c_str(), "AudioTracks")) { return AudioTracks; }
-	if (!g_strcasecmp (name.c_str(), "AudioInstruments")) { return AudioInstruments; }
-	if (!g_strcasecmp (name.c_str(), "Aux")) { return Aux; }
-	if (!g_strcasecmp (name.c_str(), "Busses")) { return Busses; }
-	if (!g_strcasecmp (name.c_str(), "Outputs")) { return Outputs; }
-	if (!g_strcasecmp (name.c_str(), "User")) { return User; }
-	if (!g_strcasecmp (name.c_str(), "Trim")) { return Trim; }
-	if (!g_strcasecmp (name.c_str(), "Latch")) { return Latch; }
-	if (!g_strcasecmp (name.c_str(), "Grp")) { return Grp; }
-	if (!g_strcasecmp (name.c_str(), "Nudge")) { return Nudge; }
-	if (!g_strcasecmp (name.c_str(), "Drop")) { return Drop; }
-	if (!g_strcasecmp (name.c_str(), "Replace")) { return Replace; }
-	if (!g_strcasecmp (name.c_str(), "Click")) { return Click; }
-	if (!g_strcasecmp (name.c_str(), "View")) { return View; }
+	if (!g_ascii_strcasecmp (name.c_str(), "IO")) { return IO; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Sends")) { return Sends; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Pan")) { return Pan; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Plugin")) { return Plugin; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Eq")) { return Eq; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Dyn")) { return Dyn; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Left")) { return Left; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Right")) { return Right; }
+	if (!g_ascii_strcasecmp (name.c_str(), "ChannelLeft")) { return ChannelLeft; }
+	if (!g_ascii_strcasecmp (name.c_str(), "ChannelRight")) { return ChannelRight; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Flip")) { return Flip; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Edit")) { return Edit; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Name/Value")) { return NameValue; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Timecode/Beats")) { return TimecodeBeats; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F1")) { return F1; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F2")) { return F2; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F3")) { return F3; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F4")) { return F4; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F5")) { return F5; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F6")) { return F6; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F7")) { return F7; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F8")) { return F8; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F9")) { return F9; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F10")) { return F10; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F11")) { return F11; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F12")) { return F12; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F13")) { return F13; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F14")) { return F14; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F15")) { return F15; }
+	if (!g_ascii_strcasecmp (name.c_str(), "F16")) { return F16; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Shift")) { return Shift; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Option")) { return Option; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Ctrl")) { return Ctrl; }
+	if (!g_ascii_strcasecmp (name.c_str(), "CmdAlt")) { return CmdAlt; }
+	if (!g_ascii_strcasecmp (name.c_str(), "On")) { return On; }
+	if (!g_ascii_strcasecmp (name.c_str(), "RecReady")) { return RecReady; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Undo")) { return Undo; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Save")) { return Save; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Touch")) { return Touch; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Redo")) { return Redo; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Marker")) { return Marker; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Enter")) { return Enter; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Cancel")) { return Cancel; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Mixer")) { return Mixer; }
+	if (!g_ascii_strcasecmp (name.c_str(), "FrmLeft")) { return FrmLeft; }
+	if (!g_ascii_strcasecmp (name.c_str(), "FrmRight")) { return FrmRight; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Loop")) { return Loop; }
+	if (!g_ascii_strcasecmp (name.c_str(), "PunchIn")) { return PunchIn; }
+	if (!g_ascii_strcasecmp (name.c_str(), "PunchOut")) { return PunchOut; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Home")) { return Home; }
+	if (!g_ascii_strcasecmp (name.c_str(), "End")) { return End; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Rewind")) { return Rewind; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Ffwd")) { return Ffwd; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Stop")) { return Stop; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Play")) { return Play; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Record")) { return Record; }
+	if (!g_ascii_strcasecmp (name.c_str(), "CursorUp")) { return CursorUp; }
+	if (!g_ascii_strcasecmp (name.c_str(), "CursorDown")) { return CursorDown; }
+	if (!g_ascii_strcasecmp (name.c_str(), "CursorLeft")) { return CursorLeft; }
+	if (!g_ascii_strcasecmp (name.c_str(), "CursorRight")) { return CursorRight; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Zoom")) { return Zoom; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Scrub")) { return Scrub; }
+	if (!g_ascii_strcasecmp (name.c_str(), "UserA")) { return UserA; }
+	if (!g_ascii_strcasecmp (name.c_str(), "UserB")) { return UserB; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Snapshot")) { return Snapshot; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Read")) { return Read; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Write")) { return Write; }
+	if (!g_ascii_strcasecmp (name.c_str(), "FdrGroup")) { return FdrGroup; }
+	if (!g_ascii_strcasecmp (name.c_str(), "ClearSolo")) { return ClearSolo; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Track")) { return Track; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Send")) { return Send; }
+	if (!g_ascii_strcasecmp (name.c_str(), "MidiTracks")) { return MidiTracks; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Inputs")) { return Inputs; }
+	if (!g_ascii_strcasecmp (name.c_str(), "AudioTracks")) { return AudioTracks; }
+	if (!g_ascii_strcasecmp (name.c_str(), "AudioInstruments")) { return AudioInstruments; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Aux")) { return Aux; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Busses")) { return Busses; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Outputs")) { return Outputs; }
+	if (!g_ascii_strcasecmp (name.c_str(), "User")) { return User; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Trim")) { return Trim; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Latch")) { return Latch; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Grp")) { return Grp; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Nudge")) { return Nudge; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Drop")) { return Drop; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Replace")) { return Replace; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Click")) { return Click; }
+	if (!g_ascii_strcasecmp (name.c_str(), "View")) { return View; }
 		
 		/* Strip buttons */
 		
-	if (!g_strcasecmp (name.c_str(), "RecEnable")) { return RecEnable; }
-	if (!g_strcasecmp (name.c_str(), "Solo")) { return Solo; }
-	if (!g_strcasecmp (name.c_str(), "Mute")) { return Mute; }
-	if (!g_strcasecmp (name.c_str(), "Select")) { return Select; }
-	if (!g_strcasecmp (name.c_str(), "VSelect")) { return VSelect; }
-	if (!g_strcasecmp (name.c_str(), "FaderTouch")) { return FaderTouch; }
+	if (!g_ascii_strcasecmp (name.c_str(), "RecEnable")) { return RecEnable; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Solo")) { return Solo; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Mute")) { return Mute; }
+	if (!g_ascii_strcasecmp (name.c_str(), "Select")) { return Select; }
+	if (!g_ascii_strcasecmp (name.c_str(), "VSelect")) { return VSelect; }
+	if (!g_ascii_strcasecmp (name.c_str(), "FaderTouch")) { return FaderTouch; }
 
 	return -1;
 }
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index d7d9acd544..9e4c72eab4 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -130,7 +130,7 @@ Strip::add (Control & control)
 }
 
 void
-Strip::set_route (boost::shared_ptr<Route> r, bool with_messages)
+Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/)
 {
 	if (_controls_locked) {
 		return;
@@ -419,7 +419,7 @@ Strip::notify_panner_width_changed (bool force_update)
 }
 
 void
-Strip::select_event (Button& button, ButtonState bs)
+Strip::select_event (Button&, ButtonState bs)
 {
 	DEBUG_TRACE (DEBUG::MackieControl, "select button\n");
 	
@@ -454,7 +454,7 @@ Strip::select_event (Button& button, ButtonState bs)
 }
 
 void
-Strip::vselect_event (Button& button, ButtonState bs)
+Strip::vselect_event (Button&, ButtonState bs)
 {
 	if (bs == press) {
 
@@ -480,7 +480,7 @@ Strip::vselect_event (Button& button, ButtonState bs)
 }
 
 void
-Strip::fader_touch_event (Button& button, ButtonState bs)
+Strip::fader_touch_event (Button&, ButtonState bs)
 {
 	DEBUG_TRACE (DEBUG::MackieControl, string_compose ("fader touch, press ? %1\n", (bs == press)));
 	
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 2053a963f2..4d9ab3f877 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -494,7 +494,7 @@ Surface::host_connection_confirmation (const MidiByteArray & bytes)
 }
 
 void 
-Surface::handle_port_inactive (SurfacePort * port)
+Surface::handle_port_inactive (SurfacePort*)
 {
 	_active = false;
 }
@@ -820,7 +820,7 @@ Surface::next_jog_mode ()
 }
 
 void
-Surface::set_jog_mode (JogWheel::Mode m)
+Surface::set_jog_mode (JogWheel::Mode)
 {
 }