diff options
| author |   Nick Hadaway <raker@gentoo.org> | 2002-10-30 20:40:57 +0000 |
|---|---|---|
| committer | Nick Hadaway <raker@gentoo.org> | 2002-10-30 20:40:57 +0000 |
| commit | a247216fd55e3624c2edf42db6d0541ebcb5ccf2 (patch) | |
| tree | 422cb281bdc5df472f0898d2b33f2451e452663e /media-sound/jack-audio-connection-kit | |
| parent | moved mask from package.mask to KEYWORDS (diff) | |
| download | gentoo-2-a247216fd55e3624c2edf42db6d0541ebcb5ccf2.tar.gz gentoo-2-a247216fd55e3624c2edf42db6d0541ebcb5ccf2.tar.bz2 gentoo-2-a247216fd55e3624c2edf42db6d0541ebcb5ccf2.zip | |
updated diff that doesn't puke on install :)
Diffstat (limited to 'media-sound/jack-audio-connection-kit')
| -rw-r--r-- | media-sound/jack-audio-connection-kit/files/libsndfile-1.0.diff | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/media-sound/jack-audio-connection-kit/files/libsndfile-1.0.diff b/media-sound/jack-audio-connection-kit/files/libsndfile-1.0.diff index 2f3b5ce8c85a..1173fefbe4b5 100644 --- a/media-sound/jack-audio-connection-kit/files/libsndfile-1.0.diff +++ b/media-sound/jack-audio-connection-kit/files/libsndfile-1.0.diff @@ -1,13 +1,7 @@ ---- example-clients/capture_client.c.orig 2002-10-28 17:50:37.000000000 +0200 -+++ example-clients/capture_client.c 2002-10-28 17:46:24.000000000 +0200 -@@ -15,10 +15,14 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -- $Id: libsndfile-1.0.diff,v 1.1 2002/10/30 19:20:26 raker Exp $ -+ * 2002/08/23 - modify for libsndfile 1.0.0 <andy@alsaplayer.org> -+ -+ $Id: libsndfile-1.0.diff,v 1.1 2002/10/30 19:20:26 raker Exp $ +diff -urN jack-audio-connection-kit-0.34.0/example-clients/capture_client.c jack-audio-connection-kit-0.34.0-modified/example-clients/capture_client.c +--- jack-audio-connection-kit-0.34.0/example-clients/capture_client.c 2002-05-15 20:16:57.000000000 -0500 ++++ jack-audio-connection-kit-0.34.0-modified/example-clients/capture_client.c 2002-10-30 14:40:01.000000000 -0600 +@@ -19,6 +19,8 @@ */ #include <stdio.h> @@ -16,7 +10,7 @@ #include <errno.h> #include <unistd.h> #include <sndfile.h> -@@ -155,7 +159,7 @@ +@@ -155,7 +157,7 @@ } } @@ -25,33 +19,32 @@ char errstr[256]; sf_error_str (0, errstr, sizeof (errstr) - 1); fprintf (stderr, "cannot write data to sndfile (%s)\n", errstr); -@@ -230,13 +234,26 @@ +@@ -230,13 +232,26 @@ setup_disk_thread (thread_info_t *info) { SF_INFO sf_info; -- + int short_mask; -+ + sf_info.samplerate = jack_get_sample_rate (info->client); sf_info.channels = info->channels; - sf_info.format = SF_FORMAT_WAV|SF_FORMAT_PCM; - sf_info.pcmbitwidth = info->bitdepth; -+ + +- if ((info->sf = sf_open_write (info->path, &sf_info)) == NULL) { + switch (info->bitdepth) { + case 8: short_mask = SF_FORMAT_PCM_U8; -+ break; ++ break; + case 16: short_mask = SF_FORMAT_PCM_16; -+ break; ++ break; + case 24: short_mask = SF_FORMAT_PCM_24; -+ break; ++ break; + case 32: short_mask = SF_FORMAT_PCM_32; -+ break; ++ break; + default: short_mask = SF_FORMAT_PCM_16; -+ break; -+ } ++ break; ++ } + sf_info.format = SF_FORMAT_WAV|short_mask; - -- if ((info->sf = sf_open_write (info->path, &sf_info)) == NULL) { ++ + if ((info->sf = sf_open (info->path, SFM_WRITE, &sf_info)) == NULL) { char errstr[256]; sf_error_str (0, errstr, sizeof (errstr) - 1); |