Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
e0114a72
Commit
e0114a72
authored
Dec 15, 2009
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2: new fullscreen implementation (currently intended for Linux)
parent
2e49a0b3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
14 deletions
+46
-14
modules/gui/skins2/controls/ctrl_video.cpp
modules/gui/skins2/controls/ctrl_video.cpp
+16
-1
modules/gui/skins2/src/vlcproc.cpp
modules/gui/skins2/src/vlcproc.cpp
+5
-0
modules/gui/skins2/src/vlcproc.hpp
modules/gui/skins2/src/vlcproc.hpp
+4
-0
modules/gui/skins2/src/vout_manager.cpp
modules/gui/skins2/src/vout_manager.cpp
+17
-11
modules/gui/skins2/src/vout_window.cpp
modules/gui/skins2/src/vout_window.cpp
+4
-2
No files found.
modules/gui/skins2/controls/ctrl_video.cpp
View file @
e0114a72
...
...
@@ -45,6 +45,9 @@ CtrlVideo::CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout,
VarBox
&
rVoutSize
=
VlcProc
::
instance
(
pIntf
)
->
getVoutSizeVar
();
rVoutSize
.
addObserver
(
this
);
}
VarBool
&
rFullscreen
=
VlcProc
::
instance
(
getIntf
()
)
->
getFullscreenVar
();
rFullscreen
.
addObserver
(
this
);
}
...
...
@@ -53,6 +56,9 @@ CtrlVideo::~CtrlVideo()
VarBox
&
rVoutSize
=
VlcProc
::
instance
(
getIntf
()
)
->
getVoutSizeVar
();
rVoutSize
.
delObserver
(
this
);
VarBool
&
rFullscreen
=
VlcProc
::
instance
(
getIntf
()
)
->
getFullscreenVar
();
rFullscreen
.
delObserver
(
this
);
//m_pLayout->getActiveVar().delObserver( this );
}
...
...
@@ -167,7 +173,16 @@ void CtrlVideo::onUpdate( Subject<VarBool> &rVariable, void *arg )
m_pLayout
->
getActiveVar
().
get
()
);
}
m_bIsUseable
=
isVisible
()
&&
m_pLayout
->
getActiveVar
().
get
();
VarBool
&
rFullscreen
=
VlcProc
::
instance
(
getIntf
()
)
->
getFullscreenVar
();
if
(
&
rVariable
==
&
rFullscreen
)
{
msg_Dbg
(
getIntf
(),
"VideoCtrl : fullscreen toggled (fullscreen = %d)"
,
rFullscreen
.
get
()
);
}
m_bIsUseable
=
isVisible
()
&&
m_pLayout
->
getActiveVar
().
get
()
&&
!
rFullscreen
.
get
();
if
(
m_bIsUseable
&&
!
isUsed
()
)
{
...
...
modules/gui/skins2/src/vlcproc.cpp
View file @
e0114a72
...
...
@@ -770,6 +770,11 @@ void VlcProc::update_equalizer()
SET_BOOL
(
m_cVarEqualizer
,
b_equalizer
);
}
void
VlcProc
::
setFullscreenVar
(
bool
b_fullscreen
)
{
SET_BOOL
(
m_cVarFullscreen
,
b_fullscreen
);
}
#undef SET_BOOL
#undef SET_STREAMTIME
#undef SET_TEXT
...
...
modules/gui/skins2/src/vlcproc.hpp
View file @
e0114a72
...
...
@@ -84,6 +84,10 @@ public:
/// 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
);
/// Indicate whether the embedded video output is currently used
bool
isVoutUsed
()
const
{
return
m_pVout
!=
NULL
;
}
...
...
modules/gui/skins2/src/vout_manager.cpp
View file @
e0114a72
...
...
@@ -60,6 +60,13 @@ VoutManager::VoutManager( intf_thread_t *pIntf ): SkinObject( pIntf ),
m_pCtrlVideoVecBackup
(),
m_SavedWndVec
()
{
m_pVoutMainWindow
=
new
VoutMainWindow
(
getIntf
()
);
OSFactory
*
pOsFactory
=
OSFactory
::
instance
(
getIntf
()
);
int
width
=
pOsFactory
->
getScreenWidth
();
int
height
=
pOsFactory
->
getScreenHeight
();
m_pVoutMainWindow
->
move
(
0
,
0
);
m_pVoutMainWindow
->
resize
(
width
,
height
);
}
...
...
@@ -256,19 +263,18 @@ void VoutManager::setSizeWnd( vout_window_t *pWnd, int width, int height )
void
VoutManager
::
setFullscreenWnd
(
vout_window_t
*
pWnd
,
bool
b_fullscreen
)
{
msg_Dbg
(
pWnd
,
"setFullscreen (%d) received from vout thread"
,
b_fullscreen
?
1
:
0
);
msg_Dbg
(
pWnd
,
"setFullscreen (%d) received from vout thread"
,
b_fullscreen
?
1
:
0
);
vector
<
SavedWnd
>::
iterator
it
;
for
(
it
=
m_SavedWndVec
.
begin
();
it
!=
m_SavedWndVec
.
end
();
it
++
)
{
if
(
(
*
it
).
pWnd
==
pWnd
)
{
VoutWindow
*
pVoutWindow
=
(
*
it
).
pVoutWindow
;
VlcProc
::
instance
(
getIntf
()
)
->
setFullscreenVar
(
b_fullscreen
);
pVoutWindow
->
setFullscreen
(
b_fullscreen
);
break
;
}
if
(
b_fullscreen
)
{
m_pVoutMainWindow
->
show
();
}
else
{
m_pVoutMainWindow
->
hide
();
}
}
...
...
modules/gui/skins2/src/vout_window.cpp
View file @
e0114a72
...
...
@@ -77,9 +77,11 @@ void VoutWindow::setCtrlVideo( CtrlVideo* pCtrlVideo )
}
else
{
hide
();
int
w
=
VoutManager
::
instance
(
getIntf
()
)
->
getVoutMainWindow
()
->
getWidth
();
int
h
=
VoutManager
::
instance
(
getIntf
()
)
->
getVoutMainWindow
()
->
getHeight
();
setParent
(
VoutManager
::
instance
(
getIntf
()
)
->
getVoutMainWindow
(),
0
,
0
,
0
,
0
);
0
,
0
,
w
,
h
);
m_pParentWindow
=
VoutManager
::
instance
(
getIntf
()
)
->
getVoutMainWindow
();
}
...
...
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