[vlc-commits] commit: skins2: fix RadialSlider (Erwan Tulou )
git at videolan.org
git at videolan.org
Thu Jul 1 11:01:51 CEST 2010
vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Thu Jul 1 10:21:36 2010 +0200| [a2bd0738d74befa4444d3d1a3101983265781cc3] | committer: Erwan Tulou
skins2: fix RadialSlider
- fix several parameters wrongly spelled (case sensitive)
(led to crash in atof)
- fix uninitialized m_position variable
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a2bd0738d74befa4444d3d1a3101983265781cc3
---
modules/gui/skins2/controls/ctrl_radialslider.cpp | 2 +-
modules/gui/skins2/parser/skin_parser.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/gui/skins2/controls/ctrl_radialslider.cpp b/modules/gui/skins2/controls/ctrl_radialslider.cpp
index 6aece64..0ed1875 100644
--- a/modules/gui/skins2/controls/ctrl_radialslider.cpp
+++ b/modules/gui/skins2/controls/ctrl_radialslider.cpp
@@ -41,7 +41,7 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
CtrlGeneric( pIntf, rHelp, pVisible ), m_fsm( pIntf ), m_numImg( numImg ),
m_rVariable( rVariable ), m_minAngle( minAngle ), m_maxAngle( maxAngle ),
m_cmdUpDown( this ), m_cmdDownUp( this ),
- m_cmdMove( this )
+ m_cmdMove( this ), m_position( 0 )
{
// Build the images of the sequence
m_pImgSeq = OSFactory::instance( getIntf() )->createOSGraphics(
diff --git a/modules/gui/skins2/parser/skin_parser.cpp b/modules/gui/skins2/parser/skin_parser.cpp
index 29df8f4..0b17c17 100644
--- a/modules/gui/skins2/parser/skin_parser.cpp
+++ b/modules/gui/skins2/parser/skin_parser.cpp
@@ -460,8 +460,8 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
attr["lefttop"], attr["rightbottom"],
convertBoolean( attr["xkeepratio"] ),
convertBoolean( attr["ykeepratio"] ), attr["sequence"],
- atoi( attr["nbImages"] ), atof( attr["minAngle"] ) * M_PI /180,
- atof( attr["maxAngle"] ) * M_PI / 180, attr["value"],
+ atoi( attr["nbimages"] ), atof( attr["minangle"] ) * M_PI /180,
+ atof( attr["maxangle"] ) * M_PI / 180, attr["value"],
attr["tooltiptext"], attr["help"], m_curLayer, m_curWindowId,
m_curLayoutId, m_panelStack.back() );
m_curLayer++;
More information about the vlc-commits
mailing list