summaryrefslogtreecommitdiffstats
path: root/src/JackDriver.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-05-20 18:42:59 +0000
committerDavid Robillard <d@drobilla.net>2011-05-20 18:42:59 +0000
commit9139dda70547545f9f36ffe526a5fdcc930b1e2a (patch)
tree7446c06ffee6d1d7269c8b5230719bba34942719 /src/JackDriver.cpp
parent4523e7ec80dec02ef32fac8d61bbc2b51bf06901 (diff)
downloadpatchage-9139dda70547545f9f36ffe526a5fdcc930b1e2a.tar.gz
patchage-9139dda70547545f9f36ffe526a5fdcc930b1e2a.tar.bz2
patchage-9139dda70547545f9f36ffe526a5fdcc930b1e2a.zip
Use a (smaller, simpler) statusbar instead of a toolbar.
Display more useful latency information (e.g. latency in ms as well as frames). git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@3300 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/JackDriver.cpp')
-rw-r--r--src/JackDriver.cpp20
1 files changed, 6 insertions, 14 deletions
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index b641d40..9c981ec 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -440,7 +440,7 @@ JackDriver::jack_client_registration_cb(const char* name, int registered, void*
JackDriver* me = reinterpret_cast<JackDriver*>(jack_driver);
assert(me->_client);
- jack_reset_max_delayed_usecs(me->_client);
+ //jack_reset_max_delayed_usecs(me->_client);
if (registered) {
me->_events.push(PatchageEvent(PatchageEvent::CLIENT_CREATION, name));
@@ -456,7 +456,7 @@ JackDriver::jack_port_registration_cb(jack_port_id_t port_id, int registered, vo
JackDriver* me = reinterpret_cast<JackDriver*>(jack_driver);
assert(me->_client);
- jack_reset_max_delayed_usecs(me->_client);
+ //jack_reset_max_delayed_usecs(me->_client);
if (registered) {
me->_events.push(PatchageEvent(PatchageEvent::PORT_CREATION, port_id));
@@ -472,7 +472,7 @@ JackDriver::jack_port_connect_cb(jack_port_id_t src, jack_port_id_t dst, int con
JackDriver* me = reinterpret_cast<JackDriver*>(jack_driver);
assert(me->_client);
- jack_reset_max_delayed_usecs(me->_client);
+ //jack_reset_max_delayed_usecs(me->_client);
if (connect) {
me->_events.push(PatchageEvent(PatchageEvent::CONNECTION, src, dst));
@@ -488,7 +488,7 @@ JackDriver::jack_graph_order_cb(void* jack_driver)
JackDriver* me = reinterpret_cast<JackDriver*>(jack_driver);
assert(me->_client);
- jack_reset_max_delayed_usecs(me->_client);
+ //jack_reset_max_delayed_usecs(me->_client);
return 0;
}
@@ -588,17 +588,9 @@ JackDriver::get_max_dsp_load()
const float max_delay = jack_get_max_delayed_usecs(_client);
const float rate = sample_rate();
const float size = buffer_size();
- const float period = size / rate * 1000000; // usec
-
- float max_load;
- if (max_delay > period) {
- max_load = 1.0;
- jack_reset_max_delayed_usecs(_client);
- } else {
- max_load = max_delay / period;
- }
+ const float period = size / rate * 1000000.0f; // usec
- return max_load;
+ return (max_delay > period) ? 1.0 : (max_delay / period);
}
void