updated to svn version of portaudio. fixed a couple of issues with linux and multiple sound devices.

1 files changed, 0 insertions, 147 deletions

diff --git a/src/engine/external/portaudio/pa_win_util.c b/src/engine/external/portaudio/pa_win_util.c
deleted file mode 100644
index d9911b42..00000000
--- a/src/engine/external/portaudio/pa_win_util.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*

- * $Id: pa_win_util.c 1197 2007-05-04 13:07:10Z gordon_gidluck $

- * Portable Audio I/O Library

- * Win32 platform-specific support functions

- *

- * Based on the Open Source API proposed by Ross Bencina

- * Copyright (c) 1999-2000 Ross Bencina

- *

- * Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files

- * (the "Software"), to deal in the Software without restriction,

- * including without limitation the rights to use, copy, modify, merge,

- * publish, distribute, sublicense, and/or sell copies of the Software,

- * and to permit persons to whom the Software is furnished to do so,

- * subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be

- * included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-/*

- * The text above constitutes the entire PortAudio license; however, 

- * the PortAudio community also makes the following non-binding requests:

- *

- * Any person wishing to distribute modifications to the Software is

- * requested to send the modifications to the original developer so that

- * they can be incorporated into the canonical version. It is also 

- * requested that these non-binding requests be included along with the 

- * license above.

- */

-

-/** @file

- @ingroup win_src

-

- Win32 platform-specific support functions.

-

-    @todo Implement workaround for QueryPerformanceCounter() skipping forward

-    bug. (see msdn kb Q274323).

-*/

- 

-#include <windows.h>

-#include <mmsystem.h> /* for timeGetTime() */

-

-#include "pa_util.h"

-

-

-/*

-   Track memory allocations to avoid leaks.

- */

-

-#if PA_TRACK_MEMORY

-static int numAllocations_ = 0;

-#endif

-

-

-void *PaUtil_AllocateMemory( long size )

-{

-    void *result = GlobalAlloc( GPTR, size );

-

-#if PA_TRACK_MEMORY

-    if( result != NULL ) numAllocations_ += 1;

-#endif

-    return result;

-}

-

-

-void PaUtil_FreeMemory( void *block )

-{

-    if( block != NULL )

-    {

-        GlobalFree( block );

-#if PA_TRACK_MEMORY

-        numAllocations_ -= 1;

-#endif

-

-    }

-}

-

-

-int PaUtil_CountCurrentlyAllocatedBlocks( void )

-{

-#if PA_TRACK_MEMORY

-    return numAllocations_;

-#else

-    return 0;

-#endif

-}

-

-

-void Pa_Sleep( long msec )

-{

-    Sleep( msec );

-}

-

-static int usePerformanceCounter_;

-static double secondsPerTick_;

-

-void PaUtil_InitializeClock( void )

-{

-    LARGE_INTEGER ticksPerSecond;

-

-    if( QueryPerformanceFrequency( &ticksPerSecond ) != 0 )

-    {

-        usePerformanceCounter_ = 1;

-        secondsPerTick_ = 1.0 / (double)ticksPerSecond.QuadPart;

-    }

-    else

-    {

-        usePerformanceCounter_ = 0;

-    }

-}

-

-

-double PaUtil_GetTime( void )

-{

-    LARGE_INTEGER time;

-

-    if( usePerformanceCounter_ )

-    {

-        /* FIXME:

-            according to this knowledge-base article, QueryPerformanceCounter

-            can skip forward by seconds!

-            http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q274323&

-

-            it may be better to use the rtdsc instruction using inline asm,

-            however then a method is needed to calculate a ticks/seconds ratio.

-        */

-        QueryPerformanceCounter( &time );

-        return time.QuadPart * secondsPerTick_;

-    }

-    else

-    {

-#ifndef UNDER_CE    	

-        return timeGetTime() * .001;

-#else

-        return GetTickCount() * .001;

-#endif                

-    }

-}