shithub: duke3d

Info  •  Files  •  Log  •  Branches

sound fixes for npe sdl_mixer refactor

--- a/Game/src/audiolib/_multivc.h

+++ b/Game/src/audiolib/_multivc.h

@@ -90,7 +90,9 @@

    KeepPlaying

    } playbackstatus;

+#pragma pack on

+

 typedef struct VoiceNode

    {

    struct VoiceNode *next;

@@ -201,6 +203,8 @@

 typedef MONO8  VOLUME8[ 256 ];

 typedef MONO16 VOLUME16[ 256 ];

+

+#pragma pack off

 // typedef uint8_t HARSH_CLIP_TABLE_8[ MV_NumVoices * 256 ];

--- a/Game/src/audiolib/dsl.c

+++ b/Game/src/audiolib/dsl.c

@@ -168,7 +168,7 @@

 	if (chunksize % blah) chunksize += blah - (chunksize % blah);

-	if (Mix_OpenAudio(SampleRate, format, channels, chunksize) < 0) {

+	if (Mix_OpenAudio(SampleRate, format, channels, _BufferSize) < 0) {

         printf("Mix_OpenAudio: failed to open audio: %s\n", Mix_GetError());

 		DSL_SetErrorCode(DSL_MixerInitFailure);

--- a/Game/src/game.c

+++ b/Game/src/game.c

@@ -8085,6 +8085,8 @@

 	uint8_t  kbdKey;

 	uint8_t  *exe;

+	Mix_Init(1);

+

 	//printf(	"This is a debug version 19.7.1 only Based on 19.7\n"

 	//		"Fully compliant with v19.7. Added the following:\n\n"