From ffc9a2cc70459ec1bd873c92ed3163a8e355b852 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 10 Jul 2013 00:02:35 +0200 Subject: [PATCH] Revert "replace "-inf" with UTF8 infinity symbol" This reverts commit 7f2000ec8b0d6e0d3a6e22db44a8859301d35791. --- gtk2_ardour/automation_line.cc | 6 +++--- gtk2_ardour/gain_meter.cc | 8 ++++---- gtk2_ardour/option_editor.cc | 2 +- gtk2_ardour/route_ui.cc | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 92ea8cf952..7e60bff2e3 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -342,7 +342,7 @@ AutomationLine::fraction_to_string (double fraction) const if (_uses_gain_mapping) { if (fraction == 0.0) { - snprintf (buf, sizeof (buf), "-\u221e"); + snprintf (buf, sizeof (buf), "-inf"); } else { snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain_with_max (fraction, Config->get_max_gain()))); } @@ -379,7 +379,7 @@ AutomationLine::fraction_to_relative_string (double original, double fraction) c */ return ""; } else if (fraction == 0.0) { - snprintf (buf, sizeof (buf), "-\u221e"); + snprintf (buf, sizeof (buf), "-inf"); } else { double old_db = accurate_coefficient_to_dB (slider_position_to_gain_with_max (original, Config->get_max_gain())); double new_db = accurate_coefficient_to_dB (slider_position_to_gain_with_max (fraction, Config->get_max_gain())); @@ -405,7 +405,7 @@ AutomationLine::fraction_to_relative_string (double original, double fraction) c double AutomationLine::string_to_fraction (string const & s) const { - if (s == "-\u221e") { + if (s == "-inf") { return 0; } diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 70cabec4b5..4f48ffa57a 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -102,7 +102,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int peak_display.set_name ("MixerStripPeakDisplay"); set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */ max_peak = minus_infinity(); - peak_display.set_label ("-\u221e"); + peak_display.set_label (_("-inf")); peak_display.unset_flags (Gtk::CAN_FOCUS); gain_automation_style_button.set_name ("mixer strip button"); @@ -354,7 +354,7 @@ GainMeterBase::reset_peak_display () _meter->reset_max(); level_meter->clear_meters(); max_peak = -INFINITY; - peak_display.set_label ("-\u221e"); + peak_display.set_label (_("-inf")); peak_display.set_name ("MixerStripPeakDisplay"); } @@ -459,7 +459,7 @@ GainMeterBase::show_gain () switch (_data_type) { case DataType::AUDIO: if (v == 0.0) { - strcpy (buf, "-\u221e"); + strcpy (buf, _("-inf")); } else { snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain_with_max (v, Config->get_max_gain()))); } @@ -850,7 +850,7 @@ GainMeterBase::update_meters() if (mpeak > max_peak) { max_peak = mpeak; if (mpeak <= -200.0f) { - peak_display.set_label ("-\u221e"); + peak_display.set_label (_("-inf")); } else { snprintf (buf, sizeof(buf), "%.1f", mpeak); peak_display.set_label (buf); diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index d0087d2083..1768bff1a7 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -254,7 +254,7 @@ FaderOption::set_state_from_config () char buf[16]; if (val == 0.0) { - snprintf (buf, sizeof (buf), "-\u221e"); + snprintf (buf, sizeof (buf), "-inf"); } else { snprintf (buf, sizeof (buf), "%.2f", accurate_coefficient_to_dB (val)); } diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index a245d3bf99..bf14719d70 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -882,7 +882,7 @@ RouteUI::build_sends_menu () ); items.push_back (MenuElem(_("Copy track/bus gains to sends"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_from_track))); - items.push_back (MenuElem(_("Set sends gain to -\u221edB"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_to_zero))); + items.push_back (MenuElem(_("Set sends gain to -inf"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_to_zero))); items.push_back (MenuElem(_("Set sends gain to 0dB"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_to_unity))); }