summaryrefslogtreecommitdiff
path: root/jackd
diff options
context:
space:
mode:
authortorben <torben@0c269be4-1314-0410-8aa9-9f06e86f4224>2011-05-29 00:47:28 +0000
committertorben <torben@0c269be4-1314-0410-8aa9-9f06e86f4224>2011-05-29 00:47:28 +0000
commit1c7b9bb52cbd723422a0a522e880ec34b0227d5a (patch)
treefccab02be59357442645b5f3b178b96f7398d892 /jackd
parent5c76640e3b2476e9f80b69b5d3326f00f972c71a (diff)
downloadjack1-1c7b9bb52cbd723422a0a522e880ec34b0227d5a.tar.gz
[controlAPI] add new parameter timeout threshold. also include clientengine
git-svn-id: svn+ssh://jackaudio.org/trunk/jack@4436 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'jackd')
-rw-r--r--jackd/controlapi.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/jackd/controlapi.c b/jackd/controlapi.c
index 4339784..69ba5ea 100644
--- a/jackd/controlapi.c
+++ b/jackd/controlapi.c
@@ -40,6 +40,7 @@
#include "jack/driver.h"
#include "jack/engine.h"
+#include "clientengine.h"
//#include "JackError.h"
//#include "JackServer.h"
//#include "shm.h"
@@ -112,6 +113,10 @@ struct jackctl_server
/* bool, dont zombify... */
union jackctl_parameter_value nozombies;
union jackctl_parameter_value default_nozombies;
+
+ /* int, timeout thres... */
+ union jackctl_parameter_value timothres;
+ union jackctl_parameter_value default_timothres;
};
struct jackctl_driver
@@ -1053,6 +1058,20 @@ jackctl_server_t * jackctl_server_create(
goto fail_free_parameters;
}
+ value.ui = 0;
+ if (jackctl_add_parameter(
+ &server_ptr->parameters,
+ "timeout-threshold",
+ "threshold for suspending processing",
+ "",
+ JackParamUInt,
+ &server_ptr->timothres,
+ &server_ptr->default_timothres,
+ value, NULL) == NULL)
+ {
+ goto fail_free_parameters;
+ }
+
//TODO: need
//JackServerGlobals::on_device_acquire = on_device_acquire;
//JackServerGlobals::on_device_release = on_device_release;
@@ -1159,7 +1178,7 @@ jackctl_server_start(
server_ptr->do_mlock.b, server_ptr->do_unlock.b, server_ptr->name.str,
server_ptr->temporary.b, server_ptr->verbose.b, server_ptr->client_timeout.i,
server_ptr->port_max.i, getpid(), frame_time_offset,
- server_ptr->nozombies.b, drivers)) == 0) {
+ server_ptr->nozombies.b, server_ptr->timothres.ui, drivers)) == 0) {
jack_error ("cannot create engine");
goto fail_unregister;
}