[vlc-devel] commit: Skins2: Cosmetics. (JP Dinger )

git version control git at videolan.org
Sat Dec 5 22:35:13 CET 2009


vlc | branch: master | JP Dinger <jpd at videolan.org> | Sun Nov 22 18:13:35 2009 +0100| [5988891f0c6ed8060c77e2a12fec13d512cb88b9] | committer: JP Dinger 

Skins2: Cosmetics.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5988891f0c6ed8060c77e2a12fec13d512cb88b9
---

 modules/gui/skins2/src/anim_bitmap.cpp |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/gui/skins2/src/anim_bitmap.cpp b/modules/gui/skins2/src/anim_bitmap.cpp
index 2f66dec..ff247e8 100644
--- a/modules/gui/skins2/src/anim_bitmap.cpp
+++ b/modules/gui/skins2/src/anim_bitmap.cpp
@@ -56,9 +56,7 @@ AnimBitmap::~AnimBitmap()
 void AnimBitmap::startAnim()
 {
     if( m_nbFrames > 1 && m_frameRate > 0 )
-    {
         m_pTimer->start( 1000 / m_frameRate, false );
-    }
 }
 
 
@@ -87,14 +85,8 @@ void AnimBitmap::draw( OSGraphics &rImage, int xDest, int yDest )
 bool AnimBitmap::hit( int x, int y ) const
 {
     int height = m_pImage->getHeight() / m_nbFrames;
-    if( y >= 0 && y < height )
-    {
-        return m_pImage->hit( x, m_curFrame * height + y );
-    }
-    else
-    {
-        return false;
-    }
+    return y >= 0 && y < height &&
+           m_pImage->hit( x, m_curFrame * height + y );
 }
 
 




More information about the vlc-devel mailing list