Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Allow to compile/link with zita-convolver v4 -- closes #69 
NB. this is experimental for devs (future use) only. By default
setBfree should not be compiled with b_conv, which was somewhat
a failed attempt at modeling horn speaker and cabinet
characteristics.
  • Loading branch information
@x42
x42 committed Feb 10, 2020
1 parent 93e7f15 commit 9580c7b
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion b_conv/convolution.cc
View file
Expand Up @@ -182,7 +182,9 @@ initConvolution (

convproc = new Convproc;
convproc->set_options (options);
#if ZITA_CONVOLVER_MAJOR_VERSION == 3
convproc->set_density (dens);
#endif

if (convproc->configure (
/*in*/ channels,
Expand All @@ -191,7 +193,10 @@ initConvolution (
/*fragm*/ buffersize,
/*min-part*/ buffersize,
/*max-part*/ buffersize /*Convproc::MAXPART*/
)) {
#if ZITA_CONVOLVER_MAJOR_VERSION == 4
, dens /*density*/
#endif
)) {
fprintf (stderr, "\nConvolution: Cannot initialize convolution engine.\n");
exit (1);
}
Expand Down

3 comments on commit 9580c7b

@falkTX
Copy link
Contributor

@falkTX falkTX commented on 9580c7b Feb 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that you forgot to allow v4 in the top of the file. Otherwise the #error preprocessor kicks in

@domichel
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

talkTX is right. The build fait with

make[2]: Entering directory '/var/tmp/portage/media-sound/setbfree-9999/work/setbfree-9999/b_conv'
c++ -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only -Wall -DIRPATH=\"/usr/share/setBfree/ir\"   -c -o convolution.o convolution.cc
convolution.cc:32:2: error: #error "This programs requires zita-convolver 3.x.x"
   32 | #error "This programs requires zita-convolver 3.x.x"
      |  ^~~~~
make[2]: *** [<builtin>: convolution.o] Error 1

@x42
Copy link
Collaborator Author

@x42 x42 commented on 9580c7b Nov 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a won't fix. The convolver was an experiment that has been discontinued and deprecated in favor of doing direct angular based convolution in the leslie.

The code will be removed soon. meanwhile just do not enable it at compile time (it's off by default).

Please sign in to comment.