Author: pabs Date: 2012-01-03 11:40:42 +0000 (Tue, 03 Jan 2012) New Revision: 13066
Added: packages/trunk/cultivation/debian/patches/portaudio19.patch Modified: packages/trunk/cultivation/debian/changelog Log: Add initial port to portaudio19 Modified: packages/trunk/cultivation/debian/changelog =================================================================== --- packages/trunk/cultivation/debian/changelog 2012-01-01 05:56:39 UTC (rev 13065) +++ packages/trunk/cultivation/debian/changelog 2012-01-03 11:40:42 UTC (rev 13066) @@ -1,3 +1,9 @@ +cultivation (9+dfsg1-2) UNRELEASED; urgency=low + + * Add initial port to portaudio19 + + -- Paul Wise <[email protected]> Tue, 03 Jan 2012 19:40:14 +0800 + cultivation (9+dfsg1-1) unstable; urgency=low * New upstream release Added: packages/trunk/cultivation/debian/patches/portaudio19.patch =================================================================== --- packages/trunk/cultivation/debian/patches/portaudio19.patch (rev 0) +++ packages/trunk/cultivation/debian/patches/portaudio19.patch 2012-01-03 11:40:42 UTC (rev 13066) @@ -0,0 +1,70 @@ +Description: port to PortAudio 19 +Author: Paul Wise <[email protected]> +--- a/game2/gameSource/sound/SoundPlayer.cpp ++++ b/game2/gameSource/sound/SoundPlayer.cpp +@@ -54,7 +54,7 @@ + // callback passed into portaudio + static int portaudioCallback( void *inputBuffer, void *outputBuffer, + unsigned long framesPerBuffer, +- PaTimestamp outTime, void *userData ) { ++ PaTime outTime, void *userData ) { + + + SoundPlayer *player = (SoundPlayer *)userData; +@@ -156,20 +156,27 @@ + PaError error = Pa_Initialize(); + + if( error == paNoError ) { +- +- error = Pa_OpenStream( +- &mAudioStream, ++ PaStreamParameters input_params = { + paNoDevice,// default input device + 0, // no input + paFloat32, // 32 bit floating point input +- NULL, +- Pa_GetDefaultOutputDeviceID(), ++ NULL ++ }; ++ ++ PaStreamParameters output_params = { ++ Pa_GetDefaultOutputDevice(), + 2, // stereo output + paFloat32, // 32 bit floating point output +- NULL, ++ NULL ++ }; ++ ++ ++ error = Pa_OpenStream( ++ &mAudioStream, ++ &input_params, ++ &output_params, + mSampleRate, + 1024, // frames per buffer +- 0, // number of buffers, if zero then use default minimum + paClipOff, // we won't output out of range samples so + // don't bother clipping them + portaudioCallback, +--- a/game2/gameSource/sound/SoundPlayer.h ++++ b/game2/gameSource/sound/SoundPlayer.h +@@ -239,7 +239,7 @@ + char mFadingIn; + int mNumFadeFramesRemaining; + +- PortAudioStream *mAudioStream; ++ PaStream *mAudioStream; + + // realtime sounds that should be mixed into the next to-speaker call + SimpleVector<PlayableSound *> *mRealtimeSounds; +--- a/minorGems/sound/SoundPlayer.h ++++ b/minorGems/sound/SoundPlayer.h +@@ -121,7 +121,7 @@ + + char mAudioInitialized; + +- PortAudioStream *mAudioStream; ++ PaStream *mAudioStream; + + }; + _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
