projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ogg_afh.c: Store the bitrate in KHz rather than in Hz.
[paraslash.git]
/
gui_common.c
diff --git
a/gui_common.c
b/gui_common.c
index d806ebe2df2b6e741ce80837fc59e3c28acb9536..6ca226e6e0d468e953f3e1aac6cab52364f94ffb 100644
(file)
--- a/
gui_common.c
+++ b/
gui_common.c
@@
-1,19
+1,26
@@
#include "para.h"
#include "para.h"
+#include "string.h"
+#include "fd.h"
extern const char *status_item_list[NUM_STAT_ITEMS];
extern const char *status_item_list[NUM_STAT_ITEMS];
-
int para_open_audiod_pipe(char *cmd)
{
int fds[3] = {0, 1, 0};
pid_t pid;
int para_open_audiod_pipe(char *cmd)
{
int fds[3] = {0, 1, 0};
pid_t pid;
- return para_exec_cmdline_pid(&pid, cmd, fds) > 0?
- fds[1] : -1;
+ int ret = para_exec_cmdline_pid(&pid, cmd, fds);
+ if (ret < 0)
+ return ret;
+ ret = mark_fd_nonblock(fds[1]);
+ if (ret > 0)
+ return fds[1];
+ close(fds[1]);
+ return ret;
}
}
-int read_audiod_pipe(int fd,
void (*line_handler)(char *)
)
+int read_audiod_pipe(int fd,
line_handler_t *line_handler
)
{
{
- static char buf[
STRINGSIZE
];
+ static char buf[
4096
];
const ssize_t bufsize = sizeof(buf) - 1;
static ssize_t loaded;
ssize_t ret;
const ssize_t bufsize = sizeof(buf) - 1;
static ssize_t loaded;
ssize_t ret;
@@
-24,7
+31,7
@@
int read_audiod_pipe(int fd, void (*line_handler)(char *) )
if (ret > 0) {
loaded += ret;
buf[loaded] = '\0';
if (ret > 0) {
loaded += ret;
buf[loaded] = '\0';
- loaded = for_each_line(buf, loaded, line_handler,
0
);
+ loaded = for_each_line(buf, loaded, line_handler,
NULL
);
}
return ret;
}
}
return ret;
}