Browse Source

fix gcc-2.95 compile errors

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@740 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.0
joq 21 years ago
parent
commit
88c268903f
2 changed files with 14 additions and 8 deletions
  1. +2
    -2
      drivers/alsa/alsa_driver.c
  2. +12
    -6
      jackd/engine.c

+ 2
- 2
drivers/alsa/alsa_driver.c View File

@@ -1604,11 +1604,11 @@ alsa_driver_run_cycle (alsa_driver_t *driver)
jack_engine_t *engine = driver->engine;
int wait_status;
float delayed_usecs;
jack_nframes_t nframes;

DEBUG ("alsa run cycle wait\n");

jack_nframes_t nframes = alsa_driver_wait (driver, -1, &wait_status,
&delayed_usecs);
nframes = alsa_driver_wait (driver, -1, &wait_status, &delayed_usecs);

DEBUG ("alsa back from wait, nframes = %lu", nframes);



+ 12
- 6
jackd/engine.c View File

@@ -2279,7 +2279,8 @@ jack_engine_freewheel (void *arg)

jack_lock_graph (engine);

if (jack_engine_process (engine, engine->control->buffer_size)) {
if (jack_engine_process (engine,
engine->control->buffer_size)) {
jack_error ("process cycle within freewheel failed");
jack_unlock_graph (engine);
break;
@@ -2428,25 +2429,30 @@ jack_run_one_cycle (jack_engine_t *engine, jack_nframes_t nframes,

} else {

DEBUG ("engine process cycle failed");
JSList *node;
DEBUG ("engine process cycle failed");

/* we are already late, or something else went wrong,
so it can't hurt to check the existence of all
clients.
*/

for (node = engine->clients; node; node = jack_slist_next (node)) {
jack_client_internal_t *client = (jack_client_internal_t *) node->data;
for (node = engine->clients; node;
node = jack_slist_next (node)) {
jack_client_internal_t *client =
(jack_client_internal_t *) node->data;

if (client->control->type == ClientExternal) {
if (kill (client->control->pid, 0)) {
VERBOSE(engine, "client %s has died/exited\n", client->control->name);
VERBOSE(engine,
"client %s has died/exited\n",
client->control->name);
client->error++;
}
}
DEBUG ("client %s errors = %d", client->control->name, client->error);
DEBUG ("client %s errors = %d", client->control->name,
client->error);
}
}



Loading…
Cancel
Save