Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
0bc58744
Commit
0bc58744
authored
May 15, 2011
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2: fix warnings about initialization order.
parent
356dd52e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
13 deletions
+13
-13
modules/gui/skins2/controls/ctrl_generic.cpp
modules/gui/skins2/controls/ctrl_generic.cpp
+2
-2
modules/gui/skins2/controls/ctrl_radialslider.cpp
modules/gui/skins2/controls/ctrl_radialslider.cpp
+2
-2
modules/gui/skins2/controls/ctrl_slider.cpp
modules/gui/skins2/controls/ctrl_slider.cpp
+3
-3
modules/gui/skins2/controls/ctrl_text.cpp
modules/gui/skins2/controls/ctrl_text.cpp
+2
-2
modules/gui/skins2/controls/ctrl_tree.cpp
modules/gui/skins2/controls/ctrl_tree.cpp
+2
-2
modules/gui/skins2/controls/ctrl_video.cpp
modules/gui/skins2/controls/ctrl_video.cpp
+2
-2
No files found.
modules/gui/skins2/controls/ctrl_generic.cpp
View file @
0bc58744
...
...
@@ -34,8 +34,8 @@
CtrlGeneric
::
CtrlGeneric
(
intf_thread_t
*
pIntf
,
const
UString
&
rHelp
,
VarBool
*
pVisible
)
:
SkinObject
(
pIntf
),
m_pLayout
(
NULL
),
m_p
Position
(
NULL
),
m_
help
(
rHelp
),
m_pVisible
(
pVisible
)
SkinObject
(
pIntf
),
m_pLayout
(
NULL
),
m_p
Visible
(
pVisible
),
m_
pPosition
(
NULL
),
m_help
(
rHelp
)
{
// Observe the visibility variable
if
(
m_pVisible
)
...
...
modules/gui/skins2/controls/ctrl_radialslider.cpp
View file @
0bc58744
...
...
@@ -40,8 +40,8 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
VarBool
*
pVisible
)
:
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_position
(
0
)
m_
position
(
0
),
m_
cmdUpDown
(
this
),
m_cmdDownUp
(
this
),
m_cmdMove
(
this
)
{
// Build the images of the sequence
m_pImgSeq
=
OSFactory
::
instance
(
getIntf
()
)
->
createOSGraphics
(
...
...
modules/gui/skins2/controls/ctrl_slider.cpp
View file @
0bc58744
...
...
@@ -368,9 +368,9 @@ CtrlSliderBg::CtrlSliderBg( intf_thread_t *pIntf,
CtrlGeneric
(
pIntf
,
rHelp
,
pVisible
),
m_pCursor
(
NULL
),
m_rVariable
(
rVariable
),
m_thickness
(
thickness
),
m_rCurve
(
rCurve
),
m_width
(
rCurve
.
getWidth
()
),
m_height
(
rCurve
.
getHeight
()
),
m_pImgSeq
(
pBackground
),
m_
nbHoriz
(
nbHoriz
),
m_nbVert
(
nbVert
),
m_
padHoriz
(
padHoriz
),
m_padVert
(
padVert
),
m_bgWidth
(
0
),
m_bg
Height
(
0
),
m_position
(
0
),
m_pScaledBmp
(
NULL
)
m_pImgSeq
(
pBackground
),
m_
pScaledBmp
(
NULL
),
m_nbHoriz
(
nbHoriz
),
m_
nbVert
(
nbVert
),
m_padHoriz
(
padHoriz
),
m_padVert
(
padVert
),
m_bg
Width
(
0
),
m_bgHeight
(
0
),
m_position
(
0
)
{
if
(
m_pImgSeq
)
{
...
...
modules/gui/skins2/controls/ctrl_text.cpp
View file @
0bc58744
...
...
@@ -44,12 +44,12 @@ CtrlText::CtrlText( intf_thread_t *pIntf, VarText &rVariable,
const
GenericFont
&
rFont
,
const
UString
&
rHelp
,
uint32_t
color
,
VarBool
*
pVisible
,
VarBool
*
pFocus
,
Scrolling_t
scrollMode
,
Align_t
alignment
)
:
CtrlGeneric
(
pIntf
,
rHelp
,
pVisible
),
m_
pFocus
(
pFocus
),
m_
fsm
(
pIntf
),
CtrlGeneric
(
pIntf
,
rHelp
,
pVisible
),
m_fsm
(
pIntf
),
m_rVariable
(
rVariable
),
m_cmdToManual
(
this
),
m_cmdManualMoving
(
this
),
m_cmdManualStill
(
this
),
m_cmdMove
(
this
),
m_pEvt
(
NULL
),
m_rFont
(
rFont
),
m_color
(
color
),
m_scrollMode
(
scrollMode
),
m_alignment
(
alignment
),
m_pImg
(
NULL
),
m_pImgDouble
(
NULL
),
m_p
Focus
(
pFocus
),
m_p
Img
(
NULL
),
m_pImgDouble
(
NULL
),
m_pCurrImg
(
NULL
),
m_xPos
(
0
),
m_xOffset
(
0
),
m_cmdUpdateText
(
this
)
{
...
...
modules/gui/skins2/controls/ctrl_tree.cpp
View file @
0bc58744
...
...
@@ -61,8 +61,8 @@ CtrlTree::CtrlTree( intf_thread_t *pIntf,
m_pOpenBitmap
(
pOpenBitmap
),
m_pClosedBitmap
(
pClosedBitmap
),
m_fgColor
(
fgColor
),
m_playColor
(
playColor
),
m_bgColor1
(
bgColor1
),
m_bgColor2
(
bgColor2
),
m_selColor
(
selColor
),
m_pLastSelected
(
NULL
),
m_pImage
(
NULL
),
m_
dontMove
(
false
),
m_
pScaledBitmap
(
NULL
)
m_pLastSelected
(
NULL
),
m_pImage
(
NULL
),
m_
pScaledBitmap
(
NULL
),
m_
dontMove
(
false
)
{
// Observe the tree and position variables
m_rTree
.
addObserver
(
this
);
...
...
modules/gui/skins2/controls/ctrl_video.cpp
View file @
0bc58744
...
...
@@ -36,8 +36,8 @@ CtrlVideo::CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout,
bool
autoResize
,
const
UString
&
rHelp
,
VarBool
*
pVisible
)
:
CtrlGeneric
(
pIntf
,
rHelp
,
pVisible
),
m_rLayout
(
rLayout
),
m_
xShift
(
0
),
m_yShift
(
0
),
m_bAutoResize
(
autoResize
),
m_
pVoutWindow
(
NULL
),
m_bIsUseable
(
false
)
m_
bAutoResize
(
autoResize
),
m_xShift
(
0
),
m_yShift
(
0
),
m_
bIsUseable
(
false
),
m_pVoutWindow
(
NULL
)
{
VarBool
&
rFullscreen
=
VlcProc
::
instance
(
getIntf
()
)
->
getFullscreenVar
();
rFullscreen
.
addObserver
(
this
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment