From 4f86da854475e1ef6081ad5ebec166f734a6f570 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 26 Oct 2018 14:31:14 +0200
Subject: Wimplicit-fallthrough fixes for gtk-ardour

---
 gtk2_ardour/ardour_ui.cc      | 4 ++--
 gtk2_ardour/audio_clock.cc    | 2 +-
 gtk2_ardour/meter_patterns.cc | 9 ++++++---
 gtk2_ardour/meter_strip.cc    | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 1e762b29e3..52bccd44d4 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2684,7 +2684,7 @@ If you still wish to proceed, please use the\n\n\
 					msg.run ();
 					return;
 				}
-				// no break
+				/* fall through */
 			case 0:
 				_session->remove_pending_capture_state ();
 				break;
@@ -2880,7 +2880,7 @@ If you still wish to proceed, please use the\n\n\
 					msg.run ();
 					return;
 				}
-				// no break
+				/* fall through */
 			case 0:
 				_session->remove_pending_capture_state ();
 				break;
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 68faab78b0..2656c2b445 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -510,7 +510,7 @@ AudioClock::end_edit (bool modify)
 			break;
 
 		case Seconds:
-			// no break
+			/* fall through */
 		case Samples:
 			if (edit_string.length() < 1) {
 				edit_string = pre_edit_string;
diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index 97b04b9ce5..f58f35212b 100644
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -515,7 +515,7 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 					points.insert (std::pair<float,float>(  3, 1.0));
 					points.insert (std::pair<float,float>(  4, 0.5));
 					points.insert (std::pair<float,float>(  5, 0.5));
-					// no break
+					/* fall through */
 				case MeterPeak0dB:
 					points.insert (std::pair<float,float>(-60, 0.5));
 					points.insert (std::pair<float,float>(-50, 1.0));
@@ -750,11 +750,13 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 					points.insert (std::pair<float,string>( -5.0f, "+15"));
 					points.insert (std::pair<float,string>(  0.0f, "+20"));
 					break;
-				default:
 				case MeterPeak:
+					/* fall through */
 				case MeterKrms:
+					/* fall through */
+				default:
 					points.insert (std::pair<float,string>(  3.0f, "+3"));
-					// no break
+					/* fall through */
 				case MeterPeak0dB:
 					points.insert (std::pair<float,string>(-50.0f, "-50"));
 					points.insert (std::pair<float,string>(-40.0f, "-40"));
@@ -890,6 +892,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 						points.insert (std::pair<float,string>( 72, "72"));
 						points.insert (std::pair<float,string>(112, "112"));
 						points.insert (std::pair<float,string>(127, "127"));
+						break;
 					case 4:
 						/* labels that don't overlay with 0dBFS*/
 						points.insert (std::pair<float,string>(  0, "0"));
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index 98a005a036..094d5170db 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -960,6 +960,7 @@ MeterStrip::set_meter_type_multi (int what, RouteGroup* group, MeterType type)
 			break;
 		case 0:
 			level_meter->set_meter_type (type);
+			break;
 		default:
 			if (what == _strip_type) {
 				level_meter->set_meter_type (type);
-- 
cgit v1.2.3