1 --- config_office/configure.in.orig 2006-08-16 15:00:25.000000000 +0000
2 +++ config_office/configure.in 2006-08-16 15:03:25.000000000 +0000
4 AC_CHECK_LIB(portaudio, Pa_Initialize, [],
5 [AC_MSG_ERROR(portaudio library not found or functional)], [])
6 AC_MSG_CHECKING(portaudio version)
7 - AC_TRY_LINK([#include <portaudio.h>], [
8 -void main(int argc, char **argv) {
9 - /* Pa_GetVersion() only exists in v19, so this fails to build with v18 */
10 - int v = Pa_GetVersion();
12 - ], [AC_MSG_ERROR([portaudio too new. you need v18])], [AC_MSG_RESULT([OK, v18])])
15 AC_MSG_RESULT([internal])
16 --- vcl/unx/source/app/salimpsound.hxx.orig 2006-08-17 04:38:53.000000000 +0000
17 +++ vcl/unx/source/app/salimpsound.hxx 2006-08-17 04:39:02.000000000 +0000
23 + PaDeviceIndex device;
24 PaSampleFormat format;
27 --- vcl/unx/source/app/pasfsound.cxx.orig 2006-08-17 04:53:09.000000000 +0000
28 +++ vcl/unx/source/app/pasfsound.cxx 2006-08-17 05:09:12.000000000 +0000
31 /* callback that takes data from sound file and converts it and loads it */
33 - static int pasf_in_out_callback (void *inputBuffer, void * outputBuffer,
34 - unsigned long framesPerBuffer, PaTimestamp outTime, void * userData )
35 + static int pasf_in_out_callback (const void *inputBuffer, void * outputBuffer,
36 + unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo* timeInfo,
37 + PaStreamCallbackFlags statusFlags, void * userData )
39 PASFAudioData* paudio_data;
40 unsigned int read_count, bufoff, bytecnt;
43 /* prevent warnings for unused variables */
44 inputBuffer = inputBuffer;
47 /* get all other info needed from audio_data structure passed in as userData */
48 paudio_data = (PASFAudioData*) userData;
50 m_pData->bufsize = PASF_BUFFER_LEN;
52 // Using the default output device for this
53 - m_pData->device = Pa_GetDefaultOutputDeviceID();
54 + m_pData->device = Pa_GetDefaultOutputDevice();
56 // the size of a frame in bytes is the number of channels of data * the size of the
57 // underlying data type type being used to store data for each for each channel
59 m_pData->format, // 32 bit floating point format for each item
60 m_pData->sfinfo.samplerate, // get desired sampling rate from file
61 framesPerBuffer, // frames per buffer
62 - 0, // number of buffers, if zero then use optimal number as determined by Pa
63 pasf_in_out_callback, // call back to load data into the stream
64 m_pData ); // pass along m_pData pointer so that callback can get access to info