gui: fix default stat command

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index b1313d15f2570fba77657ae2e43964c53c5eb4dd..3b6111964a8012de6bbdddd4b7ec340a1173ce48 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -541,18 +541,18 @@ static void check_stat_line(char *line)
                break;
        case SI_STREAM_START:
                if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {
                break;
        case SI_STREAM_START:
                if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {

-                       struct timeval tmp, delay;
+                       struct timeval a_start, delay;

                        delay.tv_sec = conf.stream_delay_arg / 1000;
                        delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
                        stat_task->server_stream_start.tv_sec = sec;
                        stat_task->server_stream_start.tv_usec = usec;
                        if (stat_task->sa_time_diff_sign < 0)
                                tv_add(&stat_task->server_stream_start,
                        delay.tv_sec = conf.stream_delay_arg / 1000;
                        delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
                        stat_task->server_stream_start.tv_sec = sec;
                        stat_task->server_stream_start.tv_usec = usec;
                        if (stat_task->sa_time_diff_sign < 0)
                                tv_add(&stat_task->server_stream_start,

-                                       &stat_task->sa_time_diff, &tmp);
+                                       &stat_task->sa_time_diff, &a_start);

                        else
                                tv_diff(&stat_task->server_stream_start,
                        else
                                tv_diff(&stat_task->server_stream_start,

-                                       &stat_task->sa_time_diff, &tmp);
-                       tv_add(&tmp, &delay, &initial_delay_barrier);
+                                       &stat_task->sa_time_diff, &a_start);
+                       tv_add(&a_start, &delay, &initial_delay_barrier);

                }
                break;
        case SI_CURRENT_TIME:
                }
                break;
        case SI_CURRENT_TIME:


@@ -755,17 +755,17 @@ static int init_receivers(void)
        }
        for (i = conf.receiver_given - 1; i >= 0; i--) {
                char *arg = conf.receiver_arg[i];
        }
        for (i = conf.receiver_given - 1; i >= 0; i--) {
                char *arg = conf.receiver_arg[i];

-               char *recv = strchr(arg, ':');
+               char *recv_arg = strchr(arg, ':');

                PARA_INFO_LOG("arg: %s\n", arg);
                ret = -E_MISSING_COLON;
                PARA_INFO_LOG("arg: %s\n", arg);
                ret = -E_MISSING_COLON;

-               if (!recv)
+               if (!recv_arg)

                        goto out;
                        goto out;

-               *recv = '\0';
-               recv++;
+               *recv_arg = '\0';
+               recv_arg++;

                ret = get_audio_format_num(arg);
                if (ret < 0)
                        goto out;
                ret = get_audio_format_num(arg);
                if (ret < 0)
                        goto out;

-               afi[ret].receiver_conf = check_receiver_arg(recv, &receiver_num);
+               afi[ret].receiver_conf = check_receiver_arg(recv_arg, &receiver_num);

                if (!afi[ret].receiver_conf) {
                        ret = -E_RECV_SYNTAX;
                        goto out;
                if (!afi[ret].receiver_conf) {
                        ret = -E_RECV_SYNTAX;
                        goto out;