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
bd179ee7
Commit
bd179ee7
authored
Jan 14, 2010
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2: remove dead code
Remove the old way of tracking change in vout size (no longer used)
parent
5cbb5d86
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
30 deletions
+3
-30
modules/gui/skins2/controls/ctrl_video.cpp
modules/gui/skins2/controls/ctrl_video.cpp
+0
-19
modules/gui/skins2/controls/ctrl_video.hpp
modules/gui/skins2/controls/ctrl_video.hpp
+1
-4
modules/gui/skins2/src/vlcproc.cpp
modules/gui/skins2/src/vlcproc.cpp
+2
-3
modules/gui/skins2/src/vlcproc.hpp
modules/gui/skins2/src/vlcproc.hpp
+0
-4
No files found.
modules/gui/skins2/controls/ctrl_video.cpp
View file @
bd179ee7
...
...
@@ -39,13 +39,6 @@ CtrlVideo::CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout,
m_xShift
(
0
),
m_yShift
(
0
),
m_bAutoResize
(
autoResize
),
m_pVoutWindow
(
NULL
),
m_bIsUseable
(
false
)
{
// Observe the vout size variable if the control is auto-resizable
if
(
m_bAutoResize
)
{
VarBox
&
rVoutSize
=
VlcProc
::
instance
(
pIntf
)
->
getVoutSizeVar
();
rVoutSize
.
addObserver
(
this
);
}
VarBool
&
rFullscreen
=
VlcProc
::
instance
(
getIntf
()
)
->
getFullscreenVar
();
rFullscreen
.
addObserver
(
this
);
}
...
...
@@ -53,9 +46,6 @@ CtrlVideo::CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout,
CtrlVideo
::~
CtrlVideo
()
{
VarBox
&
rVoutSize
=
VlcProc
::
instance
(
getIntf
()
)
->
getVoutSizeVar
();
rVoutSize
.
delObserver
(
this
);
VarBool
&
rFullscreen
=
VlcProc
::
instance
(
getIntf
()
)
->
getFullscreenVar
();
rFullscreen
.
delObserver
(
this
);
...
...
@@ -148,15 +138,6 @@ void CtrlVideo::resizeControl( int width, int height )
}
void
CtrlVideo
::
onUpdate
(
Subject
<
VarBox
>
&
rVoutSize
,
void
*
arg
)
{
int
newWidth
=
((
VarBox
&
)
rVoutSize
).
getWidth
()
+
m_xShift
;
int
newHeight
=
((
VarBox
&
)
rVoutSize
).
getHeight
()
+
m_yShift
;
resizeControl
(
newWidth
,
newHeight
);
}
void
CtrlVideo
::
onUpdate
(
Subject
<
VarBool
>
&
rVariable
,
void
*
arg
)
{
// Visibility changed
...
...
modules/gui/skins2/controls/ctrl_video.hpp
View file @
bd179ee7
...
...
@@ -31,7 +31,7 @@
/// Control video
class
CtrlVideo
:
public
CtrlGeneric
,
public
Observer
<
VarBox
>
class
CtrlVideo
:
public
CtrlGeneric
{
public:
CtrlVideo
(
intf_thread_t
*
pIntf
,
GenericLayout
&
rLayout
,
...
...
@@ -56,9 +56,6 @@ public:
/// Get the type of control (custom RTTI)
virtual
string
getType
()
const
{
return
"video"
;
}
/// Method called when the vout size is updated
virtual
void
onUpdate
(
Subject
<
VarBox
>
&
rVoutSize
,
void
*
);
/// Method called when visibility or ActiveLayout is updated
virtual
void
onUpdate
(
Subject
<
VarBool
>
&
rVariable
,
void
*
);
...
...
modules/gui/skins2/src/vlcproc.cpp
View file @
bd179ee7
...
...
@@ -74,9 +74,8 @@ void VlcProc::destroy( intf_thread_t *pIntf )
VlcProc
::
VlcProc
(
intf_thread_t
*
pIntf
)
:
SkinObject
(
pIntf
),
m_varVoutSize
(
pIntf
),
m_varEqBands
(
pIntf
),
m_pVout
(
NULL
),
m_pAout
(
NULL
),
m_bEqualizer_started
(
false
),
m_cmdManage
(
this
)
m_varEqBands
(
pIntf
),
m_pVout
(
NULL
),
m_pAout
(
NULL
),
m_bEqualizer_started
(
false
),
m_cmdManage
(
this
)
{
// Create a timer to poll the status of the vlc
OSFactory
*
pOsFactory
=
OSFactory
::
instance
(
pIntf
);
...
...
modules/gui/skins2/src/vlcproc.hpp
View file @
bd179ee7
...
...
@@ -81,9 +81,6 @@ public:
VarText
&
getStreamSampleRateVar
()
{
return
*
((
VarText
*
)(
m_cVarStreamSampleRate
.
get
()));
}
/// Getter for the vout size variable
VarBox
&
getVoutSizeVar
()
{
return
m_varVoutSize
;
}
/// Getter/Setter for the fullscreen variable
VarBool
&
getFullscreenVar
()
{
return
*
((
VarBool
*
)(
m_cVarFullscreen
.
get
()));
}
void
setFullscreenVar
(
bool
);
...
...
@@ -142,7 +139,6 @@ private:
VariablePtr
m_cVarRecording
;
/// Variables related to the vout
VariablePtr
m_cVarFullscreen
;
VarBox
m_varVoutSize
;
VariablePtr
m_cVarHasVout
;
/// Variables related to audio
VariablePtr
m_cVarHasAudio
;
...
...
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