Removed SDL_INIT_TIMER

This is no longer necessary before calling SDL_AddTimer()
This commit is contained in:
Sam Lantinga
2024-09-16 22:57:42 -07:00
parent 9275c533ca
commit f3e419596b
10 changed files with 6 additions and 52 deletions

View File

@@ -22,13 +22,6 @@ static int g_timerCallbackCalled = 0;
static void SDLCALL timerSetUp(void **arg)
{
/* Start SDL timer subsystem */
SDL_bool ret = SDL_InitSubSystem(SDL_INIT_TIMER);
SDLTest_AssertPass("Call to SDL_InitSubSystem(SDL_INIT_TIMER)");
SDLTest_AssertCheck(ret == SDL_TRUE, "Check result from SDL_InitSubSystem(SDL_INIT_TIMER)");
if (!ret) {
SDLTest_LogError("%s", SDL_GetError());
}
}
/* Test case functions */

View File

@@ -79,7 +79,7 @@ int main(int argc, char **argv)
}
/* Initialize the force feedbackness */
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC);
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC);
haptics = SDL_GetHaptics(&num_haptics);
SDL_Log("%d Haptic devices detected.\n", num_haptics);
for (i = 0; i < num_haptics; ++i) {

View File

@@ -82,7 +82,7 @@ int main(int argc, char **argv)
}
/* Initialize the force feedbackness */
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC);
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC);
haptics = SDL_GetHaptics(&num_haptics);
SDL_Log("%d Haptic devices detected.\n", num_haptics);
if (num_haptics == 0) {

View File

@@ -116,11 +116,6 @@ int main(int argc, char *argv[])
i += consumed;
}
if (!SDL_Init(SDL_INIT_TIMER)) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return 1;
}
if (SDL_GetEnvironmentVariable(SDL_GetEnvironment(), "SDL_TESTS_QUICK") != NULL) {
SDL_Log("Not running slower tests");
SDL_Quit();