diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-12-22 02:56:27 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-12-22 02:56:27 +0800 |
| commit | 0857134b8d9f3e92a88296b1f9c4044bf6d30d3a (patch) | |
| tree | 3776bfb47e4e80b3985e621ee99d2c49c48a83fb | |
| parent | 66fa9a18058345885c451991dbc711e83de88487 (diff) | |
| download | marcuscom-ports-0857134b8d9f3e92a88296b1f9c4044bf6d30d3a.tar marcuscom-ports-0857134b8d9f3e92a88296b1f9c4044bf6d30d3a.tar.gz marcuscom-ports-0857134b8d9f3e92a88296b1f9c4044bf6d30d3a.tar.bz2 marcuscom-ports-0857134b8d9f3e92a88296b1f9c4044bf6d30d3a.tar.lz marcuscom-ports-0857134b8d9f3e92a88296b1f9c4044bf6d30d3a.tar.xz marcuscom-ports-0857134b8d9f3e92a88296b1f9c4044bf6d30d3a.tar.zst marcuscom-ports-0857134b8d9f3e92a88296b1f9c4044bf6d30d3a.zip | |
Initialize the pcm file descriptor to -1 to prevent closing stdin when
a sound file cannot be found.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11832 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | audio/libcanberra/Makefile | 2 | ||||
| -rw-r--r-- | audio/libcanberra/files/patch-src_oss.c | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index d7a67a7d5..9d9dc6b92 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -7,7 +7,7 @@ PORTNAME= libcanberra PORTVERSION= 0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio devel MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ diff --git a/audio/libcanberra/files/patch-src_oss.c b/audio/libcanberra/files/patch-src_oss.c index 0bd453854..ec8bdc3c4 100644 --- a/audio/libcanberra/files/patch-src_oss.c +++ b/audio/libcanberra/files/patch-src_oss.c @@ -1,5 +1,5 @@ ---- src/oss.c.orig 2008-08-20 22:11:17.000000000 -0400 -+++ src/oss.c 2008-12-18 02:04:42.000000000 -0500 +--- src/oss.c.orig 2008-09-01 19:53:47.000000000 -0400 ++++ src/oss.c 2008-12-21 13:51:09.000000000 -0500 @@ -235,7 +235,7 @@ static int open_oss(ca_context *c, struc ca_return_val_if_fail(c, CA_ERROR_INVALID); ca_return_val_if_fail(c->private, CA_ERROR_STATE); @@ -18,3 +18,11 @@ val = AFMT_S16_BE; #else val = AFMT_S16_LE; +@@ -423,6 +423,7 @@ int driver_play(ca_context *c, uint32_t + out->callback = cb; + out->userdata = userdata; + out->pipe_fd[0] = out->pipe_fd[1] = -1; ++ out->pcm = -1; + + if (pipe(out->pipe_fd) < 0) { + ret = CA_ERROR_SYSTEM; |