Fixed OpenAL

git-svn-id: https://svn.eduke32.com/eduke32@1008 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hnt_ts 2008-08-23 17:02:52 +00:00
parent 0e3ee1289d
commit b7760a5674
4 changed files with 9 additions and 5 deletions

View file

@ -54,8 +54,8 @@ extern int getversionfromwebsite(char *buffer);
#define UPDATEINTERVAL 604800 // 1w #define UPDATEINTERVAL 604800 // 1w
#else #else
static int usecwd = 0; static int usecwd = 0;
int checkCON = 1;
#endif /* _WIN32 */ #endif /* _WIN32 */
int checkCON = 1;
#define IDFSIZE 479985668 #define IDFSIZE 479985668
#define IDFILENAME "DUKE3D.IDF" #define IDFILENAME "DUKE3D.IDF"

View file

@ -33,6 +33,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "dsound.h" #include "dsound.h"
#ifdef USE_OPENAL
#include "openal.h"
#endif
#include "compat.h" #include "compat.h"
#include "winlayer.h" #include "winlayer.h"
@ -424,6 +427,9 @@ static DWORD WINAPI isr(LPVOID parm)
while (1) while (1)
{ {
#ifdef USE_OPENAL
AL_Update();
#endif
rv = WaitForMultipleObjects(1+_DSOUND_NumBuffers, handles, FALSE, INFINITE); rv = WaitForMultipleObjects(1+_DSOUND_NumBuffers, handles, FALSE, INFINITE);
if (!(rv >= WAIT_OBJECT_0 && rv <= WAIT_OBJECT_0+1+_DSOUND_NumBuffers)) return -1; if (!(rv >= WAIT_OBJECT_0 && rv <= WAIT_OBJECT_0+1+_DSOUND_NumBuffers)) return -1;

View file

@ -630,8 +630,5 @@ void MUSIC_RegisterTimbreBank
void MUSIC_Update(void) void MUSIC_Update(void)
{ {
MIDI_UpdateMusic(); MIDI_UpdateMusic();
#ifdef USE_OPENAL
AL_Update();
#endif
} }

View file

@ -345,11 +345,13 @@ int AL_Init()
return 0; return 0;
} }
void AL_Stop();
void AL_Shutdown() void AL_Shutdown()
{ {
if (openal_disabled)return; if (openal_disabled)return;
initprintf("Uninitializing OpenAL...\n"); initprintf("Uninitializing OpenAL...\n");
AL_Stop();
ALdoing="Shut"; ALdoing="Shut";
balcMakeContextCurrent(NULL); balcMakeContextCurrent(NULL);
check(1); check(1);
@ -364,7 +366,6 @@ int AL_MusicVolume;
extern int Musicsize; extern int Musicsize;
void AL_Stop();
int update(); int update();
int stream(ALuint buffer); int stream(ALuint buffer);
void open1(char *ptr,int sizef,char loop); void open1(char *ptr,int sizef,char loop);