mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

snd_seq_timestamp_t->real was renamed to snd_seq_timestamp_t->time

Browse source 
Some code is using real as a variable type.
This commit is contained in:
Jaroslav Kysela 2000-01-20 12:14:50 +00:00
parent 50b815f16a
commit 70a536e924
5 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/seqmid.h
View file

@ -30,7 +30,7 @@ void snd_seq_ev_schedule_tick(snd_seq_event_t *ev, int q, int relative,
snd_seq_tick_time_t tick); snd_seq_tick_time_t tick);
/* scheduled on real-time-queue */ /* scheduled on real-time-queue */
void snd_seq_ev_schedule_real(snd_seq_event_t *ev, int q, int relative, void snd_seq_ev_schedule_real(snd_seq_event_t *ev, int q, int relative,
snd_seq_real_time_t *real); snd_seq_real_time_t *time);
/* set event priority (optional) */ /* set event priority (optional) */
void snd_seq_ev_set_priority(snd_seq_event_t *ev, int high_prior); void snd_seq_ev_set_priority(snd_seq_event_t *ev, int high_prior);
@ -134,7 +134,7 @@ int snd_seq_reset_pool_input(snd_seq_t *seq);
((ev)->type = SND_SEQ_EVENT_SETPOS_TIME,\ ((ev)->type = SND_SEQ_EVENT_SETPOS_TIME,\
snd_seq_ev_set_dest(ev, SND_SEQ_CLIENT_SYSTEM, SND_SEQ_PORT_SYSTEM_TIMER),\ snd_seq_ev_set_dest(ev, SND_SEQ_CLIENT_SYSTEM, SND_SEQ_PORT_SYSTEM_TIMER),\
(ev)->data.queue.queue = (q),\ (ev)->data.queue.queue = (q),\
(ev)->data.queue.param.time.real = *(rtime)) (ev)->data.queue.param.time.time = *(rtime))
#define snd_seq_ev_set_queue_pos_tick(ev,q,ttime) \ #define snd_seq_ev_set_queue_pos_tick(ev,q,ttime) \
((ev)->type = SND_SEQ_EVENT_SETPOS_TICK,\ ((ev)->type = SND_SEQ_EVENT_SETPOS_TICK,\
snd_seq_ev_set_dest(ev, SND_SEQ_CLIENT_SYSTEM, SND_SEQ_PORT_SYSTEM_TIMER),\ snd_seq_ev_set_dest(ev, SND_SEQ_CLIENT_SYSTEM, SND_SEQ_PORT_SYSTEM_TIMER),\

4
src/seq/seq.c
View file

@ -943,7 +943,7 @@ static int remove_match(snd_seq_remove_events_t *info,
if (info->tick) if (info->tick)
res = snd_seq_compare_tick_time(&ev->time.tick, &info->time.tick); res = snd_seq_compare_tick_time(&ev->time.tick, &info->time.tick);
else else
res = snd_seq_compare_real_time(&ev->time.real, &info->time.real); res = snd_seq_compare_real_time(&ev->time.time, &info->time.time);
if (!res) if (!res)
return 0; return 0;
} }
@ -951,7 +951,7 @@ static int remove_match(snd_seq_remove_events_t *info,
if (info->tick) if (info->tick)
res = snd_seq_compare_tick_time(&ev->time.tick, &info->time.tick); res = snd_seq_compare_tick_time(&ev->time.tick, &info->time.tick);
else else
res = snd_seq_compare_real_time(&ev->time.real, &info->time.real); res = snd_seq_compare_real_time(&ev->time.time, &info->time.time);
if (res) if (res)
return 0; return 0;
} }

6
src/seq/seqmid.c
View file

@ -49,12 +49,12 @@ void snd_seq_ev_schedule_tick(snd_seq_event_t *ev, int q, int relative,
/* queued on real-time */ /* queued on real-time */
void snd_seq_ev_schedule_real(snd_seq_event_t *ev, int q, int relative, void snd_seq_ev_schedule_real(snd_seq_event_t *ev, int q, int relative,
snd_seq_real_time_t *real) snd_seq_real_time_t *time)
{ {
ev->flags &= ~( SND_SEQ_TIME_STAMP_MASK | SND_SEQ_TIME_MODE_MASK); ev->flags &= ~( SND_SEQ_TIME_STAMP_MASK | SND_SEQ_TIME_MODE_MASK);
ev->flags |= SND_SEQ_TIME_STAMP_REAL; ev->flags |= SND_SEQ_TIME_STAMP_REAL;
ev->flags |= relative ? SND_SEQ_TIME_MODE_REL : SND_SEQ_TIME_MODE_ABS; ev->flags |= relative ? SND_SEQ_TIME_MODE_REL : SND_SEQ_TIME_MODE_ABS;
ev->time.real = *real; ev->time.time = *time;
ev->queue = q; ev->queue = q;
} }
@ -124,7 +124,7 @@ int snd_seq_setpos_queue(snd_seq_t *seq, int q, snd_seq_timestamp_t *rtime, snd_
/* stop the timer */ /* stop the timer */
result = snd_seq_stop_queue(seq, q, ev); result = snd_seq_stop_queue(seq, q, ev);
/* reset queue position */ /* reset queue position */
snd_seq_ev_set_queue_pos_real(ev, q, &rtime->real); snd_seq_ev_set_queue_pos_real(ev, q, &rtime->time);
result = snd_seq_event_output(seq, ev); result = snd_seq_event_output(seq, ev);
snd_seq_ev_set_queue_pos_tick(ev, q, rtime->tick); snd_seq_ev_set_queue_pos_tick(ev, q, rtime->tick);
result = snd_seq_event_output(seq, ev); result = snd_seq_event_output(seq, ev);

4
test/seq-decoder.c
View file

@ -273,8 +273,8 @@ int decode_event(snd_seq_event_t * ev)
break; break;
case SND_SEQ_TIME_STAMP_REAL: case SND_SEQ_TIME_STAMP_REAL:
printf(", time = %d.%09d", printf(", time = %d.%09d",
(int)ev->time.real.tv_sec, (int)ev->time.time.tv_sec,
(int)ev->time.real.tv_nsec); (int)ev->time.time.tv_nsec);
break; break;
} }
printf("\n%sSource = %d.%d, dest = %d.%d, queue = %d\n", printf("\n%sSource = %d.%d, dest = %d.%d, queue = %d\n",

3
test/seq-sender.c
View file

@ -115,7 +115,7 @@ void send_event(snd_seq_t *handle, int queue, int client, int port,
ev.source.client = ev.dest.client = client; ev.source.client = ev.dest.client = client;
ev.source.port = ev.dest.port = port; ev.source.port = ev.dest.port = port;
ev.flags = SND_SEQ_TIME_STAMP_REAL | SND_SEQ_TIME_MODE_ABS; ev.flags = SND_SEQ_TIME_STAMP_REAL | SND_SEQ_TIME_MODE_ABS;
ev.time.real.tv_sec = *time; (*time)++; ev.time.time.tv_sec = *time; (*time)++;
ev.type = SND_SEQ_EVENT_ECHO; ev.type = SND_SEQ_EVENT_ECHO;
if ((err = snd_seq_event_output(handle, &ev))<0) if ((err = snd_seq_event_output(handle, &ev))<0)
fprintf(stderr, "Event output error: %s\n", snd_strerror(err)); fprintf(stderr, "Event output error: %s\n", snd_strerror(err));
@ -147,7 +147,6 @@ void event_sender(snd_seq_t *handle, int argc, char *argv[])
int client, queue, max, err, v1, v2, time = 0, pcm_flag = 0; int client, queue, max, err, v1, v2, time = 0, pcm_flag = 0;
char *ptr; char *ptr;
snd_pcm_t *phandle = NULL; snd_pcm_t *phandle = NULL;
char *pbuf = NULL;
if (argc < 1) { if (argc < 1) {
fprintf(stderr, "Invalid destination...\n"); fprintf(stderr, "Invalid destination...\n");