snd_seq_timestamp_t->real was renamed to snd_seq_timestamp_t->time

Some code is using real as a variable type.

diff --git a/include/seqmid.h b/include/seqmid.h
index cb60a9e5e1b744684d343ed57a78cdf79d396371..6caddf27ffef977d0e457e69435487b74dfc60f0 100644 (file)
--- a/include/seqmid.h
+++ b/include/seqmid.h
@@ -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);
   /* scheduled on real-time-queue */
 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) */
 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,\
         snd_seq_ev_set_dest(ev, SND_SEQ_CLIENT_SYSTEM, SND_SEQ_PORT_SYSTEM_TIMER),\
         (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) \
        ((ev)->type = SND_SEQ_EVENT_SETPOS_TICK,\
         snd_seq_ev_set_dest(ev, SND_SEQ_CLIENT_SYSTEM, SND_SEQ_PORT_SYSTEM_TIMER),\

diff --git a/src/seq/seq.c b/src/seq/seq.c
index 6ed5fe61432aa96fef863e8351c49aa83a5e44af..05271077475e0fef7918c562392dcc99b3d3d7ee 100644 (file)
--- a/src/seq/seq.c
+++ b/src/seq/seq.c
@@ -943,7 +943,7 @@ static int remove_match(snd_seq_remove_events_t *info,
                if (info->tick)
                        res = snd_seq_compare_tick_time(&ev->time.tick, &info->time.tick);
                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)
                        return 0;
        }
@@ -951,7 +951,7 @@ static int remove_match(snd_seq_remove_events_t *info,
                if (info->tick)
                        res = snd_seq_compare_tick_time(&ev->time.tick, &info->time.tick);
                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)
                        return 0;
        }

diff --git a/src/seq/seqmid.c b/src/seq/seqmid.c
index 3004bf9f4aeccb3081650f5bf5839f6d143adf8c..2d0c68ac6317842e84c9862e3d9a93d51344a30a 100644 (file)
--- a/src/seq/seqmid.c
+++ b/src/seq/seqmid.c
@@ -49,12 +49,12 @@ void snd_seq_ev_schedule_tick(snd_seq_event_t *ev, int q, int relative,
 
 /* queued on real-time */
 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_REAL;
        ev->flags |= relative ? SND_SEQ_TIME_MODE_REL : SND_SEQ_TIME_MODE_ABS;
-       ev->time.real = *real;
+       ev->time.time = *time;
        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 */
        result = snd_seq_stop_queue(seq, q, ev);
        /* 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);
        snd_seq_ev_set_queue_pos_tick(ev, q, rtime->tick);
        result = snd_seq_event_output(seq, ev);

diff --git a/test/seq-decoder.c b/test/seq-decoder.c
index 5377f991e003a08e99adb08fa6e3cf4c2204f955..ed40f407913b8c1ff74adc81353257eb86918ba6 100644 (file)
--- a/test/seq-decoder.c
+++ b/test/seq-decoder.c
@@ -273,8 +273,8 @@ int decode_event(snd_seq_event_t * ev)
                        break;
                case SND_SEQ_TIME_STAMP_REAL:
                        printf(", time = %d.%09d",
-                              (int)ev->time.real.tv_sec,
-                              (int)ev->time.real.tv_nsec);
+                              (int)ev->time.time.tv_sec,
+                              (int)ev->time.time.tv_nsec);
                        break;
        }
        printf("\n%sSource = %d.%d, dest = %d.%d, queue = %d\n",

diff --git a/test/seq-sender.c b/test/seq-sender.c
index 0158df5efe0e614441da4369bbb31dcde89a3a07..d00eaf5b3b6a9949ae1fb366d5caccd06d581b8e 100644 (file)
--- a/test/seq-sender.c
+++ b/test/seq-sender.c
@@ -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.port = ev.dest.port = port;
        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;
        if ((err = snd_seq_event_output(handle, &ev))<0)
                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;
        char *ptr;
        snd_pcm_t *phandle = NULL;
-       char *pbuf = NULL;
 
        if (argc < 1) {
                fprintf(stderr, "Invalid destination...\n");