fix Timer::GetTimeFormatted
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2659 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
7178c8d686
commit
34e8b88c8c
|
@ -193,12 +193,20 @@ u64 Timer::GetLocalTimeSinceJan1970()
|
||||||
// Return the current time formatted as Minutes:Seconds:Milliseconds in the form 00:00:000
|
// Return the current time formatted as Minutes:Seconds:Milliseconds in the form 00:00:000
|
||||||
std::string Timer::GetTimeFormatted()
|
std::string Timer::GetTimeFormatted()
|
||||||
{
|
{
|
||||||
|
time_t sysTime;
|
||||||
|
struct tm * gmTime;
|
||||||
|
char formattedTime[13];
|
||||||
|
|
||||||
|
time(&sysTime);
|
||||||
|
gmTime = localtime(&sysTime);
|
||||||
|
strftime(formattedTime, 6, "%M:%S", gmTime);
|
||||||
|
|
||||||
|
// Now tack on the milliseconds
|
||||||
struct timeb tp;
|
struct timeb tp;
|
||||||
(void)::ftime(&tp);
|
(void)::ftime(&tp);
|
||||||
char temp[32];
|
sprintf(formattedTime, "%s:%03i", formattedTime, tp.millitm);
|
||||||
sprintf(temp, "%02ld:%02ld:%03i", tp.time/60, tp.time%60, tp.millitm);
|
|
||||||
|
|
||||||
return std::string(temp);
|
return std::string(formattedTime);
|
||||||
}
|
}
|
||||||
/////////////////////////////////////
|
/////////////////////////////////////
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue