X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=49f8f46f523742eab96346103830b5dadc9b3416;hp=de0e9c54a2729c4d597b8521989c233bf8340bb1;hb=5d506faba5e49d3fc7eecb5b7d80b515241871d4;hpb=d7cda933daa35663b2b9b61d62cb514afa37fd18 diff --git a/gui.c b/gui.c index de0e9c54..49f8f46f 100644 --- a/gui.c +++ b/gui.c @@ -24,7 +24,10 @@ #include "ringbuffer.h" #include "string.h" #include "fd.h" +#include "error.h" +/** define the array of error lists needed by para_gui */ +INIT_GUI_ERRLISTS; extern const char *status_item_list[NUM_STAT_ITEMS]; static char *stat_content[NUM_STAT_ITEMS]; @@ -883,21 +886,15 @@ repeat: /* audiod pipe */ if (audiod_pipe < 0) audiod_pipe = open_audiod_pipe(); - if (audiod_pipe >= 0) { - FD_SET(audiod_pipe, &rfds); - max_fileno = MAX(max_fileno, audiod_pipe); - } - + if (audiod_pipe >= 0) + para_fd_set(audiod_pipe, &rfds, &max_fileno); /* signal pipe */ - FD_SET(signal_pipe, &rfds); - max_fileno = MAX(max_fileno, signal_pipe); + para_fd_set(signal_pipe, &rfds, &max_fileno); /* command pipe only for COMMAND_MODE */ - if (command_pipe >= 0 && mode == COMMAND_MODE) { - FD_SET(command_pipe, &rfds); - max_fileno = MAX(max_fileno, command_pipe); - } + if (command_pipe >= 0 && mode == COMMAND_MODE) + para_fd_set(command_pipe, &rfds, &max_fileno); if (curses_active) - FD_SET(STDIN_FILENO, &rfds); + para_fd_set(STDIN_FILENO, &rfds, &max_fileno); ret = para_select(max_fileno + 1, &rfds, NULL, &tv); // PARA_DEBUG_LOG("select returned %d\n", ret); if (ret <= 0)