Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
a878f3ac
Commit
a878f3ac
authored
Jun 13, 2007
by
damienf
Browse files
qt4: a few stability fixes when working as a dialogs provider, needs a lot more ...
parent
9924f657
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/gui/qt4/input_manager.cpp
View file @
a878f3ac
...
...
@@ -261,27 +261,40 @@ MainInputManager::~MainInputManager()
void
MainInputManager
::
updateInput
()
{
vlc_mutex_lock
(
&
p_intf
->
change_lock
);
if
(
p_input
&&
p_input
->
b_dead
)
if
(
VLC_OBJECT_INTF
==
p_intf
->
i_object_type
)
{
vlc_object_release
(
p_input
);
getIM
()
->
delInput
();
p_input
=
NULL
;
emit
inputChanged
(
NULL
);
}
vlc_mutex_lock
(
&
p_intf
->
change_lock
);
if
(
p_input
&&
p_input
->
b_dead
)
{
vlc_object_release
(
p_input
);
getIM
()
->
delInput
();
p_input
=
NULL
;
emit
inputChanged
(
NULL
);
}
if
(
!
p_input
)
{
QPL_LOCK
;
p_input
=
THEPL
->
p_input
;
if
(
p_input
)
if
(
!
p_input
)
{
QPL_LOCK
;
p_input
=
THEPL
->
p_input
;
if
(
p_input
)
{
vlc_object_yield
(
p_input
);
emit
inputChanged
(
p_input
);
}
QPL_UNLOCK
;
}
vlc_mutex_unlock
(
&
p_intf
->
change_lock
);
}
else
{
/* we are working as a dialogs provider */
playlist_t
*
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_PLAYLIST
,
FIND_ANYWHERE
);
if
(
p_playlist
)
{
vlc_object_yield
(
p_input
)
;
p_input
=
p_playlist
->
p_input
;
emit
inputChanged
(
p_input
);
}
QPL_UNLOCK
;
}
vlc_mutex_unlock
(
&
p_intf
->
change_lock
);
}
void
MainInputManager
::
stop
()
...
...
modules/gui/qt4/qt4.hpp
View file @
a878f3ac
...
...
@@ -54,7 +54,7 @@ struct intf_sys_t
#define QPL_UNLOCK vlc_mutex_unlock( &THEPL->object_lock );
#define THEDP DialogsProvider::getInstance()
#define THEMIM MainInputManager::getInstance(
NULL
)
#define THEMIM MainInputManager::getInstance(
p_intf
)
#define qfu( i ) QString::fromUtf8( i )
#define qtr( i ) QString::fromUtf8( _(i) )
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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