diff options
| author | jmarshallnz <jmarshallnz@svn> | 2009-09-23 10:03:22 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2009-09-23 10:03:22 +0000 |
| commit | c3018c6090df3c4cf3c5a96cc2310f931ef8f37f (patch) | |
| tree | e22747627d63a591f15d9f87e15aa08cde10a563 /guilib/GUIMultiImage.cpp | |
| parent | 59629d6966e46a99fc8e41a05f5e460d984997a4 (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/GUIMultiImage.cpp')
| -rw-r--r-- | guilib/GUIMultiImage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guilib/GUIMultiImage.cpp b/guilib/GUIMultiImage.cpp index 75db87e921..5ef4a4bd39 100644 --- a/guilib/GUIMultiImage.cpp +++ b/guilib/GUIMultiImage.cpp @@ -29,7 +29,7 @@ using namespace std; using namespace DIRECTORY; -CGUIMultiImage::CGUIMultiImage(int parentID, int controlID, float posX, float posY, float width, float height, const CTextureInfo& texture, DWORD timePerImage, DWORD fadeTime, bool randomized, bool loop, DWORD timeToPauseAtEnd) +CGUIMultiImage::CGUIMultiImage(int parentID, int controlID, float posX, float posY, float width, float height, const CTextureInfo& texture, unsigned int timePerImage, unsigned int fadeTime, bool randomized, bool loop, unsigned int timeToPauseAtEnd) : CGUIControl(parentID, controlID, posX, posY, width, height), m_image(0, 0, posX, posY, width, height, texture) { @@ -116,7 +116,7 @@ void CGUIMultiImage::Render() if (nextImage != m_currentImage) { // check if we should be loading a new image yet - DWORD timeToShow = m_timePerImage; + unsigned int timeToShow = m_timePerImage; if (0 == nextImage) // last image should be paused for a bit longer if that's what the skinner wishes. timeToShow += m_timeToPauseAtEnd; if (m_imageTimer.IsRunning() && m_imageTimer.GetElapsedMilliseconds() > timeToShow) |