store the timezone bias in a static, so we don't call GetTimeZoneInfo…

…rmation() on each conversion (it's slow)
opdenkamp · Oct 4, 2012 · 6801b9f · 6801b9f
1 parent 35d401b
commit 6801b9f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 40 deletions.
diff --git a/xbmc/XBDateTime.cpp b/xbmc/XBDateTime.cpp
@@ -282,22 +282,8 @@ CDateTime CDateTime::GetCurrentDateTime()
 
 CDateTime CDateTime::GetUTCDateTime()
 {
-  TIME_ZONE_INFORMATION tz;
-
   CDateTime time(GetCurrentDateTime());
-  switch(GetTimeZoneInformation(&tz))
+  time += GetTimezoneBias();
-  {
-    case TIME_ZONE_ID_DAYLIGHT:
-        time += CDateTimeSpan(0, 0, tz.Bias + tz.DaylightBias, 0);
-        break;
-    case TIME_ZONE_ID_STANDARD:
-        time += CDateTimeSpan(0, 0, tz.Bias + tz.StandardBias, 0);
-        break;
-    case TIME_ZONE_ID_UNKNOWN:
-        time += CDateTimeSpan(0, 0, tz.Bias, 0);
-        break;
-  }
-
   return time;
 }
 
@@ -879,24 +865,37 @@ CStdString CDateTime::GetAsSaveString() const
 
 void CDateTime::SetFromUTCDateTime(const CDateTime &dateTime)
 {
-  TIME_ZONE_INFORMATION tz;
   CDateTime tmp(dateTime);
+  tmp -= GetTimezoneBias();
+
+  m_time = tmp.m_time;
+  m_state = tmp.m_state;
+}
+
+CDateTimeSpan CDateTime::GetTimezoneBias(void)
+{
+  static bool bGotTimezoneBias = false;
+  static CDateTimeSpan timezoneBias;
 
-  switch(GetTimeZoneInformation(&tz))
+  if (!bGotTimezoneBias)
   {
-    case TIME_ZONE_ID_DAYLIGHT:
+    bGotTimezoneBias = true;
-        tmp -= CDateTimeSpan(0, 0, tz.Bias + tz.DaylightBias, 0);
+    TIME_ZONE_INFORMATION tz;
+    switch(GetTimeZoneInformation(&tz))
+    {
+      case TIME_ZONE_ID_DAYLIGHT:
+        timezoneBias = CDateTimeSpan(0, 0, tz.Bias + tz.DaylightBias, 0);
         break;
-    case TIME_ZONE_ID_STANDARD:
+      case TIME_ZONE_ID_STANDARD:
-        tmp -= CDateTimeSpan(0, 0, tz.Bias + tz.StandardBias, 0);
+        timezoneBias = CDateTimeSpan(0, 0, tz.Bias + tz.StandardBias, 0);
         break;
-    case TIME_ZONE_ID_UNKNOWN:
+      case TIME_ZONE_ID_UNKNOWN:
-        tmp -= CDateTimeSpan(0, 0, tz.Bias, 0);
+        timezoneBias = CDateTimeSpan(0, 0, tz.Bias, 0);
         break;
+    }
   }
 
-  m_time = tmp.m_time;
+  return timezoneBias;
-  m_state = tmp.m_state;
 }
 
 void CDateTime::SetFromUTCDateTime(const time_t &dateTime)
@@ -1328,22 +1327,8 @@ CStdString CDateTime::GetAsLocalizedDateTime(bool longDate/*=false*/, bool withS
 
 CDateTime CDateTime::GetAsUTCDateTime() const
 {
-  TIME_ZONE_INFORMATION tz;
-
   CDateTime time(m_time);
-  switch(GetTimeZoneInformation(&tz))
+  time += GetTimezoneBias();
-  {
-    case TIME_ZONE_ID_DAYLIGHT:
-        time += CDateTimeSpan(0, 0, tz.Bias + tz.DaylightBias, 0);
-        break;
-    case TIME_ZONE_ID_STANDARD:
-        time += CDateTimeSpan(0, 0, tz.Bias + tz.StandardBias, 0);
-        break;
-    case TIME_ZONE_ID_UNKNOWN:
-        time += CDateTimeSpan(0, 0, tz.Bias, 0);
-        break;
-  }
-
   return time;
 }
 

diff --git a/xbmc/XBDateTime.h b/xbmc/XBDateTime.h
@@ -196,6 +196,8 @@ class CDateTime : public IArchivable
   void SetValid(bool yesNo);
   bool IsValid() const;
 
+  static CDateTimeSpan GetTimezoneBias(void);
+
 private:
   bool ToFileTime(const SYSTEMTIME& time, FILETIME& fileTime) const;
   bool ToFileTime(const time_t& time, FILETIME& fileTime) const;