Skip to content

W
wine-cw
Commit 1e319975 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

Small fixes.

parent 9fd5ceb9
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 18 deletions
multimedia/dsound.c
View file @ 1e319975
...@@ -571,7 +571,7 @@ DSOUND_setformat(LPWAVEFORMATEX wfex) { ...@@ -571,7 +571,7 @@ DSOUND_setformat(LPWAVEFORMATEX wfex) {
return -1; return -1;
} }
if ((xx&format)!=format) {/* format unsupported */ if ((xx&format)!=format) {/* format unsupported */
WARN(dsound,"SNDCTL_DSP_GETFMTS: format not supported\n"); FIXME(dsound,"SNDCTL_DSP_GETFMTS: format not supported\n");
return -1; return -1;
} }
nformat = format; nformat = format;
...@@ -580,7 +580,7 @@ DSOUND_setformat(LPWAVEFORMATEX wfex) { ...@@ -580,7 +580,7 @@ DSOUND_setformat(LPWAVEFORMATEX wfex) {
return -1; return -1;
} }
if (nformat!=format) {/* didn't work */ if (nformat!=format) {/* didn't work */
WARN(dsound,"SNDCTL_DSP_GETFMTS: format not set\n"); FIXME(dsound,"SNDCTL_DSP_GETFMTS: format not set\n");
return -1; return -1;
} }
...@@ -629,11 +629,8 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -629,11 +629,8 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
int j,buflen = dsb->buflen; int j,buflen = dsb->buflen;
LPDSBPOSITIONNOTIFY nextevent; LPDSBPOSITIONNOTIFY nextevent;
int xdiff = dsb->wfx.nSamplesPerSec-dsound->wfx.nSamplesPerSec; int xdiff = dsb->wfx.nSamplesPerSec-dsound->wfx.nSamplesPerSec;
long Rvoldec, Lvoldec, samp;
/* Insomnia - Going along with REAL author's style */
long Rvoldec, Lvoldec;
long pan = dsb->pan; long pan = dsb->pan;
long samp; /* temporary sample workspace */
{ {
double tmpr=dsb->volume-500; double tmpr=dsb->volume-500;
...@@ -659,7 +656,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -659,7 +656,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
dsb->wfx.nSamplesPerSec,dsound->wfx.nSamplesPerSec); dsb->wfx.nSamplesPerSec,dsound->wfx.nSamplesPerSec);
} }
nextevent = DSOUND_nextevent(dsb); nextevent = DSOUND_nextevent(dsb);
/* TRACE(dsound,"(%d.%d.%d.%d)\n",dsound->wfx.wBitsPerSample,dsb->wfx.wBitsPerSample,dsound->wfx.nChannels,dsb->wfx.nChannels);*/ TRACE(dsound,"(%d.%d.%d.%d)\n",dsound->wfx.wBitsPerSample,dsb->wfx.wBitsPerSample,dsound->wfx.nChannels,dsb->wfx.nChannels);
if (dsound->wfx.wBitsPerSample == 8) { if (dsound->wfx.wBitsPerSample == 8) {
char *playbuf8 = (char*)playbuf; char *playbuf8 = (char*)playbuf;
...@@ -667,6 +664,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -667,6 +664,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
if (dsb->wfx.wBitsPerSample == 8) { if (dsb->wfx.wBitsPerSample == 8) {
unsigned char *xbuf = (unsigned char*)(dsb->buffer); unsigned char *xbuf = (unsigned char*)(dsb->buffer);
if (dsb->wfx.nChannels == 1) { if (dsb->wfx.nChannels == 1) {
/* 8.1 -> 8.2 */
for (j=0;j<sizeof(playbuf)/2;j++) { for (j=0;j<sizeof(playbuf)/2;j++) {
dsb->playpos=(dsb->playpos+1)%buflen; dsb->playpos=(dsb->playpos+1)%buflen;
...@@ -677,7 +675,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -677,7 +675,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
} }
/* Insomnia- volume, panning, and correcting against wrap */ /* Insomnia- volume, panning, and correcting against wrap */
/* Left Channel */ /* Left Channel */
samp = xbuf[dsb->playpos>>1]; samp = xbuf[dsb->playpos];
samp *= Lvoldec; samp *= Lvoldec;
samp >>= 16; samp >>= 16;
samp += playbuf8[(j<<1)]; samp += playbuf8[(j<<1)];
...@@ -686,7 +684,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -686,7 +684,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
playbuf8[(j<<1)] = (short)samp; playbuf8[(j<<1)] = (short)samp;
/* Right Channel */ /* Right Channel */
samp = xbuf[dsb->playpos>>1]; samp = xbuf[dsb->playpos];
samp *= Rvoldec; samp *= Rvoldec;
samp >>= 16; samp >>= 16;
samp += playbuf8[(j<<1)+1]; samp += playbuf8[(j<<1)+1];
...@@ -698,6 +696,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -698,6 +696,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
CHECK_EVENT CHECK_EVENT
} }
} else { } else {
/* 8.2 -> 8.2 */
for (j=0;j<sizeof(playbuf);j++) { for (j=0;j<sizeof(playbuf);j++) {
dsb->playpos=(dsb->playpos+1)%buflen; dsb->playpos=(dsb->playpos+1)%buflen;
if (!dsb->playpos && !(dsb->playflags&DSBPLAY_LOOPING)) { if (!dsb->playpos && !(dsb->playflags&DSBPLAY_LOOPING)) {
...@@ -706,7 +705,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -706,7 +705,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
return; return;
} }
/* Insomnia- volume, panning, and correcting against wrap */ /* Insomnia- volume, panning, and correcting against wrap */
samp = xbuf[dsb->playpos>>1]; samp = xbuf[dsb->playpos];
/* Right Channel */ /* Right Channel */
if(j&1) samp *= Rvoldec; if(j&1) samp *= Rvoldec;
...@@ -726,7 +725,8 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -726,7 +725,8 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
} else { /* 16 */ } else { /* 16 */
short *xbuf = (short*)(dsb->buffer); short *xbuf = (short*)(dsb->buffer);
if (dsb->wfx.nChannels == 1) { if (dsb->wfx.nChannels == 1) {
for (j=0;j<sizeof(playbuf)/2;j++) { /* 16.1 -> 8.2 */
for (j=0;j<sizeof(playbuf)/sizeof(playbuf[0])/2;j++) {
dsb->playpos=(dsb->playpos+2)%buflen; dsb->playpos=(dsb->playpos+2)%buflen;
if (!dsb->playpos && !(dsb->playflags&DSBPLAY_LOOPING)) { if (!dsb->playpos && !(dsb->playflags&DSBPLAY_LOOPING)) {
dsb->playing = 0; dsb->playing = 0;
...@@ -756,6 +756,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -756,6 +756,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
CHECK_EVENT CHECK_EVENT
} }
} else { } else {
/* 16.2 -> 8.2 */
for (j=0;j<sizeof(playbuf);j++) { for (j=0;j<sizeof(playbuf);j++) {
dsb->playpos=(dsb->playpos+2)%buflen; dsb->playpos=(dsb->playpos+2)%buflen;
if (!dsb->playpos && !(dsb->playflags&DSBPLAY_LOOPING)) { if (!dsb->playpos && !(dsb->playflags&DSBPLAY_LOOPING)) {
...@@ -787,6 +788,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -787,6 +788,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
/* unsigned char *xbuf = (unsigned char*)(dsb->buffer); */ /* unsigned char *xbuf = (unsigned char*)(dsb->buffer); */
char *xbuf = dsb->buffer; char *xbuf = dsb->buffer;
if (dsb->wfx.nChannels == 1) { if (dsb->wfx.nChannels == 1) {
/* 8.1 -> 16.2 */
WARN(dsound,"Mixing 8-bit stereo into 16!!\n"); WARN(dsound,"Mixing 8-bit stereo into 16!!\n");
for (j=0;j<sizeof(playbuf)/sizeof(playbuf[0])/2;j++) { for (j=0;j<sizeof(playbuf)/sizeof(playbuf[0])/2;j++) {
dsb->playpos=(dsb->playpos+1)%buflen; dsb->playpos=(dsb->playpos+1)%buflen;
...@@ -797,7 +799,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -797,7 +799,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
} }
/* Insomnia- volume, panning, and correcting against wrap */ /* Insomnia- volume, panning, and correcting against wrap */
/* Left Channel */ /* Left Channel */
samp = xbuf[dsb->playpos>>1]; samp = xbuf[dsb->playpos];
samp *= Lvoldec; samp *= Lvoldec;
samp >>= 8; samp >>= 8;
samp += playbuf[(j<<1)]; samp += playbuf[(j<<1)];
...@@ -806,7 +808,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -806,7 +808,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
playbuf[(j<<1)] = (short)samp; playbuf[(j<<1)] = (short)samp;
/* Right Channel */ /* Right Channel */
samp = xbuf[dsb->playpos>>1]; samp = xbuf[dsb->playpos];
samp *= Rvoldec; samp *= Rvoldec;
samp >>= 8; samp >>= 8;
samp += playbuf[(j<<1)+1]; samp += playbuf[(j<<1)+1];
...@@ -818,6 +820,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -818,6 +820,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
CHECK_EVENT CHECK_EVENT
} }
} else { } else {
/* 8.2 -> 16.2 */
for (j=0;j<sizeof(playbuf)/sizeof(playbuf[0]);j++) { for (j=0;j<sizeof(playbuf)/sizeof(playbuf[0]);j++) {
dsb->playpos=(dsb->playpos+1)%buflen; dsb->playpos=(dsb->playpos+1)%buflen;
if (!dsb->playpos && !(dsb->playflags&DSBPLAY_LOOPING)) { if (!dsb->playpos && !(dsb->playflags&DSBPLAY_LOOPING)) {
...@@ -826,7 +829,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -826,7 +829,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
return; return;
} }
/* Insomnia- volume, panning, and correcting against wrap */ /* Insomnia- volume, panning, and correcting against wrap */
samp = xbuf[dsb->playpos>>1]; samp = xbuf[dsb->playpos];
/* Right Channel */ /* Right Channel */
if(j&1) samp *= Rvoldec; if(j&1) samp *= Rvoldec;
...@@ -844,6 +847,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) { ...@@ -844,6 +847,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
} }
} }
} else { /* 16 */ } else { /* 16 */
/* 16.1 -> 16.2 */
short *xbuf = (short*)(dsb->buffer); short *xbuf = (short*)(dsb->buffer);
if (dsb->wfx.nChannels == 1) { if (dsb->wfx.nChannels == 1) {
for (j=0;j<sizeof(playbuf)/sizeof(playbuf[0])/2;j++) { for (j=0;j<sizeof(playbuf)/sizeof(playbuf[0])/2;j++) {
...@@ -968,15 +972,13 @@ DSOUND_thread(LPVOID arg) { ...@@ -968,15 +972,13 @@ DSOUND_thread(LPVOID arg) {
if (!dsb || !dsb->lpvtbl) if (!dsb || !dsb->lpvtbl)
continue; continue;
dsb->lpvtbl->fnAddRef(dsb); dsb->lpvtbl->fnAddRef(dsb);
if (dsb->buflen && dsb->playing) { if (dsb->buflen && dsb->playing)
playing++;
DSOUND_MixInBuffer(dsb); DSOUND_MixInBuffer(dsb);
}
dsb->lpvtbl->fnRelease(dsb); dsb->lpvtbl->fnRelease(dsb);
} }
dsound->lpvtbl->fnRelease(dsound); dsound->lpvtbl->fnRelease(dsound);
/*fputc('0'+playing,stderr);*/ fputc('0'+playing,stderr);
curleft = 0; curleft = 0;
while (curleft < sizeof(playbuf)) { while (curleft < sizeof(playbuf)) {
res = write(audiofd,(LPBYTE)playbuf+curleft,sizeof(playbuf)-curleft); res = write(audiofd,(LPBYTE)playbuf+curleft,sizeof(playbuf)-curleft);
......
windows/dinput.c
View file @ 1e319975
...@@ -292,6 +292,7 @@ static HRESULT WINAPI SysKeyboardA_GetDeviceData( ...@@ -292,6 +292,7 @@ static HRESULT WINAPI SysKeyboardA_GetDeviceData(
TRACE(dinput,"(this=%p,%ld,%p,%p(%ld)),0x%08lx)\n", TRACE(dinput,"(this=%p,%ld,%p,%p(%ld)),0x%08lx)\n",
this,dodsize,dod,entries,entries?*entries:0,flags); this,dodsize,dod,entries,entries?*entries:0,flags);
EVENT_WaitNetEvent(FALSE,TRUE);
if (entries) if (entries)
xentries = *entries; xentries = *entries;
else else
...@@ -311,6 +312,7 @@ static HRESULT WINAPI SysKeyboardA_GetDeviceData( ...@@ -311,6 +312,7 @@ static HRESULT WINAPI SysKeyboardA_GetDeviceData(
if (!(flags & DIGDD_PEEK)) if (!(flags & DIGDD_PEEK))
kthis->keystate[i] = InputKeyStateTable[i]&0x80; kthis->keystate[i] = InputKeyStateTable[i]&0x80;
} }
if (n) fprintf(stderr,"%d entries\n",n);
*entries = n; *entries = n;
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment