Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
a8291189
Commit
a8291189
authored
Feb 18, 2009
by
Joseph Tulou
Committed by
Jean-Baptiste Kempf
Feb 20, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrects crashing when a skin doesn't have a video widget.
Signed-off-by:
Jean-Baptiste Kempf
<
jb@sasmira.jbkempf.com
>
parent
521b3b3d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+6
-3
modules/gui/skins2/src/skin_main.cpp
modules/gui/skins2/src/skin_main.cpp
+10
-4
No files found.
modules/gui/qt4/qt4.cpp
View file @
a8291189
...
@@ -293,9 +293,12 @@ static int Open( vlc_object_t *p_this )
...
@@ -293,9 +293,12 @@ static int Open( vlc_object_t *p_this )
while
(
p_sys
->
p_mi
==
NULL
&&
!
p_sys
->
b_isDialogProvider
)
while
(
p_sys
->
p_mi
==
NULL
&&
!
p_sys
->
b_isDialogProvider
)
iface
.
ready
.
wait
(
&
iface
.
lock
);
iface
.
ready
.
wait
(
&
iface
.
lock
);
if
(
!
p_sys
->
b_isDialogProvider
)
{
var_Create
(
p_this
->
p_libvlc
,
"qt4-iface"
,
VLC_VAR_ADDRESS
);
var_Create
(
p_this
->
p_libvlc
,
"qt4-iface"
,
VLC_VAR_ADDRESS
);
val
.
p_address
=
p_this
;
val
.
p_address
=
p_this
;
var_Set
(
p_this
->
p_libvlc
,
"qt4-iface"
,
val
);
var_Set
(
p_this
->
p_libvlc
,
"qt4-iface"
,
val
);
}
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
modules/gui/skins2/src/skin_main.cpp
View file @
a8291189
...
@@ -305,12 +305,18 @@ static int WindowOpen( vlc_object_t *p_this )
...
@@ -305,12 +305,18 @@ static int WindowOpen( vlc_object_t *p_this )
pWnd
->
handle
.
hwnd
=
VlcProc
::
getWindow
(
pIntf
,
pWnd
->
vout
,
pWnd
->
handle
.
hwnd
=
VlcProc
::
getWindow
(
pIntf
,
pWnd
->
vout
,
&
pWnd
->
pos_x
,
&
pWnd
->
pos_y
,
&
pWnd
->
pos_x
,
&
pWnd
->
pos_y
,
&
pWnd
->
width
,
&
pWnd
->
height
);
&
pWnd
->
width
,
&
pWnd
->
height
);
if
(
pWnd
->
handle
.
hwnd
)
{
pWnd
->
p_private
=
pIntf
;
pWnd
->
p_private
=
pIntf
;
pWnd
->
control
=
&
VlcProc
::
controlWindow
;
pWnd
->
control
=
&
VlcProc
::
controlWindow
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
else
{
return
VLC_EGENERIC
;
}
}
}
static
void
WindowClose
(
vlc_object_t
*
p_this
)
static
void
WindowClose
(
vlc_object_t
*
p_this
)
{
{
vout_window_t
*
pWnd
=
(
vout_window_t
*
)
p_this
;
vout_window_t
*
pWnd
=
(
vout_window_t
*
)
p_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