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
a9e9f718
Commit
a9e9f718
authored
Aug 03, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed the last issue with FS (in embedded mode we not always be asked to
release the video).
parent
d4de21db
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+3
-2
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+1
-1
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+6
-1
No files found.
modules/gui/qt4/main_interface.cpp
View file @
a9e9f718
...
...
@@ -690,10 +690,11 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
return
ret
;
}
void
MainInterface
::
releaseVideo
(
vo
ut_thread_t
*
p_vout
,
vo
id
*
p_win
)
void
MainInterface
::
releaseVideo
(
void
*
p_win
)
{
if
(
fullscreenControls
)
fullscreenControls
->
detachVout
();
emit
askReleaseVideo
(
p_win
);
if
(
p_win
)
emit
askReleaseVideo
(
p_win
);
}
void
MainInterface
::
releaseVideoSlot
(
void
*
p_win
)
...
...
modules/gui/qt4/main_interface.hpp
View file @
a9e9f718
...
...
@@ -73,7 +73,7 @@ public:
void
*
requestVideo
(
vout_thread_t
*
p_nvout
,
int
*
pi_x
,
int
*
pi_y
,
unsigned
int
*
pi_width
,
unsigned
int
*
pi_height
);
void
releaseVideo
(
vo
ut_thread_t
*
,
vo
id
*
);
void
releaseVideo
(
void
*
);
int
controlVideo
(
void
*
p_window
,
int
i_query
,
va_list
args
);
void
requestLayoutUpdate
();
...
...
modules/gui/qt4/qt4.cpp
View file @
a9e9f718
...
...
@@ -417,6 +417,11 @@ static void Init( intf_thread_t *p_intf )
if
(
miP
)
{
QMutexLocker
locker
(
&
windowLock
);
/* We need to warn to detach from any vout before
* deleting miP (WindowClose will not be called after it) */
p_intf
->
p_sys
->
p_mi
->
releaseVideo
(
NULL
);
val
.
p_address
=
NULL
;
var_Set
(
p_intf
,
"window_widget"
,
val
);
delete
miP
;
...
...
@@ -534,6 +539,6 @@ static void WindowClose (vlc_object_t *obj)
QMutexLocker
locker
(
&
windowLock
);
if
(
!
miP
->
isNull
())
(
*
miP
)
->
releaseVideo
(
wnd
->
vout
,
wnd
->
handle
);
(
*
miP
)
->
releaseVideo
(
wnd
->
handle
);
delete
miP
;
}
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