Author: pdewacht-guest Date: 2013-05-28 19:29:10 +0000 (Tue, 28 May 2013) New Revision: 14178
Modified: packages/trunk/transcend/debian/patches/03_portaudio.patch Log: transcend: this seems to work Modified: packages/trunk/transcend/debian/patches/03_portaudio.patch =================================================================== --- packages/trunk/transcend/debian/patches/03_portaudio.patch 2013-05-28 18:36:11 UTC (rev 14177) +++ packages/trunk/transcend/debian/patches/03_portaudio.patch 2013-05-28 19:29:10 UTC (rev 14178) @@ -1,9 +1,7 @@ Author: Barry deFreese <[email protected]> Description: Build with portaudio19. -Index: transcend-0.3.dfsg2/Transcend/game/SoundPlayer.h -=================================================================== ---- transcend-0.3.dfsg2.orig/Transcend/game/SoundPlayer.h 2013-05-27 13:40:20.000000000 -0400 -+++ transcend-0.3.dfsg2/Transcend/game/SoundPlayer.h 2013-05-27 15:46:19.000000000 -0400 +--- a/Transcend/game/SoundPlayer.h ++++ b/Transcend/game/SoundPlayer.h @@ -204,7 +204,7 @@ double mMusicLoudness; @@ -13,10 +11,8 @@ // realtime sounds that should be mixed into the next to-speaker call SimpleVector<PlayableSound *> *mRealtimeSounds; -Index: transcend-0.3.dfsg2/Transcend/game/SoundPlayer.cpp -=================================================================== ---- transcend-0.3.dfsg2.orig/Transcend/game/SoundPlayer.cpp 2004-09-01 02:32:14.000000000 -0400 -+++ transcend-0.3.dfsg2/Transcend/game/SoundPlayer.cpp 2013-05-27 17:32:48.000000000 -0400 +--- a/Transcend/game/SoundPlayer.cpp ++++ b/Transcend/game/SoundPlayer.cpp @@ -47,9 +47,11 @@ @@ -31,46 +27,26 @@ SoundPlayer *player = (SoundPlayer *)userData; -@@ -147,19 +149,38 @@ +@@ -147,21 +149,13 @@ if( error == paNoError ) { - error = Pa_OpenStream( -- &mAudioStream, -+/* FIXME!! */ -+ PaStreamParameters inParams, outParams; -+ -+ bzero( &inParams, sizeof( inParams) ); -+ inParams.device = paNoDevice; -+ inParams.hostApiSpecificStreamInfo = NULL; -+ inParams.sampleFormat = paFloat32; -+ -+ bzero( &outParams, sizeof( outParams) ); -+ outParams.device = Pa_GetDefaultOutputDevice(); -+ outParams.hostApiSpecificStreamInfo = NULL; -+ outParams.sampleFormat = paFloat32; -+ -+/* -+ - paNoDevice,// default input device ++ error = Pa_OpenDefaultStream( + &mAudioStream, +- paNoDevice,// default input device 0, // no input - paFloat32, // 32 bit floating point input - NULL, +- paFloat32, // 32 bit floating point input +- NULL, - Pa_GetDefaultOutputDeviceID(), -+ Pa_GetDefaultOutputDevice(), 2, // stereo output paFloat32, // 32 bit floating point output - NULL, -+ 0, // number of buffers, if zero then use default minimum -+ -+*/ -+ error = Pa_OpenStream( -+ &mAudioStream, -+ &inParams, -+ &outParams, +- NULL, 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 +- paClipOff, // we won't output out of range samples so +- // don't bother clipping them portaudioCallback, + (void *)this ); // pass self-pointer to callback function + _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
