diff --git a/matlab/osc/blip/eval_blep.m b/matlab/osc/blip/eval_blep.m index ac48451..ac3f8c4 100755 --- a/matlab/osc/blip/eval_blep.m +++ b/matlab/osc/blip/eval_blep.m @@ -72,10 +72,10 @@ end; close all plot(1:nsin, blepm(fix(nharm/2), :)); grid; -wavwrite(0.5*vtri, fs, 'tri.wav'); -wavwrite(0.5*vsqr, fs, 'sqr.wav'); -wavwrite(0.5*vsaw, fs, 'saw.wav'); -wavwrite(0.5*vblep, fs, 'blep.wav'); +wavw16(0.5*vtri, fs, 'tri.wav'); +wavw16(0.5*vsqr, fs, 'sqr.wav'); +wavw16(0.5*vsaw, fs, 'saw.wav'); +wavw16(0.5*vblep, fs, 'blep.wav'); function h = lagrange(N, delay) %LAGRANGE h=lagrange(N,delay) returns order N FIR diff --git a/matlab/osc/blip/eval_blit.m b/matlab/osc/blip/eval_blit.m index fa02623..7b8ed89 100755 --- a/matlab/osc/blip/eval_blit.m +++ b/matlab/osc/blip/eval_blit.m @@ -82,8 +82,8 @@ close all figure; plot(1:L, vsaw, 1:L, vblit); grid; -wavwrite(0.5*vtri, fs, 'tri.wav'); -wavwrite(0.5*vsqr, fs, 'sqr.wav'); -wavwrite(0.5*vsaw, fs, 'saw.wav'); -wavwrite(0.5*vblit, fs, 'blit.wav'); +wavw16(0.5*vtri, fs, 'tri.wav'); +wavw16(0.5*vsqr, fs, 'sqr.wav'); +wavw16(0.5*vsaw, fs, 'saw.wav'); +wavw16(0.5*vblit, fs, 'blit.wav'); diff --git a/matlab/osc/blip/eval_blit2.m b/matlab/osc/blip/eval_blit2.m index cf44271..6a0dbc0 100755 --- a/matlab/osc/blip/eval_blit2.m +++ b/matlab/osc/blip/eval_blit2.m @@ -1,4 +1,4 @@ -function eval_blit() +function eval_blit2() L = 64000; Nb = 65; Nos = 8; @@ -9,7 +9,7 @@ df = (fend-fstart)/L fcut = 16000; x = (0:Nb*Nos-1) - (Nb*Nos-1)/2; -H = sinc(2*fcut/fs.*x/Nos).*Kaiser(Nos*Nb, 8)'; +H = sinc(2*fcut/fs.*x/Nos).*kaiser(Nos*Nb, 8)'; for ii=0:Nos-1, for jj=0:Nb-1 Hs(ii+1,jj+1) = H(Nos-ii+Nos*jj); @@ -58,7 +58,7 @@ for i = 1:L, f = f + df; end; -wavwrite(0.7*blit, fs, 'blit.wav'); +wavw16(0.7*blit, fs, 'blit.wav'); for ii = 1:Nos step(ii,:) = k(ii).*filter(Hs(ii,:), 1, [ones(1,Nb)]); diff --git a/matlab/osc/blip/eval_blit3.m b/matlab/osc/blip/eval_blit3.m index ffddd4f..f5b5753 100755 --- a/matlab/osc/blip/eval_blit3.m +++ b/matlab/osc/blip/eval_blit3.m @@ -1,4 +1,4 @@ -function eval_blit() +function eval_blit3() L = 64000; Nb = 137; Nphases = 256; @@ -10,7 +10,7 @@ fcut = 16000; x = (0:Nb*Nphases-1) - (Nb*Nphases-1)/2; H = sinc(2*fcut/fs.*x/Nphases);%.*Kaiser(Nphases*Nb, 8)'; -Hw = Kaiser(Nb, 18)'; +Hw = kaiser(Nb, 18)'; for ii=0:Nphases-1, for jj=0:Nb-1 @@ -62,7 +62,7 @@ plot(saw); grid; figure; plot(saw_nodc); grid; -wavwrite(0.8*blit, fs, 'blit.wav'); -wavwrite(0.7*saw_nodc, fs, 'saw.wav'); -wavwrite(0.5*sqr_nodc, fs, 'sqr.wav'); +wavw16(0.8*blit, fs, 'blit.wav'); +wavw16(0.7*saw_nodc, fs, 'saw.wav'); +wavw16(0.5*sqr_nodc, fs, 'sqr.wav'); diff --git a/matlab/osc/blip/eval_blit4.m b/matlab/osc/blip/eval_blit4.m index e3b4582..0ee3a60 100755 --- a/matlab/osc/blip/eval_blit4.m +++ b/matlab/osc/blip/eval_blit4.m @@ -80,9 +80,9 @@ plot(vc4); grid; figure; plot(vc3); grid; -wavwrite(0.5*vc4, fs, 'c4.wav'); -wavwrite(0.5*vc3, fs, 'c3.wav'); -wavwrite(0.5*vsqr, fs, 'sqr.wav'); -wavwrite(0.5*vsaw, fs, 'saw.wav'); -wavwrite(0.5*vblit, fs, 'blit.wav'); +wavw16(0.5*vc4, fs, 'c4.wav'); +wavw16(0.5*vc3, fs, 'c3.wav'); +wavw16(0.5*vsqr, fs, 'sqr.wav'); +wavw16(0.5*vsaw, fs, 'saw.wav'); +wavw16(0.5*vblit, fs, 'blit.wav');