mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Reformat all the things. Have fun with merge conflicts.
This commit is contained in:
@ -12,40 +12,41 @@ namespace Common
|
||||
class Timer
|
||||
{
|
||||
public:
|
||||
Timer();
|
||||
Timer();
|
||||
|
||||
void Start();
|
||||
void Stop();
|
||||
void Update();
|
||||
void Start();
|
||||
void Stop();
|
||||
void Update();
|
||||
|
||||
// The time difference is always returned in milliseconds, regardless of alternative internal representation
|
||||
u64 GetTimeDifference();
|
||||
void AddTimeDifference();
|
||||
// The time difference is always returned in milliseconds, regardless of alternative internal
|
||||
// representation
|
||||
u64 GetTimeDifference();
|
||||
void AddTimeDifference();
|
||||
|
||||
static void IncreaseResolution();
|
||||
static void RestoreResolution();
|
||||
static u64 GetTimeSinceJan1970();
|
||||
static u64 GetLocalTimeSinceJan1970();
|
||||
// Returns a timestamp with decimals for precise time comparisons
|
||||
static double GetDoubleTime();
|
||||
static void IncreaseResolution();
|
||||
static void RestoreResolution();
|
||||
static u64 GetTimeSinceJan1970();
|
||||
static u64 GetLocalTimeSinceJan1970();
|
||||
// Returns a timestamp with decimals for precise time comparisons
|
||||
static double GetDoubleTime();
|
||||
|
||||
static std::string GetTimeFormatted();
|
||||
// Formats a timestamp from GetDoubleTime() into a date and time string
|
||||
static std::string GetDateTimeFormatted(double time);
|
||||
std::string GetTimeElapsedFormatted() const;
|
||||
u64 GetTimeElapsed();
|
||||
static std::string GetTimeFormatted();
|
||||
// Formats a timestamp from GetDoubleTime() into a date and time string
|
||||
static std::string GetDateTimeFormatted(double time);
|
||||
std::string GetTimeElapsedFormatted() const;
|
||||
u64 GetTimeElapsed();
|
||||
|
||||
static u32 GetTimeMs();
|
||||
static u64 GetTimeUs();
|
||||
static u32 GetTimeMs();
|
||||
static u64 GetTimeUs();
|
||||
|
||||
// Arbitrarily chosen value (38 years) that is subtracted in GetDoubleTime()
|
||||
// to increase sub-second precision of the resulting double timestamp
|
||||
static const int DOUBLE_TIME_OFFSET = (38 * 365 * 24 * 60 * 60);
|
||||
// Arbitrarily chosen value (38 years) that is subtracted in GetDoubleTime()
|
||||
// to increase sub-second precision of the resulting double timestamp
|
||||
static const int DOUBLE_TIME_OFFSET = (38 * 365 * 24 * 60 * 60);
|
||||
|
||||
private:
|
||||
u64 m_LastTime;
|
||||
u64 m_StartTime;
|
||||
bool m_Running;
|
||||
u64 m_LastTime;
|
||||
u64 m_StartTime;
|
||||
bool m_Running;
|
||||
};
|
||||
|
||||
} // Namespace Common
|
||||
} // Namespace Common
|
||||
|
Reference in New Issue
Block a user