Changes in emu/sdl.c [7cc6ac0:caff491] in buchla-emu

File:

• emu/sdl.c (modified) (3 diffs)

emu/sdl.c

@@ -18 +18 @@
 #include <all.h>
 
-int32_t sdl_verbose = 0;
+int32_t sdl_verbose = false;
 
 #define ver(...) _ver(sdl_verbose, 0, __VA_ARGS__)
 #define ver2(...) _ver(sdl_verbose, 1, __VA_ARGS__)
 #define ver3(...) _ver(sdl_verbose, 2, __VA_ARGS__)
-
-typedef void (*sdl_func_t)(void);
-
-static sdl_func_t sdl_funcs[] = {
-        ser_sdl
-};
 
 void sdl_init(void)
@@ -38 +32 @@
 
         SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_VERBOSE);
-
-        if (SDLNet_Init() < 0) {
-                fail("SDLNet_Init() failed: %s", SDLNet_GetError());
-        }
 
         if (TTF_Init() < 0) {
@@ -54 +44 @@
 {
         TTF_Quit();
-        SDLNet_Quit();
         SDL_Quit();
 }
-
-void sdl_loop(void)
-{
-        inf("entering SDL loop");
-
-#if defined EMU_LINUX
-        SDL_Scancode down = SDL_SCANCODE_UNKNOWN;
-#endif
-
-        while (SDL_AtomicGet(&run) != 0) {
-                for (int32_t i = 0; i < ARRAY_COUNT(sdl_funcs); ++i) {
-                        sdl_funcs[i]();
-                }
-
-                SDL_Event ev;
-
-                while (SDL_PollEvent(&ev) > 0) {
-#if defined EMU_LINUX
-                        // Work around duplicate key-down events on Linux.
-
-                        if (ev.type == SDL_KEYDOWN) {
-                                if (down == ev.key.keysym.scancode) {
-                                        continue;
-                                }
-
-                                down = ev.key.keysym.scancode;
-                        }
-                        else if (ev.type == SDL_KEYUP) {
-                                down = SDL_SCANCODE_UNKNOWN;
-                        }
-#endif
-
-                        if (ev.type == SDL_QUIT ||
-                                        (ev.type == SDL_KEYDOWN && ev.key.keysym.sym == SDLK_ESCAPE)) {
-                                ver("quit");
-                                SDL_AtomicSet(&run, 0);
-                                continue;
-                        }
-
-                        if (ev.type == SDL_TEXTINPUT) {
-                                ser_text(&ev.text);
-                                continue;
-                        }
-
-                        if (ev.type == SDL_KEYDOWN) {
-                                ser_key(&ev.key);
-                                continue;
-                        }
-
-                        SDL_Delay(50);
-                }
-        }
-
-        inf("leaving SDL loop");
-}