Spelling fixes.
This commit is contained in:
parent
e665eba1b7
commit
c2bc22b91c
@ -103,6 +103,7 @@ struct IDirectSoundImpl
|
|||||||
*/
|
*/
|
||||||
struct IDirectSoundBufferImpl
|
struct IDirectSoundBufferImpl
|
||||||
{
|
{
|
||||||
|
/* FIXME: document */
|
||||||
/* IUnknown fields */
|
/* IUnknown fields */
|
||||||
ICOM_VFIELD(IDirectSoundBuffer);
|
ICOM_VFIELD(IDirectSoundBuffer);
|
||||||
DWORD ref;
|
DWORD ref;
|
||||||
@ -1361,7 +1362,7 @@ static DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This,
|
|||||||
if (pwrite < pplay) pwrite += primarybuf->buflen; /* wraparound */
|
if (pwrite < pplay) pwrite += primarybuf->buflen; /* wraparound */
|
||||||
pwrite -= pplay;
|
pwrite -= pplay;
|
||||||
if (pmix > (DS_SND_QUEUE * primarybuf->dsound->fraglen + pwrite + primarybuf->writelead)) {
|
if (pmix > (DS_SND_QUEUE * primarybuf->dsound->fraglen + pwrite + primarybuf->writelead)) {
|
||||||
TRACE("detected an underrun: primary queue was %ld\n",pmix);
|
WARN("detected an underrun: primary queue was %ld\n",pmix);
|
||||||
pmix = 0;
|
pmix = 0;
|
||||||
}
|
}
|
||||||
/* divide the offset by its sample size */
|
/* divide the offset by its sample size */
|
||||||
@ -1535,8 +1536,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(
|
|||||||
if ((writebytes == This->buflen) &&
|
if ((writebytes == This->buflen) &&
|
||||||
((This->state == STATE_STARTING) ||
|
((This->state == STATE_STARTING) ||
|
||||||
(This->state == STATE_PLAYING)))
|
(This->state == STATE_PLAYING)))
|
||||||
/* some games, like Half-Life, tries to be clever (not) and
|
/* some games, like Half-Life, try to be clever (not) and
|
||||||
* keeps one secondary buffer, and mixes sounds into it itself,
|
* keep one secondary buffer, and mix sounds into it itself,
|
||||||
* locking the entire buffer every time... so we can just forget
|
* locking the entire buffer every time... so we can just forget
|
||||||
* about tracking the last-written-to-position... */
|
* about tracking the last-written-to-position... */
|
||||||
This->probably_valid_to = (DWORD)-1;
|
This->probably_valid_to = (DWORD)-1;
|
||||||
@ -2746,7 +2747,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD playpos, DWORD wri
|
|||||||
/* determine this buffer's write position */
|
/* determine this buffer's write position */
|
||||||
DWORD buf_writepos = DSOUND_CalcPlayPosition(dsb, dsb->state & primarybuf->state, writepos,
|
DWORD buf_writepos = DSOUND_CalcPlayPosition(dsb, dsb->state & primarybuf->state, writepos,
|
||||||
writepos, dsb->primary_mixpos, dsb->buf_mixpos);
|
writepos, dsb->primary_mixpos, dsb->buf_mixpos);
|
||||||
/* determine how much already-mixed data exist */
|
/* determine how much already-mixed data exists */
|
||||||
DWORD buf_done =
|
DWORD buf_done =
|
||||||
((dsb->buf_mixpos < buf_writepos) ? dsb->buflen : 0) +
|
((dsb->buf_mixpos < buf_writepos) ? dsb->buflen : 0) +
|
||||||
dsb->buf_mixpos - buf_writepos;
|
dsb->buf_mixpos - buf_writepos;
|
||||||
@ -2935,6 +2936,7 @@ static void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD dwUser, DWORD dw
|
|||||||
if (primarybuf->hwbuf) {
|
if (primarybuf->hwbuf) {
|
||||||
if (dsound->priolevel != DSSCL_WRITEPRIMARY) {
|
if (dsound->priolevel != DSSCL_WRITEPRIMARY) {
|
||||||
BOOL paused = ((primarybuf->state == STATE_STOPPED) || (primarybuf->state == STATE_STARTING));
|
BOOL paused = ((primarybuf->state == STATE_STOPPED) || (primarybuf->state == STATE_STARTING));
|
||||||
|
/* FIXME: document variables */
|
||||||
DWORD playpos, writepos, inq, maxq, frag;
|
DWORD playpos, writepos, inq, maxq, frag;
|
||||||
hres = IDsDriverBuffer_GetPosition(primarybuf->hwbuf, &playpos, &writepos);
|
hres = IDsDriverBuffer_GetPosition(primarybuf->hwbuf, &playpos, &writepos);
|
||||||
if (hres) {
|
if (hres) {
|
||||||
|
@ -238,7 +238,7 @@ static LONG JSTCK_GetPosEx(DWORD dwDevID, LPJOYINFOEX lpInfo)
|
|||||||
if ((dev = JSTCK_OpenDevice(jstck)) < 0) return JOYERR_PARMS;
|
if ((dev = JSTCK_OpenDevice(jstck)) < 0) return JOYERR_PARMS;
|
||||||
|
|
||||||
#ifdef HAVE_LINUX_22_JOYSTICK_API
|
#ifdef HAVE_LINUX_22_JOYSTICK_API
|
||||||
/* After opening the device it's state can be
|
/* After opening the device, its state can be
|
||||||
read with JS_EVENT_INIT flag */
|
read with JS_EVENT_INIT flag */
|
||||||
while ((read(dev, &ev, sizeof(struct js_event))) > 0) {
|
while ((read(dev, &ev, sizeof(struct js_event))) > 0) {
|
||||||
if (ev.type == (JS_EVENT_AXIS | JS_EVENT_INIT)) {
|
if (ev.type == (JS_EVENT_AXIS | JS_EVENT_INIT)) {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
|
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MMSYTEM time functions
|
* MMSYSTEM time functions
|
||||||
*
|
*
|
||||||
* Copyright 1993 Martin Ayotte
|
* Copyright 1993 Martin Ayotte
|
||||||
*/
|
*/
|
||||||
|
@ -448,7 +448,7 @@ HTASK TASK_SpawnTask( NE_MODULE *pModule, WORD cmdShow, LPCSTR cmdline, BYTE len
|
|||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* TASK_KillTask
|
* TASK_ExitTask
|
||||||
*/
|
*/
|
||||||
void TASK_ExitTask(void)
|
void TASK_ExitTask(void)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user