vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Tue Dec 27 19:02:34 2016 +0100| [7722017e2e5cc750abc853e16aa1f0b7d6654bbe] | committer: Jean-Baptiste Kempf
qt: controller: Only react to external fullscreen changes And assume the playlist's "fullscreen" variable to be the reference value. Fix #17054 (cherry picked from commit ba9689033cd471536efb0d030e08f4f13beb6bdb) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=7722017e2e5cc750abc853e16aa1f0b7d6654bbe --- modules/gui/qt4/components/controller.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp index e7dcd1b..8468482 100644 --- a/modules/gui/qt4/components/controller.cpp +++ b/modules/gui/qt4/components/controller.cpp @@ -1105,6 +1105,7 @@ static int FullscreenControllerWidgetFullscreenChanged( vlc_object_t *vlc_object FullscreenControllerWidget *p_fs = (FullscreenControllerWidget *)data; p_fs->fullscreenChanged( p_vout, new_val.b_bool, var_GetInteger( p_vout, "mouse-hide-timeout" ) ); + p_fs->emit fullscreenChanged( new_val.b_bool ); return VLC_SUCCESS; } @@ -1177,7 +1178,7 @@ void FullscreenControllerWidget::setVoutList( vout_thread_t **pp_vout, int i_vou var_AddCallback( p_vout, "fullscreen", FullscreenControllerWidgetFullscreenChanged, this ); /* I miss a add and fire */ - fullscreenChanged( p_vout, var_GetBool( p_vout, "fullscreen" ), + fullscreenChanged( p_vout, var_GetBool( THEPL, "fullscreen" ), var_GetInteger( p_vout, "mouse-hide-timeout" ) ); vlc_mutex_unlock( &lock ); } @@ -1213,7 +1214,6 @@ void FullscreenControllerWidget::fullscreenChanged( vout_thread_t *p_vout, IMEvent *eHide = new IMEvent( IMEvent::FullscreenControlHide, 0 ); QApplication::postEvent( this, eHide ); } - emit fullscreenChanged( b_fullscreen ); vlc_mutex_unlock( &lock ); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
