Wimplicit-fallthrough fixes for gtk-ardour

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 1e762b29e3edf23418f6a9bac7f670214472e67b..52bccd44d4ddbb3e4f865428df5d453e68615283 100644 (file)
--- 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 68faab78b0f727cb12afb11c203b09b75661f5d5..2656c2b445f128cf31d0217d09fe392f17ae7a0a 100644 (file)
--- 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 97b04b9ce583cf83a26347bc53bffbb681c7ac28..f58f35212bf88d98358f3d061e7a15afc6a76b60 100644 (file)
--- 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 98a005a0361b1318b646b7d5da03f66e36227d62..094d5170db19f468f2470d333c72b555731e2382 100644 (file)
--- 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);