com_stat(): Return a proper error message if an invalid option was given.
[paraslash.git] / audiod.c
index 4a88cc8..29a8aa3 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -19,7 +19,6 @@
 #include "ggo.h"
 #include "recv.h"
 #include "filter.h"
-#include "grab_client.cmdline.h"
 #include "grab_client.h"
 #include "client.cmdline.h"
 #include "client.h"
@@ -162,7 +161,7 @@ struct command_task {
  * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
  * \a name is not a supported audio format.
  */
-int get_audio_format_num(char *name)
+int get_audio_format_num(const char *name)
 {
        int i;
 
@@ -221,8 +220,7 @@ out:
        seconds = PARA_MIN(seconds, length);
        seconds = PARA_MAX(seconds, 0);
        return make_message(
-               "%s: %s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
-               status_item_list[SI_PLAY_TIME],
+               "%s%d:%02d [%d:%02d] (%d%%/%d:%02d)",
                s? "" : "~",
                seconds / 60,
                seconds % 60,
@@ -233,7 +231,7 @@ out:
                length % 60
        );
 empty:
-       return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
+       return para_strdup(NULL);
 }
 
 static int want_colors(void)
@@ -446,7 +444,7 @@ static void open_writers(int slot_num)
                stat_task->server_stream_start : *now;
        s->offset_seconds = stat_task->offset_seconds;
        s->seconds_total = stat_task->length_seconds;
-       activate_inactive_grab_clients(slot_num, s->format, s->fc);
+       activate_inactive_grab_clients(s->format, s->fc);
 }
 
 static int open_receiver(int format)
@@ -580,45 +578,31 @@ out:
        return count;
 }
 
-static int check_stat_line(char *line, __a_unused void *data)
+static int update_item(int itemnum, char *buf)
 {
-       int itemnum;
-       size_t ilen = 0;
        long unsigned sec, usec;
-       char *tmp;
 
-       //PARA_INFO_LOG("line: %s\n", line);
-       if (!line)
-               return 1;
-       itemnum = stat_line_valid(line);
-       if (itemnum < 0) {
-               PARA_WARNING_LOG("invalid status line: %s\n", line);
-               return 1;
-       }
        if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME)
                return 1;
-       tmp = make_message("%s\n", line);
-       stat_client_write(tmp, itemnum);
-       free(tmp);
        free(stat_item_values[itemnum]);
-       stat_item_values[itemnum] = para_strdup(line);
-       ilen = strlen(status_item_list[itemnum]);
+       stat_item_values[itemnum] = para_strdup(buf);
+       stat_client_write_item(itemnum);
        switch (itemnum) {
        case SI_STATUS_FLAGS:
                stat_task->vss_status = 0;
-               if (strchr(line, 'N'))
+               if (strchr(buf, 'N'))
                        stat_task->vss_status |= VSS_STATUS_FLAG_NEXT;
-               if (strchr(line, 'P'))
+               if (strchr(buf, 'P'))
                        stat_task->vss_status |= VSS_STATUS_FLAG_PLAYING;
                break;
        case SI_OFFSET:
-               stat_task->offset_seconds = atoi(line + ilen + 1);
+               stat_task->offset_seconds = atoi(buf);
                break;
        case SI_SECONDS_TOTAL:
-               stat_task->length_seconds = atoi(line + ilen + 1);
+               stat_task->length_seconds = atoi(buf);
                break;
        case SI_STREAM_START:
-               if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {
+               if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
                        struct timeval a_start, delay;
                        delay.tv_sec = conf.stream_delay_arg / 1000;
                        delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
@@ -636,14 +620,14 @@ static int check_stat_line(char *line, __a_unused void *data)
                }
                break;
        case SI_CURRENT_TIME:
-               if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {
+               if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
                        struct timeval tv = {sec, usec};
                        compute_time_diff(&tv);
                }
                break;
        case SI_FORMAT:
-               stat_task->current_audio_format_num = get_audio_format_num(
-                       line + ilen + 1);
+               stat_task->current_audio_format_num
+                       = get_audio_format_num(buf);
        }
        return 1;
 }
@@ -937,17 +921,11 @@ static void init_command_task(struct command_task *ct)
 
 static void close_stat_pipe(void)
 {
-       int i;
-
        if (!stat_task->ct)
                return;
        client_close(stat_task->ct);
        stat_task->ct = NULL;
-       FOR_EACH_STATUS_ITEM(i) {
-               free(stat_item_values[i]);
-               stat_item_values[i] = NULL;
-       }
-       dump_empty_status();
+       clear_and_dump_items();
        stat_task->length_seconds = 0;
        stat_task->offset_seconds = 0;
        stat_task->vss_status = 0;
@@ -1071,7 +1049,7 @@ static void status_pre_select(struct sched *s, struct task *t)
                goto out;
        }
        if (st->ct) {
-               unsigned bytes_left;
+               int ret;
                if (st->ct->task.error < 0) {
                        if (st->ct->task.error != -E_TASK_UNREGISTERED)
                                goto out;
@@ -1080,11 +1058,15 @@ static void status_pre_select(struct sched *s, struct task *t)
                }
                if (st->ct->status != CL_RECEIVING)
                        goto out;
-               bytes_left = for_each_line(st->ct->buf, st->ct->loaded,
-                       &check_stat_line, NULL);
-               if (st->ct->loaded != bytes_left) {
+               ret = for_each_stat_item(st->ct->buf, st->ct->loaded,
+                       update_item);
+               if (ret < 0) {
+                       st->ct->task.error = ret;
+                       goto out;
+               }
+               if (st->ct->loaded != ret) {
                        st->last_status_read = *now;
-                       st->ct->loaded = bytes_left;
+                       st->ct->loaded = ret;
                } else {
                        struct timeval diff;
                        tv_diff(now, &st->last_status_read, &diff);
@@ -1096,25 +1078,23 @@ static void status_pre_select(struct sched *s, struct task *t)
        if (tv_diff(now, &st->restart_barrier, NULL) < 0)
                goto out;
        if (st->clock_diff_count) { /* get status only one time */
-               char *argv[] = {"audiod", "stat", "1", NULL};
-               int argc = 3;
+               char *argv[] = {"audiod", "--", "stat", "-p", "1", NULL};
+               int argc = 5;
                PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
                st->clock_diff_count--;
                client_open(argc, argv, &st->ct, NULL);
                set_stat_task_restart_barrier(2);
 
        } else {
-               char *argv[] = {"audiod", "stat", NULL};
-               int argc = 2;
+               char *argv[] = {"audiod", "--", "stat", "-p", NULL};
+               int argc = 4;
                client_open(argc, argv, &st->ct, NULL);
                set_stat_task_restart_barrier(5);
        }
        free(stat_item_values[SI_BASENAME]);
-       stat_item_values[SI_BASENAME] = make_message(
-               "%s: no connection to para_server\n",
-               status_item_list[SI_BASENAME]);
-       stat_client_write(stat_item_values[SI_BASENAME],
-               SI_BASENAME);
+       stat_item_values[SI_BASENAME] = para_strdup(
+               "no connection to para_server");
+       stat_client_write_item(SI_BASENAME);
        st->last_status_read = *now;
 out:
        start_stop_decoders(s);