Permalink
Browse files

rename IsDisplayEffectNeedChange to DisplayEffectNeedChange.

  • Loading branch information...
1 parent b2c601c commit 6940ff891715a0b49743ec6dbb958e3911f09cce @ulion committed Apr 11, 2013
Showing with 4 additions and 4 deletions.
  1. +2 −2 xbmc/pictures/GUIWindowSlideShow.cpp
  2. +1 −1 xbmc/pictures/SlideShowPicture.cpp
  3. +1 −1 xbmc/pictures/SlideShowPicture.h
@@ -611,7 +611,7 @@ void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re
if (!m_Image[1 - m_iCurrentPic].IsStarted())
{
CSlideShowPic::DISPLAY_EFFECT effect = GetDisplayEffect(m_iNextSlide);
- if (m_Image[1 - m_iCurrentPic].IsDisplayEffectNeedChange(effect))
+ if (m_Image[1 - m_iCurrentPic].DisplayEffectNeedChange(effect))
m_Image[1 - m_iCurrentPic].Reset(effect);
}
// set the appropriate transistion time
@@ -855,7 +855,7 @@ bool CGUIWindowSlideShow::OnAction(const CAction &action)
if (m_Image[m_iCurrentPic].IsLoaded())
{
CSlideShowPic::DISPLAY_EFFECT effect = GetDisplayEffect(m_iCurrentSlide);
- if (m_Image[m_iCurrentPic].IsDisplayEffectNeedChange(effect))
+ if (m_Image[m_iCurrentPic].DisplayEffectNeedChange(effect))
m_Image[m_iCurrentPic].Reset(effect);
}
AnnouncePlayerPlay(m_slides->Get(m_iCurrentSlide));
@@ -87,7 +87,7 @@ void CSlideShowPic::Reset(DISPLAY_EFFECT dispEffect, TRANSISTION_EFFECT transEff
Close();
}
-bool CSlideShowPic::IsDisplayEffectNeedChange(DISPLAY_EFFECT newDispEffect) const
+bool CSlideShowPic::DisplayEffectNeedChange(DISPLAY_EFFECT newDispEffect) const
{
if (m_displayEffect == newDispEffect)
return false;
@@ -54,7 +54,7 @@ class CSlideShowPic
void Close();
void Reset(DISPLAY_EFFECT dispEffect = EFFECT_RANDOM, TRANSISTION_EFFECT transEffect = FADEIN_FADEOUT);
DISPLAY_EFFECT DisplayEffect() const { return m_displayEffect; }
- bool IsDisplayEffectNeedChange(DISPLAY_EFFECT newDispEffect) const;
+ bool DisplayEffectNeedChange(DISPLAY_EFFECT newDispEffect) const;
bool IsStarted() const { return m_iCounter > 0; }
bool IsFinished() const { return m_bIsFinished;};
bool DrawNextImage() const { return m_bDrawNextImage;};

0 comments on commit 6940ff8

Please sign in to comment.