Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #2045 from jmarshallnz/hasprocessed

tag animations as ready to go once processed once, not when rendered once
  • Loading branch information...
commit fa4eb438f79ae49dd39bc86e0ba194177d6ed975 2 parents d27da6c + 1278e07
Arne Morten Kvarving authored
View
2  xbmc/dialogs/GUIDialogProgress.cpp
@@ -88,7 +88,7 @@ void CGUIDialogProgress::StartModal()
// we must be running from fullscreen video or similar where the
// calling thread handles rendering (ie not main app thread) but
// is waiting on this routine before rendering begins
- if (!m_hasRendered)
+ if (!HasProcessed())
break;
}
}
View
4 xbmc/guilib/GUIControl.h
@@ -84,7 +84,7 @@ class CGUIControl
virtual void DoRender();
virtual void Render();
- bool HasRendered() const { return m_hasRendered; };
+ bool HasProcessed() const { return m_hasProcessed; };
// OnAction() is called by our window when we are the focused control.
// We should process any control-specific actions in the derived classes,
@@ -343,7 +343,7 @@ class CGUIControl
bool m_visibleFromSkinCondition;
bool m_forceHidden; // set from the code when a hidden operation is given - overrides m_visible
CGUIInfoBool m_allowHiddenFocus;
- bool m_hasRendered;
+ bool m_hasProcessed;
// enable/disable state
unsigned int m_enableCondition;
bool m_enabled;
View
2  xbmc/guilib/GUIDialog.cpp
@@ -234,7 +234,7 @@ void CGUIDialog::FrameMove()
{ // check if our timer is running
if (!m_showStartTime)
{
- if (HasRendered()) // start timer
+ if (HasProcessed()) // start timer
m_showStartTime = CTimeUtils::GetFrameTime();
}
else
View
4 xbmc/guilib/GUIImage.cpp
@@ -68,7 +68,7 @@ void CGUIImage::UpdateInfo(const CGUIListItem *item)
return; // nothing to do
// don't allow image to change while animating out
- if (HasRendered() && IsAnimating(ANIM_TYPE_HIDDEN) && !IsVisibleFromSkin())
+ if (HasProcessed() && IsAnimating(ANIM_TYPE_HIDDEN) && !IsVisibleFromSkin())
return;
if (item)
@@ -253,7 +253,7 @@ void CGUIImage::FreeResourcesButNotAnims()
{
FreeTextures();
m_bAllocated=false;
- m_hasRendered = false;
+ m_hasProcessed = false;
}
void CGUIImage::DynamicResourceAlloc(bool bOnOff)
View
4 xbmc/guilib/GUIWindow.cpp
@@ -492,7 +492,7 @@ void CGUIWindow::OnInitWindow()
g_audioManager.PlayWindowSound(GetID(), SOUND_INIT);
// set our rendered state
- m_hasRendered = false;
+ m_hasProcessed = false;
m_closing = false;
m_active = true;
ResetAnimations(); // we need to reset our animations as those windows that don't dynamically allocate
@@ -818,7 +818,7 @@ bool CGUIWindow::CheckAnimation(ANIMATION_TYPE animType)
// special cases first
if (animType == ANIM_TYPE_WINDOW_CLOSE)
{
- if (!m_bAllocated || !m_hasRendered) // can't render an animation if we aren't allocated or haven't rendered
+ if (!m_bAllocated || !HasProcessed()) // can't process an animation if we aren't allocated or haven't processed
return false;
// make sure we update our visibility prior to queuing the window close anim
for (unsigned int i = 0; i < m_children.size(); i++)
View
4 xbmc/pictures/GUIWindowSlideShow.cpp
@@ -391,8 +391,8 @@ void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re
int iSlides = m_slides->Size();
if (!iSlides) return ;
- // if we haven't rendered yet, we should mark the whole screen
- if (!m_hasRendered)
+ // if we haven't processed yet, we should mark the whole screen
+ if (!HasProcessed())
regions.push_back(CRect(0.0f, 0.0f, (float)g_graphicsContext.GetWidth(), (float)g_graphicsContext.GetHeight()));
if (m_iNextSlide < 0 || m_iNextSlide >= m_slides->Size())

1 comment on commit fa4eb43

@mkortstiege
Collaborator

Breaks build (at least on Linux). Looks like a good bunch of m_hasRendered references were left out in GUIControl.cpp

Please sign in to comment.
Something went wrong with that request. Please try again.