Commit 5ddd193a authored by Jaroslav Kysela's avatar Jaroslav Kysela

[ALSA] remove superfluous from_timer_port parameter

ALSA sequencer
Removed superfluous from_timer_port parameter from
snd_seq_queue_process_event and queue_broadcast_event
functions.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent 33e44d91
...@@ -650,7 +650,7 @@ void snd_seq_queue_remove_cells(int client, snd_seq_remove_events_t *info) ...@@ -650,7 +650,7 @@ void snd_seq_queue_remove_cells(int client, snd_seq_remove_events_t *info)
/* /*
* send events to all subscribed ports * send events to all subscribed ports
*/ */
static void queue_broadcast_event(queue_t *q, snd_seq_event_t *ev, int from_timer_port, int atomic, int hop) static void queue_broadcast_event(queue_t *q, snd_seq_event_t *ev, int atomic, int hop)
{ {
snd_seq_event_t sev; snd_seq_event_t sev;
...@@ -661,60 +661,58 @@ static void queue_broadcast_event(queue_t *q, snd_seq_event_t *ev, int from_time ...@@ -661,60 +661,58 @@ static void queue_broadcast_event(queue_t *q, snd_seq_event_t *ev, int from_time
sev.queue = q->queue; sev.queue = q->queue;
sev.data.queue.queue = q->queue; sev.data.queue.queue = q->queue;
if (from_timer_port) { /* broadcast events from Timer port */
/* broadcast events from Timer port */ sev.source.client = SNDRV_SEQ_CLIENT_SYSTEM;
sev.source.client = SNDRV_SEQ_CLIENT_SYSTEM; sev.source.port = SNDRV_SEQ_PORT_SYSTEM_TIMER;
sev.source.port = SNDRV_SEQ_PORT_SYSTEM_TIMER; sev.dest.client = SNDRV_SEQ_ADDRESS_SUBSCRIBERS;
sev.dest.client = SNDRV_SEQ_ADDRESS_SUBSCRIBERS; snd_seq_kernel_client_dispatch(SNDRV_SEQ_CLIENT_SYSTEM, &sev, atomic, hop);
snd_seq_kernel_client_dispatch(SNDRV_SEQ_CLIENT_SYSTEM, &sev, atomic, hop);
}
} }
/* /*
* process a received queue-control event. * process a received queue-control event.
* this function is exported for seq_sync.c. * this function is exported for seq_sync.c.
*/ */
void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev, int from_timer_port, int atomic, int hop) void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev, int atomic, int hop)
{ {
switch (ev->type) { switch (ev->type) {
case SNDRV_SEQ_EVENT_START: case SNDRV_SEQ_EVENT_START:
snd_seq_prioq_leave(q->tickq, ev->source.client, 1); snd_seq_prioq_leave(q->tickq, ev->source.client, 1);
snd_seq_prioq_leave(q->timeq, ev->source.client, 1); snd_seq_prioq_leave(q->timeq, ev->source.client, 1);
if (! snd_seq_timer_start(q->timer)) if (! snd_seq_timer_start(q->timer))
queue_broadcast_event(q, ev, from_timer_port, atomic, hop); queue_broadcast_event(q, ev, atomic, hop);
break; break;
case SNDRV_SEQ_EVENT_CONTINUE: case SNDRV_SEQ_EVENT_CONTINUE:
if (! snd_seq_timer_continue(q->timer)) if (! snd_seq_timer_continue(q->timer))
queue_broadcast_event(q, ev, from_timer_port, atomic, hop); queue_broadcast_event(q, ev, atomic, hop);
break; break;
case SNDRV_SEQ_EVENT_STOP: case SNDRV_SEQ_EVENT_STOP:
snd_seq_timer_stop(q->timer); snd_seq_timer_stop(q->timer);
queue_broadcast_event(q, ev, from_timer_port, atomic, hop); queue_broadcast_event(q, ev, atomic, hop);
break; break;
case SNDRV_SEQ_EVENT_TEMPO: case SNDRV_SEQ_EVENT_TEMPO:
snd_seq_timer_set_tempo(q->timer, ev->data.queue.param.value); snd_seq_timer_set_tempo(q->timer, ev->data.queue.param.value);
queue_broadcast_event(q, ev, from_timer_port, atomic, hop); queue_broadcast_event(q, ev, atomic, hop);
break; break;
case SNDRV_SEQ_EVENT_SETPOS_TICK: case SNDRV_SEQ_EVENT_SETPOS_TICK:
if (snd_seq_timer_set_position_tick(q->timer, ev->data.queue.param.time.tick) == 0) { if (snd_seq_timer_set_position_tick(q->timer, ev->data.queue.param.time.tick) == 0) {
queue_broadcast_event(q, ev, from_timer_port, atomic, hop); queue_broadcast_event(q, ev, atomic, hop);
} }
break; break;
case SNDRV_SEQ_EVENT_SETPOS_TIME: case SNDRV_SEQ_EVENT_SETPOS_TIME:
if (snd_seq_timer_set_position_time(q->timer, ev->data.queue.param.time.time) == 0) { if (snd_seq_timer_set_position_time(q->timer, ev->data.queue.param.time.time) == 0) {
queue_broadcast_event(q, ev, from_timer_port, atomic, hop); queue_broadcast_event(q, ev, atomic, hop);
} }
break; break;
case SNDRV_SEQ_EVENT_QUEUE_SKEW: case SNDRV_SEQ_EVENT_QUEUE_SKEW:
if (snd_seq_timer_set_skew(q->timer, if (snd_seq_timer_set_skew(q->timer,
ev->data.queue.param.skew.value, ev->data.queue.param.skew.value,
ev->data.queue.param.skew.base) == 0) { ev->data.queue.param.skew.base) == 0) {
queue_broadcast_event(q, ev, from_timer_port, atomic, hop); queue_broadcast_event(q, ev, atomic, hop);
} }
break; break;
} }
...@@ -740,7 +738,7 @@ int snd_seq_control_queue(snd_seq_event_t *ev, int atomic, int hop) ...@@ -740,7 +738,7 @@ int snd_seq_control_queue(snd_seq_event_t *ev, int atomic, int hop)
return -EPERM; return -EPERM;
} }
snd_seq_queue_process_event(q, ev, 1, atomic, hop); snd_seq_queue_process_event(q, ev, atomic, hop);
queue_access_unlock(q); queue_access_unlock(q);
queuefree(q); queuefree(q);
......
...@@ -111,7 +111,7 @@ int snd_seq_queue_use(int queueid, int client, int use); ...@@ -111,7 +111,7 @@ int snd_seq_queue_use(int queueid, int client, int use);
int snd_seq_queue_is_used(int queueid, int client); int snd_seq_queue_is_used(int queueid, int client);
int snd_seq_control_queue(snd_seq_event_t *ev, int atomic, int hop); int snd_seq_control_queue(snd_seq_event_t *ev, int atomic, int hop);
void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev, int from_timer_port, int atomic, int hop); void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev, int atomic, int hop);
/* /*
* 64bit division - for sync stuff.. * 64bit division - for sync stuff..
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment