diff options
| author |   Nick Hadaway <raker@gentoo.org> | 2002-10-30 19:20:26 +0000 |
|---|---|---|
| committer | Nick Hadaway <raker@gentoo.org> | 2002-10-30 19:20:26 +0000 |
| commit | 6e598c8a80621a8f92a64abdacd2272619702ef1 (patch) | |
| tree | 8b91d97a7524698312586483f40f689e3ea5f7a1 /media-sound/jack-audio-connection-kit/files | |
| parent | adding mask for libsndfile-1 compatible jack-audio-connection-kit (diff) | |
| download | gentoo-2-6e598c8a80621a8f92a64abdacd2272619702ef1.tar.gz gentoo-2-6e598c8a80621a8f92a64abdacd2272619702ef1.tar.bz2 gentoo-2-6e598c8a80621a8f92a64abdacd2272619702ef1.zip | |
libsndfile-1.0.? compatible ebuild. masked until said libsndfile is
unmasked.
Diffstat (limited to 'media-sound/jack-audio-connection-kit/files')
| -rw-r--r-- | media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.34.0-r2 | 1 | ||||
| -rw-r--r-- | media-sound/jack-audio-connection-kit/files/libsndfile-1.0.diff | 58 |
2 files changed, 59 insertions, 0 deletions
diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.34.0-r2 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.34.0-r2 new file mode 100644 index 000000000000..9de31feb1926 --- /dev/null +++ b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.34.0-r2 @@ -0,0 +1 @@ +MD5 eddc87ae83e364edfd0e5289362757ba jack-audio-connection-kit-0.34.0.tar.gz 295629 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 new file mode 100644 index 000000000000..2f3b5ce8c85a --- /dev/null +++ b/media-sound/jack-audio-connection-kit/files/libsndfile-1.0.diff @@ -0,0 +1,58 @@ +--- 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 $ + */ + + #include <stdio.h> ++#include <stdlib.h> ++#include <string.h> + #include <errno.h> + #include <unistd.h> + #include <sndfile.h> +@@ -155,7 +159,7 @@ + } + } + +- if (sf_writef_double (info->sf, fbuf, buf->nframes, 1) != buf->nframes) { ++ if (sf_writef_double (info->sf, fbuf, buf->nframes) != buf->nframes) { + 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 @@ + 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; ++ ++ switch (info->bitdepth) { ++ case 8: short_mask = SF_FORMAT_PCM_U8; ++ break; ++ case 16: short_mask = SF_FORMAT_PCM_16; ++ break; ++ case 24: short_mask = SF_FORMAT_PCM_24; ++ break; ++ case 32: short_mask = SF_FORMAT_PCM_32; ++ break; ++ default: short_mask = SF_FORMAT_PCM_16; ++ 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); + fprintf (stderr, "cannot open sndfile \"%s\" for output (%s)\n", info->path, errstr); |