[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-508-gae06517
Lennart Poettering
gitmailer-noreply at 0pointer.de
Wed Feb 4 12:22:23 PST 2009
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from 0933f1a2a401a418a90dc948824e184b5dcc9c93 (commit)
- Log -----------------------------------------------------------------
ae06517... make pacmd work in a pipe
3d33172... rate limit underrun messages
-----------------------------------------------------------------------
Summary of changes:
src/modules/alsa/alsa-sink.c | 4 +-
src/modules/alsa/alsa-source.c | 3 +-
src/utils/pacmd.c | 104 ++++++++++++++++++++++++++--------------
3 files changed, 73 insertions(+), 38 deletions(-)
-----------------------------------------------------------------------
commit 3d33172791197b76fb60d643b2b11c714713eb5b
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Feb 4 20:55:30 2009 +0100
rate limit underrun messages
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 22460bb..c56614c 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -190,7 +190,9 @@ static size_t check_left_to_play(struct userdata *u, snd_pcm_sframes_t n) {
if (left_to_play > 0) {
/* pa_log_debug("%0.2f ms left to play", (double) pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) / PA_USEC_PER_MSEC); */
} else if (!u->first && !u->after_rewind) {
- pa_log_info("Underrun!");
+
+ if (pa_log_ratelimit())
+ pa_log_info("Underrun!");
if (u->use_tsched) {
size_t old_watermark = u->tsched_watermark;
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 0fd9838..2b42d3f 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -187,7 +187,8 @@ static size_t check_left_to_record(struct userdata *u, snd_pcm_sframes_t n) {
if (left_to_record > 0) {
/* pa_log_debug("%0.2f ms left to record", (double) pa_bytes_to_usec(left_to_record, &u->source->sample_spec) / PA_USEC_PER_MSEC); */
} else {
- pa_log_info("Overrun!");
+ if (pa_log_ratelimit())
+ pa_log_info("Overrun!");
if (u->use_tsched) {
size_t old_watermark = u->tsched_watermark;
commit ae0651728614042f840dbbb4bb8cb080d5e1f3db
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Feb 4 21:22:18 2009 +0100
make pacmd work in a pipe
diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
index 2c89c8d..507e229 100644
--- a/src/utils/pacmd.c
+++ b/src/utils/pacmd.c
@@ -47,16 +47,16 @@ int main(int argc, char*argv[]) {
int fd = -1;
int ret = 1, i;
struct sockaddr_un sa;
- char ibuf[256], obuf[256];
+ char ibuf[PIPE_BUF], obuf[PIPE_BUF];
size_t ibuf_index, ibuf_length, obuf_index, obuf_length;
- fd_set ifds, ofds;
char *cli;
+ pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed;
setlocale(LC_ALL, "");
bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR);
if (pa_pid_file_check_running(&pid, "pulseaudio") < 0) {
- pa_log("No PulseAudio daemon running");
+ pa_log("No PulseAudio daemon running, or not running as session daemon.");
goto fail;
}
@@ -99,15 +99,47 @@ int main(int argc, char*argv[]) {
}
ibuf_index = ibuf_length = obuf_index = obuf_length = 0;
+ ibuf_eof = obuf_eof = ibuf_closed = obuf_closed = FALSE;
+ if (argc > 1) {
+ for (i = 1; i < argc; i++) {
+ size_t k;
- FD_ZERO(&ifds);
- FD_SET(0, &ifds);
- FD_SET(fd, &ifds);
+ k = PA_MIN(sizeof(ibuf) - ibuf_length, strlen(argv[i]));
+ memcpy(ibuf + ibuf_length, argv[1], k);
+ ibuf_length += k;
- FD_ZERO(&ofds);
+ if (ibuf_length < sizeof(ibuf)) {
+ ibuf[ibuf_length] = i < argc-1 ? ' ' : '\n';
+ ibuf_length++;
+ }
+ }
+
+ ibuf_eof = TRUE;
+ }
for (;;) {
+ fd_set ifds, ofds;
+
+ if (ibuf_eof &&
+ obuf_eof &&
+ ibuf_length <= 0 &&
+ obuf_length <= 0)
+ break;
+
+ FD_ZERO(&ifds);
+ FD_ZERO(&ofds);
+
+ if (obuf_length > 0)
+ FD_SET(1, &ofds);
+ else if (!obuf_eof)
+ FD_SET(fd, &ifds);
+
+ if (ibuf_length > 0)
+ FD_SET(fd, &ofds);
+ else if (!ibuf_eof)
+ FD_SET(0, &ifds);
+
if (select(FD_SETSIZE, &ifds, &ofds, NULL, NULL) < 0) {
pa_log(_("select(): %s"), strerror(errno));
goto fail;
@@ -118,15 +150,16 @@ int main(int argc, char*argv[]) {
assert(!ibuf_length);
if ((r = read(0, ibuf, sizeof(ibuf))) <= 0) {
- if (r == 0)
- break;
-
- pa_log(_("read(): %s"), strerror(errno));
- goto fail;
+ if (r < 0) {
+ pa_log(_("read(): %s"), strerror(errno));
+ goto fail;
+ }
+
+ ibuf_eof = TRUE;
+ } else {
+ ibuf_length = (size_t) r;
+ ibuf_index = 0;
}
-
- ibuf_length = (size_t) r;
- ibuf_index = 0;
}
if (FD_ISSET(fd, &ifds)) {
@@ -134,15 +167,16 @@ int main(int argc, char*argv[]) {
assert(!obuf_length);
if ((r = read(fd, obuf, sizeof(obuf))) <= 0) {
- if (r == 0)
- break;
-
- pa_log(_("read(): %s"), strerror(errno));
- goto fail;
+ if (r < 0) {
+ pa_log(_("read(): %s"), strerror(errno));
+ goto fail;
+ }
+
+ obuf_eof = TRUE;
+ } else {
+ obuf_length = (size_t) r;
+ obuf_index = 0;
}
-
- obuf_length = (size_t) r;
- obuf_index = 0;
}
if (FD_ISSET(1, &ofds)) {
@@ -170,28 +204,26 @@ int main(int argc, char*argv[]) {
ibuf_length -= (size_t) r;
ibuf_index += obuf_index;
-
}
- FD_ZERO(&ifds);
- FD_ZERO(&ofds);
-
- if (obuf_length <= 0)
- FD_SET(fd, &ifds);
- else
- FD_SET(1, &ofds);
+ if (ibuf_length <= 0 && ibuf_eof && !ibuf_closed) {
+ close(0);
+ shutdown(fd, SHUT_WR);
+ ibuf_closed = TRUE;
+ }
- if (ibuf_length <= 0)
- FD_SET(0, &ifds);
- else
- FD_SET(fd, &ofds);
+ if (obuf_length <= 0 && obuf_eof && !obuf_closed) {
+ shutdown(fd, SHUT_RD);
+ close(1);
+ obuf_closed = TRUE;
+ }
}
ret = 0;
fail:
if (fd >= 0)
- close(fd);
+ pa_close(fd);
return ret;
}
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list