the paraslash-0.2.12 release tarball

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 462ecc8baefe442c8b383f253a7a57bb086cf591..bd87cf870203613648aec2261d501835062b4ade 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -696,7 +696,7 @@ static void start_stream_writer(int slot_num)
        if (a->write_cmd)
                glob = glob_cmd(a->write_cmd);
        if (!glob)
-               glob = para_strdup("para_play");
+               glob = para_strdup("para_write -w alsa");
        PARA_INFO_LOG("starting stream writer: %s\n", glob);
        open_filters(slot_num);
        ret = para_exec_cmdline_pid(&s->wpid, glob, fds);
@@ -809,7 +809,7 @@ static void check_stat_line(char *line)
        long unsigned sec, usec;
        char *tmp;
 
-       PARA_INFO_LOG("line: %s\n", line);
+//     PARA_INFO_LOG("line: %s\n", line);
        if (!line)
                return;
        itemnum = stat_line_valid(line);
@@ -1096,8 +1096,9 @@ static int setup_default_filters(void)
                free(tmp);
                if (ret < 0)
                        goto out;
-               PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i], filters[j].name);
-               ret = add_filter(i, para_strdup("wav"));
+               PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
+                       filters[j].name);
+               ret = add_filter(i, "wav");
                if (ret < 0)
                        goto out;
                PARA_INFO_LOG("%s -> default filter: wav\n", audio_formats[i]);
@@ -1561,9 +1562,9 @@ static void __noreturn audiod_mainloop(void)
 repeat:
        FD_ZERO(&wfds);
        FD_ZERO(&rfds);
+       max_fileno = -1;
        /* always check signal pipe and the local socket */
-       FD_SET(signal_pipe, &rfds);
-       max_fileno = signal_pipe;
+       para_fd_set(signal_pipe, &rfds, &max_fileno);
        para_fd_set(audiod_socket, &rfds, &max_fileno);
 
        if (audiod_status != AUDIOD_ON)
@@ -1644,7 +1645,6 @@ int __noreturn main(int argc, char *argv[])
        char *cf;
        int i;
 
-       fprintf(stderr, "argc: %d\n", argc);
        valid_fd_012();
        hostname = para_hostname();
        cmdline_parser(argc, argv, &conf);