RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

build: ensure HAVE_WIN32_SMTC is always defined 

It makes sense to only descend into the subdirectory meson build file on
windows, but we should always make sure HAVE_WIN32_SMTC is 0 for other
platforms. Otherwise, it gets unneccesarily awkward to work with.
This commit is contained in:
Dudemanguy 2024-08-01 17:35:59 -05:00 committed by sfan5
parent b64c53f730
commit 2bd1e78701
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meson.build
View File

@ -530,8 +530,11 @@ if not posix and not features['win32-desktop']
'osdep/terminal-dummy.c') 'osdep/terminal-dummy.c')
endif endif
# media controls
if win32 if win32
subdir('osdep/win32') subdir('osdep/win32')
else
features += {'win32-smtc': false}
endif endif
features += {'glob-posix': cc.has_function('glob', prefix: '#include <glob.h>')} features += {'glob-posix': cc.has_function('glob', prefix: '#include <glob.h>')}

2
player/main.c
View File

@ -399,7 +399,7 @@ int mp_initialize(struct MPContext *mpctx, char **options)
cocoa_set_mpv_handle(ctx); cocoa_set_mpv_handle(ctx);
#endif #endif
#if defined(HAVE_WIN32_SMTC) && HAVE_WIN32_SMTC #if HAVE_WIN32_SMTC
if (opts->media_controls == 2 || (mpctx->is_cli && opts->media_controls == 1)) if (opts->media_controls == 2 || (mpctx->is_cli && opts->media_controls == 1))
mp_smtc_init(mp_new_client(mpctx->clients, "SystemMediaTransportControls")); mp_smtc_init(mp_new_client(mpctx->clients, "SystemMediaTransportControls"));
#endif #endif