audio/audacity still does not compile due to issues with soundtouch

[Dimitry Andric]

On 2013-03-05 13:03, Joseph A. Nagy, Jr wrote:
> On 03/05/13 05:59, Dimitry Andric wrote:
>> On 2013-03-05 06:06, Joseph A. Nagy, Jr wrote:
>>> On 03/04/13 22:42, Joseph A. Nagy, Jr wrote:
>>>> I am still having issues with Audacity trying to compile in soundtouch
>>>> plugins. Is this an issue with the port (there is no config option to
>>>> disable this behavior) or is it an upstream issue?
>>>
>>> Full error messages follow:
>>> effects/SoundTouchEffect.cpp:209:31: error: cannot initialize a
>>> parameter of type 'const SAMPLETYPE *'
>>>          (aka 'const short *') with an lvalue of type 'float *'
>>>          mSoundTouch->putSamples(buffer, block);
>>>                                  ^~~~~~
>>> /usr/local/include/soundtouch/SoundTouch.h:237:31: note: passing
>>> argument to parameter 'samples' here
>>>                const SAMPLETYPE *samples,  ///< Pointer to sample buffer.
>>>                                  ^
>>
>> It looks like you have configured the Soundtouch port with the
>> INTEGER_SAMPLES option.  In that case, Soundtouch defines SAMPLETYPE to
>> short, and apparently Audacity is hardcoded to expect float samples
>> instead.
>>
>> Maybe this should be reported to Audacity, but I can imagine they would
>> say "Soundtouch must be configured with float samples". :-)
>
> I will report it to Audacity, right after I rebuild soundtouch w/o
> integer samples selected as an option.

Joseph, can you please try out the attached diff for Audacity?

I have attempted to fix the assumption that samples are always in float
format, and Audacity now compiles and links, even if Soundtouch is
configured with the INTEGER_SAMPLES options.

However, I cannot currently test if this still properly works at
runtime.  Maybe you are able to run this on a test setup, and check if
the Soundtouch effects seem to work as expected.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: audio__audacity-1.diff
Type: text/x-diff
Size: 5587 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20130305/33929edd/attachment.diff>