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
ae059a3c
Commit
ae059a3c
authored
Jul 15, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass vout_thread_t to releaseVideo.
parent
b4302875
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-1
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+2
-1
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+1
-1
No files found.
modules/gui/qt4/main_interface.cpp
View file @
ae059a3c
...
@@ -686,7 +686,7 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
...
@@ -686,7 +686,7 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
return
ret
;
return
ret
;
}
}
void
MainInterface
::
releaseVideo
(
void
*
p_win
)
void
MainInterface
::
releaseVideo
(
vo
ut_thread_t
*
p_vout
,
vo
id
*
p_win
)
{
{
emit
askReleaseVideo
(
p_win
);
emit
askReleaseVideo
(
p_win
);
}
}
...
...
modules/gui/qt4/main_interface.hpp
View file @
ae059a3c
...
@@ -73,8 +73,9 @@ public:
...
@@ -73,8 +73,9 @@ public:
void
*
requestVideo
(
vout_thread_t
*
p_nvout
,
int
*
pi_x
,
void
*
requestVideo
(
vout_thread_t
*
p_nvout
,
int
*
pi_x
,
int
*
pi_y
,
unsigned
int
*
pi_width
,
int
*
pi_y
,
unsigned
int
*
pi_width
,
unsigned
int
*
pi_height
);
unsigned
int
*
pi_height
);
void
releaseVideo
(
void
*
);
void
releaseVideo
(
vo
ut_thread_t
*
,
vo
id
*
);
int
controlVideo
(
void
*
p_window
,
int
i_query
,
va_list
args
);
int
controlVideo
(
void
*
p_window
,
int
i_query
,
va_list
args
);
void
requestLayoutUpdate
();
void
requestLayoutUpdate
();
/* Getters */
/* Getters */
...
...
modules/gui/qt4/qt4.cpp
View file @
ae059a3c
...
@@ -523,6 +523,6 @@ static void WindowClose (vlc_object_t *obj)
...
@@ -523,6 +523,6 @@ static void WindowClose (vlc_object_t *obj)
QMutexLocker
locker
(
&
windowLock
);
QMutexLocker
locker
(
&
windowLock
);
if
(
!
miP
->
isNull
())
if
(
!
miP
->
isNull
())
(
*
miP
)
->
releaseVideo
(
wnd
->
handle
);
(
*
miP
)
->
releaseVideo
(
wnd
->
vout
,
wnd
->
handle
);
delete
miP
;
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