[vlc-commits] [Git][videolan/vlc][master] 2 commits: skins2: don't invoke window API from window
Rémi Denis-Courmont (@Courmisch)
gitlab at videolan.org
Tue Dec 21 18:55:05 UTC 2021
Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC
Commits:
b4b7bcc0 by Rémi Denis-Courmont at 2021-12-21T18:29:53+00:00
skins2: don't invoke window API from window
- - - - -
33e350db by Rémi Denis-Courmont at 2021-12-21T18:29:53+00:00
xdg-shell: don't use window API from window
- - - - -
2 changed files:
- modules/gui/skins2/src/skin_main.cpp
- modules/video_output/wayland/xdg-shell.c
Changes:
=====================================
modules/gui/skins2/src/skin_main.cpp
=====================================
@@ -312,6 +312,8 @@ static void WindowCloseLocal( intf_thread_t* pIntf, vlc_object_t *pObj )
VoutManager::instance( pIntf )->releaseWnd( pWnd );
}
+static void WindowSetFullscreen( vout_window_t *pWnd, const char * );
+
static int WindowEnable( vout_window_t *pWnd, const vout_window_cfg_t *cfg )
{
vout_window_skins_t* sys = (vout_window_skins_t *)pWnd->sys;
@@ -331,7 +333,7 @@ static int WindowEnable( vout_window_t *pWnd, const vout_window_cfg_t *cfg )
}
if (cfg->is_fullscreen)
- vout_window_SetFullScreen( pWnd, NULL );
+ WindowSetFullscreen( pWnd, NULL );
return VLC_SUCCESS;
}
=====================================
modules/video_output/wayland/xdg-shell.c
=====================================
@@ -272,7 +272,7 @@ static int Enable(vout_window_t *wnd, const vout_window_cfg_t *restrict cfg)
if (cfg->is_decorated)
return VLC_EGENERIC;
#endif
- vout_window_SetSize(wnd, cfg->width, cfg->height);
+ Resize(wnd, cfg->width, cfg->height);
wl_surface_commit(wnd->handle.wl);
wl_display_flush(display);
#ifdef XDG_SHELL
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7d4d28d2ed362a054c21390d8778ba76a409d140...33e350db7bdc50094cca746ece7f60e6e25c7ab4
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7d4d28d2ed362a054c21390d8778ba76a409d140...33e350db7bdc50094cca746ece7f60e6e25c7ab4
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list