Move the time routines into the system driver.

This simplifies the implementation of new drivers, and fixes the
oddities with doc generation.

First steps towards fixing #996.

Author: SiegeLordEx

include/allegro5/internal/aintern_system.h

@@ -48,6 +48,9 @@ struct ALLEGRO_SYSTEM_INTERFACE
    void (*close_library)(void *handle);
    void (*heartbeat)(void);
    void (*heartbeat_init)(void);
+   double (*get_time)(void);
+   void (*rest)(double seconds);
+   void (*init_timeout)(ALLEGRO_TIMEOUT *timeout, double seconds);
 };
 
 struct ALLEGRO_SYSTEM

include/allegro5/platform/aintunix.h

@@ -18,6 +18,7 @@
 #ifndef __al_included_allegro5_aintunix_h
 #define __al_included_allegro5_aintunix_h
 
+#include "allegro5/altime.h"
 #include "allegro5/path.h"
 #include "allegro5/internal/aintern_driver.h"
 
@@ -30,7 +31,10 @@
 extern "C" {
 #endif
 
-   AL_FUNC(ALLEGRO_PATH *, _al_unix_get_path, (int id));
+ALLEGRO_PATH *_al_unix_get_path(int id);
+double _al_unix_get_time(void);
+void _al_unix_rest(double seconds);
+void _al_unix_init_timeout(ALLEGRO_TIMEOUT *timeout, double seconds);
 
 
 #ifdef __cplusplus
@@ -60,7 +64,7 @@ extern "C" {
 #endif
 
 /* time */
-AL_FUNC(void, _al_unix_init_time, (void));
+void _al_unix_init_time(void);
 
 /* fdwatch */
 void _al_unix_start_watching_fd(int fd, void (*callback)(void *), void *cb_data);

include/allegro5/platform/aintwin.h

@@ -289,6 +289,11 @@ void _al_win_touch_input_handle_cancel(int id, size_t timestamp, float x, float
 AL_FUNC(const char*, _al_win_error, (DWORD));
 AL_FUNC(const char*, _al_win_last_error, (void));
 
+/* Time handling */
+double _al_win_get_time(void);
+void _al_win_rest(double seconds);
+void _al_win_init_timeout(ALLEGRO_TIMEOUT *timeout, double seconds);
+
 #ifdef __cplusplus
    }
 #endif

include/allegro5/platform/allegro_internal_sdl.h

@@ -1,5 +1,6 @@
 #include "SDL.h"
 
+#include "allegro5/altime.h"
 #include "allegro5/internal/aintern_display.h"
 #include "allegro5/internal/aintern_keyboard.h"
 #include "allegro5/internal/aintern_mouse.h"
@@ -46,3 +47,6 @@ float _al_sdl_get_display_pixel_ratio(ALLEGRO_DISPLAY *display);
 
 void _al_sdl_event_hack(void);
 
+double _al_sdl_get_time(void);
+void _al_sdl_rest(double seconds);
+void _al_sdl_init_timeout(ALLEGRO_TIMEOUT *timeout, double seconds);

src/android/android_system.c

@@ -545,6 +545,9 @@ ALLEGRO_SYSTEM_INTERFACE *_al_system_android_interface()
    android_vt->get_path = _al_android_get_path;
    android_vt->shutdown_system = android_shutdown_system;
    android_vt->inhibit_screensaver = android_inhibit_screensaver;
+   android_vt->get_time = _al_unix_get_time;
+   android_vt->rest = _al_unix_rest;
+   android_vt->init_timeout = _al_unix_init_timeout;
 
    return android_vt;
 }

src/gp2xwiz/wiz_system.c

@@ -156,6 +156,9 @@ ALLEGRO_SYSTEM_INTERFACE *_al_system_gp2xwiz_driver(void)
    gp2xwiz_vt->get_path = _al_unix_get_path;
    gp2xwiz_vt->inhibit_screensaver = gp2xwiz_inhibit_screensaver;
    gp2xwiz_vt->get_num_display_formats = gp2xwiz_get_num_display_formats;
+   gp2xwiz_vt->get_time = _al_unix_get_time;
+   gp2xwiz_vt->rest = _al_unix_rest;
+   gp2xwiz_vt->init_timeout = _al_unix_init_timeout;
 
    return gp2xwiz_vt;
 }

src/macosx/system.m

@@ -542,6 +542,9 @@ static void osx_thread_exit(ALLEGRO_THREAD *thread)
       vt->inhibit_screensaver = osx_inhibit_screensaver;
       vt->thread_init = osx_thread_init;
       vt->thread_exit = osx_thread_exit;
+      vt->get_time = _al_unix_get_time;
+      vt->rest = _al_unix_rest;
+      vt->init_timeout = _al_unix_init_timeout;
 
    };
 

src/raspberrypi/pisystem.c

@@ -195,6 +195,9 @@ ALLEGRO_SYSTEM_INTERFACE *_al_system_raspberrypi_driver(void)
    pi_vt->get_cursor_position = pi_get_cursor_position;
    pi_vt->get_path = _al_unix_get_path;
    pi_vt->inhibit_screensaver = pi_inhibit_screensaver;
+   pi_vt->get_time = _al_unix_get_time;
+   pi_vt->rest = _al_unix_rest;
+   pi_vt->init_timeout = _al_unix_init_timeout;
 
    return pi_vt;
 }

src/sdl/sdl_system.c

@@ -342,6 +342,9 @@ ALLEGRO_SYSTEM_INTERFACE *_al_sdl_system_driver(void)
    vt->close_library = sdl_close_library;*/
    vt->heartbeat = sdl_heartbeat;
    vt->heartbeat_init = sdl_heartbeat_init;
+   vt->get_time = _al_sdl_get_time;
+   vt->rest = _al_sdl_rest;
+   vt->init_timeout = _al_sdl_init_timeout;
 
    return vt;
 }

src/sdl/sdl_time.c

@@ -20,21 +20,21 @@
 
 ALLEGRO_DEBUG_CHANNEL("SDL")
 
-double al_get_time(void)
+double _al_sdl_get_time(void)
 {
    return 1.0 * SDL_GetPerformanceCounter() / SDL_GetPerformanceFrequency();
 }
 
 
 
-void al_rest(double seconds)
+void _al_sdl_rest(double seconds)
 {
    SDL_Delay(seconds * 1000);
 }
 
 
 
-void al_init_timeout(ALLEGRO_TIMEOUT *timeout, double seconds)
+void _al_sdl_init_timeout(ALLEGRO_TIMEOUT *timeout, double seconds)
 {
    ALLEGRO_TIMEOUT_SDL *timeout_sdl = (void *)timeout;
    timeout_sdl->ms = seconds * 1000;