aboutsummaryrefslogtreecommitdiff
path: root/guilib/GUIFadeLabelControl.cpp
diff options
context:
space:
mode:
authorjmarshallnz <jmarshallnz@svn>2009-09-23 10:03:22 +0000
committerjmarshallnz <jmarshallnz@svn>2009-09-23 10:03:22 +0000
commitc3018c6090df3c4cf3c5a96cc2310f931ef8f37f (patch)
treee22747627d63a591f15d9f87e15aa08cde10a563 /guilib/GUIFadeLabelControl.cpp
parent59629d6966e46a99fc8e41a05f5e460d984997a4 (diff)
changed: DWORD -> unsigned int for frame-based timings, and moved to using CTimeUtils::Update/GetFrameTime() for UI timing.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23109 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIFadeLabelControl.cpp')
-rw-r--r--guilib/GUIFadeLabelControl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/guilib/GUIFadeLabelControl.cpp b/guilib/GUIFadeLabelControl.cpp
index 195740434e..a51733bd0d 100644
--- a/guilib/GUIFadeLabelControl.cpp
+++ b/guilib/GUIFadeLabelControl.cpp
@@ -24,7 +24,7 @@
using namespace std;
-CGUIFadeLabelControl::CGUIFadeLabelControl(int parentID, int controlID, float posX, float posY, float width, float height, const CLabelInfo& labelInfo, bool scrollOut, int scrollSpeed, DWORD timeToDelayAtEnd, bool resetOnLabelChange)
+CGUIFadeLabelControl::CGUIFadeLabelControl(int parentID, int controlID, float posX, float posY, float width, float height, const CLabelInfo& labelInfo, bool scrollOut, int scrollSpeed, unsigned int timeToDelayAtEnd, bool resetOnLabelChange)
: CGUIControl(parentID, controlID, posX, posY, width, height), m_scrollInfo(50, labelInfo.offsetX, scrollSpeed)
, m_textLayout(labelInfo.font, false)
{
@@ -76,7 +76,7 @@ void CGUIFadeLabelControl::AddLabel(const string &label)
m_infoLabels.push_back(CGUIInfoLabel(label));
}
-void CGUIFadeLabelControl::DoRender(DWORD currentTime)
+void CGUIFadeLabelControl::DoRender(unsigned int currentTime)
{
m_renderTime = currentTime;
CGUIControl::DoRender(currentTime);