diff --git a/polymer/eduke32/source/jaudiolib/_multivc.h b/polymer/eduke32/source/jaudiolib/_multivc.h index 5c9220219..d9e1cf0cc 100644 --- a/polymer/eduke32/source/jaudiolib/_multivc.h +++ b/polymer/eduke32/source/jaudiolib/_multivc.h @@ -67,7 +67,7 @@ Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com) #define SILENCE_8BIT 0x80808080 //#define SILENCE_16BIT_PAS 0 -#ifdef WINDOWS +#if defined(_WIN32) #define MixBufferSize (MV_GetBufferSize(MV_RequestedMixRate)) #else #define MixBufferSize 256 @@ -272,7 +272,7 @@ parm [ edi ] [ eax ] [ ecx ] modify exact [ ecx edi ]; #define CDEC _cdecl -#elif defined(WINDOWS) +#elif defined(_WIN32) #define CDEC __cdecl diff --git a/polymer/eduke32/source/jaudiolib/dsoundout.c b/polymer/eduke32/source/jaudiolib/dsoundout.c index ec1e3e965..49c1a6563 100644 --- a/polymer/eduke32/source/jaudiolib/dsoundout.c +++ b/polymer/eduke32/source/jaudiolib/dsoundout.c @@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include "dsound.h" -#include "osd.h" #include "winlayer.h" @@ -181,7 +180,7 @@ int DSOUND_Init(int soundcard, int mixrate, int numchannels, int samplebits, int DSOUND_Shutdown(); } - printOSD("Initializing DirectSound...\n"); + initprintf("Initializing DirectSound...\n"); if (!_DSOUND_CriticalSectionAlloced) { @@ -191,7 +190,7 @@ int DSOUND_Init(int soundcard, int mixrate, int numchannels, int samplebits, int _DSOUND_CriticalSectionAlloced = TRUE; } - printOSD(" - Loading DSOUND.DLL\n"); + initprintf(" - Loading DSOUND.DLL\n"); hDSoundDLL = LoadLibrary("DSOUND.DLL"); if (!hDSoundDLL) { @@ -208,7 +207,7 @@ int DSOUND_Init(int soundcard, int mixrate, int numchannels, int samplebits, int return DSOUND_Error; } - printOSD(" - Creating DirectSound object\n"); + initprintf(" - Creating DirectSound object\n"); hr = aDirectSoundCreate(NULL, &lpDS, NULL); if (hr != DS_OK) { @@ -225,7 +224,7 @@ int DSOUND_Init(int soundcard, int mixrate, int numchannels, int samplebits, int return DSOUND_Error; } - printOSD(" - Creating primary buffer\n"); + initprintf(" - Creating primary buffer\n"); ZeroMemory(&dsbuf, sizeof(dsbuf)); dsbuf.dwSize = sizeof(DSBUFFERDESC); dsbuf.dwFlags = DSBCAPS_PRIMARYBUFFER; @@ -237,7 +236,7 @@ int DSOUND_Init(int soundcard, int mixrate, int numchannels, int samplebits, int return DSOUND_Error; } - printOSD(" - Setting primary buffer format\n" + initprintf(" - Setting primary buffer format\n" " Channels: %d\n" " Sample rate: %dHz\n" " Sample size: %d bits\n", @@ -257,7 +256,7 @@ int DSOUND_Init(int soundcard, int mixrate, int numchannels, int samplebits, int return DSOUND_Error; } - printOSD(" - Creating secondary buffer\n"); + initprintf(" - Creating secondary buffer\n"); ZeroMemory(&dsbuf, sizeof(dsbuf)); dsbuf.dwSize = sizeof(DSBUFFERDESC); dsbuf.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPOSITIONNOTIFY | DSBCAPS_LOCSOFTWARE; @@ -323,7 +322,7 @@ int DSOUND_Shutdown(void) { int i; - if (DSOUND_Installed) printOSD("Uninitializing DirectSound...\n"); + if (DSOUND_Installed) initprintf("Uninitializing DirectSound...\n"); DSOUND_Installed = FALSE; @@ -347,7 +346,7 @@ int DSOUND_Shutdown(void) if (lpDSBSecondary) { - printOSD(" - Releasing secondary buffer\n"); + initprintf(" - Releasing secondary buffer\n"); IDirectSoundBuffer_Stop(lpDSBSecondary); IDirectSoundBuffer_Release(lpDSBSecondary); lpDSBSecondary = NULL; @@ -355,21 +354,21 @@ int DSOUND_Shutdown(void) if (lpDSBPrimary) { - printOSD(" - Releasing primary buffer\n"); + initprintf(" - Releasing primary buffer\n"); IDirectSoundBuffer_Release(lpDSBPrimary); lpDSBPrimary = NULL; } if (lpDS) { - printOSD(" - Releasing DirectSound object\n"); + initprintf(" - Releasing DirectSound object\n"); IDirectSound_Release(lpDS); lpDS = NULL; } if (hDSoundDLL) { - printOSD(" - Unloading DSOUND.DLL\n"); + initprintf(" - Unloading DSOUND.DLL\n"); FreeLibrary(hDSoundDLL); hDSoundDLL = NULL; } @@ -581,11 +580,11 @@ int DSOUND_StopPlayback(void) { SetEvent(isrfinish); - printOSD("DirectSound: Waiting for sound thread to exit\n"); + initprintf("DirectSound: Waiting for sound thread to exit\n"); if (WaitForSingleObject(isrthread, 300) == WAIT_OBJECT_0) - printOSD("DirectSound: Sound thread has exited\n"); + initprintf("DirectSound: Sound thread has exited\n"); else - printOSD("DirectSound: Sound thread failed to exit!\n"); + initprintf("DirectSound: Sound thread failed to exit!\n"); /* while (1) { if (!GetExitCodeThread(isrthread, &exitcode)) { diff --git a/polymer/eduke32/source/jaudiolib/multivoc.c b/polymer/eduke32/source/jaudiolib/multivoc.c index 0dcd50136..b4ececc11 100644 --- a/polymer/eduke32/source/jaudiolib/multivoc.c +++ b/polymer/eduke32/source/jaudiolib/multivoc.c @@ -41,7 +41,6 @@ Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com) #include "pitch.h" #include "multivoc.h" #include "_multivc.h" -#include "osd.h" #ifdef __MINGW32__ #define min(a,b) (((a)<(b))?(a):(b)) @@ -2794,7 +2793,7 @@ int MV_Init MV_Shutdown(); } - printOSD("Initializing MultiVoc...\n"); + initprintf("Initializing MultiVoc...\n"); MV_SetErrorCode(MV_Ok); @@ -2812,7 +2811,7 @@ int MV_Init // Set number of voices before calculating volume table MV_MaxVoices = Voices; - printOSD(" - Maximum voices: %d\n", MV_MaxVoices); + initprintf(" - Maximum voices: %d\n", MV_MaxVoices); LL_Reset(&VoiceList, next, prev); LL_Reset(&VoicePool, next, prev); @@ -2825,7 +2824,7 @@ int MV_Init // Set the sampling rate MV_RequestedMixRate = MixRate; - printOSD(" - Using %d byte mixing buffers\n", MixBufferSize); + initprintf(" - Using %d byte mixing buffers\n", MixBufferSize); // Allocate mix buffer within 1st megabyte ptr = (char *)malloc(TotalBufferSize + 4); // FIXME: temporarily fixes bounds error somewhere... @@ -2924,7 +2923,7 @@ int MV_Shutdown return(MV_Ok); } - printOSD("Uninitializing MultiVoc...\n"); + initprintf("Uninitializing MultiVoc...\n"); flags = DisableInterrupts(); diff --git a/polymer/eduke32/source/jaudiolib/sdlout.c b/polymer/eduke32/source/jaudiolib/sdlout.c index 111c0bae7..6aabba4a6 100644 --- a/polymer/eduke32/source/jaudiolib/sdlout.c +++ b/polymer/eduke32/source/jaudiolib/sdlout.c @@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "SDL.h" #include #include -#include "osd.h" #include "sdlayer.h" @@ -115,9 +114,9 @@ int SDLSOUND_Init(int soundcard, int mixrate, int numchannels, int samplebits, i SDLSOUND_Shutdown(); } - printOSD("Initializing SDL sound...\n"); + initprintf("Initializing SDL sound...\n"); - printOSD(" - Requested sound format\n" + initprintf(" - Requested sound format\n" " Channels: %d\n" " Sample rate: %dHz\n" " Sample size: %d bits\n", @@ -146,7 +145,7 @@ int SDLSOUND_Shutdown(void) { int i; - if (SDLSOUND_Installed) printOSD("Uninitializing SDL sound...\n"); + if (SDLSOUND_Installed) initprintf("Uninitializing SDL sound...\n"); SDLSOUND_Installed = FALSE; @@ -231,11 +230,11 @@ int DSOUND_StopPlayback(void) { SetEvent(isrfinish); - printOSD("DirectSound: Waiting for sound thread to exit\n"); + initprintf("DirectSound: Waiting for sound thread to exit\n"); if (WaitForSingleObject(isrthread, 300) == WAIT_OBJECT_0) - printOSD("DirectSound: Sound thread has exited\n"); + initprintf("DirectSound: Sound thread has exited\n"); else - printOSD("DirectSound: Sound thread failed to exit!\n"); + initprintf("DirectSound: Sound thread failed to exit!\n"); /* while (1) { if (!GetExitCodeThread(isrthread, &exitcode)) { diff --git a/polymer/eduke32/source/jaudiolib/unixvoc.c b/polymer/eduke32/source/jaudiolib/unixvoc.c index 041cc0d80..9fd41cf8d 100755 --- a/polymer/eduke32/source/jaudiolib/unixvoc.c +++ b/polymer/eduke32/source/jaudiolib/unixvoc.c @@ -2541,6 +2541,8 @@ int MV_Init(int soundcard, MV_Shutdown(); } + initprintf("Initializing MultiVoc...\n"); + MV_SetErrorCode(MV_Ok); MV_TotalMemory = Voices * sizeof(VoiceNode) + sizeof(HARSH_CLIP_TABLE_8); @@ -2557,6 +2559,8 @@ int MV_Init(int soundcard, // Set number of voices before calculating volume table MV_MaxVoices = Voices; + initprintf(" - Maximum voices: %d\n", MV_MaxVoices); + LL_Reset((VoiceNode *)&VoiceList, next, prev); LL_Reset((VoiceNode *)&VoicePool, next, prev); @@ -2565,6 +2569,8 @@ int MV_Init(int soundcard, LL_Add((VoiceNode *)&VoicePool, &MV_Voices[ index ], next, prev); } + initprintf(" - Using %d byte mixing buffers\n", MixBufferSize); + // Allocate mix buffer within 1st megabyte status = DPMI_GetDOSMemory((void **)&ptr, &MV_BufferDescriptor, 2 * TotalBufferSize); @@ -2669,6 +2675,8 @@ int MV_Shutdown(void) return(MV_Ok); } + initprintf("Uninitializing MultiVoc...\n"); + flags = DisableInterrupts(); MV_KillAllVoices();