SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.

This commit is contained in:
Sam Lantinga
2006-07-10 21:04:37 +00:00
parent 8f3655506a
commit 6bc598ea61
686 changed files with 117556 additions and 98661 deletions

View File

@@ -26,19 +26,22 @@
#include "SDL_timer.h"
#include "../SDL_timer_c.h"
void SDL_StartTicks(void)
void
SDL_StartTicks(void)
{
}
Uint32 SDL_GetTicks (void)
Uint32
SDL_GetTicks(void)
{
SDL_Unsupported();
return 0;
SDL_Unsupported();
return 0;
}
void SDL_Delay (Uint32 ms)
void
SDL_Delay(Uint32 ms)
{
SDL_Unsupported();
SDL_Unsupported();
}
#include "SDL_thread.h"
@@ -47,45 +50,51 @@ void SDL_Delay (Uint32 ms)
static int timer_alive = 0;
static SDL_Thread *timer = NULL;
static int RunTimer(void *unused)
static int
RunTimer(void *unused)
{
while ( timer_alive ) {
if ( SDL_timer_running ) {
SDL_ThreadedTimerCheck();
}
SDL_Delay(1);
}
return(0);
while (timer_alive) {
if (SDL_timer_running) {
SDL_ThreadedTimerCheck();
}
SDL_Delay(1);
}
return (0);
}
/* This is only called if the event thread is not running */
int SDL_SYS_TimerInit(void)
int
SDL_SYS_TimerInit(void)
{
timer_alive = 1;
timer = SDL_CreateThread(RunTimer, NULL);
if ( timer == NULL )
return(-1);
return(SDL_SetTimerThreaded(1));
timer_alive = 1;
timer = SDL_CreateThread(RunTimer, NULL);
if (timer == NULL)
return (-1);
return (SDL_SetTimerThreaded(1));
}
void SDL_SYS_TimerQuit(void)
void
SDL_SYS_TimerQuit(void)
{
timer_alive = 0;
if ( timer ) {
SDL_WaitThread(timer, NULL);
timer = NULL;
}
timer_alive = 0;
if (timer) {
SDL_WaitThread(timer, NULL);
timer = NULL;
}
}
int SDL_SYS_StartTimer(void)
int
SDL_SYS_StartTimer(void)
{
SDL_SetError("Internal logic error: threaded timer in use");
return(-1);
SDL_SetError("Internal logic error: threaded timer in use");
return (-1);
}
void SDL_SYS_StopTimer(void)
void
SDL_SYS_StopTimer(void)
{
return;
return;
}
#endif /* SDL_TIMER_DUMMY || SDL_TIMERS_DISABLED */
/* vi: set ts=4 sw=4 expandtab: */