Patched to compile again (thanks, Rasmus!).
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402196
This commit is contained in:
parent
0089ba6cbe
commit
95b6efb631
2 changed files with 3 additions and 3 deletions
|
@ -205,7 +205,7 @@ WINWAVEOUT_OpenDevice(_THIS, const char *devname, int iscapture)
|
||||||
|
|
||||||
while ((!valid_datatype) && (test_format)) {
|
while ((!valid_datatype) && (test_format)) {
|
||||||
valid_datatype = 1;
|
valid_datatype = 1;
|
||||||
_this->spec.format = test_format;
|
this->spec.format = test_format;
|
||||||
switch (test_format) {
|
switch (test_format) {
|
||||||
case AUDIO_U8:
|
case AUDIO_U8:
|
||||||
case AUDIO_S16:
|
case AUDIO_S16:
|
||||||
|
@ -287,7 +287,7 @@ WINWAVEOUT_OpenDevice(_THIS, const char *devname, int iscapture)
|
||||||
|
|
||||||
/* Create the sound buffers */
|
/* Create the sound buffers */
|
||||||
this->hidden->mixbuf = (Uint8 *) SDL_malloc(NUM_BUFFERS * this->spec.size);
|
this->hidden->mixbuf = (Uint8 *) SDL_malloc(NUM_BUFFERS * this->spec.size);
|
||||||
if (mixbuf == NULL) {
|
if (this->hidden->mixbuf == NULL) {
|
||||||
WINWAVEOUT_CloseDevice(this);
|
WINWAVEOUT_CloseDevice(this);
|
||||||
SDL_OutOfMemory();
|
SDL_OutOfMemory();
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -485,7 +485,7 @@ DSOUND_Init(SDL_AudioDriverImpl *impl)
|
||||||
SDL_memset(&ver, '\0', sizeof (OSVERSIONINFO));
|
SDL_memset(&ver, '\0', sizeof (OSVERSIONINFO));
|
||||||
ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
|
ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
|
||||||
GetVersionEx(&ver);
|
GetVersionEx(&ver);
|
||||||
if (ver.dwPlatformId == VER_PLATFORM_WIN32_NT)
|
if (ver.dwPlatformId == VER_PLATFORM_WIN32_NT) {
|
||||||
if (ver.dwMajorVersion <= 4) {
|
if (ver.dwMajorVersion <= 4) {
|
||||||
return 0; /* NT4.0 or earlier. Disable dsound support. */
|
return 0; /* NT4.0 or earlier. Disable dsound support. */
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue