projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
one step closer to working vbap panning
[ardour.git]
/
gtk2_ardour
/
latency_gui.cc
diff --git
a/gtk2_ardour/latency_gui.cc
b/gtk2_ardour/latency_gui.cc
index e5eab6201b83013ee27df0bdbd8812c723b68907..73b6bf1a3070727829139e7a4620aa754b5913f8 100644
(file)
--- a/
gtk2_ardour/latency_gui.cc
+++ b/
gtk2_ardour/latency_gui.cc
@@
-1,8
+1,8
@@
-#define __STDC_FORMAT_MACROS 1
#include <inttypes.h>
#include <iomanip>
#include "ardour/latent.h"
#include <inttypes.h>
#include <iomanip>
#include "ardour/latent.h"
+#include "pbd/convert.h"
#include <gtkmm2ext/utils.h>
#include "latency_gui.h"
#include <gtkmm2ext/utils.h>
#include "latency_gui.h"
@@
-12,7
+12,6
@@
using namespace PBD;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace PBD;
using namespace Gtk;
using namespace Gtkmm2ext;
-using namespace sigc;
using namespace ARDOUR;
using namespace ARDOUR;
@@
-32,7
+31,7
@@
LatencyBarController::get_label (int&)
std::stringstream s;
if (nframes < (_latency_gui->sample_rate / 1000.0)) {
std::stringstream s;
if (nframes < (_latency_gui->sample_rate / 1000.0)) {
- s << ((
nframes64
_t) rint (nframes)) << " samples";
+ s << ((
framepos
_t) rint (nframes)) << " samples";
} else {
s << std::fixed << std::setprecision (2) << (nframes / (_latency_gui->sample_rate / 1000.0)) << " msecs";
}
} else {
s << std::fixed << std::setprecision (2) << (nframes / (_latency_gui->sample_rate / 1000.0)) << " msecs";
}
@@
-40,7
+39,7
@@
LatencyBarController::get_label (int&)
return s.str ();
}
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()),
sample_rate (sr),
: _latent (l),
initial_value (_latent.signal_latency()),
sample_rate (sr),
@@
-95,7
+94,7
@@
LatencyGUI::LatencyGUI (Latent& l, nframes64_t sr, nframes64_t psz)
void
LatencyGUI::finish ()
{
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);
}
if (new_value != initial_value) {
_latent.set_user_latency (new_value);
}
@@
-118,7
+117,7
@@
LatencyGUI::refresh ()
void
LatencyGUI::change_latency_from_button (int dir)
{
void
LatencyGUI::change_latency_from_button (int dir)
{
-
Glib::u
string unitstr = units_combo.get_active_text();
+
std::
string unitstr = units_combo.get_active_text();
double shift = 0.0;
if (unitstr == unit_strings[0]) {
double shift = 0.0;
if (unitstr == unit_strings[0]) {
@@
-140,7
+139,7
@@
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)
{
: ArdourDialog (title, false, true),
lwidget (l, sr, psz)
{