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
5741789d
Commit
5741789d
authored
May 20, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allowed vout_display_DeleteWindow(vd, NULL) to destroy unused window.
parent
c75fafe4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
include/vlc_vout_display.h
include/vlc_vout_display.h
+4
-0
src/video_output/video_output.c
src/video_output/video_output.c
+7
-2
No files found.
include/vlc_vout_display.h
View file @
5741789d
...
@@ -389,6 +389,10 @@ static inline vout_window_t *vout_display_NewWindow(vout_display_t *vd, const vo
...
@@ -389,6 +389,10 @@ static inline vout_window_t *vout_display_NewWindow(vout_display_t *vd, const vo
{
{
return
vd
->
owner
.
window_new
(
vd
,
cfg
);
return
vd
->
owner
.
window_new
(
vd
,
cfg
);
}
}
/**
* Deletes a window created by vout_display_NewWindow if window is non NULL
* or any unused windows otherwise.
*/
static
inline
void
vout_display_DeleteWindow
(
vout_display_t
*
vd
,
static
inline
void
vout_display_DeleteWindow
(
vout_display_t
*
vd
,
vout_window_t
*
window
)
vout_window_t
*
window
)
{
{
...
...
src/video_output/video_output.c
View file @
5741789d
...
@@ -504,10 +504,15 @@ void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
...
@@ -504,10 +504,15 @@ void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
vout_window_t
*
window
)
vout_window_t
*
window
)
{
{
VLC_UNUSED
(
vd
);
VLC_UNUSED
(
vd
);
if
(
!
vout
->
p
->
window
.
is_unused
&&
vout
->
p
->
window
.
object
==
window
)
if
(
!
vout
->
p
->
window
.
is_unused
&&
vout
->
p
->
window
.
object
==
window
)
{
vout
->
p
->
window
.
is_unused
=
true
;
vout
->
p
->
window
.
is_unused
=
true
;
else
}
else
if
(
vout
->
p
->
window
.
is_unused
&&
vout
->
p
->
window
.
object
&&
!
window
)
{
vout_window_Delete
(
vout
->
p
->
window
.
object
);
vout
->
p
->
window
.
is_unused
=
true
;
vout
->
p
->
window
.
object
=
NULL
;
}
else
if
(
window
)
{
vout_window_Delete
(
window
);
vout_window_Delete
(
window
);
}
}
}
/* */
/* */
...
...
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