mirror/anarch
1
0
Fork 0
mirror of https://gitlab.com/drummyfish/anarch.git synced 2024-12-21 23:08:49 -05:00
Code Issues Projects Releases Wiki Activity

Fix emscripten sound

Browse Source
This commit is contained in:
Miloslav Číž 2020-09-26 00:59:03 +02:00
parent 927666145a
commit d551a8495a
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main_sdl.c
View File

@ -40,7 +40,13 @@
#define MUSIC_VOLUME 4 #define MUSIC_VOLUME 4
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
#define SFG_FPS 30
#define SFG_SCREEN_RESOLUTION_X 640
#define SFG_SCREEN_RESOLUTION_Y 480
#define SFG_CAN_EXIT 0 #define SFG_CAN_EXIT 0
#define SFG_RESOLUTION_SCALEDOWN 2
#include <emscripten.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -229,6 +235,13 @@ void mainLoopIteration()
{ {
SDL_Event event; SDL_Event event;
#ifdef __EMSCRIPTEN__
// Hack, without it sound won't work because of shitty browser audio policies.
if (SFG_game.frame % 512 == 0)
SDL_PauseAudio(0);
#endif
while (SDL_PollEvent(&event)) // also automatically updates sdlKeyboardState while (SDL_PollEvent(&event)) // also automatically updates sdlKeyboardState
{ {
if(event.type == SDL_MOUSEWHEEL) if(event.type == SDL_MOUSEWHEEL)
@ -336,10 +349,10 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
puts("SDL: starting");
puts("SDL: initializing SDL"); puts("SDL: initializing SDL");
SFG_init();
window = window =
SDL_CreateWindow("raycasting", SDL_WINDOWPOS_UNDEFINED, SDL_CreateWindow("raycasting", SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, SFG_SCREEN_RESOLUTION_X, SFG_SCREEN_RESOLUTION_Y, SDL_WINDOWPOS_UNDEFINED, SFG_SCREEN_RESOLUTION_X, SFG_SCREEN_RESOLUTION_Y,
@ -367,21 +380,18 @@ int main(int argc, char *argv[])
SDL_ShowCursor(0); SDL_ShowCursor(0);
SFG_init();
SDL_Init(SDL_INIT_AUDIO); SDL_Init(SDL_INIT_AUDIO);
SDL_AudioSpec audioSpec, audioSpec2; SDL_AudioSpec audioSpec;
SDL_memset(&audioSpec, 0, sizeof(audioSpec)); SDL_memset(&audioSpec, 0, sizeof(audioSpec));
audioSpec.callback = audioFillCallback; audioSpec.callback = audioFillCallback;
audioSpec.userdata = 0;
audioSpec.freq = 8000; audioSpec.freq = 8000;
audioSpec.format = AUDIO_U16; audioSpec.format = AUDIO_U16;
audioSpec.channels = 1; audioSpec.channels = 1;
audioSpec.samples = 128; audioSpec.samples = 1024;
if (SDL_OpenAudio(&audioSpec,&audioSpec2) < 0) if (SDL_OpenAudio(&audioSpec,NULL) < 0)
puts("SDL: could not initialize audio"); puts("SDL: could not initialize audio");
for (int16_t i = 0; i < SFG_SFX_SAMPLE_COUNT; ++i) for (int16_t i = 0; i < SFG_SFX_SAMPLE_COUNT; ++i)