diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-10-20 09:55:52 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-10-20 09:55:52 +0000 |
| commit | 6fad764e91e00b7b0e22c452c2b2cea42c7e5de7 (patch) | |
| tree | 5b3900128c0d14d725f8d6ab7933bb2a640c6801 /audio | |
| parent | Don't try and obtain a value from a void function (fix build on -current) (diff) | |
Fix some of the build problems on -current. This is still broken
because it tries to use mlockall() which is not implemented on FreeBSD.
Notes
Notes:
svn path=/head/; revision=68405
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/pd/files/patch-extra_fiddle~_fiddle~.c | 57 | ||||
| -rw-r--r-- | audio/pd/files/patch-src_s_freebsd.c | 11 |
2 files changed, 60 insertions, 8 deletions
diff --git a/audio/pd/files/patch-extra_fiddle~_fiddle~.c b/audio/pd/files/patch-extra_fiddle~_fiddle~.c index 6158d457d4eb..67d76b16f24b 100644 --- a/audio/pd/files/patch-extra_fiddle~_fiddle~.c +++ b/audio/pd/files/patch-extra_fiddle~_fiddle~.c @@ -1,6 +1,6 @@ ---- extra/fiddle~/fiddle~.c.orig Mon Apr 15 15:52:45 2002 -+++ extra/fiddle~/fiddle~.c Fri May 24 23:12:27 2002 -@@ -40,9 +40,7 @@ This file is downloadable from http://ww +--- ./extra/fiddle~/fiddle~.c.orig Mon Apr 15 15:52:45 2002 ++++ ./extra/fiddle~/fiddle~.c Sun Oct 20 02:48:51 2002 +@@ -40,9 +40,7 @@ #define fexp exp #define fsqrt sqrt #pragma warning (disable: 4305 4244) @@ -11,3 +11,54 @@ #define flog log #define fexp exp #define fsqrt sqrt +@@ -702,11 +700,11 @@ + + for (npitch = 0; npitch < x->x_npitch; npitch++) + { +- int index; ++ int myindex; + float best; + if (npitch) + { +- for (best = 0, index = -1, j=1; j < maxbin-1; j++) ++ for (best = 0, myindex = -1, j=1; j < maxbin-1; j++) + { + if (histogram[j] > best && histogram[j] > histogram[j-1] && + histogram[j] > histogram[j+1]) +@@ -726,7 +724,7 @@ + if (histogram[j + sigfiddle_intpartialonset[k]] + > histogram[j]) goto peaknogood; + } +- index = j; ++ myindex = j; + best = histogram[j]; + } + peaknogood: ; +@@ -734,13 +732,13 @@ + } + else + { +- for (best = 0, index = -1, j=0; j < maxbin; j++) ++ for (best = 0, myindex = -1, j=0; j < maxbin; j++) + if (histogram[j] > best) +- index = j, best = histogram[j]; ++ myindex = j, best = histogram[j]; + } +- if (index < 0) break; ++ if (myindex < 0) break; + histvec[npitch].h_value = best; +- histvec[npitch].h_index = index; ++ histvec[npitch].h_index = myindex; + } + #if 1 + if (x->x_nprint) +@@ -1641,8 +1639,7 @@ + { + if (sp[0]->s_n > x->x_hop) { + x->x_downsample = sp[0]->s_n / x->x_hop; +- post("* warning: fiddle~: will downsample input by +-%ld",x->x_downsample); ++ post("* warning: fiddle~: will downsample input by %ld",x->x_downsample); + x->x_sr = sp[0]->s_sr / x->x_downsample; + } else { + x->x_downsample = 1; diff --git a/audio/pd/files/patch-src_s_freebsd.c b/audio/pd/files/patch-src_s_freebsd.c index 468fbb2d6903..7be4999c58bf 100644 --- a/audio/pd/files/patch-src_s_freebsd.c +++ b/audio/pd/files/patch-src_s_freebsd.c @@ -1,15 +1,16 @@ ---- src/s_freebsd.c.orig Fri May 24 23:12:24 2002 -+++ src/s_freebsd.c Fri May 24 23:12:23 2002 -@@ -32,7 +32,7 @@ +--- src/s_freebsd.c.orig Sun Oct 20 02:49:11 2002 ++++ src/s_freebsd.c Sun Oct 20 02:53:24 2002 +@@ -32,7 +32,8 @@ * 1311:forum::für::umläute:2001 */ -#include <linux/soundcard.h> +#include <sys/soundcard.h> ++#include <sys/mman.h> #if (defined(ALSA01) || defined(ALSA99)) #define ALSA -@@ -865,7 +865,8 @@ +@@ -865,7 +866,8 @@ } else { @@ -19,7 +20,7 @@ dev->d_bytespersamp = 2; } param = wantformat; -@@ -2747,7 +2748,7 @@ +@@ -2747,7 +2749,7 @@ /* use ctrlpanel to change, experiment, channels 1 */ |