X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flatency_gui.cc;h=dbb3e08cd7c86e0ee89d8caa146a955b83568159;hb=456596bced4a3647cde4613792002142f9fea4d7;hp=08c59dc64d2bf35ba6fe002fe55cece5663c1267;hpb=92f3bc5c4486bd9d26979baf60c742c95faea62e;p=ardour.git diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc index 08c59dc64d..dbb3e08cd7 100644 --- a/gtk2_ardour/latency_gui.cc +++ b/gtk2_ardour/latency_gui.cc @@ -1,18 +1,37 @@ -#define __STDC_FORMAT_MACROS 1 +/* + Copyright (C) 2009 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + #include #include #include "ardour/latent.h" +#include "pbd/convert.h" +#include "pbd/error.h" #include #include "latency_gui.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; -using namespace sigc; using namespace ARDOUR; @@ -26,23 +45,24 @@ static const gchar *_unit_strings[] = { std::vector LatencyGUI::unit_strings; std::string -LatencyBarController::get_label (int&) +LatencyBarController::get_label (double&) { double const nframes = _latency_gui->adjustment.get_value(); std::stringstream s; if (nframes < (_latency_gui->sample_rate / 1000.0)) { - s << ((nframes64_t) rint (nframes)) << " samples"; + const framepos_t nf = (framepos_t) rint (nframes); + s << string_compose (P_("%1 sample", "%1 samples", nf), nf); } else { - s << std::fixed << std::setprecision (2) << (nframes / (_latency_gui->sample_rate / 1000.0)) << " msecs"; + s << std::fixed << std::setprecision (2) << (nframes / (_latency_gui->sample_rate / 1000.0)) << " ms"; } - + return s.str (); } -LatencyGUI::LatencyGUI (Latent& l, nframes64_t sr, nframes64_t psz) +LatencyGUI::LatencyGUI (Latent& l, framepos_t sr, framepos_t psz) : _latent (l), - initial_value (_latent.signal_latency()), + initial_value (_latent.user_latency()), sample_rate (sr), period_size (psz), ignored (new PBD::IgnorableControllable()), @@ -57,7 +77,7 @@ LatencyGUI::LatencyGUI (Latent& l, nframes64_t sr, nframes64_t psz) unit_strings = I18N (_unit_strings); } - set_popdown_strings (units_combo, unit_strings); + set_popdown_strings (units_combo, unit_strings); units_combo.set_active_text (unit_strings.front()); w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON)); @@ -76,16 +96,14 @@ LatencyGUI::LatencyGUI (Latent& l, nframes64_t sr, nframes64_t psz) hbox2.pack_start (plus_button); hbox2.pack_start (units_combo, true, true); - minus_button.signal_clicked().connect (bind (mem_fun (*this, &LatencyGUI::change_latency_from_button), -1)); - plus_button.signal_clicked().connect (bind (mem_fun (*this, &LatencyGUI::change_latency_from_button), 1)); - reset_button.signal_clicked().connect (mem_fun (*this, &LatencyGUI::reset)); + minus_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LatencyGUI::change_latency_from_button), -1)); + plus_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LatencyGUI::change_latency_from_button), 1)); + reset_button.signal_clicked().connect (sigc::mem_fun (*this, &LatencyGUI::reset)); - adjustment.signal_value_changed().connect (mem_fun (*this, &LatencyGUI::finish)); + adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &LatencyGUI::finish)); bc.set_size_request (-1, 25); - bc.set_style (BarController::LeftToRight); - bc.set_use_parent (true); - bc.set_name (X_("PluginSlider")); + bc.set_name (X_("ProcessorControlSlider")); set_spacing (12); pack_start (hbox1, true, true); @@ -95,7 +113,7 @@ LatencyGUI::LatencyGUI (Latent& l, nframes64_t sr, nframes64_t psz) void LatencyGUI::finish () { - nframes64_t new_value = (nframes64_t) adjustment.get_value(); + framepos_t new_value = (framepos_t) adjustment.get_value(); if (new_value != initial_value) { _latent.set_user_latency (new_value); } @@ -118,7 +136,7 @@ LatencyGUI::refresh () void LatencyGUI::change_latency_from_button (int dir) { - Glib::ustring unitstr = units_combo.get_active_text(); + std::string unitstr = units_combo.get_active_text(); double shift = 0.0; if (unitstr == unit_strings[0]) { @@ -130,7 +148,7 @@ LatencyGUI::change_latency_from_button (int dir) } else { fatal << string_compose (_("programming error: %1 (%2)"), X_("illegal string in latency GUI units combo"), unitstr) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if (dir > 0) { @@ -140,33 +158,15 @@ LatencyGUI::change_latency_from_button (int dir) } } -LatencyDialog::LatencyDialog (const Glib::ustring& title, Latent& l, nframes64_t sr, nframes64_t psz) +LatencyDialog::LatencyDialog (const std::string& title, Latent& l, framepos_t sr, framepos_t psz) : ArdourDialog (title, false, true), lwidget (l, sr, psz) { - get_vbox()->pack_start (lwidget); - add_button (Stock::CANCEL, RESPONSE_CANCEL); - add_button (Stock::APPLY, RESPONSE_REJECT); - add_button (Stock::OK, RESPONSE_ACCEPT); + add_button (Stock::CLOSE, RESPONSE_CLOSE); show_all (); - - while (true) { - int ret = run (); - - switch (ret) { - case RESPONSE_ACCEPT: - return; - break; - - case RESPONSE_REJECT: - lwidget.finish (); - break; - default: - return; - } - } + run (); }