From 6e623fe6fc493cf33e767e9f3900497d58d690c5 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Mon, 4 Aug 2003 11:20:40 +0000 Subject: [PATCH] Update the QuickTime movies each time through the game loop. --- .../src/arch/ArchHooks/ArchHooks_darwin.cpp | 31 +------------------ .../src/arch/ArchHooks/ArchHooks_darwin.h | 7 ++--- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp index b6c29f6c34..a5108d8d85 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp +++ b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp @@ -13,10 +13,9 @@ #include "RageLog.h" #include "archutils/Darwin/Crash.h" #include "archutils/Unix/CrashHandler.h" +#include "archutils/Unix/SignalHandler.h" #include -#if 1 #include -#endif /* You would think that these would be defined somewhere. */ enum { @@ -25,10 +24,6 @@ enum { }; OSStatus HandleException(ExceptionInformation *theException); -#if 0 -static int TaskMovies(void *data); -static bool shutdown; -#endif ArchHooks_darwin::ArchHooks_darwin() { @@ -49,16 +44,6 @@ ArchHooks_darwin::ArchHooks_darwin() exit(0); } InstallExceptionHandler(HandleException); -#if 0 - thread = SDL_CreateThread(TaskMovies, NULL); -#endif -} - -ArchHooks_darwin::~ArchHooks_darwin() { -#if 0 - shutdown = true; - SDL_WaitThread(thread, NULL); -#endif } #define CASE_GESTALT_M(str,code,result) case gestalt##code: str = result; break @@ -299,19 +284,6 @@ ArchHooks::MessageBoxResult ArchHooks_darwin::MessageBoxAbortRetryIgnore(CString return result; } -#if 0 -int TaskMovies(void *data) { -#pragma unused(data) - while (!shutdown) { - MoviesTask(NULL, 0); /* Task all movies one frame */ - OSErr err = GetMoviesError(); - if (err != noErr) - RageException::Throw("MoviesTask failed with error: %d", err); - } - return 0; -} -#endif -#if 0 inline void ArchHooks_darwin::Update(float delta) { #pragma unused(delta) MoviesTask(NULL, 0); @@ -319,4 +291,3 @@ inline void ArchHooks_darwin::Update(float delta) { if (__builtin_expect(err, noErr)) RageException::Throw("MoviesTask failed with error: %d", err); } -#endif diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h index edd5dea5ce..7ec8f37139 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h @@ -15,16 +15,13 @@ #include class ArchHooks_darwin : public ArchHooks { -private: -#if 0 - SDL_Thread *thread; -#endif public: ArchHooks_darwin(); - ~ArchHooks_darwin(); + ~ArchHooks_darwin() { } void DumpDebugInfo(); void MessageBoxOK(CString sMessage, CString ID = ""); MessageBoxResult MessageBoxAbortRetryIgnore(CString sMessage, CString ID = ""); + void Update(float delta); }; #undef ARCH_HOOKS