mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 13:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a small calculation in WaveOut plugin.

Browse Source 
Upgraded to SQLite 3.6.3.
This commit is contained in:
Daniel Önnerby 2008-10-06 13:15:09 +00:00
parent 931e190d9e
commit 889f4c856d
3 changed files with 1515 additions and 974 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
src/3rdparty/include/sqlite/sqlite3.h vendored
View File

@ -30,7 +30,7 @@
** the version number) and changes its name to "sqlite3.h" as ** the version number) and changes its name to "sqlite3.h" as
** part of the build process. ** part of the build process.
** **
** @(#) $Id: sqlite.h.in,v 1.394 2008/08/25 21:23:02 drh Exp $ ** @(#) $Id: sqlite.h.in,v 1.398 2008/09/10 13:09:24 drh Exp $
*/ */
#ifndef _SQLITE3_H_ #ifndef _SQLITE3_H_
#define _SQLITE3_H_ #define _SQLITE3_H_
@ -57,7 +57,7 @@ extern "C" {
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
/* GCC added the deprecated attribute in version 3.1 */ /* GCC added the deprecated attribute in version 3.1 */
#define SQLITE_DEPRECATED __attribute__ ((deprecated)) #define SQLITE_DEPRECATED __attribute__ ((deprecated))
#elif defined(_MSC_VER) #elif defined(_MSC_VER) && (_MSC_VER>1200)
#define SQLITE_DEPRECATED __declspec(deprecated) #define SQLITE_DEPRECATED __declspec(deprecated)
#else #else
#define SQLITE_DEPRECATED #define SQLITE_DEPRECATED
@ -70,7 +70,7 @@ extern "C" {
/* I can confirm that it does not work on version 4.1.0... */ /* I can confirm that it does not work on version 4.1.0... */
/* First appears in GCC docs for version 4.3.0 */ /* First appears in GCC docs for version 4.3.0 */
#define SQLITE_EXPERIMENTAL __attribute__ ((warning ("is experimental"))) #define SQLITE_EXPERIMENTAL __attribute__ ((warning ("is experimental")))
#elif defined(_MSC_VER) #elif defined(_MSC_VER) && (_MSC_VER>1200)
#define SQLITE_EXPERIMENTAL __declspec(deprecated("was declared experimental")) #define SQLITE_EXPERIMENTAL __declspec(deprecated("was declared experimental"))
#else #else
#define SQLITE_EXPERIMENTAL #define SQLITE_EXPERIMENTAL
@ -116,8 +116,8 @@ extern "C" {
** with the value (X*1000000 + Y*1000 + Z) where X, Y, and Z ** with the value (X*1000000 + Y*1000 + Z) where X, Y, and Z
** are the major version, minor version, and release number. ** are the major version, minor version, and release number.
*/ */
#define SQLITE_VERSION "3.6.2" #define SQLITE_VERSION "3.6.3"
#define SQLITE_VERSION_NUMBER 3006002 #define SQLITE_VERSION_NUMBER 3006003
/* /*
** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100> ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
@ -154,8 +154,9 @@ int sqlite3_libversion_number(void);
** CAPI3REF: Test To See If The Library Is Threadsafe {H10100} <S60100> ** CAPI3REF: Test To See If The Library Is Threadsafe {H10100} <S60100>
** **
** SQLite can be compiled with or without mutexes. When ** SQLite can be compiled with or without mutexes. When
** the [SQLITE_THREADSAFE] C preprocessor macro is true, mutexes ** the [SQLITE_THREADSAFE] C preprocessor macro 1 or 2, mutexes
** are enabled and SQLite is threadsafe. When that macro is false, ** are enabled and SQLite is threadsafe. When the
** [SQLITE_THREADSAFE] macro is 0,
** the mutexes are omitted. Without the mutexes, it is not safe ** the mutexes are omitted. Without the mutexes, it is not safe
** to use SQLite concurrently from more than one thread. ** to use SQLite concurrently from more than one thread.
** **
@ -177,12 +178,13 @@ int sqlite3_libversion_number(void);
** only the default compile-time setting, not any run-time changes ** only the default compile-time setting, not any run-time changes
** to that setting. ** to that setting.
** **
** See the [threading mode] documentation for additional information.
**
** INVARIANTS: ** INVARIANTS:
** **
** {H10101} The [sqlite3_threadsafe()] function shall return nonzero if ** {H10101} The [sqlite3_threadsafe()] function shall return nonzero if
** SQLite was compiled with the its mutexes enabled by default ** and only if
** or zero if SQLite was compiled such that mutexes are ** SQLite was compiled with the its mutexes enabled by default.
** permanently disabled.
** **
** {H10102} The value returned by the [sqlite3_threadsafe()] function ** {H10102} The value returned by the [sqlite3_threadsafe()] function
** shall not change when mutex setting are modified at ** shall not change when mutex setting are modified at
@ -1097,7 +1099,9 @@ struct sqlite3_mem_methods {
** The application is responsible for serializing access to ** The application is responsible for serializing access to
** [database connections] and [prepared statements]. But other mutexes ** [database connections] and [prepared statements]. But other mutexes
** are enabled so that SQLite will be safe to use in a multi-threaded ** are enabled so that SQLite will be safe to use in a multi-threaded
** environment.</dd> ** environment as long as no two threads attempt to use the same
** [database connection] at the same time. See the [threading mode]
** documentation for additional information.</dd>
** **
** <dt>SQLITE_CONFIG_SERIALIZED</dt> ** <dt>SQLITE_CONFIG_SERIALIZED</dt>
** <dd>There are no arguments to this option. This option enables ** <dd>There are no arguments to this option. This option enables
@ -1108,11 +1112,7 @@ struct sqlite3_mem_methods {
** to [database connections] and [prepared statements] so that the ** to [database connections] and [prepared statements] so that the
** application is free to use the same [database connection] or the ** application is free to use the same [database connection] or the
** same [prepared statement] in different threads at the same time. ** same [prepared statement] in different threads at the same time.
** ** See the [threading mode] documentation for additional information.</dd>
** <p>This configuration option merely sets the default mutex
** behavior to serialize access to [database connections]. Individual
** [database connections] can override this setting
** using the [SQLITE_OPEN_NOMUTEX] flag to [sqlite3_open_v2()].</p></dd>
** **
** <dt>SQLITE_CONFIG_MALLOC</dt> ** <dt>SQLITE_CONFIG_MALLOC</dt>
** <dd>This option takes a single argument which is a pointer to an ** <dd>This option takes a single argument which is a pointer to an
@ -1575,6 +1575,10 @@ int sqlite3_complete16(const void *sql);
** previously set handler. Note that calling [sqlite3_busy_timeout()] ** previously set handler. Note that calling [sqlite3_busy_timeout()]
** will also set or clear the busy handler. ** will also set or clear the busy handler.
** **
** The busy callback should not take any actions which modify the
** database connection that invoked the busy handler. Any such actions
** result in undefined behavior.
**
** INVARIANTS: ** INVARIANTS:
** **
** {H12311} The [sqlite3_busy_handler(D,C,A)] function shall replace ** {H12311} The [sqlite3_busy_handler(D,C,A)] function shall replace
@ -2103,6 +2107,11 @@ void sqlite3_randomness(int N, void *P);
** previous call. Disable the authorizer by installing a NULL callback. ** previous call. Disable the authorizer by installing a NULL callback.
** The authorizer is disabled by default. ** The authorizer is disabled by default.
** **
** The authorizer callback must not do anything that will modify
** the database connection that invoked the authorizer callback.
** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
** database connections for the meaning of "modify" in this paragraph.
**
** When [sqlite3_prepare_v2()] is used to prepare a statement, the ** When [sqlite3_prepare_v2()] is used to prepare a statement, the
** statement might be reprepared during [sqlite3_step()] due to a ** statement might be reprepared during [sqlite3_step()] due to a
** schema change. Hence, the application should ensure that the ** schema change. Hence, the application should ensure that the
@ -2327,7 +2336,12 @@ SQLITE_EXPERIMENTAL void *sqlite3_profile(sqlite3*,
** **
** If the progress callback returns non-zero, the operation is ** If the progress callback returns non-zero, the operation is
** interrupted. This feature can be used to implement a ** interrupted. This feature can be used to implement a
** "Cancel" button on a GUI dialog box. ** "Cancel" button on a GUI progress dialog box.
**
** The progress handler must not do anything that will modify
** the database connection that invoked the progress handler.
** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
** database connections for the meaning of "modify" in this paragraph.
** **
** INVARIANTS: ** INVARIANTS:
** **
@ -2390,7 +2404,7 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
** except that it accepts two additional parameters for additional control ** except that it accepts two additional parameters for additional control
** over the new database connection. The flags parameter can take one of ** over the new database connection. The flags parameter can take one of
** the following three values, optionally combined with the ** the following three values, optionally combined with the
** [SQLITE_OPEN_NOMUTEX] flag: ** [SQLITE_OPEN_NOMUTEX] or [SQLITE_OPEN_FULLMUTEX] flags:
** **
** <dl> ** <dl>
** <dt>[SQLITE_OPEN_READONLY]</dt> ** <dt>[SQLITE_OPEN_READONLY]</dt>
@ -2410,16 +2424,15 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
** **
** If the 3rd parameter to sqlite3_open_v2() is not one of the ** If the 3rd parameter to sqlite3_open_v2() is not one of the
** combinations shown above or one of the combinations shown above combined ** combinations shown above or one of the combinations shown above combined
** with the [SQLITE_OPEN_NOMUTEX] flag, then the behavior is undefined. ** with the [SQLITE_OPEN_NOMUTEX] or [SQLITE_OPEN_FULLMUTEX] flags,
** then the behavior is undefined.
** **
** If the [SQLITE_OPEN_NOMUTEX] flag is set, then mutexes on the ** If the [SQLITE_OPEN_NOMUTEX] flag is set, then the database connection
** opened [database connection] are disabled and the appliation must ** opens in the multi-thread [threading mode] as long as the single-thread
** insure that access to the [database connection] and its associated ** mode has not been set at compile-time or start-time. If the
** [prepared statements] is serialized. The [SQLITE_OPEN_NOMUTEX] flag ** [SQLITE_OPEN_FULLMUTEX] flag is set then the database connection opens
** is the default behavior is SQLite is configured using the ** in the serialized [threading mode] unless single-thread was
** [SQLITE_CONFIG_MULTITHREAD] or [SQLITE_CONFIG_SINGLETHREAD] options ** previously selected at compile-time or start-time.
** to [sqlite3_config()]. The [SQLITE_OPEN_NOMUTEX] flag only makes a
** difference when SQLite is in its default [SQLITE_CONFIG_SERIALIZED] mode.
** **
** If the filename is ":memory:", then a private, temporary in-memory database ** If the filename is ":memory:", then a private, temporary in-memory database
** is created for the connection. This in-memory database will vanish when ** is created for the connection. This in-memory database will vanish when
@ -3838,7 +3851,8 @@ int sqlite3_reset(sqlite3_stmt *pStmt);
** characters. Any attempt to create a function with a longer name ** characters. Any attempt to create a function with a longer name
** will result in [SQLITE_ERROR] being returned. ** will result in [SQLITE_ERROR] being returned.
** **
** The third parameter is the number of arguments that the SQL function or ** The third parameter (nArg)
** is the number of arguments that the SQL function or
** aggregate takes. If this parameter is negative, then the SQL function or ** aggregate takes. If this parameter is negative, then the SQL function or
** aggregate may take any number of arguments. ** aggregate may take any number of arguments.
** **
@ -3869,72 +3883,91 @@ int sqlite3_reset(sqlite3_stmt *pStmt);
** functions with the same name but with either differing numbers of ** functions with the same name but with either differing numbers of
** arguments or differing preferred text encodings. SQLite will use ** arguments or differing preferred text encodings. SQLite will use
** the implementation most closely matches the way in which the ** the implementation most closely matches the way in which the
** SQL function is used. ** SQL function is used. A function implementation with a non-negative
** nArg parameter is a better match than a function implementation with
** a negative nArg. A function where the preferred text encoding
** matches the database encoding is a better
** match than a function where the encoding is different.
** A function where the encoding difference is between UTF16le and UTF16be
** is a closer match than a function where the encoding difference is
** between UTF8 and UTF16.
**
** Built-in functions may be overloaded by new application-defined functions.
** The first application-defined function with a given name overrides all
** built-in functions in the same [database connection] with the same name.
** Subsequent application-defined functions of the same name only override
** prior application-defined functions that are an exact match for the
** number of parameters and preferred encoding.
**
** An application-defined function is permitted to call other
** SQLite interfaces. However, such calls must not
** close the database connection nor finalize or reset the prepared
** statement in which the function is running.
** **
** INVARIANTS: ** INVARIANTS:
** **
** {H16103} The [sqlite3_create_function16()] interface behaves exactly ** {H16103} The [sqlite3_create_function16(D,X,...)] interface shall behave
** like [sqlite3_create_function()] in every way except that it ** as [sqlite3_create_function(D,X,...)] in every way except that it
** interprets the zFunctionName argument as zero-terminated UTF-16 ** interprets the X argument as zero-terminated UTF-16
** native byte order instead of as zero-terminated UTF-8. ** native byte order instead of as zero-terminated UTF-8.
** **
** {H16106} A successful invocation of ** {H16106} A successful invocation of the
** the [sqlite3_create_function(D,X,N,E,...)] interface registers ** [sqlite3_create_function(D,X,N,E,...)] interface shall register
** or replaces callback functions in the [database connection] D ** or replaces callback functions in the [database connection] D
** used to implement the SQL function named X with N parameters ** used to implement the SQL function named X with N parameters
** and having a preferred text encoding of E. ** and having a preferred text encoding of E.
** **
** {H16109} A successful call to [sqlite3_create_function(D,X,N,E,P,F,S,L)] ** {H16109} A successful call to [sqlite3_create_function(D,X,N,E,P,F,S,L)]
** replaces the P, F, S, and L values from any prior calls with ** shall replace the P, F, S, and L values from any prior calls with
** the same D, X, N, and E values. ** the same D, X, N, and E values.
** **
** {H16112} The [sqlite3_create_function(D,X,...)] interface fails with ** {H16112} The [sqlite3_create_function(D,X,...)] interface shall fail
** a return code of [SQLITE_ERROR] if the SQL function name X is ** if the SQL function name X is
** longer than 255 bytes exclusive of the zero terminator. ** longer than 255 bytes exclusive of the zero terminator.
** **
** {H16118} Either F must be NULL and S and L are non-NULL or else F ** {H16118} The [sqlite3_create_function(D,X,N,E,P,F,S,L)] interface
** is non-NULL and S and L are NULL, otherwise ** shall fail unless either F is NULL and S and L are non-NULL or
** [sqlite3_create_function(D,X,N,E,P,F,S,L)] returns [SQLITE_ERROR]. *** F is non-NULL and S and L are NULL.
** **
** {H16121} The [sqlite3_create_function(D,...)] interface fails with an ** {H16121} The [sqlite3_create_function(D,...)] interface shall fails with an
** error code of [SQLITE_BUSY] if there exist [prepared statements] ** error code of [SQLITE_BUSY] if there exist [prepared statements]
** associated with the [database connection] D. ** associated with the [database connection] D.
** **
** {H16124} The [sqlite3_create_function(D,X,N,...)] interface fails with an ** {H16124} The [sqlite3_create_function(D,X,N,...)] interface shall fail with
** error code of [SQLITE_ERROR] if parameter N (specifying the number ** an error code of [SQLITE_ERROR] if parameter N is less
** of arguments to the SQL function being registered) is less
** than -1 or greater than 127. ** than -1 or greater than 127.
** **
** {H16127} When N is non-negative, the [sqlite3_create_function(D,X,N,...)] ** {H16127} When N is non-negative, the [sqlite3_create_function(D,X,N,...)]
** interface causes callbacks to be invoked for the SQL function ** interface shall register callbacks to be invoked for the
** SQL function
** named X when the number of arguments to the SQL function is ** named X when the number of arguments to the SQL function is
** exactly N. ** exactly N.
** **
** {H16130} When N is -1, the [sqlite3_create_function(D,X,N,...)] ** {H16130} When N is -1, the [sqlite3_create_function(D,X,N,...)]
** interface causes callbacks to be invoked for the SQL function ** interface shall register callbacks to be invoked for the SQL
** named X with any number of arguments. ** function named X with any number of arguments.
** **
** {H16133} When calls to [sqlite3_create_function(D,X,N,...)] ** {H16133} When calls to [sqlite3_create_function(D,X,N,...)]
** specify multiple implementations of the same function X ** specify multiple implementations of the same function X
** and when one implementation has N>=0 and the other has N=(-1) ** and when one implementation has N>=0 and the other has N=(-1)
** the implementation with a non-zero N is preferred. ** the implementation with a non-zero N shall be preferred.
** **
** {H16136} When calls to [sqlite3_create_function(D,X,N,E,...)] ** {H16136} When calls to [sqlite3_create_function(D,X,N,E,...)]
** specify multiple implementations of the same function X with ** specify multiple implementations of the same function X with
** the same number of arguments N but with different ** the same number of arguments N but with different
** encodings E, then the implementation where E matches the ** encodings E, then the implementation where E matches the
** database encoding is preferred. ** database encoding shall preferred.
** **
** {H16139} For an aggregate SQL function created using ** {H16139} For an aggregate SQL function created using
** [sqlite3_create_function(D,X,N,E,P,0,S,L)] the finalizer ** [sqlite3_create_function(D,X,N,E,P,0,S,L)] the finalizer
** function L will always be invoked exactly once if the ** function L shall always be invoked exactly once if the
** step function S is called one or more times. ** step function S is called one or more times.
** **
** {H16142} When SQLite invokes either the xFunc or xStep function of ** {H16142} When SQLite invokes either the xFunc or xStep function of
** an application-defined SQL function or aggregate created ** an application-defined SQL function or aggregate created
** by [sqlite3_create_function()] or [sqlite3_create_function16()], ** by [sqlite3_create_function()] or [sqlite3_create_function16()],
** then the array of [sqlite3_value] objects passed as the ** then the array of [sqlite3_value] objects passed as the
** third parameter are always [protected sqlite3_value] objects. ** third parameter shall be [protected sqlite3_value] objects.
*/ */
int sqlite3_create_function( int sqlite3_create_function(
sqlite3 *db, sqlite3 *db,
@ -4846,6 +4879,14 @@ sqlite3_stmt *sqlite3_next_stmt(sqlite3 *pDb, sqlite3_stmt *pStmt);
** If another function was previously registered, its ** If another function was previously registered, its
** pArg value is returned. Otherwise NULL is returned. ** pArg value is returned. Otherwise NULL is returned.
** **
** The callback implementation must not do anything that will modify
** the database connection that invoked the callback. Any actions
** to modify the database connection must be deferred until after the
** completion of the [sqlite3_step()] call that triggered the commit
** or rollback hook in the first place.
** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
** database connections for the meaning of "modify" in this paragraph.
**
** Registering a NULL function disables the callback. ** Registering a NULL function disables the callback.
** **
** For the purposes of this API, a transaction is said to have been ** For the purposes of this API, a transaction is said to have been
@ -4920,6 +4961,13 @@ void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
** The update hook is not invoked when internal system tables are ** The update hook is not invoked when internal system tables are
** modified (i.e. sqlite_master and sqlite_sequence). ** modified (i.e. sqlite_master and sqlite_sequence).
** **
** The update hook implementation must not do anything that will modify
** the database connection that invoked the update hook. Any actions
** to modify the database connection must be deferred until after the
** completion of the [sqlite3_step()] call that triggered the update hook.
** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
** database connections for the meaning of "modify" in this paragraph.
**
** If another function was previously registered, its pArg value ** If another function was previously registered, its pArg value
** is returned. Otherwise NULL is returned. ** is returned. Otherwise NULL is returned.
** **
@ -6197,6 +6245,10 @@ SQLITE_EXPERIMENTAL int sqlite3_status(int op, int *pCurrent, int *pHighwater, i
*/ */
SQLITE_EXPERIMENTAL int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg); SQLITE_EXPERIMENTAL int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg);
int sqlite3_wsd_init(int N, int J);
void *sqlite3_wsd_find(void *K, int L);
/* /*
** CAPI3REF: Status Parameters {H17250} <H17200> ** CAPI3REF: Status Parameters {H17250} <H17200>
** EXPERIMENTAL ** EXPERIMENTAL

2321
src/3rdparty/src/sqlite/sqlite3.c vendored
View File

File diff suppressed because it is too large Load Diff

14
src/contrib/waveout/WaveOut.cpp
View File

@ -8,7 +8,7 @@ WaveOut::WaveOut(void) :
audioThread(NULL), audioThread(NULL),
m_dwSamplesOut(0), m_dwSamplesOut(0),
m_LastPlayedBuffer(-1), m_LastPlayedBuffer(-1),
m_NumBuffers(4) //TODO: config m_NumBuffers(8) //TODO: config
{ {
ZeroMemory(&m_waveFormatPCMEx, sizeof(m_waveFormatPCMEx)); ZeroMemory(&m_waveFormatPCMEx, sizeof(m_waveFormatPCMEx));
@ -65,14 +65,19 @@ bool WaveOut::Open(void)
} }
m_Buffers = (WAVEHDR *)VirtualAlloc(NULL, m_NumBuffers * sizeof(WAVEHDR), MEM_COMMIT, PAGE_READWRITE); m_Buffers = (WAVEHDR *)VirtualAlloc(NULL, m_NumBuffers * sizeof(WAVEHDR), MEM_COMMIT, PAGE_READWRITE);
m_dwBufferSize = m_BlockSize * m_NumBuffers; // m_dwBufferSize = m_BlockSize * m_NumBuffers;
unsigned int bytesPerSample = m_waveFormatPCMEx.Format.nChannels*m_waveFormatPCMEx.Format.wBitsPerSample/16;
m_dwBufferSize = m_BlockSize*bytesPerSample;
m_pfAudioBuffer = (float *)VirtualAlloc(NULL, m_dwBufferSize * m_NumBuffers, MEM_COMMIT, PAGE_READWRITE); // allocate audio memory m_pfAudioBuffer = (float *)VirtualAlloc(NULL, m_dwBufferSize * m_NumBuffers, MEM_COMMIT, PAGE_READWRITE); // allocate audio memory
VirtualLock(m_pfAudioBuffer, m_dwBufferSize * m_NumBuffers); // lock the audio memory into physical memory VirtualLock(m_pfAudioBuffer, m_dwBufferSize * m_NumBuffers); // lock the audio memory into physical memory
for(unsigned long x=0; x<m_NumBuffers; x++) for(unsigned long x=0; x<m_NumBuffers; x++)
{ {
m_Buffers[x].dwBufferLength = m_BlockSize * m_NumBuffers; // m_Buffers[x].dwBufferLength = m_BlockSize * m_NumBuffers;
m_Buffers[x].dwBufferLength = m_BlockSize*bytesPerSample;
m_Buffers[x].lpData = (LPSTR)&m_pfAudioBuffer[x * m_BlockSize]; m_Buffers[x].lpData = (LPSTR)&m_pfAudioBuffer[x * m_BlockSize];
m_Buffers[x].dwUser = x; m_Buffers[x].dwUser = x;
m_Buffers[x].dwBytesRecorded = 0; m_Buffers[x].dwBytesRecorded = 0;
@ -80,6 +85,7 @@ bool WaveOut::Open(void)
m_Buffers[x].dwLoops = 0; m_Buffers[x].dwLoops = 0;
waveOutPrepareHeader(m_waveHandle, &m_Buffers[x], sizeof(WAVEHDR)); waveOutPrepareHeader(m_waveHandle, &m_Buffers[x], sizeof(WAVEHDR));
m_Buffers[x].dwFlags |= WHDR_DONE;
} }
QueryPerformanceCounter(&m_liLastPerformanceCount); QueryPerformanceCounter(&m_liLastPerformanceCount);
@ -141,7 +147,7 @@ unsigned long WaveOut::ThreadProc(void)
{ {
boost::mutex::scoped_lock lock(this->audioMutex); boost::mutex::scoped_lock lock(this->audioMutex);
while(this->m_Buffers && ((m_Buffers[m_ActiveBuffer].dwFlags & WHDR_INQUEUE) && m_Playing )) while(this->m_Buffers && m_Playing && ((m_Buffers[m_ActiveBuffer].dwFlags&WHDR_DONE)==0) )
{ {
this->audioCondition.wait(lock); this->audioCondition.wait(lock);
} }