Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-25 09:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compile errors in example programs.

Browse Source
This commit is contained in:
Philipp Wiesemann 2014-12-25 21:42:56 +01:00
parent e8467cbca9
commit 97e876671b
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/testgamecontroller.c
View File

@ -214,7 +214,7 @@ WatchGameController(SDL_GameController * gamecontroller)
emscripten_set_main_loop_arg(loop, gamecontroller, 0, 1); emscripten_set_main_loop_arg(loop, gamecontroller, 0, 1);
#else #else
while (!done) { while (!done) {
loop(gamecontroler); loop(gamecontroller);
} }
#endif #endif

12
test/testgesture.c
View File

@ -269,6 +269,9 @@ void loop()
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
window = NULL;
screen = NULL;
quitting = SDL_FALSE;
/* Enable standard application logging */ /* Enable standard application logging */
SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
@ -279,13 +282,8 @@ int main(int argc, char* argv[])
if (SDL_Init(SDL_INIT_VIDEO) < 0 ) return 1; if (SDL_Init(SDL_INIT_VIDEO) < 0 ) return 1;
if (!(screen = initScreen(WIDTH,HEIGHT))) if (!(window = initWindow(window, WIDTH, HEIGHT)) ||
{ !(screen = SDL_GetWindowSurface(window)))
SDL_Quit();
return 1;
}
if (!(window = initWindow(NULL,WIDTH,HEIGHT)))
{ {
SDL_Quit(); SDL_Quit();
return 1; return 1;

13
test/testmultiaudio.c
View File

@ -54,7 +54,9 @@ void
loop() loop()
{ {
if(cbd[0].done) { if(cbd[0].done) {
#ifdef __EMSCRIPTEN__
emscripten_cancel_main_loop(); emscripten_cancel_main_loop();
#endif
SDL_PauseAudioDevice(cbd[0].dev, 1); SDL_PauseAudioDevice(cbd[0].dev, 1);
SDL_CloseAudioDevice(cbd[0].dev); SDL_CloseAudioDevice(cbd[0].dev);
SDL_FreeWAV(sound); SDL_FreeWAV(sound);
@ -145,6 +147,17 @@ test_multi_audio(int devcount)
SDL_Delay(100); SDL_Delay(100);
} }
#ifndef __EMSCRIPTEN__
for (i = 0; i < devcount; i++) {
if (cbd[i].dev) {
SDL_PauseAudioDevice(cbd[i].dev, 1);
SDL_CloseAudioDevice(cbd[i].dev);
}
}
SDL_Log("All done!\n");
#endif
} }