fix mistaken "do not roll" conclusion in TransportFSM::compute_should_roll()

[ardour.git] / gtk2_ardour / gain_meter.cc

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 6c6b3c13f80d75cc6454201f96c8edb04744a630..4196409692aa3c78cfd9b58601f22711cb72c7ac 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -162,6 +162,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
        gain_automation_state_button.set_name ("mixer strip button");
 
        set_tooltip (gain_automation_state_button, _("Fader automation mode"));
+       set_tooltip (peak_display, _("dBFS - Digital Peak Hold. Click to reset."));
 
        gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
 
@@ -780,27 +781,20 @@ GainMeterBase::short_astate_string (AutoState state)
 string
 GainMeterBase::_astate_string (AutoState state, bool shrt)
 {
-       string sstr;
-
        switch (state) {
-       case ARDOUR::Off:
-               sstr = shrt ? S_("Manual|M") : S_("Automation|Manual");
-               break;
-       case Play:
-               sstr = shrt ? S_("Play|P") : _("Play");
-               break;
-       case Touch:
-               sstr = shrt ? S_("Trim|T") : _("Write");
-               break;
-       case Latch:
-               sstr = shrt ? S_("Latch|L") : _("Touch");
-               break;
-       case Write:
-               sstr = shrt ? S_("Write|W"): _("Latch");
-               break;
+               case ARDOUR::Off:
+                       return shrt ? S_("Manual|M") : S_("Automation|Manual");
+               case Play:
+                       return shrt ? S_("Play|P") : _("Play");
+               case Touch:
+                       return shrt ? S_("Touch|T") : _("Touch");
+               case Latch:
+                       return shrt ? S_("Latch|L") : _("Latch");
+               case Write:
+                       return shrt ? S_("Write|W"): _("Write");
        }
-
-       return sstr;
+       assert (0);
+       return "???";
 }
 
 string
@@ -819,7 +813,7 @@ GainMeterBase::meterpt_string (MeterPoint mp)
                        return _("Custom");
        }
        assert (0);
-       return _("Custom"); // make gcc happy
+       return "???"; // make gcc and _FrnchFrgg_ happy
 }
 
 void