Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 854567 | Differences between
and this patch

Collapse All | Expand All

(-)a/Engine/Base/Timer.cpp (-6 / +6 lines)
Lines 359-365 Link Here
359
  CTimer_TimerFunc_internal();
359
  CTimer_TimerFunc_internal();
360
}
360
}
361
#elif (defined PLATFORM_UNIX)
361
#elif (defined PLATFORM_UNIX)
362
/*
362
363
#include "SDL.h"
363
#include "SDL.h"
364
Uint32 CTimer_TimerFunc_SDL(Uint32 interval, void* param)
364
Uint32 CTimer_TimerFunc_SDL(Uint32 interval, void* param)
365
{
365
{
Lines 370-376 Link Here
370
  CTimer_TimerFunc_internal();
370
  CTimer_TimerFunc_internal();
371
  return(interval);
371
  return(interval);
372
}
372
}
373
*/
373
/*
374
void *CTimer_TimerMain(void *input) {
374
void *CTimer_TimerMain(void *input) {
375
  while(true) {
375
  while(true) {
376
    // sleep
376
    // sleep
Lines 387-393 Link Here
387
    // handle all timers
387
    // handle all timers
388
    CTimer_TimerFunc_internal();
388
    CTimer_TimerFunc_internal();
389
  }
389
  }
390
}
390
}*/
391
391
392
#endif
392
#endif
393
#endif
393
#endif
Lines 570-576 Link Here
570
    if( tm_TimerID==NULL) FatalError(TRANS("Cannot initialize multimedia timer!"));
570
    if( tm_TimerID==NULL) FatalError(TRANS("Cannot initialize multimedia timer!"));
571
571
572
   #else
572
   #else
573
/*
573
574
    if (SDL_Init(SDL_INIT_TIMER) == -1) FatalError(TRANS("Cannot initialize multimedia timer!"));
574
    if (SDL_Init(SDL_INIT_TIMER) == -1) FatalError(TRANS("Cannot initialize multimedia timer!"));
575
    tm_TimerID = SDL_AddTimer(ULONG(TickQuantum*1000.0f), CTimer_TimerFunc_SDL, NULL);
575
    tm_TimerID = SDL_AddTimer(ULONG(TickQuantum*1000.0f), CTimer_TimerFunc_SDL, NULL);
576
    if( tm_TimerID==NULL) FatalError(TRANS("Cannot initialize multimedia timer!"));
576
    if( tm_TimerID==NULL) FatalError(TRANS("Cannot initialize multimedia timer!"));
Lines 589-595 Link Here
589
    // report fatal
589
    // report fatal
590
    if( iTry>3) FatalError(TRANS("Problem with initializing multimedia timer - please try again."));
590
    if( iTry>3) FatalError(TRANS("Problem with initializing multimedia timer - please try again."));
591
  }
591
  }
592
*/
592
/*
593
    int ret = pthread_create(&g_timerMainThread, 0, &CTimer_TimerMain, nullptr);
593
    int ret = pthread_create(&g_timerMainThread, 0, &CTimer_TimerMain, nullptr);
594
    if (ret != 0) {
594
    if (ret != 0) {
595
      const char *err;
595
      const char *err;
Lines 611-617 Link Here
611
    if (iTry > 3) {
611
    if (iTry > 3) {
612
      FatalError(TRANS("Problem with initializing multimedia timer - please try again."));
612
      FatalError(TRANS("Problem with initializing multimedia timer - please try again."));
613
    }
613
    }
614
  }
614
  }*/
615
#endif  // !defined SINGLE_THREADED
615
#endif  // !defined SINGLE_THREADED
616
}
616
}
617
617

Return to bug 854567