Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
ef551582
Commit
ef551582
authored
Sep 12, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: remove pointless locking
The main interface video window calls are re-entrant nowadays.
parent
2d1f8dbe
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
7 deletions
+1
-7
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+1
-7
No files found.
modules/gui/qt4/qt4.cpp
View file @
ef551582
...
@@ -478,7 +478,7 @@ static void *Thread( void *obj )
...
@@ -478,7 +478,7 @@ static void *Thread( void *obj )
if
(
p_mi
!=
NULL
)
if
(
p_mi
!=
NULL
)
{
{
QMutexLocker
locker
(
&
iface
.
lock
);
/* FIXME: are we sure that video window is already destroyed? */
msg_Dbg
(
p_intf
,
"destroying the main Qt4 interface"
);
msg_Dbg
(
p_intf
,
"destroying the main Qt4 interface"
);
p_intf
->
p_sys
->
p_mi
=
NULL
;
p_intf
->
p_sys
->
p_mi
=
NULL
;
...
@@ -543,8 +543,6 @@ static int WindowOpen( vlc_object_t *p_obj )
...
@@ -543,8 +543,6 @@ static int WindowOpen( vlc_object_t *p_obj )
if
(
p_wnd
->
cfg
->
is_standalone
)
if
(
p_wnd
->
cfg
->
is_standalone
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
QMutexLocker
(
&
iface
.
lock
);
vlc_value_t
val
;
vlc_value_t
val
;
if
(
var_Get
(
p_obj
->
p_libvlc
,
"qt4-iface"
,
&
val
)
)
if
(
var_Get
(
p_obj
->
p_libvlc
,
"qt4-iface"
,
&
val
)
)
...
@@ -585,8 +583,6 @@ static int WindowOpen( vlc_object_t *p_obj )
...
@@ -585,8 +583,6 @@ static int WindowOpen( vlc_object_t *p_obj )
static
int
WindowControl
(
vout_window_t
*
p_wnd
,
int
i_query
,
va_list
args
)
static
int
WindowControl
(
vout_window_t
*
p_wnd
,
int
i_query
,
va_list
args
)
{
{
MainInterface
*
p_mi
=
(
MainInterface
*
)
p_wnd
->
sys
;
MainInterface
*
p_mi
=
(
MainInterface
*
)
p_wnd
->
sys
;
QMutexLocker
locker
(
&
iface
.
lock
);
return
p_mi
->
controlVideo
(
i_query
,
args
);
return
p_mi
->
controlVideo
(
i_query
,
args
);
}
}
...
@@ -595,8 +591,6 @@ static void WindowClose( vlc_object_t *p_obj )
...
@@ -595,8 +591,6 @@ static void WindowClose( vlc_object_t *p_obj )
vout_window_t
*
p_wnd
=
(
vout_window_t
*
)
p_obj
;
vout_window_t
*
p_wnd
=
(
vout_window_t
*
)
p_obj
;
MainInterface
*
p_mi
=
(
MainInterface
*
)
p_wnd
->
sys
;
MainInterface
*
p_mi
=
(
MainInterface
*
)
p_wnd
->
sys
;
QMutexLocker
locker
(
&
iface
.
lock
);
msg_Dbg
(
p_obj
,
"releasing video..."
);
msg_Dbg
(
p_obj
,
"releasing video..."
);
p_mi
->
releaseVideo
();
p_mi
->
releaseVideo
();
}
}
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