Packman Build Service PMBS

Changes of Revision 38

vlc-beta.spec Changed

@@ -31,8 +31,7 @@
 Release:        0
 Summary:        Snapshot of vlc.git#master
 License:        GPL-2.0+ and LGPL-2.1+
-Group:          Productivity/Multimedia/Video/Players
-Url:            http://www.videolan.org
+URL:            https://code.videolan.org/videolan/vlc
 Source0:        %name-%version.tar
 Source1:        %name.changes
 Source3:        %name-rpmlintrc
@@ -86,163 +85,161 @@
 Provides:       vlc-beta-qt-debuginfo = %version-%release
 
 BuildRequires:  bash
-BuildRequires:  flex
 BuildRequires:  bison
-%if 0%{?suse_version} > 1500
+BuildRequires:  ffmpeg-7-libavcodec-devel
+BuildRequires:  ffmpeg-7-libavformat-devel
+BuildRequires:  ffmpeg-7-libavutil-devel
+BuildRequires:  ffmpeg-7-libpostproc-devel
+BuildRequires:  ffmpeg-7-libswscale-devel
+BuildRequires:  flex
 BuildRequires:  gettext-devel >= 0.21
 BuildRequires:  gettext-tools
-%endif
+BuildRequires:  libgcrypt-devel >= 1.6.0
 BuildRequires:  libtool
 BuildRequires:  pkg-config
-%if %{with vlc_medialibrary}
-BuildRequires:  pkgconfig(medialibrary)
+%if 0%{?suse_version} > 1500
+BuildRequires:  pkgconfig(KF6WindowSystem)
 %endif
-BuildRequires:  pkgconfig(zlib)
-BuildRequires:  pkgconfig(libidn)
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6Qml)
+BuildRequires:  pkgconfig(Qt6QmlModels)
+BuildRequires:  pkgconfig(Qt6QmlWorkerScript)
+BuildRequires:  pkgconfig(Qt6Quick)
+BuildRequires:  pkgconfig(Qt6QuickControls2)
+BuildRequires:  pkgconfig(Qt6QuickLayouts)
+BuildRequires:  pkgconfig(Qt6QuickTemplates2)
+BuildRequires:  pkgconfig(Qt6ShaderTools)
+BuildRequires:  pkgconfig(Qt6Svg)
+BuildRequires:  pkgconfig(Qt6WaylandClient)
+BuildRequires:  pkgconfig(Qt6Widgets)
+BuildRequires:  pkgconfig(alsa) >= 1.0.24
+BuildRequires:  pkgconfig(avahi-client) >= 0.6
+BuildRequires:  pkgconfig(caca) >= 0.99.beta14
+BuildRequires:  pkgconfig(cairo) >= 1.13.1
+BuildRequires:  pkgconfig(dav1d)
 BuildRequires:  pkgconfig(dbus-1) >= 1.6.0
-BuildRequires:  pkgconfig(libsystemd)
-BuildRequires:  pkgconfig(lua) >= 5.1
-BuildRequires:  pkgconfig(libarchive) >= 3.1.0
-BuildRequires:  pkgconfig(live555) >= 2015.01.27
-BuildRequires:  pkgconfig(libdc1394-2) >= 2.1.0
-BuildRequires:  pkgconfig(libraw1394) >= 2.0.1
-BuildRequires:  pkgconfig(libavc1394) >= 0.5.3
-BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28
 BuildRequires:  pkgconfig(dvdnav) >= 6.0.0
 BuildRequires:  pkgconfig(dvdread) >= 6.0.0
-BuildRequires:  pkgconfig(libplacebo)
-BuildRequires:  pkgconfig(vulkan) >= 1.0.26
-BuildRequires:  pkgconfig(libbluray)
-%if %{with vlc_opencv}
-BuildRequires:  pkgconfig(opencv) > 2.0
+BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(faad2)
+%if %{with fdk_aac}
+BuildRequires:  pkgconfig(fdk-aac)
 %endif
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(libssh2)
-BuildRequires:  pkgconfig(libnfs) >= 1.10.0
-BuildRequires:  pkgconfig(libv4l2)
-#uildRequires:  pkgconfig(ffnvcodec)
-BuildRequires:  pkgconfig(libcddb) >= 0.9.5
-BuildRequires:  pkgconfig(libvncclient) >= 0.9.9
+BuildRequires:  pkgconfig(ffnvcodec)
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(fluidsynth) >= 1.1.2
+BuildRequires:  pkgconfig(fontconfig) >= 2.11
 BuildRequires:  pkgconfig(freerdp2)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(fribidi)
+BuildRequires:  pkgconfig(gbm)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(gnutls) >= 3.5.0
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(harfbuzz)
+BuildRequires:  pkgconfig(jack) >= 1.9.7
+BuildRequires:  pkgconfig(kate) >= 0.3.0
+BuildRequires:  pkgconfig(libarchive) >= 3.1.0
+BuildRequires:  pkgconfig(libass) >= 0.9.8
+BuildRequires:  pkgconfig(libavc1394) >= 0.5.3
+BuildRequires:  pkgconfig(libbluray)
+BuildRequires:  pkgconfig(libcddb) >= 0.9.5
+%if 0%{?suse_version} > 1500
+BuildRequires:  pkgconfig(libchromaprint) >= 0.6.0
+%endif
+BuildRequires:  pkgconfig(libdc1394-2) >= 2.1.0
+BuildRequires:  pkgconfig(libdrm) >= 2.4.83
 BuildRequires:  pkgconfig(libdvbpsi) >= 1.2.0
-BuildRequires:  pkgconfig(libgme)
-BuildRequires:  pkgconfig(ogg) >= 1.0
-BuildRequires:  pkgconfig(vorbis) >= 1.1
-BuildRequires:  pkgconfig(shout) >= 2.1
 BuildRequires:  pkgconfig(libebml) >= 1.3.6
+BuildRequires:  pkgconfig(libebur128) >= 1.2.4
+BuildRequires:  pkgconfig(libgme)
+BuildRequires:  pkgconfig(libidn)
+BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libmatroska)
 BuildRequires:  pkgconfig(libmodplug)
-BuildRequires:  pkgconfig(shine) >= 3.0.0
-BuildRequires:  pkgconfig(mad)
 BuildRequires:  pkgconfig(libmpg123)
-BuildRequires:  ffmpeg-6-libavutil-devel
-BuildRequires:  ffmpeg-6-libavcodec-devel
+BuildRequires:  pkgconfig(libmtp) >= 1.0.0
+BuildRequires:  pkgconfig(libnfs) >= 1.10.0
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libpipewire-0.3)
+BuildRequires:  pkgconfig(libplacebo)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libpulse) >= 6.0
+BuildRequires:  pkgconfig(libraw1394) >= 2.0.1
+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.9.0
+BuildRequires:  pkgconfig(libsecret-1) >= 0.18
+BuildRequires:  pkgconfig(libssh2)
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libudev) >= 142
+BuildRequires:  pkgconfig(libupnp)
+BuildRequires:  pkgconfig(libv4l2)
 BuildRequires:  pkgconfig(libva) >= 0.38
 BuildRequires:  pkgconfig(libva-drm)
+BuildRequires:  pkgconfig(libva-wayland)
 BuildRequires:  pkgconfig(libva-x11)
-BuildRequires:  ffmpeg-6-libavformat-devel
-BuildRequires:  ffmpeg-6-libswscale-devel
-BuildRequires:  ffmpeg-6-libpostproc-devel
-BuildRequires:  pkgconfig(faad2)
-BuildRequires:  pkgconfig(rav1e)
-BuildRequires:  pkgconfig(dav1d)
-BuildRequires:  pkgconfig(vpx) >= 1.5.0
-BuildRequires:  pkgconfig(twolame)
-%if %{with fdk_aac}
-BuildRequires:  pkgconfig(fdk-aac)
+BuildRequires:  pkgconfig(libvncclient) >= 0.9.9
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.5
+BuildRequires:  pkgconfig(lirc)
+BuildRequires:  pkgconfig(live555) >= 2015.01.27
+BuildRequires:  pkgconfig(lua) >= 5.1
+BuildRequires:  pkgconfig(mad)
+%if %{with vlc_medialibrary}
+BuildRequires:  pkgconfig(medialibrary)
+%endif
+BuildRequires:  pkgconfig(ncursesw)
+BuildRequires:  pkgconfig(ogg) >= 1.0
+%if %{with vlc_opencv}
+BuildRequires:  pkgconfig(opencv) > 2.0
 %endif
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(vorbisenc) >= 1.1
-BuildRequires:  pkgconfig(speex) >= 1.0.5
 BuildRequires:  pkgconfig(opus) >= 1.0.3
+BuildRequires:  pkgconfig(protobuf-lite)
+BuildRequires:  pkgconfig(python3)
+BuildRequires:  pkgconfig(rav1e)
+BuildRequires:  pkgconfig(samplerate)
+BuildRequires:  pkgconfig(schroedinger-1.0) >= 1.0.10
+BuildRequires:  pkgconfig(shine) >= 3.0.0
+BuildRequires:  pkgconfig(shout) >= 2.1
+BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(soxr) >= 0.1.2
+BuildRequires:  pkgconfig(speex) >= 1.0.5
+BuildRequires:  pkgconfig(taglib) >= 1.11
 BuildRequires:  pkgconfig(theoradec) >= 1.0
 BuildRequires:  pkgconfig(theoraenc)
-BuildRequires:  pkgconfig(schroedinger-1.0) >= 1.0.10
-BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(libjpeg)
-BuildRequires:  pkgconfig(x265)
-BuildRequires:  pkgconfig(x264) >= 0.86
-BuildRequires:  pkgconfig(fluidsynth) >= 1.1.2
-BuildRequires:  pkgconfig(libass) >= 0.9.8
-BuildRequires:  pkgconfig(kate) >= 0.3.0
-BuildRequires:  pkgconfig(gbm)
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(xcb) >= 1.6
-BuildRequires:  pkgconfig(xcb-render)
-BuildRequires:  pkgconfig(xcb-shm) >= 1.9.2
-BuildRequires:  pkgconfig(xcb-composite)
-BuildRequires:  pkgconfig(xproto)
-BuildRequires:  pkgconfig(xcursor)
-BuildRequires:  pkgconfig(xcb-randr) >= 1.3
-BuildRequires:  pkgconfig(xcb-keysyms) >= 0.3.4
-BuildRequires:  pkgconfig(xcb-damage)
-BuildRequires:  pkgconfig(xcb-xfixes)
+BuildRequires:  pkgconfig(twolame)
 BuildRequires:  pkgconfig(vdpau) >= 0.6
-BuildRequires:  pkgconfig(libva-wayland)
+BuildRequires:  pkgconfig(vorbis) >= 1.1
+BuildRequires:  pkgconfig(vorbisenc) >= 1.1
+BuildRequires:  pkgconfig(vpx) >= 1.5.0
+BuildRequires:  pkgconfig(vulkan) >= 1.0.26
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-protocols) >= 1.15
 BuildRequires:  pkgconfig(wayland-scanner) >= 1.15
+BuildRequires:  pkgconfig(x264) >= 0.86
+BuildRequires:  pkgconfig(x265)
+BuildRequires:  pkgconfig(xcb) >= 1.6
+BuildRequires:  pkgconfig(xcb-composite)
+BuildRequires:  pkgconfig(xcb-damage)
+BuildRequires:  pkgconfig(xcb-keysyms) >= 0.3.4
+BuildRequires:  pkgconfig(xcb-randr) >= 1.3
+BuildRequires:  pkgconfig(xcb-render)
+BuildRequires:  pkgconfig(xcb-shm) >= 1.9.2
+BuildRequires:  pkgconfig(xcb-xfixes)
+BuildRequires:  pkgconfig(xcb-xkb)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xinerama)
 BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(fontconfig) >= 2.11
-BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(harfbuzz)
-BuildRequires:  pkgconfig(librsvg-2.0) >= 2.9.0
-BuildRequires:  pkgconfig(cairo) >= 1.13.1
-BuildRequires:  pkgconfig(libdrm) >= 2.4.83
-BuildRequires:  pkgconfig(caca) >= 0.99.beta14
-BuildRequires:  pkgconfig(libpulse) >= 6.0
-BuildRequires:  pkgconfig(alsa) >= 1.0.24
-BuildRequires:  pkgconfig(jack) >= 1.9.7
-BuildRequires:  pkgconfig(samplerate)
-BuildRequires:  pkgconfig(soxr) >= 0.1.2
-BuildRequires:  pkgconfig(libebur128) >= 1.2.4
-BuildRequires:  pkgconfig(libchromaprint) >= 0.6.0
-%if 0%{?suse_version} > 1500
-BuildRequires:  pkgconfig(KF6WindowSystem)
-%endif
-BuildRequires:  pkgconfig(Qt6Core)
-BuildRequires:  pkgconfig(Qt6Gui)
-BuildRequires:  pkgconfig(Qt6Qml)
-BuildRequires:  pkgconfig(Qt6QmlModels)
-BuildRequires:  pkgconfig(Qt6QmlWorkerScript)
-BuildRequires:  pkgconfig(Qt6Quick)
-BuildRequires:  pkgconfig(Qt6QuickControls2)
-BuildRequires:  pkgconfig(Qt6QuickLayouts)
-BuildRequires:  pkgconfig(Qt6QuickTemplates2)
-BuildRequires:  pkgconfig(Qt6ShaderTools)
-BuildRequires:  pkgconfig(Qt6Svg)
-BuildRequires:  pkgconfig(Qt6WaylandClient)
-BuildRequires:  pkgconfig(Qt6Widgets)
+BuildRequires:  pkgconfig(xkbcommon-x11)
+BuildRequires:  pkgconfig(xpm)
+BuildRequires:  pkgconfig(xproto)
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28
 BuildRequires:  qt6qmlimport(Qt5Compat.GraphicalEffects.1)
-#uildRequires:  qt6qmlimport(QtQml.Models)
 BuildRequires:  qt6qmlimport(QtQuick.Controls.6)
-#uildRequires:  qt6qmlimport(QtQuick.Layouts)
 BuildRequires:  qt6qmlimport(QtQuick.Window.2)
-BuildRequires:  pkgconfig(xpm)
-BuildRequires:  pkgconfig(xinerama)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xcb-xkb)
-BuildRequires:  pkgconfig(xkbcommon-x11)
-BuildRequires:  pkgconfig(ncursesw)
-BuildRequires:  pkgconfig(lirc)
-BuildRequires:  pkgconfig(avahi-client) >= 0.6
-BuildRequires:  pkgconfig(libudev) >= 142
-BuildRequires:  pkgconfig(libmtp) >= 1.0.0
-BuildRequires:  pkgconfig(libupnp)
-BuildRequires:  pkgconfig(libxml-2.0) >= 2.5
-BuildRequires:  libgcrypt-devel >= 1.6.0
-BuildRequires:  pkgconfig(gnutls) >= 3.5.0
-BuildRequires:  pkgconfig(taglib) >= 1.11
-BuildRequires:  pkgconfig(libsecret-1) >= 0.18
-BuildRequires:  pkgconfig(libnotify)
-BuildRequires:  pkgconfig(gtk+-3.0)
-%if 0%{?suse_version} > 1500
-BuildRequires:  pkgconfig(protobuf-lite)
-%endif
 
 BuildRequires:  fdupes
 BuildRequires:  update-desktop-files
@@ -252,11 +249,8 @@
 Requires:       qt6qmlimport(QtQuick.Window.2)
 
 %description
-VLC media player is a highly portable multimedia player for various
-audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...)
-as well as DVDs, VCDs, and various streaming protocols.
-It can also be used as a server to stream in unicast or multicast
-in IPv4 or IPv6 on a high-bandwidth network.
+VLC media player is a multimedia player.
+It can also be used as a server to stream in unicast or multicast.
 
 %prep
 %autosetup -p1
@@ -421,7 +415,6 @@
 	--enable-x265 \
 	--disable-x26410b \
 	--enable-x264 \
-	--disable-mfx \
 	--enable-fluidsynth \
 	--disable-fluidlite \
 	--enable-zvbi \
@@ -453,6 +446,7 @@
 	--enable-caca \
 	--disable-kva \
 	--disable-mmal \
+	--enable-pipewire \
 	--enable-pulse \
 	--enable-alsa \
 	--disable-oss \
@@ -463,10 +457,10 @@
 	--enable-samplerate \
 	--enable-soxr \
 	--disable-kai \
-	--enable-chromaprint \
 %if 0%{?suse_version} > 1500
-	--enable-chromecast \
+	--enable-chromaprint \
 %endif
+	--enable-chromecast \
 	--enable-qt \
 	--enable-qt \
 	--enable-skins2 \
@@ -508,9 +502,7 @@
 %endif
 	--with-kde-solid=%_datadir/kde4/apps/solid \
 	--enable-vlc \
-%if 0%{?suse_version} > 1500
 	--enable-nls \
-%endif
 	%nil
 
 %make_build --no-print-directory
@@ -532,59 +524,25 @@
     popd
 done
 > %name.lang
-%if 0%{?suse_version} > 1500
 %find_lang %name
-%endif
-ls -l %buildroot/%_libdir/%name/plugins/plugins.dat
-> %buildroot/%_libdir/%name/plugins/plugins.dat
+read s < <(stat -c %%s %buildroot%_libdir/%name/plugins/plugins.dat)
+fallocate --punch-hole --offset 0 --length "${s}" %buildroot%_libdir/%name/plugins/plugins.dat
+(
+echo '%%ghost %buildroot%_libdir/%name/plugins/plugins.dat'
+find %buildroot%_libdir/%name -type d -printf '%%%%dir %p\n'
+find %buildroot%_libdir/%name -type f -name "*.so" -printf '%p\n'
+)|sed 's|%buildroot||'|sort -u|tee -a %name.lang
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %posttrans
-%_libexecdir/%name/vlc-cache-gen %_libdir/%name/plugins
+exec %_libexecdir/%name/vlc-cache-gen %_libdir/%name/plugins
 
 %files -f %name.lang
-%dir %_libdir/%name/
-%dir %_libdir/%name/plugins
-%ifarch aarch64
-%dir %_libdir/%name/plugins/aarch64
-%endif
-%dir %_libdir/%name/plugins/access
-%dir %_libdir/%name/plugins/access/rtp
-%dir %_libdir/%name/plugins/access_output
-%dir %_libdir/%name/plugins/audio_filter
-%dir %_libdir/%name/plugins/audio_mixer
-%dir %_libdir/%name/plugins/audio_output
-%dir %_libdir/%name/plugins/codec
-%dir %_libdir/%name/plugins/control
-%dir %_libdir/%name/plugins/demux
-%dir %_libdir/%name/plugins/gui
-%dir %_libdir/%name/plugins/keystore
-%dir %_libdir/%name/plugins/logger
-%dir %_libdir/%name/plugins/lua
-%dir %_libdir/%name/plugins/meta_engine
-%dir %_libdir/%name/plugins/misc
-%dir %_libdir/%name/plugins/mux
-%dir %_libdir/%name/plugins/notify
-%dir %_libdir/%name/plugins/packetizer
-%dir %_libdir/%name/plugins/services_discovery
-%dir %_libdir/%name/plugins/spu
-%dir %_libdir/%name/plugins/stream_extractor
-%dir %_libdir/%name/plugins/stream_filter
-%dir %_libdir/%name/plugins/stream_out
-%dir %_libdir/%name/plugins/text_renderer
-%dir %_libdir/%name/plugins/vaapi
-%dir %_libdir/%name/plugins/vdpau
-%dir %_libdir/%name/plugins/video_chroma
-%dir %_libdir/%name/plugins/video_filter
-%dir %_libdir/%name/plugins/video_output
-%dir %_libdir/%name/plugins/video_splitter
-%dir %_libdir/%name/plugins/visualization
-%ghost %_libdir/%name/plugins/*.dat
 %_bindir/*
-%_datadir/%name/
+%_datadir/%name
 %_datadir/applications/*
 %_datadir/icons/*
 %_datadir/kde4
@@ -593,8 +551,6 @@
 %_includedir/*
 %_libdir/%name/*.so
 %_libdir/%name/*.so.*
-%_libdir/%name/plugins/*/*.so
-%_libdir/%name/plugins/*/*/*.so
 %_libdir/*.so
 %_libdir/*.so.*
 %_libdir/pkgconfig/*.pc

vlc-beta.patch Changed

@@ -9,7 +9,7 @@
  LIBVLC_ABI_MINOR=0
  LIBVLC_ABI_MICRO=0
  
-@@ -2168,7 +2168,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
+@@ -2176,7 +2176,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
  dnl
  dnl dvdread module: check for libdvdread
  dnl
@@ -18,7 +18,7 @@
  
  dnl
  dnl libdvdnav plugin
-@@ -2525,7 +2525,7 @@ AC_ARG_ENABLE(mod,
+@@ -2545,7 +2545,7 @@ AC_ARG_ENABLE(mod,
    AS_HELP_STRING(--disable-mod,
      do not use libmodplug (default auto)))
  if test "${enable_mod}" != "no" ; then
@@ -27,7 +27,7 @@
            VLC_ADD_PLUGIN(mod)
            VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)
            VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
-@@ -4798,7 +4798,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
+@@ -4900,7 +4900,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
     VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
  )
  AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)
@@ -59,7 +59,7 @@
  #else // _WIN32
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -568,7 +568,7 @@ libvlccore_la_LDFLAGS = \
+@@ -585,7 +585,7 @@ libvlccore_la_LDFLAGS = \
  	$(LDFLAGS_libvlccore) \
  	-no-undefined \
  	-export-symbols $(srcdir)/libvlccore.sym \

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch Deleted

@@ -1,38 +0,0 @@
-From 56828b95fc427e8475d0a03ac016fa7edcc0dfc8 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@videolabs.io>
-Date: Fri, 16 Feb 2024 07:43:32 +0100
-Subject: PATCH 1/3 Move AMF_UNICODE into Platform.h
-
-It's a common macro that can be used in other places.
----
- core/Platform.h            | 14 ++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/core/Platform.h b/core/Platform.h
-index 35cbc9a..2ced091 100644
---- a/core/Platform.h
-+++ b/core/Platform.h
-@@ -66,6 +66,20 @@
- 
- #define AMF_TODO(_todo) (__FILE__ "(" AMF_MACRO_STRING(__LINE__) "): TODO: "_todo)
- 
-+/**
-+*******************************************************************************
-+*   AMF_UNICODE
-+*
-+*   @brief
-+*       Macro to convert string constant into wide char string constant
-+*
-+*   Auxilary AMF_UNICODE_ macro is needed as otherwise it is not possible to use AMF_UNICODE(__FILE__)
-+*   Microsoft macro _T also uses 2 passes to accomplish that
-+*******************************************************************************
-+*/
-+#define AMF_UNICODE(s) AMF_UNICODE_(s)
-+#define AMF_UNICODE_(s) L ## s
-+
- 
-  #if defined(__GNUC__) || defined(__clang__)
-      #define AMF_ALIGN(n) __attribute__((aligned(n)))
--- 
-2.45.0.windows.1
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch Deleted

@@ -1,63 +0,0 @@
-From a2c7dbd97a22febdb19b8a82cfea4fda7af0d4b6 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@videolabs.io>
-Date: Fri, 16 Feb 2024 07:45:25 +0100
-Subject: PATCH 2/3 Define LPRI(d|ud|x)64 as Unicode (wide) versions of
- AMFPRI(d|ud|x)64
-
-It's always true for all platforms.
----
- core/Platform.h | 27 ++++-----------------------
- 1 file changed, 4 insertions(+), 23 deletions(-)
-
-diff --git a/core/Platform.h b/core/Platform.h
-index 2ced091..12541f3 100644
---- a/core/Platform.h
-+++ b/core/Platform.h
-@@ -124,13 +110,10 @@ typedef signed int HRESULT;
- #endif
- 
-     #define AMFPRId64   "I64d"
--    #define LPRId64    L"I64d"
- 
-     #define AMFPRIud64   "Iu64d"
--    #define LPRIud64    L"Iu64d"
- 
-     #define AMFPRIx64   "I64x"
--    #define LPRIx64    L"I64x"
- 
- #else // !WIN32 - Linux and Mac
- 
-@@ -147,26 +130,24 @@ typedef signed int HRESULT;
- 
-     #if defined(__x86_64__) || defined(__aarch64__)
-         #define AMFPRId64    "ld"
--        #define LPRId64     L"ld"
- 
-         #define AMFPRIud64    "uld"
--        #define LPRIud64     L"uld"
- 
-         #define AMFPRIx64    "lx"
--        #define LPRIx64     L"lx"
-     #else
-         #define AMFPRId64    "lld"
--        #define LPRId64     L"lld"
- 
-         #define AMFPRIud64    "ulld"
--        #define LPRIud64     L"ulld"
- 
-         #define AMFPRIx64    "llx"
--        #define LPRIx64     L"llx"
-     #endif
- 
- #endif // WIN32
- 
-+#define LPRId64   AMF_UNICODE(AMFPRId64)
-+#define LPRIud64  AMF_UNICODE(AMFPRIud64)
-+#define LPRIx64   AMF_UNICODE(AMFPRIx64)
-+
- 
- #if defined(_WIN32)
- #define AMF_WEAK __declspec( selectany )
--- 
-2.45.0.windows.1
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch Deleted

@@ -1,73 +0,0 @@
-From 3ecced3ba3ad710b6f86104a648f2c1b6dbb86fa Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@videolabs.io>
-Date: Fri, 16 Feb 2024 07:50:03 +0100
-Subject: PATCH 3/3 Define AMFPRI(d|ud|x)64 using the standard C++ format for
- C+11 and up
-
-See https://en.cppreference.com/w/cpp/types/integer
-
-When compiled in C, it depends whether it's the Microsoft flavor or the standard C format. Not
-whether it's Win32 or not. Clang or GCC use the proper string formats on windows.
----
- core/Platform.h | 33 +++++++++++++++---------------
- 1 file changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/core/Platform.h b/core/Platform.h
-index 12541f3..a1fa96c 100644
---- a/core/Platform.h
-+++ b/core/Platform.h
-@@ -109,12 +109,6 @@ typedef signed int HRESULT;
-     #define AMF_FORCEINLINE         __forceinline
- #endif
- 
--    #define AMFPRId64   "I64d"
--
--    #define AMFPRIud64   "Iu64d"
--
--    #define AMFPRIx64   "I64x"
--
- #else // !WIN32 - Linux and Mac
- 
-     #define AMF_STD_CALL
-@@ -128,21 +122,28 @@ typedef signed int HRESULT;
-     #define AMF_FORCEINLINE         __inline__
- #endif
- 
--    #if defined(__x86_64__) || defined(__aarch64__)
--        #define AMFPRId64    "ld"
-+#endif // WIN32
- 
--        #define AMFPRIud64    "uld"
-+#if defined(__cplusplus) && (__cplusplus >= 201103L)
-+    #include <cinttypes>
-+    #define AMFPRId64   PRId64
- 
--        #define AMFPRIx64    "lx"
--    #else
--        #define AMFPRId64    "lld"
-+    #define AMFPRIud64  PRIu64
- 
--        #define AMFPRIud64    "ulld"
-+    #define AMFPRIx64   PRIx64
-+#elif defined(_MSC_VER)
-+    #define AMFPRId64   "I64d"
- 
--        #define AMFPRIx64    "llx"
--    #endif
-+    #define AMFPRIud64  "Iu64d"
- 
--#endif // WIN32
-+    #define AMFPRIx64   "I64x"
-+#elif !defined(AMFPRId64)
-+    #define AMFPRId64    "lld"
-+
-+    #define AMFPRIud64   "ulld"
-+
-+     #define AMFPRIx64    "llx"
-+#endif
- 
- #define LPRId64   AMF_UNICODE(AMFPRId64)
- #define LPRIud64  AMF_UNICODE(AMFPRIud64)
--- 
-2.45.0.windows.1
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/chromaprint/linklibs.patch Deleted

@@ -1,42 +0,0 @@
-diff -urN chromaprint.orig/CMakeLists.txt chromaprint/CMakeLists.txt
---- chromaprint.orig/CMakeLists.txt	2016-12-28 21:10:42.000000000 +0100
-+++ chromaprint/CMakeLists.txt	2017-12-08 14:59:39.000000000 +0100
-@@ -135,12 +135,16 @@
- if(FFT_LIB STREQUAL "vdsp")
- 	if(ACCELERATE_LIBRARIES)
- 		set(USE_VDSP ON)
-+		set(CHROMAPRINT_ADDITIONAL_LIBS "-F${ACCELERATE_LIBRARIES} -framework Accelerate")
- 	else()
- 		message(FATAL_ERROR "Selected ${FFT_LIB} for FFT calculations, but the library is not found")
- 	endif()
- elseif(FFT_LIB STREQUAL "avfft")
- 	if(FFMPEG_LIBAVCODEC_FFT_FOUND)
- 		set(USE_AVFFT ON)
-+		find_package(PkgConfig)
-+		pkg_check_modules(AVFFT REQUIRED libavcodec libavutil)
-+		string(REPLACE ";" " " CHROMAPRINT_ADDITIONAL_LIBS "${AVFFT_LDFLAGS}")
- 	else()
- 		message(FATAL_ERROR "Selected ${FFT_LIB} for FFT calculations, but the library is not found")
- 	endif()
-diff -urN chromaprint.orig/libchromaprint.pc.cmake chromaprint/libchromaprint.pc.cmake
---- chromaprint.orig/libchromaprint.pc.cmake	2016-12-28 21:10:42.000000000 +0100
-+++ chromaprint/libchromaprint.pc.cmake	2017-12-08 14:56:22.000000000 +0100
-@@ -7,6 +7,6 @@
- Description: Audio fingerprint library
- URL: http://acoustid.org/chromaprint
- Version: ${PROJECT_VERSION}
--Libs: -L${LIB_INSTALL_DIR} -lchromaprint
-+Libs: -L${LIB_INSTALL_DIR} -lchromaprint ${CHROMAPRINT_ADDITIONAL_LIBS}
- Cflags: -I${INCLUDE_INSTALL_DIR}
- 
-diff -urN chromaprint.orig/src/fft_lib_avfft.h chromaprint/src/fft_lib_avfft.h
---- chromaprint.orig/src/fft_lib_avfft.h	2016-12-28 21:10:42.000000000 +0100
-+++ chromaprint/src/fft_lib_avfft.h	2017-12-08 14:55:35.000000000 +0100
-@@ -5,6 +5,7 @@
- #define CHROMAPRINT_FFT_LIB_AVFFT_H_
- 
- extern "C" {
-+#include <libavutil/mem.h>
- #include <libavcodec/avcodec.h>
- #include <libavcodec/avfft.h>
- #include <libavutil/mem.h>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/gme/skip-underrun.patch Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mfx Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mfx/0001-Add-missing-mfx_dispatcher_uwp.h-.cpp.patch Deleted

@@ -1,279 +0,0 @@
-From f5a03b546070a4743603b3fe0e2474866d76622a Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@ycbcr.xyz>
-Date: Tue, 30 May 2023 12:19:15 +0200
-Subject: PATCH Add missing mfx_dispatcher_uwp.h/.cpp
-
-Originaly found in api/mfx_dispatch/windows/include/mfx_dispatcher_uwp.h
-And api/mfx_dispatch/windows/src/mfx_dispatcher_uwp.cpp
----
- Makefile.am                |   1 +
- src/mfx_dispatcher_uwp.cpp | 201 +++++++++++++++++++++++++++++++++++++
- src/mfx_dispatcher_uwp.h   |  36 +++++++
- 3 files changed, 238 insertions(+)
- create mode 100644 src/mfx_dispatcher_uwp.cpp
- create mode 100644 src/mfx_dispatcher_uwp.h
-
-diff --git a/Makefile.am b/Makefile.am
-index 40be4b1..680f125 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -42,6 +42,7 @@ libmfx_la_LIBADD = $(DLLIB) $(LIBVA_DRM_LIBS) $(LIBVA_X11_LIBS)
- libmfx_la_CPPFLAGS = $(LIBVA_DRM_CFLAGS) $(LIBVA_X11_CFLAGS) $(AM_CPPFLAGS)
- 
- if WINDOWS_STORE
-+libmfx_la_SOURCES += src/mfx_dispatcher_uwp.cpp
- libintel_gfx_api-x86.a: src/intel_gfx_api-x86.def
- 	$(DLLTOOL) --as=as --output-lib $@ --input-def $< --as-flags=--32 -m i386 
- libintel_gfx_api-x64.a: src/intel_gfx_api-x64.def
-diff --git a/src/mfx_dispatcher_uwp.cpp b/src/mfx_dispatcher_uwp.cpp
-new file mode 100644
-index 0000000..62c9f75
---- /dev/null
-+++ b/src/mfx_dispatcher_uwp.cpp
-@@ -0,0 +1,201 @@
-+// Copyright (c) 2020 Intel Corporation
-+//
-+// Permission is hereby granted, free of charge, to any person obtaining a copy
-+// of this software and associated documentation files (the "Software"), to deal
-+// in the Software without restriction, including without limitation the rights
-+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+// copies of the Software, and to permit persons to whom the Software is
-+// furnished to do so, subject to the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be included in all
-+// copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+// SOFTWARE.
-+
-+#include "mfx_dispatcher.h"
-+#include "mfx_dispatcher_uwp.h"
-+#include "mfx_driver_store_loader.h"
-+#include "mfx_dxva2_device.h"
-+#include "mfx_load_dll.h"
-+
-+mfxStatus GfxApiInit(mfxInitParam par, mfxU32 deviceID, mfxSession *session, mfxModuleHandle& hModule)
-+{
-+    HRESULT hr = S_OK;
-+    wchar_t IntelGFXAPIdllNameMFX_MAX_DLL_PATH = { 0 };
-+    MFX::DriverStoreLoader dsLoader;
-+
-+    if (!dsLoader.GetDriverStorePath(IntelGFXAPIdllName, sizeof(IntelGFXAPIdllName), deviceID))
-+    {
-+        return MFX_ERR_UNSUPPORTED;
-+    }
-+
-+    size_t pathLen = wcslen(IntelGFXAPIdllName);
-+    MFX::mfx_get_default_intel_gfx_api_dll_name(IntelGFXAPIdllName + pathLen, sizeof(IntelGFXAPIdllName) / sizeof(IntelGFXAPIdllName0) - pathLen);
-+    DISPATCHER_LOG_INFO((("loading %S\n"), IntelGFXAPIdllName));
-+
-+    hModule = MFX::mfx_dll_load(IntelGFXAPIdllName);
-+    if (!hModule)
-+    {
-+        DISPATCHER_LOG_ERROR("Can't load intel_gfx_api\n");
-+        return MFX_ERR_UNSUPPORTED;
-+    }
-+
-+    mfxFunctionPointer pFunc = (mfxFunctionPointer)MFX::mfx_dll_get_addr(hModule, "InitialiseMediaSession");
-+    if (!pFunc)
-+    {
-+        DISPATCHER_LOG_ERROR("Can't find required API function: InitialiseMediaSession\n");
-+        MFX::mfx_dll_free(hModule);
-+        return MFX_ERR_UNSUPPORTED;
-+    }
-+
-+    typedef HRESULT(APIENTRY *InitialiseMediaSessionPtr) (HANDLE*, LPVOID, LPVOID);
-+    InitialiseMediaSessionPtr init = (InitialiseMediaSessionPtr)pFunc;
-+    hr = init((HANDLE*)session, &par, NULL);
-+
-+    return (hr == S_OK) ? MFX_ERR_NONE : MFX_ERR_UNKNOWN;
-+}
-+
-+mfxStatus GfxApiClose(mfxSession& session, mfxModuleHandle& hModule)
-+{
-+    HRESULT hr = S_OK;
-+
-+    if (!hModule)
-+    {
-+        return MFX_ERR_INVALID_HANDLE;
-+    }
-+
-+    mfxFunctionPointer pFunc = (mfxFunctionPointer)MFX::mfx_dll_get_addr(hModule, "DisposeMediaSession");
-+    if (!pFunc)
-+    {
-+        DISPATCHER_LOG_ERROR("Can't find required API function: DisposeMediaSession\n");
-+        return MFX_ERR_INVALID_HANDLE;
-+    }
-+
-+    typedef HRESULT(APIENTRY *DisposeMediaSessionPtr) (HANDLE);
-+    DisposeMediaSessionPtr dispose = (DisposeMediaSessionPtr)pFunc;
-+    hr = dispose((HANDLE)session);
-+    session = NULL;
-+
-+    MFX::mfx_dll_free(hModule);
-+    hModule = NULL;
-+
-+    return (hr == S_OK) ? MFX_ERR_NONE : MFX_ERR_UNKNOWN;
-+}
-+
-+mfxStatus GfxApiInitByAdapterNum(mfxInitParam par, mfxU32 adapterNum, mfxSession *session, mfxModuleHandle& hModule)
-+{
-+    MFX::DXVA2Device dxvaDevice;
-+
-+    if (!dxvaDevice.InitDXGI1(adapterNum))
-+    {
-+        DISPATCHER_LOG_ERROR((("dxvaDevice.InitDXGI1(%d) Failed\n"), adapterNum));
-+        return MFX_ERR_UNSUPPORTED;
-+    }
-+
-+    if (dxvaDevice.GetVendorID() != INTEL_VENDOR_ID)
-+    {
-+        DISPATCHER_LOG_ERROR("Specified adapter is not Intel\n");
-+        return MFX_ERR_UNSUPPORTED;
-+    }
-+
-+    return GfxApiInit(par, dxvaDevice.GetDeviceID(), session, hModule);
-+}
-+
-+struct GfxApiHandle
-+{
-+    mfxModuleHandle hModule;
-+    mfxSession session;
-+    mfxU16 mediaAdapterType;
-+};
-+
-+static int GfxApiHandleSort(const void * plhs, const void * prhs)
-+{
-+    const GfxApiHandle * lhs = *(const GfxApiHandle **)plhs;
-+    const GfxApiHandle * rhs = *(const GfxApiHandle **)prhs;
-+
-+    // prefer integrated GPU
-+    if (lhs->mediaAdapterType != MFX_MEDIA_INTEGRATED && rhs->mediaAdapterType == MFX_MEDIA_INTEGRATED)
-+    {
-+        return 1;
-+    }
-+    if (lhs->mediaAdapterType == MFX_MEDIA_INTEGRATED && rhs->mediaAdapterType != MFX_MEDIA_INTEGRATED)
-+    {
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+mfxStatus GfxApiInitPriorityIntegrated(mfxInitParam par, mfxSession *session, mfxModuleHandle& hModule)
-+{
-+    mfxStatus sts = MFX_ERR_UNSUPPORTED;
-+    MFX::MFXVector<GfxApiHandle> gfxApiHandles;
-+
-+    for (int adapterNum = 0; adapterNum < 4; ++adapterNum)
-+    {
-+        MFX::DXVA2Device dxvaDevice;
-+
-+        if (!dxvaDevice.InitDXGI1(adapterNum) || dxvaDevice.GetVendorID() != INTEL_VENDOR_ID)
-+        {
-+            continue;
-+        }
-+
-+        par.Implementation &= ~(0xf);
-+        switch (adapterNum)
-+        {
-+        case 0:
-+            par.Implementation |= MFX_IMPL_HARDWARE;
-+            break;
-+        case 1:
-+            par.Implementation |= MFX_IMPL_HARDWARE2;
-+            break;
-+        case 2:
-+            par.Implementation |= MFX_IMPL_HARDWARE3;
-+            break;
-+        case 3:
-+            par.Implementation |= MFX_IMPL_HARDWARE4;
-+            break;
-+        }
-+
-+        mfxModuleHandle hModuleCur = NULL;
-+        mfxSession sessionCur = NULL;
-+
-+        sts = GfxApiInit(par, dxvaDevice.GetDeviceID(), &sessionCur, hModuleCur);
-+        if (sts != MFX_ERR_NONE)
-+            continue;
-+
-+        mfxPlatform platform = { MFX_PLATFORM_UNKNOWN, 0, MFX_MEDIA_UNKNOWN };
-+        sts = MFXVideoCORE_QueryPlatform(sessionCur, &platform);
-+        if (sts != MFX_ERR_NONE)
-+        {
-+            sts = GfxApiClose(sessionCur, hModuleCur);
-+            if (sts != MFX_ERR_NONE)
-+                return sts;
-+            continue;
-+        }
-+
-+        GfxApiHandle handle = { hModuleCur, sessionCur, platform.MediaAdapterType };
-+        gfxApiHandles.push_back(handle);
-+    }
-+
-+    qsort(&(*gfxApiHandles.begin()), gfxApiHandles.size(), sizeof(GfxApiHandle), &GfxApiHandleSort);
-+
-+    hModule = gfxApiHandles.begin()->hModule;
-+    *session = gfxApiHandles.begin()->session;
-+
-+    MFX::MFXVector<GfxApiHandle>::iterator it = gfxApiHandles.begin()++;
-+    for (; it != gfxApiHandles.end(); ++it)
-+    {
-+        sts = GfxApiClose(it->session, it->hModule);
-+        if (sts != MFX_ERR_NONE)
-+            return sts;
-+    }
-+
-+    return sts;
-+}
-diff --git a/src/mfx_dispatcher_uwp.h b/src/mfx_dispatcher_uwp.h
-new file mode 100644
-index 0000000..c3cbad3
---- /dev/null
-+++ b/src/mfx_dispatcher_uwp.h
-@@ -0,0 +1,36 @@
-+// Copyright (c) 2020 Intel Corporation
-+//
-+// Permission is hereby granted, free of charge, to any person obtaining a copy
-+// of this software and associated documentation files (the "Software"), to deal
-+// in the Software without restriction, including without limitation the rights
-+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+// copies of the Software, and to permit persons to whom the Software is
-+// furnished to do so, subject to the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be included in all
-+// copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+// SOFTWARE.
-+
-+#if !defined(__MFX_DISPATCHER_UWP_H)
-+#define __MFX_DISPATCHER_UWP_H
-+
-+// Loads intel_gfx_api dll from DriverStore fro specified device and calls InitialiseMediaSession from it
-+mfxStatus GfxApiInit(mfxInitParam par, mfxU32 deviceID, mfxSession *session, mfxModuleHandle& hModule);
-+
-+// Calls DisposeMediaSession from the intel_gfx_api dll and unloads it
-+mfxStatus GfxApiClose(mfxSession& session, mfxModuleHandle& hModule);
-+
-+// Initializes intel_gfx_api for specified adapter number
-+mfxStatus GfxApiInitByAdapterNum(mfxInitParam par, mfxU32 adapterNum, mfxSession *session, mfxModuleHandle& hModule);
-+
-+// Initializes intel_gfx_api for any Intel adapter, chooses integrated adapter with higher priority
-+mfxStatus GfxApiInitPriorityIntegrated(mfxInitParam par, mfxSession *session, mfxModuleHandle& hModule);
-+
-+#endif // __MFX_DISPATCHER_UWP_H
--- 
-2.37.3.windows.1
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mfx/0001-fix-UWP-build-in-ming-w64.patch Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mfx/0002-fix-UWP-build-in-ming-w64.patch Deleted

@@ -1,45 +0,0 @@
-From 0070532c09865a95f63987ccec25d529ce198683 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@ycbcr.xyz>
-Date: Tue, 30 May 2023 15:29:31 +0200
-Subject: PATCH fix UWP build in ming-w64
-
-minwg-w64 doesn't define these types in UWP mode and would require
-a bit of code refactoring to do so.
----
- src/mfx_driver_store_loader.h | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/mfx_driver_store_loader.h b/src/mfx_driver_store_loader.h
-index 650e170..3895854 100644
---- a/src/mfx_driver_store_loader.h
-+++ b/src/mfx_driver_store_loader.h
-@@ -35,11 +35,24 @@
- #endif
- #endif
- 
--#if defined(__MINGW64_VERSION_MAJOR) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
--// mingw-w64 doesn't set these types for WINAPI_PARTITION_APP
-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-+// these are not defined for WINAPI_PARTITION_APP
- typedef DWORD      DEVINST;
- typedef DEVINST    *PDEVINST;
- typedef ULONG      REGDISPOSITION;
-+#include <initguid.h>
-+DEFINE_GUID( GUID_DEVCLASS_DISPLAY,             0x4d36e968L, 0xe325, 0x11ce, 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18 );
-+
-+#if defined(__MINGW64_VERSION_MAJOR)
-+#define CR_SUCCESS                     (0x00)
-+#define CR_BUFFER_SMALL                (0x1A)
-+#define CM_LOCATE_DEVNODE_NORMAL       (0x00000000)
-+#define CM_REGISTRY_SOFTWARE           (0x00000001)
-+#define CM_GETIDLIST_FILTER_PRESENT    (0x00000100)
-+#define CM_GETIDLIST_FILTER_CLASS      (0x00000200)
-+#define RegDisposition_OpenExisting    (0x00000001)
-+#endif
-+
- #endif
- 
- namespace MFX
--- 
-2.37.3.windows.1
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mfx/SHA512SUMS Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mfx/rules.mak Deleted

@@ -1,44 +0,0 @@
-# mfx (Media SDK)
-
-MFX_VERSION := 1.35.1
-MFX_URL := $(GITHUB)/lu-zero/mfx_dispatch/archive/refs/tags/$(MFX_VERSION).tar.gz
-
-ifeq ($(call need_pkg,"mfx"),)
-PKGS_FOUND += mfx
-endif
-ifdef HAVE_WIN32
-ifeq ($(filter arm aarch64, $(ARCH)),)
-PKGS += mfx
-endif
-endif
-
-DEPS_mfx =
-ifdef HAVE_WINSTORE
-DEPS_mfx += alloweduwp $(DEPS_alloweduwp)
-endif
-
-ifdef HAVE_WINSTORE
-MFX_CONF := CFLAGS="$(CFLAGS) -DMEDIASDK_UWP_DISPATCHER"
-MFX_CONF += CXXFLAGS="$(CXXFLAGS) -DMEDIASDK_UWP_DISPATCHER"
-endif
-
-$(TARBALLS)/mfx_dispatch-$(MFX_VERSION).tar.gz:
-	$(call download_pkg,$(MFX_URL),mfx)
-
-.sum-mfx: mfx_dispatch-$(MFX_VERSION).tar.gz
-
-mfx: mfx_dispatch-$(MFX_VERSION).tar.gz .sum-mfx
-	$(UNPACK)
-	# $(call update_autoconfig,.)
-	$(APPLY) $(SRC)/mfx/0001-fix-UWP-build-in-ming-w64.patch
-	$(APPLY) $(SRC)/mfx/0002-fix-UWP-build-in-ming-w64.patch
-	$(APPLY) $(SRC)/mfx/0001-Add-missing-mfx_dispatcher_uwp.h-.cpp.patch
-	$(MOVE)
-
-.mfx: mfx
-	$(RECONF)
-	$(MAKEBUILDDIR)
-	$(MAKECONFIGURE) $(MFX_CONF)
-	+$(MAKEBUILD)
-	+$(MAKEBUILD) install
-	touch $@

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qt5compat Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qt5compat/0001-Revert-Auxiliary-commit-to-revert-individual-files-f.patch Deleted

@@ -1,810 +0,0 @@
-From d17c8890da94ec44e8b80fa22a061765c799a293 Mon Sep 17 00:00:00 2001
-From: Fatih Uzunoglu <fuzun54@outlook.com>
-Date: Fri, 19 Apr 2024 15:59:48 +0300
-Subject: PATCH 1/2 Revert "Auxiliary commit to revert individual files from
- 0ba059c6dc8b7c0f6ac4a277c96b6b16e43053a2"
-
-This effectively reverts deprecated Qt Graphical Effects to its more
-primitive Qt 6.3 version. This is done to prevent linking to Qt
-Shader Tools library, which increases the size considerably when
-statically linked.
----
- CMakeLists.txt                                |   5 -
- src/imports/graphicaleffects5/CMakeLists.txt  |  14 --
- src/imports/graphicaleffects5/DropShadow.qml  | 175 +++++-------------
- src/imports/graphicaleffects5/Glow.qml        | 126 ++++---------
- .../graphicaleffects5/private/CMakeLists.txt  |   9 -
- .../graphicaleffects5/shaders_ng/compile.bat  |   6 -
- tests/manual/graphicaleffects5/CMakeLists.txt |   9 -
- tests/manual/graphicaleffects5/main.qml       |  47 +----
- tests/manual/graphicaleffects5/qml.qrc        |   9 -
- 9 files changed, 91 insertions(+), 309 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ac84544..ae465c1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,9 +18,4 @@ find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Network Xml
- 
- qt_internal_project_setup()
- 
--# Look for the target ShaderTools package to have access to the ShaderTools Qt module library.
--# This is optional. When not present, runtime shader processing will not be available, and
--# only a certain set of effects will be available
--find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS ShaderTools)
--
- qt_build_repo()
-diff --git a/src/imports/graphicaleffects5/CMakeLists.txt b/src/imports/graphicaleffects5/CMakeLists.txt
-index 00209ed..2889f33 100644
---- a/src/imports/graphicaleffects5/CMakeLists.txt
-+++ b/src/imports/graphicaleffects5/CMakeLists.txt
-@@ -6,31 +6,23 @@
- #####################################################################
- 
- set(qml_files
--    "Blend.qml"
-     "BrightnessContrast.qml"
-     "ColorOverlay.qml"
-     "Colorize.qml"
-     "ConicalGradient.qml"
-     "Desaturate.qml"
--    "DirectionalBlur.qml"
-     "Displace.qml"
-     "DropShadow.qml"
-     "FastBlur.qml"
-     "GammaAdjust.qml"
--    "GaussianBlur.qml"
-     "Glow.qml"
-     "HueSaturation.qml"
--    "InnerShadow.qml"
-     "LevelAdjust.qml"
-     "LinearGradient.qml"
--    "MaskedBlur.qml"
-     "OpacityMask.qml"
--    "RadialBlur.qml"
-     "RadialGradient.qml"
-     "RectangularGlow.qml"
--    "RecursiveBlur.qml"
-     "ThresholdMask.qml"
--    "ZoomBlur.qml"
- )
- 
- qt_internal_add_qml_module(qtgraphicaleffectsplugin
-@@ -68,12 +60,8 @@ set(qtgraphicaleffectsshaders_resource_files
-     "shaders_ng/fastblur.frag.qsb"
-     "shaders_ng/fastblur_internal.frag.qsb"
-     "shaders_ng/fastblur_internal.vert.qsb"
--    "shaders_ng/fastinnershadow.frag.qsb"
--    "shaders_ng/fastinnershadow_level0.frag.qsb"
-     "shaders_ng/fastglow.frag.qsb"
-     "shaders_ng/gammaadjust.frag.qsb"
--    "shaders_ng/gaussianinnershadow.frag.qsb"
--    "shaders_ng/gaussianinnershadow_shadow.frag.qsb"
-     "shaders_ng/huesaturation.frag.qsb"
-     "shaders_ng/leveladjust.frag.qsb"
-     "shaders_ng/lineargradient.vert.qsb"
-@@ -84,8 +72,6 @@ set(qtgraphicaleffectsshaders_resource_files
-     "shaders_ng/radialgradient.vert.qsb"
-     "shaders_ng/radialgradient_mask.frag.qsb"
-     "shaders_ng/radialgradient_nomask.frag.qsb"
--    "shaders_ng/recursiveblur.vert.qsb"
--    "shaders_ng/recursiveblur.frag.qsb"
-     "shaders_ng/rectangularglow.frag.qsb"
-     "shaders_ng/thresholdmask.frag.qsb"
- )
-diff --git a/src/imports/graphicaleffects5/DropShadow.qml b/src/imports/graphicaleffects5/DropShadow.qml
-index cdf3fd4..e31fb6b 100644
---- a/src/imports/graphicaleffects5/DropShadow.qml
-+++ b/src/imports/graphicaleffects5/DropShadow.qml
-@@ -11,14 +11,9 @@ import Qt5Compat.GraphicalEffects.private
-     \since QtGraphicalEffects 1.0
-     \inherits QtQuick2::Item
-     \ingroup qtgraphicaleffects-drop-shadow
--
--    \brief Generates a soft shadow behind the source item.
--
--    The DropShadow effect blurs the alpha channel of the input, colorizes the
--    result and places it behind the source object to create a soft shadow. The
--    shadow's color can be changed using the \l {DropShadow::color}{color}
--    property. The location of the shadow can be changed with the \l
--    horizontalOffset and \l verticalOffset properties.
-+    \brief Generates a colorized and blurred shadow image of the
-+    source and places it behind the original, giving the impression that
-+    source item is raised from the background.
- 
-     \table
-     \header
-@@ -29,16 +24,6 @@ import Qt5Compat.GraphicalEffects.private
-         \li \image DropShadow_butterfly.png
-     \endtable
- 
--    The soft shadow is created by blurring the image live using a gaussian
--    blur. Performing blur live is a costly operation. Fullscreen gaussian blur
--    with even a moderate number of samples will only run at 60 fps on highend
--    graphics hardware.
--
--    When the source is static, the \l cached property can be set to allocate
--    another buffer to avoid performing the blur every time it is drawn.
--
--    \note This effect is available when running with OpenGL.
--
-     \section1 Example
- 
-     The following example shows how to apply the effect.
-@@ -46,12 +31,7 @@ import Qt5Compat.GraphicalEffects.private
- 
- */
- Item {
--    id: root
--
--    DropShadowBase {
--        id: dbs
--        anchors.fill: parent
--    }
-+    id: rootItem
- 
-     /*!
-         This property defines the source item that is going to be used as the
-@@ -60,26 +40,14 @@ Item {
-         \note It is not supported to let the effect include itself, for
-         instance by setting source to the effect's parent.
-     */
--    property alias source: dbs.source
-+    property variant source
- 
-     /*!
--        \qmlproperty int DropShadow::radius
--
-         Radius defines the softness of the shadow. A larger radius causes the
-         edges of the shadow to appear more blurry.
- 
--        The ideal blur is achieved by selecting \c samples and \c radius such
--        that \c {samples = 1 + radius * 2}, such as:
--
--        \table
--        \header \li Radius             \li Samples
--        \row    \li 0 \e{(no blur)}    \li 1
--        \row    \li 1                  \li 3
--        \row    \li 2                  \li 5
--        \row    \li 3                  \li 7
--        \endtable
--
--        By default, the property is set to \c {floor(samples/2)}.
-+        The value ranges from 0.0 (no blur) to inf. By default, the property is
-+        set to \c 0.0 (no blur).
- 
-         \table
-         \header
-@@ -94,10 +62,6 @@ Item {
-             \li \b { radius: 0 }
-             \li \b { radius: 6 }
-             \li \b { radius: 12 }
--        \row
--            \li \l samples: 25
--            \li \l samples: 25
--            \li \l samples: 25
-         \row
-             \li \l color: #000000
-             \li \l color: #000000
-@@ -115,31 +79,9 @@ Item {
-             \li \l spread: 0
-             \li \l spread: 0
-         \endtable
--    */
--    property alias radius: dbs.radius;
--
--    /*!
--        This property defines how many samples are taken per pixel when edge
--        softening blur calculation is done. Larger value produces better
--        quality, but is slower to render.
--
--        Ideally, this value should be twice as large as the highest required
--        radius value plus one, such as:
--
--        \table
--        \header \li Radius             \li Samples
--        \row    \li 0 \e{(no blur)}    \li 1
--        \row    \li 1                  \li 3
--        \row    \li 2                  \li 5
--        \row    \li 3                  \li 7
--        \endtable
--
--        By default, the property is set to \c 9.
- 
--        This property is not intended to be animated. Changing this property will
--        cause the underlying OpenGL shaders to be recompiled.
-     */
--    property alias samples: dbs.samples
-+    property real radius: 0.0
- 
-     /*!
-         This property defines the RGBA color value which is used for the shadow.
-@@ -163,10 +105,6 @@ Item {
-             \li \l radius: 8
-             \li \l radius: 8
-             \li \l radius: 8
--        \row
--            \li \l samples: 17
--            \li \l samples: 17
--            \li \l samples: 17
-         \row
-             \li \l horizontalOffset: 0
-             \li \l horizontalOffset: 0
-@@ -180,8 +118,9 @@ Item {
-             \li \l spread: 0
-             \li \l spread: 0
-         \endtable
-+
-     */
--    property alias color: dbs.color
-+    property color color: "black"
- 
-     /*!
-         \qmlproperty real QtGraphicalEffects::DropShadow::horizontalOffset
-@@ -215,10 +154,6 @@ Item {
-             \li \l radius: 4
-             \li \l radius: 4
-             \li \l radius: 4
--        \row
--            \li \l samples: 9
--            \li \l samples: 9
--            \li \l samples: 9
-         \row
-             \li \l color: #000000
-             \li \l color: #000000
-@@ -233,43 +168,16 @@ Item {
-             \li \l spread: 0
-         \endtable
- 
--        \table
--        \header
--        \li Output examples with different verticalOffset values
--        \li
--        \li
--        \row
--            \li \image DropShadow_horizontalOffset2.png
--            \li \image DropShadow_spread1.png
--        \row
--            \li \b { horizontalOffset: 0 }
--            \li \b { horizontalOffset: 0 }
--        \row
--            \li \l radius: 4
--            \li \l radius: 8
--        \row
--            \li \l samples: 9
--            \li \l samples: 17
--        \row
--            \li \l color: #000000
--            \li \l color: #000000
--        \row
--            \li \l verticalOffset: 0
--            \li \l verticalOffset: 20
--        \row
--            \li \l spread: 0
--            \li \l spread: 0
--        \endtable
-     */
--    property alias horizontalOffset: dbs.horizontalOffset
--    property alias verticalOffset: dbs.verticalOffset
-+    property real horizontalOffset: 0.0
-+    property real verticalOffset: 0.0
- 
-     /*!
--        This property defines how large part of the shadow color is strengthened
-+        This property defines how large part of the shadow color is strenghtened
-         near the source edges.
- 
-         The value ranges from 0.0 to 1.0. By default, the property is set to \c
--        0.0.
-+        0.5.
- 
-         \table
-         \header
-@@ -288,10 +196,6 @@ Item {
-             \li \l radius: 8
-             \li \l radius: 8
-             \li \l radius: 8
--        \row
--            \li \l samples: 17
--            \li \l samples: 17
--            \li \l samples: 17
-         \row
-             \li \l color: #000000
-             \li \l color: #000000
-@@ -305,18 +209,9 @@ Item {
-             \li \l verticalOffset: 20
-             \li \l verticalOffset: 20
-         \endtable
--    */
--    property alias spread: dbs.spread
--
--    /*!
--        \internal
--
--        Starting Qt 5.6, this property has no effect. It is left here
--        for source compatibility only.
- 
--        ### Qt 6: remove
-     */
--    property bool fast: false
-+    property real spread: 0.0
- 
-     /*!
-         This property allows the effect output pixels to be cached in order to
-@@ -329,8 +224,9 @@ Item {
-         properties are animated.
- 
-         By default, the property is set to \c false.
-+
-     */
--    property alias cached: dbs.cached
-+    property bool cached: false
- 
-     /*!
-         This property determines whether or not the effect has a transparent
-@@ -339,16 +235,45 @@ Item {
-         When set to \c true, the exterior of the item is padded with a 1 pixel
-         wide transparent edge, making sampling outside the source texture use
-         transparency instead of the edge pixels. Without this property, an
--        image which has opaque edges will not get a blurred shadow.
-+        image which has opaque edges will not get a blurred edge.
- 
-         In the image below, the Rectangle on the left has transparent borders
-         and has blurred edges, whereas the Rectangle on the right does not:
- 
--        By default, this property is set to \c true.
--
-         \snippet DropShadow-transparentBorder-example.qml example
- 
-         \image DropShadow-transparentBorder.png
-     */
--    property alias transparentBorder: dbs.transparentBorder
-+    property bool transparentBorder: false
-+
-+    Loader {
-+        x: rootItem.horizontalOffset
-+        y: rootItem.verticalOffset
-+        width: parent.width
-+        height: parent.height
-+        sourceComponent: fastGlow
-+    }
-+
-+    Component {
-+        id: fastGlow
-+        FastGlow {
-+            anchors.fill: parent
-+            source: sourceProxy.output
-+            blur: Math.pow(rootItem.radius / 64.0, 0.4)
-+            color: rootItem.color
-+            cached: rootItem.cached
-+            spread: rootItem.spread
-+            transparentBorder: rootItem.transparentBorder
-+        }
-+    }
-+
-+    SourceProxy {
-+        id: sourceProxy
-+        input: rootItem.source
-+        sourceRect: rootItem.transparentBorder ? Qt.rect(-1, -1, parent.width + 2.0, parent.height + 2.0) : Qt.rect(0, 0, 0, 0)
-+    }
-+    ShaderEffect {
-+        anchors.fill: parent
-+        property variant source: sourceProxy.output
-+    }
- }
-diff --git a/src/imports/graphicaleffects5/Glow.qml b/src/imports/graphicaleffects5/Glow.qml
-index 67335ac..e4aad96 100644
---- a/src/imports/graphicaleffects5/Glow.qml
-+++ b/src/imports/graphicaleffects5/Glow.qml
-@@ -30,16 +30,7 @@ import Qt5Compat.GraphicalEffects.private
- 
- */
- Item {
--    id: root
--
--    DropShadowBase {
--        id: dps
--        anchors.fill: parent
--        color: "white"
--        spread: 0.5
--        horizontalOffset: 0
--        verticalOffset: 0
--    }
-+    id: rootItem
- 
-     /*!
-         This property defines the source item that is going to be used as source
-@@ -48,27 +39,14 @@ Item {
-         \note It is not supported to let the effect include itself, for
-         instance by setting source to the effect's parent.
-     */
--    property alias source: dps.source
-+    property variant source
- 
-     /*!
-         Radius defines the softness of the glow. A larger radius causes the
-         edges of the glow to appear more blurry.
- 
--        Depending on the radius value, value of the \l{Glow::samples}{samples}
--        should be set to sufficiently large to ensure the visual quality.
--
--        The ideal blur is achieved by selecting \c samples and \c radius such
--        that \c {samples = 1 + radius * 2}, such as:
--
--        \table
--        \header \li Radius             \li Samples
--        \row    \li 0 \e{(no blur)}    \li 1
--        \row    \li 1                  \li 3
--        \row    \li 2                  \li 5
--        \row    \li 3                  \li 7
--        \endtable
--
--        By default, the property is set to \c {floor(samples/2)}.
-+        The value ranges from 0.0 (no blur) to inf. By default, the property is
-+        set to \c 0.0 (no blur).
- 
-         \table
-         \header
-@@ -83,10 +61,6 @@ Item {
-             \li \b { radius: 0 }
-             \li \b { radius: 6 }
-             \li \b { radius: 12 }
--        \row
--            \li \l samples: 25
--            \li \l samples: 25
--            \li \l samples: 25
-         \row
-             \li \l color: #ffffff
-             \li \l color: #ffffff
-@@ -97,42 +71,15 @@ Item {
-             \li \l spread: 0
-         \endtable
-     */
--    property alias radius: dps.radius
--
--    /*!
--        This property defines how many samples are taken per pixel when edge
--        softening blur calculation is done. Larger value produces better
--        quality, but is slower to render.
--
--        Ideally, this value should be twice as large as the highest required
--        radius value plus one, such as:
--
--        \table
--        \header \li Radius             \li Samples
--        \row    \li 0 \e{(no blur)}    \li 1
--        \row    \li 1                  \li 3
--        \row    \li 2                  \li 5
--        \row    \li 3                  \li 7
--        \endtable
--
--        By default, the property is set to \c 9.
--
--        This property is not intended to be animated. Changing this property will
--        cause the underlying OpenGL shaders to be recompiled.
--    */
--    property alias samples: dps.samples
-+    property real radius: 0.0
- 
-     /*!
--        This property defines how large part of the glow color is strengthened
-+        This property defines how large part of the glow color is strenghtened
-         near the source edges.
- 
-         The values range from 0.0 to 1.0. By default, the property is set to \c
-         0.5.
- 
--        \note The implementation is optimized for medium and low spread values.
--        Depending on the source, spread values closer to 1.0 may yield visually
--        asymmetrical results.
--
-         \table
-         \header
-         \li Output examples with different spread values
-@@ -150,17 +97,13 @@ Item {
-             \li \l radius: 8
-             \li \l radius: 8
-             \li \l radius: 8
--        \row
--            \li \l samples: 17
--            \li \l samples: 17
--            \li \l samples: 17
-         \row
-             \li \l color: #ffffff
-             \li \l color: #ffffff
-             \li \l color: #ffffff
-         \endtable
-     */
--    property alias spread: dps.spread
-+    property real spread: 0.0
- 
-     /*!
-         This property defines the RGBA color value which is used for the glow.
-@@ -184,10 +127,6 @@ Item {
-             \li \l radius: 8
-             \li \l radius: 8
-             \li \l radius: 8
--        \row
--            \li \l samples: 17
--            \li \l samples: 17
--            \li \l samples: 17
-         \row
-             \li \l spread: 0.5
-             \li \l spread: 0.5
-@@ -195,17 +134,7 @@ Item {
-         \endtable
- 
-     */
--    property alias color: dps.color
--
--    /*!
--        \internal
--
--        Starting Qt 5.6, this property has no effect. It is left here
--        for source compatibility only.
--
--        ### Qt 6: remove
--    */
--    property bool fast: false
-+    property color color: "white"
- 
-     /*!
-         This property allows the effect output pixels to be cached in order to
-@@ -221,20 +150,17 @@ Item {
-         By default, the property is set to \c false.
- 
-     */
--    property alias cached: dps.cached
-+    property bool cached: false
- 
-     /*!
-         This property determines whether or not the effect has a transparent
-         border.
- 
--        When set to \c true, the exterior of the item is padded with a
--        transparent edge, making sampling outside the source texture use
-+        When set to \c true, the exterior of the item is padded with a 1 pixel
-+        wide transparent edge, making sampling outside the source texture use
-         transparency instead of the edge pixels. Without this property, an
-         image which has opaque edges will not get a blurred edge.
- 
--        By default, the property is set to \c true. Set it to false if the source
--        already has a transparent edge to make the blurring a tiny bit faster.
--
-         In the snippet below, the Rectangle on the left has transparent borders
-         and has blurred edges, whereas the Rectangle on the right does not.
- 
-@@ -242,5 +168,33 @@ Item {
- 
-         \image Glow-transparentBorder.png
-     */
--    property alias transparentBorder: dps.transparentBorder
-+    property bool transparentBorder: false
-+
-+    Loader {
-+        anchors.fill: parent
-+        sourceComponent: fastGlow
-+    }
-+
-+    Component {
-+        id: fastGlow
-+        FastGlow {
-+            anchors.fill: parent
-+            source: sourceProxy.output
-+            blur: Math.pow(rootItem.radius / 64.0, 0.4)
-+            color: rootItem.color
-+            cached: rootItem.cached
-+            spread: rootItem.spread
-+            transparentBorder: rootItem.transparentBorder
-+        }
-+    }
-+
-+    SourceProxy {
-+        id: sourceProxy
-+        input: rootItem.source
-+        sourceRect: rootItem.transparentBorder ? Qt.rect(-1, -1, parent.width + 2.0, parent.height + 2.0) : Qt.rect(0, 0, 0, 0)
-+    }
-+    ShaderEffect {
-+        anchors.fill: parent
-+        property variant source: sourceProxy.output
-+    }
- }
-diff --git a/src/imports/graphicaleffects5/private/CMakeLists.txt b/src/imports/graphicaleffects5/private/CMakeLists.txt
-index 47ccf59..7bcd661 100644
---- a/src/imports/graphicaleffects5/private/CMakeLists.txt
-+++ b/src/imports/graphicaleffects5/private/CMakeLists.txt
-@@ -6,13 +6,7 @@
- #####################################################################
- 
- set(qml_files
--    "DropShadowBase.qml"
-     "FastGlow.qml"
--    "FastInnerShadow.qml"
--    "GaussianDirectionalBlur.qml"
--    "GaussianGlow.qml"
--    "GaussianInnerShadow.qml"
--    "GaussianMaskedBlur.qml"
- )
- 
- qt_internal_add_qml_module(qtgraphicaleffectsprivate
-@@ -23,7 +17,6 @@ qt_internal_add_qml_module(qtgraphicaleffectsprivate
-     PAST_MAJOR_VERSIONS 1
-     SOURCES
-         qgfxsourceproxy.cpp qgfxsourceproxy_p.h
--        qgfxshaderbuilder.cpp qgfxshaderbuilder_p.h
-     QML_FILES
-         ${qml_files}
-     LIBRARIES
-@@ -31,6 +24,4 @@ qt_internal_add_qml_module(qtgraphicaleffectsprivate
-         Qt::GuiPrivate
-         Qt::QmlPrivate
-         Qt::QuickPrivate
--        Qt::ShaderTools
--        Qt::ShaderToolsPrivate
- )
-diff --git a/src/imports/graphicaleffects5/shaders_ng/compile.bat b/src/imports/graphicaleffects5/shaders_ng/compile.bat
-index 1e38742..398433e 100644
---- a/src/imports/graphicaleffects5/shaders_ng/compile.bat
-+++ b/src/imports/graphicaleffects5/shaders_ng/compile.bat
-@@ -9,8 +9,6 @@ qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o opacitymask_invert.frag.qsb
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o fastblur.frag.qsb fastblur.frag
- qsb -b --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o fastblur_internal.vert.qsb fastblur_internal.vert
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o fastblur_internal.frag.qsb fastblur_internal.frag
--qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o fastinnershadow.frag.qsb fastinnershadow.frag
--qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o fastinnershadow_level0.frag.qsb fastinnershadow_level0.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o fastglow.frag.qsb fastglow.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o colorize.frag.qsb colorize.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o brightnesscontrast.frag.qsb brightnesscontrast.frag
-@@ -18,8 +16,6 @@ qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o coloroverlay.frag.qsb color
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o desaturate.frag.qsb desaturate.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o displace.frag.qsb displace.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o gammaadjust.frag.qsb gammaadjust.frag
--qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o gaussianinnershadow.frag.qsb gaussianinnershadow.frag
--qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o gaussianinnershadow_shadow.frag.qsb gaussianinnershadow_shadow.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o huesaturation.frag.qsb huesaturation.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o rectangularglow.frag.qsb rectangularglow.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o thresholdmask.frag.qsb thresholdmask.frag
-@@ -29,8 +25,6 @@ qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o lineargradient_mask.frag.qs
- qsb -b --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o radialgradient.vert.qsb radialgradient.vert
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o radialgradient_nomask.frag.qsb radialgradient_nomask.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o radialgradient_mask.frag.qsb radialgradient_mask.frag
--qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o recursiveblur.frag.qsb recursiveblur.frag
--qsb -b --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o recursiveblur.vert.qsb recursiveblur.vert
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o conicalgradient_nomask.frag.qsb conicalgradient_nomask.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o conicalgradient_mask.frag.qsb conicalgradient_mask.frag
- qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o leveladjust.frag.qsb leveladjust.frag
-diff --git a/tests/manual/graphicaleffects5/CMakeLists.txt b/tests/manual/graphicaleffects5/CMakeLists.txt
-index 0d48ee2..31874ac 100644
---- a/tests/manual/graphicaleffects5/CMakeLists.txt
-+++ b/tests/manual/graphicaleffects5/CMakeLists.txt
-@@ -34,32 +34,23 @@ set(qml_resource_files
-     "../../../src/imports/graphicaleffects5/doc/images/butterfly.png"
-     "../../../src/imports/graphicaleffects5/doc/images/fog.png"
-     "../../../src/imports/graphicaleffects5/doc/images/glass_normal.png"
--    "BlendEffect.qml"
-     "BrightnessContrastEffect.qml"
-     "ColorOverlayEffect.qml"
-     "ColorizeEffect.qml"
-     "ConicalGradientEffect.qml"
-     "DesaturateEffect.qml"
--    "DirectionalBlurEffect.qml"
-     "DisplaceEffect.qml"
-     "DropShadowEffect.qml"
-     "FastBlurEffect.qml"
-     "GammaAdjustEffect.qml"
--    "GaussianBlurEffect.qml"
-     "GlowEffect.qml"
-     "HueSaturationEffect.qml"
--    "InnerShadowEffect.qml"
--    "InnerShadowFastEffect.qml"
-     "LevelAdjustEffect.qml"
-     "LinearGradientEffect.qml"
--    "MaskedBlurEffect.qml"
-     "OpacityMaskEffect.qml"
--    "RadialBlurEffect.qml"
-     "RadialGradientEffect.qml"
-     "RectangularGlowEffect.qml"
--    "RecursiveBlurEffect.qml"
-     "ThresholdMaskEffect.qml"
--    "ZoomBlurEffect.qml"
-     "main.qml"
- )
- 
-diff --git a/tests/manual/graphicaleffects5/main.qml b/tests/manual/graphicaleffects5/main.qml
-index 5ca69d4..7344467 100644
---- a/tests/manual/graphicaleffects5/main.qml
-+++ b/tests/manual/graphicaleffects5/main.qml
-@@ -28,7 +28,7 @@ Window {
-     Grid {
-         id: grid
-         anchors.fill: parent
--        columns: 6
-+        columns: 5
- 
-         BrightnessContrastEffect {
-             width: parent.width / parent.columns
-@@ -90,51 +90,11 @@ Window {
-             height: width
-         }
- 
--        InnerShadowEffect {
--            width: parent.width / parent.columns
--            height: width
--        }
--
--        InnerShadowFastEffect {
--            width: parent.width / parent.columns
--            height: width
--        }
--
-         FastBlurEffect {
-             width: parent.width / parent.columns
-             height: width
-         }
- 
--        GaussianBlurEffect {
--            width: parent.width / parent.columns
--            height: width
--        }
--
--        MaskedBlurEffect {
--            width: parent.width / parent.columns
--            height: width
--        }
--
--        RadialBlurEffect {
--            width: parent.width / parent.columns
--            height: width
--        }
--
--        RecursiveBlurEffect {
--            width: parent.width / parent.columns
--            height: width
--        }
--
--        ZoomBlurEffect {
--            width: parent.width / parent.columns
--            height: width
--        }
--
--        DirectionalBlurEffect {
--            width: parent.width / parent.columns
--            height: width
--        }
--
-         GlowEffect {
-             width: parent.width / parent.columns
-             height: width
-@@ -154,10 +114,5 @@ Window {
-             width: parent.width / parent.columns
-             height: width
-         }
--
--        BlendEffect {
--            width: parent.width / parent.columns
--            height: width
--        }
-     }
- }
-diff --git a/tests/manual/graphicaleffects5/qml.qrc b/tests/manual/graphicaleffects5/qml.qrc
-index 34207fe..f0a9401 100644
---- a/tests/manual/graphicaleffects5/qml.qrc
-+++ b/tests/manual/graphicaleffects5/qml.qrc
-@@ -22,14 +22,5 @@
-         <file>OpacityMaskEffect.qml</file>
-         <file alias="images/fog.png">../../../src/imports/graphicaleffects5/doc/images/fog.png</file>
-         <file>ThresholdMaskEffect.qml</file>
--        <file>GaussianBlurEffect.qml</file>
--        <file>MaskedBlurEffect.qml</file>
--        <file>BlendEffect.qml</file>
--        <file>DirectionalBlurEffect.qml</file>
--        <file>InnerShadowEffect.qml</file>
--        <file>InnerShadowFastEffect.qml</file>
--        <file>RadialBlurEffect.qml</file>
--        <file>RecursiveBlurEffect.qml</file>
--        <file>ZoomBlurEffect.qml</file>
-     </qresource>
- </RCC>
--- 
-2.44.0
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qt5compat/0002-Do-not-build-core5.patch Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qt5compat/SHA512SUMS Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qt5compat/rules.mak Deleted

@@ -1,39 +0,0 @@
-# Qt5Compat
-
-QT5COMPAT_VERSION := $(QTBASE_VERSION)
-QT5COMPAT_URL := $(QT)/$(QT5COMPAT_VERSION)/submodules/qt5compat-everywhere-src-$(QT5COMPAT_VERSION).tar.xz
-
-DEPS_qt5compat += qtdeclarative $(DEPS_qtdeclarative)
-
-ifdef HAVE_WIN32
-PKGS += qt5compat
-endif
-
-ifeq ($(call need_pkg,"Qt6Core5Compat >= $(QTBASE_VERSION_MAJOR)"),)
-PKGS_FOUND += qt5compat
-endif
-
-$(TARBALLS)/qt5compat-everywhere-src-$(QT5COMPAT_VERSION).tar.xz:
-	$(call download_pkg,$(QT5COMPAT_URL),qt)
-
-.sum-qt5compat: qt5compat-everywhere-src-$(QT5COMPAT_VERSION).tar.xz
-
-QT5_COMPAT_CONFIG := $(QT_CMAKE_CONFIG)
-ifdef ENABLE_PDB
-QT5_COMPAT_CONFIG += -DCMAKE_BUILD_TYPE=RelWithDebInfo
-else
-QT5_COMPAT_CONFIG += -DCMAKE_BUILD_TYPE=Release
-endif
-
-qt5compat: qt5compat-everywhere-src-$(QT5COMPAT_VERSION).tar.xz .sum-qt5compat
-	$(UNPACK)
-	$(APPLY) $(SRC)/qt5compat/0001-Revert-Auxiliary-commit-to-revert-individual-files-f.patch
-	$(APPLY) $(SRC)/qt5compat/0002-Do-not-build-core5.patch
-	$(MOVE)
-
-.qt5compat: qt5compat toolchain.cmake
-	$(CMAKECLEAN)
-	$(HOSTVARS_CMAKE) $(CMAKE) $(QT5_COMPAT_CONFIG)
-	+PATH="$(PATH):$(PREFIX)/bin" $(CMAKEBUILD)
-	$(CMAKEINSTALL)
-	touch $@

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/upnp/0001-disable-fseeko-usage-on-32-bit-Android-older-than-AP.patch Deleted

@@ -1,31 +0,0 @@
-From 270dd4063694c6138a893bfaebdddde4987c69d1 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@ycbcr.xyz>
-Date: Mon, 22 Apr 2024 13:17:15 +0200
-Subject: PATCH disable fseeko usage on 32-bit Android older than API 24
-
-feesko is not supported on 32-bit Android older than API 24 1.
-Older SDKs would allow the call but the 64-bit off_t was not accurate.
-With the NDK26 the call is hidden in that case and calling fseeko() results in a compilation error.
-
-1 https://android.googlesource.com/platform/bionic/+/main/docs/32-bit-abi.md
----
- upnp/src/genlib/net/http/httpreadwrite.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
-index 27e9c3a5..045e5d51 100644
---- a/upnp/src/genlib/net/http/httpreadwrite.c
-+++ b/upnp/src/genlib/net/http/httpreadwrite.c
-@@ -73,6 +73,9 @@
- 	#include <sys/types.h>
- 	#include <sys/utsname.h>
- 	#include <sys/wait.h>
-+	#if defined(__ANDROID__) && (!defined(__USE_FILE_OFFSET64) || __ANDROID_API__ < 24)
-+		#define fseeko fseek
-+	#endif
- #endif /* _WIN32 */
- 
- /*
--- 
-2.37.3.windows.1
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/x265/x265-enable-detect512.patch Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/x265/x265-ldl-linking.patch Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/x265/x265-no-pdb-install.patch Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/tools/libtool-2.4.7-clang-libs.patch Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/tools/libtool-2.4.7-embed-bitcode.patch Deleted

@@ -1,41 +0,0 @@
-From 019e9ec253a972fd5b0e3675140256b0982ec6f4 Mon Sep 17 00:00:00 2001
-From: Alexandre Janniaux <ajanni@videolabs.io>
-Date: Mon, 31 May 2021 10:28:54 +0200
-Subject: PATCH ltmain: add support for -fembed-bitcode
-
----
- build-aux/ltmain.in | 1 +
- m4/libtool.m4       | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 8ef537c1..d8131598 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -5197,6 +5197,7 @@ func_mode_link ()
- 	continue
- 	;;
-       -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
-+      |-fembed-bitcode|-fembed-bitcode-marker \
-       |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- 	func_append compiler_flags " $arg"
- 	func_append compile_command " $arg"
-diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index 69cd577d..da0eec54 100644
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -1122,9 +1122,9 @@ m4_defun(_LT_DARWIN_LINKER_FEATURES,
-   if test yes = "$_lt_dar_can_shared"; then
-     output_verbose_link_cmd=func_echo_all
-     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
--    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -dynamiclib \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-     _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
--    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-+    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -dynamiclib \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-     m4_if($1, CXX,
-    if test yes != "$lt_cv_apple_cc_single_mod"; then
-       _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
--- 
-2.36.0
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/tools/libtool-2.4.7-emscripten-dlinker.patch Deleted

@@ -1,36 +0,0 @@
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -6397,6 +6397,7 @@ func_mode_link ()
-		case $host in
-		  *-*-sco3.2v5.0.024*) add_dir=-L$dir ;;
-		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
-+		  *-*-emscripten*) add_dir=-L$dir ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.01.10* | \
-		    *-*-unixware7*) add_dir=-L$dir ;;
-		  *-*-darwin* )
-diff --git a/m4/libtool.m4 b/m4/libtool.m4
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -3081,6 +3081,21 @@ uts4*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
-
-+emscripten*)
-+  version_type=none
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='$libname$release$shared_ext'
-+  soname_spec='$libname$release$shared_ext'
-+  finish_cmds=
-+  dynamic_linker="Emscripten linker"
-+  _LT_COMPILER_PIC($1)='-fPIC'
-+  _LT_TAGVAR(archive_cmds, $1)='$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib'
-+  _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib -s EXPORTED_FUNCTIONS=@$output_objdir/$soname.expsym'
-+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+  _LT_TAGVAR(no_undefined_flag, $1)=
-+  ;;
-+
- *)
-   dynamic_linker=no
-   ;;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/tools/libtool-2.4.7-response-files.patch Deleted

@@ -1,83 +0,0 @@
-From 5fe8ae738927cd2c7e6d786b359e39876c84630c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Wed, 10 Oct 2018 10:47:21 +0300
-Subject: PATCH Prefer response files over linker scripts for mingw tools
-
-The GCC/binutils tools support response files just fine, while
-lld (impersonating GNU ld) only supports response files, not
-linker scripts. Using a linker script as input just to pass a
-list of files is overkill for cases when a response file is enough.
----
- libtool-2.4.6/build-aux/ltmain.in | 28 ++++++++++++++--------------
- libtool-2.4.6/m4/libtool.m4      |  2 ++
- 2 files changed, 16 insertions(+), 14 deletions(-)
-
-diff --git libtool-2.4.6/build-aux/ltmain.in.orig libtool-2.4.6/build-aux/ltmain.in
-index 2641327..f6b4217 100644
---- libtool-2.4.6/build-aux/ltmain.in.orig	2019-05-14 15:41:21.977391100 +0200
-+++ libtool-2.4.6/build-aux/ltmain.in	2019-05-14 15:43:07.767697900 +0200
-@@ -9852,20 +9852,7 @@ EOF
- 	  last_robj=
- 	  k=1
- 
--	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
--	    output=$output_objdir/$output_la.lnkscript
--	    func_verbose "creating GNU ld script: $output"
--	    echo 'INPUT (' > $output
--	    for obj in $save_libobjs
--	    do
--	      func_to_tool_file "$obj"
--	      $ECHO "$func_to_tool_file_result" >> $output
--	    done
--	    echo ')' >> $output
--	    func_append delfiles " $output"
--	    func_to_tool_file "$output"
--	    output=$func_to_tool_file_result
--	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
-+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
- 	    output=$output_objdir/$output_la.lnk
- 	    func_verbose "creating linker input file list: $output"
- 	    : > $output
-@@ -9884,6 +9871,19 @@ EOF
- 	    func_append delfiles " $output"
- 	    func_to_tool_file "$output"
- 	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
-+	    output=$output_objdir/$output_la.lnkscript
-+	    func_verbose "creating GNU ld script: $output"
-+	    echo 'INPUT (' > $output
-+	    for obj in $save_libobjs
-+	    do
-+	      func_to_tool_file "$obj"
-+	      $ECHO "$func_to_tool_file_result" >> $output
-+	    done
-+	    echo ')' >> $output
-+	    func_append delfiles " $output"
-+	    func_to_tool_file "$output"
-+	    output=$func_to_tool_file_result
- 	  else
- 	    if test -n "$save_libobjs"; then
- 	      func_verbose "creating reloadable object files..."
-diff --git libtool-2.4.6/m4/libtool.m4.orig libtool-2.4.6/m4/libtool.m4
-index 6f93d32..2c5c2f0 100644
---- libtool-2.4.6/m4/libtool.m4.orig
-+++ libtool-2.4.6/m4/libtool.m4
-@@ -4750,6 +4750,7 @@ _LT_EOF
-       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
-       _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
-+      _LT_TAGVAR(file_list_spec, $1)='@'
- 
-       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -6166,6 +6167,7 @@ if test "$_lt_caught_CXX_error" != yes; then
- 	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- 	  _LT_TAGVAR(always_export_symbols, $1)=no
- 	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+	  _LT_TAGVAR(file_list_spec, $1)='@'
- 
- 	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--- 
-2.7.4
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_thumbnailer.h Deleted

@@ -1,145 +0,0 @@
-/*****************************************************************************
- * vlc_thumbnailer.h: Thumbnailing API
- *****************************************************************************
- * Copyright (C) 2018 VLC authors and VideoLAN
- *
- * Authors: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef VLC_THUMBNAILER_H
-#define VLC_THUMBNAILER_H
-
-#include <vlc_common.h>
-#include <vlc_tick.h>
-
-typedef struct vlc_thumbnailer_t vlc_thumbnailer_t;
-typedef size_t vlc_thumbnailer_req_id;
-
-#define VLC_THUMBNAILER_REQ_ID_INVALID 0
-
-/**
- * thumbnailer callbacks
- */
-struct vlc_thumbnailer_cbs
-{
-    /**
-     * Event received on thumbnailing completion or error
-     *
-     * This callback will always be called, provided vlc_thumbnailer_Request
-     * returned a valid request, and provided the request is not cancelled
-     * before its completion.
-     *
-     * @note This callback is mandatory.
-     *
-     * In case of failure, timeout or cancellation, p_thumbnail will be NULL.
-     * The picture, if any, is owned by the thumbnailer, and must be acquired
-     * by using \link picture_Hold \endlink to use it pass the callback's
-     * scope.
-     *
-     * \param thumbnail The generated thumbnail, or NULL in case of failure or
-     * timeout
-     * \param data Is the opaque pointer passed as vlc_thumbnailer_Request last
-     * parameter
-     */
-    void (*on_ended)(picture_t* thumbnail, void *data);
-};
-
-/**
- * \brief vlc_thumbnailer_Create Creates a thumbnailer object
- * \param parent A VLC object
- * @param timeout timeout of the thumbnailer, 0 for no limits.
- * \return A thumbnailer object, or NULL in case of failure
- */
-VLC_API vlc_thumbnailer_t*
-vlc_thumbnailer_Create(vlc_object_t* parent, vlc_tick_t timeout) VLC_USED;
-
-/**
- * Thumbnailer seek argument
- */
-struct vlc_thumbnailer_seek_arg
-{
-    enum
-    {
-        /** Don't seek */
-        VLC_THUMBNAILER_SEEK_NONE,
-        /** Seek by time */
-        VLC_THUMBNAILER_SEEK_TIME,
-        /** Seek by position */
-        VLC_THUMBNAILER_SEEK_POS,
-    } type;
-    union
-    {
-        /** Seek time if type == VLC_THUMBNAILER_SEEK_TIME */
-        vlc_tick_t time;
-        /** Seek position if type == VLC_THUMBNAILER_SEEK_POS */
-        double pos;
-    };
-    enum
-    {
-        /** Precise, but potentially slow */
-        VLC_THUMBNAILER_SEEK_PRECISE,
-        /** Fast, but potentially imprecise */
-        VLC_THUMBNAILER_SEEK_FAST,
-    } speed;
-};
-
-/**
- * \brief vlc_thumbnailer_Request Requests a thumbnailer
- * \param thumbnailer A thumbnailer object
- * \param input_item The input item to generate the thumbnail for
- * \param seek_arg pointer to a seek struct, that tell at which time the
- * thumbnail should be taken, NULL to disable seek
- * \param timeout A timeout value, or VLC_TICK_INVALID to disable timeout
- * \param cbs callback to listen to events (can't be NULL)
- * \param cbs_userdata opaque pointer used by the callbacks
- * \return VLC_THUMBNAILER_REQ_ID_INVALID in case of error, or a valid id if the
- * item was scheduled for thumbnailing. If this returns an
- * error, the on_ended callback will *not* be invoked
- *
- * The provided input_item will be held by the thumbnailer and can safely be
- * released safely after calling this function.
- */
-VLC_API vlc_thumbnailer_req_id
-vlc_thumbnailer_Request( vlc_thumbnailer_t *thumbnailer,
-                         input_item_t *input_item,
-                         const struct vlc_thumbnailer_seek_arg *seek_arg,
-                         const struct vlc_thumbnailer_cbs *cbs,
-                         void *cbs_userdata );
-
-/**
- * \brief vlc_thumbnailer_Camcel Cancel a thumbnail request
- * \param thumbnailer A thumbnailer object
- * \param id unique id returned by vlc_thumbnailer_Request*(),
- * VLC_THUMBNAILER_REQ_ID_INVALID to cancels all tasks
- * \return number of tasks cancelled
- */
-VLC_API size_t
-vlc_thumbnailer_Cancel( vlc_thumbnailer_t* thumbnailer, vlc_thumbnailer_req_id id );
-
-/**
- * \brief vlc_thumbnailer_Delete Deletes a thumbnailer and cancel all pending requests
- * \param thumbnailer A thumbnailer object
- */
-VLC_API void vlc_thumbnailer_Delete( vlc_thumbnailer_t* thumbnailer );
-
-/**
- * Do not use, libVLC only fonction, will be removed soon
- */
-VLC_API void vlc_thumbnailer_SetTimeout( vlc_thumbnailer_t *thumbnailer,
-                                         vlc_tick_t timeout ) VLC_DEPRECATED;
-
-#endif // VLC_THUMBNAILER_H

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/Cargo.toml Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/dtv/bdadefs.h Deleted

@@ -1,303 +0,0 @@
-/*****************************************************************************
- * bdadefs.h : DirectShow BDA headers for vlc
- *****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
- *
- * Author: Ken Self <kenself(at)optusnet(dot)com(dot)au>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#include <tuner.h>
-#include <mpeg2structs.h>
-
-#ifndef __ISampleGrabberCB_FWD_DEFINED__
-#define __ISampleGrabberCB_FWD_DEFINED__
-typedef interface ISampleGrabberCB ISampleGrabberCB;
-#ifdef __cplusplus
-interface ISampleGrabberCB;
-#endif /* __cplusplus */
-#endif
-
-#ifndef __ISampleGrabber_FWD_DEFINED__
-#define __ISampleGrabber_FWD_DEFINED__
-typedef interface ISampleGrabber ISampleGrabber;
-#ifdef __cplusplus
-interface ISampleGrabber;
-#endif /* __cplusplus */
-#endif
-
-
-/*****************************************************************************
- * ISampleGrabberCB interface
- */
-#ifndef __ISampleGrabberCB_INTERFACE_DEFINED__
-#define __ISampleGrabberCB_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_ISampleGrabberCB, 0x0579154a, 0x2b53, 0x4994, 0xb0,0xd0, 0xe7,0x73,0x14,0x8e,0xff,0x85);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-MIDL_INTERFACE("0579154a-2b53-4994-b0d0-e773148eff85")
-ISampleGrabberCB : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE SampleCB(
-        double SampleTime,
-        IMediaSample *pSample) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE BufferCB(
-        double SampleTime,
-        BYTE *pBuffer,
-        LONG BufferLen) = 0;
-
-};
-#ifdef __CRT_UUID_DECL
-__CRT_UUID_DECL(ISampleGrabberCB, 0x0579154a, 0x2b53, 0x4994, 0xb0,0xd0, 0xe7,0x73,0x14,0x8e,0xff,0x85)
-#endif
-#else
-typedef struct ISampleGrabberCBVtbl {
-    BEGIN_INTERFACE
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISampleGrabberCB *This,
-        REFIID riid,
-        void **ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISampleGrabberCB *This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        ISampleGrabberCB *This);
-
-    /*** ISampleGrabberCB methods ***/
-    HRESULT (STDMETHODCALLTYPE *SampleCB)(
-        ISampleGrabberCB *This,
-        double SampleTime,
-        IMediaSample *pSample);
-
-    HRESULT (STDMETHODCALLTYPE *BufferCB)(
-        ISampleGrabberCB *This,
-        double SampleTime,
-        BYTE *pBuffer,
-        LONG BufferLen);
-
-    END_INTERFACE
-} ISampleGrabberCBVtbl;
-
-interface ISampleGrabberCB {
-    CONST_VTBL ISampleGrabberCBVtbl* lpVtbl;
-};
-
-#ifdef COBJMACROS
-#ifndef WIDL_C_INLINE_WRAPPERS
-/*** IUnknown methods ***/
-#define ISampleGrabberCB_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define ISampleGrabberCB_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define ISampleGrabberCB_Release(This) (This)->lpVtbl->Release(This)
-/*** ISampleGrabberCB methods ***/
-#define ISampleGrabberCB_SampleCB(This,SampleTime,pSample) (This)->lpVtbl->SampleCB(This,SampleTime,pSample)
-#define ISampleGrabberCB_BufferCB(This,SampleTime,pBuffer,BufferLen) (This)->lpVtbl->BufferCB(This,SampleTime,pBuffer,BufferLen)
-#else
-/*** IUnknown methods ***/
-static FORCEINLINE HRESULT ISampleGrabberCB_QueryInterface(ISampleGrabberCB* This,REFIID riid,void **ppvObject) {
-    return This->lpVtbl->QueryInterface(This,riid,ppvObject);
-}
-static FORCEINLINE ULONG ISampleGrabberCB_AddRef(ISampleGrabberCB* This) {
-    return This->lpVtbl->AddRef(This);
-}
-static FORCEINLINE ULONG ISampleGrabberCB_Release(ISampleGrabberCB* This) {
-    return This->lpVtbl->Release(This);
-}
-/*** ISampleGrabberCB methods ***/
-static FORCEINLINE HRESULT ISampleGrabberCB_SampleCB(ISampleGrabberCB* This,double SampleTime,IMediaSample *pSample) {
-    return This->lpVtbl->SampleCB(This,SampleTime,pSample);
-}
-static FORCEINLINE HRESULT ISampleGrabberCB_BufferCB(ISampleGrabberCB* This,double SampleTime,BYTE *pBuffer,LONG BufferLen) {
-    return This->lpVtbl->BufferCB(This,SampleTime,pBuffer,BufferLen);
-}
-#endif
-#endif
-
-#endif
-
-
-#endif  /* __ISampleGrabberCB_INTERFACE_DEFINED__ */
-
-/*****************************************************************************
- * ISampleGrabber interface
- */
-#ifndef __ISampleGrabber_INTERFACE_DEFINED__
-#define __ISampleGrabber_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_ISampleGrabber, 0x6b652fff, 0x11fe, 0x4fce, 0x92,0xad, 0x02,0x66,0xb5,0xd7,0xc7,0x8f);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-MIDL_INTERFACE("6b652fff-11fe-4fce-92ad-0266b5d7c78f")
-ISampleGrabber : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE SetOneShot(
-        BOOL OneShot) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetMediaType(
-        const AM_MEDIA_TYPE *pType) = 0;
-
-    virtual HRESULT __stdcall GetConnectedMediaType(
-        AM_MEDIA_TYPE *pType) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetBufferSamples(
-        BOOL BufferThem) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetCurrentBuffer(
-        LONG *pBufferSize,
-        LONG *pBuffer) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetCurrentSample(
-        IMediaSample **ppSample) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetCallback(
-        ISampleGrabberCB *pCallback,
-        LONG WhichMethodToCallback) = 0;
-
-};
-#ifdef __CRT_UUID_DECL
-__CRT_UUID_DECL(ISampleGrabber, 0x6b652fff, 0x11fe, 0x4fce, 0x92,0xad, 0x02,0x66,0xb5,0xd7,0xc7,0x8f)
-#endif
-#else
-typedef struct ISampleGrabberVtbl {
-    BEGIN_INTERFACE
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISampleGrabber *This,
-        REFIID riid,
-        void **ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISampleGrabber *This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        ISampleGrabber *This);
-
-    /*** ISampleGrabber methods ***/
-    HRESULT (STDMETHODCALLTYPE *SetOneShot)(
-        ISampleGrabber *This,
-        BOOL OneShot);
-
-    HRESULT (STDMETHODCALLTYPE *SetMediaType)(
-        ISampleGrabber *This,
-        const AM_MEDIA_TYPE *pType);
-
-    HRESULT (STDMETHODCALLTYPE *GetConnectedMediaType)(
-        ISampleGrabber *This,
-        AM_MEDIA_TYPE *pType);
-
-    HRESULT (STDMETHODCALLTYPE *SetBufferSamples)(
-        ISampleGrabber *This,
-        BOOL BufferThem);
-
-    HRESULT (STDMETHODCALLTYPE *GetCurrentBuffer)(
-        ISampleGrabber *This,
-        LONG *pBufferSize,
-        LONG *pBuffer);
-
-    HRESULT (STDMETHODCALLTYPE *GetCurrentSample)(
-        ISampleGrabber *This,
-        IMediaSample **ppSample);
-
-    HRESULT (STDMETHODCALLTYPE *SetCallback)(
-        ISampleGrabber *This,
-        ISampleGrabberCB *pCallback,
-        LONG WhichMethodToCallback);
-
-    END_INTERFACE
-} ISampleGrabberVtbl;
-
-interface ISampleGrabber {
-    CONST_VTBL ISampleGrabberVtbl* lpVtbl;
-};
-
-#ifdef COBJMACROS
-#ifndef WIDL_C_INLINE_WRAPPERS
-/*** IUnknown methods ***/
-#define ISampleGrabber_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define ISampleGrabber_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define ISampleGrabber_Release(This) (This)->lpVtbl->Release(This)
-/*** ISampleGrabber methods ***/
-#define ISampleGrabber_SetOneShot(This,OneShot) (This)->lpVtbl->SetOneShot(This,OneShot)
-#define ISampleGrabber_SetMediaType(This,pType) (This)->lpVtbl->SetMediaType(This,pType)
-#define ISampleGrabber_GetConnectedMediaType(This,pType) (This)->lpVtbl->GetConnectedMediaType(This,pType)
-#define ISampleGrabber_SetBufferSamples(This,BufferThem) (This)->lpVtbl->SetBufferSamples(This,BufferThem)
-#define ISampleGrabber_GetCurrentBuffer(This,pBufferSize,pBuffer) (This)->lpVtbl->GetCurrentBuffer(This,pBufferSize,pBuffer)
-#define ISampleGrabber_GetCurrentSample(This,ppSample) (This)->lpVtbl->GetCurrentSample(This,ppSample)
-#define ISampleGrabber_SetCallback(This,pCallback,WhichMethodToCallback) (This)->lpVtbl->SetCallback(This,pCallback,WhichMethodToCallback)
-#else
-/*** IUnknown methods ***/
-static FORCEINLINE HRESULT ISampleGrabber_QueryInterface(ISampleGrabber* This,REFIID riid,void **ppvObject) {
-    return This->lpVtbl->QueryInterface(This,riid,ppvObject);
-}
-static FORCEINLINE ULONG ISampleGrabber_AddRef(ISampleGrabber* This) {
-    return This->lpVtbl->AddRef(This);
-}
-static FORCEINLINE ULONG ISampleGrabber_Release(ISampleGrabber* This) {
-    return This->lpVtbl->Release(This);
-}
-/*** ISampleGrabber methods ***/
-static FORCEINLINE HRESULT ISampleGrabber_SetOneShot(ISampleGrabber* This,BOOL OneShot) {
-    return This->lpVtbl->SetOneShot(This,OneShot);
-}
-static FORCEINLINE HRESULT ISampleGrabber_SetMediaType(ISampleGrabber* This,const AM_MEDIA_TYPE *pType) {
-    return This->lpVtbl->SetMediaType(This,pType);
-}
-static FORCEINLINE HRESULT ISampleGrabber_GetConnectedMediaType(ISampleGrabber* This,AM_MEDIA_TYPE *pType) {
-    return This->lpVtbl->GetConnectedMediaType(This,pType);
-}
-static FORCEINLINE HRESULT ISampleGrabber_SetBufferSamples(ISampleGrabber* This,BOOL BufferThem) {
-    return This->lpVtbl->SetBufferSamples(This,BufferThem);
-}
-static FORCEINLINE HRESULT ISampleGrabber_GetCurrentBuffer(ISampleGrabber* This,LONG *pBufferSize,LONG *pBuffer) {
-    return This->lpVtbl->GetCurrentBuffer(This,pBufferSize,pBuffer);
-}
-static FORCEINLINE HRESULT ISampleGrabber_GetCurrentSample(ISampleGrabber* This,IMediaSample **ppSample) {
-    return This->lpVtbl->GetCurrentSample(This,ppSample);
-}
-static FORCEINLINE HRESULT ISampleGrabber_SetCallback(ISampleGrabber* This,ISampleGrabberCB *pCallback,LONG WhichMethodToCallback) {
-    return This->lpVtbl->SetCallback(This,pCallback,WhichMethodToCallback);
-}
-#endif
-#endif
-
-#endif
-
-
-#endif  /* __ISampleGrabber_INTERFACE_DEFINED__ */
-
-
-extern "C" {
-DEFINE_GUID(CLSID_DigitalCableNetworkType,
-    0x143827AB,0xF77B,0x498d,0x81,0xCA,0x5A,0x00,0x7A,0xEC,0x28,0xBF);
-
-/* KSCATEGORY_BDA */
-DEFINE_GUID(KSCATEGORY_BDA_NETWORK_PROVIDER,
-    0x71985F4B,0x1CA1,0x11d3,0x9C,0xC8,0x00,0xC0,0x4F,0x79,0x71,0xE0);
-DEFINE_GUID(KSCATEGORY_BDA_TRANSPORT_INFORMATION,
-    0xa2e3074f,0x6c3d,0x11d3,0xb6,0x53,0x00,0xc0,0x4f,0x79,0x49,0x8e);
-DEFINE_GUID(KSCATEGORY_BDA_RECEIVER_COMPONENT,
-    0xFD0A5AF4,0xB41D,0x11d2,0x9c,0x95,0x00,0xc0,0x4f,0x79,0x71,0xe0);
-DEFINE_GUID(KSCATEGORY_BDA_NETWORK_TUNER,
-    0x71985f48,0x1ca1,0x11d3,0x9c,0xc8,0x00,0xc0,0x4f,0x79,0x71,0xe0);
-DEFINE_GUID(KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT,
-    0xF4AEB342,0x0329,0x4fdd,0xA8,0xFD,0x4A,0xFF,0x49,0x26,0xC9,0x78);
-
-extern const CLSID CLSID_SampleGrabber; // found in strmiids
-
-};

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mp4/mpeg4.h Deleted

@@ -1,128 +0,0 @@
-/*****************************************************************************
- * mpeg4.h: MPEG4 ISO-14496-1 definitions
- *****************************************************************************
- * Copyright (C) 2001-2019 VLC authors, VideoLAN and VideoLabs
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-#ifndef MP4_MPEG4_H
-#define MP4_MPEG4_H
-
-#include <vlc_codec.h>
-#include "../../packetizer/dts_header.h"
-
-static inline bool MPEG4_Codec_By_ObjectType(uint8_t oti,
-                                              const uint8_t *p_dsi,
-                                              size_t i_dsi,
-                                              vlc_fourcc_t *pi_codec,
-                                              int *pi_profile)
-{
-    /* See 14496-1 and http://mp4ra.org/#/object_types */
-    switch(oti)
-    {
-        case 0x20: /* MPEG4 VIDEO */
-            *pi_codec = VLC_CODEC_MP4V;
-            break;
-        case 0x21: /* H.264 */
-            *pi_codec = VLC_CODEC_H264;
-            break;
-        case 0x22: /* H.265 */
-            *pi_codec = VLC_CODEC_HEVC;
-            break;
-        case 0x23: /* H.266 */
-            *pi_codec = VLC_CODEC_VVC;
-            break;
-        case 0x40:
-        case 0x41:
-            *pi_codec = VLC_CODEC_MP4A;
-            if(i_dsi >= 2 && p_dsi0 == 0xF8 && (p_dsi1&0xE0)== 0x80)
-                *pi_codec = VLC_CODEC_ALS;
-            break;
-        case 0x60:
-        case 0x61:
-        case 0x62:
-        case 0x63:
-        case 0x64:
-        case 0x65: /* MPEG2 video */
-            *pi_codec = VLC_CODEC_MPGV;
-            break;
-            /* Theses are MPEG2-AAC */
-        case 0x66: /* main profile */
-        case 0x67: /* Low complexity profile */
-        case 0x68: /* Scalable Sampling rate profile */
-            *pi_codec = VLC_CODEC_MP4A;
-            break;
-            /* True MPEG 2 audio */
-        case 0x69:
-            *pi_codec = VLC_CODEC_MPGA;
-            break;
-        case 0x6a: /* MPEG1 video */
-            *pi_codec = VLC_CODEC_MPGV;
-            break;
-        case 0x6b: /* MPEG1 audio */
-            *pi_codec = VLC_CODEC_MPGA;
-            break;
-        case 0x6c: /* jpeg */
-            *pi_codec = VLC_CODEC_JPEG;
-            break;
-        case 0x6d: /* png */
-            *pi_codec = VLC_CODEC_PNG;
-            break;
-        case 0x6e: /* jpeg2000 */
-            *pi_codec = VLC_FOURCC('M','J','2','C');
-            break;
-        case 0xa3: /* vc1 */
-            *pi_codec = VLC_CODEC_VC1;
-            break;
-        case 0xa4:
-            *pi_codec = VLC_CODEC_DIRAC;
-            break;
-        case 0xa5:
-            *pi_codec = VLC_CODEC_A52;
-            break;
-        case 0xa6:
-            *pi_codec = VLC_CODEC_EAC3;
-            break;
-        case 0xa9: /* dts */
-            *pi_codec = VLC_CODEC_DTS;
-            break;
-        case 0xaa: /* DTS-HD HRA */
-        case 0xab: /* DTS-HD Master Audio */
-            *pi_profile = PROFILE_DTS_HD;
-            *pi_codec = VLC_CODEC_DTS;
-            break;
-        case 0xac: /* Extension Substream containing only LBR */
-            *pi_profile = PROFILE_DTS_EXPRESS;
-            *pi_codec = VLC_CODEC_DTS;
-            break;
-        case 0xad:
-            *pi_codec = VLC_CODEC_OPUS;
-            break;
-        case 0xB1:
-            *pi_codec = VLC_CODEC_VP9;
-            break;
-        case 0xDD:
-            *pi_codec = VLC_CODEC_VORBIS;
-            break;
-        case 0xE1:
-            *pi_codec = VLC_CODEC_QCELP;
-            break;
-        default:
-            return false;
-    }
-    return true;
-}
-
-#endif

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryWindowPlaylistView.xib Deleted

@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
-        <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="VLCLibraryWindowPlaylistSidebarViewController">
-            <connections>
-                <outlet property="bottomButtonsSeparator" destination="ew3-Pn-diG" id="N5L-cw-953"/>
-                <outlet property="dragDropImageBackgroundBox" destination="aUB-Ld-N2o" id="9xc-5h-uRF"/>
-                <outlet property="dragDropView" destination="grx-kk-1X1" id="b1W-Zw-a7Z"/>
-                <outlet property="openMediaButton" destination="ghp-DI-YmZ" id="30J-m7-gLb"/>
-                <outlet property="repeatButton" destination="9xU-Ba-Hys" id="myS-5X-rgK"/>
-                <outlet property="shuffleButton" destination="bdZ-N9-Noa" id="bJz-sR-lGW"/>
-                <outlet property="tableView" destination="Ubg-RS-LWE" id="ZiJ-ca-sOj"/>
-                <outlet property="titleSeparator" destination="ik5-L4-VLw" id="qht-tq-0rB"/>
-                <outlet property="view" destination="NJR-gf-yTs" id="P3C-tn-4va"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView identifier="VLCLibraryWindowPlaylistSidebarIdentifier" id="NJR-gf-yTs">
-            <rect key="frame" x="0.0" y="0.0" width="510" height="266"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <box verticalHuggingPriority="751" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="ik5-L4-VLw">
-                    <rect key="frame" x="20" y="263" width="470" height="5"/>
-                </box>
-                <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EIb-Is-vco">
-                    <rect key="frame" x="0.0" y="55" width="510" height="210"/>
-                    <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="20t-S6-IYS">
-                        <rect key="frame" x="0.0" y="0.0" width="510" height="210"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" autosaveColumns="NO" rowHeight="16" rowSizeStyle="automatic" viewBased="YES" id="Ubg-RS-LWE" customClass="VLCPlaylistTableView">
-                                <rect key="frame" x="0.0" y="0.0" width="510" height="210"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <size key="intercellSpacing" width="3" height="2"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
-                                <tableColumns>
-                                    <tableColumn width="478" minWidth="40" maxWidth="1000" id="vsk-lo-Poz">
-                                        <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                            <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                        </tableHeaderCell>
-                                        <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="hd9-0h-vDz">
-                                            <font key="font" metaFont="message"/>
-                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                        <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                        <prototypeCellViews>
-                                            <tableCellView id="16d-Sp-wg1">
-                                                <rect key="frame" x="11" y="1" width="487" height="16"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                <subviews>
-                                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="UNu-bV-KHW">
-                                                        <rect key="frame" x="0.0" y="0.0" width="487" height="16"/>
-                                                        <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="cHf-3e-UVA">
-                                                            <font key="font" metaFont="message"/>
-                                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                        </textFieldCell>
-                                                    </textField>
-                                                </subviews>
-                                                <constraints>
-                                                    <constraint firstItem="UNu-bV-KHW" firstAttribute="centerX" secondItem="16d-Sp-wg1" secondAttribute="centerX" id="3lH-fF-e4z"/>
-                                                    <constraint firstItem="UNu-bV-KHW" firstAttribute="leading" secondItem="16d-Sp-wg1" secondAttribute="leading" constant="2" id="daN-fU-MF2"/>
-                                                    <constraint firstItem="UNu-bV-KHW" firstAttribute="centerY" secondItem="16d-Sp-wg1" secondAttribute="centerY" id="gxh-uO-KDR"/>
-                                                </constraints>
-                                                <connections>
-                                                    <outlet property="textField" destination="UNu-bV-KHW" id="M8y-bv-h0J"/>
-                                                </connections>
-                                            </tableCellView>
-                                        </prototypeCellViews>
-                                    </tableColumn>
-                                </tableColumns>
-                                <connections>
-                                    <action trigger="doubleAction" selector="tableDoubleClickAction:" target="-2" id="dA1-82-uPF"/>
-                                </connections>
-                            </tableView>
-                        </subviews>
-                        <nil key="backgroundColor"/>
-                    </clipView>
-                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="d8X-HO-km5">
-                        <rect key="frame" x="-100" y="-100" width="0.0" height="16"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </scroller>
-                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="pGF-gC-QOo">
-                        <rect key="frame" x="494" y="0.0" width="16" height="27"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </scroller>
-                </scrollView>
-                <box verticalHuggingPriority="751" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="ew3-Pn-diG">
-                    <rect key="frame" x="20" y="52" width="470" height="5"/>
-                </box>
-                <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="grx-kk-1X1" customClass="VLCDragDropView">
-                    <rect key="frame" x="0.0" y="55" width="510" height="210"/>
-                    <subviews>
-                        <box boxType="custom" borderType="line" borderWidth="0.0" cornerRadius="10" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="aUB-Ld-N2o">
-                            <rect key="frame" x="188" y="38" width="134" height="134"/>
-                            <view key="contentView" id="9Ay-rU-2bA">
-                                <rect key="frame" x="0.0" y="0.0" width="134" height="134"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            </view>
-                            <color key="borderColor" name="separatorColor" catalog="System" colorSpace="catalog"/>
-                        </box>
-                        <imageView translatesAutoresizingMaskIntoConstraints="NO" id="qv6-Mn-ifA" customClass="VLCDropDisabledImageView">
-                            <rect key="frame" x="199" y="49" width="112" height="112"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="112" id="CUl-4Z-0sw"/>
-                                <constraint firstAttribute="width" constant="112" id="MpG-av-aGj"/>
-                            </constraints>
-                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="dropzone" id="AZ2-8e-Rrz"/>
-                        </imageView>
-                        <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ghp-DI-YmZ">
-                            <rect key="frame" x="196" y="1" width="119" height="32"/>
-                            <buttonCell key="cell" type="push" title="Open media..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="07D-yu-JVI">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="openMedia:" target="-2" id="bNF-Oh-7mm"/>
-                            </connections>
-                        </button>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="qv6-Mn-ifA" firstAttribute="centerY" secondItem="grx-kk-1X1" secondAttribute="centerY" id="AO4-Hd-L52"/>
-                        <constraint firstItem="aUB-Ld-N2o" firstAttribute="centerX" secondItem="qv6-Mn-ifA" secondAttribute="centerX" id="DKc-9E-HYo"/>
-                        <constraint firstItem="aUB-Ld-N2o" firstAttribute="width" secondItem="qv6-Mn-ifA" secondAttribute="width" multiplier="1.2" id="Jkb-0O-auX"/>
-                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="210" id="UHR-0G-iJA"/>
-                        <constraint firstItem="ghp-DI-YmZ" firstAttribute="top" secondItem="aUB-Ld-N2o" secondAttribute="bottom" constant="10" id="XFC-9r-Q8L"/>
-                        <constraint firstItem="aUB-Ld-N2o" firstAttribute="height" secondItem="qv6-Mn-ifA" secondAttribute="height" multiplier="1.2" id="eJ2-wz-BJL"/>
-                        <constraint firstItem="ghp-DI-YmZ" firstAttribute="centerX" secondItem="qv6-Mn-ifA" secondAttribute="centerX" id="gL5-uR-Smy"/>
-                        <constraint firstItem="aUB-Ld-N2o" firstAttribute="centerY" secondItem="qv6-Mn-ifA" secondAttribute="centerY" id="yfU-xa-zSE"/>
-                        <constraint firstItem="qv6-Mn-ifA" firstAttribute="centerX" secondItem="grx-kk-1X1" secondAttribute="centerX" id="z8g-fU-cRw"/>
-                    </constraints>
-                </customView>
-                <stackView distribution="equalCentering" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hc5-GJ-yJe">
-                    <rect key="frame" x="20" y="16" width="470" height="22"/>
-                    <subviews>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bdZ-N9-Noa">
-                            <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
-                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="shuffleOn" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="fpN-XQ-XkJ">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="24" id="Dt6-9r-UXZ"/>
-                                <constraint firstAttribute="height" constant="24" id="MPF-8Q-Oge"/>
-                            </constraints>
-                            <connections>
-                                <action selector="shuffleAction:" target="-2" id="yht-Rc-8kq"/>
-                            </connections>
-                        </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9xU-Ba-Hys">
-                            <rect key="frame" x="149" y="0.0" width="24" height="24"/>
-                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="repeatOff" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="CWu-CE-2fG">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="24" id="LwI-Gs-9Ll"/>
-                                <constraint firstAttribute="height" constant="24" id="oy4-Ke-bx1"/>
-                            </constraints>
-                            <connections>
-                                <action selector="repeatAction:" target="-2" id="SNk-vw-LSL"/>
-                            </connections>
-                        </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="C02-6a-1Uw">
-                            <rect key="frame" x="297" y="0.0" width="24" height="25"/>
-                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="line.horizontal.3.decrease" catalog="system" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Qsi-6S-0bG">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="24" id="3rz-oE-rhS"/>
-                                <constraint firstAttribute="width" constant="24" id="uLL-RT-XeW"/>
-                            </constraints>
-                            <connections>
-                                <action selector="sortPlaylist:" target="-2" id="BAl-CA-um5"/>
-                            </connections>
-                        </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aKS-lw-hfk">
-                            <rect key="frame" x="446" y="-3" width="24.5" height="32"/>
-                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="trash" catalog="system" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="DEr-Gg-n7Z">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="24" id="TWi-ow-aoD"/>
-                                <constraint firstAttribute="width" constant="24" id="bgh-Lr-Mae"/>
-                            </constraints>
-                            <connections>
-                                <action selector="clearPlaylist:" target="-2" id="DEh-0j-CpD"/>
-                            </connections>
-                        </button>
-                    </subviews>
-                    <visibilityPriorities>
-                        <integer value="1000"/>
-                        <integer value="1000"/>
-                        <integer value="1000"/>
-                        <integer value="1000"/>
-                    </visibilityPriorities>
-                    <customSpacing>
-                        <real value="3.4028234663852886e+38"/>
-                        <real value="3.4028234663852886e+38"/>
-                        <real value="3.4028234663852886e+38"/>
-                        <real value="3.4028234663852886e+38"/>
-                    </customSpacing>
-                </stackView>
-            </subviews>
-            <constraints>
-                <constraint firstItem="ik5-L4-VLw" firstAttribute="top" secondItem="NJR-gf-yTs" secondAttribute="top" id="1za-9j-6sD"/>
-                <constraint firstAttribute="trailing" secondItem="grx-kk-1X1" secondAttribute="trailing" id="4CB-HB-Om0"/>
-                <constraint firstItem="grx-kk-1X1" firstAttribute="top" secondItem="ik5-L4-VLw" secondAttribute="bottom" id="AoR-Q7-XYJ"/>
-                <constraint firstItem="ik5-L4-VLw" firstAttribute="leading" secondItem="NJR-gf-yTs" secondAttribute="leading" constant="20" id="CW2-KK-Z5t"/>
-                <constraint firstItem="EIb-Is-vco" firstAttribute="top" secondItem="ik5-L4-VLw" secondAttribute="bottom" id="Cyw-MK-W8n"/>
-                <constraint firstAttribute="trailing" secondItem="ew3-Pn-diG" secondAttribute="trailing" constant="20" id="Hwc-K8-2WQ"/>
-                <constraint firstAttribute="bottom" secondItem="ew3-Pn-diG" secondAttribute="bottom" constant="54" id="OnX-TC-nMG"/>
-                <constraint firstAttribute="trailing" secondItem="EIb-Is-vco" secondAttribute="trailing" id="UAJ-gH-fWy"/>
-                <constraint firstItem="hc5-GJ-yJe" firstAttribute="leading" secondItem="NJR-gf-yTs" secondAttribute="leading" constant="20" id="Ums-3j-iWc"/>
-                <constraint firstAttribute="bottom" secondItem="hc5-GJ-yJe" secondAttribute="bottom" constant="16" id="XfY-Lh-mBE"/>
-                <constraint firstAttribute="trailing" secondItem="hc5-GJ-yJe" secondAttribute="trailing" constant="20" id="chv-hJ-pjk"/>
-                <constraint firstAttribute="trailing" secondItem="ik5-L4-VLw" secondAttribute="trailing" constant="20" id="ef5-v1-Rm6"/>
-                <constraint firstItem="hc5-GJ-yJe" firstAttribute="top" secondItem="ew3-Pn-diG" secondAttribute="bottom" constant="16" id="fcg-kI-gzS"/>
-                <constraint firstItem="ew3-Pn-diG" firstAttribute="top" secondItem="grx-kk-1X1" secondAttribute="bottom" id="haK-Qu-HJv"/>
-                <constraint firstItem="EIb-Is-vco" firstAttribute="leading" secondItem="NJR-gf-yTs" secondAttribute="leading" id="kEZ-5n-pxq"/>
-                <constraint firstItem="grx-kk-1X1" firstAttribute="leading" secondItem="NJR-gf-yTs" secondAttribute="leading" id="mCw-UE-mS0"/>
-                <constraint firstItem="ew3-Pn-diG" firstAttribute="leading" secondItem="NJR-gf-yTs" secondAttribute="leading" constant="20" id="qow-FG-3aN"/>
-                <constraint firstItem="EIb-Is-vco" firstAttribute="baseline" secondItem="ew3-Pn-diG" secondAttribute="firstBaseline" id="y82-Wx-neg"/>
-            </constraints>
-            <point key="canvasLocation" x="-148" y="45"/>
-        </customView>
-    </objects>
-    <resources>
-        <image name="dropzone" width="112" height="112"/>
-        <image name="line.horizontal.3.decrease" catalog="system" width="16" height="10"/>
-        <image name="repeatOff" width="24" height="24"/>
-        <image name="shuffleOn" width="24" height="24"/>
-        <image name="trash" catalog="system" width="15" height="17"/>
-    </resources>
-</document>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCPlaylistTableCellView.xib Deleted

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="VLCPlaylistTableCellView"/>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView wantsLayer="YES" id="c22-O7-iKe" customClass="VLCPlaylistTableCellView">
-            <rect key="frame" x="0.0" y="0.0" width="398" height="58"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0Ge-7z-bq6">
-                    <rect key="frame" x="97" y="1" width="245" height="56"/>
-                    <subviews>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ohB-P0-nCv">
-                            <rect key="frame" x="-2" y="40" width="249" height="16"/>
-                            <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="ZPw-XO-XD1">
-                                <font key="font" usesAppearanceFont="YES"/>
-                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xJW-ps-ycn">
-                            <rect key="frame" x="-2" y="19" width="249" height="16"/>
-                            <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="aCe-ia-0Ww">
-                                <font key="font" usesAppearanceFont="YES"/>
-                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TPv-k2-6XS">
-                            <rect key="frame" x="-2" y="0.0" width="249" height="14"/>
-                            <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="jZ4-pa-K3T">
-                                <font key="font" metaFont="smallSystem"/>
-                                <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                    </subviews>
-                    <constraints>
-                        <constraint firstAttribute="trailing" secondItem="TPv-k2-6XS" secondAttribute="trailing" id="Bdm-3y-L6Y"/>
-                        <constraint firstAttribute="trailing" secondItem="xJW-ps-ycn" secondAttribute="trailing" id="Te0-Yn-6Bc"/>
-                        <constraint firstAttribute="trailing" secondItem="ohB-P0-nCv" secondAttribute="trailing" id="weY-Nx-VPO"/>
-                    </constraints>
-                    <visibilityPriorities>
-                        <integer value="1000"/>
-                        <integer value="1000"/>
-                        <integer value="1000"/>
-                    </visibilityPriorities>
-                    <customSpacing>
-                        <real value="3.4028234663852886e+38"/>
-                        <real value="3.4028234663852886e+38"/>
-                        <real value="3.4028234663852886e+38"/>
-                    </customSpacing>
-                </stackView>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ydb-7n-5Cd" customClass="VLCImageView">
-                    <rect key="frame" x="10" y="5" width="77" height="48"/>
-                    <constraints>
-                        <constraint firstAttribute="width" secondItem="Ydb-7n-5Cd" secondAttribute="height" multiplier="16:10" id="4aB-rs-m22"/>
-                    </constraints>
-                </customView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mk2-5A-q4g">
-                    <rect key="frame" x="8" y="13" width="22" height="31"/>
-                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="♪" id="mdz-SA-hCl">
-                        <font key="font" textStyle="largeTitle" name=".SFNS-Regular"/>
-                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="97z-d7-S3D" customClass="VLCImageView">
-                    <rect key="frame" x="39" y="5" width="48" height="48"/>
-                    <constraints>
-                        <constraint firstAttribute="width" secondItem="97z-d7-S3D" secondAttribute="height" multiplier="1:1" id="YBL-j9-anm"/>
-                    </constraints>
-                </customView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Ha-ZH-fa9">
-                    <rect key="frame" x="350" y="21" width="40" height="16"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="36" id="0cB-ga-0Uw"/>
-                    </constraints>
-                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Label" id="N0j-xB-3t9">
-                        <font key="font" usesAppearanceFont="YES"/>
-                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-            </subviews>
-            <constraints>
-                <constraint firstItem="Mk2-5A-q4g" firstAttribute="centerY" secondItem="Ydb-7n-5Cd" secondAttribute="centerY" id="7oz-36-KPx"/>
-                <constraint firstItem="Ydb-7n-5Cd" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="10" id="8hv-Qt-uAI"/>
-                <constraint firstItem="0Ge-7z-bq6" firstAttribute="centerY" secondItem="3Ha-ZH-fa9" secondAttribute="centerY" id="DpI-8u-rFu"/>
-                <constraint firstItem="0Ge-7z-bq6" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="EXo-Wn-Jh5"/>
-                <constraint firstItem="97z-d7-S3D" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="5" id="FbP-R4-bAA"/>
-                <constraint firstItem="Mk2-5A-q4g" firstAttribute="leading" secondItem="Ydb-7n-5Cd" secondAttribute="leading" id="S9m-bB-HBd"/>
-                <constraint firstAttribute="trailing" secondItem="3Ha-ZH-fa9" secondAttribute="trailing" constant="10" id="SVJ-UL-O5m"/>
-                <constraint firstAttribute="bottom" secondItem="97z-d7-S3D" secondAttribute="bottom" constant="5" id="XfR-Fd-n6o"/>
-                <constraint firstAttribute="bottom" secondItem="Ydb-7n-5Cd" secondAttribute="bottom" constant="5" id="aVd-Ld-lUH"/>
-                <constraint firstItem="0Ge-7z-bq6" firstAttribute="leading" secondItem="97z-d7-S3D" secondAttribute="trailing" constant="10" id="adC-9f-And"/>
-                <constraint firstItem="97z-d7-S3D" firstAttribute="trailing" secondItem="Ydb-7n-5Cd" secondAttribute="trailing" id="bzC-Km-KOo"/>
-                <constraint firstItem="0Ge-7z-bq6" firstAttribute="trailing" secondItem="3Ha-ZH-fa9" secondAttribute="leading" constant="-10" id="dSC-Pq-ml2"/>
-                <constraint firstItem="Ydb-7n-5Cd" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="5" id="iPZ-zR-jTv"/>
-            </constraints>
-            <connections>
-                <outlet property="artistTextField" destination="TPv-k2-6XS" id="jJV-4C-USY"/>
-                <outlet property="audioArtworkImageView" destination="97z-d7-S3D" id="ZDl-d6-j29"/>
-                <outlet property="audioMediaTypeIndicator" destination="Mk2-5A-q4g" id="wal-6y-aRv"/>
-                <outlet property="durationTextField" destination="3Ha-ZH-fa9" id="vbh-oE-Afj"/>
-                <outlet property="mediaImageView" destination="Ydb-7n-5Cd" id="MlE-WQ-VB9"/>
-                <outlet property="mediaTitleTextField" destination="ohB-P0-nCv" id="iS6-q4-h8I"/>
-                <outlet property="secondaryMediaTitleTextField" destination="xJW-ps-ycn" id="KpP-ao-QlW"/>
-            </connections>
-            <point key="canvasLocation" x="98" y="50"/>
-        </customView>
-    </objects>
-</document>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryNavigationStack.h Deleted

@@ -1,43 +0,0 @@
-/*****************************************************************************
- * VLCLibraryNavigationStack.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2022 VLC authors and VideoLAN
- *
- * Authors: Claudio Cambra <claudio.cambra@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class VLCLibraryWindow;
-
-@interface VLCLibraryNavigationStack : NSObject
-
-@property (readwrite, nonatomic, weak) VLCLibraryWindow *delegate;
-@property (readonly) BOOL forwardsAvailable;
-@property (readonly) BOOL backwardsAvailable;
-
-- (void)backwards;
-- (void)forwards;
-
-- (void)appendCurrentLibraryState;
-- (void)clear;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryNavigationStack.m Deleted

@@ -1,201 +0,0 @@
-/*****************************************************************************
- * VLCLibraryNavigationStack.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2022 VLC authors and VideoLAN
- *
- * Authors: Claudio Cambra <claudio.cambra@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCLibraryNavigationStack.h"
-
-#import "VLCInputItem.h"
-#import "VLCInputNodePathControl.h"
-#import "VLCInputNodePathControlItem.h"
-#import "VLCLibraryNavigationState.h"
-#import "VLCLibraryWindow.h"
-
-#import "library/audio-library/VLCLibraryAudioViewController.h"
-
-#import "media-source/VLCLibraryMediaSourceViewController.h"
-#import "media-source/VLCMediaSourceBaseDataSource.h"
-#import "media-source/VLCMediaSourceDataSource.h"
-#import "media-source/VLCMediaSource.h"
-
-@interface VLCLibraryNavigationCurrentStackPosition : NSObject
-
-@property (readonly) NSUInteger navigationStackIndex;
-@property (readonly) VLCLibraryNavigationState *navigationState;
-
-- (instancetype)initWithStackIndex:(NSUInteger)index andState:(VLCLibraryNavigationState *)state;
-
-@end
-
-@implementation VLCLibraryNavigationCurrentStackPosition
-
-- (instancetype)initWithStackIndex:(NSUInteger)index andState:(VLCLibraryNavigationState *)state
-{
-    self = super init;
-
-    if(self) {
-        _navigationStackIndex = index;
-        _navigationState = state;
-    }
-
-    return self;
-}
-
-@end
-
-
-@interface VLCLibraryNavigationStack ()
-{
-    NSMutableArray<VLCLibraryNavigationState *> *_navigationStates;
-    VLCLibraryNavigationCurrentStackPosition *_currentPosition;
-}
-
-@end
-
-@implementation VLCLibraryNavigationStack
-
-- (instancetype)init
-{
-    self = super init;
-    if (self) {
-        _navigationStates = NSMutableArray alloc init;
-    }
-    return self;
-}
-
-- (void)setDelegate:(VLCLibraryWindow *)delegate
-{
-    _delegate = delegate;
-    self updateDelegateNavigationButtons;
-}
-
-- (BOOL)forwardsAvailable
-{
-    NSUInteger numNavigationStates = _navigationStates.count;
-
-    return _currentPosition != nil && 
-        _currentPosition.navigationStackIndex < numNavigationStates - 1 && 
-        numNavigationStates > 1;
-}
-
-- (BOOL)backwardsAvailable
-{
-    return _currentPosition != nil && 
-        _currentPosition.navigationStackIndex > 0 && 
-        _navigationStates.count > 1;
-}
-
-- (void)forwards
-{
-    if(_delegate == nil || !self.forwardsAvailable) {
-        return;
-    }
-
-    NSUInteger newPositionIndex = _currentPosition.navigationStackIndex + 1;
-    _currentPosition = VLCLibraryNavigationCurrentStackPosition alloc initWithStackIndex:newPositionIndex andState:_navigationStatesnewPositionIndex;
-
-    VLCInputNode *node = _currentPosition.navigationState.currentNodeDisplayed;
-    VLCInputNodePathControlItem *nodePathItem = VLCInputNodePathControlItem alloc initWithInputNode:node;
-    _delegate.mediaSourcePathControl appendInputNodePathControlItem:nodePathItem;
-
-    self setDelegateToState:_currentPosition.navigationState;
-}
-
-- (void)backwards
-{
-    if(_delegate == nil || !self.backwardsAvailable) {
-        return;
-    }
-
-    NSUInteger newPositionIndex = _currentPosition.navigationStackIndex - 1;
-    _currentPosition = VLCLibraryNavigationCurrentStackPosition alloc initWithStackIndex:newPositionIndex andState:_navigationStatesnewPositionIndex;
-
-    _delegate.mediaSourcePathControl removeLastInputNodePathControlItem;
-
-    self setDelegateToState:_currentPosition.navigationState;
-}
-
-- (void)appendCurrentLibraryState
-{
-    if(_delegate == nil) {
-        return;
-    }
-
-    if(self.forwardsAvailable) {
-        NSUInteger firstIndexToRemove = _currentPosition.navigationStackIndex + 1;
-        // -1 to account for the array count
-        NSRange rangeToRemove = NSMakeRange(firstIndexToRemove, (_navigationStates.count - 1) - _currentPosition.navigationStackIndex);
-        self removeAndCleanUpStatesInRange:rangeToRemove;
-        _navigationStates removeObjectsInRange:rangeToRemove;
-    }
-
-    VLCLibraryNavigationState *navigationState = VLCLibraryNavigationState alloc initFromLibraryWindow:_delegate;
-    _currentPosition = VLCLibraryNavigationCurrentStackPosition alloc initWithStackIndex:_navigationStates.count andState:navigationState;
-    _navigationStates addObject:navigationState;
-
-    self updateDelegateNavigationButtons;
-}
-
-- (void)removeAndCleanUpStatesInRange:(NSRange)range
-{
-    NSAssert(range.location + range.length - 1 < _navigationStates.count, @"Invalid range for state removal and cleanup, out of bounds.");
-    
-    for (NSUInteger i = range.location; i < range.length; ++i) {
-        VLCLibraryNavigationState *state = _navigationStates objectAtIndex:i;
-        VLCInputNode *stateNode = state.currentNodeDisplayed;
-        
-        if (stateNode) {
-            state.currentMediaSource.displayedMediaSource clearChildNodesForNode:stateNode.vlcInputItemNode;
-        }
-        
-        _navigationStates removeObjectAtIndex:i;
-    }
-}
-
-- (void)updateDelegateNavigationButtons
-{
-    if(_delegate == nil) {
-        return;
-    }
-
-    _delegate.forwardsNavigationButton.enabled = self.forwardsAvailable;
-    _delegate.backwardsNavigationButton.enabled = self.backwardsAvailable;
-}
-
-- (void)setDelegateToState:(VLCLibraryNavigationState *)state
-{
-    if(_delegate == nil) {
-        return;
-    }
-
-    _delegate.libraryMediaSourceViewController.baseDataSource setChildDataSource:state.currentMediaSource;
-    _delegate.libraryMediaSourceViewController.baseDataSource.childDataSource setNodeToDisplay:state.currentNodeDisplayed;
-
-    self updateDelegateNavigationButtons;
-}
-
-- (void)clear
-{
-    _navigationStates = NSMutableArray array;
-    _currentPosition = nil;
-    self updateDelegateNavigationButtons;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryNavigationState.h Deleted

@@ -1,41 +0,0 @@
-/*****************************************************************************
- * VLCLibraryNavigationStack.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2022 VLC authors and VideoLAN
- *
- * Authors: Claudio Cambra <developer@claudiocambra.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class VLCLibraryWindow;
-@class VLCMediaSourceDataSource;
-@class VLCInputNode;
-@class VLCMediaSource;
-
-@interface VLCLibraryNavigationState : NSObject
-
-@property (readonly) VLCMediaSourceDataSource *currentMediaSource;
-@property (readonly) VLCInputNode *currentNodeDisplayed;
-
-- (instancetype)initFromLibraryWindow:(VLCLibraryWindow *)libraryWindow;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryNavigationState.m Deleted

@@ -1,45 +0,0 @@
-/*****************************************************************************
- * VLCLibraryNavigationStack.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2022 VLC authors and VideoLAN
- *
- * Authors: Claudio Cambra <claudio.cambra@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCLibraryNavigationState.h"
-
-#import "VLCLibraryWindow.h"
-
-#import "media-source/VLCLibraryMediaSourceViewController.h"
-#import "media-source/VLCMediaSourceBaseDataSource.h"
-#import "media-source/VLCMediaSourceDataSource.h"
-
-@implementation VLCLibraryNavigationState
-
-- (instancetype)initFromLibraryWindow:(VLCLibraryWindow *)libraryWindow
-{
-    VLCLibraryNavigationState* navState = super init;
-
-    if(navState) {
-        _currentMediaSource = libraryWindow.libraryMediaSourceViewController.baseDataSource.childDataSource;
-        _currentNodeDisplayed = libraryWindow.libraryMediaSourceViewController.baseDataSource.childDataSource.nodeToDisplay;
-    }
-
-    return navState;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowPlaylistSidebarViewController.h Deleted

@@ -1,62 +0,0 @@
-/*****************************************************************************
- * VLCLibraryWindowPlaylistSidebarViewController.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2024 VLC authors and VideoLAN
- *
- * Authors: Claudio Cambra <developer@claudiocambra.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-#import "VLCLibraryWindowAbstractSidebarViewController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class VLCDragDropView;
-@class VLCPlaylistController;
-@class VLCPlaylistDataSource;
-@class VLCPlaylistSortingMenuController;
-@class VLCRoundedCornerTextField;
-
-@interface VLCLibraryWindowPlaylistSidebarViewController : VLCLibraryWindowAbstractSidebarViewController
-
-@property (readwrite, weak) IBOutlet NSTableView *tableView;
-@property (readwrite, weak) IBOutlet VLCDragDropView *dragDropView;
-@property (readwrite, weak) IBOutlet NSBox *dragDropImageBackgroundBox;
-@property (readwrite, weak) IBOutlet NSButton *openMediaButton;
-@property (readwrite, weak) IBOutlet NSBox *bottomButtonsSeparator;
-@property (readwrite, weak) IBOutlet NSButton *repeatButton;
-@property (readwrite, weak) IBOutlet NSButton *shuffleButton;
-
-@property (readwrite, nonatomic) NSTextField *counterLabel;
-
-@property (readonly) VLCPlaylistController *playlistController;
-@property (readonly) VLCPlaylistDataSource *dataSource;
-@property (readonly) VLCPlaylistSortingMenuController *sortingMenuController;
-
-- (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow;
-
-- (IBAction)tableDoubleClickAction:(id)sender;
-- (IBAction)openMedia:(id)sender;
-- (IBAction)shuffleAction:(id)sender;
-- (IBAction)repeatAction:(id)sender;
-- (IBAction)sortPlaylist:(id)sender;
-- (IBAction)clearPlaylist:(id)sender;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowPlaylistSidebarViewController.m Deleted

@@ -1,242 +0,0 @@
-/*****************************************************************************
- * VLCLibraryWindowPlaylistSidebarViewController.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2024 VLC authors and VideoLAN
- *
- * Authors: Claudio Cambra <developer@claudiocambra.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCLibraryWindowPlaylistSidebarViewController.h"
-
-#import "extensions/NSColor+VLCAdditions.h"
-#import "extensions/NSFont+VLCAdditions.h"
-#import "extensions/NSImage+VLCAdditions.h"
-#import "extensions/NSString+Helpers.h"
-#import "extensions/NSWindow+VLCAdditions.h"
-#import "library/VLCLibraryUIUnits.h"
-#import "library/VLCLibraryWindow.h"
-#import "main/VLCMain.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlaylistDataSource.h"
-#import "playlist/VLCPlaylistSortingMenuController.h"
-#import "views/VLCDragDropView.h"
-#import "views/VLCRoundedCornerTextField.h"
-#import "windows/VLCOpenWindowController.h"
-
-@implementation VLCLibraryWindowPlaylistSidebarViewController
-
-@synthesize counterLabel = _counterLabel;
-
-- (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow
-{
-    return super initWithLibraryWindow:libraryWindow
-                                nibName:@"VLCLibraryWindowPlaylistView";
-}
-
-- (void)viewDidLoad
-{
-    super viewDidLoad;
-
-    self.dragDropView.dropTarget = self.libraryWindow;
-
-    _playlistController = VLCMain.sharedInstance.playlistController;
-    _dataSource = VLCPlaylistDataSource alloc init;
-    self.dataSource.playlistController = self.playlistController;
-    self.dataSource.tableView = self.tableView;
-    self.dataSource.dragDropView = self.dragDropView;
-    self.dataSource.counterTextField = self.counterLabel;
-    self.dataSource prepareForUse;
-    self.playlistController.playlistDataSource = self.dataSource;
-
-    self.tableView.dataSource = self.dataSource;
-    self.tableView.delegate = self.dataSource;
-    self.tableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;
-    self.tableView reloadData;
-
-    self.openMediaButton.title = _NS("Open media...");
-    self.dragDropImageBackgroundBox.fillColor = NSColor.VLClibrarySeparatorLightColor;
-
-    self repeatStateUpdated:nil;
-    self shuffleStateUpdated:nil;
-
-    NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
-    notificationCenter addObserver:self
-                           selector:@selector(shuffleStateUpdated:)
-                               name:VLCPlaybackOrderChanged
-                             object:nil;
-    notificationCenter addObserver:self
-                           selector:@selector(repeatStateUpdated:)
-                               name:VLCPlaybackRepeatChanged
-                             object:nil;
-}
-
-- (NSString *)title
-{
-    return _NS("Playlist");
-}
-
-- (BOOL)supportsItemCount
-{
-    return YES;
-}
-
-- (void)setCounterLabel:(NSTextField *)counterLabel
-{
-    _counterLabel = counterLabel;
-    self.dataSource.counterTextField = counterLabel;
-}
-
-#pragma mark - appearance setters
-
-- (void)updateColorsBasedOnAppearance:(NSAppearance *)appearance
-{
-    super updateColorsBasedOnAppearance:appearance;
-
-    BOOL isDark = NO;
-    if (@available(macOS 10.14, *)) {
-        isDark = appearance.name isEqualToString:NSAppearanceNameDarkAqua || 
-                 appearance.name isEqualToString:NSAppearanceNameVibrantDark;
-    }
-
-    // If we try to pull the view's effectiveAppearance we are going to get the previous 
-    // appearance's name despite responding to the effectiveAppearance change (???) so it is a
-    // better idea to pull from the general system theme preference, which is always up-to-date
-    if (isDark) {
-        self.bottomButtonsSeparator.borderColor = NSColor.VLClibrarySeparatorDarkColor;
-        self.dragDropImageBackgroundBox.hidden = NO;
-    } else {
-        self.bottomButtonsSeparator.borderColor = NSColor.VLClibrarySeparatorLightColor;
-        self.dragDropImageBackgroundBox.hidden = YES;
-    }
-}
-
-#pragma mark - table view interaction
-
-- (IBAction)tableDoubleClickAction:(id)sender
-{
-    const NSInteger selectedRow = self.tableView.selectedRow;
-    if (selectedRow == -1) {
-        return;
-    }
-    VLCMain.sharedInstance.playlistController playItemAtIndex:selectedRow;
-}
-
-#pragma mark - open media handling
-
-- (IBAction)openMedia:(id)sender
-{
-    VLCMain.sharedInstance.open openFileGeneric;
-}
-
-#pragma mark - playmode state display and interaction
-
-- (IBAction)shuffleAction:(id)sender
-{
-    if (_playlistController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL) {
-        _playlistController.playbackOrder = VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM;
-    } else {
-        _playlistController.playbackOrder = VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL;
-    }
-}
-
-- (void)shuffleStateUpdated:(NSNotification *)aNotification
-{
-    if (@available(macOS 11.0, *)) {
-        self.shuffleButton.image = NSImage imageWithSystemSymbolName:@"shuffle"
-                                             accessibilityDescription:@"Shuffle";
-        self.shuffleButton.contentTintColor =
-            self.playlistController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL ?
-                nil : NSColor.VLCAccentColor;
-    } else {
-        self.shuffleButton.image =
-            self.playlistController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL ?
-                NSImage imageNamed:@"shuffleOff" :
-                NSImage imageNamed:@"shuffleOn" imageTintedWithColor:NSColor.VLCAccentColor;
-    }
-}
-
-- (IBAction)repeatAction:(id)sender
-{
-    const enum vlc_playlist_playback_repeat repeatState = self.playlistController.playbackRepeat;
-    switch (repeatState) {
-        case VLC_PLAYLIST_PLAYBACK_REPEAT_ALL:
-            self.playlistController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_NONE;
-            break;
-        case VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT:
-            self.playlistController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_ALL;
-            break;
-        default:
-            self.playlistController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT;
-            break;
-    }
-}
-
-- (void)repeatStateUpdated:(NSNotification *)aNotification
-{
-    const enum vlc_playlist_playback_repeat repeatState = self.playlistController.playbackRepeat;
-
-    if (@available(macOS 11.0, *)) {
-        switch (repeatState) {
-            case VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT:
-                self.repeatButton.image = NSImage imageWithSystemSymbolName:@"repeat.1"
-                                                    accessibilityDescription:@"Repeat current";
-                self.repeatButton.contentTintColor = NSColor.VLCAccentColor;
-                break;
-            case VLC_PLAYLIST_PLAYBACK_REPEAT_ALL:
-                self.repeatButton.image = NSImage imageWithSystemSymbolName:@"repeat"
-                                                    accessibilityDescription:@"Repeat";
-                self.repeatButton.contentTintColor = NSColor.VLCAccentColor;
-                break;
-            default:
-                self.repeatButton.image = NSImage imageWithSystemSymbolName:@"repeat"
-                                                    accessibilityDescription:@"Repeat";
-                self.repeatButton.contentTintColor = nil;
-                break;
-        }
-    } else {
-        switch (repeatState) {
-            case VLC_PLAYLIST_PLAYBACK_REPEAT_ALL:
-                self.repeatButton.image =
-                    NSImage imageNamed:@"repeatAll" imageTintedWithColor:NSColor.VLCAccentColor;
-                break;
-            case VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT:
-                self.repeatButton.image =
-                    NSImage imageNamed:@"repeatOne" imageTintedWithColor:NSColor.VLCAccentColor;
-                break;
-            default:
-                self.repeatButton.image = NSImage imageNamed:@"repeatOff";
-                break;
-        }
-    }
-}
-
-- (IBAction)sortPlaylist:(id)sender
-{
-    if (!self.sortingMenuController) {
-        _sortingMenuController = VLCPlaylistSortingMenuController alloc init;
-    }
-    NSMenu popUpContextMenu:self.sortingMenuController.playlistSortingMenu
-                   withEvent:NSApp.currentEvent
-                     forView:sender;
-}
-
-- (IBAction)clearPlaylist:(id)sender
-{
-    self.playlistController clearPlaylist;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaybackContinuityController.m Deleted

@@ -1,343 +0,0 @@
-/*****************************************************************************
- * VLCPlaybackContinuityController.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2015-2020 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan.org>
- *          David Fuhrmann <dfuhrmann # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlaybackContinuityController.h"
-
-#import "extensions/NSString+Helpers.h"
-#import "main/VLCMain.h"
-#import "panels/dialogs/VLCResumeDialogController.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
-#import "library/VLCInputItem.h"
-#import "library/VLCLibraryDataTypes.h"
-
-#import <vlc_configuration.h>
-
-static const int64_t SecInMillisecs = 1000;
-static const int64_t MinInMillisecs = SecInMillisecs * 60;
-static const int64_t MinimumDuration = 3 * MinInMillisecs;
-static const float MinimumStorePercent = 0.05;
-static const float MaximumStorePercent = 0.95;
-static const int64_t MinimumStoreTime = MinInMillisecs;
-static const int64_t MinimumStoreRemainingTime = MinInMillisecs;
-static NSString *VLCRecentlyPlayedMediaKey = @"recentlyPlayedMedia";
-static NSString *VLCRecentlyPlayedMediaListKey = @"recentlyPlayedMediaList";
-
-@interface VLCPlaybackContinuityController()
-{
-    VLCInputItem *_currentInput;
-    VLCResumeDialogController *_resumeDialogController;
-}
-@end
-
-@implementation VLCPlaybackContinuityController
-
-+ (void)initialize
-{
-    NSUserDefaults *defaults = NSUserDefaults standardUserDefaults;
-    NSDictionary *appDefaults = NSDictionary dictionaryWithObjectsAndKeys:
-                                 NSArray array, VLCRecentlyPlayedMediaListKey,
-                                 NSDictionary dictionary, VLCRecentlyPlayedMediaKey, nil;
-
-    defaults registerDefaults:appDefaults;
-}
-
-- (id)init
-{
-    self = super init;
-    if (self) {
-        NSNotificationCenter *notificationCenter = NSNotificationCenter.defaultCenter;
-        notificationCenter addObserver:self
-                               selector:@selector(inputItemChanged:)
-                                   name:VLCPlayerCurrentMediaItemChanged
-                                 object:nil;
-        notificationCenter addObserver:self
-                               selector:@selector(playbackStatusUpdated:)
-                                   name:VLCPlayerStateChanged
-                                 object:nil;
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    msg_Dbg(getIntf(), "Deinitializing input manager");
-
-    NSNotificationCenter.defaultCenter removeObserver:self;
-
-    if (_currentInput) {
-        /* continue playback where you left off */
-        self storePlaybackPositionForItem:_currentInput player:VLCMain.sharedInstance.playlistController.playerController;
-    }
-}
-
-- (void)inputItemChanged:(NSNotification *)aNotification
-{
-    VLCPlayerController * const playerController = VLCMain.sharedInstance.playlistController.playerController;
-
-    // Cancel pending resume dialogs
-    _resumeDialogController cancel;
-
-    // object is hold here and released then it is dead
-    _currentInput = playerController.currentMedia;
-    if (_currentInput) {
-        self continuePlaybackWhereYouLeftOff:_currentInput
-                                       player:playerController;
-    }
-}
-
-- (void)playbackStatusUpdated:(NSNotification *)aNotification
-{
-    // On shutdown, input might not be dead yet. Cleanup actions like itunes playback
-    // and playback positon are done in different code paths (dealloc and appWillTerminate:).
-    if (VLCMain.sharedInstance isTerminating) {
-        return;
-    }
-
-    VLCPlayerController *playerController = aNotification.object;
-    enum vlc_player_state playerState = playerController playerState;
-
-    if (playerState == VLC_PLAYER_STATE_STOPPED || playerState == VLC_PLAYER_STATE_STOPPING) {
-        /* continue playback where you left off */
-        if (_currentInput)
-            self storePlaybackPositionForItem:_currentInput player:playerController;
-    }
-}
-
-- (BOOL)isValidResumeItem:(VLCInputItem *)inputItem
-{
-    NSString *urlString = inputItem.MRL;
-
-    if (urlString isEqualToString:@"")
-        return NO;
-
-    NSURL *url = NSURL URLWithString:urlString;
-
-    if (!url isFileURL)
-        return NO;
-
-    BOOL isDir = false;
-    if (!NSFileManager defaultManager fileExistsAtPath:url path isDirectory:&isDir)
-        return NO;
-
-    if (isDir)
-        return NO;
-
-    return YES;
-}
-
-- (void)continuePlaybackWhereYouLeftOff:(VLCInputItem *)inputItem player:(VLCPlayerController *)playerController
-{
-    int settingValue = (int)config_GetInt("macosx-continue-playback");
-    if (settingValue == 2) // never resume
-        return;
-
-    if (!inputItem)
-        return;
-
-    /* allow the user to over-write the start/stop/run-time */
-    // FIXME: reimplement using new playlist
-#if 0
-    if (var_GetFloat(p_input_thread, "run-time") > 0 ||
-        var_GetFloat(p_input_thread, "start-time") > 0 ||
-        var_GetFloat(p_input_thread, "stop-time") != 0) {
-        return;
-    }
-#endif
-
-    /* check for file existence before resuming */
-    if (!self isValidResumeItem:inputItem)
-        return;
-
-    NSURL *url = NSURL URLWithString:inputItem.MRL;
-    if (!url)
-        return;
-
-    VLCMediaLibraryMediaItem *libraryMediaItem = VLCMediaLibraryMediaItem mediaItemForURL:url;
-    if (!libraryMediaItem) {
-        // input item isn't part of the library
-        self resumeLegacyPlaybackPositionForInputItem:inputItem
-                                                   ask:(settingValue == 0)
-                                                player:playerController;
-    }
-
-    self resumePlaybackPositionForLibraryMediaItem:libraryMediaItem
-                                          inputItem:inputItem
-                                                ask:(settingValue == 0)
-                                             player:playerController;
-}
-
-- (void)resumePlaybackPositionForLibraryMediaItem:(VLCMediaLibraryMediaItem *)libraryMediaItem
-                                        inputItem:(VLCInputItem *)inputItem
-                                              ask:(BOOL)ask
-                                           player:(VLCPlayerController *)playerController
-{
-    if(libraryMediaItem == nil) {
-        return;
-    }
-
-    float lastPlaybackPosition = libraryMediaItem.progress;
-    int64_t duration = libraryMediaItem.duration;
-    BOOL isAlbumTrack = libraryMediaItem.mediaSubType == VLC_ML_MEDIA_SUBTYPE_ALBUMTRACK;
-
-    if (lastPlaybackPosition < MinimumStorePercent || duration < MinimumDuration || isAlbumTrack) {
-
-        return;
-    }
-
-    CompletionBlock completionBlock = ^(enum ResumeResult result) {
-        if (result == RESUME_RESTART)
-            return;
-
-        msg_Dbg(getIntf(), "continuing playback at %0.2f", lastPlaybackPosition);
-        playerController setPositionPrecise:lastPlaybackPosition;
-    };
-
-    if (!ask) { // always
-        completionBlock(RESUME_NOW);
-        return;
-    }
-
-    if (!_resumeDialogController) {
-        _resumeDialogController = VLCResumeDialogController alloc init;
-    }
-
-    _resumeDialogController showWindowWithItem:inputItem
-                               withLastPosition:(lastPlaybackPosition * duration) / 1000
-                                completionBlock:completionBlock;
-}
-
-- (void)resumeLegacyPlaybackPositionForInputItem:(VLCInputItem *)inputItem
-                                             ask:(BOOL)ask
-                                          player:(VLCPlayerController *)playerController
-{
-    NSDictionary *recentlyPlayedFiles = NSUserDefaults standardUserDefaults objectForKey:VLCRecentlyPlayedMediaKey;
-    if (!recentlyPlayedFiles)
-        return;
-
-    NSNumber *lastPosition = recentlyPlayedFiles objectForKey:inputItem.MRL;
-    if (!lastPosition || lastPosition.intValue <= 0)
-        return;
-
-    CompletionBlock completionBlock = ^(enum ResumeResult result) {
-        if (result == RESUME_RESTART)
-            return;
-
-        vlc_tick_t lastPos = vlc_tick_from_sec( lastPosition.intValue );
-        msg_Dbg(getIntf(), "continuing playback at %lld", lastPos);
-
-        playerController setTimePrecise: lastPos;
-    };
-
-    if (!ask) { // always
-        completionBlock(RESUME_NOW);
-        return;
-    }
-
-    if (!_resumeDialogController) {
-        _resumeDialogController = VLCResumeDialogController alloc init;
-    }
-
-    _resumeDialogController showWindowWithItem:inputItem
-                               withLastPosition:lastPosition.intValue
-                                completionBlock:completionBlock;
-}
-
-BOOL ShouldStorePlaybackPosition(float position, int64_t duration)
-{
-    int64_t positionTime = position * duration;
-    int64_t remainingTime = duration - positionTime;
-
-    if (duration < MinimumDuration) {
-        return NO;
-    }
-
-    if (position < MinimumStorePercent && positionTime < MinimumStoreTime) {
-        return NO;
-    }
-
-    if (position > MaximumStorePercent && remainingTime < MinimumStoreRemainingTime) {
-        return NO;
-    }
-
-    return YES;
-}
-
-- (void)storePlaybackPositionForItem:(VLCInputItem *)inputItem
-                              player:(VLCPlayerController *)playerController
-{
-    if (!var_InheritBool(getIntf(), "macosx-recentitems"))
-        return;
-
-    if (!inputItem)
-        return;
-
-    if (!self isValidResumeItem:inputItem)
-        return;
-
-    NSURL *url = NSURL URLWithString:inputItem.MRL;
-    if (!url)
-        return;
-
-    VLCMediaLibraryMediaItem *libraryMediaItem = VLCMediaLibraryMediaItem mediaItemForURL:url;
-    if (!libraryMediaItem) {
-        // input item isn't part of the library
-        self storeLegacyPlaybackPositionForInputItem:inputItem withPlayer:playerController;
-    }
-}
-
-- (void)storeLegacyPlaybackPositionForInputItem:(VLCInputItem *)inputItem
-                                     withPlayer:(VLCPlayerController *)playerController
-{
-    NSUserDefaults *defaults = NSUserDefaults standardUserDefaults;
-    NSMutableDictionary *mutDict = NSMutableDictionary alloc initWithDictionary:defaults objectForKey:VLCRecentlyPlayedMediaKey;
-
-    float relativePos = playerController.position;
-    long long pos = SEC_FROM_VLC_TICK(playerController.time);
-    long long dur = SEC_FROM_VLC_TICK(inputItem.duration);
-
-    NSMutableArray *mediaList = defaults objectForKey:VLCRecentlyPlayedMediaListKey mutableCopy;
-    NSString *mrl = inputItem.MRL;
-
-    if (ShouldStorePlaybackPosition(relativePos, dur*1000)) {
-        msg_Dbg(getIntf(), "Store current playback position of %f", relativePos);
-        mutDict setObject:NSNumber numberWithInteger:pos forKey:inputItem.MRL;
-
-        mediaList removeObject:mrl;
-        mediaList addObject:mrl;
-        NSUInteger mediaListCount = mediaList.count;
-        if (mediaListCount > 30) {
-            for (NSUInteger x = 0; x < mediaListCount - 30; x++) {
-                mutDict removeObjectForKey:mediaList firstObject;
-                mediaList removeObjectAtIndex:0;
-            }
-        }
-    } else {
-        mutDict removeObjectForKey:mrl;
-        mediaList removeObject:mrl;
-    }
-    defaults setObject:mutDict forKey:VLCRecentlyPlayedMediaKey;
-    defaults setObject:mediaList forKey:VLCRecentlyPlayedMediaListKey;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlayerController.h Deleted

@@ -1,939 +0,0 @@
-/*****************************************************************************
- * VLCPlayerController.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Foundation/Foundation.h>
-#import <vlc_player.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class VLCInputStats;
-@class VLCTrackMetaData;
-@class VLCPlayerTitle;
-@class VLCProgramMetaData;
-@class VLCInputItem;
-
-extern NSString *VLCPlayerElementaryStreamID;
-extern NSString *VLCTick;
-
-/**
- * Listen to VLCPlayerCurrentMediaItemChanged to notified if the current media item changes for the player
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerCurrentMediaItemChanged;
-
-/**
- * Listen to VLCPlayerMetadataChangedForCurrentMedia to be notified if metadata such as title, artwork, etc change
- * for the media item currently played
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerMetadataChangedForCurrentMedia;
-
-/**
- * Listen to VLCPlayerStateChanged to be notified if the player's state changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerStateChanged;
-
-/**
- * Listen to VLCPlayerErrorChanged to be notified if the player's error expression changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerErrorChanged;
-
-extern NSString *VLCPlayerBufferFill;
-/**
- * Listen to VLCPlayerBufferChanged to be notified if the player's buffer value changes
- * @note the affected player object will be the object of the notification
- * @note the userInfo dictionary will have the float value indicating the fill state as percentage from 0.0 to 1.0
- * for key VLCPlayerBufferFill */
-extern NSString *VLCPlayerBufferChanged;
-
-/**
- * Listen to VLCPlayerRateChanged to be notified if the player's playback rate changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerRateChanged;
-
-/**
- * Listen to VLCPlayerCapabilitiesChanged to be notified if the player's capabilities change
- * Those are: seekable, rewindable, pausable, recordable, rateChangable
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerCapabilitiesChanged;
-
-/**
- * Listen to VLCPlayerTimeAndPositionChanged to be notified if playback position and/or time change
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerTimeAndPositionChanged;
-
-/**
- * Listen to VLCPlayerLengthChanged to be notified if the length of the current media changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerLengthChanged;
-
-/**
- * Listen to VLCPlayerTitleSelectionChanged to be notified if the selected title of the current media changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerTitleSelectionChanged;
-
-/**
- * Listen to VLCPlayerTitleListChanged to be notified if the list of titles of the current media changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerTitleListChanged;
-
-/**
- * Listen to VLCPlayerChapterSelectionChanged to be notified if the selected chapter of the current title changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerChapterSelectionChanged;
-
-/**
- * Listen to VLCPlayerProgramSelectionChanged to be notified if the selected program of the current media changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerProgramSelectionChanged;
-
-/**
- * Listen to VLCPlayerProgramListChanged to be notified if the list of available programs of the current media changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerProgramListChanged;
-
-/**
- * Listen to VLCPlayerABLoopStateChanged to be notified if the A→B loop state changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerABLoopStateChanged;
-
-/**
- * Listen to VLCPlayerTeletextMenuAvailable to be notified if a teletext menu becomes (un-)available
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerTeletextMenuAvailable;
-
-/**
- * Listen to VLCPlayerTeletextEnabled to be notified if teletext becomes enabled or disabled
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerTeletextEnabled;
-
-/**
- * Listen to VLCPlayerTeletextPageChanged to be notified if the teletext page changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerTeletextPageChanged;
-
-/**
- * Listen to VLCPlayerTeletextTransparencyChanged to be notified if the teletext transparency changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerTeletextTransparencyChanged;
-
-/**
- * Listen to VLCPlayerAudioDelayChanged to be notified if the audio delay of the current media changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerAudioDelayChanged;
-
-/**
- * Listen to VLCPlayerSubtitlesDelayChanged to be notified if the subtitles delay of the current media changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerSubtitlesDelayChanged;
-
-/**
- * Listen to VLCPlayerDelayChangedForSpecificElementaryStream to be notified if the delay of a specific elementary stream changes
- * @note the affected player object will be the object of the notification
- * @return the notification's userInfo dictionary will hold key/value pairs for VLCPlayerElementaryStreamID and VLCTick to describe the changes
- */
-extern NSString *VLCPlayerDelayChangedForSpecificElementaryStream;
-
-/**
- * Listen to VLCPlayerSubtitlesFPSChanged to be notified if the subtitles FPS of the current media changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerSubtitlesFPSChanged;
-
-/**
- * Listen to VLCPlayerRecordingChanged to be notified if the recording state of the current media changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerRecordingChanged;
-
-/**
- * Listen to VLCPlayerRendererChanged to be notified if the renderer (such as a Chromecast device) changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerRendererChanged;
-
-extern NSString *VLCPlayerInputStats;
-/**
- * Listen to VLCPlayerStatisticsUpdated to be notified if the playback statistics state of the current media update
- * @note the affected player object will be the object of the notification
- * @note the userInfo dictionary will have an instance of VLCInputStats for key VLCPlayerInputStats representing the new state
- */
-extern NSString *VLCPlayerStatisticsUpdated;
-
-/**
- * Listen to VLCPlayerTrackListChanged to be notified of the list of audio/video/SPU tracks changes for the current media
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerTrackListChanged;
-
-/**
- * Listen to VLCPlayerTrackSelectionChanged to be notified if a selected audio/video/SPU track changes for the current media
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerTrackSelectionChanged;
-
-/**
- * Listen to VLCPlayerFullscreenChanged to be notified whether the fullscreen state of the video output changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerFullscreenChanged;
-
-extern NSString *VLCPlayerPictureInPictureChanged;
-
-/**
- * Listen to VLCPlayerListOfVideoOutputThreadsChanged to be notified when a video output thread was added or removed
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerListOfVideoOutputThreadsChanged;
-
-/**
- * Listen to VLCPlayerWallpaperModeChanged to be notified whether the fullscreen state of the video output changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerWallpaperModeChanged;
-
-/**
- * Listen to VLCPlayerVolumeChanged to be notified whether the audio output volume changes
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerVolumeChanged;
-
-/**
- * Listen to VLCPlayerMuteChanged to be notified whether the audio output is muted or not
- * @note the affected player object will be the object of the notification
- */
-extern NSString *VLCPlayerMuteChanged;
-
-extern const CGFloat VLCVolumeMaximum;
-extern const CGFloat VLCVolumeDefault;
-
-@interface VLCPlayerController : NSObject
-
-- (instancetype)initWithPlayer:(vlc_player_t *)player;
-
-/**
- * Start playback of the current media
- * @return VLC_SUCCESS on success, otherwise a VLC error
- */
-- (int)start;
-
-/**
- * Request to start playback in paused state
- * @param yes if you want to start in paused state, no if you want to cancel your previous request
- */
-- (void)startInPausedState:(BOOL)startPaused;
-
-/**
- * Pause the current playback
- */
-- (void)pause;
-
-/**
- * Resume the current playback
- */
-- (void)resume;
-
-/**
- * Convenience method to either start or pause playback
- */
-- (void)togglePlayPause;
-
-/**
- * Stop the current playback
- */
-- (void)stop;
-
-/**
- * the current status of the A→B loop
- * It will be A if A is set, B if A _and_ B are set or none if there is none
- * @note listen to VLCPlayerABLoopStateChanged for changes to this property
- */
-@property (readonly) enum vlc_player_abloop abLoopState;
-@property (readonly) vlc_tick_t aLoopTime;
-@property (readonly) vlc_tick_t bLoopTime;
-@property (readonly) float aLoopPosition;
-@property (readonly) float bLoopPosition;
-
-/**
- * set the A→B loop
- * this function will need to be called twice to set the A and the B point
- * @note VLC core will automatically pick the current time stamp, so there is no parameter to this method
- * @return VLC_SUCCESS or a VLC error code
- */
-- (int)setABLoop;
-
-/**
- * disable the A→B loop
- * @return VLC_SUCCESS or a VLC error code
- */
-- (int)disableABLoop;
-
-/**
- * Move on to the next video frame and pause
- * @warning this relies on a gross hack in the core and will work for 20 consecutive frames maximum only
- */
-- (void)nextVideoFrame;
-
-/**
- * get the current media item
- * @return the current media item, NULL if none
- * @note it is the receiver's obligation to release the input item
- */
-@property (readonly, nullable) VLCInputItem * currentMedia;
-/**
- * set the current media item
- * @note this is typically done by the associated playlist so you should not need to do it
- * @return VLC_SUCCESS on success, another VLC error on failure
- */
-- (int)setCurrentMedia:(VLCInputItem *)currentMedia;
-
-/**
- * returns the duration of the current media in vlc ticks
- */
-@property (readonly) vlc_tick_t durationOfCurrentMediaItem;
-
-/**
- * returns the URL of the current media or NULL if there is none
- */
-@property (readonly, copy, nullable) NSURL *URLOfCurrentMediaItem;
-
-/**
- * returns the name of the current media or NULL if there is none
- */
-@property (readonly, copy, nullable) NSString *nameOfCurrentMediaItem;
-
-/**
- * the current player state
- * @return a value according to the vlc_player_state enum
- * @note listen to VLCPlayerStateChanged to be notified about changes to this property
- */
-@property (readonly) enum vlc_player_state playerState;
-
-/**
- * the current error value
- * @return a value according to the vlc_player_error enum
- * @note listen to VLCPlayerErrorChanged to be notified about changes to this property
- */
-@property (readonly) enum vlc_player_error error;
-
-/**
- * the current buffer state
- * @return a float ranging from 0.0 to 1.0 indicating the buffer fill state as percentage
- * @note listen to VLCPlayerBufferChanged to be notified about changes to this property
- */
-@property (readonly) float bufferFill;
-
-/**
- * the current playback rate
- * @return a float larger than 0.0 indicating the playback rate in multiples
- * @note 1.0 defines playback at the default rate, <1.0 will slow things, >1.0 will be faster
- */
-@property (readwrite, nonatomic) float playbackRate;
-
-/**
- * helper function to increment the playback rate
- */
-- (void)incrementPlaybackRate;
-/**
- * helper function to decrement the playback rate
- */
-- (void)decrementPlaybackRate;
-
-/**
- * is the currently playing input seekable?
- * @return a BOOL value indicating whether the current input is seekable
- * @note listen to VLCPlayerCapabilitiesChanged to be notified about changes to this property
- */
-@property (readonly) BOOL seekable;
-
-/**
- * is the currently playing input rewindable?
- * @return a BOOL value indicating whether the current input is rewindable
- * @note listen to VLCPlayerCapabilitiesChanged to be notified about changes to this property
- */
-@property (readonly) BOOL rewindable;
-
-/**
- * is the currently playing input pausable?
- * @return a BOOL value indicating whether the current input can be paused
- * @note listen to VLCPlayerCapabilitiesChanged to be notified about changes to this property
- */
-@property (readonly) BOOL pausable;
-
-/**
- * is the currently playing input recordable?
- * @return a BOOL value indicating whether the current input can be recorded
- * @note listen to VLCPlayerCapabilitiesChanged to be notified about changes to this property
- */
-@property (readonly) BOOL recordable;
-
-/**
- * is the currently playing input rateChangable?
- * @return a BOOL value indicating whether the playback rate can be changed for the current input
- * @note listen to VLCPlayerCapabilitiesChanged to be notified about changes to this property
- */
-@property (readonly) BOOL rateChangable;
-
-/**
- * the time of the currently playing media
- * @return a valid time or VLC_TICK_INVALID (if no media is set, the media
- * doesn't have any time, if playback is not yet started or in case of error)
- * @note A started and playing media doesn't have necessarily a valid time.
- * @note listen to VLCPlayerTimeAndPositionChanged to be notified about changes to this property
- */
-@property (readonly) vlc_tick_t time;
-
-/**
- * set the playback position in time for the currently playing media
- * @note this methods prefers speed in seeking over precision
- * @note This method can be called before starting to set a starting position.
- */
-- (void)setTimeFast:(vlc_tick_t)time;
-
-/**
- * set the playback position in time for the currently playing media
- * @note this methods prefers precision in seeking over speed
- * @note This method can be called before starting to set a starting position.
- */
-- (void)setTimePrecise:(vlc_tick_t)time;
-
-/**
- * the time of the currently playing media
- * @return a valid time or VLC_TICK_INVALID (if no media is set, the media
- * doesn't have any time, if playback is not yet started or in case of error)
- * @note A started and playing media doesn't have necessarily a valid time.
- * @note listen to VLCPlayerTimeAndPositionChanged to be notified about changes to this property
- */
-@property (readonly) float position;
-
-/**
- * set the playback position as a percentage (range 0.0 to 1.0) for the currently playing media
- * @note this methods prefers speed in seeking over precision
- * @note This method can be called before starting to set a starting position.
- */
-- (void)setPositionFast:(float)position;
-
-/**
- * set the playback position as a percentage (range 0.0 to 1.0) for the currently playing media
- * @note this methods prefers precision in seeking over speed
- * @note This method can be called before starting to set a starting position.
- */
-- (void)setPositionPrecise:(float)position;
-
-/**
- * shows the current position as OSD within the video
- * does not do anything if you do not have a vout
- */
-- (void)displayPosition;
-
-/**
- * helper function to jump forward with the extra short interval (user configurable in preferences)
- */
-- (void)jumpForwardExtraShort;
-
-/**
- * helper function to jump backward with the extra short interval (user configurable in preferences)
- */
-- (void)jumpBackwardExtraShort;
-
-/**
- * helper function to jump forward with the short interval (user configurable in preferences)
- */
-- (void)jumpForwardShort;
-
-/**
- * helper function to jump backward with the extra short interval (user configurable in preferences)
- */
-- (void)jumpBackwardShort;
-
-/**
- * helper function to jump forward with the medium interval (user configurable in preferences)
- */
-- (void)jumpForwardMedium;
-
-/**
- * helper function to jump backward with the medium interval (user configurable in preferences)
- */
-- (void)jumpBackwardMedium;
-
-/**
- * helper function to jump forward with the long interval (user configurable in preferences)
- */
-- (void)jumpForwardLong;
-
-/**
- * helper function to jump forward with the long interval (user configurable in preferences)
- */
-- (void)jumpBackwardLong;
-
-/**
- * the length of the currently playing media in ticks
- * @return a valid time or VLC_TICK_INVALID (if no media is set, the media
- * doesn't have any length, if playback is not yet started or in case of error)
- * @note A started and playing media doesn't have necessarily a valid length.
- * @note listen to VLCPlayerLengthChanged to be notified about changes to this property
- */
-@property (readonly) vlc_tick_t length;
-
-/**
- * set/get the currently selected title
- * @note listen to VLCPlayerTitleSelectionChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) size_t selectedTitleIndex;
-
-/**
- * convenience method to get the current title
- * @note this may return NULL if there is no title
- */
-- (const struct vlc_player_title * _Nullable)selectedTitle;
-
-/**
- * get the number of titles available for the currently playing media item
- * @note listen to VLCPlayerTitleListChanged to be notified about changes to this property
- */
-@property (readonly) size_t numberOfTitlesOfCurrentMedia;
-
-@property (readonly) NSArray<VLCPlayerTitle *> *titlesOfCurrentMedia;
-
-/**
- * get a vlc_player_title by the index
- * @note listen to VLCPlayerTitleListChanged in case the list changes so previous indexes will no longer be valid anymore
- */
-- (const struct vlc_player_title *)titleAtIndexForCurrentMedia:(size_t)index;
-
-/**
- * the index of the currently selected chapter within the current title
- * @note listen to VLCPlayerChapterSelectionChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) size_t selectedChapterIndex;
-
-/**
- * select the next chapter of the current title
- */
-- (void)selectNextChapter;
-
-/**
- * select the previous chapter of the current title
- */
-- (void)selectPreviousChapter;
-
-/**
- * returns the number of chapters for the current title
- */
-@property (readonly) size_t numberOfChaptersForCurrentTitle;
-
-/**
- * returns the chapter for the index within the current title
- */
-- (nullable const struct vlc_player_chapter *)chapterAtIndexForCurrentTitle:(size_t)index;
-
-/**
- * returns the selected program ID, typically in the range 0 to 32,000
- * @warning the counter does not necessarily start at 0 nor are programs numbered consecutively
- * @note listen to VLCPlayerProgramSelectionChanged to be notified about changes to this property
- */
-@property (readonly) int selectedProgramID;
-
-/**
- * select the program defined by the provided VLCProgramMetaData instance
- * @note listen to VLCPlayerProgramSelectionChanged to be notified once the change takes effect
- */
-- (void)selectProgram:(VLCProgramMetaData *)program;
-
-/**
- * returns the number of programs available for the current media
- * @note listen to VLCPlayerProgramListChanged to be notified about changes to this property
- */
-@property (readonly) size_t numberOfPrograms;
-
-/**
- * returns an instance of VLCProgramMetaData with details about the program at the specified index
- */
-- (nullable VLCProgramMetaData *)programAtIndex:(size_t)index;
-
-/**
- * returns an instance of VLCProgramMetaData with details about the program with the specified ID
- */
-- (nullable VLCProgramMetaData *)programForID:(int)programID;
-
-/**
- * exposes whether a teletext menu is available or not
- * @note listen to VLCPlayerTeletextMenuAvailable to be notified about changes to this property
- */
-@property (readonly) BOOL teletextMenuAvailable;
-
-/**
- * enable/disable teletext display
- * @note listen to VLCPlayerTeletextEnabled to be notified about changes to this property
- */
-@property (readwrite, nonatomic) BOOL teletextEnabled;
-
-/**
- * set/get the currently displayed (or looked for) teletext page
- *
- * @note Page keys can be the following: @ref VLC_PLAYER_TELETEXT_KEY_RED,
- * @ref VLC_PLAYER_TELETEXT_KEY_GREEN, @ref VLC_PLAYER_TELETEXT_KEY_YELLOW,
- * @ref VLC_PLAYER_TELETEXT_KEY_BLUE or @ref VLC_PLAYER_TELETEXT_KEY_INDEX.
- *
- * @param page a page in the range 0 to 888 or a valid key
- * @note listen to VLCPlayerTeletextPageChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) unsigned int teletextPage;
-
-/**
- * is the teletext background transparent or not?
- * @return a BOOL value indicating the current state
- * @note listen to VLCPlayerTeletextTransparencyChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) BOOL teletextTransparent;
-
-/**
- * the audio delay for the current media
- * @warning this property expects you to provide an absolute delay time
- * @return the audio delay in vlc ticks
- * @note listed to VLCPlayerAudioDelayChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) vlc_tick_t audioDelay;
-
-/**
- * the subtitles delay for the current media
- * @warning this property expects you to provide an absolute delay time
- * @return the subtitles delay in vlc ticks
- * @note listen to VLCPlayerSubtitlesDelayChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) vlc_tick_t subtitlesDelay;
-
-/**
- * fetch the delay for a specific track identified through its elementary stream ID
- * @return the delay for the track or VLC_TICK_MAX if none is set
- */
-- (vlc_tick_t)delayForElementaryStreamID:(vlc_es_id_t *)esID;
-
-/**
- * set the delay of a specific track identified through its elementary stream ID
- * @warning Setting the delay of one specific track will override previous and future changes of delay made through generic calls
- * @param delay the delay as a valid time or VLC_TICK_MAX to reset to the default for the ES category
- * @param esID the ID for the elementary stream
- * @param relative use an absolute or relative whence to describe the time
- * @return VLC_SUCCESS on success
- */
-- (int)setDelay:(vlc_tick_t)delay forElementaryStreamID:(vlc_es_id_t *)esID relativeWhence:(BOOL)relative;
-
-/**
- * the subtitles fps to correct mismatch between video and text
- * the default value shall be 1.0
- * @note listen to VLCPlayerSubtitlesFPSChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) float subtitlesFPS;
-
-/**
- * a scale factor for text based subtitles, range 10 - 500, default 100
- * @warning this does not have any effect on bitmapped subtitles
- */
-@property (readwrite, nonatomic) unsigned int subtitleTextScalingFactor;
-
-/**
- * enable recording of the current media or check if it is being done
- * @note listen to VLCPlayerRecordingChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) BOOL enableRecording;
-
-/**
- * helper function to inverse the current recording state
- */
-- (void)toggleRecord;
-
-/**
- * allows to add associated media to the currently playing one (previously known as input slaves)
- * @param the URL for the media
- * @param the media category (SPU or audio)
- * @param defines whether the added track shall be immediately selected
- * @param defines whether a OSD notification shall be displayed after adding the track
- * @param defines whether the core shall verify the file extension before trying the addition
- * @return VLC_SUCCESS or an error
- */
-- (int)addAssociatedMediaToCurrentFromURL:(NSURL *)URL
-                               ofCategory:(enum es_format_category_e)category
-                         shallSelectTrack:(BOOL)selectTrack
-                          shallDisplayOSD:(BOOL)showOSD
-                     shallVerifyExtension:(BOOL)verifyExtension;
-
-/**
- * set / get the renderer for the current player
- * @warning the returned vlc_renderer_item_t * must be released with vlc_renderer_item_release().
- * @note listen to VLCPlayerRendererChanged to be notified about changes
- */
-@property (readwrite, nonatomic, nullable) vlc_renderer_item_t *rendererItem;
-
-/**
- * navigate in interactive content such as DVD or BR menus
- */
-- (void)navigateInInteractiveContent:(enum vlc_player_nav)navigationAction;
-
-/**
- * the latest available playback statistics
- * @return an instance of VLCInputStats holding the data
- * @note listen to VLCPlayerStatisticsUpdated to be notified about changes to this property
- */
-@property (readonly) VLCInputStats *statistics;
-
-#pragma mark - track selection
-
-/**
- * select a track
- * @param the track to select
- * @param indicate whether multiple tracks may be played (video and SPU only)
- * @note since tracks are unique, you do not need to specify the type
- * @note listen to VLCTrackSelectionChanged to be notified once the change occurred
- */
-- (void)selectTrack:(VLCTrackMetaData *)track exclusively:(BOOL)exclusiveSelection;
-
-/**
- * unselect a track
- * @note since tracks are unique, you do not need to specify the type
- * @note listen to VLCTrackSelectionChanged to be notified once the change occurred
- */
-- (void)unselectTrack:(VLCTrackMetaData *)track;
-
-/**
- * unselect any track of a certain category
- * @param the es_format_category_e category to unselect
- * @note listen to VLCTrackSelectionChanged to be notified once the change occurred
- */
-- (void)unselectTracksFromCategory:(enum es_format_category_e)category;
-
-/**
- * cycle to the previous track of a certain category
- * @param the category, @see es_format_category_e
- * @note listen to VLCTrackSelectionChanged to be notified once the change occurred
- */
-- (void)selectPreviousTrackForCategory:(enum es_format_category_e)category;
-
-/**
- * cycle to the next track of a certain category
- * @param the category, @see es_format_category_e
- * @note listen to VLCTrackSelectionChanged to be notified once the change occurred
- */
-- (void)selectNextTrackForCategory:(enum es_format_category_e)category;
-
-/**
- * an array holding instances of VLCTrackMetaData describing the available audio tracks for the current media
- * @note listen to VLCPlayerTrackListChanged to be notified of changes to the list
- */
-@property (readonly, nullable) NSArray<VLCTrackMetaData *>* audioTracks;
-
-/**
- * an array holding instances of VLCTrackMetaData describing the available video tracks for the current media
- * @note listen to VLCPlayerTrackListChanged to be notified of changes to the list
- */
-@property (readonly, nullable) NSArray<VLCTrackMetaData *>* videoTracks;
-
-/**
- * an array holding instances of VLCTrackMetaData describing the available subtitle tracks for the current media
- * @note listen to VLCPlayerTrackListChanged to be notified of changes to the list
- */
-@property (readonly, nullable) NSArray<VLCTrackMetaData *>* subtitleTracks;
-
-@property (readonly) BOOL videoTracksEnabled;
-
-@property (readonly) VLCTrackMetaData *selectedVideoTrack;
-
-@property (readonly) BOOL audioTracksEnabled;
-
-@property (readonly) VLCTrackMetaData *selectedAudioTrack;
-
-#pragma mark - video output properties
-
-/**
- * the main video output thread
- * @warning the returned vout_thread_t * must be released with vout_Release().
- * @note listen to VLCPlayerListOfVideoOutputThreadsChanged to be notified about changes
- * @return the current video output thread or NULL if there is none
- */
-@property (readonly, nullable) vout_thread_t *mainVideoOutputThread;
-
-/**
- * the video output embedded in the current key window
- * @warning the returned vout_thread_t * must be released with vout_Release().
- * @return the current video output thread for the key window or the main video output thread or NULL if there is none
- */
-@property (readonly, nullable) vout_thread_t *videoOutputThreadForKeyWindow;
-
-/**
- * an array holding all current video output threads
- * @warning the returned vout_thread_t * instances must be individually released with vout_Release().
- * @note listen to VLCPlayerListOfVideoOutputThreadsChanged to be notified about changes
- */
-@property (readonly, nullable, copy) NSArray<NSValue *> *allVideoOutputThreads;
-
-/**
- * indicates whether video is displayed in fullscreen or shall to
- * @note listen to VLCPlayerFullscreenChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) BOOL fullscreen;
-
-/**
- * indicates whether we currently have an active video playback session
- */
-@property (readwrite) BOOL activeVideoPlayback;
-
-/**
- * helper function to inverse the current fullscreen state
- */
-- (void)toggleFullscreen;
-
-
-- (void)togglePictureInPicture;
-
-/**
- * indicates whether video is displaed in wallpaper mode or shall to
- * @note listen to VLCPlayerWallpaperModeChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) BOOL wallpaperMode;
-
-/**
- * Take a snapshot of all vouts
- */
-- (void)takeSnapshot;
-
-/**
- * displays a OSD message format string
- */
-- (void)displayOSDMessage:(NSString *)message;
-
-/**
- * defines whether the vout windows lock on the video's AR or can be resized arbitrarily
- */
-@property (nonatomic, readwrite) BOOL aspectRatioIsLocked;
-
-#pragma mark - audio output properties
-
-/**
- * reveals or sets the audio output volume
- * range is 0.0 to 2.0 in percentage, whereas 100% is the unamplified maximum
- * @note listen to VLCPlayerVolumeChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) float volume;
-
-/**
- * helper function to increase volume by 5%
- */
-- (void)incrementVolume;
-
-/**
- * helper function to decrease volume by 5%
- */
-- (void)decrementVolume;
-
-/**
- * reveals or sets whether audio output is set to mute or not
- * @note listen to VLCPlayerMuteChanged to be notified about changes to this property
- */
-@property (readwrite, nonatomic) BOOL mute;
-
-/**
- * helper function to inverse the current mute state
- */
-- (void)toggleMute;
-
-/**
- * the main audio output thread
- * @warning the returned vout_thread_t * must be released with aout_Release().
- * @return the current audio output instance or NULL if there is none
- */
-@property (readonly, nullable) audio_output_t *mainAudioOutput;
-
-- (int)enableAudioFilterWithName:(NSString *)name state:(BOOL)state;
-
-@end
-
-@interface VLCInputStats : NSObject
-
-- (instancetype)initWithStatsStructure:(const struct input_stats_t *)stats;
-
-/* Input */
-@property (readonly) int64_t inputReadPackets;
-@property (readonly) int64_t inputReadBytes;
-@property (readonly) float inputBitrate;
-
-/* Demux */
-@property (readonly) int64_t demuxReadPackets;
-@property (readonly) int64_t demuxReadBytes;
-@property (readonly) float demuxBitrate;
-@property (readonly) int64_t demuxCorrupted;
-@property (readonly) int64_t demuxDiscontinuity;
-
-/* Decoders */
-@property (readonly) int64_t decodedAudio;
-@property (readonly) int64_t decodedVideo;
-
-/* Vout */
-@property (readonly) int64_t displayedPictures;
-@property (readonly) int64_t latePictures;
-@property (readonly) int64_t lostPictures;
-
-/* Aout */
-@property (readonly) int64_t playedAudioBuffers;
-@property (readonly) int64_t lostAudioBuffers;
-
-@end
-
-@interface VLCTrackMetaData : NSObject
-
-- (instancetype)initWithTrackStructure:(const struct vlc_player_track *)track;
-
-@property (readonly) vlc_es_id_t *esID;
-@property (readonly) NSString *name;
-@property (readonly) BOOL selected;
-
-@end
-
-@interface VLCProgramMetaData : NSObject
-
-- (instancetype)initWithProgramStructure:(const struct vlc_player_program *)structure;
-
-@property (readonly) int group_id;
-@property (readonly) NSString *name;
-@property (readonly) BOOL selected;
-@property (readonly) BOOL scrambled;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlayerController.m Deleted

@@ -1,1883 +0,0 @@
-/*****************************************************************************
- * VLCPlayerController.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlayerController.h"
-#include "vlc_player.h"
-
-#import <vlc_configuration.h>
-#import <vlc_url.h>
-
-#import "extensions/NSString+Helpers.h"
-
-#import "library/VLCInputItem.h"
-
-#import "main/VLCMain.h"
-
-#import "os-integration/VLCRemoteControlService.h"
-#import "os-integration/iTunes.h"
-#import "os-integration/Spotify.h"
-
-#import "playlist/VLCPlayerTitle.h"
-
-#import "windows/video/VLCVoutView.h"
-#import "windows/video/VLCMainVideoViewController.h"
-#import "windows/video/VLCVideoWindowCommon.h"
-
-NSString *VLCPlayerElementaryStreamID = @"VLCPlayerElementaryStreamID";
-NSString *VLCTick = @"VLCTick";
-NSString *VLCPlayerCurrentMediaItemChanged = @"VLCPlayerCurrentMediaItemChanged";
-NSString *VLCPlayerMetadataChangedForCurrentMedia = @"VLCPlayerMetadataChangedForCurrentMedia";
-NSString *VLCPlayerStateChanged = @"VLCPlayerStateChanged";
-NSString *VLCPlayerErrorChanged = @"VLCPlayerErrorChanged";
-NSString *VLCPlayerBufferFill = @"VLCPlayerBufferFill";
-NSString *VLCPlayerBufferChanged = @"VLCPlayerBufferChanged";
-NSString *VLCPlayerRateChanged = @"VLCPlayerRateChanged";
-NSString *VLCPlayerCapabilitiesChanged = @"VLCPlayerCapabilitiesChanged";
-NSString *VLCPlayerTimeAndPositionChanged = @"VLCPlayerTimeAndPositionChanged";
-NSString *VLCPlayerLengthChanged = @"VLCPlayerLengthChanged";
-NSString *VLCPlayerTitleSelectionChanged = @"VLCPlayerTitleSelectionChanged";
-NSString *VLCPlayerTitleListChanged = @"VLCPlayerTitleListChanged";
-NSString *VLCPlayerChapterSelectionChanged = @"VLCPlayerChapterSelectionChanged";
-NSString *VLCPlayerProgramSelectionChanged = @"VLCPlayerProgramSelectionChanged";
-NSString *VLCPlayerProgramListChanged = @"VLCPlayerProgramListChanged";
-NSString *VLCPlayerABLoopStateChanged = @"VLCPlayerABLoopStateChanged";
-NSString *VLCPlayerTeletextMenuAvailable = @"VLCPlayerTeletextMenuAvailable";
-NSString *VLCPlayerTeletextEnabled = @"VLCPlayerTeletextEnabled";
-NSString *VLCPlayerTeletextPageChanged = @"VLCPlayerTeletextPageChanged";
-NSString *VLCPlayerTeletextTransparencyChanged = @"VLCPlayerTeletextTransparencyChanged";
-NSString *VLCPlayerAudioDelayChanged = @"VLCPlayerAudioDelayChanged";
-NSString *VLCPlayerSubtitlesDelayChanged = @"VLCPlayerSubtitlesDelayChanged";
-NSString *VLCPlayerDelayChangedForSpecificElementaryStream = @"VLCPlayerDelayChangedForSpecificElementaryStream";
-NSString *VLCPlayerSubtitlesFPSChanged = @"VLCPlayerSubtitlesFPSChanged";
-NSString *VLCPlayerSubtitleTextScalingFactorChanged = @"VLCPlayerSubtitleTextScalingFactorChanged";
-NSString *VLCPlayerRecordingChanged = @"VLCPlayerRecordingChanged";
-NSString *VLCPlayerRendererChanged = @"VLCPlayerRendererChanged";
-NSString *VLCPlayerInputStats = @"VLCPlayerInputStats";
-NSString *VLCPlayerStatisticsUpdated = @"VLCPlayerStatisticsUpdated";
-NSString *VLCPlayerTrackListChanged = @"VLCPlayerTrackListChanged";
-NSString *VLCPlayerTrackSelectionChanged = @"VLCPlayerTrackSelectionChanged";
-NSString *VLCPlayerFullscreenChanged = @"VLCPlayerFullscreenChanged";
-NSString *VLCPlayerPictureInPictureChanged = @"VLCPlayerPictureInPictureChanged";
-NSString *VLCPlayerWallpaperModeChanged = @"VLCPlayerWallpaperModeChanged";
-NSString *VLCPlayerListOfVideoOutputThreadsChanged = @"VLCPlayerListOfVideoOutputThreadsChanged";
-NSString *VLCPlayerVolumeChanged = @"VLCPlayerVolumeChanged";
-NSString *VLCPlayerMuteChanged = @"VLCPlayerMuteChanged";
-
-const CGFloat VLCVolumeMaximum = 2.;
-const CGFloat VLCVolumeDefault = 1.;
-
-@interface VLCPlayerController ()
-{
-    vlc_player_t *_p_player;
-    vlc_player_listener_id *_playerListenerID;
-    vlc_player_aout_listener_id *_playerAoutListenerID;
-    vlc_player_vout_listener_id *_playerVoutListenerID;
-    vlc_player_title_list *_currentTitleList;
-    NSNotificationCenter *_defaultNotificationCenter;
-
-    /* remote control support */
-    VLCRemoteControlService *_remoteControlService;
-
-    /* iTunes/Apple Music/Spotify play/pause support */
-    BOOL _iTunesPlaybackWasPaused;
-    BOOL _appleMusicPlaybackWasPaused;
-    BOOL _spotifyPlaybackWasPaused;
-
-    NSTimer *_playbackHasTruelyEndedTimer;
-}
-
-@property (readwrite, atomic) iTunesApplication *appleMusicApp;
-@property (readwrite, atomic) iTunesApplication *iTunesApp;
-@property (readwrite, atomic) SpotifyApplication *spotifyApp;
-
-- (void)currentMediaItemChanged:(input_item_t *)newMediaItem;
-- (void)stateChanged:(enum vlc_player_state)state;
-- (void)errorChanged:(enum vlc_player_error)error;
-- (void)newBufferingValue:(float)bufferValue;
-- (void)newRateValue:(float)rateValue;
-- (void)capabilitiesChanged:(int)newCapabilities;
-- (void)position:(float)position andTimeChanged:(vlc_tick_t)time;
-- (void)lengthChanged:(vlc_tick_t)length;
-- (void)titleListChanged:(vlc_player_title_list *)p_titles;
-- (void)selectedTitleChanged:(size_t)selectedTitle;
-- (void)selectedChapterChanged:(size_t)chapterIndex;
-- (void)teletextAvailibilityChanged:(BOOL)hasTeletextMenu;
-- (void)teletextEnabledChanged:(BOOL)teletextOn;
-- (void)teletextPageChanged:(unsigned int)page;
-- (void)teletextTransparencyChanged:(BOOL)isTransparent;
-- (void)audioDelayChanged:(vlc_tick_t)audioDelay;
-- (void)rendererChanged:(vlc_renderer_item_t *)newRendererItem;
-- (void)subtitlesDelayChanged:(vlc_tick_t)subtitlesDelay;
-- (void)delayChanged:(vlc_tick_t)trackDelay forTrack:(vlc_es_id_t *)esID;
-- (void)subtitlesFPSChanged:(float)subtitlesFPS;
-- (void)recordingChanged:(BOOL)recording;
-- (void)inputStatsUpdated:(VLCInputStats *)inputStats;
-- (void)trackSelectionChanged;
-- (void)trackListChanged;
-- (void)programListChanged;
-- (void)programSelectionChanged:(int)selectedID;
-- (void)ABLoopStateChanged:(enum vlc_player_abloop)abLoopState;
-- (void)metaDataChangedForInput:(input_item_t *)inputItem;
-- (void)voutListUpdated;
-
-/* video */
-- (void)fullscreenChanged:(BOOL)isFullscreen;
-- (void)wallpaperModeChanged:(BOOL)wallpaperModeValue;
-
-/* audio */
-- (void)volumeChanged:(float)volume;
-- (void)muteChanged:(BOOL)mute;
-@end
-
-#pragma mark - player callback implementations
-
-static void cb_player_current_media_changed(vlc_player_t *p_player, input_item_t *p_newMediaItem, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController currentMediaItemChanged:p_newMediaItem;
-    });
-}
-
-static void cb_player_state_changed(vlc_player_t *p_player, enum vlc_player_state state, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController stateChanged:state;
-    });
-}
-
-static void cb_player_error_changed(vlc_player_t *p_player, enum vlc_player_error error, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController errorChanged:error;
-    });
-}
-
-static void cb_player_buffering(vlc_player_t *p_player, float newBufferValue, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController newBufferingValue:newBufferValue;
-    });
-}
-
-static void cb_player_rate_changed(vlc_player_t *p_player, float newRateValue, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController newRateValue:newRateValue;
-    });
-}
-
-static void cb_player_capabilities_changed(vlc_player_t *p_player, int oldCapabilities, int newCapabilities, void *p_data)
-{
-    VLC_UNUSED(p_player); VLC_UNUSED(oldCapabilities);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController capabilitiesChanged:newCapabilities;
-    });
-}
-
-static void cb_player_position_changed(vlc_player_t *p_player, vlc_tick_t time, double position, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController position:position andTimeChanged:time;
-    });
-}
-
-static void cb_player_length_changed(vlc_player_t *p_player, vlc_tick_t newLength, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController lengthChanged:newLength;
-    });
-}
-
-static void cb_player_titles_changed(vlc_player_t *p_player,
-                                     vlc_player_title_list *p_titles,
-                                     void *p_data)
-{
-    VLC_UNUSED(p_player);
-    if (p_titles)
-        vlc_player_title_list_Hold(p_titles);
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController titleListChanged:p_titles;
-    });
-}
-
-static void cb_player_title_selection_changed(vlc_player_t *p_player,
-                                              const struct vlc_player_title *p_new_title,
-                                              size_t selectedIndex,
-                                              void *p_data)
-{
-    VLC_UNUSED(p_player);
-    VLC_UNUSED(p_new_title);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController selectedTitleChanged:selectedIndex;
-    });
-}
-
-static void cb_player_chapter_selection_changed(vlc_player_t *p_player,
-                                                const struct vlc_player_title *p_title, size_t title_idx,
-                                                const struct vlc_player_chapter *p_new_chapter, size_t new_chapter_idx,
-                                                void *p_data)
-{
-    VLC_UNUSED(p_player);
-    VLC_UNUSED(p_title);
-    VLC_UNUSED(title_idx);
-    VLC_UNUSED(p_new_chapter);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController selectedChapterChanged:new_chapter_idx;
-    });
-}
-
-static void cb_player_teletext_menu_availability_changed(vlc_player_t *p_player, bool hasTeletextMenu, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController teletextAvailibilityChanged:hasTeletextMenu;
-    });
-}
-
-static void cb_player_teletext_enabled_changed(vlc_player_t *p_player, bool teletextEnabled, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController teletextEnabledChanged:teletextEnabled;
-    });
-}
-
-static void cb_player_teletext_page_changed(vlc_player_t *p_player, unsigned page, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController teletextPageChanged:page;
-    });
-}
-
-static void cb_player_teletext_transparency_changed(vlc_player_t *p_player, bool isTransparent, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController teletextTransparencyChanged:isTransparent;
-    });
-}
-
-static void cb_player_category_delay_changed(vlc_player_t *p_player, enum es_format_category_e cat,
-                                             vlc_tick_t newDelay, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        switch (cat)
-        {
-            case AUDIO_ES:
-                playerController audioDelayChanged:newDelay;
-                break;
-            case SPU_ES:
-                playerController subtitlesDelayChanged:newDelay;
-                break;
-            default:
-                vlc_assert_unreachable();
-        }
-    });
-}
-
-static void cb_player_associated_subs_fps_changed(vlc_player_t *p_player, float subs_fps, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController subtitlesFPSChanged:subs_fps;
-    });
-}
-
-static void cb_player_renderer_changed(vlc_player_t *p_player,
-                                       vlc_renderer_item_t *p_new_renderer,
-                                       void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController rendererChanged:p_new_renderer;
-    });
-}
-
-static void cb_player_record_changed(vlc_player_t *p_player, bool recording, void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController recordingChanged:recording;
-    });
-}
-
-static void cb_player_stats_changed(vlc_player_t *p_player,
-                                    const struct input_stats_t *p_stats,
-                                    void *p_data)
-{
-    VLC_UNUSED(p_player);
-
-    /* the provided structure is valid in this context only, so copy all data to our own */
-    VLCInputStats *inputStats = VLCInputStats alloc initWithStatsStructure:p_stats;
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController inputStatsUpdated:inputStats;
-    });
-}
-
-static void cb_player_track_list_changed(vlc_player_t *p_player,
-                                         enum vlc_player_list_action action,
-                                         const struct vlc_player_track *track,
-                                         void *p_data)
-{
-    VLC_UNUSED(p_player); VLC_UNUSED(action); VLC_UNUSED(track);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController trackListChanged;
-    });
-}
-
-static void cb_player_track_selection_changed(vlc_player_t *p_player,
-                                              vlc_es_id_t *unselected_id,
-                                              vlc_es_id_t *selected_id,
-                                              void *p_data)
-{
-    VLC_UNUSED(p_player); VLC_UNUSED(unselected_id); VLC_UNUSED(selected_id);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController trackSelectionChanged;
-    });
-}
-
-static void cb_player_track_delay_changed(vlc_player_t *p_player,
-                                          vlc_es_id_t *es_id,
-                                          vlc_tick_t delay,
-                                          void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController delayChanged:delay forTrack:es_id;
-    });
-}
-
-static void cb_player_program_list_changed(vlc_player_t *p_player,
-                                           enum vlc_player_list_action action,
-                                           const struct vlc_player_program *prgm,
-                                           void *p_data)
-{
-    VLC_UNUSED(p_player); VLC_UNUSED(action); VLC_UNUSED(prgm);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController programListChanged;
-    });
-}
-
-static void cb_player_program_selection_changed(vlc_player_t *p_player,
-                                                int unselected_id,
-                                                int selected_id,
-                                                void *p_data)
-{
-    VLC_UNUSED(p_player); VLC_UNUSED(unselected_id);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController programSelectionChanged:selected_id;
-    });
-}
-
-static void cb_player_atobloop_changed(vlc_player_t *p_player,
-                                       enum vlc_player_abloop new_state,
-                                       vlc_tick_t time, double pos,
-                                       void *p_data)
-{
-    VLC_UNUSED(p_player);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController ABLoopStateChanged:new_state;
-    });
-}
-
-static void cb_player_item_meta_changed(vlc_player_t *p_player,
-                                        input_item_t *p_mediaItem,
-                                        void *p_data)
-{
-    VLC_UNUSED(p_player);
-    input_item_Hold(p_mediaItem);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController metaDataChangedForInput:p_mediaItem;
-    });
-}
-
-static void cb_player_vout_changed(vlc_player_t *p_player,
-                                   enum vlc_player_vout_action action,
-                                   vout_thread_t *p_vout,
-                                   enum vlc_vout_order order,
-                                   vlc_es_id_t *es_id,
-                                   void *p_data)
-{
-    VLC_UNUSED(p_player);
-    VLC_UNUSED(p_vout);
-    VLC_UNUSED(order);
-
-    if (vlc_es_id_GetCat(es_id) != VIDEO_ES)
-        return;
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController voutListUpdated;
-    });
-}
-
-static const struct vlc_player_cbs player_callbacks = {
-    .on_current_media_changed = cb_player_current_media_changed,
-    .on_state_changed = cb_player_state_changed,
-    .on_error_changed = cb_player_error_changed,
-    .on_buffering_changed = cb_player_buffering,
-    .on_rate_changed = cb_player_rate_changed,
-    .on_capabilities_changed = cb_player_capabilities_changed,
-    .on_position_changed = cb_player_position_changed,
-    .on_length_changed = cb_player_length_changed,
-    .on_track_list_changed = cb_player_track_list_changed,
-    .on_track_selection_changed = cb_player_track_selection_changed,
-    .on_track_delay_changed = cb_player_track_delay_changed,
-    .on_program_list_changed = cb_player_program_list_changed,
-    .on_program_selection_changed = cb_player_program_selection_changed,
-    .on_titles_changed = cb_player_titles_changed,
-    .on_title_selection_changed = cb_player_title_selection_changed,
-    .on_chapter_selection_changed = cb_player_chapter_selection_changed,
-    .on_teletext_menu_changed = cb_player_teletext_menu_availability_changed,
-    .on_teletext_enabled_changed = cb_player_teletext_enabled_changed,
-    .on_teletext_page_changed = cb_player_teletext_page_changed,
-    .on_teletext_transparency_changed = cb_player_teletext_transparency_changed,
-    .on_category_delay_changed = cb_player_category_delay_changed,
-    .on_associated_subs_fps_changed = cb_player_associated_subs_fps_changed,
-    .on_renderer_changed = cb_player_renderer_changed,
-    .on_recording_changed = cb_player_record_changed,
-    .on_signal_changed = NULL,
-    .on_statistics_changed = cb_player_stats_changed,
-    .on_atobloop_changed = cb_player_atobloop_changed,
-    .on_media_meta_changed = cb_player_item_meta_changed,
-    .on_media_epg_changed = NULL,
-    .on_media_subitems_changed = NULL,
-    .on_vout_changed = cb_player_vout_changed,
-    .on_cork_changed = NULL,
-};
-
-#pragma mark - video specific callback implementations
-
-static void cb_player_vout_fullscreen_changed(vout_thread_t *p_vout, bool isFullscreen, void *p_data)
-{
-    VLC_UNUSED(p_vout);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController fullscreenChanged:isFullscreen;
-    });
-}
-
-static void cb_player_vout_wallpaper_mode_changed(vout_thread_t *p_vout,  bool wallpaperModeEnabled, void *p_data)
-{
-    VLC_UNUSED(p_vout);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController wallpaperModeChanged:wallpaperModeEnabled;
-    });
-}
-
-static const struct vlc_player_vout_cbs player_vout_callbacks = {
-    cb_player_vout_fullscreen_changed,
-    cb_player_vout_wallpaper_mode_changed,
-};
-
-#pragma mark - video specific callback implementations
-
-static void cb_player_aout_volume_changed(audio_output_t *aout, float volume, void *p_data)
-{
-    VLC_UNUSED(aout);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController volumeChanged:volume;
-    });
-}
-
-static void cb_player_aout_mute_changed(audio_output_t *aout, bool muted, void *p_data)
-{
-    VLC_UNUSED(aout);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-        playerController muteChanged:muted;
-    });
-}
-
-static const struct vlc_player_aout_cbs player_aout_callbacks = {
-    cb_player_aout_volume_changed,
-    cb_player_aout_mute_changed,
-    NULL,
-};
-
-static int BossCallback(vlc_object_t *p_this,
-                        const char *psz_var,
-                        vlc_value_t oldval,
-                        vlc_value_t new_val,
-                        void *p_data)
-{
-    VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval); VLC_UNUSED(new_val);
-    @autoreleasepool {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
-            playerController pause;
-            NSApplication.sharedApplication hide:nil;
-        });
-        return VLC_SUCCESS;
-    }
-}
-
-#pragma mark - controller initialization
-
-@implementation VLCPlayerController
-
-- (instancetype)initWithPlayer:(vlc_player_t *)player
-{
-    self = super init;
-    if (self) {
-        _defaultNotificationCenter = NSNotificationCenter.defaultCenter;
-        _defaultNotificationCenter addObserver:self
-                                       selector:@selector(applicationWillTerminate:)
-                                           name:NSApplicationWillTerminateNotification
-                                         object:nil;
-        _defaultNotificationCenter addObserver:self
-                                       selector:@selector(applicationDidFinishLaunching:)
-                                           name:NSApplicationDidFinishLaunchingNotification
-                                         object:nil;
-        _position = -1.f;
-        _time = VLC_TICK_INVALID;
-        _p_player = player;
-        vlc_player_Lock(_p_player);
-        // FIXME: initialize state machine here
-        _playerListenerID = vlc_player_AddListener(_p_player,
-                               &player_callbacks,
-                               (__bridge void *)self);
-        vlc_player_Unlock(_p_player);
-        _playerAoutListenerID = vlc_player_aout_AddListener(_p_player,
-                                                            &player_aout_callbacks,
-                                                            (__bridge void *)self);
-        _playerVoutListenerID = vlc_player_vout_AddListener(_p_player,
-                                                            &player_vout_callbacks,
-                                                            (__bridge void *)self);
-
-        _volume = VLCVolumeDefault;
-
-        _aLoopTime = -1;
-        _bLoopTime = -1;
-        _aLoopPosition = -1;
-        _bLoopPosition = -1;
-
-        libvlc_int_t *libvlc = vlc_object_instance(getIntf());
-        var_AddCallback(libvlc, "intf-boss", BossCallback, (__bridge void *)self);
-    }
-
-    return self;
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-    if (@available(macOS 10.12.2, *)) {
-        _remoteControlService = VLCRemoteControlService alloc init;
-        _remoteControlService subscribeToRemoteCommands;
-    }
-
-    dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
-        if (@available(macOS 10.15, *)) {
-            self.appleMusicApp = (iTunesApplication *) SBApplication applicationWithBundleIdentifier:@"com.apple.Music";
-        } else {
-            self.iTunesApp = (iTunesApplication *) SBApplication applicationWithBundleIdentifier:@"com.apple.iTunes";
-        }
-
-        self.spotifyApp = (SpotifyApplication *) SBApplication applicationWithBundleIdentifier:@"com.spotify.client";
-
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if (self->_playerState == VLC_PLAYER_STATE_PLAYING || self->_playerState == VLC_PLAYER_STATE_STARTED) {
-                self stopOtherAudioPlaybackApps;
-            }
-        });
-    });
-}
-
-- (void)applicationWillTerminate:(NSNotification *)aNotification
-{
-    libvlc_int_t *libvlc = vlc_object_instance(getIntf());
-    var_DelCallback(libvlc, "intf-boss", BossCallback, (__bridge void *)self);
-
-    self onPlaybackHasTruelyEnded:nil;
-    if (@available(macOS 10.12.2, *)) {
-        _remoteControlService unsubscribeFromRemoteCommands;
-    }
-    if (_currentTitleList) {
-        vlc_player_title_list_Release(_currentTitleList);
-    }
-    if (_p_player) {
-        if (_playerListenerID) {
-            vlc_player_Lock(_p_player);
-            vlc_player_RemoveListener(_p_player, _playerListenerID);
-            vlc_player_Unlock(_p_player);
-        }
-        if (_playerAoutListenerID) {
-            vlc_player_aout_RemoveListener(_p_player, _playerAoutListenerID);
-        }
-        if (_playerVoutListenerID) {
-            vlc_player_vout_RemoveListener(_p_player, _playerVoutListenerID);
-        }
-    }
-}
-
-- (void)dealloc
-{
-    _defaultNotificationCenter removeObserver:self;
-}
-
-#pragma mark - playback control methods
-
-- (int)start
-{
-    vlc_player_Lock(_p_player);
-    int ret = vlc_player_Start(_p_player);
-    vlc_player_Unlock(_p_player);
-    return ret;
-}
-
-- (void)startInPausedState:(BOOL)startPaused
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SetStartPaused(_p_player, startPaused);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)pause
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_Pause(_p_player);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)resume
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_Resume(_p_player);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)togglePlayPause
-{
-    vlc_player_Lock(_p_player);
-    if (_playerState == VLC_PLAYER_STATE_PLAYING) {
-        vlc_player_Pause(_p_player);
-    } else if (_playerState == VLC_PLAYER_STATE_PAUSED) {
-        vlc_player_Resume(_p_player);
-    } else
-        vlc_player_Start(_p_player);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)stop
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_Stop(_p_player);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)metaDataChangedForInput:(input_item_t *)inputItem
-{
-    _defaultNotificationCenter postNotificationName:VLCPlayerMetadataChangedForCurrentMedia
-                                              object:self;
-}
-
-- (void)nextVideoFrame
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_NextVideoFrame(_p_player);
-    vlc_player_Unlock(_p_player);
-}
-
-#pragma mark - player callback delegations
-
-- (VLCInputItem *)currentMedia
-{
-    VLCInputItem *inputItem;
-    input_item_t *p_input;
-    vlc_player_Lock(_p_player);
-    p_input = vlc_player_GetCurrentMedia(_p_player);
-    if (p_input) {
-        inputItem = VLCInputItem alloc initWithInputItem:p_input;
-    }
-    vlc_player_Unlock(_p_player);
-    return inputItem;
-}
-
-- (int)setCurrentMedia:(VLCInputItem *)currentMedia
-{
-    if (currentMedia == NULL) {
-        return VLC_ENOENT;
-    }
-    vlc_player_Lock(_p_player);
-    int ret = vlc_player_SetCurrentMedia(_p_player, currentMedia.vlcInputItem);
-    vlc_player_Unlock(_p_player);
-    return ret;
-}
-
-- (void)currentMediaItemChanged:(input_item_t *)newMediaItem
-{
-    _defaultNotificationCenter postNotificationName:VLCPlayerCurrentMediaItemChanged
-                                              object:self;
-}
-
-- (vlc_tick_t)durationOfCurrentMediaItem
-{
-    if (!self.currentMedia) {
-        return -1;
-    }
-
-    return self.currentMedia.duration;
-}
-
-- (NSURL *)URLOfCurrentMediaItem;
-{
-    if (!self.currentMedia) {
-        return nil;
-    }
-
-    return NSURL URLWithString:self.currentMedia.MRL;
-}
-
-- (NSString*)nameOfCurrentMediaItem;
-{
-    if (!self.currentMedia) {
-        return nil;
-    }
-
-    NSString *name = self.currentMedia.name;
-    if (!name) {
-        NSURL *url = NSURL URLWithString:self.currentMedia.MRL;
-        if (url isFileURL)
-            name = NSFileManager defaultManager displayNameAtPath:url path;
-        else
-            name = url absoluteString;
-    }
-
-    return name;
-}
-
-- (void)stateChanged:(enum vlc_player_state)state
-{
-    /* instead of using vlc_player_GetState, we cache the state and provide it through a synthesized getter
-     * as the direct call might not reflect the actual state due the asynchronous API nature */
-    _playerState = state;
-
-    /* we seem to start (over), don't start other players */
-    if (_playerState != VLC_PLAYER_STATE_STOPPED) {
-        if (_playbackHasTruelyEndedTimer) {
-            _playbackHasTruelyEndedTimer invalidate;
-            _playbackHasTruelyEndedTimer = nil;
-        }
-    }
-
-    _defaultNotificationCenter postNotificationName:VLCPlayerStateChanged
-                                              object:self;
-
-    /* notify third party apps through an informal protocol that our state changed */
-    NSDistributedNotificationCenter defaultCenter postNotificationName:@"VLCPlayerStateDidChange"
-                                                                   object:nil
-                                                                 userInfo:nil
-                                                       deliverImmediately:YES;
-
-    /* schedule a timer to restart iTunes / Spotify because we are done here */
-    if (_playerState == VLC_PLAYER_STATE_STOPPED) {
-        if (_playbackHasTruelyEndedTimer) {
-            _playbackHasTruelyEndedTimer invalidate;
-        }
-        _playbackHasTruelyEndedTimer = NSTimer scheduledTimerWithTimeInterval:0.5
-                                                                        target:self
-                                                                      selector:@selector(onPlaybackHasTruelyEnded:)
-                                                                      userInfo:nil
-                                                                       repeats:NO;
-    }
-
-    /* pause external players */
-    if (_playerState == VLC_PLAYER_STATE_PLAYING || _playerState == VLC_PLAYER_STATE_STARTED) {
-        self stopOtherAudioPlaybackApps;
-    }
-}
-
-// Called when playback has truly ended and likely no subsequent media will start playing
-- (void)onPlaybackHasTruelyEnded:(id)sender
-{
-    msg_Dbg(getIntf(), "Playback has been ended");
-
-    self resumeOtherAudioPlaybackApps;
-    _playbackHasTruelyEndedTimer = nil;
-}
-
-- (void)stopOtherAudioPlaybackApps
-{
-    intf_thread_t *p_intf = getIntf();
-    int64_t controlOtherPlayers = var_InheritInteger(p_intf, "macosx-control-itunes");
-    if (controlOtherPlayers <= 0)
-        return;
-
-    // Don't bother looking for Apple Music on macOS below 10.15, and conversely
-    // don't bother looking for iTunes on macOS above 10.15
-    if (@available(macOS 10.15, *)) {
-        // Pause Apple Music playback
-        iTunesApplication *appleMusic = self.appleMusicApp;
-        if (appleMusic != nil &&
-            !_appleMusicPlaybackWasPaused &&
-            appleMusic isRunning &&
-            appleMusic playerState == iTunesEPlSPlaying) {
-
-            msg_Dbg(p_intf, "pausing Apple Music");
-            appleMusic pause;
-            _appleMusicPlaybackWasPaused = YES;
-        }
-    } else {
-        iTunesApplication *iTunes = self.iTunesApp;
-        if (iTunes != nil &&
-            !_iTunesPlaybackWasPaused &&
-            iTunes isRunning &&
-            iTunes playerState == iTunesEPlSPlaying) {
-            // Pause iTunes playback
-            msg_Dbg(p_intf, "pausing iTunes");
-            iTunes pause;
-            _iTunesPlaybackWasPaused = YES;
-        }
-    }
-
-    // Pause Spotify
-    SpotifyApplication *spotify = self.spotifyApp;
-    if (spotify != nil &&
-        !_spotifyPlaybackWasPaused &&
-        spotify respondsToSelector:@selector(isRunning) &&
-        spotify respondsToSelector:@selector(playerState) &&
-        spotify isRunning &&
-        spotify playerState == kSpotifyPlayerStatePlaying) {
-
-        msg_Dbg(p_intf, "pausing Spotify");
-        spotify pause;
-        _spotifyPlaybackWasPaused = YES;
-    }
-}
-
-- (void)resumeOtherAudioPlaybackApps
-{
-    intf_thread_t *p_intf = getIntf();
-    if (var_InheritInteger(p_intf, "macosx-control-itunes") > 1) {
-        if (@available(macOS 10.15, *)) {
-            iTunesApplication *appleMusic = self.appleMusicApp;
-            if (appleMusic != nil &&
-                _appleMusicPlaybackWasPaused &&
-                appleMusic isRunning &&
-                appleMusic playerState == iTunesEPlSPaused) {
-
-                msg_Dbg(p_intf, "unpausing Apple Music");
-                appleMusic playpause;
-            }
-        } else {
-            iTunesApplication *iTunes = self.iTunesApp;
-            if (iTunes != nil &&
-                _iTunesPlaybackWasPaused &&
-                iTunes isRunning &&
-                iTunes playerState == iTunesEPlSPaused) {
-
-                msg_Dbg(p_intf, "unpausing iTunes");
-                iTunes playpause;
-            }
-        }
-
-        SpotifyApplication *spotify = self.spotifyApp;
-        if (spotify != nil &&
-            _spotifyPlaybackWasPaused &&
-            spotify respondsToSelector:@selector(isRunning) &&
-            spotify respondsToSelector:@selector(playerState) &&
-            spotify isRunning &&
-            spotify playerState == kSpotifyPlayerStatePaused) {
-
-            msg_Dbg(p_intf, "unpausing Spotify");
-            spotify play;
-        }
-    }
-
-    _iTunesPlaybackWasPaused = NO;
-    _appleMusicPlaybackWasPaused = NO;
-    _spotifyPlaybackWasPaused = NO;
-}
-
-- (void)errorChanged:(enum vlc_player_error)error
-{
-    /* instead of using vlc_player_GetError, we cache the error and provide it through a synthesized getter
-     * as the direct call might not reflect the actual error due the asynchronous API nature */
-    _error = error;
-    _defaultNotificationCenter postNotificationName:VLCPlayerErrorChanged
-                                              object:self;
-}
-
-- (void)newBufferingValue:(float)bufferValue
-{
-    _bufferFill = bufferValue;
-    _defaultNotificationCenter postNotificationName:VLCPlayerBufferChanged
-                                              object:self
-                                            userInfo:@{VLCPlayerBufferFill : @(bufferValue)};
-}
-
-- (void)newRateValue:(float)rateValue
-{
-    _playbackRate = rateValue;
-    _defaultNotificationCenter postNotificationName:VLCPlayerRateChanged
-                                              object:self;
-}
-
-- (void)setPlaybackRate:(float)playbackRate
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_ChangeRate(_p_player, playbackRate);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)incrementPlaybackRate
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_IncrementRate(_p_player);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)decrementPlaybackRate
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_DecrementRate(_p_player);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)capabilitiesChanged:(int)newCapabilities
-{
-    _seekable = newCapabilities & VLC_PLAYER_CAP_SEEK ? YES : NO;
-    _rewindable = newCapabilities & VLC_PLAYER_CAP_REWIND ? YES : NO;
-    _pausable = newCapabilities & VLC_PLAYER_CAP_PAUSE ? YES : NO;
-    _recordable = YES;
-    _rateChangable = newCapabilities & VLC_PLAYER_CAP_CHANGE_RATE ? YES : NO;
-    _defaultNotificationCenter postNotificationName:VLCPlayerCapabilitiesChanged
-                                              object:self;
-}
-
-- (void)position:(float)position andTimeChanged:(vlc_tick_t)time
-{
-    _position = position;
-    _time = time;
-    _defaultNotificationCenter postNotificationName:VLCPlayerTimeAndPositionChanged
-                                              object:self;
-}
-
-- (void)setTimeFast:(vlc_tick_t)time
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SeekByTime(_p_player, time, VLC_PLAYER_SEEK_FAST, VLC_PLAYER_WHENCE_ABSOLUTE);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)setTimePrecise:(vlc_tick_t)time
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SeekByTime(_p_player, time, VLC_PLAYER_SEEK_PRECISE, VLC_PLAYER_WHENCE_ABSOLUTE);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)setPositionFast:(float)position
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SeekByPos(_p_player, position, VLC_PLAYER_SEEK_FAST, VLC_PLAYER_WHENCE_ABSOLUTE);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)setPositionPrecise:(float)position
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SeekByPos(_p_player, position, VLC_PLAYER_SEEK_PRECISE, VLC_PLAYER_WHENCE_ABSOLUTE);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)displayPosition
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_DisplayPosition(_p_player);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)jumpWithValue:(char *)p_userDefinedJumpSize forward:(BOOL)shallJumpForward
-{
-    int64_t interval = var_InheritInteger(getIntf(), p_userDefinedJumpSize);
-    if (interval <= 0)
-        return;
-
-    vlc_tick_t jumptime = vlc_tick_from_sec(interval);
-    if (!shallJumpForward)
-        jumptime = jumptime * -1;
-
-    vlc_player_Lock(_p_player);
-    /* No fask seek for jumps. Indeed, jumps can seek to the current position
-     * if not precise enough or if the jump value is too small. */
-    vlc_player_SeekByTime(_p_player,
-                          jumptime,
-                          VLC_PLAYER_SEEK_PRECISE,
-                          VLC_PLAYER_WHENCE_RELATIVE);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)jumpForwardExtraShort
-{
-    self jumpWithValue:"extrashort-jump-size" forward:YES;
-}
-
-- (void)jumpBackwardExtraShort
-{
-    self jumpWithValue:"extrashort-jump-size" forward:NO;
-}
-
-- (void)jumpForwardShort
-{
-    self jumpWithValue:"short-jump-size" forward:YES;
-}
-
-- (void)jumpBackwardShort
-{
-    self jumpWithValue:"short-jump-size" forward:NO;
-}
-
-- (void)jumpForwardMedium
-{
-    self jumpWithValue:"medium-jump-size" forward:YES;
-}
-
-- (void)jumpBackwardMedium
-{
-    self jumpWithValue:"medium-jump-size" forward:NO;
-}
-
-- (void)jumpForwardLong
-{
-    self jumpWithValue:"long-jump-size" forward:YES;
-}
-
-- (void)jumpBackwardLong
-{
-    self jumpWithValue:"long-jump-size" forward:NO;
-}
-
-- (void)lengthChanged:(vlc_tick_t)length
-{
-    _length = length;
-    _defaultNotificationCenter postNotificationName:VLCPlayerLengthChanged
-                                              object:self;
-}
-
-- (void)titleListChanged:(vlc_player_title_list *)p_titles
-{
-    if (_currentTitleList) {
-        vlc_player_title_list_Release(_currentTitleList);
-    }
-    /* the new list was already hold earlier */
-    _currentTitleList = p_titles;
-    _defaultNotificationCenter postNotificationName:VLCPlayerTitleListChanged
-                                              object:self;
-}
-
-- (void)selectedTitleChanged:(size_t)selectedTitle
-{
-    _selectedTitleIndex = selectedTitle;
-    _defaultNotificationCenter postNotificationName:VLCPlayerTitleSelectionChanged
-                                              object:self;
-}
-
-- (const struct vlc_player_title *)selectedTitle
-{
-    if (_selectedTitleIndex >= 0 && _selectedTitleIndex < self numberOfTitlesOfCurrentMedia) {
-        return vlc_player_title_list_GetAt(_currentTitleList, _selectedTitleIndex);
-    }
-    return NULL;
-}
-
-- (void)setSelectedTitleIndex:(size_t)selectedTitleIndex
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SelectTitleIdx(_p_player, selectedTitleIndex);
-    vlc_player_Unlock(_p_player);
-}
-
-- (const struct vlc_player_title *)titleAtIndexForCurrentMedia:(size_t)index
-{
-    return vlc_player_title_list_GetAt(_currentTitleList, index);
-}
-
-- (size_t)numberOfTitlesOfCurrentMedia
-{
-    if (!_currentTitleList) {
-        return 0;
-    }
-    return vlc_player_title_list_GetCount(_currentTitleList);
-}
-
-- (NSArray<VLCPlayerTitle *> *)titlesOfCurrentMedia
-{
-    const size_t count = self numberOfTitlesOfCurrentMedia;
-    NSMutableArray<VLCPlayerTitle *> * const titles = NSMutableArray.array;
-    for (size_t i = 0; i < count; i++) {
-        const struct vlc_player_title * const p_title = self titleAtIndexForCurrentMedia:i;
-        VLCPlayerTitle * const title = VLCPlayerTitle alloc initWithTitle:p_title atIndex:i;
-        titles addObject:title;
-    }
-    return titles.copy;
-}
-
-- (void)selectedChapterChanged:(size_t)chapterIndex
-{
-    _selectedChapterIndex = chapterIndex;
-    _defaultNotificationCenter postNotificationName:VLCPlayerChapterSelectionChanged
-                                              object:self;
-}
-
-- (void)setSelectedChapterIndex:(size_t)selectedChapterIndex
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SelectChapterIdx(_p_player, selectedChapterIndex);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)selectNextChapter
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SelectNextChapter(_p_player);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)selectPreviousChapter
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SelectPrevChapter(_p_player);
-    vlc_player_Unlock(_p_player);
-}
-
-- (size_t)numberOfChaptersForCurrentTitle
-{
-    const struct vlc_player_title *p_current_title = self selectedTitle;
-    if (p_current_title == NULL) {
-        return 0;
-    }
-
-    return p_current_title->chapter_count;
-}
-
-- (const struct vlc_player_chapter *)chapterAtIndexForCurrentTitle:(size_t)index
-{
-    const struct vlc_player_title *p_current_title = self selectedTitle;
-    if (p_current_title == NULL || !p_current_title->chapter_count) {
-        return NULL;
-    }
-
-    return &p_current_title->chaptersindex;
-}
-
-- (void)teletextAvailibilityChanged:(BOOL)hasTeletextMenu
-{
-    _teletextMenuAvailable = hasTeletextMenu;
-    _defaultNotificationCenter postNotificationName:VLCPlayerTeletextTransparencyChanged
-                                              object:self;
-}
-
-- (void)teletextEnabledChanged:(BOOL)teletextOn
-{
-    _teletextEnabled = teletextOn;
-    _defaultNotificationCenter postNotificationName:VLCPlayerTeletextEnabled
-                                              object:self;
-}
-
-- (void)setTeletextEnabled:(BOOL)teletextEnabled
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SetTeletextEnabled(_p_player, teletextEnabled);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)teletextPageChanged:(unsigned int)page
-{
-    _teletextPage = page;
-    _defaultNotificationCenter postNotificationName:VLCPlayerTeletextPageChanged
-                                              object:self;
-}
-
-- (void)setTeletextPage:(unsigned int)teletextPage
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SelectTeletextPage(_p_player, teletextPage);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)teletextTransparencyChanged:(BOOL)isTransparent
-{
-    _teletextTransparent = isTransparent;
-    _defaultNotificationCenter postNotificationName:VLCPlayerTeletextTransparencyChanged
-                                              object:self;
-}
-
-- (void)setTeletextTransparent:(BOOL)teletextTransparent
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SetTeletextTransparency(_p_player, teletextTransparent);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)audioDelayChanged:(vlc_tick_t)audioDelay
-{
-    _audioDelay = audioDelay;
-    _defaultNotificationCenter postNotificationName:VLCPlayerAudioDelayChanged
-                                              object:self;
-}
-
-- (void)setAudioDelay:(vlc_tick_t)audioDelay
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SetAudioDelay(_p_player, audioDelay, VLC_PLAYER_WHENCE_ABSOLUTE);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)subtitlesDelayChanged:(vlc_tick_t)subtitlesDelay
-{
-    _subtitlesDelay = subtitlesDelay;
-    _defaultNotificationCenter postNotificationName:VLCPlayerSubtitlesDelayChanged
-                                              object:self;
-}
-
-- (void)setSubtitlesDelay:(vlc_tick_t)subtitlesDelay
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SetSubtitleDelay(_p_player, subtitlesDelay, VLC_PLAYER_WHENCE_ABSOLUTE);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)delayChanged:(vlc_tick_t)trackDelay forTrack:(vlc_es_id_t *)esID
-{
-    _defaultNotificationCenter postNotificationName:VLCPlayerDelayChangedForSpecificElementaryStream
-                                              object:self
-                                            userInfo:@{ VLCPlayerElementaryStreamID : NSValue valueWithPointer:esID,
-                                                        VLCTick : NSNumber numberWithLongLong:trackDelay };
-
-}
-
-- (vlc_tick_t)delayForElementaryStreamID:(vlc_es_id_t *)esID
-{
-    vlc_player_Lock(_p_player);
-    vlc_tick_t delay = vlc_player_GetEsIdDelay(_p_player, esID);
-    vlc_player_Unlock(_p_player);
-    return delay;
-}
-
-- (int)setDelay:(vlc_tick_t)delay forElementaryStreamID:(vlc_es_id_t *)esID relativeWhence:(BOOL)relative
-{
-    vlc_player_Lock(_p_player);
-    int returnValue = vlc_player_SetEsIdDelay(_p_player, esID, delay, relative ? VLC_PLAYER_WHENCE_RELATIVE : VLC_PLAYER_WHENCE_ABSOLUTE);
-    vlc_player_Unlock(_p_player);
-    return returnValue;
-}
-
-- (void)subtitlesFPSChanged:(float)subtitlesFPS
-{
-    _subtitlesFPS = subtitlesFPS;
-    _defaultNotificationCenter postNotificationName:VLCPlayerSubtitlesFPSChanged
-                                              object:self;
-}
-
-- (void)setSubtitlesFPS:(float)subtitlesFPS
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SetAssociatedSubsFPS(_p_player, subtitlesFPS);
-    vlc_player_Unlock(_p_player);
-}
-
-- (unsigned int)subtitleTextScalingFactor
-{
-    unsigned int ret = 100;
-    vlc_player_Lock(_p_player);
-    ret = vlc_player_GetSubtitleTextScale(_p_player);
-    vlc_player_Unlock(_p_player);
-    return ret;
-}
-
-- (void)setSubtitleTextScalingFactor:(unsigned int)subtitleTextScalingFactor
-{
-    if (subtitleTextScalingFactor < 10)
-        subtitleTextScalingFactor = 10;
-    if (subtitleTextScalingFactor > 500)
-        subtitleTextScalingFactor = 500;
-
-    vlc_player_Lock(_p_player);
-    vlc_player_SetSubtitleTextScale(_p_player, subtitleTextScalingFactor);
-    vlc_player_Unlock(_p_player);
-}
-
-- (int)addAssociatedMediaToCurrentFromURL:(NSURL *)URL
-                               ofCategory:(enum es_format_category_e)category
-                         shallSelectTrack:(BOOL)selectTrack
-                          shallDisplayOSD:(BOOL)showOSD
-                     shallVerifyExtension:(BOOL)verifyExtension
-{
-    int ret;
-    vlc_player_Lock(_p_player);
-    ret = vlc_player_AddAssociatedMedia(_p_player, category, URL absoluteString UTF8String, selectTrack, showOSD, verifyExtension);
-    vlc_player_Unlock(_p_player);
-    return ret;
-}
-
-- (void)rendererChanged:(vlc_renderer_item_t *)newRenderer
-{
-    _rendererItem = newRenderer;
-    _defaultNotificationCenter postNotificationName:VLCPlayerRendererChanged
-                                              object:self;
-}
-
-- (void)setRendererItem:(vlc_renderer_item_t *)rendererItem
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SetRenderer(_p_player, rendererItem);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)navigateInInteractiveContent:(enum vlc_player_nav)navigationAction
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_Navigate(_p_player, navigationAction);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)recordingChanged:(BOOL)recording
-{
-    _enableRecording = recording;
-    _defaultNotificationCenter postNotificationName:VLCPlayerRecordingChanged
-                                              object:self;
-}
-
-- (void)inputStatsUpdated:(VLCInputStats *)inputStats
-{
-    _statistics = inputStats;
-    _defaultNotificationCenter postNotificationName:VLCPlayerStatisticsUpdated
-                                              object:self
-                                            userInfo:@{VLCPlayerInputStats : inputStats};
-}
-
-#pragma mark - track selection
-- (void)trackSelectionChanged
-{
-    _defaultNotificationCenter postNotificationName:VLCPlayerTrackSelectionChanged object:self;
-}
-
-- (void)trackListChanged
-{
-    _defaultNotificationCenter postNotificationName:VLCPlayerTrackListChanged object:self;
-}
-
-- (void)selectTrack:(VLCTrackMetaData *)track exclusively:(BOOL)exclusiveSelection
-{
-    vlc_player_Lock(_p_player);
-    const enum es_format_category_e formatCategory = vlc_es_id_GetCat(track.esID);
-    vlc_player_SelectEsId(_p_player, track.esID, (formatCategory == AUDIO_ES || exclusiveSelection) ? VLC_PLAYER_SELECT_EXCLUSIVE : VLC_PLAYER_SELECT_SIMULTANEOUS);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)unselectTrack:(VLCTrackMetaData *)track
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_UnselectEsId(_p_player, track.esID);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)unselectTracksFromCategory:(enum es_format_category_e)category
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_UnselectTrackCategory(_p_player, category);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)selectPreviousTrackForCategory:(enum es_format_category_e)category
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SelectPrevTrack(_p_player, category, VLC_VOUT_ORDER_PRIMARY);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)selectNextTrackForCategory:(enum es_format_category_e)category
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SelectNextTrack(_p_player, category, VLC_VOUT_ORDER_PRIMARY);
-    vlc_player_Unlock(_p_player);
-}
-
-- (NSArray<VLCTrackMetaData *> *)tracksForCategory:(enum es_format_category_e)category
-{
-    size_t numberOfTracks = 0;
-    NSMutableArray *tracks;
-
-    vlc_player_Lock(_p_player);
-    numberOfTracks = vlc_player_GetTrackCount(_p_player, category);
-    if (numberOfTracks == 0) {
-        vlc_player_Unlock(_p_player);
-        return nil;
-    }
-
-    tracks = NSMutableArray alloc initWithCapacity:numberOfTracks;
-    for (size_t x = 0; x < numberOfTracks; x++) {
-        const struct vlc_player_track *p_track = vlc_player_GetTrackAt(_p_player, category, x);
-        VLCTrackMetaData *trackMetadata = VLCTrackMetaData alloc initWithTrackStructure:p_track;
-        tracks addObject:trackMetadata;
-    }
-    vlc_player_Unlock(_p_player);
-
-    return tracks copy;
-}
-
-- (NSArray<VLCTrackMetaData *> *)audioTracks
-{
-    return self tracksForCategory:AUDIO_ES;
-}
-
-- (NSArray<VLCTrackMetaData *> *)videoTracks
-{
-    return self tracksForCategory:VIDEO_ES;
-}
-
-- (NSArray<VLCTrackMetaData *> *)subtitleTracks
-{
-    return self tracksForCategory:SPU_ES;
-}
-
-- (VLCTrackMetaData *)selectedTrackMetadataOfCategory:(enum es_format_category_e)category
-{
-    vlc_player_Lock(_p_player);
-    const struct vlc_player_track * const p_track =
-        vlc_player_GetSelectedTrack(_p_player, category);
-    vlc_player_Unlock(_p_player);
-    return VLCTrackMetaData alloc initWithTrackStructure:p_track;
-}
-
-- (BOOL)videoTracksEnabled
-{
-    vlc_player_Lock(_p_player);
-    const BOOL enabled = vlc_player_IsVideoEnabled(_p_player);
-    vlc_player_Unlock(_p_player);
-    return enabled;
-}
-
-- (VLCTrackMetaData *)selectedVideoTrack
-{
-    return self selectedTrackMetadataOfCategory:VIDEO_ES;
-}
-
-- (BOOL)audioTracksEnabled
-{
-    vlc_player_Lock(_p_player);
-    const BOOL enabled = vlc_player_IsAudioEnabled(_p_player);
-    vlc_player_Unlock(_p_player);
-    return enabled;
-}
-
-- (VLCTrackMetaData *)selectedAudioTrack
-{
-    return self selectedTrackMetadataOfCategory:AUDIO_ES;
-}
-
-- (void)programListChanged
-{
-    _defaultNotificationCenter postNotificationName:VLCPlayerProgramListChanged
-                                              object:self;
-}
-
-- (void)programSelectionChanged:(int)selectedID
-{
-    _selectedProgramID = selectedID;
-    _defaultNotificationCenter postNotificationName:VLCPlayerProgramSelectionChanged
-                                              object:self;
-}
-
-- (void)selectProgram:(VLCProgramMetaData *)program
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SelectProgram(_p_player, program.group_id);
-    vlc_player_Unlock(_p_player);
-}
-
-- (size_t)numberOfPrograms
-{
-    size_t ret = 0;
-    vlc_player_Lock(_p_player);
-    ret = vlc_player_GetProgramCount(_p_player);
-    vlc_player_Unlock(_p_player);
-    return ret;
-}
-
-- (nullable VLCProgramMetaData *)programAtIndex:(size_t)index
-{
-    VLCProgramMetaData *programMetaData = nil;
-    vlc_player_Lock(_p_player);
-    const struct vlc_player_program *p_program = vlc_player_GetProgramAt(_p_player, index);
-    if (p_program != NULL) {
-        programMetaData = VLCProgramMetaData alloc initWithProgramStructure:p_program;
-    }
-    vlc_player_Unlock(_p_player);
-    return programMetaData;
-}
-
-- (nullable VLCProgramMetaData *)programForID:(int)programID
-{
-    VLCProgramMetaData *programMetaData = nil;
-    vlc_player_Lock(_p_player);
-    const struct vlc_player_program *p_program = vlc_player_GetProgram(_p_player, programID);
-    if (p_program != NULL) {
-        programMetaData = VLCProgramMetaData alloc initWithProgramStructure:p_program;
-    }
-    vlc_player_Unlock(_p_player);
-    return programMetaData;
-}
-
-- (void)ABLoopStateChanged:(enum vlc_player_abloop)abLoopState
-{
-    _abLoopState = abLoopState;
-
-    vlc_tick_t a_time = -1;
-    vlc_tick_t b_time = -1;
-    float a_pos = -1;
-    float b_pos = -1;
-    
-    vlc_player_Lock(_p_player);
-    const enum vlc_player_abloop state = vlc_player_GetAtoBLoop(_p_player, &a_time, &a_pos, &b_time, &b_pos);
-    vlc_player_Unlock(_p_player);
-
-    _aLoopTime = a_time;
-    _bLoopTime = b_time;
-    _aLoopPosition = a_pos;
-    _bLoopPosition = b_pos;
-
-    _defaultNotificationCenter postNotificationName:VLCPlayerABLoopStateChanged
-                                              object:self;
-}
-
-- (int)setABLoop
-{
-    int ret = 0;
-
-    vlc_player_Lock(_p_player);
-    switch (_abLoopState) {
-        case VLC_PLAYER_ABLOOP_A:
-            ret = vlc_player_SetAtoBLoop(_p_player, VLC_PLAYER_ABLOOP_B);
-            break;
-
-        case VLC_PLAYER_ABLOOP_B:
-            ret = vlc_player_SetAtoBLoop(_p_player, VLC_PLAYER_ABLOOP_NONE);
-            break;
-
-        default:
-            ret = vlc_player_SetAtoBLoop(_p_player, VLC_PLAYER_ABLOOP_A);
-            break;
-    }
-    vlc_player_Unlock(_p_player);
-
-    return ret;
-}
-
-- (int)disableABLoop
-{
-    vlc_player_Lock(_p_player);
-    int ret = vlc_player_SetAtoBLoop(_p_player, VLC_PLAYER_ABLOOP_NONE);
-    vlc_player_Unlock(_p_player);
-    return ret;
-}
-
-- (void)setEnableRecording:(BOOL)enableRecording
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SetRecordingEnabled(_p_player, enableRecording, NULL);
-    vlc_player_Unlock(_p_player);
-}
-
-- (void)toggleRecord
-{
-    vlc_player_Lock(_p_player);
-    vlc_player_SetRecordingEnabled(_p_player, !_enableRecording, NULL);
-    vlc_player_Unlock(_p_player);
-}
-
-#pragma mark - video specific delegation
-
-- (void)fullscreenChanged:(BOOL)isFullscreen
-{
-    _fullscreen = isFullscreen;
-    _defaultNotificationCenter postNotificationName:VLCPlayerFullscreenChanged
-                                              object:self;
-}
-
-- (void)setFullscreen:(BOOL)fullscreen
-{
-    vlc_player_vout_SetFullscreen(_p_player, fullscreen);
-}
-
-- (void)toggleFullscreen
-{
-    vlc_player_vout_SetFullscreen(_p_player, !_fullscreen);
-}
-
-- (void)togglePictureInPicture
-{
-    _defaultNotificationCenter postNotificationName:VLCPlayerPictureInPictureChanged
-                                              object:self;
-}
-
-- (void)wallpaperModeChanged:(BOOL)wallpaperModeValue
-{
-    _wallpaperMode = wallpaperModeValue;
-    _defaultNotificationCenter postNotificationName:VLCPlayerWallpaperModeChanged
-                                              object:self;
-}
-
-- (void)setWallpaperMode:(BOOL)wallpaperMode
-{
-    vlc_player_vout_SetWallpaperModeEnabled(_p_player, wallpaperMode);
-}
-
-- (void)takeSnapshot
-{
-    vlc_player_vout_Snapshot(_p_player);
-}
-
-- (void)voutListUpdated
-{
-    _defaultNotificationCenter postNotificationName:VLCPlayerListOfVideoOutputThreadsChanged
-                                              object:self;
-}
-
-- (vout_thread_t *)mainVideoOutputThread
-{
-    return vlc_player_vout_Hold(_p_player);
-}
-
-- (vout_thread_t *)videoOutputThreadForKeyWindow
-{
-    vout_thread_t *p_vout = nil;
-
-    id currentWindow = NSApp keyWindow;
-    if (currentWindow respondsToSelector:@selector(videoView)) {
-        VLCVideoWindowCommon *videoWindow = (VLCVideoWindowCommon *)currentWindow;
-        VLCVoutView *videoView = videoWindow.videoViewController.voutView;
-        if (videoView) {
-            p_vout = videoView voutThread;
-        }
-    }
-
-    if (!p_vout)
-        p_vout = self mainVideoOutputThread;
-
-    return p_vout;
-}
-
-- (NSArray<NSValue *> *)allVideoOutputThreads
-{
-    size_t numberOfVoutThreads = 0;
-    vout_thread_t **pp_vouts = vlc_player_vout_HoldAll(_p_player, &numberOfVoutThreads);
-    if (numberOfVoutThreads == 0) {
-        return nil;
-    }
-
-    NSMutableArray<NSValue *> *vouts = NSMutableArray arrayWithCapacity:numberOfVoutThreads;
-
-    for (size_t i = 0; i < numberOfVoutThreads; ++i)
-    {
-        assert(pp_voutsi);
-        vouts addObject:NSValue valueWithPointer:pp_voutsi;
-    }
-
-    free(pp_vouts);
-    return vouts;
-}
-
-- (void)displayOSDMessage:(NSString *)message
-{
-    vlc_player_osd_Message(_p_player, message UTF8String);
-}
-
-- (void)setAspectRatioIsLocked:(BOOL)b_value
-{
-    config_PutInt("macosx-lock-aspect-ratio", b_value);
-}
-
-- (BOOL)aspectRatioIsLocked
-{
-    return config_GetInt("macosx-lock-aspect-ratio");
-}
-
-#pragma mark - audio specific delegation
-
-- (void)volumeChanged:(float)volume
-{
-    _volume = volume;
-    _defaultNotificationCenter postNotificationName:VLCPlayerVolumeChanged
-                                              object:self;
-}
-
-- (void)setVolume:(float)volume
-{
-    vlc_player_aout_SetVolume(_p_player, volume);
-}
-
-- (void)incrementVolume
-{
-    vlc_player_aout_IncrementVolume(_p_player, 1, NULL);
-}
-
-- (void)decrementVolume
-{
-    vlc_player_aout_DecrementVolume(_p_player, 1, NULL);
-}
-
-- (void)muteChanged:(BOOL)mute
-{
-    _mute = mute;
-    _defaultNotificationCenter postNotificationName:VLCPlayerMuteChanged
-                                              object:self;
-}
-
-- (void)setMute:(BOOL)mute
-{
-    vlc_player_aout_Mute(_p_player, mute);
-}
-
-- (void)toggleMute
-{
-    vlc_player_aout_ToggleMute(_p_player);
-}
-
-- (audio_output_t *)mainAudioOutput
-{
-    return vlc_player_aout_Hold(_p_player);
-}
-
-- (int)enableAudioFilterWithName:(NSString *)name state:(BOOL)state
-{
-    if (name == nil || name.length == 0) {
-        return VLC_EINVAL;
-    }
-
-    return vlc_player_aout_EnableFilter(_p_player, name UTF8String, state);
-}
-
-@end
-
-@implementation VLCInputStats
-
-- (instancetype)initWithStatsStructure:(const struct input_stats_t *)p_stats
-{
-    self = super init;
-    if (self && p_stats != NULL) {
-        _inputReadPackets = p_stats->i_read_packets;
-        _inputReadBytes = p_stats->i_read_bytes;
-        _inputBitrate = p_stats->f_input_bitrate;
-
-        _demuxReadPackets = p_stats->i_demux_read_packets;
-        _demuxReadBytes = p_stats->i_demux_read_bytes;
-        _demuxBitrate = p_stats->f_demux_bitrate;
-        _demuxCorrupted = p_stats->i_demux_corrupted;
-        _demuxDiscontinuity = p_stats->i_demux_discontinuity;
-
-        _decodedAudio = p_stats->i_decoded_audio;
-        _decodedVideo = p_stats->i_decoded_video;
-
-        _displayedPictures = p_stats->i_displayed_pictures;
-        _latePictures = p_stats->i_late_pictures;
-        _lostPictures = p_stats->i_lost_pictures;
-
-        _playedAudioBuffers = p_stats->i_played_abuffers;
-        _lostAudioBuffers = p_stats->i_lost_abuffers;
-    }
-    return self;
-}
-
-@end
-
-@implementation VLCTrackMetaData
-
-- (instancetype)initWithTrackStructure:(const struct vlc_player_track *)p_track
-{
-    self = super init;
-    if (self && p_track != NULL) {
-        _esID = p_track->es_id;
-        _name = toNSStr(p_track->name);
-        _selected = p_track->selected;
-    }
-    return self;
-}
-
-- (NSString *)description
-{
-    return NSString stringWithFormat:@"%@: name: %@, selected: %i", VLCTrackMetaData className, self.name, self.selected;
-}
-
-@end
-
-@implementation VLCProgramMetaData
-
-- (instancetype)initWithProgramStructure:(const struct vlc_player_program *)p_program
-{
-    self = super init;
-    if (self && p_program != NULL) {
-        _group_id = p_program->group_id;
-        _name = toNSStr(p_program->name);
-        _selected = p_program->selected;
-        _scrambled = p_program->scrambled;
-    }
-    return self;
-}
-
-- (NSString *)description
-{
-    return NSString stringWithFormat:@"%@: name: %@", VLCProgramMetaData className, self.name;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlayerTitle.m Deleted

@@ -1,52 +0,0 @@
-/*****************************************************************************
- * VLCPlayerTitle.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2024 VLC authors and VideoLAN
- *
- * Authors: Claudio Cambra <developer@claudiocambra.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlayerTitle.h"
-
-#import "extensions/NSString+Helpers.h"
-#import "playlist/VLCPlayerChapter.h"
-
-@implementation VLCPlayerTitle
-
-- (instancetype)initWithTitle:(const struct vlc_player_title *)p_title atIndex:(size_t)index
-{
-    self = super init;
-    if (self) {
-        _index = index;
-        _name = toNSStr(p_title->name);
-        _length = p_title->length;
-        _lengthString = NSString stringWithTimeFromTicks:_length;
-        _flags = p_title->flags;
-        _chapterCount = p_title->chapter_count;
-
-        NSMutableArray * const chapters = NSMutableArray arrayWithCapacity:self.chapterCount;
-        for (int i = 0; i < self.chapterCount; i++) {
-            VLCPlayerChapter * const chapter =
-                VLCPlayerChapter alloc initWithChapter:&p_title->chaptersi;
-            chapters addObject:chapter;
-        }
-        _chapters = chapters.copy;
-    }
-    return self;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistController.h Deleted

@@ -1,250 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistController.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Foundation/Foundation.h>
-#import <vlc_playlist.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class VLCPlaylistModel;
-@class VLCPlaylistDataSource;
-@class VLCPlayerController;
-@class VLCPlaylistExportModuleDescription;
-@class VLCOpenInputMetadata;
-@class VLCInputItem;
-
-extern NSString *VLCPlaybackOrderChanged;
-extern NSString *VLCPlaybackRepeatChanged;
-extern NSString *VLCPlaybackHasPreviousChanged;
-extern NSString *VLCPlaybackHasNextChanged;
-extern NSString *VLCPlaylistCurrentItemIndexChanged;
-extern NSString *VLCPlaylistItemsAdded;
-extern NSString *VLCPlaylistItemsRemoved;
-
-@interface VLCPlaylistController : NSObject
-
-- (instancetype)initWithPlaylist:(vlc_playlist_t *)playlist;
-
-/**
- * The vlc core playlist controlled by the instance of this class
- * @note You DO SOMETHING WRONG if you need to access this!
- */
-@property (readonly) vlc_playlist_t *p_playlist;
-
-/**
- * The playlist model caching the contents of the playlist controlled by
- * the instance of this class.
- */
-@property (readonly) VLCPlaylistModel *playlistModel;
-
-/**
- * The datasource instance used to actually display the playlist.
- */
-@property (readwrite, assign) VLCPlaylistDataSource *playlistDataSource;
-
-/**
- * The player instance associated with the playlist
- */
-@property (readonly) VLCPlayerController *playerController;
-
-/**
- * Index of the current playlist item
- @return index of the current playlist index or -1 if none
- @warning just because the current index is valid does not imply that it is playing!
- */
-@property (readonly) size_t currentPlaylistIndex;
-
-/**
- * input of the currently playing item
- @return returns the input item for the currently playing playlist item
- @note the receiver is responsible for releasing the input item
- */
-@property (readonly, nullable) VLCInputItem *currentlyPlayingInputItem;
-
-/**
- * indicates whether there is a previous item in the list the user could go back to
- * @note Subscribe to the VLCPlaybackHasPreviousChanged notification to be notified about changes
- */
-@property (readonly) BOOL hasPreviousPlaylistItem;
-
-/**
- * indicates whether there is a next item in the list the user could move on to
- * @note Subscribe to the VLCPlaybackHasNextChanged notification to be notified about changes
- */
-@property (readonly) BOOL hasNextPlaylistItem;
-
-/**
- * sets and gets the playback repeat mode according to the enum defined in the core
- * @note Subscribe to the VLCPlaybackRepeatChanged notification to be notified about changes
- */
-@property (readwrite, nonatomic) enum vlc_playlist_playback_repeat playbackRepeat;
-
-/**
- * sets and gets the playback order according to the enum defined in the core
- * @note Subscribe to the VLCPlaybackOrderChanged notification to be notified about changes
- */
-@property (readwrite, nonatomic) enum vlc_playlist_playback_order playbackOrder;
-
-@property (readwrite, nonatomic) BOOL libraryPlaylistMode;
-
-/**
- * Define the action to perform after playback of the current media stopped (for any reason)
- * Options are: continue with next time, pause on last frame, stop even if there is a next item and quit VLC
- * @see the vlc_playlist_media_stopped_action enum for details
- */
-@property (readwrite, nonatomic) enum vlc_playlist_media_stopped_action actionAfterStop;
-
-
-/**
- * Simplified version to add new items to the end of the current playlist
- * @param array array of items. Each item is an instance of VLCOpenInputMetadata.
- */
-- (void)addPlaylistItems:(NSArray <VLCOpenInputMetadata *> *)array;
-
-/**
- * Add new items to the playlist, at specified index.
- * @param itemArray array of items. Each item is an instance of VLCOpenInputMetadata.
- * @param insertionIndex index for new items, -1 for appending at end
- * @param startPlayback starts playback of first item if true
- */
-- (void)addPlaylistItems:(NSArray <VLCOpenInputMetadata *> *)itemArray
-              atPosition:(size_t)insertionIndex
-           startPlayback:(BOOL)startPlayback;
-
-/**
- * Add new item to the playlist if you already have an input item
- * @param p_inputItem the input item you already from somewhere
- * @param insertionIndex index for new item, -1 for appending at end
- * @param startPlayback starts playback of the item if true
- * @return returns VLC_SUCCESS or an error
- */
-- (int)addInputItem:(input_item_t *)p_inputItem
-         atPosition:(size_t)insertionIndex
-      startPlayback:(BOOL)startPlayback;
-
-/**
- * Move an item with a given unique ID to a new position
- * @param uniqueID the ID of the playlist item to move
- * @param target the target index of where to move the item
- * @return returns VLC_SUCCESS or an error
- */
-- (int)moveItemWithID:(int64_t)uniqueID toPosition:(size_t)target;
-
-/**
- * Remove all items at the given index set
- * @param indexes Set of indexes to remove
- */
-- (void)removeItemsAtIndexes:(NSIndexSet *)indexes;
-
-/**
- * Clear the entire playlist
- */
-- (void)clearPlaylist;
-
-/**
- * Sort the entire playlist listen based on:
- * @param sortKey the key used for sorting
- * @param sortOrder sort ascending or descending..
- * @return Returns VLC_SUCCESS on success.
- */
-- (int)sortByKey:(enum vlc_playlist_sort_key)sortKey andOrder:(enum vlc_playlist_sort_order)sortOrder;
-
-/**
- * Initially, the playlist is unsorted until the user decides to do so
- * Until then, the unsorted state is retained.
- */
-@property (readonly) BOOL unsorted;
-
-/**
- * The last key used for sorting
- */
-@property (readonly) enum vlc_playlist_sort_key lastSortKey;
-
-/**
- * The last order used for sorting
- */
-@property (readonly) enum vlc_playlist_sort_order lastSortOrder;
-
-/**
- * Start the playlist
- * @return Returns VLC_SUCCESS on success.
- */
-- (int)startPlaylist;
-
-/**
- * Play the previous item in the list (if any)
- * @return Returns VLC_SUCCESS on success.
- */
-- (int)playPreviousItem;
-
-/**
- * Play the item at the given index (if any)
- * @param index the index to play
- * @return Returns VLC_SUCCESS on success.
- */
-- (int)playItemAtIndex:(size_t)index;
-
-/**
- * Play the previous item in the list (if any)
- * @return Returns VLC_SUCCESS on success.
- */
-- (int)playNextItem;
-
-/**
- * Stop playback of the playlist and destroy all facilities
- */
-- (void)stopPlayback;
-
-/**
- * Pause playback of the playlist while keeping all facilities
- */
-- (void)pausePlayback;
-
-/**
- * Resume playback of the playlist if it was paused
- */
-- (void)resumePlayback;
-
-/**
- * returns an array of module descriptions available for export a playlist. Content may vary
- */
-@property (readonly) NSArray <VLCPlaylistExportModuleDescription *> *availablePlaylistExportModules;
-
-/**
- * exports the playlist owned by the controller to a given file using the provided module
- * @param path the file path to store the file in
- * @param exportModule the VLCPlaylistExportModuleDescription for the respective export module
- * @return VLC_SUCCESS or an error
- */
-- (int)exportPlaylistToPath:(NSString *)path exportModule:(VLCPlaylistExportModuleDescription *)exportModule;
-
-@end
-
-@interface VLCPlaylistExportModuleDescription : NSObject
-
-@property (readwrite, retain) NSString *humanReadableName;
-@property (readwrite, retain) NSString *fileExtension;
-@property (readwrite, retain) NSString *moduleName;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistController.m Deleted

@@ -1,733 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistController.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlaylistController.h"
-
-#import <vlc_interface.h>
-#import <vlc_player.h>
-
-#import "extensions/NSString+Helpers.h"
-#import "main/VLCMain.h"
-#import "playlist/VLCPlaylistModel.h"
-#import "playlist/VLCPlaylistItem.h"
-#import "playlist/VLCPlaylistDataSource.h"
-#import "playlist/VLCPlayerController.h"
-#import "windows/VLCOpenInputMetadata.h"
-#import "library/VLCInputItem.h"
-
-NSString *VLCPlaybackOrderChanged = @"VLCPlaybackOrderChanged";
-NSString *VLCPlaybackRepeatChanged = @"VLCPlaybackRepeatChanged";
-NSString *VLCPlaybackHasPreviousChanged = @"VLCPlaybackHasPreviousChanged";
-NSString *VLCPlaybackHasNextChanged = @"VLCPlaybackHasNextChanged";
-NSString *VLCPlaylistCurrentItemIndexChanged = @"VLCPlaylistCurrentItemIndexChanged";
-NSString *VLCPlaylistItemsAdded = @"VLCPlaylistItemsAdded";
-NSString *VLCPlaylistItemsRemoved = @"VLCPlaylistItemsRemoved";
-
-NSString * const VLCLibraryPlaylistModeDefaultsKey = @"VLCLibraryPlaylistMode";
-
-@interface VLCPlaylistController ()
-{
-    NSNotificationCenter *_defaultNotificationCenter;
-
-    vlc_playlist_t *_p_playlist;
-    vlc_playlist_listener_id *_playlistListenerID;
-}
-
-- (void)playlistResetWithItems:(NSArray *)items;
-- (void)playlistAdded:(NSArray *)items atIndex:(size_t)insertionIndex count:(size_t)numberOfItems;
-- (void)playlistMovedIndex:(size_t)index toTarget:(size_t)target numberOfItems:(size_t)count;
-- (void)playlistRemovedItemsAtIndex:(size_t)index count:(size_t)numberOfItems;
-- (void)playlistUpdatedForIndex:(size_t)firstUpdatedIndex items:(vlc_playlist_item_t *const *)items count:(size_t)numberOfItems;
-- (void)playlistPlaybackRepeatUpdated:(enum vlc_playlist_playback_repeat)currentRepeatMode;
-- (void)playlistPlaybackOrderUpdated:(enum vlc_playlist_playback_order)currentOrder;
-- (void)currentPlaylistItemIndexChanged:(size_t)index;
-- (void)playlistHasPreviousItem:(BOOL)hasPrevious;
-- (void)playlistHasNextItem:(BOOL)hasNext;
-- (void)stopActionChanged:(enum vlc_playlist_media_stopped_action)stoppedAction;
-
-@end
-
-#pragma mark -
-#pragma mark core callbacks
-
-static void
-cb_playlist_items_reset(vlc_playlist_t *playlist,
-                        vlc_playlist_item_t *const items,
-                        size_t numberOfItems,
-                        void *p_data)
-{
-    NSMutableArray *array = NSMutableArray arrayWithCapacity:numberOfItems;
-    for (size_t i = 0; i < numberOfItems; i++) {
-        VLCPlaylistItem *item = VLCPlaylistItem alloc initWithPlaylistItem:itemsi;
-        array addObject:item;
-    }
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController *playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController playlistResetWithItems:array;
-    });
-}
-
-static void
-cb_playlist_items_added(vlc_playlist_t *playlist,
-                        size_t insertionIndex,
-                        vlc_playlist_item_t *const items,
-                        size_t numberOfAddedItems,
-                        void *p_data)
-{
-    NSMutableArray *array = NSMutableArray arrayWithCapacity:numberOfAddedItems;
-    for (size_t i = 0; i < numberOfAddedItems; i++) {
-        VLCPlaylistItem *item = VLCPlaylistItem alloc initWithPlaylistItem:itemsi;
-        array addObject:item;
-    }
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController *playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController playlistAdded:array atIndex:insertionIndex count:numberOfAddedItems;
-    });
-}
-
-static void
-cb_playlist_items_moved(vlc_playlist_t *playlist,
-                        size_t index,
-                        size_t numberOfMovedItems,
-                        size_t target,
-                        void *p_data)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController *playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController playlistMovedIndex:index toTarget:target numberOfItems:numberOfMovedItems;
-    });
-}
-
-static void
-cb_playlist_items_removed(vlc_playlist_t *playlist,
-                          size_t index,
-                          size_t count,
-                          void *p_data)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController *playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController playlistRemovedItemsAtIndex:index count:count;
-    });
-}
-
-static void
-cb_playlist_items_updated(vlc_playlist_t *playlist,
-                          size_t firstUpdatedIndex,
-                          vlc_playlist_item_t *const items,
-                          size_t numberOfUpdatedItems,
-                          void *p_data)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController *playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController playlistUpdatedForIndex:firstUpdatedIndex items:items count:numberOfUpdatedItems;
-    });
-}
-
-static void
-cb_playlist_playback_repeat_changed(vlc_playlist_t *playlist,
-                                    enum vlc_playlist_playback_repeat repeat,
-                                    void *p_data)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController *playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController playlistPlaybackRepeatUpdated:repeat;
-    });
-}
-
-static void
-cb_playlist_playback_order_changed(vlc_playlist_t *playlist,
-                                   enum vlc_playlist_playback_order order,
-                                   void *p_data)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController *playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController playlistPlaybackOrderUpdated:order;
-    });
-}
-
-static void
-cb_playlist_current_item_index_changed(vlc_playlist_t *playlist,
-                                 ssize_t index,
-                                 void *p_data)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController * const playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController currentPlaylistItemIndexChanged:index;
-    });
-}
-
-static void
-cb_playlist_has_prev_changed(vlc_playlist_t *playlist,
-                             bool has_prev,
-                             void *p_data)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController *playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController playlistHasPreviousItem:has_prev;
-    });
-}
-
-static void
-cb_playlist_has_next_changed(vlc_playlist_t *playlist,
-                             bool has_next,
-                             void *p_data)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController *playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController playlistHasNextItem:has_next;
-    });
-}
-
-static void
-cb_playlist_media_stopped_action_changed(vlc_playlist_t *p_playlist,
-                                         enum vlc_playlist_media_stopped_action newAction,
-                                         void *p_data)
-{
-    VLC_UNUSED(p_playlist);
-    dispatch_async(dispatch_get_main_queue(), ^{
-        VLCPlaylistController *playlistController = (__bridge VLCPlaylistController *)p_data;
-        playlistController stopActionChanged:newAction;
-    });
-}
-
-static const struct vlc_playlist_callbacks playlist_callbacks = {
-    cb_playlist_items_reset,
-    cb_playlist_items_added,
-    cb_playlist_items_moved,
-    cb_playlist_items_removed,
-    cb_playlist_items_updated,
-    cb_playlist_playback_repeat_changed,
-    cb_playlist_playback_order_changed,
-    cb_playlist_current_item_index_changed,
-    cb_playlist_has_prev_changed,
-    cb_playlist_has_next_changed,
-    cb_playlist_media_stopped_action_changed,
-};
-
-#pragma mark -
-#pragma mark class initialization
-
-@implementation VLCPlaylistController
-
-- (instancetype)initWithPlaylist:(vlc_playlist_t *)playlist
-{
-    self = super init;
-    if (self) {
-        _defaultNotificationCenter = NSNotificationCenter.defaultCenter;
-        _defaultNotificationCenter addObserver:self
-                                       selector:@selector(applicationWillTerminate:)
-                                           name:NSApplicationWillTerminateNotification
-                                         object:nil;
-        _defaultNotificationCenter addObserver:self
-                                       selector:@selector(applicationDidFinishLaunching:)
-                                           name:NSApplicationDidFinishLaunchingNotification
-                                         object:nil;
-        _p_playlist = playlist;
-
-        /* set initial values, further updates through callbacks */
-        vlc_playlist_Lock(_p_playlist);
-        _unsorted = YES;
-        _libraryPlaylistMode =
-            NSUserDefaults.standardUserDefaults boolForKey:VLCLibraryPlaylistModeDefaultsKey;
-        _playbackOrder = vlc_playlist_GetPlaybackOrder(_p_playlist);
-        _playbackRepeat = vlc_playlist_GetPlaybackRepeat(_p_playlist);
-        _playlistListenerID = vlc_playlist_AddListener(_p_playlist,
-                                                       &playlist_callbacks,
-                                                       (__bridge void *)self,
-                                                       YES);
-        vlc_playlist_Unlock(_p_playlist);
-        _playlistModel = VLCPlaylistModel alloc init;
-        _playlistModel.playlistController = self;
-        _playerController = VLCPlayerController alloc initWithPlayer:vlc_playlist_GetPlayer(_p_playlist);
-    }
-    return self;
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-    /* Handle sleep notification */
-    NSWorkspace.sharedWorkspace.notificationCenter addObserver:self
-                                                           selector:@selector(computerWillSleep:)
-                                                               name:NSWorkspaceWillSleepNotification
-                                                             object:nil;
-
-    // respect playlist-autostart
-    if (var_GetBool(getIntf(), "playlist-autostart")) {
-        if (self.playlistModel numberOfPlaylistItems > 0) {
-            self startPlaylist;
-        }
-    }
-}
-
-- (void)applicationWillTerminate:(NSNotification *)aNotification
-{
-    if (_p_playlist) {
-        if (_playlistListenerID) {
-            vlc_playlist_Lock(_p_playlist);
-            vlc_playlist_RemoveListener(_p_playlist, _playlistListenerID);
-            vlc_playlist_Unlock(_p_playlist);
-        }
-    }
-}
-
-- (void)computerWillSleep:(NSNotification *)notification
-{
-    self pausePlayback;
-}
-
-- (void)dealloc
-{
-    NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self;
-    _defaultNotificationCenter removeObserver:self;
-}
-
-#pragma mark - callback forwarders
-
-- (void)playlistResetWithItems:(NSArray *)items
-{
-    // Clear all items (reset)
-    _playlistModel dropExistingData;
-
-    _playlistModel addItems:items;
-
-    _playlistDataSource playlistUpdated;
-}
-
-- (void)playlistAdded:(NSArray *)items atIndex:(size_t)insertionIndex count:(size_t)numberOfItems
-{
-    _playlistModel addItems:items atIndex:insertionIndex count:numberOfItems;
-
-    _playlistDataSource playlistUpdated;
-    _defaultNotificationCenter postNotificationName:VLCPlaylistItemsAdded object:self;
-}
-
-- (void)playlistMovedIndex:(size_t)index toTarget:(size_t)target numberOfItems:(size_t)count
-{
-    _playlistModel moveItemAtIndex:index toTarget:target;
-    _playlistDataSource playlistUpdated;
-}
-
-- (void)playlistRemovedItemsAtIndex:(size_t)index count:(size_t)numberOfItems
-{
-    NSRange range = NSMakeRange(index, numberOfItems);
-    _playlistModel removeItemsInRange:range;
-
-    _playlistDataSource playlistUpdated;
-    _defaultNotificationCenter postNotificationName:VLCPlaylistItemsRemoved object:self;
-}
-
-- (void)playlistUpdatedForIndex:(size_t)firstUpdatedIndex items:(vlc_playlist_item_t *const *)items count:(size_t)numberOfItems
-{
-    VLC_UNUSED(items);
-    for (size_t i = firstUpdatedIndex; i < firstUpdatedIndex + numberOfItems; i++) {
-        _playlistModel updateItemAtIndex:i;
-    }
-    _playlistDataSource playlistUpdated;
-}
-
-- (void)playlistPlaybackRepeatUpdated:(enum vlc_playlist_playback_repeat)currentRepeatMode
-{
-    _playbackRepeat = currentRepeatMode;
-    _defaultNotificationCenter postNotificationName:VLCPlaybackRepeatChanged object:self;
-}
-
-- (void)playlistPlaybackOrderUpdated:(enum vlc_playlist_playback_order)currentOrder
-{
-    _playbackOrder = currentOrder;
-    _defaultNotificationCenter postNotificationName:VLCPlaybackOrderChanged object:self;
-}
-
-- (void)currentPlaylistItemIndexChanged:(size_t)index
-{
-    _currentPlaylistIndex = index;
-    _playlistDataSource scrollToCurrentPlaylistItem;
-    _defaultNotificationCenter postNotificationName:VLCPlaylistCurrentItemIndexChanged object:self;
-}
-
-- (void)playlistHasPreviousItem:(BOOL)hasPrevious
-{
-    _hasPreviousPlaylistItem = hasPrevious;
-    _defaultNotificationCenter postNotificationName:VLCPlaybackHasPreviousChanged object:self;
-}
-
-- (void)playlistHasNextItem:(BOOL)hasNext
-{
-    _hasNextPlaylistItem = hasNext;
-    _defaultNotificationCenter postNotificationName:VLCPlaybackHasNextChanged object:self;
-}
-
-#pragma mark - controller functions for use within the UI
-
-- (void)addPlaylistItems:(NSArray <VLCOpenInputMetadata *> *)array
-{
-    BOOL b_autoplay = var_InheritBool(getIntf(), "macosx-autoplay");
-    self addPlaylistItems:array atPosition:-1 startPlayback:b_autoplay;
-}
-
-- (void)addPlaylistItems:(NSArray <VLCOpenInputMetadata *> *)itemArray
-              atPosition:(size_t)insertionIndex
-           startPlayback:(BOOL)startPlayback;
-{
-    /* note: we don't add the item as cached data to the model here
-     * because this will be done asynchronously through the callback */
-
-    intf_thread_t *p_intf = getIntf();
-    NSUInteger numberOfItems = itemArray count;
-
-    for (NSUInteger i = 0; i < numberOfItems; i++) {
-        VLCOpenInputMetadata *itemMetadata = itemArrayi;
-        input_item_t *p_input = self createInputItemBasedOnMetadata:itemMetadata;
-        NSString *itemURLString = itemMetadata.MRLString;
-
-        if (!p_input) {
-            if (itemURLString) {
-                msg_Warn(p_intf, "failed to create input for %s", itemURLString UTF8String);
-            } else {
-                msg_Warn(p_intf, "failed to create input because no URL was provided");
-            }
-            continue;
-        }
-
-        vlc_playlist_Lock(_p_playlist);
-
-        int ret = 0;
-        size_t actualInsertionIndex = insertionIndex;
-        if (insertionIndex == -1) {
-            actualInsertionIndex = vlc_playlist_Count(_p_playlist);
-        }
-        ret = vlc_playlist_Insert(_p_playlist,
-                                  actualInsertionIndex,
-                                  &p_input,
-                                  1);
-
-        if (ret != VLC_SUCCESS) {
-            msg_Err(p_intf, "failed to insert input item at insertion index: %zu", insertionIndex);
-        } else {
-            msg_Dbg(p_intf, "Added item %s at insertion index: %zu", itemURLString UTF8String, insertionIndex);
-        }
-
-        if (i == 0 && startPlayback) {
-            vlc_playlist_PlayAt(_p_playlist, actualInsertionIndex);
-        }
-
-        vlc_playlist_Unlock(_p_playlist);
-        input_item_Release(p_input);
-
-        if (insertionIndex != -1) {
-            insertionIndex++;
-        }
-    }
-}
-
-- (int)addInputItem:(input_item_t *)p_inputItem atPosition:(size_t)insertionIndex startPlayback:(BOOL)startPlayback
-{
-    if (p_inputItem == NULL) {
-        return VLC_EINVAL;
-    }
-    int ret = 0;
-
-    vlc_playlist_Lock(_p_playlist);
-    if (insertionIndex == -1) {
-        insertionIndex = vlc_playlist_Count(_p_playlist);
-    }
-    ret = vlc_playlist_InsertOne(_p_playlist, insertionIndex, p_inputItem);
-    if (ret != VLC_SUCCESS) {
-        vlc_playlist_Unlock(_p_playlist);
-        return ret;
-    }
-    if (startPlayback) {
-        ret = vlc_playlist_PlayAt(_p_playlist, insertionIndex);
-    }
-    vlc_playlist_Unlock(_p_playlist);
-    return ret;
-}
-
-- (int)moveItemWithID:(int64_t)uniqueID toPosition:(size_t)target
-{
-    vlc_playlist_item_t **items = calloc(1, sizeof(vlc_playlist_item_t *));
-    vlc_playlist_Lock(_p_playlist);
-    ssize_t itemIndex = vlc_playlist_IndexOfId(_p_playlist, uniqueID);
-    vlc_playlist_item_t *p_item = vlc_playlist_Get(_p_playlist, itemIndex);
-    items0 = p_item;
-    int ret = vlc_playlist_RequestMove(_p_playlist, items, 1, target, itemIndex);
-    vlc_playlist_Unlock(_p_playlist);
-    free(items);
-    return ret;
-}
-
-- (void)removeItemsAtIndexes:(NSIndexSet *)indexes
-{
-    if (indexes.count == 0)
-        return;
-
-    __block vlc_playlist_item_t **items = calloc(indexes.count, sizeof(vlc_playlist_item_t *));
-    __block NSUInteger pos = 0;
-    indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
-        VLCPlaylistItem *item = self->_playlistModel playlistItemAtIndex:idx;
-        itemspos++ = item.playlistItem;
-    };
-
-    /* note: we don't remove the cached data from the model here
-     * because this will be done asynchronously through the callback */
-
-    vlc_playlist_Lock(_p_playlist);
-    vlc_playlist_RequestRemove(_p_playlist, items, pos, indexes.firstIndex);
-    vlc_playlist_Unlock(_p_playlist);
-
-    free(items);
-}
-
-- (void)clearPlaylist
-{
-    vlc_playlist_Lock(_p_playlist);
-    vlc_playlist_Clear(_p_playlist);
-    vlc_playlist_Unlock(_p_playlist);
-}
-
-- (int)sortByKey:(enum vlc_playlist_sort_key)sortKey andOrder:(enum vlc_playlist_sort_order)sortOrder
-{
-    struct vlc_playlist_sort_criterion sortCriterion = { sortKey, sortOrder };
-    int returnValue = VLC_SUCCESS;
-    vlc_playlist_Lock(_p_playlist);
-    returnValue = vlc_playlist_Sort(_p_playlist, &sortCriterion, 1);
-    vlc_playlist_Unlock(_p_playlist);
-    if (returnValue == VLC_SUCCESS) {
-        _lastSortKey = sortKey;
-        _lastSortOrder = sortOrder;
-        _unsorted = NO;
-    }
-    return returnValue;
-}
-
-- (int)startPlaylist
-{
-    NSInteger selectedIndex = _playlistDataSource.tableView selectedRow;
-    return self playItemAtIndex:selectedIndex;
-}
-
-- (int)playPreviousItem
-{
-    vlc_playlist_Lock(_p_playlist);
-    int ret = vlc_playlist_Prev(_p_playlist);
-    vlc_playlist_Unlock(_p_playlist);
-    return ret;
-}
-
-- (int)playItemAtIndex:(size_t)index
-{
-    vlc_playlist_Lock(_p_playlist);
-    size_t playlistLength = vlc_playlist_Count(_p_playlist);
-    int ret = 0;
-    if (index >= playlistLength) {
-        ret = VLC_EGENERIC;
-    } else {
-        ret = vlc_playlist_PlayAt(_p_playlist, index);
-    }
-    vlc_playlist_Unlock(_p_playlist);
-    return ret;
-}
-
-- (int)playNextItem
-{
-    vlc_playlist_Lock(_p_playlist);
-    int ret = vlc_playlist_Next(_p_playlist);
-    vlc_playlist_Unlock(_p_playlist);
-    return ret;
-}
-
-- (void)stopPlayback
-{
-    vlc_playlist_Lock(_p_playlist);
-    vlc_playlist_Stop(_p_playlist);
-    vlc_playlist_Unlock(_p_playlist);
-}
-
-- (void)pausePlayback
-{
-    vlc_playlist_Lock(_p_playlist);
-    vlc_playlist_Pause(_p_playlist);
-    vlc_playlist_Unlock(_p_playlist);
-}
-
-- (void)resumePlayback
-{
-    vlc_playlist_Lock(_p_playlist);
-    vlc_playlist_Resume(_p_playlist);
-    vlc_playlist_Unlock(_p_playlist);
-}
-
-- (void)setPlaybackOrder:(enum vlc_playlist_playback_order)playbackOrder
-{
-    vlc_playlist_Lock(_p_playlist);
-    vlc_playlist_SetPlaybackOrder(_p_playlist, playbackOrder);
-    vlc_playlist_Unlock(_p_playlist);
-}
-
-- (void)setPlaybackRepeat:(enum vlc_playlist_playback_repeat)playbackRepeat
-{
-    vlc_playlist_Lock(_p_playlist);
-    vlc_playlist_SetPlaybackRepeat(_p_playlist, playbackRepeat);
-    vlc_playlist_Unlock(_p_playlist);
-}
-
-- (void)setLibraryPlaylistMode:(BOOL)libraryPlaylistMode
-{
-    _libraryPlaylistMode = libraryPlaylistMode;
-    NSUserDefaults.standardUserDefaults setBool:libraryPlaylistMode
-                                          forKey:VLCLibraryPlaylistModeDefaultsKey;
-}
-
-#pragma mark - properties
-
-- (VLCInputItem *)currentlyPlayingInputItem
-{
-    vlc_player_t *player = vlc_playlist_GetPlayer(_p_playlist);
-    VLCInputItem *inputItem;
-    vlc_player_Lock(player);
-    input_item_t *vlcInputItem = vlc_player_GetCurrentMedia(player);
-    if (vlcInputItem) {
-        inputItem = VLCInputItem alloc initWithInputItem:vlcInputItem;
-    }
-    vlc_player_Unlock(player);
-    return inputItem;
-}
-
-#pragma mark - helper methods
-
-- (input_item_t *)createInputItemBasedOnMetadata:(VLCOpenInputMetadata *)itemMetadata
-{
-    intf_thread_t *p_intf = getIntf();
-
-    input_item_t *p_input;
-    BOOL b_rem = FALSE, b_dir = FALSE, b_writable = FALSE;
-    NSString *uri, *name, *path;
-    NSURL * url;
-    NSArray *optionsArray;
-
-    /* Get the item */
-    uri = itemMetadata.MRLString;
-    url = NSURL URLWithString: uri;
-    path = url path;
-    name = itemMetadata.itemName;
-    optionsArray = itemMetadata.playbackOptions;
-
-    if (NSFileManager defaultManager fileExistsAtPath:path isDirectory:&b_dir
-        && b_dir &&
-        NSWorkspace.sharedWorkspace getFileSystemInfoForPath:path
-                                                    isRemovable:&b_rem
-                                                     isWritable:&b_writable
-                                                  isUnmountable:NULL
-                                                    description:NULL
-                                                           type:NULL
-        && b_rem && !b_writable && url isFileURL) {
-
-        NSString *diskType = getVolumeTypeFromMountPath(path);
-        msg_Dbg(p_intf, "detected optical media of type %s in the file input", diskType UTF8String);
-
-        if (diskType isEqualToString: kVLCMediaDVD)
-            uri = NSString stringWithFormat: @"dvdnav://%@", getBSDNodeFromMountPath(path);
-        else if (diskType isEqualToString: kVLCMediaVideoTSFolder)
-            uri = NSString stringWithFormat: @"dvdnav://%@", path;
-        else if (diskType isEqualToString: kVLCMediaAudioCD)
-            uri = NSString stringWithFormat: @"cdda://%@", getBSDNodeFromMountPath(path);
-        else if (diskType isEqualToString: kVLCMediaVCD)
-            uri = NSString stringWithFormat: @"vcd://%@#0:0", getBSDNodeFromMountPath(path);
-        else if (diskType isEqualToString: kVLCMediaSVCD)
-            uri = NSString stringWithFormat: @"vcd://%@@0:0", getBSDNodeFromMountPath(path);
-        else if (diskType isEqualToString: kVLCMediaBD || diskType isEqualToString: kVLCMediaBDMVFolder)
-            uri = NSString stringWithFormat: @"bluray://%@", path;
-        else
-            msg_Warn(getIntf(), "unknown disk type, treating %s as regular input", path UTF8String);
-
-        p_input = input_item_New(uri UTF8String, NSFileManager defaultManager displayNameAtPath:path UTF8String);
-    } else {
-        p_input = input_item_New(uri fileSystemRepresentation, name ? name UTF8String : NULL);
-    }
-
-    if (!p_input)
-        return NULL;
-
-    if (optionsArray) {
-        NSUInteger count = optionsArray count;
-        for (NSUInteger i = 0; i < count; i++)
-            input_item_AddOption(p_input, optionsArray objectAtIndex:i UTF8String, VLC_INPUT_OPTION_TRUSTED);
-    }
-
-    /* Recent documents menu */
-    if (url != nil && var_InheritBool(getIntf(), "macosx-recentitems"))
-        NSDocumentController sharedDocumentController noteNewRecentDocumentURL:url;
-
-    return p_input;
-}
-
-- (NSArray<VLCPlaylistExportModuleDescription *> *)availablePlaylistExportModules
-{
-    VLCPlaylistExportModuleDescription *xspf = VLCPlaylistExportModuleDescription alloc init;
-    xspf.humanReadableName = _NS("XSPF playlist");
-    xspf.fileExtension = @"xspf";
-    xspf.moduleName = @"export-xspf";
-
-    VLCPlaylistExportModuleDescription *m3u = VLCPlaylistExportModuleDescription alloc init;
-    m3u.humanReadableName = _NS("M3U playlist");
-    m3u.fileExtension = @"m3u";
-    m3u.moduleName = @"export-m3u";
-
-    VLCPlaylistExportModuleDescription *m3u8 = VLCPlaylistExportModuleDescription alloc init;
-    m3u8.humanReadableName = _NS("M3U8 playlist");
-    m3u8.fileExtension = @"m3u8";
-    m3u8.moduleName = @"export-m3u8";
-
-    VLCPlaylistExportModuleDescription *html = VLCPlaylistExportModuleDescription alloc init;
-    html.humanReadableName = _NS("HTML playlist");
-    html.fileExtension = @"html";
-    html.moduleName = @"export-html";
-
-    return @xspf, m3u, m3u8, html;
-}
-
-- (int)exportPlaylistToPath:(NSString *)path exportModule:(VLCPlaylistExportModuleDescription *)exportModule
-{
-    vlc_playlist_Lock(_p_playlist);
-    int ret = vlc_playlist_Export(_p_playlist,
-                                  path.fileSystemRepresentation,
-                                  exportModule.moduleName.UTF8String);
-    vlc_playlist_Unlock(_p_playlist);
-    return ret;
-}
-
-- (void)stopActionChanged:(enum vlc_playlist_media_stopped_action)stoppedAction
-{
-    _actionAfterStop = stoppedAction;
-}
-
-- (void)setActionAfterStop:(enum vlc_playlist_media_stopped_action)actionAfterStop
-{
-    vlc_playlist_Lock(_p_playlist);
-    vlc_playlist_SetMediaStoppedAction(_p_playlist, actionAfterStop);
-    vlc_playlist_Unlock(_p_playlist);
-}
-
-@end
-
-@implementation VLCPlaylistExportModuleDescription
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistDataSource.h Deleted

@@ -1,43 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistDataSource.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-@class VLCPlaylistController;
-@class VLCDragDropView;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface VLCPlaylistDataSource : NSObject <NSTableViewDataSource, NSTableViewDelegate>
-
-@property (readwrite, assign, nonatomic) VLCPlaylistController *playlistController;
-@property (readwrite, assign) NSTableView *tableView;
-@property (readwrite, assign) VLCDragDropView *dragDropView;
-@property (readwrite, nonatomic) NSTextField *counterTextField;
-
-- (void)prepareForUse;
-- (void)playlistUpdated;
-- (void)scrollToCurrentPlaylistItem;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistDataSource.m Deleted

@@ -1,197 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistDataSource.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlaylistDataSource.h"
-
-#import "main/VLCMain.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlaylistTableCellView.h"
-#import "playlist/VLCPlaylistItem.h"
-#import "playlist/VLCPlaylistModel.h"
-#import "views/VLCDragDropView.h"
-#import "library/VLCLibraryDataTypes.h"
-#import "library/VLCInputItem.h"
-#import "windows/VLCOpenInputMetadata.h"
-
-static NSString *VLCPlaylistCellIdentifier = @"VLCPlaylistCellIdentifier";
-
-@interface VLCPlaylistDataSource ()
-{
-    VLCPlaylistModel *_playlistModel;
-}
-@end
-
-@implementation VLCPlaylistDataSource
-
-- (void)setPlaylistController:(VLCPlaylistController *)playlistController
-{
-    _playlistController = playlistController;
-    _playlistModel = _playlistController.playlistModel;
-}
-
-- (void)setCounterTextField:(NSTextField *)counterTextField
-{
-    _counterTextField = counterTextField;
-    self.counterTextField.stringValue =
-        NSString stringWithFormat:@"%lu", _playlistModel.numberOfPlaylistItems;
-}
-
-- (void)prepareForUse
-{
-    _tableView registerForDraggedTypes:@VLCMediaLibraryMediaItemPasteboardType, VLCMediaLibraryMediaItemUTI, VLCPlaylistItemPasteboardType, NSFilenamesPboardType;
-}
-
-- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
-{
-    return _playlistModel.numberOfPlaylistItems;
-}
-
-- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
-{
-    VLCPlaylistTableCellView *cellView = tableView makeViewWithIdentifier:VLCPlaylistCellIdentifier owner:self;
-
-    if (cellView == nil) {
-        /* the following code saves us an instance of NSViewController which we don't need */
-        NSNib *nib = NSNib alloc initWithNibNamed:@"VLCPlaylistTableCellView" bundle:nil;
-        NSArray *topLevelObjects;
-        if (!nib instantiateWithOwner:self topLevelObjects:&topLevelObjects) {
-            msg_Err(getIntf(), "Failed to load nib file to show playlist items");
-            return nil;
-        }
-
-        for (id topLevelObject in topLevelObjects) {
-            if (topLevelObject isKindOfClass:VLCPlaylistTableCellView class) {
-                cellView = topLevelObject;
-                break;
-            }
-        }
-        cellView.identifier = VLCPlaylistCellIdentifier;
-    }
-
-    VLCPlaylistItem *item = _playlistModel playlistItemAtIndex:row;
-    if (!item) {
-        msg_Err(getIntf(), "playlist model did not return an item for representation");
-        return cellView;
-    }
-
-    cellView.representedPlaylistItem = item;
-    cellView.representsCurrentPlaylistItem = _playlistController.currentPlaylistIndex == row;
-
-    return cellView;
-}
-
-- (void)playlistUpdated
-{
-    NSUInteger numberOfPlaylistItems = _playlistModel.numberOfPlaylistItems;
-    self.dragDropView.hidden = numberOfPlaylistItems > 0 ? YES : NO;
-    self.counterTextField.stringValue = NSString stringWithFormat:@"%lu", numberOfPlaylistItems;
-    _tableView reloadData;
-}
-
-- (id<NSPasteboardWriting>)tableView:(NSTableView *)tableView pasteboardWriterForRow:(NSInteger)row
-{
-    NSPasteboardItem *pboardItem = NSPasteboardItem alloc init;
-    VLCPlaylistItem *playlistItem = _playlistModel playlistItemAtIndex:row;
-    pboardItem setString:@(playlistItem.uniqueID) stringValue forType:VLCPlaylistItemPasteboardType;
-    return pboardItem;
-}
-
-- (NSDragOperation)tableView:(NSTableView *)tableView
-                validateDrop:(id<NSDraggingInfo>)info
-                 proposedRow:(NSInteger)row
-       proposedDropOperation:(NSTableViewDropOperation)dropOperation
-{
-    return NSDragOperationCopy;
-}
-
-- (BOOL)tableView:(NSTableView *)tableView
-       acceptDrop:(id<NSDraggingInfo>)info
-              row:(NSInteger)row
-    dropOperation:(NSTableViewDropOperation)dropOperation
-{
-    NSString *encodedIDtoMove = info.draggingPasteboard stringForType:VLCPlaylistItemPasteboardType;
-    if (encodedIDtoMove != nil) {
-        int64_t uniqueID = encodedIDtoMove integerValue;
-        _playlistController moveItemWithID:uniqueID toPosition:row;
-        return YES;
-    }
-
-    /* check whether the receive data is a library item from the left-hand side */
-    NSData *data = info.draggingPasteboard dataForType:VLCMediaLibraryMediaItemPasteboardType;
-    if (!data) {
-        data = info.draggingPasteboard dataForType:VLCMediaLibraryMediaItemUTI;
-    }
-
-    if (!data) {
-        /* it's not, so check if it is a file handle from the Finder */
-        id propertyList = info.draggingPasteboard propertyListForType:NSFilenamesPboardType;
-        if (propertyList == nil) {
-            return NO;
-        }
-
-        NSArray *mediaPaths = propertyList sortedArrayUsingSelector:@selector(caseInsensitiveCompare:);
-        NSUInteger mediaCount = mediaPaths count;
-        if (mediaCount > 0) {
-            NSMutableArray *metadataArray = NSMutableArray arrayWithCapacity:mediaCount;
-            for (NSString *mediaPath in mediaPaths) {
-                VLCOpenInputMetadata *inputMetadata;
-                NSURL *url = NSURL fileURLWithPath:mediaPath isDirectory:NO;
-                if (!url) {
-                    continue;
-                }
-                inputMetadata = VLCOpenInputMetadata alloc init;
-                inputMetadata.MRLString = url.absoluteString;
-                metadataArray addObject:inputMetadata;
-            }
-            _playlistController addPlaylistItems:metadataArray;
-
-            return YES;
-        }
-        return NO;
-    }
-
-    /* it is a media library item, so unarchive it and add it to the playlist */
-    NSArray *array = nil;
-    @try {
-        array = NSKeyedUnarchiver unarchiveObjectWithData:data;
-    } @catch (NSException *exception) {
-        if (exception.name isEqualToString:NSInvalidArgumentException) {
-            msg_Err(getIntf(), "Failed to unarchive MediaLibrary Item: %s",
-                    exception reason UTF8String);
-            return NO;
-        }
-        @throw;
-    }
-
-    for (VLCMediaLibraryMediaItem *mediaItem in array) {
-        _playlistController addInputItem:mediaItem.inputItem.vlcInputItem atPosition:row startPlayback:NO;
-    }
-
-    return YES;
-}
-
-- (void)scrollToCurrentPlaylistItem
-{
-    _tableView scrollRowToVisible:_playlistController.currentPlaylistIndex;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistItem.h Deleted

@@ -1,54 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistItem.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Foundation/Foundation.h>
-#import <vlc_playlist.h>
-#import <vlc_tick.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class VLCInputItem;
-@class VLCMediaLibraryMediaItem;
-
-extern NSString *VLCPlaylistItemPasteboardType;
-
-@interface VLCPlaylistItem : NSObject
-
-@property (readonly) vlc_playlist_item_t *playlistItem;
-@property (readonly) uint64_t uniqueID;
-@property (readwrite, retain) NSString *title;
-@property (readonly, copy, nullable) NSURL *url;
-@property (readonly, copy, nullable) NSString *path;
-@property (readwrite, assign) vlc_tick_t duration;
-@property (readonly, nullable) VLCInputItem *inputItem;
-@property (readonly, nullable) VLCMediaLibraryMediaItem *mediaLibraryItem;
-
-@property (readwrite, retain, nullable) NSString *artistName;
-@property (readwrite, retain, nullable) NSString *albumName;
-@property (readonly) NSURL *artworkURL;
-
-- (instancetype)initWithPlaylistItem:(vlc_playlist_item_t *)p_item;
-- (void)updateRepresentation;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistItem.m Deleted

@@ -1,138 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistItem.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlaylistItem.h"
-
-#import <vlc_input.h>
-#import <vlc_url.h>
-
-#import "extensions/NSString+Helpers.h"
-#import "library/VLCInputItem.h"
-#import "library/VLCLibraryDataTypes.h"
-
-NSString *VLCPlaylistItemPasteboardType = @"org.videolan.vlc.playlistitemtype";
-
-@implementation VLCPlaylistItem
-
-- (instancetype)initWithPlaylistItem:(vlc_playlist_item_t *)p_item
-{
-    self = super init;
-    if (self) {
-        _playlistItem = p_item;
-        vlc_playlist_item_Hold(_playlistItem);
-        self updateRepresentation;
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    vlc_playlist_item_Release(_playlistItem);
-}
-
-- (NSString *)description
-{
-    return NSString stringWithFormat:@"item %p, title: %@ duration %lli", &_playlistItem, _title, _duration;
-}
-
-- (uint64_t)uniqueID
-{
-    return vlc_playlist_item_GetId(_playlistItem);
-}
-
-- (VLCInputItem *)inputItem
-{
-    if (!_playlistItem) {
-        return nil;
-    }
-    input_item_t *p_input = vlc_playlist_item_GetMedia(_playlistItem);
-    if (!p_input) {
-        return nil;
-    }
-    VLCInputItem *inputItem = VLCInputItem alloc initWithInputItem:p_input;
-    return inputItem;
-}
-
-- (VLCMediaLibraryMediaItem *)mediaLibraryItem
-{
-    return VLCMediaLibraryMediaItem mediaItemForURL:self.url;
-}
-
-- (void)updateRepresentation
-{
-    input_item_t *p_media = vlc_playlist_item_GetMedia(_playlistItem);
-    vlc_mutex_lock(&p_media->lock);
-    _title = toNSStr(p_media->psz_name);
-    _duration = p_media->i_duration;
-
-    if (p_media->p_meta) {
-        _artistName = toNSStr(vlc_meta_Get(p_media->p_meta, vlc_meta_Artist));
-        _albumName = toNSStr(vlc_meta_Get(p_media->p_meta, vlc_meta_Album));
-
-        NSString *artworkURLString = toNSStr(vlc_meta_Get(p_media->p_meta, vlc_meta_ArtworkURL));
-        if (artworkURLString.length > 1) {
-            _artworkURL = NSURL URLWithString:artworkURLString;
-        }
-    }
-    vlc_mutex_unlock(&p_media->lock);
-}
-
-- (NSURL *)url
-{
-    if (_playlistItem) {
-        return nil;
-    }
-
-    input_item_t *p_media = vlc_playlist_item_GetMedia(_playlistItem);
-    if (!p_media) {
-        return nil;
-    }
-    char *psz_url = input_item_GetURI(p_media);
-    if (!psz_url)
-        return nil;
-
-    NSURL *url = NSURL URLWithString:toNSStr(psz_url);
-    free(psz_url);
-    return url;
-}
-
-- (NSString *)path
-{
-    if (!_playlistItem) {
-        return nil;
-    }
-    input_item_t *p_media = vlc_playlist_item_GetMedia(_playlistItem);
-    if (!p_media) {
-        return nil;
-    }
-    char *psz_url = input_item_GetURI(p_media);
-    if (!psz_url)
-        return nil;
-
-    char *psz_path = vlc_uri2path(psz_url);
-    NSString *path = toNSStr(psz_path);
-    free(psz_url);
-    free(psz_path);
-    return path;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistMenuController.h Deleted

@@ -1,36 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistMenuController.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2002-2019 VLC authors and VideoLAN
- *
- * Authors: Benjamin Pracht <bigben at videolan dot org>
- *          Felix Paul Kühne <fkuehne at videolan dot org>
- *          David Fuhrmann <dfuhrmann # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface VLCPlaylistMenuController : NSObject
-
-@property (readwrite, weak, nonatomic) NSTableView *playlistTableView;
-@property (readonly) NSMenu *playlistMenu;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistMenuController.m Deleted

@@ -1,237 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistMenuController.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2002-2019 VLC authors and VideoLAN
- *
- * Authors: Benjamin Pracht <bigben at videolan dot org>
- *          Felix Paul Kühne <fkuehne at videolan dot org>
- *          David Fuhrmann <dfuhrmann # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlaylistMenuController.h"
-
-#import "extensions/NSString+Helpers.h"
-#import "extensions/NSMenu+VLCAdditions.h"
-#import "main/VLCMain.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlaylistModel.h"
-#import "playlist/VLCPlaylistItem.h"
-#import "playlist/VLCPlaylistSortingMenuController.h"
-#import "windows/VLCOpenWindowController.h"
-#import "panels/VLCInformationWindowController.h"
-
-@interface VLCPlaylistMenuController ()
-{
-    VLCPlaylistController *_playlistController;
-    VLCPlaylistSortingMenuController *_playlistSortingMenuController;
-    VLCInformationWindowController *_informationWindowController;
-
-    NSMenuItem *_playMenuItem;
-    NSMenuItem *_removeMenuItem;
-    NSMenuItem *_informationMenuItem;
-    NSMenuItem *_revealInFinderMenuItem;
-    NSMenuItem *_addFilesToPlaylistMenuItem;
-    NSMenuItem *_clearPlaylistMenuItem;
-    NSMenuItem *_sortMenuItem;
-}
-
-@property (readwrite, atomic) NSArray<NSMenuItem *> *items;
-@property (readwrite, atomic) NSArray<NSMenuItem *> *multipleSelectionItems;
-
-@end
-
-@implementation VLCPlaylistMenuController
-
-- (instancetype)init
-{
-    self = super init;
-    if (self) {
-        self createMenu;
-        _playlistController = VLCMain.sharedInstance.playlistController;
-    }
-    return self;
-}
-
-- (void)createMenu
-{
-    _playMenuItem = NSMenuItem alloc initWithTitle:_NS("Play") action:@selector(play:) keyEquivalent:@"";
-    _playMenuItem.target = self;
-
-    _removeMenuItem = NSMenuItem alloc initWithTitle:_NS("Delete") action:@selector(remove:) keyEquivalent:@"";
-    _removeMenuItem.target = self;
-
-    _revealInFinderMenuItem = NSMenuItem alloc initWithTitle:_NS("Reveal in Finder") action:@selector(revealInFinder:) keyEquivalent:@"";
-    _revealInFinderMenuItem.target = self;
-
-    _informationMenuItem = NSMenuItem alloc initWithTitle:_NS("Information...") action:@selector(showInformationPanel:) keyEquivalent:@"";
-    _informationMenuItem.target = self;
-
-    _addFilesToPlaylistMenuItem = NSMenuItem alloc initWithTitle:_NS("Add File...") action:@selector(addFilesToPlaylist:) keyEquivalent:@"";
-    _addFilesToPlaylistMenuItem.target = self;
-
-    _clearPlaylistMenuItem = NSMenuItem alloc initWithTitle:_NS("Clear the playlist") action:@selector(clearPlaylist:) keyEquivalent:@"";
-    _clearPlaylistMenuItem.target = self;
-
-    _playlistSortingMenuController = VLCPlaylistSortingMenuController alloc init;
-    _sortMenuItem = NSMenuItem alloc initWithTitle:_NS("Sort") action:nil keyEquivalent:@"";
-    _sortMenuItem setSubmenu:_playlistSortingMenuController.playlistSortingMenu;
-
-    self.items = @
-        _playMenuItem,
-        _removeMenuItem,
-        _revealInFinderMenuItem,
-        _informationMenuItem,
-        NSMenuItem.separatorItem,
-        _addFilesToPlaylistMenuItem,
-        _clearPlaylistMenuItem,
-        _sortMenuItem
-    ;
-
-    self.multipleSelectionItems = @
-        _removeMenuItem,
-        NSMenuItem.separatorItem,
-        _addFilesToPlaylistMenuItem,
-        _clearPlaylistMenuItem,
-        _sortMenuItem
-    ;
-
-    _playlistMenu = NSMenu alloc init;
-    _playlistMenu.itemArray = self.items;
-}
-
-- (void)setPlaylistTableView:(NSTableView *)playlistTableView
-{
-    NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
-    if (self.playlistTableView != nil) {
-        notificationCenter removeObserver:self
-                                      name:NSTableViewSelectionDidChangeNotification
-                                    object:self.playlistTableView;
-    }
-
-    _playlistTableView = playlistTableView;
-    notificationCenter addObserver:self
-                           selector:@selector(tableViewSelectionDidChange:)
-                               name:NSTableViewSelectionDidChangeNotification
-                             object:self.playlistTableView;
-
-}
-
-- (void)play:(id)sender
-{
-    NSInteger selectedRow = self.playlistTableView.selectedRow;
-
-    if (selectedRow != -1) {
-        _playlistController playItemAtIndex:selectedRow;
-    } else {
-        _playlistController startPlaylist;
-    }
-}
-
-- (void)remove:(id)sender
-{
-    _playlistController removeItemsAtIndexes:self.playlistTableView.selectedRowIndexes;
-}
-
-- (void)showInformationPanel:(id)sender
-{
-    if (!_informationWindowController) {
-        _informationWindowController = VLCInformationWindowController alloc init;
-    }
-
-    NSMutableArray * const inputItems = NSMutableArray.array;
-    NSIndexSet * const selectedIndices = self.playlistTableView.selectedRowIndexes;
-
-    selectedIndices enumerateIndexesUsingBlock:^(const NSUInteger idx, BOOL * const stop) {
-        VLCPlaylistItem * const item =
-            self->_playlistController.playlistModel playlistItemAtIndex:idx;
-        if (item == nil) {
-            return;
-        }
-        inputItems addObject:item.inputItem;
-    };
-
-    _informationWindowController.representedInputItems = inputItems.copy;
-    _informationWindowController toggleWindow:sender;
-}
-
-- (void)revealInFinder:(id)sender
-{
-    NSInteger selectedRow = self.playlistTableView.selectedRow;
-
-    if (selectedRow == -1)
-        return;
-
-    VLCPlaylistItem *item = _playlistController.playlistModel playlistItemAtIndex:selectedRow;
-    if (item == nil)
-        return;
-
-    NSString *path = item.path;
-    NSWorkspace.sharedWorkspace selectFile:path inFileViewerRootedAtPath:path;
-}
-
-- (void)addFilesToPlaylist:(id)sender
-{
-    NSInteger selectedRow = self.playlistTableView.selectedRow;
-
-    VLCMain.sharedInstance open openFileWithAction:^(NSArray *files) {
-        self->_playlistController addPlaylistItems:files
-                                         atPosition:selectedRow
-                                      startPlayback:NO;
-    };
-}
-
-- (void)clearPlaylist:(id)sender
-{
-    _playlistController clearPlaylist;
-}
-
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
-{
-    if (menuItem == _addFilesToPlaylistMenuItem) {
-        return YES;
-
-    } else if (menuItem == _clearPlaylistMenuItem) {
-        return (self.playlistTableView.numberOfRows > 0);
-
-    } else if (menuItem == _removeMenuItem ||
-               menuItem == _playMenuItem ||
-               menuItem == _informationMenuItem) {
-        return (self.playlistTableView.numberOfSelectedRows > 0);
-
-    } else if (menuItem == _revealInFinderMenuItem) {
-        return (self.playlistTableView.numberOfSelectedRows == 1);
-    }
-
-    return NO;
-}
-
-- (void)tableViewSelectionDidChange:(NSNotification *)notification
-{
-    NSTableView * const tableView = notification.object;
-    if (tableView != self.playlistTableView) {
-        return;
-    }
-
-    const BOOL multipleSelection = tableView.selectedRowIndexes.count > 1;
-    if (multipleSelection) {
-        self.playlistMenu.itemArray = self.multipleSelectionItems;
-    } else {
-        self.playlistMenu.itemArray = self.items;
-    }
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistModel.h Deleted

@@ -1,46 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistModel.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Foundation/Foundation.h>
-#import <vlc_playlist.h>
-
-@class VLCPlaylistController;
-@class VLCPlaylistItem;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface VLCPlaylistModel : NSObject
-
-@property (readwrite, assign) VLCPlaylistController *playlistController;
-@property (readonly) NSUInteger numberOfPlaylistItems;
-
-- (void)dropExistingData;
-- (VLCPlaylistItem *)playlistItemAtIndex:(NSInteger)index;
-- (void)addItems:(NSArray *)array;
-- (void)addItems:(NSArray *)array atIndex:(size_t)index count:(size_t)count;
-- (void)moveItemAtIndex:(size_t)index toTarget:(size_t)target;
-- (void)removeItemsInRange:(NSRange)range;
-- (void)updateItemAtIndex:(size_t)index;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistModel.m Deleted

@@ -1,94 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistModel.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlaylistModel.h"
-
-#import <vlc_common.h>
-
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlaylistItem.h"
-
-@interface VLCPlaylistModel ()
-{
-    NSMutableArray *_playlistArray;
-}
-@end
-
-@implementation VLCPlaylistModel
-
-- (instancetype)init
-{
-    self = super init;
-    if (self) {
-        _playlistArray = NSMutableArray alloc init;
-    }
-    return self;
-}
-
-- (NSUInteger)numberOfPlaylistItems
-{
-    return _playlistArray.count;
-}
-
-- (void)dropExistingData
-{
-    _playlistArray removeAllObjects;
-}
-
-- (VLCPlaylistItem *)playlistItemAtIndex:(NSInteger)index
-{
-    if (index < 0 || index > _playlistArray.count) {
-        return nil;
-    }
-    
-    return _playlistArrayindex;
-}
-
-- (void)addItems:(NSArray *)array
-{
-    _playlistArray addObjectsFromArray:array;
-}
-
-- (void)addItems:(NSArray *)array atIndex:(size_t)index count:(size_t)count
-{
-    _playlistArray insertObjects:array atIndexes:NSIndexSet indexSetWithIndexesInRange:NSMakeRange(index, count);
-}
-
-- (void)moveItemAtIndex:(size_t)index toTarget:(size_t)target
-{
-    VLCPlaylistItem *item = _playlistArray objectAtIndex:index;
-    _playlistArray removeObjectAtIndex:index;
-    _playlistArray insertObject:item atIndex:target;
-}
-
-- (void)removeItemsInRange:(NSRange)range
-{
-    _playlistArray removeObjectsInRange:range;
-}
-
-- (void)updateItemAtIndex:(size_t)index
-{
-    VLCPlaylistItem *item = _playlistArrayindex;
-    item updateRepresentation;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistSortingMenuController.h Deleted

@@ -1,33 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistSortingMenuController.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2002-2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan dot org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface VLCPlaylistSortingMenuController : NSObject
-
-@property (readonly) NSMenu *playlistSortingMenu;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistSortingMenuController.m Deleted

@@ -1,131 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistSortingMenuController.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2002-2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan dot org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlaylistSortingMenuController.h"
-
-#import "extensions/NSString+Helpers.h"
-#import "main/VLCMain.h"
-#import "playlist/VLCPlaylistController.h"
-
-@interface VLCPlaylistSortingMenuController () <NSMenuDelegate>
-{
-    VLCPlaylistController *_playlistController;
-}
-@end
-
-@implementation VLCPlaylistSortingMenuController
-
-- (instancetype)init
-{
-    self = super init;
-    if (self) {
-        self createMenu;
-        _playlistController = VLCMain.sharedInstance.playlistController;
-    }
-    return self;
-}
-
-- (void)createMenu
-{
-    _playlistSortingMenu = NSMenu alloc init;
-
-    NSArray *titles = @_NS("Title"),
-                        _NS("Duration"),
-                        _NS("Artist"),
-                        _NS("Album"),
-                        _NS("Album Artist"),
-                        _NS("Genre"),
-                        _NS("Date"),
-                        _NS("Track Number"),
-                        _NS("Disc Number"),
-                        _NS("URL"),
-                        _NS("Rating");
-    NSUInteger count = titles.count;
-    for (NSUInteger x = 0; x < count; x++) {
-        NSMenuItem *menuItem = NSMenuItem alloc initWithTitle:titlesx action:@selector(selectSortKey:) keyEquivalent:@"";
-        menuItem.target = self;
-        menuItem.tag = x;
-        _playlistSortingMenu addItem:menuItem;
-    }
-
-    _playlistSortingMenu addItem:NSMenuItem separatorItem;
-
-    titles = @_NS("Ascending"),
-               _NS("Descending");
-    count = titles.count;
-    for (NSUInteger x = 0; x < count; x++) {
-        NSMenuItem *menuItem = NSMenuItem alloc initWithTitle:titlesx action:@selector(selectSortOrder:) keyEquivalent:@"";
-        menuItem.target = self;
-        menuItem.tag = x + 100;
-        _playlistSortingMenu addItem:menuItem;
-    }
-
-    _playlistSortingMenu.delegate = self;
-}
-
-- (void)menuNeedsUpdate:(NSMenu *)menu
-{
-    if (_playlistController.unsorted) {
-        return;
-    }
-    NSInteger count = _playlistSortingMenu.numberOfItems;
-    for (NSInteger x = 0; x < count; x++) {
-        NSMenuItem *menuItem = _playlistSortingMenu itemAtIndex:x;
-        menuItem.state = NSOffState;
-    }
-
-    NSMenuItem *menuItem = _playlistSortingMenu itemWithTag:_playlistController.lastSortKey;
-    menuItem.state = NSOnState;
-
-    menuItem = _playlistSortingMenu itemWithTag:_playlistController.lastSortOrder + 100;
-    menuItem.state = NSOnState;
-}
-
-- (void)selectSortKey:(id)sender
-{
-    enum vlc_playlist_sort_key sortKey = (enum vlc_playlist_sort_key)sender tag;
-    enum vlc_playlist_sort_order sortOrder;
-    if (_playlistController.unsorted) {
-        /* we don't have an order and the user can only do a single selection - pick the most popular */
-        sortOrder = VLC_PLAYLIST_SORT_ORDER_ASCENDING;
-    } else {
-        sortOrder = _playlistController.lastSortOrder;
-    }
-
-    _playlistController sortByKey:sortKey andOrder:sortOrder;
-}
-
-- (void)selectSortOrder:(id)sender
-{
-    enum vlc_playlist_sort_key sortKey;
-    enum vlc_playlist_sort_order sortOrder = (enum vlc_playlist_sort_order)(sender tag - 100);
-    if (_playlistController.unsorted) {
-        /* we don't have a key and the user can only do a single selection - pick the most popular */
-        sortKey = VLC_PLAYLIST_SORT_KEY_TITLE;
-    } else {
-        sortKey = _playlistController.lastSortKey;
-    }
-
-    _playlistController sortByKey:sortKey andOrder:sortOrder;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistTableCellView.h Deleted

@@ -1,45 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistTableViewCell.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-@class VLCImageView;
-@class VLCPlaylistItem;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface VLCPlaylistTableCellView : NSTableCellView
-
-@property (readwrite, assign, nonatomic) VLCPlaylistItem *representedPlaylistItem;
-@property (readwrite, nonatomic) BOOL representsCurrentPlaylistItem;
-
-@property (readwrite, assign) IBOutlet NSTextField *artistTextField;
-@property (readwrite, assign) IBOutlet NSTextField *secondaryMediaTitleTextField;
-@property (readwrite, assign) IBOutlet NSTextField *mediaTitleTextField;
-@property (readwrite, assign) IBOutlet NSTextField *durationTextField;
-@property (readwrite, assign) IBOutlet VLCImageView *mediaImageView;
-@property (readwrite, assign) IBOutlet NSTextField *audioMediaTypeIndicator;
-@property (readwrite, assign) IBOutlet VLCImageView *audioArtworkImageView;
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistTableCellView.m Deleted

@@ -1,123 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistTableViewCell.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlaylistTableCellView.h"
-
-#import "extensions/NSColor+VLCAdditions.h"
-#import "extensions/NSFont+VLCAdditions.h"
-#import "extensions/NSImage+VLCAdditions.h"
-#import "extensions/NSString+Helpers.h"
-
-#import "library/VLCLibraryImageCache.h"
-
-#import "main/VLCMain.h"
-
-#import "playlist/VLCPlaylistItem.h"
-
-#import "views/VLCImageView.h"
-
-#import <vlc_configuration.h>
-
-@implementation VLCPlaylistTableCellView
-
-- (void)dealloc
-{
-    NSNotificationCenter.defaultCenter removeObserver:self;
-}
-
-- (void)setRepresentsCurrentPlaylistItem:(BOOL)representsCurrentPlaylistItem
-{
-    _representsCurrentPlaylistItem = representsCurrentPlaylistItem;
-
-    self updateFonts;
-    self updateColouredElements;
-}
-
-- (void)updateFonts
-{
-    NSFont * const displayedFont = _representsCurrentPlaylistItem ?
-        NSFont boldSystemFontOfSize:NSFont.systemFontSize :
-        NSFont systemFontOfSize:NSFont.systemFontSize;
-
-    NSFont * const sublineDisplayedFont = _representsCurrentPlaylistItem ?
-        NSFont boldSystemFontOfSize:NSFont.smallSystemFontSize :
-        NSFont systemFontOfSize:NSFont.smallSystemFontSize;
-
-    self.mediaTitleTextField.font = displayedFont;
-    self.secondaryMediaTitleTextField.font = displayedFont;
-    self.durationTextField.font = displayedFont;
-    self.artistTextField.font = sublineDisplayedFont;
-}
-
-- (void)updateColouredElements
-{
-
-    self.audioMediaTypeIndicator.textColor = _representsCurrentPlaylistItem ?
-        NSColor.labelColor :
-        NSColor.secondaryLabelColor;
-}
-
-- (void)setRepresentedPlaylistItem:(VLCPlaylistItem *)item
-{
-    VLCLibraryImageCache thumbnailForPlaylistItem:item withCompletion:^(NSImage * const thumbnail) {
-        self.audioArtworkImageView.image = thumbnail;
-        self.mediaImageView.image = thumbnail;
-    };
-
-    const BOOL validArtistString = item.artistName && item.artistName.length > 0;
-    const BOOL validAlbumString = item.albumName && item.albumName.length > 0;
-
-    NSString *songDetailString = @"";
-
-    if (validArtistString && validAlbumString) {
-        songDetailString = NSString stringWithFormat:@"%@ · %@", item.artistName, item.albumName;
-    } else if (validArtistString) {
-        songDetailString = item.artistName;
-    }
-
-    if (songDetailString) {
-        self.mediaTitleTextField.hidden = YES;
-        self.secondaryMediaTitleTextField.hidden = NO;
-        self.artistTextField.hidden = NO;
-        self.secondaryMediaTitleTextField.stringValue = item.title;
-        self.artistTextField.stringValue = songDetailString;
-        self.audioMediaTypeIndicator.hidden = NO;
-
-        self.audioArtworkImageView.hidden = NO;
-        self.mediaImageView.hidden = YES;
-    } else {
-        self.mediaTitleTextField.hidden = NO;
-        self.secondaryMediaTitleTextField.hidden = YES;
-        self.artistTextField.hidden = YES;
-        self.mediaTitleTextField.stringValue = item.title;
-        self.audioMediaTypeIndicator.hidden = YES;
-
-        self.audioArtworkImageView.hidden = YES;
-        self.mediaImageView.hidden = NO;
-    }
-
-    self.durationTextField.stringValue = NSString stringWithTimeFromTicks:item.duration;
-
-    _representedPlaylistItem = item;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistTableView.h Deleted

@@ -1,34 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistTableView.h: table view subclass for the playlist
- *****************************************************************************
- * Copyright (C) 2003-2019 VLC authors and VideoLAN
- *
- * Authors: Derk-Jan Hartman <hartman at videola/n dot org>
- *          Benjamin Pracht <bigben at videolab dot org>
- *          Felix Paul Kühne <fkuehne at videolan dot org>
- *          David Fuhrmann <dfuhrmann # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface VLCPlaylistTableView : NSTableView
-
-@end
-
-NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/playlist/VLCPlaylistTableView.m Deleted

@@ -1,106 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistTableView.m: table view subclass for the playlist
- *****************************************************************************
- * Copyright (C) 2003-2019 VLC authors and VideoLAN
- *
- * Authors: Derk-Jan Hartman <hartman at videola/n dot org>
- *          Benjamin Pracht <bigben at videolab dot org>
- *          Felix Paul Kühne <fkuehne at videolan dot org>
- *          David Fuhrmann <dfuhrmann # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCPlaylistTableView.h"
-
-#import "main/VLCMain.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlaylistMenuController.h"
-
-@interface VLCPlaylistTableView ()
-
-@property (readonly, atomic) VLCPlaylistMenuController *menuController;
-
-@end
-
-@implementation VLCPlaylistTableView
-
-- (NSMenu *)menuForEvent:(NSEvent *)event
-{
-    if (self.menuController == nil) {
-        _menuController = VLCPlaylistMenuController alloc init;
-        self.menuController.playlistTableView = self;
-    }
-
-    NSPoint pt = self convertPoint: event locationInWindow fromView: nil;
-    NSInteger row = self rowAtPoint:pt;
-    if (row != -1 && !self selectedRowIndexes containsIndex: row)
-        self selectRowIndexes:NSIndexSet indexSetWithIndex:row byExtendingSelection:NO;
-
-    return self.menuController.playlistMenu;
-}
-
-- (void)keyDown:(NSEvent *)event
-{
-    unichar key = 0;
-
-    if (event characters length) {
-        /* we evaluate the first key only */
-        key = event characters characterAtIndex: 0;
-    }
-
-    size_t indexOfSelectedItem = self.selectedRow;
-    NSIndexSet *selectedIndexes = self selectedRowIndexes;
-
-    switch(key) {
-        case NSDeleteCharacter:
-        case NSDeleteFunctionKey:
-        case NSDeleteCharFunctionKey:
-        case NSBackspaceCharacter:
-        {
-            VLCPlaylistController *playlistController = VLCMain.sharedInstance.playlistController;
-            playlistController removeItemsAtIndexes:selectedIndexes;
-            break;
-        }
-
-        case NSEnterCharacter:
-        case NSCarriageReturnCharacter:
-            VLCMain.sharedInstance.playlistController playItemAtIndex:indexOfSelectedItem;
-            break;
-
-        default:
-            super keyDown: event;
-            break;
-    }
-}
-
-- (BOOL)acceptsFirstResponder
-{
-    return YES;
-}
-
-- (BOOL)becomeFirstResponder
-{
-    self setNeedsDisplay:YES;
-    return YES;
-}
-
-- (BOOL)resignFirstResponder
-{
-    self setNeedsDisplay:YES;
-    return YES;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCHUDOutlineView.h Deleted

@@ -1,50 +0,0 @@
-//
-//  VLCHUDOutlineView.h
-//  BGHUDAppKit
-//
-//  Created by BinaryGod on 6/20/08.
-//
-//  Copyright (c) 2008, Tim Davis (BinaryMethod.com, binary.god@gmail.com)
-//  All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification,
-//  are permitted provided that the following conditions are met:
-//
-//		Redistributions of source code must retain the above copyright notice, this
-//	list of conditions and the following disclaimer.
-//
-//		Redistributions in binary form must reproduce the above copyright notice,
-//	this list of conditions and the following disclaimer in the documentation and/or
-//	other materials provided with the distribution.
-//
-//		Neither the name of the BinaryMethod.com nor the names of its contributors
-//	may be used to endorse or promote products derived from this software without
-//	specific prior written permission.
-//
-//	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
-//	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-//	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-//	IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-//	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-//	OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-//	WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-//	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//	POSSIBILITY OF SUCH DAMAGE.
-
-#import <Cocoa/Cocoa.h>
-
-@interface VLCHUDOutlineView : NSOutlineView
-
-@property (strong) NSColor *tableBackgroundColor;
-@property (strong) NSArray *cellAlternatingRowColors;
-@property (strong) NSColor *cellHighlightColor;
-@property (strong) NSColor *cellEditingFillColor;
-@property (strong) NSColor *cellTextColor;
-@property (strong) NSColor *cellSelectedTextColor;
-@property (strong) NSColor *strokeColor;
-
-@property (strong) NSGradient *highlightGradient;
-@property (strong) NSGradient *normalGradient;
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCHUDOutlineView.m Deleted

@@ -1,101 +0,0 @@
-//
-//  VLCHUDOutlineView.m
-//  BGHUDAppKit
-//
-//  Created by BinaryGod on 6/20/08.
-//
-//  Copyright (c) 2008, Tim Davis (BinaryMethod.com, binary.god@gmail.com)
-//  All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification,
-//  are permitted provided that the following conditions are met:
-//
-//		Redistributions of source code must retain the above copyright notice, this
-//	list of conditions and the following disclaimer.
-//
-//		Redistributions in binary form must reproduce the above copyright notice,
-//	this list of conditions and the following disclaimer in the documentation and/or
-//	other materials provided with the distribution.
-//
-//		Neither the name of the BinaryMethod.com nor the names of its contributors
-//	may be used to endorse or promote products derived from this software without
-//	specific prior written permission.
-//
-//	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
-//	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-//	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-//	IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-//	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-//	OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-//	WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-//	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//	POSSIBILITY OF SUCH DAMAGE.
-
-#import "VLCHUDOutlineView.h"
-
-#import "views/VLCHUDTableCornerView.h"
-
-@interface NSOutlineView (private)
-- (void)_sendDelegateWillDisplayCell:(id)cell forColumn:(id)column row:(NSInteger)row;
-@end
-
-@implementation VLCHUDOutlineView
-
-#pragma mark Drawing Functions
-
-- (instancetype)initWithCoder:(NSCoder *)decoder
-{
-
-    self = super initWithCoder: decoder;
-
-    if (self) {
-        _tableBackgroundColor = NSColor colorWithCalibratedRed:0 green:0 blue:0 alpha:0;
-        _cellEditingFillColor = NSColor colorWithDeviceRed:0.141f green:0.141f blue:0.141f alpha:0.5f;
-        _cellAlternatingRowColors = @NSColor colorWithCalibratedWhite:0.16f alpha:0.86f,
-                                      NSColor colorWithCalibratedWhite:0.15f alpha:0.8f;
-        _cellTextColor = NSColor whiteColor;
-        _cellSelectedTextColor = NSColor blackColor;
-        _strokeColor = NSColor colorWithDeviceRed:0.749f green:0.761f blue:0.788f alpha:1.0f;
-        _highlightGradient = NSGradient alloc initWithStartingColor:NSColor colorWithDeviceRed:0.451f green:0.451f blue:0.455f alpha:0.5f
-                                                           endingColor:NSColor colorWithDeviceRed:0.318f green:0.318f blue:0.318f alpha:0.5f;
-        _normalGradient = NSGradient alloc initWithStartingColor:NSColor colorWithDeviceRed:0.251f green:0.251f blue:0.255f alpha:0.5f
-                                                        endingColor:NSColor colorWithDeviceRed:0.118f green:0.118f blue:0.118f alpha:0.5f;
-
-
-        self setBackgroundColor:_tableBackgroundColor;
-        self setFocusRingType:NSFocusRingTypeNone;
-    }
-
-    return self;
-}
-
-- (id)_alternatingRowBackgroundColors {
-    return _cellAlternatingRowColors;
-}
-
-- (void)_sendDelegateWillDisplayCell:(id)cell forColumn:(id)column row:(NSInteger)row {
-
-    super _sendDelegateWillDisplayCell:cell forColumn:column row:row;
-
-    self currentEditor setBackgroundColor:_cellEditingFillColor;
-    self currentEditor setTextColor:_cellTextColor;
-
-    if(self selectedRowIndexes containsIndex: row) {
-
-        if(cell respondsToSelector: @selector(setTextColor:)) {
-            cell setTextColor:_cellSelectedTextColor;
-        }
-    } else {
-
-        if (cell respondsToSelector:@selector(setTextColor:)) {
-            cell setTextColor:_cellTextColor;
-        }
-    }
-}
-
-- (void)awakeFromNib {
-    self setCornerView: VLCHUDTableCornerView alloc init;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCHUDTableCornerView.h Deleted

@@ -1,42 +0,0 @@
-//
-//  VLCHUDTableCornerView.h
-//  BGHUDAppKit
-//
-//  Created by BinaryGod on 6/29/08.
-//
-//  Copyright (c) 2008, Tim Davis (BinaryMethod.com, binary.god@gmail.com)
-//  All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification,
-//  are permitted provided that the following conditions are met:
-//
-//		Redistributions of source code must retain the above copyright notice, this
-//	list of conditions and the following disclaimer.
-//
-//		Redistributions in binary form must reproduce the above copyright notice,
-//	this list of conditions and the following disclaimer in the documentation and/or
-//	other materials provided with the distribution.
-//
-//		Neither the name of the BinaryMethod.com nor the names of its contributors
-//	may be used to endorse or promote products derived from this software without
-//	specific prior written permission.
-//
-//	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
-//	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-//	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-//	IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-//	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-//	OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-//	WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-//	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//	POSSIBILITY OF SUCH DAMAGE.
-
-#import <Cocoa/Cocoa.h>
-
-@interface VLCHUDTableCornerView : NSView
-
-@property (strong) NSColor *tableHeaderCellBorderColor;
-@property (strong) NSGradient *tableHeaderCellNormalFill;
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCHUDTableCornerView.m Deleted

@@ -1,59 +0,0 @@
-//
-//  VLCHUDTableCornerView.m
-//  BGHUDAppKit
-//
-//  Created by BinaryGod on 6/29/08.
-//
-//  Copyright (c) 2008, Tim Davis (BinaryMethod.com, binary.god@gmail.com)
-//  All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification,
-//  are permitted provided that the following conditions are met:
-//
-//		Redistributions of source code must retain the above copyright notice, this
-//	list of conditions and the following disclaimer.
-//
-//		Redistributions in binary form must reproduce the above copyright notice,
-//	this list of conditions and the following disclaimer in the documentation and/or
-//	other materials provided with the distribution.
-//
-//		Neither the name of the BinaryMethod.com nor the names of its contributors
-//	may be used to endorse or promote products derived from this software without
-//	specific prior written permission.
-//
-//	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
-//	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-//	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-//	IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-//	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-//	OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-//	WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-//	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//	POSSIBILITY OF SUCH DAMAGE.
-#import "VLCHUDTableCornerView.h"
-
-@implementation VLCHUDTableCornerView
-
-- (instancetype)init
-{
-    self = super init;
-
-    if (self) {
-        _tableHeaderCellBorderColor = NSColor colorWithDeviceRed:0.349f green:0.361f blue:0.388f alpha:1.0f;
-        _tableHeaderCellNormalFill = NSGradient alloc initWithStartingColor:NSColor colorWithDeviceRed:0.251f green:0.251f blue:0.255f alpha:1.0f
-                                                                   endingColor:NSColor colorWithDeviceRed:0.118f green:0.118f blue:0.118f alpha:1.0f;
-    }
-    return self;
-}
-
-- (void)drawRect:(NSRect)dirtyRect {
-
-    // Draw base layer
-    _tableHeaderCellBorderColor set;
-    NSRectFill(self bounds);
-
-    _tableHeaderCellNormalFill drawInRect:NSInsetRect(self bounds, 1, 1) angle:270;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCHUDTableView.h Deleted

@@ -1,50 +0,0 @@
-//
-//  VLCHUDTableView.h
-//  BGHUDAppKit
-//
-//  Created by BinaryGod on 6/17/08.
-//
-//  Copyright (c) 2008, Tim Davis (BinaryMethod.com, binary.god@gmail.com)
-//  All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification,
-//  are permitted provided that the following conditions are met:
-//
-//		Redistributions of source code must retain the above copyright notice, this
-//	list of conditions and the following disclaimer.
-//
-//		Redistributions in binary form must reproduce the above copyright notice,
-//	this list of conditions and the following disclaimer in the documentation and/or
-//	other materials provided with the distribution.
-//
-//		Neither the name of the BinaryMethod.com nor the names of its contributors
-//	may be used to endorse or promote products derived from this software without
-//	specific prior written permission.
-//
-//	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
-//	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-//	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-//	IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-//	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-//	OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-//	WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-//	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//	POSSIBILITY OF SUCH DAMAGE.
-
-#import <Cocoa/Cocoa.h>
-
-@interface VLCHUDTableView : NSTableView
-
-@property (strong) NSColor *tableBackgroundColor;
-@property (strong) NSArray *cellAlternatingRowColors;
-@property (strong) NSColor *cellHighlightColor;
-@property (strong) NSColor *cellEditingFillColor;
-@property (strong) NSColor *cellTextColor;
-@property (strong) NSColor *cellSelectedTextColor;
-@property (strong) NSColor *strokeColor;
-
-@property (strong) NSGradient *highlightGradient;
-@property (strong) NSGradient *normalGradient;
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCHUDTableView.m Deleted

@@ -1,106 +0,0 @@
-//
-//  VLCHUDTableView.m
-//  BGHUDAppKit
-//
-//  Created by BinaryGod on 6/17/08.
-//
-//  Copyright (c) 2008, Tim Davis (BinaryMethod.com, binary.god@gmail.com)
-//  All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification,
-//  are permitted provided that the following conditions are met:
-//
-//		Redistributions of source code must retain the above copyright notice, this
-//	list of conditions and the following disclaimer.
-//
-//		Redistributions in binary form must reproduce the above copyright notice,
-//	this list of conditions and the following disclaimer in the documentation and/or
-//	other materials provided with the distribution.
-//
-//		Neither the name of the BinaryMethod.com nor the names of its contributors
-//	may be used to endorse or promote products derived from this software without
-//	specific prior written permission.
-//
-//	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
-//	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-//	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-//	IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-//	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-//	OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-//	WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-//	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//	POSSIBILITY OF SUCH DAMAGE.
-
-#import "VLCHUDTableView.h"
-
-#import "views/VLCHUDTableCornerView.h"
-
-@interface NSTableView (private)
-- (void)_sendDelegateWillDisplayCell:(id)cell forColumn:(id)column row:(NSInteger)row;
-@end
-
-@implementation VLCHUDTableView
-
-#pragma mark Drawing Functions
-
-- (instancetype)initWithCoder:(NSCoder *)decoder
-{
-
-    self = super initWithCoder: decoder;
-
-    if (self) {
-        _tableBackgroundColor = NSColor colorWithCalibratedRed:0 green:0 blue:0 alpha:0;
-        _cellHighlightColor = NSColor colorWithDeviceRed:0.549f green:0.561f blue:0.588f alpha:1;
-        _cellEditingFillColor = NSColor colorWithDeviceRed:0.141f green:0.141f blue:0.141f alpha:0.5f;
-        _cellAlternatingRowColors = @NSColor colorWithCalibratedWhite:0.16f alpha:0.86f,
-                                      NSColor colorWithCalibratedWhite:0.15f alpha:0.8f;
-        _cellTextColor = NSColor whiteColor;
-        _cellSelectedTextColor = NSColor blackColor;
-        _strokeColor = NSColor colorWithDeviceRed:0.749f green:0.761f blue:0.788f alpha:1.0f;
-        _highlightGradient = NSGradient alloc initWithStartingColor:NSColor colorWithDeviceRed:0.451f green:0.451f blue:0.455f alpha:0.5f
-                                                           endingColor:NSColor colorWithDeviceRed:0.318f green:0.318f blue:0.318f alpha:0.5f;
-        _normalGradient = NSGradient alloc initWithStartingColor:NSColor colorWithDeviceRed:0.251f green:0.251f blue:0.255f alpha:0.5f
-                                                        endingColor:NSColor colorWithDeviceRed:0.118f green:0.118f blue:0.118f alpha:0.5f;
-
-
-        self setBackgroundColor:_tableBackgroundColor;
-        self setFocusRingType:NSFocusRingTypeNone;
-    }
-
-    return self;
-}
-
-- (id)_alternatingRowBackgroundColors {
-    return _cellAlternatingRowColors;
-}
-
-- (id)_highlightColorForCell:(id)cell {
-    return _cellHighlightColor;
-}
-
-- (void)_sendDelegateWillDisplayCell:(id)cell forColumn:(id)column row:(NSInteger)row {
-
-    super _sendDelegateWillDisplayCell:cell forColumn:column row:row;
-
-    self currentEditor setBackgroundColor:_cellEditingFillColor;
-    self currentEditor setTextColor:_cellTextColor;
-
-    if(self selectedRowIndexes containsIndex: row) {
-
-        if(cell respondsToSelector: @selector(setTextColor:)) {
-            cell setTextColor:_cellSelectedTextColor;
-        }
-    } else {
-
-        if (cell respondsToSelector:@selector(setTextColor:)) {
-            cell setTextColor:_cellTextColor;
-        }
-    }
-}
-
-- (void)awakeFromNib {
-    self setCornerView: VLCHUDTableCornerView alloc init;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCWrappableTextField.h Deleted

@@ -1,42 +0,0 @@
-/*****************************************************************************
- * VLCWrappableTextField.h
- *****************************************************************************
- * Copyright (C) 2017 VideoLAN and authors
- * Author:       David Fuhrmann <dfuhrmann at videolan dot org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-/**
- * Helper class for wrappable text multi line text fields on 10.7.
- *
- * Makes sure to try to wrap the text while calculating an intrinsic size for
- * the field.
- *
- * For this to work, make sure that:
- * - Field has a minimum width (best is to use >= constraint)
- * - Field has layout set to wrap
- * - Fields preferred with setting is explicit with constant 0 (auto or runtime
- *   width are not compatible with 10.7)
- * - If text can change, make sure to have vertical hugging priorities > 500 so
- *   that window height can shrink again if text gets smaller.
- *
- * TODO: Revisit that code one 10.7 is dropped.
- */
-@interface VLCWrappableTextField : NSTextField
-
-@end
\ No newline at end of file

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCWrappableTextField.m Deleted

@@ -1,49 +0,0 @@
-/*****************************************************************************
- * VLCWrappableTextField.m
- *****************************************************************************
- * Copyright (C) 2017 VideoLAN and authors
- * Author:       David Fuhrmann <dfuhrmann at videolan dot org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import "VLCWrappableTextField.h"
-
-
-@implementation VLCWrappableTextField
-
-- (NSSize)intrinsicContentSize
-{
-    if (!self.cell wraps) {
-        return super intrinsicContentSize;
-    }
-
-    // Try to get minimum height needed, by assuming unlimited height being
-    // (theoretically) possible.
-    NSRect frame = self frame;
-    frame.size.height = CGFLOAT_MAX;
-
-    CGFloat height = self.cell cellSizeForBounds:frame.height;
-
-    return NSMakeSize(frame.size.width, height);
-}
-
-- (void)textDidChange:(NSNotification *)notification
-{
-    super textDidChange:notification;
-    self invalidateIntrinsicContentSize;
-}
-
-@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/plugins/addons_manager.cpp Deleted

@@ -1,143 +0,0 @@
-/*****************************************************************************
- * addons_manager.cpp: Addons manager for Qt
- ****************************************************************************
- * Copyright (C) 2013 VideoLAN and authors
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#include "addons_manager.hpp"
-#include <QApplication>
-
-const QEvent::Type AddonManagerEvent::AddedEvent =
-        (QEvent::Type)QEvent::registerEventType();
-const QEvent::Type AddonManagerEvent::ChangedEvent =
-        (QEvent::Type)QEvent::registerEventType();
-const QEvent::Type AddonManagerEvent::DiscoveryEndedEvent =
-        (QEvent::Type)QEvent::registerEventType();
-
-AddonsManager::AddonsManager( qt_intf_t *p_intf )
-{
-    struct addons_manager_owner owner =
-    {
-        this,
-        addonFoundCallback,
-        addonsDiscoveryEndedCallback,
-        addonChangedCallback,
-    };
-
-    p_manager = addons_manager_New( VLC_OBJECT(p_intf), &owner );
-}
-
-AddonsManager::~AddonsManager()
-{
-    if ( p_manager )
-        addons_manager_Delete( p_manager );
-}
-
-void AddonsManager::findNewAddons()
-{
-    addons_manager_Gather( p_manager, "repo://" );
-}
-
-void AddonsManager::findDesignatedAddon( QString uri )
-{
-    addons_manager_Gather( p_manager, qtu(uri) );
-}
-
-void AddonsManager::findInstalled()
-{
-    addons_manager_LoadCatalog( p_manager );
-}
-
-void AddonsManager::install( QByteArray id )
-{
-    Q_ASSERT( id.size() == sizeof(addon_uuid_t) );
-    addon_uuid_t addonid;
-    memcpy( &addonid, id.constData(), sizeof(addon_uuid_t) );
-    addons_manager_Install( p_manager, addonid );
-}
-
-void AddonsManager::remove( QByteArray id )
-{
-    Q_ASSERT( id.size() == sizeof(addon_uuid_t) );
-    addon_uuid_t addonid;
-    memcpy( &addonid, id.constData(), sizeof(addon_uuid_t) );
-    addons_manager_Remove( p_manager, addonid );
-}
-
-QString AddonsManager::getAddonType( int i_type )
-{
-    switch ( i_type )
-    {
-    case ADDON_SKIN2:
-        return qtr( "Skins" );
-    case ADDON_PLAYLIST_PARSER:
-        return qtr("Playlist parsers");
-    case ADDON_SERVICE_DISCOVERY:
-        return qtr("Service Discovery");
-    case ADDON_INTERFACE:
-        return qtr("Interfaces");
-    case ADDON_META:
-        return qtr("Art and meta fetchers");
-    case ADDON_EXTENSION:
-        return qtr("Extensions");
-    default:
-        return qtr("Unknown");
-    }
-}
-
-void AddonsManager::addonFoundCallback( addons_manager_t *manager,
-                                        addon_entry_t *entry )
-{
-    AddonsManager *me = (AddonsManager *) manager->owner.sys;
-    QEvent *ev = new AddonManagerEvent( AddonManagerEvent::AddedEvent,
-                                        entry );
-    QApplication::postEvent( me, ev );
-}
-
-void AddonsManager::addonsDiscoveryEndedCallback( addons_manager_t *manager )
-{
-    AddonsManager *me = (AddonsManager *) manager->owner.sys;
-    QEvent *ev = new QEvent( AddonManagerEvent::DiscoveryEndedEvent );
-    QApplication::postEvent( me, ev );
-}
-
-void AddonsManager::addonChangedCallback( addons_manager_t *manager,
-                                          addon_entry_t *entry )
-{
-    AddonsManager *me = (AddonsManager *) manager->owner.sys;
-    QEvent *ev = new AddonManagerEvent( AddonManagerEvent::ChangedEvent,
-                                        entry );
-    QApplication::postEvent( me, ev );
-}
-
-void AddonsManager::customEvent( QEvent *event )
-{
-    if ( event->type() == AddonManagerEvent::AddedEvent )
-    {
-        AddonManagerEvent *ev = static_cast<AddonManagerEvent *>(event);
-        emit addonAdded( ev->entry() );
-    }
-    else if ( event->type() == AddonManagerEvent::ChangedEvent )
-    {
-        AddonManagerEvent *ev = static_cast<AddonManagerEvent *>(event);
-        emit addonChanged( ev->entry() );
-    }
-    else if ( event->type() == AddonManagerEvent::DiscoveryEndedEvent )
-    {
-        emit discoveryEnded();
-    }
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/plugins/addons_manager.hpp Deleted

@@ -1,90 +0,0 @@
-/*****************************************************************************
- * addons_manager.hpp: Addons manager for Qt
- ****************************************************************************
- * Copyright (C) 2013 VideoLAN and authors
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef ADDONS_MANAGER_HPP
-#define ADDONS_MANAGER_HPP
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "qt.hpp"
-#include "util/singleton.hpp"
-
-#include <vlc_addons.h>
-
-#include <QObject>
-#include <QEvent>
-
-
-class AddonManagerEvent : public QEvent
-{
-public:
-    static const QEvent::Type AddedEvent;
-    static const QEvent::Type ChangedEvent;
-    static const QEvent::Type DiscoveryEndedEvent;
-
-    AddonManagerEvent( QEvent::Type type, addon_entry_t *_p_entry )
-        : QEvent( type ), p_entry( _p_entry )
-    {
-        addon_entry_Hold( p_entry );
-    }
-    virtual ~AddonManagerEvent()
-    {
-        addon_entry_Release( p_entry );
-    }
-
-    addon_entry_t *entry() const { return p_entry; }
-
-private:
-    addon_entry_t *p_entry;
-};
-
-class AddonsManager : public QObject, public Singleton<AddonsManager>
-{
-    Q_OBJECT
-    friend class Singleton<AddonsManager>;
-
-public:
-    AddonsManager( qt_intf_t * );
-    virtual ~AddonsManager();
-    static void addonFoundCallback( addons_manager_t *, addon_entry_t * );
-    static void addonsDiscoveryEndedCallback( addons_manager_t * );
-    static void addonChangedCallback( addons_manager_t *, addon_entry_t * );
-    void customEvent( QEvent * );
-    void install( QByteArray id );
-    void remove( QByteArray id );
-    static QString getAddonType( int );
-
-signals:
-    void addonAdded( addon_entry_t * );
-    void addonChanged( const addon_entry_t * );
-    void discoveryEnded();
-
-public slots:
-    void findNewAddons();
-    void findDesignatedAddon( QString uri );
-    void findInstalled();
-
-private:
-    addons_manager_t* p_manager;
-};
-
-#endif // ADDONS_MANAGER_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/servicesdiscoverymodel.cpp Deleted

@@ -1,359 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2020 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#include "servicesdiscoverymodel.hpp"
-
-#include "util/locallistbasemodel.hpp"
-
-#include "medialibrary/mlhelper.hpp"
-
-#include "playlist/media.hpp"
-#include "playlist/playlist_controller.hpp"
-
-#include <memory>
-#include <QPixmap>
-
-#include <vlc_media_source.h>
-#include <vlc_addons.h>
-#include <vlc_cxx_helpers.hpp>
-#include <vlc_addons.h>
-
-namespace {
-
-using AddonPtr = vlc_shared_data_ptr_type(addon_entry_t,
-                                          addon_entry_Hold, addon_entry_Release);
-
-class SDItem {
-public:
-    SDItem( AddonPtr addon )
-    {
-        name = qfu( addon->psz_name );
-        summery = qfu( addon->psz_summary ).trimmed();
-        description = qfu( addon->psz_description ).trimmed();
-        author = qfu( addon->psz_author );
-        sourceUrl = QUrl( addon->psz_source_uri );
-        entry = addon;
-
-        if ( addon->psz_image_data ) {
-            char *cDir = config_GetUserDir( VLC_CACHE_DIR );
-            if (likely(cDir != nullptr))
-            {
-                QDir dir( cDir );
-                free(cDir);
-                dir.mkdir("art");
-                dir.cd("art");
-                dir.mkdir("qt-addon-covers");
-                dir.cd("qt-addon-covers");
-
-                QString id = addons_uuid_to_psz( &addon->uuid );
-                QString filename = QString("addon_thumbnail_%1.png").arg(id);
-                QString absoluteFilePath =  dir.absoluteFilePath(filename);
-
-                if ( !QFileInfo::exists( absoluteFilePath )) {
-                    QPixmap pixmap;
-                    pixmap.loadFromData( QByteArray::fromBase64( QByteArray( addon->psz_image_data ) ),
-                                        0,
-                                        Qt::AutoColor
-                                        );
-                    pixmap.save(absoluteFilePath);
-                }
-                artworkUrl = QUrl::fromLocalFile( absoluteFilePath );
-            }
-        }
-        else if ( addon->e_flags & ADDON_BROKEN )
-            artworkUrl = QUrl( ":/addons/addon_broken.svg" );
-        else
-            artworkUrl = QUrl( ":/addons/addon_default.svg" );
-    }
-
-public:
-    QString name;
-    QString summery;
-    QString description;
-    QString author;
-    QUrl sourceUrl;
-    QUrl artworkUrl;
-    AddonPtr entry;
-};
-
-} //namespace
-
-using SDItemPtr = std::shared_ptr<SDItem> ;
-using SDItemList = std::vector<SDItemPtr> ;
-
-// ListCache specialisation
-
-template<>
-bool ListCache<SDItemPtr>::compareItems(const SDItemPtr& a, const SDItemPtr& b)
-{
-    //just compare the pointers here
-    return a == b;
-}
-
-// ServicesDiscoveryModelPrivate
-
-class ServicesDiscoveryModelPrivate
-    : public LocalListBaseModelPrivate<SDItemPtr>
-{
-
-public:
-    Q_DECLARE_PUBLIC(ServicesDiscoveryModel)
-
-public: //ctor/dtor
-    ServicesDiscoveryModelPrivate(ServicesDiscoveryModel* pub)
-        : LocalListBaseModelPrivate<SDItemPtr>(pub)
-    {
-    }
-
-    ~ServicesDiscoveryModelPrivate()
-    {
-        if ( m_manager )
-            addons_manager_Delete( m_manager );
-    }
-
-public:
-    const SDItem* getItemForRow(int row) const
-    {
-        const SDItemPtr* ref = item(row);
-        if (ref)
-            return ref->get();
-        return nullptr;
-    }
-
-public: //BaseModelPrivateT implementation
-    bool initializeModel() override;
-
-    LocalListCacheLoader<SDItemPtr>::ItemCompare getSortFunction() const override
-    {
-        if (m_sortOrder == Qt::SortOrder::DescendingOrder)
-            return (const SDItemPtr& a, const SDItemPtr& b){
-                return QString::compare(a->name, b->name) > 0;
-            };
-        else
-            return (const SDItemPtr& a, const SDItemPtr& b) {
-                return QString::compare(a->name, b->name) < 0;
-            };
-    }
-
-
-
-public: //discovery callbacks
-    void addonFound( AddonPtr addon );
-    void addonChanged( AddonPtr addon );
-    void discoveryEnded();
-
-public: //LocalListCacheLoader implementation
-    //return the data matching the pattern
-    SDItemList getModelData(const QString& pattern) const override
-    {
-        if (pattern.isEmpty())
-            return m_items;
-
-        SDItemList items;
-        std::copy_if(
-            m_items.cbegin(), m_items.cend(),
-            std::back_inserter(items),
-            &pattern(const SDItemPtr& item) {
-                return item->name.contains(pattern, Qt::CaseInsensitive);
-            });
-        return items;
-    }
-
-public: // data
-    addons_manager_t* m_manager = nullptr;
-    SDItemList m_items;
-};
-
-ServicesDiscoveryModel::ServicesDiscoveryModel( QObject* parent )
-    : BaseModel( new ServicesDiscoveryModelPrivate(this), parent )
-{
-}
-
-QVariant ServicesDiscoveryModel::data( const QModelIndex& index, int role ) const
-{
-    Q_D(const ServicesDiscoveryModel);
-    if (!m_ctx)
-        return {};
-
-    const SDItem* item = d->getItemForRow(index.row());
-    if (!item)
-        return {};
-
-    switch ( role )
-    {
-        case Role::SERVICE_NAME:
-            return item->name;
-        case Role::SERVICE_AUTHOR:
-            return item->author;
-        case Role::SERVICE_SUMMARY:
-            return item->summery;
-        case Role::SERVICE_DESCRIPTION:
-            return item->description;
-        case Role::SERVICE_DOWNLOADS:
-            return QVariant::fromValue( item->entry->i_downloads );
-        case Role::SERVICE_SCORE:
-            return item->entry->i_score / 100;
-        case Role::SERVICE_STATE:
-            return item->entry->e_state;
-        case Role::SERVICE_ARTWORK:
-            return item->artworkUrl;
-        default:
-            return {};
-    }
-}
-
-QHash<int, QByteArray> ServicesDiscoveryModel::roleNames() const
-{
-    return {
-        { Role::SERVICE_NAME, "name" },
-        { Role::SERVICE_AUTHOR, "author"},
-        { Role::SERVICE_SUMMARY, "summary" },
-        { Role::SERVICE_DESCRIPTION, "description" },
-        { Role::SERVICE_DOWNLOADS, "downloads" },
-        { Role::SERVICE_SCORE, "score" },
-        { Role::SERVICE_STATE, "state" },
-        { Role::SERVICE_ARTWORK, "artwork" }
-    };
-}
-
-void ServicesDiscoveryModel::installService(int idx)
-{
-    Q_D(ServicesDiscoveryModel);
-
-    const SDItem* item = d->getItemForRow(idx);
-    if (!item)
-        return;
-
-    addon_uuid_t uuid;
-    memcpy( uuid, item->entry->uuid, sizeof( uuid ) );
-    addons_manager_Install( d->m_manager, uuid );
-}
-
-void ServicesDiscoveryModel::removeService(int idx)
-{
-    Q_D(ServicesDiscoveryModel);
-
-    const SDItem* item = d->getItemForRow(idx);
-    if (!item)
-        return;
-
-    addon_uuid_t uuid;
-    memcpy( uuid, item->entry->uuid, sizeof( uuid ) );
-    addons_manager_Remove( d->m_manager, uuid );
-}
-
-
-void ServicesDiscoveryModel::setCtx(MainCtx* ctx)
-{
-    Q_D(ServicesDiscoveryModel);
-
-    if (ctx == m_ctx)
-        return;
-
-    assert(ctx);
-    m_ctx = ctx;
-    d->initializeModel();
-    emit ctxChanged();
-}
-
-static void addonFoundCallback( addons_manager_t *manager, addon_entry_t *entry )
-{
-    if (entry->e_type != ADDON_SERVICE_DISCOVERY)
-        return;
-    ServicesDiscoveryModelPrivate* d = (ServicesDiscoveryModelPrivate*) manager->owner.sys;
-    QMetaObject::invokeMethod( d->q_func(), d, entryPtr = AddonPtr(entry)()
-        {
-            d->addonFound( std::move( entryPtr ) );
-        }, Qt::QueuedConnection);
-}
-
-static void addonsDiscoveryEndedCallback( addons_manager_t *manager )
-{
-    ServicesDiscoveryModelPrivate* d = (ServicesDiscoveryModelPrivate*) manager->owner.sys;
-    QMetaObject::invokeMethod( d->q_func(), d()
-        {
-            d->discoveryEnded();
-        }, Qt::QueuedConnection);
-}
-
-static void addonChangedCallback( addons_manager_t *manager, addon_entry_t *entry )
-{
-    if (entry->e_type != ADDON_SERVICE_DISCOVERY)
-        return;
-    ServicesDiscoveryModelPrivate* d = (ServicesDiscoveryModelPrivate*) manager->owner.sys;
-    QMetaObject::invokeMethod( d->q_func(), d, entryPtr = AddonPtr(entry)()
-        {
-            d->addonChanged( std::move( entryPtr ) );
-        }, Qt::QueuedConnection);
-}
-
-bool ServicesDiscoveryModelPrivate::initializeModel()
-{
-    Q_Q(ServicesDiscoveryModel);
-    if (m_qmlInitializing || !q->m_ctx)
-        return false;
-
-    if ( m_manager )
-        addons_manager_Delete( m_manager );
-
-    struct addons_manager_owner owner =
-    {
-        this,
-        addonFoundCallback,
-        addonsDiscoveryEndedCallback,
-        addonChangedCallback,
-    };
-
-    m_manager = addons_manager_New( VLC_OBJECT( q->m_ctx->getIntf() ), &owner );
-    assert( m_manager );
-
-    emit q->loadingChanged();
-    addons_manager_LoadCatalog( m_manager );
-    addons_manager_Gather( m_manager, "repo://" );
-    return true;
-}
-
-
-void ServicesDiscoveryModelPrivate::addonFound( AddonPtr addon )
-{
-    m_items.emplace_back(std::make_shared<SDItem>(addon));
-    m_revision++;
-    invalidateCache();
-}
-
-void ServicesDiscoveryModelPrivate::addonChanged( AddonPtr addon )
-{
-    for ( size_t r = 0; r < m_items.size(); ++r )
-    {
-        if ( memcmp( m_itemsr->entry->uuid, addon->uuid, sizeof( addon->uuid ) ) )
-            continue;
-
-        m_itemsr = std::make_shared<SDItem>(addon);
-        break;
-    }
-    m_revision++;
-    invalidateCache();
-}
-
-void ServicesDiscoveryModelPrivate::discoveryEnded()
-{
-    Q_Q(ServicesDiscoveryModel);
-    assert( m_loading );
-    m_loading = false;
-    emit q->loadingChanged();
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/servicesdiscoverymodel.hpp Deleted

@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2020 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef MLServicesDiscoveryModel_HPP
-#define MLServicesDiscoveryModel_HPP
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "util/base_model.hpp"
-#include "maininterface/mainctx.hpp"
-
-class ServicesDiscoveryModelPrivate;
-class ServicesDiscoveryModel : public BaseModel
-{
-    Q_OBJECT
-
-public:
-
-    Q_PROPERTY(MainCtx* ctx READ getCtx WRITE setCtx NOTIFY ctxChanged FINAL)
-
-    enum State // equivalent to addon_state_t
-    {
-        NOTINSTALLED = 0,
-        INSTALLING,
-        INSTALLED,
-        UNINSTALLING
-    };
-    Q_ENUM(State)
-
-    enum Role {
-        SERVICE_NAME = Qt::UserRole + 1,
-        SERVICE_AUTHOR,
-        SERVICE_SUMMARY,
-        SERVICE_DESCRIPTION,
-        SERVICE_DOWNLOADS,
-        SERVICE_SCORE,
-        SERVICE_STATE,
-        SERVICE_ARTWORK
-    };
-    Q_ENUM(Role)
-
-    explicit ServicesDiscoveryModel(QObject* parent = nullptr);
-
-public: //QAbstractListModel override
-    QVariant data(const QModelIndex& index, int role) const override;
-    QHash<int, QByteArray> roleNames() const override;
-
-public: //invokable functions
-    Q_INVOKABLE void installService(int idx);
-    Q_INVOKABLE void removeService(int idx);
-
-public: // properties
-    void setCtx(MainCtx* ctx);
-    inline MainCtx* getCtx() const { return m_ctx; }
-
-signals:
-    void ctxChanged();
-
-private:
-    MainCtx* m_ctx = nullptr;
-
-    Q_DECLARE_PRIVATE(ServicesDiscoveryModel);
-};
-
-#endif // MLServicesDiscoveryModel_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/PlayerBlurredBackground.qml Deleted

@@ -1,89 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2022 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * ( at your option ) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-
-import QtQuick
-
-import Qt5Compat.GraphicalEffects
-import VLC.Util
-
-Item {
-    id: rootItem
-
-    property alias source: blurSource.sourceItem
-    property alias screenColor: shaderItem.screenColor
-    property alias overlayColor: shaderItem.overlayColor
-
-    function scheduleUpdate() {
-        blurSource.scheduleUpdate()
-    }
-
-    onSourceChanged: blurSource.scheduleUpdate()
-
-    ShaderEffectSource {
-        id: blurSource
-
-        width: 512
-        height: 512
-        textureSize: Qt.size(512,512)
-
-        visible: false
-
-        live: false
-        hideSource: false
-        smooth: false
-        mipmap: false
-    }
-
-    FastBlur {
-        id: blur
-
-        source: blurSource
-
-        width: 512
-        height: 512
-
-        radius: 50
-        visible: false
-    }
-
-    ShaderEffectSource {
-        id: proxySource
-        live: true
-        hideSource: false
-        sourceItem: blur
-        smooth: false
-        visible: false
-        mipmap: false
-    }
-
-    ShaderEffect {
-        id: shaderItem
-
-        property var backgroundSource: proxySource
-        property color screenColor
-        property color overlayColor
-
-        anchors.fill: parent
-        visible: true
-        blending: false
-        cullMode: ShaderEffect.BackFaceCulling
-
-        fragmentShader: "qrc:///shaders/PlayerBlurredBackground.frag.qsb"
-    }
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/playlist/qml/PlaylistListView.qml Deleted

@@ -1,385 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * ( at your option ) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Templates as T
-import QtQuick.Layouts
-import QtQml.Models
-
-
-import VLC.MainInterface
-import VLC.Widgets as Widgets
-import VLC.Util
-import VLC.Playlist
-import VLC.Style
-
-T.Pane {
-    id: root
-
-    property var model: PlaylistListModel {
-        playlist: MainPlaylistController.playlist
-    }
-    readonly property ListSelectionModel selectionModel: listView?.selectionModel ?? null
-
-    property bool useAcrylic: true
-
-    readonly property real minimumWidth: contentItem.Layout.minimumWidth +
-                                         leftPadding +
-                                         rightPadding +
-                                         2 * (VLCStyle.margin_xsmall)
-
-    readonly property ListView listView: contentItem.listView
-
-    property alias contextMenu: contextMenu
-
-    property alias dragItem: dragItem
-
-    property alias isDropAcceptableFunc: listView.isDropAcceptableFunc
-    property alias acceptDropFunc: listView.acceptDropFunc
-
-    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
-
-    verticalPadding: VLCStyle.margin_normal
-
-    Accessible.name: qsTr("Playqueue")
-
-    readonly property ColorContext colorContext: ColorContext {
-        id: theme
-        colorSet: ColorContext.View
-
-        focused: root.activeFocus
-        hovered: root.hovered
-        enabled: root.enabled
-    }
-
-    Widgets.DragItem {
-        id: dragItem
-
-        onRequestData: (indexes, resolve, reject) => {
-            resolve(indexes.map((index) => {
-                const item = root.model.itemAt(index)
-                return {
-                    "title": item.title,
-                    "cover": (!!item.artwork && item.artwork.toString() !== "") ? item.artwork : VLCStyle.noArtAlbumCover,
-                    "url": item.url
-                }
-            }))
-        }
-
-        onRequestInputItems: (indexes, data, resolve, reject) => {
-            resolve(root.model.getItemsForIndexes(root.selectionModel.selectedIndexesFlat))
-        }
-    }
-
-    PlaylistContextMenu {
-        id: contextMenu
-        model: root.model
-        selectionModel: root.selectionModel
-        controler: MainPlaylistController
-        ctx: MainCtx
-
-        onJumpToCurrentPlaying: listView.positionViewAtIndex( MainPlaylistController.currentIndex, ItemView.Center)
-    }
-
-    background: Widgets.AcrylicBackground {
-        enabled: root.useAcrylic
-        tintColor: theme.bg.primary
-    }
-
-    contentItem: ColumnLayout {
-        spacing: VLCStyle.margin_xxsmall
-
-        Layout.minimumWidth: noContentInfoColumn.implicitWidth
-
-        readonly property ListView listView: listView
-
-        Column {
-            Layout.fillHeight: false
-            Layout.fillWidth: true
-            Layout.leftMargin: VLCStyle.margin_normal
-
-            spacing: VLCStyle.margin_xxxsmall
-
-            Widgets.SubtitleLabel {
-                text: qsTr("Playqueue")
-                color: theme.fg.primary
-                font.weight: Font.Bold
-                font.pixelSize: VLCStyle.dp(24, VLCStyle.scale)
-            }
-
-            Widgets.CaptionLabel {
-                color: theme.fg.secondary
-                visible: model.count !== 0
-                text: qsTr("%1 elements, %2").arg(model.count).arg(model.duration.formatLong())
-            }
-        }
-
-        Item {
-            // Spacer
-
-            implicitHeight: VLCStyle.margin_xsmall
-        }
-
-        RowLayout {
-            visible: model.count !== 0
-
-            Layout.fillHeight: false
-            Layout.leftMargin: VLCStyle.margin_normal
-            Layout.rightMargin: Math.max(listView.ScrollBar.vertical.width, VLCStyle.margin_normal)
-
-            spacing: VLCStyle.margin_large
-
-            Widgets.IconLabel {
-                // playlist cover column
-                Layout.preferredWidth: VLCStyle.icon_playlistArt
-
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                text: VLCIcons.album_cover
-                font.pixelSize: VLCStyle.icon_playlistHeader
-
-                color: theme.fg.secondary
-
-                Accessible.role: Accessible.ColumnHeader
-                Accessible.name: qsTr("Cover")
-                Accessible.ignored: false
-            }
-
-            //Use Text here as we're redefining its Accessible.role
-            Text {
-                Layout.fillWidth: true
-
-                elide: Text.ElideRight
-                font.pixelSize: VLCStyle.fontSize_normal
-                textFormat: Text.PlainText
-
-                verticalAlignment: Text.AlignVCenter
-                text: qsTr("Title")
-                color: theme.fg.secondary
-
-                Accessible.role: Accessible.ColumnHeader
-                Accessible.name: text
-            }
-
-            Widgets.IconLabel {
-                Layout.preferredWidth: durationMetric.width
-
-                text: VLCIcons.time
-                color: theme.fg.secondary
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                font.pixelSize: VLCStyle.icon_playlistHeader
-
-                Accessible.role: Accessible.ColumnHeader
-                Accessible.name: qsTr("Duration")
-                Accessible.ignored: false
-
-                TextMetrics {
-                    id: durationMetric
-
-                    font.weight: Font.DemiBold
-                    font.pixelSize: VLCStyle.fontSize_normal
-                    text: "00:00"
-                }
-            }
-        }
-
-        Widgets.ListViewExt {
-            id: listView
-
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-
-            focus: true
-
-            clip: true // else out of view items will overlap with surronding items
-
-            model: root.model
-
-            fadingEdge.backgroundColor: (root.background && (root.background.color.a >= 1.0)) ? root.background.color
-                                                                                             : "transparent"
-
-            isDropAcceptableFunc: function(drop, index) {
-                if (drop.source === dragItem)
-                    return Helpers.itemsMovable(selectionModel.sortedSelectedIndexesFlat, index)
-                else if (Helpers.isValidInstanceOf(drop.source, Widgets.DragItem))
-                    return true
-                else if (drop.hasUrls)
-                    return true
-                else
-                    return false
-            }
-
-            acceptDropFunc: function(index, drop) {
-                const item = drop.source;
-
-                // NOTE: Move implementation.
-                if (dragItem === item) {
-                    model.moveItemsPre(root.selectionModel.sortedSelectedIndexesFlat, index);
-                    listView.forceActiveFocus();
-                // NOTE: Dropping medialibrary content into the queue.
-                } else if (Helpers.isValidInstanceOf(item, Widgets.DragItem)) {
-                    return item.getSelectedInputItem().then((inputItems) => {
-                            if (!Helpers.isArray(inputItems) || inputItems.length === 0) {
-                                console.warn("can't convert items to input items");
-                                return
-                            }
-                            MainPlaylistController.insert(index, inputItems, false)
-                        }).then(() => { listView.forceActiveFocus(); })
-                // NOTE: Dropping an external item (i.e. filesystem) into the queue.
-                } else if (drop.hasUrls) {
-                    const urlList = ;
-
-                    for (let url in drop.urls)
-                        urlList.push(drop.urlsurl);
-
-                    MainPlaylistController.insert(index, urlList, false);
-
-                    // NOTE This is required otherwise backend may handle the drop as well yielding double addition.
-                    drop.accept(Qt.IgnoreAction);
-                    listView.forceActiveFocus();
-                }
-
-                return Promise.resolve()
-            }
-
-            property int shiftIndex: -1
-
-            onShowContextMenu: (globalPos) => {
-                contextMenu.popup(-1, globalPos)
-            }
-
-            Connections {
-                target: listView.model
-
-                function onRowsInserted() {
-                    if (listView.currentIndex === -1)
-                        listView.currentIndex = 0
-                }
-
-                function onModelReset() {
-                    if (listView.currentIndex === -1 && root.model.count > 0)
-                        listView.currentIndex = 0
-                }
-            }
-
-            delegate: PlaylistDelegate {
-                id: delegate
-
-                width: listView.contentWidth
-                rightPadding: Math.max(listView.ScrollBar.vertical.width, VLCStyle.margin_normal)
-
-                contextMenu: root.contextMenu
-
-                dragItem: root.dragItem
-
-                isDropAcceptable: listView.isDropAcceptableFunc
-                acceptDrop: listView.acceptDropFunc
-
-                onContainsDragChanged: listView.updateItemContainsDrag(this, containsDrag)
-            }
-
-            Keys.onDeletePressed: model.removeItems(selectionModel.selectedIndexesFlat)
-
-            Navigation.parentItem: root
-
-            onActionAtIndex: (index) => {
-                if (index < 0)
-                    return
-
-                MainPlaylistController.goTo(index, true)
-            }
-
-            Column {
-                id: noContentInfoColumn
-
-                anchors.centerIn: parent
-
-                visible: false
-                enabled: visible
-
-                opacity: (listView.activeFocus) ? 1.0 : 0.4
-
-                Binding on visible {
-                    delayed: true
-                    value: (listView.model.count === 0 && !listView.footerItem.firstItemIndicatorVisible)
-                }
-
-                Widgets.IconLabel {
-                    id: label
-
-                    anchors.horizontalCenter: parent.horizontalCenter
-
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-
-                    text: VLCIcons.playlist
-
-                    color: theme.fg.primary
-
-                    font.pixelSize: VLCStyle.dp(48, VLCStyle.scale)
-                }
-
-                T.Label {
-                    anchors.topMargin: VLCStyle.margin_xlarge
-
-                    anchors.horizontalCenter: parent.horizontalCenter
-
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-
-                    text: qsTr("No content yet")
-
-                    color: label.color
-
-                    font.pixelSize: VLCStyle.fontSize_xxlarge
-                }
-
-                T.Label {
-                    anchors.topMargin: VLCStyle.margin_normal
-
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-
-                    text: qsTr("Drag & Drop some content here!")
-
-                    color: label.color
-
-                    font.pixelSize: VLCStyle.fontSize_large
-                }
-            }
-        }
-
-        PlaylistToolbar {
-            id: toolbar
-
-            Layout.preferredHeight: VLCStyle.heightBar_normal
-            Layout.fillHeight: false
-            Layout.fillWidth: true
-            Layout.leftMargin: VLCStyle.margin_normal
-            Layout.rightMargin: VLCStyle.margin_normal
-        }
-    }
-
-    Keys.priority: Keys.AfterItem
-    Keys.forwardTo: listView
-    Keys.onPressed: (event) => root.Navigation.defaultKeyAction(event)
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/private-core.pro Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/private-gui.pro Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/private-quick.pro Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/shaders/FrostedGlass.frag Deleted

@@ -1,52 +0,0 @@
-#version 440
-
-/*****************************************************************************
- * Copyright (C) 2024 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * ( at your option ) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-layout(std140, binding = 0) uniform buf {
-  mat4 qt_Matrix;
-  float qt_Opacity;
-  vec4 tint;
-  float exclusionStrength;
-  float noiseStrength;
-  float tintStrength;
-};
-layout(binding = 1) uniform sampler2D source;
-
-float rand(vec2 co){
-    return fract(sin(dot(co.xy, vec2(12.9898, 78.233))) * 43758.5453);
-}
-
-vec4 exclude(vec4 src, vec4 dst)
-{
-    return src + dst - 2.0 * src * dst;
-}
-
-void main() {
-   float r = rand(qt_TexCoord0) - 0.5;
-   vec4 noise = vec4(r,r,r,1.0) * noiseStrength;
-   vec4 blurred  = texture(source, qt_TexCoord0);
-
-   vec4 exclColor = vec4(exclusionStrength, exclusionStrength, exclusionStrength, 0.0);
-
-   blurred = exclude(blurred, exclColor);
-
-   fragColor = (mix(blurred, tint, tintStrength) + noise) * qt_Opacity;
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/native/roundimage.cpp Deleted

@@ -1,685 +0,0 @@
-/*****************************************************************************
- * roundimage.cpp: Custom widgets
- ****************************************************************************
- * Copyright (C) 2021 the VideoLAN team
- *
- * Authors: Prince Gupta <guptaprince8832@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_access.h>
-#include <vlc_stream.h>
-
-#include "qt.hpp"
-
-#include "roundimage.hpp"
-#include "roundimage_p.hpp"
-#include "util/asynctask.hpp"
-#include "util/qsgroundedrectangularimagenode.hpp"
-#include "util/vlcaccess_image_provider.hpp"
-
-#include <qhashfunctions.h>
-
-#include <QBuffer>
-#include <QFile>
-#include <QImage>
-#include <QImageReader>
-#include <QPainter>
-#include <QPainterPath>
-#include <QQuickWindow>
-#include <QGuiApplication>
-#include <QSGImageNode>
-#include <QIODevice>
-#include <QtQml>
-#include <QQmlFile>
-
-
-bool operator ==(const ImageCacheKey &lhs, const ImageCacheKey &rhs)
-{
-    return lhs.radius == rhs.radius && lhs.size == rhs.size && lhs.url == rhs.url;
-}
-
-uint qHash(const ImageCacheKey &key, uint seed)
-{
-    QtPrivate::QHashCombine hash;
-    seed = hash(seed, key.url);
-    seed = hash(seed, key.size.width());
-    seed = hash(seed, key.size.height());
-    seed = hash(seed, key.radius);
-    return seed;
-}
-
-namespace
-{
-    QImage prepareImage(const QSize &targetSize, const qreal radius, const QImage sourceImage)
-    {
-        if (qFuzzyIsNull(radius))
-        {
-            return sourceImage.scaled(targetSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-        }
-
-        QImage target(targetSize, QImage::Format_ARGB32_Premultiplied);
-        if (target.isNull())
-            return target;
-
-        target.fill(Qt::transparent);
-
-        {
-            QPainter painter(&target);
-            painter.setRenderHint(QPainter::Antialiasing, true);
-            painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
-
-            QPainterPath path;
-            path.addRoundedRect(0, 0, targetSize.width(), targetSize.height(), radius, radius);
-            painter.setClipPath(path);
-
-            // do PreserveAspectCrop
-            const auto imageSize = sourceImage.size();
-            const QPointF alignedCenteredTopLeft {(targetSize.width() - imageSize.width()) / 2.
-                                                 , (targetSize.height() - imageSize.height()) / 2.};
-            painter.drawImage(QRectF {alignedCenteredTopLeft, imageSize}, sourceImage);
-        }
-
-        return target;
-    }
-
-    // adapts a given QQuickImageResponse to produce a image with radius
-    class ImageResponseRadiusAdaptor : public QQuickImageResponse
-    {
-    public:
-        ImageResponseRadiusAdaptor(QQuickImageResponse *response, const qreal radius) : response {response}, radius {radius}
-        {
-            response->setParent(this);
-            connect(response, &QQuickImageResponse::finished
-                    , this, &ImageResponseRadiusAdaptor::handleResponseFinished);
-        }
-
-        QString errorString() const override
-        {
-            if (result.isNull() && errStr.isEmpty())
-                return QStringLiteral("Unspecified error.");
-            return errStr;
-        }
-
-        QQuickTextureFactory *textureFactory() const override
-        {
-            return !result.isNull() ? QQuickTextureFactory::textureFactoryForImage(result) : nullptr;
-        }
-
-    private:
-        class RoundImageGenerator : public AsyncTask<QImage>
-        {
-        public:
-            RoundImageGenerator(const QImage &img, const qreal radius) : sourceImg {img}, radius{radius}
-            {
-            }
-
-            QImage execute() override
-            {
-                return prepareImage(sourceImg.size(), radius, sourceImg);
-            }
-
-        private:
-            QImage sourceImg;
-            qreal radius;
-        };
-
-        void handleResponseFinished()
-        {
-            errStr = response->errorString();
-            auto textureFactory = std::unique_ptr<QQuickTextureFactory>(response->textureFactory());
-            auto img = !textureFactory ? QImage {} : textureFactory->image();
-            if (!textureFactory || img.isNull())
-            {
-                // source response failed, signal to parent
-                emit finished();
-                return;
-            }
-
-            response->disconnect(this);
-            response->deleteLater();
-            response = nullptr;
-
-            generator.reset(new RoundImageGenerator(img, radius));
-            connect(generator.get(), &RoundImageGenerator::result
-                    , this, &ImageResponseRadiusAdaptor::handleGeneratorFinished);
-
-            generator->start(*QThreadPool::globalInstance());
-        }
-
-        void handleGeneratorFinished()
-        {
-            result = generator->takeResult();
-
-            emit finished();
-        }
-
-        QQuickImageResponse *response;
-        QString errStr;
-        qreal radius;
-        QImage result;
-        TaskHandle<RoundImageGenerator> generator;
-    };
-
-// global RoundImage cache
-RoundImageCache g_imageCache = {};
-
-}
-
-// RoundImageCache
-
-RoundImageCache::RoundImageCache()
-    : m_imageCache(32 * 1024 * 1024) // 32 MiB
-{}
-
-std::shared_ptr<RoundImageRequest> RoundImageCache::requestImage(const ImageCacheKey& key, qreal dpr, QQmlEngine *engine)
-{
-    //do we already have a pending request?
-    auto it = m_pendingRequests.find(key);
-    if (it != m_pendingRequests.end())
-    {
-        std::shared_ptr<RoundImageRequest> request = it->second.lock();
-        if (request)
-            return request;
-    }
-    auto request = std::make_shared<RoundImageRequest>(key, dpr, engine);
-    if (request->getStatus() == RoundImage::Status::Error)
-        return {};
-    m_pendingRequestskey = request;
-    return request;
-}
-
-void RoundImageCache::removeRequest(const ImageCacheKey& key)
-{
-    m_pendingRequests.erase(key);
-}
-
-// RoundImageRequest
-
-RoundImageRequest::RoundImageRequest(const ImageCacheKey& key, qreal dpr, QQmlEngine *engine)
-    : m_key(key)
-    , m_dpr(dpr)
-{
-    m_imageResponse = getAsyncImageResponse(key.url, key.size, key.radius, engine);
-    if (m_imageResponse)
-        connect(m_imageResponse, &QQuickImageResponse::finished, this, &RoundImageRequest::handleImageResponseFinished);
-    else
-        m_status = RoundImage::Error;
-}
-
-RoundImageRequest::~RoundImageRequest()
-{
-    if (m_imageResponse)
-    {
-        if (m_cancelOnDelete)
-        {
-            disconnect(m_imageResponse, &QQuickImageResponse::finished, this, &RoundImageRequest::handleImageResponseFinished);
-            connect(m_imageResponse, &QQuickImageResponse::finished, m_imageResponse, &QObject::deleteLater);
-            m_imageResponse->cancel();
-        }
-        else
-        {
-            m_imageResponse->deleteLater();
-        }
-    }
-    g_imageCache.removeRequest(m_key);
-}
-
-void RoundImageRequest::saveInCache()
-{
-    m_saveInCache = true;
-}
-
-void RoundImageRequest::handleImageResponseFinished()
-{
-    m_cancelOnDelete = false;
-    g_imageCache.removeRequest(m_key);
-
-    const QString error = m_imageResponse->errorString();
-    QImage image;
-
-    if (auto textureFactory = m_imageResponse->textureFactory())
-    {
-        image = textureFactory->image();
-        delete textureFactory;
-    }
-
-    if (image.isNull())
-    {
-        qDebug() << "failed to get image, error" << error << m_key.url;
-        m_status = RoundImage::Status::Error;
-        emit requestCompleted(m_status, {});
-        return;
-    }
-
-    image.setDevicePixelRatio(m_dpr);
-
-    if (m_saveInCache)
-        g_imageCache.insert(m_key, new QImage(image), image.sizeInBytes());
-    emit requestCompleted(RoundImage::Status::Ready, image);
-}
-
-
-QQuickImageResponse* RoundImageRequest::getAsyncImageResponse(const QUrl &url, const QSize &requestedSize, const qreal radius, QQmlEngine *engine)
-{
-    if (url.scheme() == QStringLiteral("image") && url.host() != "vlcaccess")
-    {
-        auto provider = engine->imageProvider(url.host());
-        if (!provider)
-            return nullptr;
-
-        assert(provider->imageType() == QQmlImageProviderBase::ImageResponse);
-
-        const auto imageId = url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority).mid(1);
-
-        if (provider->imageType() == QQmlImageProviderBase::ImageResponse)
-        {
-            auto rawImageResponse = static_cast<QQuickAsyncImageProvider *>(provider)->requestImageResponse(imageId, requestedSize);
-            return new ImageResponseRadiusAdaptor(rawImageResponse, radius);
-        }
-
-        return nullptr;
-    }
-
-    VLCAccessImageProvider vlcAccessImageProvider(radius(QImage& img, const QSize &requestedSize) -> QImage {
-        return prepareImage(requestedSize, radius, img);
-    });
-    QString wrappedUri = VLCAccessImageProvider::wrapUri(url.toString(QUrl::FullyEncoded));
-
-    return vlcAccessImageProvider.requestImageResponse(wrappedUri, requestedSize);
-}
-
-// RoundImage
-
-RoundImage::RoundImage(QQuickItem *parent) : QQuickItem {parent}
-{
-    if (Q_LIKELY(qGuiApp))
-        setDPR(qGuiApp->devicePixelRatio());
-
-    connect(this, &QQuickItem::windowChanged, this, this(const QQuickWindow* const window) {
-        if (window)
-            setDPR(window->effectiveDevicePixelRatio());
-        else if (Q_LIKELY(qGuiApp))
-            setDPR(qGuiApp->devicePixelRatio());
-    });
-
-    connect(this, &QQuickItem::windowChanged, this, &RoundImage::adjustQSGCustomGeometry);
-}
-
-RoundImage::~RoundImage()
-{
-}
-
-QSGNode *RoundImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
-{
-    auto customImageNode = dynamic_cast<QSGRoundedRectangularImageNode*>(oldNode);
-    auto imageNode = dynamic_cast<QSGImageNode*>(oldNode);
-
-    if (Q_UNLIKELY(oldNode && ((m_QSGCustomGeometry && !customImageNode)
-                               || (!m_QSGCustomGeometry && !imageNode))))
-    {
-        // This must be extremely unlikely.
-        // Assigned to different window with different renderer?
-        delete oldNode;
-        oldNode = nullptr;
-    }
-
-    if (m_roundImage.isNull())
-    {
-        delete oldNode;
-        m_dirty = false;
-        return nullptr;
-    }
-
-    if (!oldNode)
-    {
-        if (m_QSGCustomGeometry)
-        {
-            customImageNode = new QSGRoundedRectangularImageNode;
-        }
-        else
-        {
-            assert(window());
-            imageNode = window()->createImageNode();
-            assert(imageNode);
-            imageNode->setOwnsTexture(true);
-        }
-    }
-
-    if (m_dirty)
-    {
-        m_dirty = false;
-        assert(window());
-
-        QQuickWindow::CreateTextureOptions flags = QQuickWindow::TextureCanUseAtlas;
-
-        if (!m_roundImage.hasAlphaChannel())
-            flags |= QQuickWindow::TextureIsOpaque;
-
-        if (std::unique_ptr<QSGTexture> texture { window()->createTextureFromImage(m_roundImage, flags) })
-        {
-            if (m_QSGCustomGeometry)
-            {
-                customImageNode->setTexture(std::move(texture));
-            }
-            else
-            {
-                // No need to delete the old texture manually as it is owned by the node.
-                imageNode->setTexture(texture.release());
-            }
-        }
-        else
-        {
-            qmlWarning(this) << "Could not generate texture from " << m_roundImage;
-        }
-    }
-
-    // Geometry:
-    if (m_QSGCustomGeometry)
-    {
-        customImageNode->setShape({boundingRect(), radius()});
-        customImageNode->setSmooth(smooth());
-        assert(customImageNode->geometry() && customImageNode->material());
-        return customImageNode;
-    }
-    else
-    {
-        imageNode->setRect(boundingRect());
-        imageNode->setFiltering(smooth() ? QSGTexture::Linear : QSGTexture::Nearest);
-        return imageNode;
-    }
-}
-
-void RoundImage::componentComplete()
-{
-    QQuickItem::componentComplete();
-
-    if (!m_source.isEmpty())
-        regenerateRoundImage();
-}
-
-QUrl RoundImage::source() const
-{
-    return m_source;
-}
-
-QSize RoundImage::sourceSize() const
-{
-    return m_sourceSize;
-}
-
-qreal RoundImage::radius() const
-{
-    return m_radius;
-}
-
-RoundImage::Status RoundImage::status() const
-{
-    return m_status;
-}
-
-bool RoundImage::cache() const
-{
-    return m_cache;
-}
-
-void RoundImage::setSource(const QUrl& source)
-{
-    if (m_source == source)
-        return;
-
-    m_source = source;
-    emit sourceChanged(m_source);
-    regenerateRoundImage();
-}
-
-void RoundImage::setSourceSize(const QSize& size)
-{
-    if (m_sourceSize == size)
-        return;
-
-    m_sourceSize = size;
-    emit sourceSizeChanged(size);
-    regenerateRoundImage();
-}
-
-void RoundImage::setRadius(qreal radius)
-{
-    if (m_radius == radius)
-        return;
-
-    m_radius = radius;
-    emit radiusChanged(m_radius);
-}
-
-void RoundImage::setCache(bool cache)
-{
-    if (m_cache == cache)
-        return;
-    m_cache = cache;
-    emit cacheChanged();
-}
-
-void RoundImage::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value)
-{
-    if (change == QQuickItem::ItemDevicePixelRatioHasChanged)
-        setDPR(value.realValue);
-
-    QQuickItem::itemChange(change, value);
-}
-
-void RoundImage::setDPR(const qreal value)
-{
-    if (m_dpr == value)
-        return;
-
-    m_dpr = value;
-    regenerateRoundImage();
-}
-
-void RoundImage::load()
-{
-    // NOTE: at this point we still have old content displayed
-
-    m_enqueuedGeneration = false;
-
-    if (m_source.isEmpty())
-    {
-        // nothing to load, clear old content
-        setStatus(Status::Null);
-        setRoundImage({});
-
-        return;
-    }
-
-    auto engine = qmlEngine(this);
-    if (!engine || !m_sourceSize.isValid() || m_sourceSize.isEmpty())
-    {
-        onRequestCompleted(Status::Error, {});
-        return;
-    }
-
-    const qreal scaledWidth = m_sourceSize.width() * m_dpr;
-    const qreal scaledHeight = m_sourceSize.height() * m_dpr;
-    const qreal scaledRadius = m_QSGCustomGeometry ? 0.0 : (this->radius() * m_dpr);
-
-    const ImageCacheKey key {source(), QSizeF {scaledWidth, scaledHeight}.toSize(), scaledRadius};
-
-    if (auto image = g_imageCache.object(key)) // should only by called in mainthread
-    {
-        onRequestCompleted(Status::Ready, *image);
-        return;
-    }
-
-    m_activeImageResponse = g_imageCache.requestImage(key, m_dpr, engine);
-    if (!m_activeImageResponse)
-    {
-        onRequestCompleted(RoundImage::Error, {});
-        return;
-    }
-
-    if (m_cache)
-        m_activeImageResponse->saveInCache();
-
-    connect(m_activeImageResponse.get(), &RoundImageRequest::requestCompleted, this, &RoundImage::onRequestCompleted);
-
-    //at this point m_activeImageResponse is either in Loading or Error status
-    onRequestCompleted(RoundImage::Loading, {});
-}
-
-void RoundImage::onRequestCompleted(Status status, const QImage& image)
-{
-    setRoundImage(image);
-    switch (status)
-    {
-    case RoundImage::Error:
-        setStatus(Status::Error);
-        m_activeImageResponse.reset();
-        break;
-    case RoundImage::Ready:
-    {
-        if (image.isNull())
-            setStatus(Status::Error);
-        else
-            setStatus(Status::Ready);
-        m_activeImageResponse.reset();
-        break;
-    }
-    case RoundImage::Loading:
-        setStatus(Status::Loading);
-        break;
-    case RoundImage::Null:
-        //requests should not be yield this state
-        vlc_assert_unreachable();
-    }
-}
-
-void RoundImage::setRoundImage(QImage image)
-{
-    if (m_roundImage.isNull() && image.isNull())
-        return;
-
-    m_dirty = true;
-    m_roundImage = image;
-
-    // remove old contents, setting ItemHasContent to false will
-    // inhibit updatePaintNode() call and old content will remain
-    if (image.isNull())
-        update();
-
-    setFlag(ItemHasContents, !image.isNull());
-    update();
-}
-
-void RoundImage::setStatus(const RoundImage::Status status)
-{
-    if (status == m_status)
-        return;
-
-    m_status = status;
-    emit statusChanged();
-}
-
-void RoundImage::regenerateRoundImage()
-{
-    if (!isComponentComplete() || m_enqueuedGeneration)
-        return;
-
-    m_activeImageResponse.reset();
-
-    // use Qt::QueuedConnection to delay generation, so that dependent properties
-    // subsequent updates can be merged, f.e when VLCStyle.scale changes
-    m_enqueuedGeneration = true;
-
-    QMetaObject::invokeMethod(this, &RoundImage::load, Qt::QueuedConnection);
-}
-
-void RoundImage::adjustQSGCustomGeometry(const QQuickWindow* const window)
-{
-    if (!window) return;
-
-    // No need to check if the scene graph is initialized according to docs.
-
-    const auto enableCustomGeometry = this, window() {
-        if (m_QSGCustomGeometry)
-            return;
-
-        // Favor custom geometry instead of clipping the image.
-        // This allows making the texture opaque, as long as
-        // source image is also opaque, for optimization
-        // purposes.
-        if (window->format().samples() >= 2)
-            m_QSGCustomGeometry = true;
-        // No need to regenerate as transparent part will not
-        // matter. However, in order for the material to not
-        // require blending, a regeneration is necessary.
-        // We could force the material to not require blending
-        // for the outer transparent part which is not within the
-        // geometry, but then inherently transparent images would
-        // not be rendered correctly due to the alpha channel.
-
-        QMetaObject::invokeMethod(this,
-                                  &RoundImage::regenerateRoundImage,
-                                  Qt::QueuedConnection);
-
-        // It might be tempting to not regenerate the image on size
-        // change. However;
-        // If upscaled, we don't know if the image can be provided
-        // in a higher resolution.
-        // If downscaled, we would like to free some used memory.
-        // On the other hand, there is no need to regenerate the
-        // image when the radius changes. This behavior does not
-        // mean that the radius can be animated. Although possible,
-        // the custom geometry node is not designed to handle animations.
-        disconnect(this, &RoundImage::radiusChanged, this, &RoundImage::regenerateRoundImage);
-        connect(this, &RoundImage::radiusChanged, this, &QQuickItem::update);
-    };
-
-    const auto disableCustomGeometry = this() {
-        if (!m_QSGCustomGeometry)
-            return;
-
-        m_QSGCustomGeometry = false;
-
-        QMetaObject::invokeMethod(this,
-                                  &RoundImage::regenerateRoundImage,
-                                  Qt::QueuedConnection);
-
-        connect(this, &RoundImage::radiusChanged, this, &RoundImage::regenerateRoundImage);
-        disconnect(this, &RoundImage::radiusChanged, this, &QQuickItem::update);
-    };
-
-
-    if (window->rendererInterface()->graphicsApi() == QSGRendererInterface::GraphicsApi::OpenGL)
-    {
-        // Direct OpenGL, enable custom geometry:
-        enableCustomGeometry();
-    }
-    else
-    {
-        // QSG(Opaque)TextureMaterial supports Qt RHI,
-        // so there is no obstacle using custom geometry
-        // if Qt RHI is in use.
-        if (QSGRendererInterface::isApiRhiBased(window->rendererInterface()->graphicsApi()))
-            enableCustomGeometry();
-        else
-            disableCustomGeometry();
-    }
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/native/roundimage.hpp Deleted

@@ -1,116 +0,0 @@
-/*****************************************************************************
- * roundimage.hpp: Custom widgets
- ****************************************************************************
- * Copyright (C) 2021 the VideoLAN team
- *
- * Authors: Prince Gupta <guptaprince8832@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef VLC_QT_ROUNDIMAGE_HPP
-#define VLC_QT_ROUNDIMAGE_HPP
-
-#include <QImage>
-#include <QQuickItem>
-#include <QUrl>
-#include <memory>
-
-class QQuickImageResponse;
-class RoundImageRequest;
-
-class RoundImage : public QQuickItem
-{
-    Q_OBJECT
-
-    // url of the image
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged FINAL)
-
-    Q_PROPERTY(QSize sourceSize READ sourceSize WRITE setSourceSize NOTIFY sourceSizeChanged FINAL)
-
-    Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged FINAL)
-
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged FINAL)
-
-    Q_PROPERTY(bool cache READ cache WRITE setCache NOTIFY cacheChanged FINAL)
-
-public:
-    enum Status
-    {
-        Null,
-        Ready,
-        Loading,
-        Error
-    };
-
-    Q_ENUM(Status)
-
-    RoundImage(QQuickItem *parent = nullptr);
-    ~RoundImage();
-
-    void componentComplete() override;
-
-    QUrl source() const;
-    qreal radius() const;
-    Status status() const;
-    bool cache() const;
-    QSize sourceSize() const;
-
-public slots:
-    void setSource(const QUrl& source);
-    void setRadius(qreal radius);
-    void setCache(bool cache);
-    void setSourceSize(const QSize&);
-
-signals:
-    void sourceChanged(const QUrl&);
-    void radiusChanged(qreal);
-    void statusChanged();
-    void cacheChanged();;
-    void sourceSizeChanged(const QSize&);
-
-protected:
-    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value) override;
-    QSGNode* updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *) override;
-
-private:
-    void setDPR(qreal value);
-    void handleImageResponseFinished();
-    void load();
-    void setRoundImage(QImage image);
-    void setStatus(const Status status);
-    void regenerateRoundImage();
-
-private slots:
-    void adjustQSGCustomGeometry(const QQuickWindow* const window);
-    void onRequestCompleted(Status status, const QImage& image);
-
-private:
-    Status m_status = Status::Null;
-    bool m_QSGCustomGeometry = false;
-    bool m_dirty = false;
-    bool m_enqueuedGeneration = false;
-
-    QUrl m_source;
-    QSize m_sourceSize;
-    qreal m_radius = 0.0;
-    qreal m_dpr = 1.0; // device pixel ratio
-    bool m_cache = true;
-
-    QImage m_roundImage;
-    std::shared_ptr<RoundImageRequest> m_activeImageResponse;
-};
-
-#endif

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/native/roundimage_p.hpp Deleted

@@ -1,164 +0,0 @@
-/*****************************************************************************
- * roundimage.cpp: Custom widgets
- ****************************************************************************
- * Copyright (C) 2023 the VideoLAN team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef VLC_ROUNDIMAGE_P_HPP
-#define VLC_ROUNDIMAGE_P_HPP
-
-#include <QObject>
-#include <QUrl>
-#include <QCache>
-#include <QQuickImageProvider>
-
-#include <unordered_map>
-#include <memory>
-
-#include "roundimage.hpp"
-
-struct ImageCacheKey
-{
-    ImageCacheKey(QUrl url, QSize size, qreal radius)
-        : url(url)
-        , size(size)
-        , radius(radius)
-    {}
-
-    QUrl url;
-    QSize size;
-    qreal radius;
-};
-
-bool operator ==(const ImageCacheKey &lhs, const ImageCacheKey &rhs);
-uint qHash(const ImageCacheKey &key, uint seed);
-
-//std hash version is required for unordered_map
-template<>
-struct std::hash<ImageCacheKey>
-{
-    std::size_t operator()(const ImageCacheKey& s) const noexcept
-    {
-        return qHash(s, 0); // or use boost::hash_combine
-    }
-};
-
-
-/**
- * @brief The RoundImageRequest class represent a request for a RoundImage generation
- * it will be shared amongst the diffent RoundImage instance that preforms the same request
- * simultaneously, and will notify upon completion or failure through the requestCompleted signal
- */
-class RoundImageRequest : public QObject
-{
-    Q_OBJECT
-public:
-    RoundImageRequest(const ImageCacheKey& key, qreal dpr, QQmlEngine *engine);
-
-    ~RoundImageRequest();
-
-    inline RoundImage::Status getStatus() const
-    {
-        return m_status;
-    }
-
-    void handleImageResponseFinished();
-
-    void saveInCache();
-
-signals:
-    void requestCompleted(RoundImage::Status status, QImage image);
-
-private:
-    QQuickImageResponse *getAsyncImageResponse(const QUrl &url, const QSize &requestedSize, const qreal radius, QQmlEngine *engine);
-
-    bool m_cancelOnDelete = true;
-    const ImageCacheKey m_key;
-    qreal m_dpr;
-    QQuickImageResponse* m_imageResponse = nullptr;
-    RoundImage::Status m_status = RoundImage::Status::Loading;
-    bool m_saveInCache = false;
-};
-
-/**
- * @brief The RoundImageCache class contains the cache of generated round images
- *
- * principle is the folowing:
- *
- * @startuml
- * (*) --> if image already in cache then
- *   --> true "use image from the cache"
- *   --> "set image in Ready state"
- *   --> (*)
- * else
- *   --> false "set image Loading state"
- *   --> if pending requests already exists for the source
- *       --> true reference pending request
- *       --> "wait for request completion" as wait
- *   else
- *       --> false create a new request
- *       --> wait
- *   endif
- *   --> if request succeed
- *         --> true "store image result in cache"
- *         --> "use request image result"
- *         --> "set image in Ready state"
- *         --> (*)
- *       else
- *         --> false "set the image in Error state"
- *         --> (*)
- *      endif
- * endif
- * @enduml
- *
- * notes that:
- * - requests are refcounted, if no image reference a request anymore,
- *   the request is canceled and destroyed
- *
- * - failed atempts are not stored, if the same resource is requested latter on,
- *   a new request will be created and executed for this request
- */
-class RoundImageCache
-{
-public:
-    RoundImageCache();
-
-    inline QImage* object(const ImageCacheKey& key) const
-    {
-        return m_imageCache.object(key);
-    }
-
-    inline void insert(const ImageCacheKey& key, QImage* image, int size)
-    {
-        m_imageCache.insert(key, image, size);
-    }
-
-    std::shared_ptr<RoundImageRequest> requestImage(const ImageCacheKey& key, qreal dpr, QQmlEngine *engine);
-
-    void removeRequest(const ImageCacheKey& key);
-
-private:
-    //images are cached (result of RoundImageGenerator) with the cost calculated from QImage::sizeInBytes
-    QCache<ImageCacheKey, QImage> m_imageCache;
-
-    //contains the pending request, we use a weak ptr here as the request may be canceled and destroyed
-    //when all RoundImage that requested the image drop the request. user should check for validity before
-    //accessing the RoundImageRequest
-    std::unordered_map<ImageCacheKey, std::weak_ptr<RoundImageRequest>> m_pendingRequests;
-};
-
-#endif // VLC_ROUNDIMAGE_P_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/TableViewDelegate.qml Deleted

@@ -1,295 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2021 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * ( at your option ) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-import QtQuick
-import QtQuick.Templates as T
-import QtQuick.Layouts
-
-import VLC.MainInterface
-import VLC.Widgets as Widgets
-import VLC.Style
-import VLC.Util
-
-T.Control {
-    id: delegate
-
-    // Properties
-    required property int index
-    required property var rowModel
-    required property var sortModel
-    required property bool selected
-    required property Widgets.DragItem dragItem
-
-    readonly property bool topContainsDrag: dropAreaLayout.higherDropArea.containsDrag
-    readonly property bool bottomContainsDrag: dropAreaLayout.lowerDropArea.containsDrag
-    readonly property bool containsDrag: (topContainsDrag || bottomContainsDrag)
-
-    required property real fixedColumnWidth
-    required property real weightedColumnWidth
-
-    readonly property point dragPosition: mapFromItem(dropAreaLayout,
-                                                      dropAreaLayout.dragPosition.x,
-                                                      dropAreaLayout.dragPosition.y)
-
-    // Optional, used to show the drop indicator
-    property alias isDropAcceptable: dropAreaLayout.isDropAcceptable
-
-    // Optional, but required to drop a drag
-    property alias acceptDrop: dropAreaLayout.acceptDrop
-
-    property int _modifiersOnLastPress: Qt.NoModifier
-
-    signal contextMenuButtonClicked(Item menuParent, var menuModel, point globalMousePos)
-    signal rightClick(Item menuParent, var menuModel, point globalMousePos)
-    signal itemDoubleClicked(var index, var model)
-
-    signal selectAndFocus(int modifiers, int focusReason)
-
-    property Component defaultDelegate: TableRowDelegate {
-        id: defaultDelId
-        Widgets.TextAutoScroller {
-
-            anchors.fill: parent
-
-            label: text
-            forceScroll: defaultDelId.currentlyFocused
-            clip: scrolling
-
-            Widgets.ListLabel {
-                id: text
-
-                anchors.verticalCenter: parent.verticalCenter
-                text: defaultDelId.rowModeldefaultDelId.colModel.criteria ?? ""
-
-                color: defaultDelId.selected
-                    ? defaultDelId.colorContext.fg.highlight
-                    : defaultDelId.colorContext.fg.primary
-            }
-        }
-    }
-    // Settings
-
-    hoverEnabled: true
-
-    ListView.delayRemove: dragHandler.active
-
-    Component.onCompleted: {
-        Keys.menuPressed.connect(contextButton.clicked)
-    }
-
-    // Childs
-
-    readonly property ColorContext colorContext: ColorContext {
-        id: theme
-        colorSet: ColorContext.Item
-
-        focused: delegate.visualFocus
-        hovered: delegate.hovered
-    }
-
-    // TODO: Qt bug 6.2: QTBUG-103604
-    DoubleClickIgnoringItem {
-        anchors.fill: parent
-
-        z: -1
-
-        DragHandler {
-            id: dragHandler
-
-            acceptedDevices: PointerDevice.AllDevices & ~(PointerDevice.TouchScreen)
-
-            target: null
-
-            grabPermissions: PointerHandler.CanTakeOverFromHandlersOfDifferentType | PointerHandler.ApprovesTakeOverByAnything
-
-            onActiveChanged: {
-                if (dragItem) {
-                    if (active) {
-                        if (!selected) {
-                            delegate.ListView.view.selectionModel.select(index, ItemSelectionModel.ClearAndSelect)
-                        }
-
-                        dragItem.Drag.active = true
-                    } else {
-                        dragItem.Drag.drop()
-                    }
-                }
-            }
-        }
-
-        TapHandler {
-            acceptedDevices: PointerDevice.AllDevices & ~(PointerDevice.TouchScreen)
-
-            acceptedButtons: Qt.LeftButton | Qt.RightButton
-
-            gesturePolicy: TapHandler.ReleaseWithinBounds // TODO: Qt 6.2 bug: Use TapHandler.DragThreshold
-
-            grabPermissions: TapHandler.CanTakeOverFromHandlersOfDifferentType | TapHandler.ApprovesTakeOverByAnything
-
-            onSingleTapped: (eventPoint, button) => {
-                initialAction()
-
-                if (!(delegate.selected && button === Qt.RightButton)) {
-                    const view = delegate.ListView.view
-                    view.selectionModel.updateSelection(point.modifiers, view.currentIndex, index)
-                    view.currentIndex = index
-                }
-
-                if (button === Qt.RightButton)
-                    delegate.rightClick(delegate, delegate.rowModel, parent.mapToGlobal(eventPoint.position.x, eventPoint.position.y))
-            }
-
-            onDoubleTapped: (point, button) => {
-                if (button === Qt.LeftButton)
-                    delegate.itemDoubleClicked(delegate.index, delegate.rowModel)
-            }
-
-            Component.onCompleted: {
-                canceled.connect(initialAction)
-            }
-
-            function initialAction() {
-                delegate.forceActiveFocus(Qt.MouseFocusReason)
-            }
-        }
-
-        TapHandler {
-            acceptedDevices: PointerDevice.TouchScreen
-
-            grabPermissions: TapHandler.CanTakeOverFromHandlersOfDifferentType | TapHandler.ApprovesTakeOverByAnything
-
-            onTapped: (eventPoint, button) => {
-                delegate.selectAndFocus(Qt.NoModifier, Qt.MouseFocusReason)
-                delegate.itemDoubleClicked(delegate.index, delegate.rowModel)
-            }
-
-            onLongPressed: {
-                delegate.rightClick(delegate, delegate.rowModel, parent.mapToGlobal(point.position.x, point.position.y))
-            }
-        }
-    }
-
-    background: AnimatedBackground {
-        animationDuration: VLCStyle.duration_short
-        enabled: theme.initialized
-        color: delegate.selected ? theme.bg.highlight : theme.bg.primary
-        border.color: visualFocus ? theme.visualFocus : "transparent"
-    }
-
-    contentItem: Row {
-        leftPadding: VLCStyle.margin_xxxsmall
-        rightPadding: VLCStyle.margin_xxxsmall
-
-        spacing: VLCStyle.column_spacing
-
-        Repeater {
-            model: delegate.sortModel
-
-            //manually load the component as Loader is unable to pass initial/required properties
-            Item {
-                id: loader
-                required property var modelData
-                property TableRowDelegate item: null
-                width: {
-                    if (!!modelData.size)
-                        return modelData.size * delegate.fixedColumnWidth
-                    else if (!!modelData.weight)
-                        return modelData.weight * delegate.weightedColumnWidth
-                    else
-                        return 0
-                }
-                height: parent.height
-
-                Component.onCompleted: {
-                    const del = modelData.model.colDelegate || delegate.defaultDelegate
-                    item = del.createObject(loader, {
-                            width: Qt.binding(() => loader.width),
-                            height: Qt.binding(() => loader.height),
-                            rowModel: Qt.binding(() => delegate.rowModel),
-                            colModel: Qt.binding(() => loader.modelData.model),
-                            index: Qt.binding(() => delegate.index),
-                            currentlyFocused: Qt.binding(() => delegate.visualFocus),
-                            selected: Qt.binding(() => delegate.selected),
-                            containsMouse: Qt.binding(() => delegate.hovered),
-                            colorContext: Qt.binding(() => theme),
-                        }
-                    )
-                }
-                Component.onDestruction: {
-                    item?.destroy()
-                }
-            }
-        }
-
-        Item {
-            width: VLCStyle.icon_normal
-
-            height: parent.height
-
-            Widgets.IconToolButton {
-                id: contextButton
-
-                anchors.left: parent.left
-
-                // NOTE: We want the contextButton to be contained inside the trailing
-                //       column_spacing.
-                anchors.leftMargin: -width - delegate.leftPadding
-
-                anchors.verticalCenter: parent.verticalCenter
-
-                text: VLCIcons.ellipsis
-
-                font.pixelSize: VLCStyle.icon_normal
-
-                description: qsTr("Menu")
-
-                visible: delegate.hovered
-
-                // NOTE: QTBUG-100543
-                // Hover handling in controls is blocking in Qt 6.2, meaning if this
-                // control handles the hover, delegate itself won't have its `hovered`
-                // set. Since this control is visible when delegate is hovered, there
-                // becomes an infinite loop of visibility when this control is hovered.
-
-                // 1) When delegate is hovered, delegate's hovered property becomes set.
-                // 2) This control becomes visible.
-                // 3) When this control is hovered, delegate's hovered property becomes unset.
-                // 4) This control becomes invisible. Delegate's hovered property becomes set.
-                // * Infinite loop *
-
-                // Disable hovering in this control to prevent twitching due to infinite loop:
-                hoverEnabled: MainCtx.qtQuickControlRejectsHoverEvents()
-
-                onClicked: {
-                    if (!delegate.selected)
-                        delegate.selectAndFocus(Qt.NoModifier, Qt.MouseFocusReason)
-
-                    const pos = contextButton.mapToGlobal(VLCStyle.margin_xsmall, contextButton.height / 2 + VLCStyle.fontHeight_normal)
-                    delegate.contextMenuButtonClicked(this, delegate.rowModel, pos)
-                }
-
-                activeFocusOnTab: false
-            }
-        }
-    }
-
-    Widgets.ListViewExt.VerticalDropAreaLayout {
-        id: dropAreaLayout
-        anchors.fill: parent
-    }
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/share/vlc.appdata.xml.in.in Deleted

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<component type="desktop">
-    <id>org.videolan.vlc</id>
-    <launchable type="desktop-id">vlc.desktop</launchable>
-    <metadata_license>CC0-1.0</metadata_license>
-    <name>VLC</name>
-    <summary>VLC media player, the open-source multimedia player</summary>
-    <description>
-        <p>
-            VLC is a free and open source cross-platform multimedia player and
-            framework that plays most multimedia files as well as DVDs, Audio CDs,
-            VCDs, and various streaming protocols.
-        </p>
-    </description>
-    <url type="homepage">https://www.videolan.org/vlc/</url>
-    <url type="bugtracker">https://trac.videolan.org/vlc/</url>
-    <url type="donation">https://www.videolan.org/contribute.html</url>
-    <releases>
-        <release version="@VERSION@" />
-    </releases>
-    <provides>
-        <library>libvlc.so.5</library>
-    </provides>
-    <project_group>VideoLAN</project_group>
-    <project_license>GPL-2.0+</project_license>
-    <developer_name>VideoLAN et al.</developer_name>
-    <update_contact>vlc-devel -- videolan.org</update_contact>
-    <screenshots>
-        <screenshot type="default">
-            <image>https://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-poney.jpg</image>
-        </screenshot>
-        <screenshot type="default">
-            <image>https://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-open.jpg</image>
-        </screenshot>
-        <screenshot type="default">
-            <image>https://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg</image>
-        </screenshot>
-    </screenshots>
-</component>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/thumbnailer.c Deleted

@@ -1,329 +0,0 @@
-/*****************************************************************************
- * thumbnailer.c: Thumbnailing API
- *****************************************************************************
- * Copyright (C) 2018 VLC authors and VideoLAN
- *
- * Authors: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_thumbnailer.h>
-#include <vlc_executor.h>
-#include "input_internal.h"
-
-struct vlc_thumbnailer_t
-{
-    vlc_object_t* parent;
-    vlc_executor_t *executor;
-    vlc_mutex_t lock;
-    vlc_cond_t cond_ended;
-
-    vlc_thumbnailer_req_id current_id;
-    vlc_tick_t timeout;
-
-    struct vlc_list submitted_tasks; /**< list of struct task */
-};
-
-typedef struct task
-{
-    vlc_thumbnailer_t *thumbnailer;
-
-    struct vlc_thumbnailer_seek_arg seek_arg;
-    input_item_t *item;
-    const struct vlc_thumbnailer_cbs *cbs;
-    void* userdata;
-
-    enum
-    {
-        RUNNING,
-        INTERRUPTED,
-        ENDED,
-    } status;
-    picture_t *pic;
-
-    vlc_thumbnailer_req_id id;
-
-    struct vlc_runnable runnable; /**< to be passed to the executor */
-    struct vlc_list node; /**< node of vlc_thumbnailer_t.submitted_tasks */
-} task_t;
-
-static void RunnableRun(void *);
-
-static task_t *
-TaskNew(vlc_thumbnailer_t *thumbnailer, input_item_t *item,
-        const struct vlc_thumbnailer_seek_arg *seek_arg,
-        const struct vlc_thumbnailer_cbs *cbs, void *userdata )
-{
-    task_t *task = malloc(sizeof(*task));
-    if (!task)
-        return NULL;
-
-    task->thumbnailer = thumbnailer;
-    task->item = item;
-    if (seek_arg == NULL)
-        task->seek_arg = (struct vlc_thumbnailer_seek_arg) {
-            .type = VLC_THUMBNAILER_SEEK_NONE,
-        };
-    else
-        task->seek_arg = *seek_arg;
-
-    task->cbs = cbs;
-    task->userdata = userdata;
-
-    task->status = RUNNING;
-    task->pic = NULL;
-
-    task->runnable.run = RunnableRun;
-    task->runnable.userdata = task;
-
-    input_item_Hold(item);
-
-    return task;
-}
-
-static void
-TaskDestroy(task_t *task)
-{
-    input_item_Release(task->item);
-    free(task);
-}
-
-static void NotifyThumbnail(task_t *task, picture_t *pic)
-{
-    task->cbs->on_ended(pic, task->userdata);
-}
-
-static void
-on_thumbnailer_input_event( input_thread_t *input,
-                            const struct vlc_input_event *event, void *userdata )
-{
-    VLC_UNUSED(input);
-    if ( event->type != INPUT_EVENT_THUMBNAIL_READY &&
-         ( event->type != INPUT_EVENT_STATE || ( event->state.value != ERROR_S &&
-                                                 event->state.value != END_S ) ) )
-         return;
-
-    task_t *task = userdata;
-    vlc_thumbnailer_t *thumbnailer = task->thumbnailer;
-
-    vlc_mutex_lock(&thumbnailer->lock);
-    if (task->status != RUNNING)
-    {
-        /* We may receive a THUMBNAIL_READY event followed by an
-         * INPUT_EVENT_STATE (end of stream), we must only consider the first
-         * one. */
-        vlc_mutex_unlock(&thumbnailer->lock);
-        return;
-    }
-
-    task->status = ENDED;
-
-    if (event->type == INPUT_EVENT_THUMBNAIL_READY)
-        task->pic = picture_Hold(event->thumbnail);
-
-    vlc_cond_signal(&thumbnailer->cond_ended);
-    vlc_mutex_unlock(&thumbnailer->lock);
-}
-
-static void
-RunnableRun(void *userdata)
-{
-    vlc_thread_set_name("vlc-run-thumb");
-
-    task_t *task = userdata;
-    vlc_thumbnailer_t *thumbnailer = task->thumbnailer;
-
-    vlc_tick_t now = vlc_tick_now();
-
-    static const struct vlc_input_thread_callbacks cbs = {
-        .on_event = on_thumbnailer_input_event,
-    };
-
-    const struct vlc_input_thread_cfg cfg = {
-        .type = INPUT_TYPE_THUMBNAILING,
-        .cbs = &cbs,
-        .cbs_data = task,
-    };
-
-    input_thread_t* input =
-            input_Create( thumbnailer->parent, task->item, &cfg );
-    if (!input)
-        goto error;
-
-    assert(task->seek_arg.speed == VLC_THUMBNAILER_SEEK_PRECISE
-        || task->seek_arg.speed == VLC_THUMBNAILER_SEEK_FAST);
-    bool fast_seek = task->seek_arg.speed == VLC_THUMBNAILER_SEEK_FAST;
-
-    switch (task->seek_arg.type)
-    {
-        case VLC_THUMBNAILER_SEEK_NONE:
-            break;
-        case VLC_THUMBNAILER_SEEK_TIME:
-            input_SetTime(input, task->seek_arg.time, fast_seek);
-            break;
-        case VLC_THUMBNAILER_SEEK_POS:
-            input_SetPosition(input, task->seek_arg.pos, fast_seek);
-            break;
-        default:
-            vlc_assert_unreachable();
-    }
-
-    int ret = input_Start(input);
-    if (ret != VLC_SUCCESS)
-    {
-        input_Close(input);
-        goto error;
-    }
-
-    vlc_mutex_lock(&thumbnailer->lock);
-    if (thumbnailer->timeout == VLC_TICK_INVALID)
-    {
-        while (task->status == RUNNING)
-            vlc_cond_wait(&thumbnailer->cond_ended, &thumbnailer->lock);
-    }
-    else
-    {
-        vlc_tick_t deadline = now + thumbnailer->timeout;
-        int timeout = 0;
-        while (task->status == RUNNING && timeout == 0)
-            timeout =
-                vlc_cond_timedwait(&thumbnailer->cond_ended, &thumbnailer->lock, deadline);
-    }
-    picture_t* pic = task->pic;
-    task->pic = NULL;
-
-    bool interrupted = task->status == INTERRUPTED;
-
-    vlc_list_remove(&task->node);
-    vlc_mutex_unlock(&thumbnailer->lock);
-
-    NotifyThumbnail(task, interrupted ? NULL : pic);
-
-    if (pic)
-        picture_Release(pic);
-
-    input_Stop(input);
-    input_Close(input);
-
-error:
-    TaskDestroy(task);
-}
-
-vlc_thumbnailer_req_id
-vlc_thumbnailer_Request( vlc_thumbnailer_t *thumbnailer,
-                         input_item_t *item,
-                         const struct vlc_thumbnailer_seek_arg *seek_arg,
-                         const struct vlc_thumbnailer_cbs *cbs, void *userdata )
-{
-    assert( cbs != NULL && cbs->on_ended != NULL );
-
-    task_t *task = TaskNew(thumbnailer, item, seek_arg, cbs, userdata);
-    if (!task)
-        return 0;
-
-    vlc_mutex_lock(&thumbnailer->lock);
-    vlc_thumbnailer_req_id id = task->id = thumbnailer->current_id++;
-    static_assert(VLC_THUMBNAILER_REQ_ID_INVALID == 0, "Invalid id should be 0");
-    if (unlikely(thumbnailer->current_id == 0)) /* unsigned wrapping */
-        ++thumbnailer->current_id;
-    vlc_list_append(&task->node, &thumbnailer->submitted_tasks);
-    vlc_mutex_unlock(&thumbnailer->lock);
-
-    vlc_executor_Submit(thumbnailer->executor, &task->runnable);
-
-    return id;
-}
-
-size_t vlc_thumbnailer_Cancel( vlc_thumbnailer_t* thumbnailer, vlc_thumbnailer_req_id id )
-{
-    vlc_mutex_lock(&thumbnailer->lock);
-
-    task_t *task;
-    size_t count = 0;
-    vlc_list_foreach(task, &thumbnailer->submitted_tasks, node)
-    {
-        if (id == VLC_THUMBNAILER_REQ_ID_INVALID || task->id == id)
-        {
-            count++;
-            bool canceled =
-                vlc_executor_Cancel(thumbnailer->executor, &task->runnable);
-            if (canceled)
-            {
-                vlc_list_remove(&task->node);
-                vlc_mutex_unlock(&thumbnailer->lock);
-                NotifyThumbnail(task, NULL);
-                TaskDestroy(task);
-
-                /* Small optimisation in the likely case where the user cancel
-                 * only one task */
-                if (id != VLC_THUMBNAILER_REQ_ID_INVALID)
-                    return count;
-                vlc_mutex_lock(&thumbnailer->lock);
-            }
-            else
-            {
-                /* The task will be finished and destroyed after run() */
-                task->status = INTERRUPTED;
-                vlc_cond_signal(&thumbnailer->cond_ended);
-            }
-        }
-    }
-
-    vlc_mutex_unlock(&thumbnailer->lock);
-
-    return count;
-}
-
-vlc_thumbnailer_t *vlc_thumbnailer_Create( vlc_object_t* parent, vlc_tick_t timeout )
-{
-    assert(timeout >= 0);
-
-    vlc_thumbnailer_t *thumbnailer = malloc( sizeof( *thumbnailer ) );
-    if ( unlikely( thumbnailer == NULL ) )
-        return NULL;
-
-    thumbnailer->executor = vlc_executor_New(1);
-    if (!thumbnailer->executor)
-    {
-        free(thumbnailer);
-        return NULL;
-    }
-
-    thumbnailer->parent = parent;
-    thumbnailer->current_id = 1;
-    thumbnailer->timeout = timeout;
-    vlc_mutex_init(&thumbnailer->lock);
-    vlc_cond_init(&thumbnailer->cond_ended);
-    vlc_list_init(&thumbnailer->submitted_tasks);
-
-    return thumbnailer;
-}
-
-void vlc_thumbnailer_SetTimeout( vlc_thumbnailer_t *thumbnailer,
-                                 vlc_tick_t timeout )
-{
-    thumbnailer->timeout = timeout;
-}
-
-void vlc_thumbnailer_Delete( vlc_thumbnailer_t *thumbnailer )
-{
-    vlc_executor_Delete(thumbnailer->executor);
-    free( thumbnailer );
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/Cargo.toml Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-plugin/src Deleted

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-plugin/src/lib.rs Deleted

@@ -1,254 +0,0 @@
-#!feature(extern_types)
-#!feature(associated_type_defaults)
-
-pub mod sys;
-
-use vlcrs_core::object::Object;
-
-pub const VLC_COPYRIGHT_VIDEOLAN : &str = r#"
-\x43\x6f\x70\x79\x72\x69\x67\x68\x74\x20\x28\x43\x29\x20\x74\x68
-\x65\x20\x56\x69\x64\x65\x6f\x4c\x41\x4e\x20\x56\x4c\x43\x20\x6d
-\x65\x64\x69\x61\x20\x70\x6c\x61\x79\x65\x72\x20\x64\x65\x76\x65
-\x6c\x6f\x70\x65\x72\x73"#;
-
-pub const VLC_LICENSE_LGPL_2_1_PLUS : &str = r#"
-\x4c\x69\x63\x65\x6e\x73\x65\x64\x20\x75\x6e\x64\x65\x72\x20\x74
-\x68\x65\x20\x74\x65\x72\x6d\x73\x20\x6f\x66\x20\x74\x68\x65\x20
-\x47\x4e\x55\x20\x4c\x65\x73\x73\x65\x72\x20\x47\x65\x6e\x65\x72
-\x61\x6c\x20\x50\x75\x62\x6c\x69\x63\x20\x4c\x69\x63\x65\x6e\x73
-\x65\x2c\x20\x76\x65\x72\x73\x69\x6f\x6e\x20\x32\x2e\x31\x20\x6f"#;
-
-#allow(non_camel_case_types)
-#allow(unused)
-extern {
-    pub type module_t;
-    pub type vlc_param;
-}
-
-#allow(non_camel_case_types)
-#repr(u32)
-pub enum ConfigModule {
-    HINT_CATEGORY        = 0x02,
-    SUBCATEGORY          = 0x07,
-    SECTION              = 0x08,
-    ITEM_FLOAT           = 1 << 5,
-    ITEM_INTEGER         = 2 << 5,
-    ITEM_RGB             = ConfigModule::ITEM_INTEGER as u32 | 0x01,
-    ITEM_BOOL            = 3 << 5,
-    ITEM_STRING          = 4 << 5,
-    ITEM_PASSWORD        = ConfigModule::ITEM_STRING  as u32 | 0x01,
-    ITEM_KEY             = ConfigModule::ITEM_STRING  as u32 | 0x02,
-    ITEM_MODULE          = ConfigModule::ITEM_STRING  as u32 | 0x04,
-    ITEM_MODULE_CAT      = ConfigModule::ITEM_STRING  as u32 | 0x05,
-    ITEM_MODULE_LIST     = ConfigModule::ITEM_STRING  as u32 | 0x06,
-    ITEM_MODULE_LIST_CAT = ConfigModule::ITEM_STRING  as u32 | 0x07,
-    ITEM_LOADFILE        = ConfigModule::ITEM_STRING  as u32 | 0x0C,
-    ITEM_SAVEFILE        = ConfigModule::ITEM_STRING  as u32 | 0x0D,
-    ITEM_DIRECTORY       = ConfigModule::ITEM_STRING  as u32 | 0x0E,
-    ITEM_FONT            = ConfigModule::ITEM_STRING  as u32 | 0x0F,
-}
-
-#allow(non_camel_case_types)
-#repr(i32)
-pub enum ConfigCategory {
-    HIDDEN    = -1,
-    UNKNOWN   = 0,
-    INTERFACE = 1,
-    AUDIO     = 2,
-    VIDEO     = 3,
-    INPUT     = 4,
-    SOUT      = 5,
-    ADVANCED  = 6,
-    PLAYLIST  = 7,
-}
-
-#allow(non_camel_case_types)
-#repr(i32)
-pub enum ConfigSubcategory {
-    HIDDEN    = -1,
-    UNKNOWN   = 0,
-
-    INTERFACE_GENERAL = 101,
-    INTERFACE_MAIN    = 102,
-    INTERFACE_CONTROL = 103,
-    INTERFACE_HOTKEYS = 104,
-
-    AUDIO_GENERAL   = 201,
-    AUDIO_AOUT      = 202,
-    AUDIO_AFILTER   = 203,
-    AUDIO_VISUAL    = 204,
-    AUDIO_RESAMPLER = 206,
-
-    VIDEO_GENERAL  = 301,
-    VIDEO_VOUT     = 302,
-    VIDEO_VFILTER  = 303,
-    VIDEO_SUBPIC   = 305,
-    VIDEO_SPLITTER = 306,
-
-    INPUT_GENERAL       = 401,
-    INPUT_ACCESS        = 402,
-    INPUT_DEMUX         = 403,
-    INPUT_VCODEC        = 404,
-    INPUT_ACODEC        = 405,
-    INPUT_SCODEC        = 406,
-    INPUT_STREAM_FILTER = 407,
-
-    SOUT_GENERAL    = 501,
-    SOUT_STREAM     = 502,
-    SOUT_MUX        = 503,
-    SOUT_ACO        = 504,
-    SOUT_PACKETIZER = 505,
-    SOUT_VOD        = 507,
-    SOUT_RENDERER   = 508,
-
-    ADVANCED_MISC    = 602,
-    ADVANCED_NETWORK = 603,
-
-    PLAYLIST_GENERAL = 701,
-    PLAYLIST_SD      = 702,
-    PLAYLIST_EXPORT  = 703,
-}
-
-
-#derive(Debug, PartialEq, PartialOrd)
-#allow(non_camel_case_types)
-#repr(i32)
-pub enum ModuleProperties {
-    MODULE_CREATE,
-    CONFIG_CREATE,
-
-    MODULE_CPU_REQUIREMENT      = 0x100,
-    MODULE_SHORTCUT,
-    MODULE_CAPABILITY,
-    MODULE_SCORE,
-    MODULE_CB_OPEN,
-    MODULE_CB_CLOSE,
-    MODULE_NO_UNLOAD,
-    MODULE_NAME,
-    MODULE_SHORTNAME,
-    MODULE_DESCRIPTION,
-    MODULE_HELP,
-    MODULE_TEXTDOMAIN,
-    MODULE_HELP_HTML,
-
-    CONFIG_NAME                 = 0x1000,
-    CONFIG_VALUE,
-    CONFIG_RANGE,
-    CONFIG_ADVANCED_RESERVED,
-    CONFIG_VOLATILE,
-    CONFIG_PERSISTENT_OBSOLETE,
-    CONFIG_PRIVATE,
-    CONFIG_REMOVED,
-    CONFIG_CAPABILITY,
-    CONFIG_SHORTCUT,
-    CONFIG_OLDNAME_OBSOLETE,
-    CONFIG_SAFE,
-    CONFIG_DESC,
-    CONFIG_LIST_OBSOLETE,
-    CONFIG_ADD_ACTION_OBSOLETE,
-    CONFIG_LIST,
-    CONFIG_LIST_CB_OBSOLETE,
-}
-
-impl TryFrom<i32> for ModuleProperties {
-    type Error = ();
-
-    fn try_from(opcode: i32) -> Result<Self, Self::Error> {
-        let prop = match opcode {
-            x if x == ModuleProperties::MODULE_CREATE as i32 => ModuleProperties::MODULE_CREATE,
-            x if x == ModuleProperties::CONFIG_CREATE as i32 => ModuleProperties::CONFIG_CREATE,
-
-            x if x == ModuleProperties::MODULE_CPU_REQUIREMENT as i32 => ModuleProperties::MODULE_CPU_REQUIREMENT,
-            x if x == ModuleProperties::MODULE_SHORTCUT as i32 => ModuleProperties::MODULE_SHORTCUT,
-            x if x == ModuleProperties::MODULE_CAPABILITY as i32 => ModuleProperties::MODULE_CAPABILITY,
-            x if x == ModuleProperties::MODULE_SCORE as i32 => ModuleProperties::MODULE_SCORE,
-            x if x == ModuleProperties::MODULE_CB_OPEN as i32 => ModuleProperties::MODULE_CB_OPEN,
-            x if x == ModuleProperties::MODULE_CB_CLOSE as i32 => ModuleProperties::MODULE_CB_CLOSE,
-            x if x == ModuleProperties::MODULE_NO_UNLOAD as i32 => ModuleProperties::MODULE_NO_UNLOAD,
-            x if x == ModuleProperties::MODULE_NAME as i32 => ModuleProperties::MODULE_NAME,
-            x if x == ModuleProperties::MODULE_SHORTNAME as i32 => ModuleProperties::MODULE_SHORTNAME,
-            x if x == ModuleProperties::MODULE_DESCRIPTION as i32 => ModuleProperties::MODULE_DESCRIPTION,
-            x if x == ModuleProperties::MODULE_HELP as i32 => ModuleProperties::MODULE_HELP,
-            x if x == ModuleProperties::MODULE_TEXTDOMAIN as i32 => ModuleProperties::MODULE_TEXTDOMAIN,
-            x if x == ModuleProperties::MODULE_HELP_HTML as i32 => ModuleProperties::MODULE_HELP_HTML,
-
-            x if x == ModuleProperties::CONFIG_NAME as i32 => ModuleProperties::CONFIG_NAME,
-            x if x == ModuleProperties::CONFIG_VALUE as i32 => ModuleProperties::CONFIG_VALUE,
-            x if x == ModuleProperties::CONFIG_RANGE as i32 => ModuleProperties::CONFIG_RANGE,
-            x if x == ModuleProperties::CONFIG_ADVANCED_RESERVED as i32 => ModuleProperties::CONFIG_ADVANCED_RESERVED,
-            x if x == ModuleProperties::CONFIG_VOLATILE as i32 => ModuleProperties::CONFIG_VOLATILE,
-            x if x == ModuleProperties::CONFIG_PERSISTENT_OBSOLETE as i32 => ModuleProperties::CONFIG_PERSISTENT_OBSOLETE,
-            x if x == ModuleProperties::CONFIG_PRIVATE as i32 => ModuleProperties::CONFIG_PRIVATE,
-            x if x == ModuleProperties::CONFIG_REMOVED as i32 => ModuleProperties::CONFIG_REMOVED,
-            x if x == ModuleProperties::CONFIG_CAPABILITY as i32 => ModuleProperties::CONFIG_CAPABILITY,
-            x if x == ModuleProperties::CONFIG_SHORTCUT as i32 => ModuleProperties::CONFIG_SHORTCUT,
-            x if x == ModuleProperties::CONFIG_OLDNAME_OBSOLETE as i32 => ModuleProperties::CONFIG_OLDNAME_OBSOLETE,
-            x if x == ModuleProperties::CONFIG_SAFE as i32 => ModuleProperties::CONFIG_SAFE,
-            x if x == ModuleProperties::CONFIG_DESC as i32 => ModuleProperties::CONFIG_DESC,
-            x if x == ModuleProperties::CONFIG_LIST_OBSOLETE as i32 => ModuleProperties::CONFIG_LIST_OBSOLETE,
-            x if x == ModuleProperties::CONFIG_ADD_ACTION_OBSOLETE as i32 => ModuleProperties::CONFIG_ADD_ACTION_OBSOLETE,
-            x if x == ModuleProperties::CONFIG_LIST as i32 => ModuleProperties::CONFIG_LIST,
-            x if x == ModuleProperties::CONFIG_LIST_CB_OBSOLETE as i32 => ModuleProperties::CONFIG_LIST_CB_OBSOLETE,
-            _ => return Err(())
-        };
-        Ok(prop)
-    }
-}
-
-use std::ffi::c_int;
-#allow(non_camel_case_types)
-pub type vlc_activate = unsafe extern "C" fn(*mut Object) -> c_int;
-#allow(non_camel_case_types)
-pub type vlc_deactivate = unsafe extern "C" fn(*mut Object);
-
-///
-/// Exposes the activation and deactivation functions for modules.
-///
-/// Capabilities for modules are traits implementing a Loader type
-/// implementing the ModuleProtocol trait to provide the activation
-/// and deactivation functions for the module.
-///
-/// * `T`: Type implementing the final capability trait
-/// * `Activate`: Type for the activation function
-/// * `Deactivate`: Type for the deactivation function
-///
-/// ```no_run
-/// use vlcrs_plugin::ModuleProtocol;
-///
-/// /* New trait bringing support for new capabilities in modules. */
-///
-/// type ActivateFunction = unsafe extern "C" fn();
-/// type DeactivateFunction = unsafe extern "C" fn();
-/// trait NewCapabilityTrait {
-///     /* Mandatory type definition for capability traits */
-///
-///     /* Example capability interface, can be anything and can add
-///      * as many function as required. */
-///     fn open(&self);
-/// }
-///
-/// /* Implement a function to load modules implementing NewCapabilityTrait. */
-/// unsafe extern "C" fn activate_new_capability<ModuleType: NewCapabilityTrait>() {
-///     /* Do anything needed to initialize the module, for instance initializing
-///      * a ModuleType object and call the open() function on it. */
-/// }
-///
-/// /* Implement a module loader for this new capability trait. */
-/// struct NewCapabilityLoader;
-/// impl<ModuleType> ModuleProtocol<ModuleType>
-/// for NewCapabilityLoader
-/// where ModuleType : NewCapabilityTrait {
-///     type Activate = ActivateFunction;
-///     type Deactivate = DeactivateFunction;
-///
-///     fn activate_function() -> ActivateFunction { activate_new_capability::<ModuleType> }
-///     fn deactivate_function() -> Option<DeactivateFunction> { None }
-/// }
-/// ```
-pub trait ModuleProtocol<ModuleType: ?Sized>
-{
-    type Activate;
-    type Deactivate = *mut ();
-    fn activate_function() -> Self::Activate;
-    fn deactivate_function() -> Option<Self::Deactivate> { None }
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/src/input/thumbnail.c Deleted

@@ -1,227 +0,0 @@
-/*****************************************************************************
- * thumbnail.c: test thumbnailing API
- *****************************************************************************
- * Copyright (C) 2018 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#include "../../libvlc/test.h"
-#include "../lib/libvlc_internal.h"
-
-#include <vlc_common.h>
-#include <vlc_thumbnailer.h>
-#include <vlc_input_item.h>
-#include <vlc_picture.h>
-
-#include <errno.h>
-
-#define MOCK_DURATION VLC_TICK_FROM_SEC( 5 * 60 )
-
-const struct
-{
-    uint32_t i_nb_video_tracks;
-    uint32_t i_nb_audio_tracks;
-    vlc_tick_t i_add_video_track_at;
-    vlc_tick_t i_time;
-    float f_pos;
-    bool b_use_pos;
-    bool b_fast_seek;
-    bool b_can_control_pace;
-    vlc_tick_t i_timeout;
-    bool b_expected_success;
-} test_params = {
-    /* Simple test with a thumbnail at 60s, with a video track */
-    { 1, 0, VLC_TICK_INVALID, VLC_TICK_FROM_SEC( 60 ), .0f, false, true, true,
-      VLC_TICK_INVALID, true },
-    /* Test without fast-seek */
-    { 1, 0, VLC_TICK_INVALID, VLC_TICK_FROM_SEC( 60 ), .0f, false, false, true,
-      VLC_TICK_INVALID, true },
-    /* Seek by position test */
-    { 1, 0, VLC_TICK_INVALID, 0, .3f, true, true, true, VLC_TICK_INVALID, true },
-    /* Seek at a negative position */
-    { 1, 0, VLC_TICK_INVALID, -12345, .0f, false, true, true, VLC_TICK_INVALID, true },
-    /* Take a thumbnail of a file without video, which should timeout. */
-    { 0, 1, VLC_TICK_INVALID, VLC_TICK_FROM_SEC( 60 ), .0f, false, true, false, VLC_TICK_FROM_MS( 100 ), false },
-    /* Take a thumbnail of a file with a video track starting later */
-    { 1, 1, VLC_TICK_FROM_SEC( 60 ), VLC_TICK_FROM_SEC( 30 ), .0f, false, true, true,
-      VLC_TICK_INVALID, true },
-};
-
-struct test_ctx
-{
-    vlc_cond_t cond;
-    vlc_mutex_t lock;
-    size_t test_idx;
-    bool b_done;
-};
-
-static void thumbnailer_callback( picture_t* thumbnail, void *data )
-{
-    struct test_ctx* p_ctx = data;
-    vlc_mutex_lock( &p_ctx->lock );
-
-    if ( thumbnail != NULL )
-    {
-        assert( test_paramsp_ctx->test_idx.b_expected_success &&
-                "Expected failure but got a thumbnail" );
-        assert( thumbnail->format.i_chroma == VLC_CODEC_ARGB );
-
-        /* TODO: Enable this once the new clock is merged */
-#if 0
-        vlc_tick_t expected_date;
-        /* Don't rely on the expected date if it was purposely invalid */
-        if ( test_paramsp_ctx->test_idx.b_use_pos == true )
-            expected_date = MOCK_DURATION * test_paramsp_ctx->test_idx.f_pos;
-        else if ( test_paramsp_ctx->test_idx.i_add_video_track_at != VLC_TICK_INVALID )
-            expected_date = test_paramsp_ctx->test_idx.i_add_video_track_at;
-        else
-        {
-            if ( test_paramsp_ctx->test_idx.i_time < 0 )
-                expected_date = VLC_TICK_0;
-            else
-                expected_date = test_paramsp_ctx->test_idx.i_time;
-        }
-        assert( thumbnail->date == expected_date && "Unexpected picture date");
-#endif
-    }
-    else
-        assert( !test_paramsp_ctx->test_idx.b_expected_success &&
-                "Expected a thumbnail but got a failure" );
-
-    p_ctx->b_done = true;
-    vlc_cond_signal( &p_ctx->cond );
-    vlc_mutex_unlock( &p_ctx->lock );
-}
-
-static void test_thumbnails( libvlc_instance_t* p_vlc )
-{
-    struct test_ctx ctx;
-    vlc_cond_init( &ctx.cond );
-    vlc_mutex_init( &ctx.lock );
-
-    for ( size_t i = 0; i < ARRAY_SIZE(test_params); ++i)
-    {
-        char* psz_mrl;
-
-        ctx.test_idx = i;
-        ctx.b_done = false;
-
-        vlc_thumbnailer_t* p_thumbnailer = vlc_thumbnailer_Create(
-                    VLC_OBJECT( p_vlc->p_libvlc_int ), test_paramsi.i_timeout );
-        assert( p_thumbnailer != NULL );
-
-
-        if ( asprintf( &psz_mrl, "mock://video_track_count=%u;audio_track_count=%u"
-                       ";length=%" PRId64 ";can_control_pace=%s;video_chroma=ARGB;video_add_track_at=%" PRId64,
-                       test_paramsi.i_nb_video_tracks,
-                       test_paramsi.i_nb_audio_tracks, MOCK_DURATION,
-                       test_paramsi.b_can_control_pace ? "true" : "false",
-                       test_paramsi.i_add_video_track_at ) < 0 )
-            assert( !"Failed to allocate mock mrl" );
-        input_item_t* p_item = input_item_New( psz_mrl, "mock item" );
-        assert( p_item != NULL );
-
-        vlc_mutex_lock( &ctx.lock );
-
-        vlc_thumbnailer_req_id id;
-        struct vlc_thumbnailer_seek_arg seek_arg;
-        if ( test_paramsi.b_use_pos )
-        {
-            seek_arg.type = VLC_THUMBNAILER_SEEK_POS;
-            seek_arg.pos = test_paramsi.f_pos;
-            seek_arg.speed = test_paramsi.b_fast_seek ?
-                VLC_THUMBNAILER_SEEK_FAST : VLC_THUMBNAILER_SEEK_PRECISE;
-        }
-        else
-        {
-            seek_arg.type = VLC_THUMBNAILER_SEEK_TIME;
-            seek_arg.time = test_paramsi.i_time;
-            seek_arg.speed = test_paramsi.b_fast_seek ?
-                VLC_THUMBNAILER_SEEK_FAST : VLC_THUMBNAILER_SEEK_PRECISE;
-        }
-        static const struct vlc_thumbnailer_cbs cbs = {
-            .on_ended = thumbnailer_callback,
-        };
-        id = vlc_thumbnailer_Request( p_thumbnailer, p_item, &seek_arg,
-                                      &cbs, &ctx );
-        assert( id != VLC_THUMBNAILER_REQ_ID_INVALID );
-
-        while ( ctx.b_done == false )
-            vlc_cond_wait( &ctx.cond, &ctx.lock );
-
-        vlc_mutex_unlock( &ctx.lock );
-
-        input_item_Release( p_item );
-        free( psz_mrl );
-
-        vlc_thumbnailer_Delete( p_thumbnailer );
-    }
-}
-
-static void thumbnailer_callback_cancel( picture_t* p_thumbnail, void *data )
-{
-    (void) data;
-    /* This callback should not be called since the request is cancelled */
-    assert( p_thumbnail == NULL );
-}
-
-static void test_cancel_thumbnail( libvlc_instance_t* p_vlc )
-{
-    vlc_thumbnailer_t* p_thumbnailer = vlc_thumbnailer_Create(
-                VLC_OBJECT( p_vlc->p_libvlc_int ), VLC_TICK_INVALID );
-    assert( p_thumbnailer != NULL );
-
-    const char* psz_mrl = "mock://video_track_count=0;audio_track_count=1;"
-                          /* force timeout: parsing will take the same time as length */
-                          "can_control_pace=false;"
-                          "length=200";
-    input_item_t* p_item = input_item_New( psz_mrl, "mock item" );
-    assert( p_item != NULL );
-
-    static const struct vlc_thumbnailer_cbs cbs = {
-        .on_ended = thumbnailer_callback_cancel,
-    };
-
-    vlc_thumbnailer_req_id id =
-        vlc_thumbnailer_Request( p_thumbnailer, p_item, NULL, &cbs, NULL );
-
-    vlc_thumbnailer_Cancel( p_thumbnailer, id );
-
-    /* Check that thumbnailer_callback_cancel is not called, even after the
-     * normal termination of the parsing. */
-    (vlc_tick_sleep)(VLC_TICK_FROM_MS(250));
-
-    input_item_Release( p_item );
-
-    vlc_thumbnailer_Delete( p_thumbnailer );
-}
-
-int main( void )
-{
-    test_init();
-
-    static const char * argv = {
-        "-v",
-        "--ignore-config",
-    };
-    libvlc_instance_t *vlc = libvlc_new(ARRAY_SIZE(argv), argv);
-    assert(vlc);
-
-    test_thumbnails( vlc );
-    test_cancel_thumbnail( vlc );
-
-    libvlc_release( vlc );
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/AUTHORS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/AUTHORS Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/Cargo.toml Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/NEWS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/NEWS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/bin/breakpad.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/bin/breakpad.cpp Changed

@@ -30,6 +30,7 @@
 #include <memory>
 #include <map>
 #include <string>
+#include <sstream>
 
 using google_breakpad::ExceptionHandler;
 
@@ -47,10 +48,10 @@
 
 void CheckCrashDump( const wchar_t* path )
 {
-    wchar_t patternMAX_PATH;
+    std::wstringstream pattern;
     WIN32_FIND_DATAW data;
-    _snwprintf( pattern, MAX_PATH, L"%s/*.dmp", path );
-    HANDLE h = FindFirstFileW( pattern, &data );
+    pattern << path << L"/*.dmp";
+    HANDLE h = FindFirstFileW( pattern.str().c_str(), &data );
     if (h == INVALID_HANDLE_VALUE)
         return;
     int answer = MessageBoxW( NULL, L"Ooops: VLC media player just crashed.\n" \
@@ -61,17 +62,17 @@
     paramsL"ver" = WIDEN(PACKAGE_VERSION);
     do
     {
-        wchar_t fullPathMAX_PATH;
-        _snwprintf( fullPath, MAX_PATH, L"%s/%s", path, data.cFileName );
+        std::wstringstream fullPath;
+        fullPath << path << L'/' << data.cFileName;
         if( answer == IDYES )
         {
             std::map<std::wstring, std::wstring> files;
-            filesL"upload_file_minidump" = fullPath;
+            filesL"upload_file_minidump" = fullPath.str();
             google_breakpad::HTTPUpload::SendRequest(
                             WIDEN( BREAKPAD_URL "/reports" ), params, files,
                             NULL, NULL, NULL );
         }
-        DeleteFileW( fullPath );
+        DeleteFileW( fullPath.str().c_str() );
     } while ( FindNextFileW( h, &data ) );
     FindClose(h);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/bin/darwinvlc.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/bin/darwinvlc.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/bin/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/bin/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/bin/winvlc.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/bin/winvlc.c Changed

@@ -59,41 +59,8 @@
     return out;
 }
 
-#if (_WIN32_WINNT < _WIN32_WINNT_WIN8)
-static BOOL SetDefaultDllDirectories_(DWORD flags)
-{
-    HMODULE h = GetModuleHandle(TEXT("kernel32.dll"));
-    if (h == NULL)
-        return FALSE;
-
-    BOOL (WINAPI * SetDefaultDllDirectoriesReal)(DWORD);
-
-    SetDefaultDllDirectoriesReal = (BOOL (WINAPI *)(DWORD))
-                                    GetProcAddress(h, "SetDefaultDllDirectories");
-    if (SetDefaultDllDirectoriesReal == NULL)
-        return FALSE;
-
-    return SetDefaultDllDirectoriesReal(flags);
-}
-# define SetDefaultDllDirectories SetDefaultDllDirectories_
-
-#endif
-
 static void PrioritizeSystem32(void)
 {
-#ifndef HAVE_PROCESS_MITIGATION_IMAGE_LOAD_POLICY
-    typedef struct _PROCESS_MITIGATION_IMAGE_LOAD_POLICY {
-      union {
-        DWORD  Flags;
-        struct {
-          DWORD NoRemoteImages  :1;
-          DWORD NoLowMandatoryLabelImages  :1;
-          DWORD PreferSystem32Images  :1;
-          DWORD ReservedFlags  :29;
-        };
-      };
-    } PROCESS_MITIGATION_IMAGE_LOAD_POLICY;
-#endif
 #if _WIN32_WINNT < _WIN32_WINNT_WIN8
     BOOL (WINAPI *SetProcessMitigationPolicy)(PROCESS_MITIGATION_POLICY, PVOID, SIZE_T);
     HINSTANCE h_Kernel32 = GetModuleHandle(TEXT("kernel32.dll"));

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/buildsystem/simd_checks/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/buildsystem/simd_checks/meson.build Changed

@@ -1,7 +1,14 @@
 # SIMD checks
 
+enable_sse = false
+enable_avx = false
+if host_machine.cpu_family().startswith('x86')
+    enable_sse = get_option('sse').allowed()
+    enable_avx = get_option('avx').allowed()
+endif
+
 # Check for fully workin SSE2 intrinsics
-have_sse2_intrinsics = cc.compiles('''
+have_sse2_intrinsics = enable_sse and cc.compiles('''
     #include <emmintrin.h>
     #include <stdint.h>
     uint64_t frobzor;
@@ -18,69 +25,83 @@
         frobzor = (uint64_t)_mm_movepi64_pi64(a);
     }
 ''', args: '-msse2', name: 'SSE2 intrinsics check')
-cdata.set('HAVE_SSE2_INTRINSICS', have_sse2_intrinsics)
+if have_sse2_intrinsics
+    cdata.set('HAVE_SSE2_INTRINSICS', 1)
+endif
 
 # Check for SSE2 inline assembly support
-can_compile_sse2 = cc.compiles('''
+can_compile_sse2 = enable_sse and cc.compiles('''
     void f() {
         void *p;
         asm volatile("punpckhqdq %%xmm1,%%xmm2"::"r"(p):"xmm1", "xmm2");
     }
 ''', args: '-msse', name: 'SSE2 inline asm check')
-cdata.set('CAN_COMPILE_SSE2', can_compile_sse2)
+if can_compile_sse2
+    cdata.set('CAN_COMPILE_SSE2', 1)
+endif
 have_sse2 = can_compile_sse2
 
 # Check for SSE3 inline assembly support
-can_compile_sse3 = cc.compiles('''
+can_compile_sse3 = enable_sse and cc.compiles('''
     void f() {
         void *p;
         asm volatile("movsldup %%xmm1,%%xmm0"::"r"(p):"xmm0", "xmm1");
     }
 ''', args: '-msse', name: 'SSE3 inline asm check')
-cdata.set('CAN_COMPILE_SSE3', can_compile_sse3)
+if can_compile_sse3
+    cdata.set('CAN_COMPILE_SSE3', 1)
+endif
 
 # Check for SSSE3 inline assembly support
-can_compile_2_sse3 = cc.compiles('''
+can_compile_2_sse3 = enable_sse and cc.compiles('''
     void f() {
         void *p;
         asm volatile("pabsw %%xmm0,%%xmm0"::"r"(p):"xmm0");
     }
 ''', args: '-msse', name: 'SSSE3 inline asm check')
-cdata.set('CAN_COMPILE_SSSE3', can_compile_2_sse3)
+if can_compile_2_sse3
+    cdata.set('CAN_COMPILE_SSSE3', 1)
+endif
 have_sse3 = can_compile_sse3 and can_compile_2_sse3
 
 # Check for SSE4.1 inline assembly support
-can_compile_sse4_1 = cc.compiles('''
+can_compile_sse4_1 = enable_sse and cc.compiles('''
     void f() {
         void *p;
         asm volatile("pmaxsb %%xmm1,%%xmm0"::"r"(p):"xmm0", "xmm1");
     }
 ''', args: '-msse', name: 'SSE4.1 inline asm check')
-cdata.set('CAN_COMPILE_SSE4_1', can_compile_sse4_1)
+if can_compile_sse4_1
+    cdata.set('CAN_COMPILE_SSE4_1', 1)
+endif
 have_sse4_1 = can_compile_sse4_1
 
 # Check for SSE4.2 inline assembly support
-can_compile_sse4_2 = cc.compiles('''
+can_compile_sse4_2 = enable_sse and cc.compiles('''
     void f() {
         void *p;
         asm volatile("pcmpgtq %%xmm1,%%xmm0"::"r"(p):"xmm0", "xmm1");
     }
 ''', args: '-msse', name: 'SSE4.2 inline asm check')
-cdata.set('CAN_COMPILE_SSE4_2', can_compile_sse4_2)
+if can_compile_sse4_2
+    cdata.set('CAN_COMPILE_SSE4_2', 1)
+endif
 have_sse4_2 = can_compile_sse4_2
 
 # Check for SSE4A inline assembly support
-can_compile_sse4A = cc.compiles('''
+can_compile_sse4A = enable_sse and cc.compiles('''
     void f() {
         void *p;
         asm volatile("insertq %%xmm1,%%xmm0"::"r"(p):"xmm0", "xmm1");
     }
 ''', args: '-msse', name: 'SSE4A inline asm check')
-cdata.set('CAN_COMPILE_SSE4A', can_compile_sse4A)
+if can_compile_sse4A
+    cdata.set('CAN_COMPILE_SSE4A', 1)
+endif
 have_sse4A = can_compile_sse4A
 
 # Check for fully workin AVX2 intrinsics
-have_avx2_intrinsics = cc.compiles('''
+have_avx2_intrinsics = enable_avx and cc.compiles('''
     #include <immintrin.h>
     #include <stdint.h>
     uint64_t frobzor;
@@ -97,26 +118,32 @@
         frobzor = (uint64_t)_mm256_extract_epi64(a, 0);
     }
 ''', args: '-mavx2', name: 'AVX2 intrinsics check')
-cdata.set('HAVE_AVX2_INTRINSICS', have_avx2_intrinsics)
+if have_avx2_intrinsics
+    cdata.set('HAVE_AVX2_INTRINSICS', 1)
+endif
 
 # Check for AVX inline assembly support
-can_compile_avx = cc.compiles('''
+can_compile_avx = enable_avx and cc.compiles('''
     void f() {
         void *p;
         asm volatile("vxorps %%ymm1,%%ymm2,%%ymm3"::"r"(p):"ymm1", "ymm2", "ymm3");
     }
 ''', args: '-mavx', name: 'AVX inline asm check')
-cdata.set('CAN_COMPILE_AVX', can_compile_avx)
+if can_compile_avx
+    cdata.set('CAN_COMPILE_AVX', 1)
+endif
 have_avx = can_compile_avx
 
 # Check for AVX2 inline assembly support
-can_compile_avx2 = cc.compiles('''
+can_compile_avx2 = enable_avx and cc.compiles('''
     void f() {
         void *p;
         asm volatile("vpunpckhqdq %%ymm1,%%ymm2,%%ymm3"::"r"(p):"ymm1", "ymm2", "ymm3");
     }
 ''', args: '-mavx', name: 'AVX2 inline asm check')
-cdata.set('CAN_COMPILE_AVX2', can_compile_avx2)
+if can_compile_avx2
+    cdata.set('CAN_COMPILE_AVX2', 1)
+endif
 have_avx2 = can_compile_avx2
 
 # TODO: ARM Neon checks and SVE checks

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/compat/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/compat/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/compat/clock_nanosleep.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/compat/clock_nanosleep.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/compat/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/compat/meson.build Changed

@@ -11,3 +11,49 @@
         install_dir: get_option('libdir') / 'vlc'
     )
 endif
+
+heap_alloc_env = environment({'ASAN_OPTIONS': 'allocator_may_return_null=1'})
+vlc_tests += {
+    'name': 'heap',
+    'sources': files('test/heap.c'),
+    'suite': 'compat',
+    'link_with': vlc_libcompat,
+    'env': heap_alloc_env,
+}
+
+vlc_tests += {
+    'name': 'strnstr',
+    'sources': files('test/strnstr.c'),
+    'suite': 'compat',
+    'link_with': vlc_libcompat,
+}
+
+vlc_tests += {
+    'name': 'ckd_ckd',
+    'sources': files('test/ckd.c'),
+    'c_args': '-DTEST_CKD',
+    'suite': 'compat',
+    'link_with': vlc_libcompat,
+}
+
+ckd_builtin_cargs = '-DTEST_BUILTIN'
+if cdata.has('HAVE_STDCKDINT_H')
+    ckd_builtin_cargs += '-DHAVE_CKD'
+endif
+vlc_tests += {
+    'name': 'ckd_builtin',
+    'sources': files('test/ckd.c'),
+    'c_args': ckd_builtin_cargs,
+    'suite': 'compat',
+    'link_with': vlc_libcompat,
+}
+
+vlc_tests += {
+    'name': 'ckd_compat',
+    'sources': files('test/ckd.c'),
+    'c_args': '-DTEST_COMPAT',
+    'suite': 'compat',
+    'link_with': vlc_libcompat,
+}
+
+#TODO: add clock_nanosleep test for Darwin

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/compat/stdbit/stdbit.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/compat/stdbit/stdbit.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/compat/stdckdint/stdckdint.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/compat/stdckdint/stdckdint.h Changed

@@ -45,8 +45,72 @@
     return b > 0 && a > (MAX / b); \
 }
 
+#  define __ckd_signed_common(suffix, type, MIN, MAX) \
+static inline _Bool __ckd_add_##suffix(type *r, type a, type b) \
+{ \
+    union suffix ua = { .v = a }; \
+    union suffix ub = { .v = b }; \
+    union suffix ur = { .uv = ua.uv + ub.uv }; \
+    *r = ur.v; \
+    if ((b > 0 && a > (MAX - b)) || (b < 0 && a < (MIN - b))) \
+        return 1; \
+    return 0; \
+} \
+\
+static inline _Bool __ckd_sub_##suffix(type *r, type a, type b) \
+{ \
+    union suffix ua = { .v = a }; \
+    union suffix ub = { .v = b }; \
+    union suffix ur = { .uv = ua.uv - ub.uv }; \
+    *r = ur.v; \
+    if ((b < 0 && a > (MAX + b)) || (b > 0 && a < (MIN + b))) \
+        return 1; \
+    return 0; \
+} \
+\
+static inline _Bool __ckd_mul_##suffix(type *r, type a, type b) \
+{ \
+    union suffix ua = { .v = a }; \
+    union suffix ub = { .v = b }; \
+    union suffix ur = { .uv = ua.uv * ub.uv }; \
+    *r = ur.v; \
+    if (a > 0) { \
+        if (b > 0) { \
+            if (a > (MAX / b)) return 1; \
+        } else if (b < 0) { \
+            if (b < (MIN / a)) return 1; \
+        } \
+    } else if (a < 0) { \
+        if (b > 0) { \
+            if (a < (MIN / b)) return 1; \
+        } else if (b < 0) { \
+            if (b < (MAX / a)) return 1; \
+        } \
+    } \
+    return 0; \
+}
+
+#  define __ckd_signed(suffix, type, MIN, MAX) \
+union suffix { \
+    unsigned type uv; \
+    type v; \
+}; \
+__ckd_signed_common(suffix, type, MIN, MAX)
+
+#  define __ckd_signed_forced(suffix, type, MIN, MAX) \
+union suffix { \
+    unsigned type uv; \
+    signed type v; \
+}; \
+__ckd_signed_common(suffix, signed type, MIN, MAX)
+
 #  define __ckd_func(op, r, a, b) \
     _Generic (*(r), \
+        signed char:        __ckd_##op##_sc((signed char *)(r), a, b), \
+        short:              __ckd_##op##_ss((short *)(r), a, b), \
+        int:                __ckd_##op##_si((int *)(r), a, b), \
+        long:               __ckd_##op##_sl((long *)(r), a, b), \
+        long long:          __ckd_##op##_sll((long long *)(r), a, b), \
         unsigned char:      __ckd_##op##_uc((unsigned char *)(r), a, b), \
         unsigned short:     __ckd_##op##_us((unsigned short *)(r), a, b), \
         unsigned int:       __ckd_##op##_ui((unsigned int *)(r), a, b), \
@@ -59,6 +123,12 @@
 __ckd_unsigned(ul,  unsigned long,      ULONG_MAX)
 __ckd_unsigned(ull, unsigned long long, ULLONG_MAX)
 
+__ckd_signed_forced(sc,  char, SCHAR_MIN, SCHAR_MAX)
+__ckd_signed(ss,  short,       SHRT_MIN,  SHRT_MAX)
+__ckd_signed(si,  int,         INT_MIN,   INT_MAX)
+__ckd_signed(sl,  long,        LONG_MIN,  LONG_MAX)
+__ckd_signed(sll, long long,   LLONG_MIN, LLONG_MAX)
+
 #  define ckd_add(r, a, b) __ckd_func(add, r, a, b)
 #  define ckd_sub(r, a, b) __ckd_func(sub, r, a, b)
 #  define ckd_mul(r, a, b) __ckd_func(mul, r, a, b)

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/compat/test/ckd.c Added

@@ -0,0 +1,115 @@
+/*****************************************************************************
+ * stdckdint.h test case
+ *****************************************************************************
+ * Copyright © 2025 VideoLabs, VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <limits.h>
+#undef NDEBUG
+#include <assert.h>
+
+#if defined (TEST_CKD)
+# ifdef HAVE_CKD
+#  include "../include/stdckdint.h" /* Force include on the compiler path */
+# else
+#  define SKIP /* can't test it */
+# endif
+#elif defined (TEST_BUILTIN)
+# if defined(__GNUC__) || defined(__clang__)
+#  undef __STDC_VERSION_STDCKDINT_H__
+#  include "../stdckdint/stdckdint.h" /* Force include on the compat path */
+# else
+#  define SKIP /* can't test it */
+# endif
+#elif defined (TEST_COMPAT)
+# undef __STDC_VERSION_STDCKDINT_H__
+# undef __GNUC__
+# undef __clang__
+# include "../stdckdint/stdckdint.h"
+#else
+# error TEST_ not defined
+#endif
+
+int main(void)
+{
+#ifdef SKIP
+    return 77;
+#else
+    unsigned long long ures;
+    long long res;
+
+    /* multiplication */
+
+    /* zero */
+    assert(!ckd_mul(&ures, 0, 0) && ures == 0);
+    assert(!ckd_mul(&ures, 0, 1) && ures == 0);
+    assert(!ckd_mul(&ures, 1, 0) && ures == 0);
+
+    /* small cases */
+    assert(!ckd_mul(&ures, 2, 3) && ures == 6);
+    assert(!ckd_mul(&res, -3, 3) && res == -9);
+    assert(!ckd_mul(&res, -3, -3) && res == 9);
+
+    /* near positive overflow */
+    assert(!ckd_mul(&res, LLONG_MAX, 1) && res == LLONG_MAX);
+    assert(!ckd_mul(&res, LLONG_MAX / 2, 2) && res == LLONG_MAX / 2 * 2);
+    assert(ckd_mul(&res, LLONG_MAX, 2) && res == -2);
+    assert(!ckd_mul(&res, LLONG_MAX, -1) && res == -LLONG_MAX);
+
+    /* near negative overflow */
+    assert(!ckd_mul(&res, LLONG_MIN, 1) && res == LLONG_MIN);
+    assert(ckd_mul(&res, LLONG_MIN, -1) && res == LLONG_MIN);
+
+    /* additions */
+
+    /* small cases */
+    assert(!ckd_add(&ures, 0, 0) && ures == 0);
+    assert(!ckd_add(&ures, 0, 1) && ures == 1);
+    assert(!ckd_add(&ures, 1, 0) && ures == 1);
+    assert(!ckd_add(&ures, 1, 1) && ures == 2);
+
+    /* big edge cases */
+    assert(!ckd_add(&ures, ULLONG_MAX, 0ULL) && ures == ULLONG_MAX);
+    assert(!ckd_add(&ures, ULLONG_MAX - 1ULL, 1ULL) && ures == ULLONG_MAX);
+    assert(ckd_add(&ures, ULLONG_MAX, 1ULL) && ures == 0);
+    assert(ckd_add(&res, LLONG_MAX, 1ULL) && res == LLONG_MIN);
+
+    /* subtractions */
+
+    /* small cases */
+    assert(!ckd_sub(&ures, 0, 0) && ures == 0);
+    assert(!ckd_sub(&ures, 1, 0) && ures == 1);
+    assert(!ckd_sub(&ures, 1, 1) && ures == 0);
+
+    /* 0 - 1 */
+    assert(ckd_sub(&ures, 0, 1) && ures == ULLONG_MAX);
+    assert(!ckd_sub(&res, 0, 1) && res == -1);
+
+    /* edge cases: */
+    assert(!ckd_sub(&ures, ULLONG_MAX, 0) && ures == ULLONG_MAX);
+    assert(!ckd_sub(&ures, ULLONG_MAX, 1) && ures == ULLONG_MAX - 1ULL);
+    assert(ckd_sub(&ures, 0ULL, ULLONG_MAX) && ures == 1);
+    assert(ckd_sub(&ures, 2, 3) && ures == ULLONG_MAX);
+    assert(ckd_sub(&res, LLONG_MIN, 1) && res == LLONG_MAX);
+
+    return 0;
+#endif
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/config.h.meson -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/config.h.meson Changed

@@ -3,6 +3,12 @@
 /* Define to 1 to allow running VLC as root (uid 0). */
 #mesondefine ALLOW_RUN_AS_ROOT
 
+/* Define to 1 if AVX inline assembly is available. */
+#mesondefine CAN_COMPILE_AVX
+
+/* Define to 1 if AVX2 inline assembly is available. */
+#mesondefine CAN_COMPILE_AVX2
+
 /* Define to 1 if SSE2 inline assembly is available. */
 #mesondefine CAN_COMPILE_SSE2
 
@@ -61,6 +67,9 @@
 /* Define to 1 if you have the `aligned_alloc' function. */
 #mesondefine HAVE_ALIGNED_ALLOC
 
+/* AMD HQScaler supported */
+#mesondefine HAVE_AMF_SCALER
+
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #mesondefine HAVE_ARPA_INET_H
 
@@ -76,6 +85,9 @@
 /* Support for __attribute__((packed)) for structs */
 #mesondefine HAVE_ATTRIBUTE_PACKED
 
+/* Define to 1 if AVX2 intrinsics are available. */
+#mesondefine HAVE_AVX2_INTRINSICS
+
 /* Define to 1 if you have the `backtrace' function. */
 #mesondefine HAVE_BACKTRACE
 
@@ -83,6 +95,9 @@
    standard. */
 #mesondefine HAVE_BROKEN_QSORT_R
 
+/* Define if CSS engine is built */
+#mesondefine HAVE_CSS
+
 /* Define to 1 if C++ headers define locale_t */
 #mesondefine HAVE_CXX_LOCALE_T
 
@@ -95,6 +110,9 @@
 /* Define to 1 if you have the `dup3' function. */
 #mesondefine HAVE_DUP3
 
+/* Define to 1 if you have the <dxgidebug.h> header file. */
+#mesondefine HAVE_DXGIDEBUG_H
+
 /* Define to 1 if you have the `eventfd' function. */
 #mesondefine HAVE_EVENTFD
 
@@ -131,6 +149,9 @@
 /* Define to 1 if you have the <sys/auxv.h> header file */
 #mesondefine HAVE_SYS_AUXV_H
 
+/* Defined if having gcrypt */
+#mesondefine HAVE_GCRYPT
+
 /* Define to 1 if you have the `getauxval' function. */
 #mesondefine HAVE_GETAUXVAL
 
@@ -193,8 +214,6 @@
  * Library check macros
  */
 
-
-
 /* TODO: Properly check for the avformat header
  */
 #define HAVE_LIBAVFORMAT_AVFORMAT_H 1
@@ -214,6 +233,9 @@
 /* Define to 1 if you have the `localtime_r' function. */
 #mesondefine HAVE_LOCALTIME_R
 
+/* Define to 1 if you have the lrintf function */
+#mesondefine HAVE_LRINTF
+
 /* Define to 1 if the system has the type `max_align_t'. */
 #mesondefine HAVE_MAX_ALIGN_T
 
@@ -232,6 +254,8 @@
 /* Define to 1 if you have the `mmap' function. */
 #mesondefine HAVE_MMAP
 
+/* Define to 1 if you have the <mpc/mpcdec.h> header file. */
+#mesondefine HAVE_MPC_MPCDEC_H
 
 /* Define to 1 if you have the NANF function */
 #mesondefine HAVE_NANF
@@ -269,13 +293,15 @@
 /* Define to 1 if you have the `posix_memalign' function. */
 #mesondefine HAVE_POSIX_MEMALIGN
 
-/* Define to 1 if the system has the type
-   `PROCESS_MITIGATION_IMAGE_LOAD_POLICY'. */
-#mesondefine HAVE_PROCESS_MITIGATION_IMAGE_LOAD_POLICY
+/* Define to 1 if using libprojectM 2.x */
+#mesondefine HAVE_PROJECTM2
 
 /* Define to 1 if you have the <pthread.h> header file. */
 #mesondefine HAVE_PTHREAD_H
 
+/* Define to 1 if you have the `qsort_r' function. */
+#mesondefine HAVE_QSORT_R
+
 /* Define to 1 if you have the `readv' function. */
 #mesondefine HAVE_READV
 
@@ -426,9 +452,15 @@
 /* Define to 1 if you have the `writev' function. */
 #mesondefine HAVE_WRITEV
 
+/* Use external asm on x86. */
+#mesondefine HAVE_X86ASM
+
 /* Define to 1 if you have the <xlocale.h> header file. */
 #mesondefine HAVE_XLOCALE_H
 
+/* Define to 1 if you have zlib. */
+#mesondefine HAVE_ZLIB
+
 /* Define to 1 if you have the <zlib.h> header file. */
 #mesondefine HAVE_ZLIB_H
 
@@ -551,7 +583,7 @@
 // #undef ZVBI_COMPILED
 
 /* Define to 64 for large files support. */
-#mesondefine _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
 
 /* Alias fdatasync() to fsync() if missing. */
 #mesondefine fdatasync

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/configure.ac -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/configure.ac Changed

@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_COPYRIGHT(Copyright 1999-2024 VLC authors and VideoLAN)
+AC_COPYRIGHT(Copyright 1999-2025 VLC authors and VideoLAN)
 
 AC_INIT(vlc, 4.0.0-dev)
 VERSION_MAJOR=4
@@ -19,7 +19,7 @@
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Otto Chriek"
-COPYRIGHT_YEARS="1996-2024"
+COPYRIGHT_YEARS="1996-2025"
 
 AC_CONFIG_SRCDIR(src/libvlc.c)
 AC_CONFIG_AUX_DIR(autotools)
@@ -118,11 +118,11 @@
 case "${host_cpu}" in
     i?86)
     X86ASMFLAGS="-f elf32"
-    X86ASMDEFS="-DARCH_X86_32=1 -DARCH_X86_64=0"
+    X86ASMDEFS="-DARCH_X86_64=0"
         ;;
     x86_64)
     X86ASMFLAGS="-f elf64"
-    X86ASMDEFS="-DARCH_X86_32=0 -DARCH_X86_64=1"
+    X86ASMDEFS="-DARCH_X86_64=1"
         ;;
 esac
 
@@ -379,11 +379,15 @@
                 WINDOWS_ARCH="arm"
                 PROGRAMFILES="PROGRAMFILES"
             ;;
-            *)
+            i?86)
                 WINDOWS_ARCH="x86"
                 PROGRAMFILES="PROGRAMFILES"
                 X86ASMFLAGS="-f win32"
                 X86ASMDEFS="${X86ASMDEFS} -DPREFIX"
+                AX_APPEND_FLAG(-Wl,--large-address-aware, LDFLAGS)
+            ;;
+            *)
+                AC_MSG_ERROR(Unsupported Windows architecture ${host_cpu})
             ;;
         esac
         AC_SUBST(WINDOWS_ARCH)
@@ -407,7 +411,7 @@
     AC_LIBOBJ(gai_strerror)
     AC_CHECK_FUNCS(if_nametoindex)
     X86ASMFLAGS="-f aout"
-    X86ASMDEFS="-DARCH_X86_32=1 -DARCH_X86_64=0 -DPREFIX"
+    X86ASMDEFS="-DARCH_X86_64=0 -DPREFIX"
     ;;
   *emscripten*)
     SYS=emscripten
@@ -451,7 +455,7 @@
 dnl WinRT
 AC_ARG_ENABLE(winstore_app,
      AS_HELP_STRING(--enable-winstore-app,
-                    Build targetted for Windows Store apps (default disabled)))
+                    Build targeted for Windows Store apps (default disabled)))
 
 vlc_winstore_app=0
 AS_IF(test "${SYS}" = "mingw32",
@@ -490,6 +494,8 @@
 )
 
 AM_CONDITIONAL(HAVE_FREEBSD, test "${SYS}" = "freebsd")
+AM_CONDITIONAL(HAVE_NETBSD,  test "${SYS}" = "netbsd")
+AM_CONDITIONAL(HAVE_OPENBSD, test "${SYS}" = "openbsd")
 AM_CONDITIONAL(HAVE_LINUX,   test "${SYS}" = "linux")
 AM_CONDITIONAL(HAVE_ANDROID, test "${VENDOR}" = "android")
 AM_CONDITIONAL(HAVE_OS2,     test "${SYS}" = "os2")
@@ -687,7 +693,7 @@
 #endif
     ), 
 
-dnl Check for broken versions of mingw-runtime compatability library
+dnl Check for broken versions of mingw-runtime compatibility library
     AC_MSG_CHECKING(for broken mingw-runtime)
     AC_PREPROC_IFELSE(AC_LANG_SOURCE(
 #include <_mingw.h>
@@ -738,7 +744,7 @@
 
 
 dnl
-dnl Buggy glibc prevention. Purposedly not cached.
+dnl Buggy glibc prevention. Purposely not cached.
 dnl See sourceware.org bugs 5058 and 5443.
 dnl Ubuntu alone has 20 bug numbers for this...
 dnl
@@ -768,7 +774,7 @@
 need_libc=false
 
 dnl Check for usual libc functions
-AC_CHECK_FUNCS(accept4 dup3 fcntl flock fstatat fstatvfs fork getmntent_r getenv getpwuid_r isatty memalign mkostemp mmap open_memstream newlocale pipe2 posix_fadvise setlocale uselocale wordexp)
+AC_CHECK_FUNCS(accept4 dup3 fcntl flock fstatat fstatvfs fork getmntent_r getenv getpwuid_r isatty memalign mkostemp mmap open_memstream newlocale pipe2 posix_fadvise qsort_r setlocale uselocale wordexp)
 AC_REPLACE_FUNCS(aligned_alloc asprintf atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lfind lldiv localtime_r memrchr nrand48 poll posix_memalign readv recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp vasprintf writev)
 AC_REPLACE_FUNCS(gettimeofday)
 AC_CHECK_FUNC(fdatasync,,
@@ -791,6 +797,8 @@
     ;;
 esac
 
+AM_CONDITIONAL(HAVE_QSORT_R, test "x$ac_cv_func_qsort_r" = "xyes")
+
 AH_BOTTOM(#include <vlc_fixups.h>)
 
 dnl Check for struct timespec
@@ -935,12 +943,10 @@
 , AC_MSG_RESULT(no))
 
 dnl __STDC_NO_THREADS__ can't be trusted on some platforms.
-dnl check for its availability explicitely
+dnl check for its availability explicitly
 AC_CHECK_HEADERS(threads.h)
 
-AC_CHECK_LIB(anl,getaddrinfo_a,
-  AC_DEFINE(HAVE_LIBANL, 1, Define to 1 if you have the anl library)
-)
+AC_CHECK_LIB(anl,getaddrinfo_a,)
 
 dnl Check for dynamic plugins
 LIBDL=""
@@ -994,6 +1000,13 @@
 )
 AC_SUBST(LIBRT)
 
+dnl Check for libatomic
+have_libatomic="no"
+VLC_SAVE_FLAGS
+AC_SEARCH_LIBS(__atomic_load, atomic, have_libatomic="yes")
+VLC_RESTORE_FLAGS
+AM_CONDITIONAL(HAVE_LIBATOMIC, test "${have_libatomic}" = "yes")
+
 dnl  Check for clock_* functions, needs to be done here,
 dnl  after the -lrt check
 AC_REPLACE_FUNCS(clock_gettime clock_nanosleep clock_getres)
@@ -1005,17 +1018,16 @@
 AC_CHECK_HEADER(stdbit.h,, 
   CPPFLAGS="${CPPFLAGS} -I\$(top_srcdir)/compat/stdbit"
 )
-AC_CHECK_HEADER(stdckdint.h,, 
+have_stdckdint="no"
+AC_CHECK_HEADER(stdckdint.h, 
+  have_stdckdint="yes"
+, 
   CPPFLAGS="${CPPFLAGS} -I\$(top_srcdir)/compat/stdckdint"
 )
+AM_CONDITIONAL(HAVE_STDCKDINT, test "${have_stdckdint}" = "yes")
 
 dnl  POSIX
-AC_CHECK_HEADERS(arpa/inet.h poll.h pthread.h search.h sys/shm.h sys/socket.h sys/uio.h wordexp.h)
-AC_CHECK_HEADERS(net/if.h, , ,
-
-#include <sys/types.h>
-#include <sys/socket.h>
-)
+AC_CHECK_HEADERS(arpa/inet.h net/if.h poll.h pthread.h search.h sys/shm.h sys/socket.h sys/uio.h wordexp.h)
 AC_CHECK_HEADER(syslog.h, have_syslog="yes", have_syslog="no")
 AM_CONDITIONAL(HAVE_SYSLOG, test "$have_syslog" = "yes")
 
@@ -1064,7 +1076,7 @@
 
 dnl On some OS we need static linking
 AS_IF(test -n "${PKG_CONFIG}" ,
-    AS_IF(test "${SYS}" = "mingw32" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ,
+    AS_IF(test "${SYS}" = "mingw32" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" -o "${SYS}" = "emscripten" ,
         PKG_CONFIG="${PKG_CONFIG} --static"
     )
 )
@@ -1190,9 +1202,18 @@
                     Turn some warnings into compilation error (default disabled)),,
                     enable_extra_checks="no")
 AS_IF(test "${enable_extra_checks}" = "yes", 
-    AX_APPEND_COMPILE_FLAGS(-Werror=missing-field-initializers -Werror=format -Werror=incompatible-pointer-types -Werror=restrict -Werror=int-conversion -Werror=implicit-int -Werror=return-mismatch -Werror=declaration-missing-parameter-type, CFLAGS)
+    AX_APPEND_COMPILE_FLAGS(-Werror=missing-field-initializers -Werror=format -Werror=incompatible-pointer-types -Werror=restrict -Werror=int-conversion -Werror=implicit-int -Werror=return-mismatch -Werror=declaration-missing-parameter-type -Werror=excess-initializers, CFLAGS)
     AC_LANG_PUSH(C++)
-    AX_APPEND_COMPILE_FLAGS(-Werror=missing-field-initializers -Werror=format -Werror=return-mismatch, CXXFLAGS)
+    AX_APPEND_COMPILE_FLAGS(-Werror=missing-field-initializers -Werror=format -Werror=excess-initializers, CXXFLAGS)
+    AC_LANG_POP(C++)
+)
+
+# Casting incompatible functions is notoriously bug prone with emscripten:
+# https://emscripten.org/docs/porting/guidelines/function_pointer_issues.html
+AS_IF(test "${enable_extra_checks}" = "yes" && test "${SYS}" = "emscripten", 
+    AX_APPEND_COMPILE_FLAGS(-Werror=cast-function-type-strict, CFLAGS)
+    AC_LANG_PUSH(C++)
+    AX_APPEND_COMPILE_FLAGS(-Werror=cast-function-type-strict, CXXFLAGS)
     AC_LANG_POP(C++)
 )
 
@@ -1443,7 +1464,7 @@
 
 WIN32_PATH_CMD=
 AS_IF(test "${SYS}" = "mingw32", 
-    AC_MSG_CHECKING(how to transform windows pathes)
+    AC_MSG_CHECKING(how to transform windows paths)
     win32_path_cmd=no
     for win_path in "cygpath" "wslpath" "wine winepath"
     do
@@ -1944,8 +1965,6 @@
   AS_IF(test "$CARGO" = "no",
     AC_MSG_ERROR(cargo not found. cargo is required to build Rust modules)
   )
-
-  AC_DEFINE(ENABLE_RUST, 1, Define to 1 for building rust modules.)
 )
 AM_CONDITIONAL(HAVE_RUST, test "${enable_rust}" = "yes")
 
@@ -2032,10 +2051,6 @@
 AC_ARG_ENABLE(addonmanagermodules,
   AS_HELP_STRING(--disable-addonmanagermodules,
     disable the addons manager modules (default enabled)))
-if test "${enable_addonmanagermodules}" != "no"
-then
-  AC_DEFINE(ENABLE_ADDONMANAGERMODULES, 1, Define if you want the addons manager modules)
-fi
 AM_CONDITIONAL(ENABLE_ADDONMANAGERMODULES, test "${enable_addonmanagermodules}" != "no")
 
 
@@ -2224,8 +2239,10 @@
   disable NVDEC decoder (default auto)))
 have_nvdec="no"
 AS_IF(test "$enable_nvdec" != "no", 
-  AC_CHECK_HEADERS(ffnvcodec/dynlink_loader.h, 
+  PKG_CHECK_MODULES(FFNVCODEC, ffnvcodec, 
     have_nvdec="yes"
+  , 
+    AC_MSG_WARN(${FFNVCODEC_PKG_ERRORS}: nvdec will not be available.)
   )
 )
 AM_CONDITIONAL(HAVE_NVDEC, test "${have_nvdec}" != "no")
@@ -2765,7 +2782,7 @@
 dnl
 dnl DXGI debug
 dnl
-AC_CHECK_HEADERS(dxgidebug.h dxgi1_6.h d3d11_4.h)
+AC_CHECK_HEADERS(dxgidebug.h)
 
 dnl
 dnl IStorageFolder
@@ -2798,19 +2815,6 @@
 AM_CONDITIONAL(HAVE_WINDOWS_STORAGE, test "${have_iapplication_data2}" = "yes")
 
 dnl
-dnl DirectComposition
-dnl
-AC_LANG_PUSH(C++)
-AC_CHECK_HEADERS(dcomp.h, 
-    have_dcomp="yes"
-, , 
-  #include <windows.h>
-)
-AC_LANG_POP(C++)
-AM_CONDITIONAL(HAVE_DCOMP, test "${have_dcomp}" = "yes")
-
-
-dnl
 dnl  avformat demuxer/muxer plugin
 dnl
 
@@ -3128,9 +3132,9 @@
 
 
 dnl
-dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder
+dnl Intel Video Processing Library
 dnl
-PKG_ENABLE_MODULES_VLC(MFX, qsv, libmfx, Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder, auto)
+PKG_ENABLE_MODULES_VLC(VPL, qsv, vpl, Intel Video Processing Library encoder, auto)
 
 
 dnl
@@ -3150,7 +3154,7 @@
 dnl Teletext Modules
 dnl vbi decoder plugin (using libzbvi)
 dnl telx module
-dnl uncompatible
+dnl incompatible
 dnl
 AC_ARG_ENABLE(zvbi,
   AS_HELP_STRING(--enable-zvbi,VBI (inc. Teletext) decoding support with
@@ -3247,6 +3251,13 @@
 EXTEND_HELP_STRING(Video plugins:)
 
 dnl
+dnl Vulkan
+dnl
+AC_ARG_ENABLE(vulkan,
+  AS_HELP_STRING(--disable-vulkan,
+      disable Vulkan support (default auto)))
+
+dnl
 dnl  libplacebo support
 dnl
 AC_ARG_ENABLE(libplacebo,
@@ -3257,12 +3268,28 @@
 AS_IF(test "$enable_libplacebo" != "no", 
   PKG_CHECK_MODULES(LIBPLACEBO, libplacebo >= 4.192, 
     AC_DEFINE(HAVE_LIBPLACEBO, 1, Define to 1 if libplacebo is enabled.)
-    AC_CHECK_HEADER(libplacebo/vulkan.h, VLC_ADD_PLUGIN(placebo_vk))
-    AC_CHECK_HEADER(libplacebo/opengl.h, 
+
+    AS_IF(test "$enable_vulkan" != "no", 
+      AC_MSG_CHECKING(libplacebo is compiled with vulkan support)
+      PLACEBO_HAS_VULKAN="$(${PKG_CONFIG} libplacebo --variable pl_has_vulkan)"
+      AS_IF(test "${PLACEBO_HAS_VULKAN}" = "1", 
+        AC_MSG_RESULT(yes)
+        VLC_ADD_PLUGIN(placebo_vk)
+      ,
+        AC_MSG_RESULT(no)
+      )
+    )
+
+    AC_MSG_CHECKING(libplacebo is compiled with OpenGL support)
+    PLACEBO_HAS_OPENGL="$(${PKG_CONFIG} libplacebo --variable pl_has_opengl)"
+    AS_IF(test "${PLACEBO_HAS_OPENGL}" = "1", 
+        AC_MSG_RESULT(yes)
         AC_DEFINE(HAVE_LIBPLACEBO_GL, 1, Define to 1 if <libplacebo/opengl.h> is available.)
         VLC_ADD_PLUGIN(placebo_gl)
         VLC_ADD_PLUGIN(placebo_gles2)
         have_libplacebo_gl="yes"
+    ,
+        AC_MSG_RESULT(no)
     )
   , 
     AS_IF(test -n "${enable_libplacebo}", 
@@ -3314,9 +3341,6 @@
   AC_MSG_RESULT(${have_gl})
 )
 AM_CONDITIONAL(HAVE_GL, test "${have_gl}" = "yes")
-AS_IF(test "${have_gl}" = "yes", 
-  AC_DEFINE(HAVE_GL, 1, Defined if having OpenGL)
-)
 
 dnl OpenGL ES 2: depends on EGL 1.1
 PKG_HAVE_WITH_MODULES(GLES2, glesv2, enable GLES2 support (default auto))
@@ -3324,13 +3348,8 @@
 dnl
 dnl Vulkan
 dnl
-AC_ARG_ENABLE(vulkan,
-  AS_HELP_STRING(--disable-vulkan,
-      disable Vulkan support (default auto)))
-
 AS_IF(test "$enable_vulkan" != "no", 
   PKG_CHECK_MODULES(VULKAN, vulkan >= 1.0.26, 
-    AC_DEFINE(HAVE_VULKAN, 1, Define to 1 if vulkan is enabled.)
   , 
     AS_IF(test -n "${enable_vulkan}", 
       AC_MSG_ERROR(${VULKAN_PKG_ERRORS}.)
@@ -3735,6 +3754,28 @@
 EXTEND_HELP_STRING(Audio plugins:)
 
 dnl
+dnl  Pipewire module
+dnl
+AC_ARG_ENABLE(pipewire,
+  AS_HELP_STRING(--enable-pipewire,
+    use the PipeWire client library (default auto)))
+have_pipewire="no"
+AS_IF(test "${enable_pipewire}" != "no", 
+  for v in "0.3 >= 0.3.64" # list of supported package versions
+  do
+    AS_IF(test "${have_pipewire}" = "no", 
+      PKG_CHECK_MODULES(PIPEWIRE, libpipewire-${v}, 
+        have_pipewire="yes"
+      , true)
+    )
+  done
+  AS_IF(test "${enable_pipewire}" = "yes" -a "${have_pipewire}" = "no", 
+    AC_MSG_ERROR($PIPEWIRE_PKG_ERRORS. Pipewire required.)
+  )
+)
+AM_CONDITIONAL(HAVE_PIPEWIRE, test "${have_pipewire}" = "yes")
+
+dnl
 dnl  Pulseaudio module
 dnl
 AC_ARG_ENABLE(pulse,
@@ -3933,10 +3974,22 @@
     AC_PATH_PROGS(PROTOC, protoc, no, "${CONTRIB_DIR}/../bin:$PATH")
     AS_IF(test "${PROTOC}" != "no", 
         dnl silently checks the protoc version matches the protobuf library
-        PROTOBUF_VERSION="$(eval ${PROTOC} --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2)"
-        protoc_ver_next="${PROTOBUF_VERSION%.*}.$((${PROTOBUF_VERSION##*.}+1))"
+        PROTOC_FULL_VERSION="$(eval ${PROTOC} --version 2>/dev/null | head -1 | sed s/'.* '//)"
+        PROTOC_MAJ_VERSION="$(echo ${PROTOC_FULL_VERSION} | cut -d '.' -f -1)"
+        AS_IF(test "${PROTOC_MAJ_VERSION}" -lt "22" , 
+            dnl protoc x.y.z is compatible with protobuf x.y.z
+            PROTOBUF_VERSION="$(echo ${PROTOC_FULL_VERSION} | cut -d '.' -f -3)"
+            dnl the protoc version is in the x.y.z format but protobuf version is in the x.y.z.r format
+            PROTOBUF_MAX_VERSION="${PROTOBUF_VERSION%.*}.$((${PROTOBUF_VERSION##*.}+1))"
+            PROTOBUF_TEST="protobuf-lite >= ${PROTOBUF_VERSION} protobuf-lite < ${PROTOBUF_MAX_VERSION}"
+        ,
+            dnl protoc x.y is compatible with protobuf x.y.*
+            PROTOBUF_VERSION="$(echo ${PROTOC_FULL_VERSION} | cut -d '.' -f -2)"
+            PROTOBUF_MAX_VERSION="${PROTOBUF_VERSION%.*}.$((${PROTOBUF_VERSION##*.}+1))"
+            PROTOBUF_TEST="protobuf-lite >= ${PROTOBUF_VERSION} protobuf-lite < ${PROTOBUF_MAX_VERSION}"
+        )
         AC_MSG_CHECKING(protobuf-lite matches ${PROTOC} version ${PROTOBUF_VERSION})
-        ($PKG_CONFIG --exists --print-errors "protobuf-lite >= ${PROTOBUF_VERSION} protobuf-lite < ${protoc_ver_next}") 2>&AS_MESSAGE_FD
+        ($PKG_CONFIG --exists --print-errors "${PROTOBUF_TEST}") 2>&AS_MESSAGE_FD
         ac_status=$?
         AS_IF(test $ac_status = 0,
             protoc_matching=yes
@@ -3981,12 +4034,13 @@
 have_qt_gtk="no"
 have_qt_qtest="no"
 have_qt_quick_test="no"
-have_qt_declarative_private="no"
 have_qt_gui_private="no"
-have_qt_core_private="no"
+have_qt65="no"
+have_qt_zstd="no"
 have_fxc="no"
 AS_IF(test "${enable_qt}" != "no", 
   have_qt="yes"
+  dnl use any qmake that is available, including from contrib tools
   AC_PATH_PROGS(QMAKE6, qmake6, qmake6, "$PATH:${CONTRIB_DIR}/../bin")
 
   AC_ARG_WITH(qtconf,
@@ -4002,6 +4056,21 @@
     )
   )
 
+  AS_IF(test -z "${QMAKE6}", 
+    have_qt="no"
+  ,
+    AS_IF(test -n "${with_qtconf}", 
+      QT_BIN_DIRECTORY="$(${QMAKE6} -qtconf ${with_qtconf} -query QT_HOST_BINS 2>/dev/null)"
+      AC_MSG_CHECKING(if qmake6 is found with qtconf)
+      AS_IF(test -n "${QT_BIN_DIRECTORY}" -a -x "${QT_BIN_DIRECTORY}/qmake6", 
+        QMAKE6="${QT_BIN_DIRECTORY}/qmake6"
+        AC_MSG_RESULT(yes)
+      ,
+        AC_MSG_RESULT(no)
+      )
+    )
+  )
+
   QT_PATHS=${QMAKE6}
   AS_IF(test -n "${with_qtconf}", 
     QT_PATHS="${QMAKE6} -qtconf ${with_qtconf}"
@@ -4020,34 +4089,48 @@
   ,
     AC_MSG_RESULT((${QT_VERSION_CORE}) yes)
 
+  AS_IF(test "${QT_VERSION_MAJ:-0}" -gt "6" || (test "${QT_VERSION_MAJ:-0}" = "6" && test "${QT_VERSION_MIN:-0}" -ge "5"), 
+    have_qt65="yes"
+  , )
+
   QT_BIN_DIRECTORY="$(${QT_PATHS}         -query QT_HOST_BINS 2>/dev/null)"
-  QMAKE="${QT_PATHS}"
-  AC_MSG_NOTICE(using ${QMAKE})
+  AC_MSG_NOTICE(using ${QT_PATHS})
+
+  AC_CHECK_PROGS(PYTHON3, python3, no)
+  AS_IF(test "$PYTHON3" == "no", 
+    AC_MSG_WARN(python is required to detect Qt libraries/flags)
+    have_qt="no"
+  ,
 
   AC_MSG_CHECKING(for Qt libraries)
-  mkdir -p ${ac_pwd}/modules/gui/qt
-  touch    ${ac_pwd}/modules/gui/qt/.qmake.stash
-  QT_PKG_ERRORS=$(${QMAKE} ${srcdir}/modules/gui/qt/qt6.pro -o ${ac_pwd}/modules/gui/qt/qmake-qt 2>&1)
+  qmake_additional_params=""
+  AS_IF(test "${enable_debug}" != "no", 
+    qmake_additional_params="$qmake_additional_params --debug"
+  )
+  srcdir_abs=`(cd ${srcdir} && pwd -P)`
+  QT_PKG_ERRORS=$(${PYTHON3} ${srcdir}/modules/gui/qt/scripts/static_dirs.py \
+    --qmake "${QMAKE6}" --qtconf "${with_qtconf}" \
+    --pro ${srcdir_abs}/modules/gui/qt/qt6.pro \
+    --builddir ${ac_pwd}/modules/gui/qt \
+    --libs \
+    ${qmake_additional_params})
   ac_status=$?
-  AS_IF(test $ac_status = 0 && test -f ${ac_pwd}/modules/gui/qt/qmake-qt,
-      echo "get_cflags:"                    > ${ac_pwd}/modules/gui/qt/qmake-common.mk
-      echo '	$(info $(DEFINES) $(INCPATH))' >> ${ac_pwd}/modules/gui/qt/qmake-common.mk
-      echo "get_libs:"                      >> ${ac_pwd}/modules/gui/qt/qmake-common.mk
-      dnl transform /foo/bar/libbaz.so arguments to -L/foo/bar -lbaz
-      dnl RS: each arguments (space separated) are treated as a new line
-      dnl FS: split fields using /^/* to extract the file basepath ($1)
-      dnl  /lib.*\.so/ lines (arguments) will add -Lxxx if this is not the current path (p), then transform into a -lxxx argument
-      dnl other arguments are kept as-is
-      echo '	echo $(LIBS) | awk '\''BEGIN{FS="/^/*$$";RS=" ";ORS=" "}{if($$0 ~ /\/lib.*\.so/){ if(p != $$1){ print "-L" $$1; p=$$1}; sub(/.*\/lib/, "-l"); sub(/\.so.*/, "")}; print $$0}'\' >> ${ac_pwd}/modules/gui/qt/qmake-common.mk
-      echo 'get_ldflags:'                   >> ${ac_pwd}/modules/gui/qt/qmake-common.mk
-      echo '	echo $(LFLAGS)'             >> ${ac_pwd}/modules/gui/qt/qmake-common.mk
-
-      echo "include ${ac_pwd}/modules/gui/qt/qmake-common.mk"  >> ${ac_pwd}/modules/gui/qt/qmake-qt
+  AS_IF(test $ac_status = 0,
 
       AC_MSG_RESULT(yes)
-      QT_LIBS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-qt get_libs)
-      QT_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-qt get_cflags)
-      QT_LDFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-qt get_ldflags)
+      QT_LIBS=${QT_PKG_ERRORS}
+      QT_CFLAGS=$(${PYTHON3} ${srcdir}/modules/gui/qt/scripts/static_dirs.py \
+        --qmake "${QMAKE6}" --qtconf "${with_qtconf}" \
+        --pro ${srcdir_abs}/modules/gui/qt/qt6.pro \
+        --builddir ${ac_pwd}/modules/gui/qt \
+        --cflags \
+        ${qmake_additional_params})
+      QT_LDFLAGS=$(${PYTHON3} ${srcdir}/modules/gui/qt/scripts/static_dirs.py \
+        --qmake "${QMAKE6}" --qtconf "${with_qtconf}" \
+        --pro ${srcdir_abs}/modules/gui/qt/qt6.pro \
+        --builddir ${ac_pwd}/modules/gui/qt \
+        --ldflags \
+        ${qmake_additional_params})
       AC_SUBST(QT_LIBS)
       AC_SUBST(QT_CFLAGS)
       AC_SUBST(QT_LDFLAGS)
@@ -4066,9 +4149,14 @@
           AC_MSG_WARN(qmlcachegen not found)
       )
 
-      AC_CHECK_PROGS(PYTHON3, python3, no)
       AC_MSG_CHECKING(if required Qt plugins are installed with ${QMAKE6} and conf ${with_qtconf})
-      AS_IF(test "$PYTHON3" != "no" && ${PYTHON3} ${srcdir}/buildsystem/check_qml_module.py \
+
+      AS_IF(test "${have_qt65}" = "yes", 
+        qt_qml_effects_module="QtQuick.Effects"
+      , 
+        qt_qml_effects_module="Qt5Compat.GraphicalEffects"
+      )
+      AS_IF(${PYTHON3} ${srcdir}/buildsystem/check_qml_module.py \
             --qmake "${QMAKE6}" \
             --qtconf "${with_qtconf}" \
             --modules \
@@ -4077,7 +4165,7 @@
             QtQuick.Layouts="" \
             QtQuick.Window="" \
             QtQuick.Controls="" \
-            Qt5Compat.GraphicalEffects="" \
+            ${qt_qml_effects_module}="" \
             >&AS_MESSAGE_FD , 
         AC_MSG_RESULT(yes)
       ,
@@ -4086,15 +4174,45 @@
         have_qt="no"
       )
 
+      AC_MSG_CHECKING(if Qt can decompress zstd)
+      VLC_SAVE_FLAGS
+      CPPFLAGS="${CPPFLAGS} ${QT_CFLAGS}"
+      AC_COMPILE_IFELSE(
+        AC_LANG_PROGRAM(#include <qconfig.h>,
+        #if QT_FEATURE_zstd != 1
+        #error "Qt can not decompress zstd. Resources are going to be compressed using zlib."
+        #endif
+        ), 
+         have_qt_zstd="yes"
+         AC_MSG_RESULT(yes)
+        ,
+         AC_MSG_RESULT(no)
+        )
+      VLC_RESTORE_FLAGS
+
       AC_MSG_CHECKING(for Qt QTest)
-      (${QMAKE} ${srcdir}/modules/gui/qt/qtest.pro -o ${ac_pwd}/modules/gui/qt/qmake-qtest) 2>/dev/null
+      _QT_QTEST_LIBS=$(${PYTHON3} ${srcdir}/modules/gui/qt/scripts/static_dirs.py \
+            --qmake "${QMAKE6}" --qtconf "${with_qtconf}" \
+            --pro ${srcdir_abs}/modules/gui/qt/qtest.pro \
+            --builddir ${ac_pwd}/modules/gui/qt \
+            --libs \
+            ${qmake_additional_params}) 2>/dev/null
       ac_status=$?
-      AS_IF(test $ac_status = 0 && test -f ${ac_pwd}/modules/gui/qt/qmake-qtest,
-        echo "include ${ac_pwd}/modules/gui/qt/qmake-common.mk"        >> ${ac_pwd}/modules/gui/qt/qmake-qtest
+      AS_IF(test $ac_status = 0,
         AC_MSG_RESULT(yes)
-        QT_QTEST_LIBS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-qtest get_libs)
-        QT_QTEST_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-qtest get_cflags)
-        QT_QTEST_LDFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-qtest get_cflags)
+        QT_QTEST_LIBS=${_QT_QTEST_LIBS}
+        QT_QTEST_CFLAGS=$(${PYTHON3} ${srcdir}/modules/gui/qt/scripts/static_dirs.py \
+            --qmake "${QMAKE6}" --qtconf "${with_qtconf}" \
+            --pro ${srcdir_abs}/modules/gui/qt/qtest.pro \
+            --builddir ${ac_pwd}/modules/gui/qt \
+            --cflags \
+            ${qmake_additional_params})
+        QT_QTEST_LDFLAGS=$(${PYTHON3} ${srcdir}/modules/gui/qt/scripts/static_dirs.py \
+            --qmake "${QMAKE6}" --qtconf "${with_qtconf}" \
+            --pro ${srcdir_abs}/modules/gui/qt/qtest.pro \
+            --builddir ${ac_pwd}/modules/gui/qt \
+            --ldflags \
+            ${qmake_additional_params})
         AC_SUBST(QT_QTEST_LIBS)
         AC_SUBST(QT_QTEST_CFLAGS)
         AC_SUBST(QT_QTEST_LDFLAGS)
@@ -4102,22 +4220,35 @@
       ,
         AC_MSG_RESULT(no)
       )
-      rm -f ${ac_pwd}/modules/gui/qt/qmake-qtest
 
       AC_MSG_CHECKING(for QuickTest)
-      (${QMAKE} ${srcdir}/modules/gui/qt/quicktest.pro -o ${ac_pwd}/modules/gui/qt/qmake-quicktest) 2>/dev/null
+      _QT_QUICK_TEST_LIBS=$(${PYTHON3} ${srcdir}/modules/gui/qt/scripts/static_dirs.py \
+            --qmake "${QMAKE6}" --qtconf "${with_qtconf}" \
+            --pro ${srcdir_abs}/modules/gui/qt/quicktest.pro \
+            --builddir ${ac_pwd}/modules/gui/qt \
+            --libs \
+            ${qmake_additional_params}) 2>/dev/null
       ac_status=$?
-      AS_IF(test $ac_status = 0 && test -f ${ac_pwd}/modules/gui/qt/qmake-quicktest,
-        AS_IF(test "$PYTHON3" != "no" && ${PYTHON3} ${srcdir}/buildsystem/check_qml_module.py \
+      AS_IF(test $ac_status = 0,
+        AS_IF(${PYTHON3} ${srcdir}/buildsystem/check_qml_module.py \
         --qmake "${QMAKE6}" \
         --qtconf "${with_qtconf}" \
         --modules QtTest="" \
         >&AS_MESSAGE_FD , 
-            echo "include ${ac_pwd}/modules/gui/qt/qmake-common.mk"        >> ${ac_pwd}/modules/gui/qt/qmake-quicktest
             AC_MSG_RESULT(yes)
-            QT_QUICK_TEST_LIBS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-quicktest get_libs)
-            QT_QUICK_TEST_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-quicktest get_cflags)
-            QT_QUICK_TEST_LDFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-quicktest get_ldflags)
+            QT_QUICK_TEST_LIBS=${_QT_QUICK_TEST_LIBS}
+            QT_QUICK_TEST_CFLAGS=$(${PYTHON3} ${srcdir}/modules/gui/qt/scripts/static_dirs.py \
+                --qmake "${QMAKE6}" --qtconf "${with_qtconf}" \
+                --pro ${srcdir_abs}/modules/gui/qt/quicktest.pro \
+                --builddir ${ac_pwd}/modules/gui/qt \
+                --cflags \
+                ${qmake_additional_params})
+            QT_QUICK_TEST_LDFLAGS=$(${PYTHON3} ${srcdir}/modules/gui/qt/scripts/static_dirs.py \
+                --qmake "${QMAKE6}" --qtconf "${with_qtconf}" \
+                --pro ${srcdir_abs}/modules/gui/qt/quicktest.pro \
+                --builddir ${ac_pwd}/modules/gui/qt \
+                --ldflags \
+                ${qmake_additional_params})
             AC_SUBST(QT_QUICK_TEST_LIBS)
             AC_SUBST(QT_QUICK_TEST_CFLAGS)
             AC_SUBST(QT_QUICK_TEST_LDFLAGS)
@@ -4128,7 +4259,6 @@
       ,
         AC_MSG_RESULT(no)
       )
-      rm -f ${ac_pwd}/modules/gui/qt/qmake-quicktest
 
       AC_PATH_PROGS(FXC, fxc, no, ${CONTRIB_DIR}/bin)
       AS_IF(test "$FXC" != "no",
@@ -4137,60 +4267,16 @@
         AC_SUBST(FXC_PATH)
       )
 
-      AC_MSG_CHECKING(for Qt Core private)
-      (${QMAKE} ${srcdir}/modules/gui/qt/private-core.pro -o ${ac_pwd}/modules/gui/qt/qmake-private-core) 2>/dev/null
-      ac_status=$?
-      AS_IF(test $ac_status = 0 && test -f ${ac_pwd}/modules/gui/qt/qmake-private-core,
-        echo "include ${ac_pwd}/modules/gui/qt/qmake-common.mk"        >> ${ac_pwd}/modules/gui/qt/qmake-private-core
-        AC_MSG_RESULT(yes)
-        QT_CORE_PRIVATE_LIBS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-private-core get_libs)
-        QT_CORE_PRIVATE_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-private-core get_cflags)
-        QT_CORE_PRIVATE_LDFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-private-core get_cflags)
-        AC_SUBST(QT_CORE_PRIVATE_LIBS)
-        AC_SUBST(QT_CORE_PRIVATE_CFLAGS)
-        AC_SUBST(QT_CORE_PRIVATE_LDFLAGS)
-        have_qt_core_private="yes"
-      ,
-        AC_MSG_RESULT(no)
-      )
-      rm -f ${ac_pwd}/modules/gui/qt/qmake-private-core
-
       AC_MSG_CHECKING(for Qt GUI private)
-      (${QMAKE} ${srcdir}/modules/gui/qt/private-gui.pro -o ${ac_pwd}/modules/gui/qt/qmake-private-gui) 2>/dev/null
-      ac_status=$?
-      AS_IF(test $ac_status = 0 && test -f ${ac_pwd}/modules/gui/qt/qmake-private-gui,
-        echo "include ${ac_pwd}/modules/gui/qt/qmake-common.mk"        >> ${ac_pwd}/modules/gui/qt/qmake-private-gui
-
-        AC_MSG_RESULT(yes)
-        QT_GUI_PRIVATE_LIBS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-private-gui get_libs)
-        QT_GUI_PRIVATE_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-private-gui get_cflags)
-        QT_GUI_PRIVATE_LDFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-private-gui get_ldflags)
-        AC_SUBST(QT_GUI_PRIVATE_LIBS)
-        AC_SUBST(QT_GUI_PRIVATE_CFLAGS)
-        AC_SUBST(QT_GUI_PRIVATE_LDFLAGS)
-        have_qt_gui_private="yes"
-      ,
-        AC_MSG_RESULT(no)
-      )
-      rm -f ${ac_pwd}/modules/gui/qt/qmake-private-gui
-
-      AC_MSG_CHECKING(for Qt Quick private)
-      (${QMAKE} ${srcdir}/modules/gui/qt/private-quick.pro -o ${ac_pwd}/modules/gui/qt/qmake-private-quick) 2>/dev/null
-      ac_status=$?
-      AS_IF(test $ac_status = 0 && test -f ${ac_pwd}/modules/gui/qt/qmake-private-quick,
-        echo "include ${ac_pwd}/modules/gui/qt/qmake-common.mk"        >> ${ac_pwd}/modules/gui/qt/qmake-private-quick
-        AC_MSG_RESULT(yes)
-        QT_QUICK_PRIVATE_LIBS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-private-quick get_libs)
-        QT_QUICK_PRIVATE_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-private-quick get_cflags)
-        QT_QUICK_PRIVATE_LDFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-private-quick get_ldflags)
-        AC_SUBST(QT_QUICK_PRIVATE_LIBS)
-        AC_SUBST(QT_QUICK_PRIVATE_CFLAGS)
-        AC_SUBST(QT_QUICK_PRIVATE_LDFLAGS)
-        have_qt_declarative_private="yes"
-      ,
-        AC_MSG_RESULT(no)
-      )
-      rm -f ${ac_pwd}/modules/gui/qt/qmake-private-quick
+      case $QT_CFLAGS in
+        *-DQT_GUI_PRIVATE\ *)
+            AC_MSG_RESULT(yes)
+            have_qt_gui_private="yes"
+            ;;
+        *)
+            AC_MSG_RESULT(no)
+            ;;
+      esac
 
       dnl gtk theme provider
       PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.20, 
@@ -4201,9 +4287,8 @@
       have_qt="no"
     )
   )
-  rm -f ${ac_pwd}/modules/gui/qt/qmake-common.mk
-  rm -f ${ac_pwd}/modules/gui/qt/qmake-qt
-  rm -f ${ac_pwd}/modules/gui/qt/.qmake.stash
+  )
+
     AS_IF(test "${have_qt}" = "no",
       AS_IF(test -n "${enable_qt}",
         AC_MSG_ERROR(${QT_PKG_ERRORS}. If you want to build VLC without GUI, pass --disable-qt.)
@@ -4215,9 +4300,11 @@
 )
 
 AC_ARG_ENABLE(qt-qml-cache,
-  AS_HELP_STRING(--enable-qt-qml-cache,
-    enable qml cache generation))
-AM_CONDITIONAL(HAVE_QMLCACHEGEN, test "${enable_qt_qml_cache}" = "yes" && test "$QMLCACHEGEN" != "no")
+  AS_HELP_STRING(--disable-qt-qml-cache,
+    disable qml cache generation and basic error checking),
+    ,
+    enable_qml_cache="yes")
+AM_CONDITIONAL(HAVE_QMLCACHEGEN, test "${enable_qml_cache}" = "yes" && test "$QMLCACHEGEN" != "no")
 
 AC_ARG_ENABLE(qt-qml-debug,
   AS_HELP_STRING(--enable-qt-qml-debug, enable qml debugger))
@@ -4231,12 +4318,11 @@
 AM_CONDITIONAL(HAVE_QT_GTK, test "${have_qt_gtk}" = "yes")
 AM_CONDITIONAL(HAVE_QT_QTEST, test "${have_qt_qtest}" = "yes")
 AM_CONDITIONAL(HAVE_QT_QUICK_TEST, test "${have_qt_quick_test}" = "yes")
-AM_CONDITIONAL(HAVE_QT_DECLARATIVE_PRIVATE, test "${have_qt_declarative_private}" = "yes")
 AM_CONDITIONAL(HAVE_QT_GUI_PRIVATE, test "${have_qt_gui_private}" = "yes")
-AM_CONDITIONAL(HAVE_QT_CORE_PRIVATE, test "${have_qt_core_private}" = "yes")
 AM_CONDITIONAL(HAVE_FXC, test "${have_fxc}" = "yes")
 AM_CONDITIONAL(HAVE_QT67, test "${QT_VERSION_MAJ:-0}" -gt "6" || (test "${QT_VERSION_MAJ:-0}" = "6" && test "${QT_VERSION_MIN:-0}" -ge "7"))
-AM_CONDITIONAL(HAVE_QT65, test "${QT_VERSION_MAJ:-0}" -gt "6" || (test "${QT_VERSION_MAJ:-0}" = "6" && test "${QT_VERSION_MIN:-0}" -ge "5"))
+AM_CONDITIONAL(HAVE_QT65, test "${have_qt65}" = "yes")
+AM_CONDITIONAL(HAVE_QT_ZSTD, test "${have_qt_zstd}" = "yes")
 
 dnl
 dnl detect kde4-config patch (used for kde solids).
@@ -4746,14 +4832,6 @@
 )
 AM_CONDITIONAL(HAVE_MAKENSIS, test "$MAKENSIS" != "no" && test "$nsis_version_ok" = "yes")
 
-dnl
-dnl Check wether we have the PROCESS_MITIGATION_IMAGE_LOAD_POLICY
-dnl It should only be available when building for win10, but some SDKs define it unconditionnaly
-dnl
-if test "${SYS}" = "mingw32"; then
-    AC_CHECK_TYPES(PROCESS_MITIGATION_IMAGE_LOAD_POLICY,,,#include <windows.h>)
-fi
-
 EXTEND_HELP_STRING(Components:)
 
 dnl
@@ -4761,7 +4839,7 @@
 dnl
 AC_ARG_ENABLE(vlc,
   AS_HELP_STRING(--enable-vlc, build the VLC media player (default enabled)))
-AM_CONDITIONAL(BUILD_VLC, test "${enable_vlc}" != "no")
+AM_CONDITIONAL(BUILD_VLC, test "${enable_vlc}" != "no" -a "$vlc_winstore_app" = "0")
 
 dnl
 dnl Fuzzer (at the end not to mess dependencies FLAGS)
@@ -4859,7 +4937,7 @@
   lib/Makefile
   bin/Makefile
   test/Makefile
-  share/vlc.appdata.xml.in
+  share/org.videolan.vlc.appdata.xml.in
 )
 
 AM_COND_IF(HAVE_WIN32,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/.gitignore -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/.gitignore Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/amf/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/amf/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/amf/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/amf/rules.mak Changed

@@ -1,10 +1,10 @@
 # AMF
 
-AMF_VERSION := 1.4.34
-AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v$(AMF_VERSION)/AMF-headers.tar.gz
+AMF_VERSION := 1.4.36
+AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v$(AMF_VERSION)/AMF-headers-v$(AMF_VERSION).tar.gz
 AMF_GITURL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF.git
 AMF_BRANCH := v$(AMF_VERSION)
-AMF_GITVERSION := 6d7bec0469961e2891c6e1aaa5122b76ed82e1db
+AMF_GITVERSION := 8f5a645e89380549368eec68935b151b238aa17b
 
 ifeq ($(ARCH),x86_64)
 ifdef HAVE_WIN32
@@ -39,16 +39,11 @@
 # 	$(call check_githash,$(AMF_GITVERSION))
 # 	touch "$@"
 
+amf: UNPACK_DIR=amf-headers-v$(AMF_VERSION)
 amf: AMF-$(AMF_VERSION).tar.gz .sum-amf
 # amf: AMF-$(AMF_GITVERSION).tar.xz .sum-amf
 	$(RM) -Rf AMF
 	$(UNPACK)
-	# the tarball is extracted to AMF but it the filesystem is case insenstive
-	# we can't move AMF to amf
-	mv -f -- AMF AMF-$(AMF_VERSION)
-	$(APPLY) $(SRC)/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch
-	$(APPLY) $(SRC)/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch
-	$(APPLY) $(SRC)/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch
 	$(MOVE)
 
 .amf: amf

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/aom/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/aom/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/aom/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/aom/rules.mak Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/ass/0001-aarch64-Set-the-right-intended-alignment-for-constan.patch Added

@@ -0,0 +1,70 @@
+From 159cefc9074a9b816d62c6b4251521ab515ecaca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+Date: Tue, 12 Nov 2024 10:08:13 +0200
+Subject: PATCH aarch64: Set the right intended alignment for constants
+
+The align parameter to these macros is passed to the gas directive
+.align. This directive is architecture dependent; on some
+architectures, the given alignment is an alignment in bytes,
+while on others, its the power of two to align to. On aarch64,
+.align is for power of two alignment, see 1 for details; i.e.
+it behaves the same as .p2align.
+
+This means that when the macros are invoked with align=16, we
+actually requested 64 KB alignment, not 16 byte alignment. Fix
+this, setting the alignment to the intended 16 byte alignment.
+
+This fixes building for aarch64-windows targets with assert enabled
+versions of Clang; such versions of Clang error out with
+"unsupported section alignment" on this case, while regular release
+versions of Clang silently let this issue pass.
+
+1 https://sourceware.org/binutils/docs/as/Align.html
+---
+ libass/aarch64/blend_bitmaps.S | 2 +-
+ libass/aarch64/blur.S          | 2 +-
+ libass/aarch64/rasterizer.S    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libass/aarch64/blend_bitmaps.S b/libass/aarch64/blend_bitmaps.S
+index 2e8f053..a58c09b 100644
+--- a/libass/aarch64/blend_bitmaps.S
++++ b/libass/aarch64/blend_bitmaps.S
+@@ -18,7 +18,7 @@
+ 
+ #include "asm.S"
+ 
+-const edge_mask, align=16
++const edge_mask, align=4
+     .dcb.b 16, 0xFF
+     .dcb.b 16, 0x00
+ endconst
+diff --git a/libass/aarch64/blur.S b/libass/aarch64/blur.S
+index de8b508..292ee84 100644
+--- a/libass/aarch64/blur.S
++++ b/libass/aarch64/blur.S
+@@ -18,7 +18,7 @@
+ 
+ #include "asm.S"
+ 
+-const words_zero, align=16
++const words_zero, align=4
+     .dc.w 0, 0, 0, 0, 0, 0, 0, 0
+ endconst
+ 
+diff --git a/libass/aarch64/rasterizer.S b/libass/aarch64/rasterizer.S
+index 5fde704..514fba2 100644
+--- a/libass/aarch64/rasterizer.S
++++ b/libass/aarch64/rasterizer.S
+@@ -28,7 +28,7 @@
+ #endif
+ 
+ 
+-const words_index, align=16
++const words_index, align=4
+     .dc.w 0, 1, 2, 3, 4, 5, 6, 7
+ endconst
+ 
+-- 
+2.34.1
+

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/ass/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/ass/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/ass/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/ass/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/breakpad/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/breakpad/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/cddb/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/cddb/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/change_prefix.sh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/change_prefix.sh Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/chromaprint/0001-contribs-chromaprint-more-fixes-for-.pc-file.patch Added

@@ -0,0 +1,49 @@
+From e0ef879e98b2aabb2aaf9124b6260d4af5e820d4 Mon Sep 17 00:00:00 2001
+From: Pavlov Konstantin <thresh@videolan.org>
+Date: Fri, 8 Dec 2017 13:12:30 +0100
+Subject: PATCH 1/2 contribs: chromaprint: more fixes for .pc file.
+
+- Moved AVFFT check: FFMPEG_LIBRARIES might be unset even if
+all needed FFmpeg libraries were found.
+- Added an ability to link with VDSP/Accelerate Framework on macOS.
+---
+ CMakeLists.txt          | 4 ++++
+ libchromaprint.pc.cmake | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fd6374e..c14e32b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -135,12 +135,16 @@ endif()
+ if(FFT_LIB STREQUAL "vdsp")
+ 	if(ACCELERATE_LIBRARIES)
+ 		set(USE_VDSP ON)
++		set(CHROMAPRINT_ADDITIONAL_LIBS "-F${ACCELERATE_LIBRARIES} -framework Accelerate")
+ 	else()
+ 		message(FATAL_ERROR "Selected ${FFT_LIB} for FFT calculations, but the library is not found")
+ 	endif()
+ elseif(FFT_LIB STREQUAL "avfft")
+ 	if(FFMPEG_LIBAVCODEC_FFT_FOUND)
+ 		set(USE_AVFFT ON)
++		find_package(PkgConfig)
++		pkg_check_modules(AVFFT REQUIRED libavcodec libavutil)
++		string(REPLACE ";" " " CHROMAPRINT_ADDITIONAL_LIBS "${AVFFT_LDFLAGS}")
+ 	else()
+ 		message(FATAL_ERROR "Selected ${FFT_LIB} for FFT calculations, but the library is not found")
+ 	endif()
+diff --git a/libchromaprint.pc.cmake b/libchromaprint.pc.cmake
+index 3799329..120e85d 100644
+--- a/libchromaprint.pc.cmake
++++ b/libchromaprint.pc.cmake
+@@ -7,6 +7,6 @@ Name: ${PROJECT_NAME}
+ Description: Audio fingerprint library
+ URL: http://acoustid.org/chromaprint
+ Version: ${PROJECT_VERSION}
+-Libs: -L${LIB_INSTALL_DIR} -lchromaprint
++Libs: -L${LIB_INSTALL_DIR} -lchromaprint @CHROMAPRINT_ADDITIONAL_LIBS@
+ Cflags: -I${INCLUDE_INSTALL_DIR}
+ 
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch Changed

@@ -1,26 +1,31 @@
-From 78e7305d566b81f34470a4f21519a47d635ee147 Mon Sep 17 00:00:00 2001
+From b4075d5b76b3efc717de27db5c093eed1be7a985 Mon Sep 17 00:00:00 2001
 From: Steve Lhomme <robux4@ycbcr.xyz>
 Date: Mon, 5 Sep 2022 16:13:05 +0200
 Subject: PATCH 2/2 add the C++ runtime to the packages to link to
 
 gcc needs libstdc++ and clang needs libc++.
 ---
- CMakeLists.txt | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
+ CMakeLists.txt | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0dbd9bd..6facfdf 100644
+index c14e32b..b2545b7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -197,6 +197,23 @@ else()
+@@ -205,6 +205,28 @@ else()
  endif()
  
  if(NOT BUILD_FRAMEWORK)
 +	foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES})
-+		if (IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
++		if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
++			list(APPEND PKG_CXX_LIBS "${LIB}")
++		elseif(LIB MATCHES "-l:lib.*.a")
++			string(LENGTH ${LIB} LIBLEN)
++			math(EXPR LIBLEN "${LIBLEN}-8")
++			string(SUBSTRING ${LIB} 6 ${LIBLEN} DIRECT_LIB)
++			list(APPEND PKG_CXX_LIBS "-l${DIRECT_LIB}")
++		elseif(LIB MATCHES "-l.*")
 +			list(APPEND PKG_CXX_LIBS "${LIB}")
-+		elseif(${LIB} MATCHES "-l:libunwind.a") # android toolchain
-+			list(APPEND IMPLICITS_LIST "-lunwind")
 +		else()
 +			list(APPEND PKG_CXX_LIBS "-l${LIB}")
 +		endif()
@@ -34,8 +39,8 @@
 +		set(CHROMAPRINT_ADDITIONAL_LIBS "${CHROMAPRINT_ADDITIONAL_LIBS} ${PKG_LIBS}")
 +	endif()
  	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libchromaprint.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc)
- 	install(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc
+ 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+ endif()
 -- 
 2.45.0.windows.1

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/chromaprint/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/chromaprint/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/chromaprint/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/chromaprint/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/dav1d/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/dav1d/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/dav1d/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/dav1d/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/dvbcsa/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/dvbcsa/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/dvdcss/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/dvdcss/rules.mak Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/dvdnav/0001-configure-don-t-use-ms-style-packing.patch Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/dvdnav/0002-play-avoid-assert-and-exit-and-bogus-Cell-link.patch Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/dvdnav/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/dvdnav/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/ffmpeg/dxva_vc1_crash.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/ffmpeg/dxva_vc1_crash.patch Changed

@@ -1,7 +1,7 @@
 From 2dbcebff1e80541d8aa71041f36a086856987373 Mon Sep 17 00:00:00 2001
 From: Steve Lhomme <robux4@ycbcr.xyz>
 Date: Tue, 23 Jan 2018 13:01:22 +0100
-Subject: PATCH 8/9 fix crash on bogus frame reference in VC1/MPEG-2 with
+Subject: PATCH 8/9 fix crash on bogus frame reference in MPEG-2 with
  DXVA
 
 ---
@@ -18,30 +18,12 @@
      memset(pp, 0, sizeof(*pp));
      pp->wDeblockedPictureIndex       = 0;
 -    if (s->pict_type != AV_PICTURE_TYPE_I)
-+    if (s->pict_type != AV_PICTURE_TYPE_I && s->last_pic.data0)
++    if (s->pict_type != AV_PICTURE_TYPE_I && s->last_pic.ptr)
          pp->wForwardRefPictureIndex  = ff_dxva2_get_surface_index(avctx, ctx, s->last_pic.ptr->f, 0);
      else
          pp->wForwardRefPictureIndex  = 0xffff;
 -    if (s->pict_type == AV_PICTURE_TYPE_B)
-+    if (s->pict_type == AV_PICTURE_TYPE_B && s->next_pic.data0)
-         pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_pic.ptr->f, 0);
-     else
-         pp->wBackwardRefPictureIndex = 0xffff;
-diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c
-index bc9ad9648e..b7608228b0 100644
---- a/libavcodec/dxva2_vc1.c
-+++ b/libavcodec/dxva2_vc1.c
-@@ -58,11 +58,11 @@ void ff_dxva2_vc1_fill_picture_parameters(AVCodecContext *avctx,
-     }
- 
-     memset(pp, 0, sizeof(*pp));
--    if (s->pict_type != AV_PICTURE_TYPE_I && !v->bi_type && s->last_pic.ptr)
-+    if (s->pict_type != AV_PICTURE_TYPE_I && !v->bi_type && s->last_pic.ptr && s->last_pic.data0)
-         pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->last_pic.ptr->f, 0);
-     else
-         pp->wForwardRefPictureIndex = 0xffff;
--    if (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type && s->next_pic.ptr)
-+    if (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type && s->next_pic.ptr && s->next_pic.data0)
++    if (s->pict_type == AV_PICTURE_TYPE_B && s->next_pic.ptr)
          pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_pic.ptr->f, 0);
      else
          pp->wBackwardRefPictureIndex = 0xffff;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/gcrypt/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/gcrypt/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/gen-cmake-toolchain.py -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/gen-cmake-toolchain.py Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/get-rust-target.sh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/get-rust-target.sh Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/gme/0001-don-t-skip-negative-fixes-14088.patch Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/gme/0003-fix-android-toolchain-broken-CMAKE_CXX_IMPLICIT_LINK.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/gme/0003-fix-android-toolchain-broken-CMAKE_CXX_IMPLICIT_LINK.patch Changed

@@ -1,7 +1,7 @@
-From 5fb77ca7127ab4343281920d79a87a899c6bc6bb Mon Sep 17 00:00:00 2001
+From b618db8f750d1201dceb05620978236aa44ce265 Mon Sep 17 00:00:00 2001
 From: Steve Lhomme <robux4@ycbcr.xyz>
 Date: Tue, 6 Sep 2022 11:56:30 +0200
-Subject: PATCH 3/3 fix android toolchain broken
+Subject: PATCH 3/4 fix android toolchain broken
  CMAKE_CXX_IMPLICIT_LINK_LIBRARIES
 
 CMake 3.17.0 and Android NDK 25 the CMAKE_CXX_IMPLICIT_LINK_LIBRARIES is
@@ -10,22 +10,27 @@
 When it should be
 c++;m;unwind;dl;c;unwind;dl
 ---
- gme/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
+ gme/CMakeLists.txt | 7 +++++++
+ 1 file changed, 7 insertions(+)
 
 diff --git a/gme/CMakeLists.txt b/gme/CMakeLists.txt
-index da23ea8..77738c4 100644
+index da23ea8..cc058c7 100644
 --- a/gme/CMakeLists.txt
 +++ b/gme/CMakeLists.txt
-@@ -196,6 +196,8 @@ set_target_properties(gme
+@@ -196,6 +196,13 @@ set_target_properties(gme
  foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES})
      if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
          list(APPEND IMPLICITS_LIST "${LIB}")
-+    elseif(${LIB} MATCHES "-l:libunwind.a") # android toolchain
-+        list(APPEND IMPLICITS_LIST "-lunwind")
++    elseif(LIB MATCHES "-l:lib.*.a")
++        string(LENGTH ${LIB} LIBLEN)
++        math(EXPR LIBLEN "${LIBLEN}-8")
++        string(SUBSTRING ${LIB} 6 ${LIBLEN} DIRECT_LIB)
++        list(APPEND IMPLICITS_LIST "-l${DIRECT_LIB}")
++    elseif(LIB MATCHES "-l.*")
++        list(APPEND IMPLICITS_LIST "${LIB}")
      else()
          list(APPEND IMPLICITS_LIST "-l${LIB}")
      endif()
 -- 
-2.27.0.windows.1
+2.45.0.windows.1

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/gme/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/gme/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/gme/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/gme/rules.mak Changed

@@ -1,20 +1,20 @@
 # Game Music Emu
 
 GME_VERSION := 0.6.3
-GME_URL := https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$(GME_VERSION).tar.xz
+GME_URL := $(GITHUB)/libgme/game-music-emu/archive/refs/tags/$(GME_VERSION).tar.gz
 
 PKGS += gme
 
-$(TARBALLS)/game-music-emu-$(GME_VERSION).tar.xz:
+$(TARBALLS)/game-music-emu-$(GME_VERSION).tar.gz:
 	$(call download_pkg,$(GME_URL),gme)
 
 DEPS_gme = zlib $(DEPS_zlib)
 
-.sum-gme: game-music-emu-$(GME_VERSION).tar.xz
+.sum-gme: game-music-emu-$(GME_VERSION).tar.gz
 
-game-music-emu: game-music-emu-$(GME_VERSION).tar.xz .sum-gme
+game-music-emu: game-music-emu-$(GME_VERSION).tar.gz .sum-gme
 	$(UNPACK)
-	$(APPLY) $(SRC)/gme/skip-underrun.patch
+	$(APPLY) $(SRC)/gme/0001-don-t-skip-negative-fixes-14088.patch
 	$(APPLY) $(SRC)/gme/0001-Export-the-proper-C-runtime-library.patch
 	$(APPLY) $(SRC)/gme/0002-link-with-libm-and-set-it-in-pkg-config-when-buildin.patch
 	$(APPLY) $(SRC)/gme/0003-fix-android-toolchain-broken-CMAKE_CXX_IMPLICIT_LINK.patch

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/jpeg/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/jpeg/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/jpeg/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/jpeg/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/libarchive/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/libarchive/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/libarchive/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/libarchive/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/lua/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/lua/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/main.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/main.mak Changed

@@ -18,7 +18,7 @@
 
 # Default Qt version
 QTBASE_VERSION_MAJOR := 6.8
-QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).0
+QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).3
 
 # Common download locations
 GNU ?= http://ftp.gnu.org/gnu
@@ -252,8 +252,6 @@
 # Tools #
 #########
 
-need_pkg = $(shell $(PKG_CONFIG) $(1) || echo 1)
-
 ifdef HAVE_CROSS_COMPILE
 # Use pkg-config cross-tool if it actually works
 ifeq ($(shell unset PKG_CONFIG_LIBDIR; $(HOST)-pkg-config --version 1>/dev/null 2>/dev/null || echo FAIL),)
@@ -262,12 +260,14 @@
 # Use the regular pkg-config and set some PKG_CONFIG_LIBDIR ourselves
 PKG_CONFIG_LIBDIR ?= /usr/$(HOST)/lib/pkgconfig:/usr/lib/$(HOST)/pkgconfig:/usr/share/pkgconfig
 export PKG_CONFIG_LIBDIR
-need_pkg = $(shell PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) $(PKG_CONFIG) $(1) || echo 1)
+need_pkg = $(shell PKG_CONFIG_PATH=$(SYSTEM_PKG_CONFIG_PATH) PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) $(PKG_CONFIG) $(1) || echo 1)
 endif
 endif # HAVE_CROSS_COMPILE
 
+need_pkg ?= $(shell PKG_CONFIG_PATH=$(SYSTEM_PKG_CONFIG_PATH) $(PKG_CONFIG) $(1) || echo 1)
 PKG_CONFIG ?= pkg-config
 
+SYSTEM_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
 PKG_CONFIG_PATH := $(PREFIX)/lib/pkgconfig:$(PREFIX)/share/pkgconfig:$(PKG_CONFIG_PATH)
 export PKG_CONFIG_PATH
 
@@ -506,9 +506,6 @@
 ifdef HAVE_WIN32
 CMAKE += -DCMAKE_DEBUG_POSTFIX:STRING=
 endif
-ifdef HAVE_ANDROID
-CMAKE += -DANDROID:BOOL=ON
-endif
 ifdef MSYS_BUILD
 CMAKE = PKG_CONFIG_LIBDIR="$(PKG_CONFIG_PATH)" $(CMAKE)
 CMAKE += -DCMAKE_LINK_LIBRARY_SUFFIX:STRING=.a
@@ -552,7 +549,7 @@
 MESONBUILD = meson compile -C $(BUILD_DIR) $(MESON_BUILD) && meson install -C $(BUILD_DIR)
 
 # shared Qt config
-ifeq ($(call system_tool_version, qmake6 -query QT_VERSION 2>/dev/null, cat),$(QTBASE_VERSION))
+ifeq ($(call system_tool_majmin, qmake6 -query QT_VERSION 2>/dev/null),$(QTBASE_VERSION_MAJOR))
 
 ifdef HAVE_CROSS_COMPILE
 QT_LIBEXECS := $(shell qmake6 -query QT_HOST_LIBEXECS)
@@ -562,9 +559,9 @@
 QT_BINS := $(shell qmake6 -query QT_INSTALL_BINS):$(shell qmake6 -query QT_HOST_BINS)
 endif
 
-ifeq ($(call system_tool_version, PATH="${QT_LIBEXECS}" moc --version, cat),$(QTBASE_VERSION))
-ifeq ($(call system_tool_version, PATH="${QT_BINS}" qsb --version, cat),$(QTBASE_VERSION))
-ifeq ($(call system_tool_version, PATH="${QT_LIBEXECS}" qmlcachegen --version, cat),$(QTBASE_VERSION))
+ifeq ($(call system_tool_majmin, PATH="${QT_LIBEXECS}" moc --version),$(QTBASE_VERSION_MAJOR))
+ifeq ($(call system_tool_majmin, PATH="${QT_BINS}" qsb --version),$(QTBASE_VERSION_MAJOR))
+ifeq ($(call system_tool_majmin, PATH="${QT_LIBEXECS}" qmlcachegen --version),$(QTBASE_VERSION_MAJOR))
 QT_USES_SYSTEM_TOOLS = 1
 endif
 endif
@@ -584,6 +581,10 @@
 QT_HOST_PATH := -DQT_HOST_PATH=$(QT_HOST_PREFIX) -DQT_HOST_PATH_CMAKE_DIR=$(QT_HOST_LIBS)/cmake
 endif
 QT_CMAKE_CONFIG := -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/lib/cmake/Qt6/qt.toolchain.cmake $(QT_HOST_PATH)
+ifdef QT_USES_SYSTEM_TOOLS
+# We checked the versions match, assume we know what we're going
+QT_CMAKE_CONFIG += -DQT_NO_PACKAGE_VERSION_CHECK=TRUE
+endif
 
 ifdef GPL
 REQUIRE_GPL =
@@ -765,10 +766,7 @@
 	CMAKE_TOOLCHAIN_ENV += ANDROID_NDK=$(ANDROID_NDK)
 	CMAKE_TOOLCHAIN_ENV += ANDROID_ABI=$(ANDROID_ABI)
 	CMAKE_TOOLCHAIN_ENV += ANDROID_API=$(ANDROID_API)
-# cmake will overwrite our --sysroot with a native (host) one on Darwin
-# Set it to "" right away to short-circuit this behaviour
-	CMAKE_TOOLCHAIN_ENV += CXX_SYSROOT_FLAG=
-	CMAKE_TOOLCHAIN_ENV += C_SYSROOT_FLAG=
+	CMAKE_TOOLCHAIN_ENV += EXTRA_INCLUDE=$(ANDROID_NDK)/build/cmake/android.toolchain.cmake
 endif
 ifdef MSYS_BUILD
 	CMAKE_TOOLCHAIN_ENV += FIND_ROOT_PATH="$(shell cygpath -m $(PREFIX))"

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/meson-machinefile/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/meson-machinefile/rules.mak Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/mingw64/0001-crt-add-missing-DXVAHD_CreateDevice-for-x86.patch Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/mingw64/0001-headers-dxvahd-Add-missing-WINAPI-on-DXVAHD_CreateDe.patch Added

@@ -0,0 +1,39 @@
+From 0a5b3814cf63bcb1c275cc35d75b20c1f328f2a7 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Thu, 30 Jan 2025 10:21:26 +0100
+Subject: PATCH headers/dxvahd: Add missing WINAPI on DXVAHD_CreateDevice()
+
+---
+ mingw-w64-headers/include/dxvahd.h   | 2 +-
+ mingw-w64-headers/include/dxvahd.idl | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mingw-w64-headers/include/dxvahd.h b/mingw-w64-headers/include/dxvahd.h
+index 2258d2836..65c37d34f 100644
+--- a/mingw-w64-headers/include/dxvahd.h
++++ b/mingw-w64-headers/include/dxvahd.h
+@@ -415,7 +415,7 @@ typedef struct _DXVAHDSW_CALLBACKS {
+   PDXVAHDSW_DestroyVideoProcessor             DestroyVideoProcessor;
+ } DXVAHDSW_CALLBACKS;
+ 
+-HRESULT DXVAHD_CreateDevice(IDirect3DDevice9Ex *pD3DDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,PDXVAHDSW_Plugin pPlugin,IDXVAHD_Device **ppDevice);
++HRESULT WINAPI DXVAHD_CreateDevice(IDirect3DDevice9Ex *pD3DDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,PDXVAHDSW_Plugin pPlugin,IDXVAHD_Device **ppDevice);
+ 
+ /*****************************************************************************
+  * IDXVAHD_Device interface
+diff --git a/mingw-w64-headers/include/dxvahd.idl b/mingw-w64-headers/include/dxvahd.idl
+index 607f3778e..519e9ed3c 100644
+--- a/mingw-w64-headers/include/dxvahd.idl
++++ b/mingw-w64-headers/include/dxvahd.idl
+@@ -398,7 +398,7 @@ cpp_quote("  PDXVAHDSW_VideoProcessBltHD                 VideoProcessBltHD;")
+ cpp_quote("  PDXVAHDSW_DestroyVideoProcessor             DestroyVideoProcessor;")
+ cpp_quote("} DXVAHDSW_CALLBACKS;")
+ cpp_quote("")
+-cpp_quote("HRESULT DXVAHD_CreateDevice(IDirect3DDevice9Ex *pD3DDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,PDXVAHDSW_Plugin pPlugin,IDXVAHD_Device **ppDevice);")
++cpp_quote("HRESULT WINAPI DXVAHD_CreateDevice(IDirect3DDevice9Ex *pD3DDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,PDXVAHDSW_Plugin pPlugin,IDXVAHD_Device **ppDevice);")
+ cpp_quote("")
+ 
+     object,
+-- 
+2.45.2
+

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mingw64/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/mingw64/rules.mak Changed

@@ -15,6 +15,9 @@
 PKGS += dcomp
 endif # !HAVE_WINSTORE
 PKGS += dxva dxvahd mingw11-fixes mingw12-fixes mft10 d3d12 uiautomationcore
+ifeq ($(ARCH),i386)
+PKGS += dxva_x86
+endif
 
 ifdef HAVE_WINSTORE
 PKGS_FOUND += winrt_headers
@@ -26,13 +29,16 @@
 PKGS_FOUND += dcomp
 endif
 ifeq ($(call mingw_at_least, 11), true)
-PKGS_FOUND += dxvahd uiautomationcore
+PKGS_FOUND += uiautomationcore
 endif # MINGW 11
 ifeq ($(call mingw_at_least, 12), true)
 PKGS_FOUND += mingw11-fixes d3d12
 endif # MINGW 12
 ifeq ($(call mingw_at_least, 13), true)
-PKGS_FOUND += mingw12-fixes
+PKGS_FOUND += mingw12-fixes dxvahd
+ifeq ($(ARCH),i386)
+PKGS_FOUND += dxva_x86
+endif
 endif # MINGW 13
 endif # !HAVE_VISUALSTUDIO
 
@@ -43,7 +49,7 @@
 
 endif # HAVE_WIN32
 
-PKGS_ALL += winpthreads winrt_headers dxva dxvahd dcomp mingw11-fixes mingw12-fixes alloweduwp mft10 d3d12 uiautomationcore
+PKGS_ALL += winpthreads winrt_headers dxva dxvahd dxva_x86 dcomp mingw11-fixes mingw12-fixes alloweduwp mft10 d3d12 uiautomationcore
 
 # $(TARBALLS)/mingw-w64-$(MINGW64_HASH).tar.xz:
 # 	$(call download_git,$(MINGW64_GITURL),,$(MINGW64_HASH))
@@ -58,6 +64,8 @@
 # mingw64: mingw-w64-$(MINGW64_HASH).tar.xz .sum-mingw64
 	$(UNPACK)
 	$(APPLY) $(SRC)/mingw64/0001-headers-disable-more-strmif-interfaces-in-UWP.patch
+	$(APPLY) $(SRC)/mingw64/0001-crt-add-missing-DXVAHD_CreateDevice-for-x86.patch
+	$(APPLY) $(SRC)/mingw64/0001-headers-dxvahd-Add-missing-WINAPI-on-DXVAHD_CreateDe.patch
 	$(MOVE)
 
 .mingw64: mingw64
@@ -159,6 +167,7 @@
 .sum-alloweduwp: .sum-mingw64
 	touch $@
 
+.alloweduwp: BUILD_DIR=$</vlc_build_alloweduwp
 .alloweduwp: mingw64
 	install -d "$(PREFIX)/include"
 	install $</mingw-w64-headers/include/fileapi.h      "$(PREFIX)/include"
@@ -182,6 +191,7 @@
 .sum-d3d12: .sum-mingw64
 	touch $@
 
+.d3d12: BUILD_DIR=$</vlc_build_d3d12
 .d3d12: mingw64
 	install -d "$(PREFIX)/include"
 	install $</mingw-w64-headers/include/d3d12.h             "$(PREFIX)/include"
@@ -199,6 +209,7 @@
 .sum-uiautomationcore: .sum-mingw64
 	touch $@
 
+.uiautomationcore: BUILD_DIR=$</vlc_build_uiautomationcore
 .uiautomationcore: mingw64
 	install -d "$(PREFIX)/include"
 	install $</mingw-w64-headers/include/uiautomation.h           "$(PREFIX)/include"
@@ -213,3 +224,20 @@
 	+$(MAKEBUILD) -C mingw-w64-crt LIBRARIES=$(MINGW64_BUILDDIR)/libuiautomationcore.a DATA= HEADERS=
 	+$(MAKEBUILD) -C mingw-w64-crt $(MINGW64_BUILDDIR)_LIBRARIES=$(MINGW64_BUILDDIR)/libuiautomationcore.a install-$(MINGW64_BUILDDIR)LIBRARIES
 	touch $@
+
+.sum-dxva_x86: .sum-mingw64
+	touch $@
+
+.dxva_x86: BUILD_DIR=$</vlc_build_dxva_x86
+.dxva_x86: mingw64
+ifeq ($(ARCH),i386)
+	install -d "$(PREFIX)/include"
+
+	# Trick mingw-w64 into just building libdxva2.a
+	$(MAKEBUILDDIR)
+	$(MAKECONFIGURE) $(MINGW64_MINIMALCRT_CONF)
+	mkdir -p $(BUILD_DIR)/mingw-w64-crt/$(MINGW64_BUILDDIR)
+	+$(MAKEBUILD) -C mingw-w64-crt LIBRARIES=$(MINGW64_BUILDDIR)/libdxva2.a DATA= HEADERS=
+	+$(MAKEBUILD) -C mingw-w64-crt $(MINGW64_BUILDDIR)_LIBRARIES=$(MINGW64_BUILDDIR)/libdxva2.a install-$(MINGW64_BUILDDIR)LIBRARIES
+endif
+	touch $@

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/modplug/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/modplug/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mpcdec/0006-adapted-patch-0001-shared.patch-from-buildroot.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/mpcdec/0006-adapted-patch-0001-shared.patch-from-buildroot.patch Changed

@@ -1,7 +1,7 @@
-From 617c72c7df93da5bcca2febbad066e31a411d976 Mon Sep 17 00:00:00 2001
+From 714e0e572ea7746831b5fa5434ea2669180e702f Mon Sep 17 00:00:00 2001
 From: r2d <r2d@c51c8d5e-032a-db11-a0f2-0002b3467eef>
 Date: Sun, 14 Feb 2016 22:07:10 +0000
-Subject: PATCH 6/6 adapted patch 0001-shared.patch from buildroot:
+Subject: PATCH 6/7 adapted patch 0001-shared.patch from buildroot:
  https://git.busybox.net/buildroot/tree/package/musepack/0001-shared.patch
  original changelog :
 
@@ -16,7 +16,7 @@
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/libmpcdec/CMakeLists.txt b/libmpcdec/CMakeLists.txt
-index fb18968..fa9c800 100644
+index 5579d55..7ce5e94 100644
 --- a/libmpcdec/CMakeLists.txt
 +++ b/libmpcdec/CMakeLists.txt
 @@ -4,7 +4,6 @@ SET(mpcdec_VERSION_PATCH 1)
@@ -29,7 +29,7 @@
  	${libmpc_SOURCE_DIR}/include/mpc/reader.h
 @@ -12,12 +11,16 @@ install(FILES
  	${libmpc_SOURCE_DIR}/include/mpc/mpc_types.h
- 	DESTINATION include/mpcdec COMPONENT headers)
+ 	DESTINATION include/mpc COMPONENT headers)
  
 +include_directories(${libmpc_SOURCE_DIR}/include)
  if(SHARED)
@@ -49,5 +49,5 @@
  endif(SHARED)
  
 -- 
-2.37.3.windows.1
+2.45.0.windows.1

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/mpcdec/0007-only-build-libmpcdec.patch Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mpcdec/musepack-asinh-msvc.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/mpcdec/musepack-asinh-msvc.patch Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mpcdec/musepack-no-binaries.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/mpcdec/musepack-no-binaries.patch Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mpcdec/musepack-no-cflags-clobber.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/mpcdec/musepack-no-cflags-clobber.patch Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/mpcdec/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/mpcdec/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/ncurses/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/ncurses/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/ncurses/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/ncurses/rules.mak Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/nfs/0001-cant-have-win32.h-referenced-from-a-header-we-instal.patch Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/nfs/0001-cmake-export-the-necessary-library-in-the-pkg-config.patch Added

@@ -0,0 +1,44 @@
+From c6b70a429e7022fb5da88d3344ae8da55a761b41 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Mon, 16 Dec 2024 11:46:16 +0100
+Subject: PATCH cmake: export the necessary library in the pkg-config file
+
+That includes gnutls on Linux if it's used.
+---
+ CMakeLists.txt        | 8 ++++++++
+ cmake/libnfs.pc.cmake | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b94d2e..86e0845 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -155,6 +155,14 @@ install(FILES cmake/FindNFS.cmake
+         DESTINATION ${INSTALL_CMAKE_DIR})
+ 
+ # handle pc-config files
++set(PKG_LIBLIST "")
++foreach(LIB ${SYSTEM_LIBRARIES})
++  if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
++    list(APPEND PKG_LIBLIST "${LIB}")
++  else()
++    list(APPEND PKG_LIBLIST "-l${LIB}")
++  endif()
++endforeach()
+ configure_file(cmake/libnfs.pc.cmake
+                ${CMAKE_CURRENT_BINARY_DIR}/libnfs.pc @ONLY)
+ 
+diff --git a/cmake/libnfs.pc.cmake b/cmake/libnfs.pc.cmake
+index 8a4e11e..783c2e3 100644
+--- a/cmake/libnfs.pc.cmake
++++ b/cmake/libnfs.pc.cmake
+@@ -10,5 +10,5 @@ Description: libnfs is a client library for accessing NFS shares over a network.
+ Version: @PROJECT_VERSION@
+ Requires:
+ Conflicts:
+-Libs: -L${libdir} -lnfs
++Libs: -L${libdir} -lnfs @PKG_LIBLIST@
+ Cflags: -I${includedir}
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/nfs/0002-pthread-and-win32-need-to-be-exclusive-in-multithrea.patch Added

@@ -0,0 +1,268 @@
+From 9d67b60f6ea777264b9b0db46a90e7c0a52d428c Mon Sep 17 00:00:00 2001
+From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
+Date: Mon, 16 Dec 2024 19:01:06 +1000
+Subject: PATCH 2/5 pthread and win32 need to be exclusive in multithread.c
+
+Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
+---
+ lib/multithreading.c | 238 +++++++++++++++++++++----------------------
+ 1 file changed, 118 insertions(+), 120 deletions(-)
+
+diff --git a/lib/multithreading.c b/lib/multithreading.c
+index b04cd5b..2dc4177 100644
+--- a/lib/multithreading.c
++++ b/lib/multithreading.c
+@@ -54,7 +54,124 @@
+ 
+ #ifdef HAVE_MULTITHREADING
+ 
+-#ifdef HAVE_PTHREAD
++#ifdef WIN32
++nfs_tid_t nfs_mt_get_tid(void)
++{
++    return GetCurrentThreadId();
++}
++static void* nfs_mt_service_thread(void* arg)
++{
++    struct nfs_context* nfs = (struct nfs_context*)arg;
++    struct pollfd pfd;
++    int revents;
++    int ret;
++
++    nfs->rpc->multithreading_enabled = 1;
++
++    while (nfs->rpc->multithreading_enabled) {
++        pfd.fd = nfs_get_fd(nfs);
++        pfd.events = nfs_which_events(nfs);
++        pfd.revents = 0;
++
++        ret = poll(&pfd, 1, 0);
++        if (ret < 0) {
++            nfs_set_error(nfs, "Poll failed");
++            revents = -1;
++        }
++        else {
++            revents = pfd.revents;
++        }
++        if (nfs_service(nfs, revents) < 0) {
++            if (revents != -1)
++                nfs_set_error(nfs, "nfs_service failed");
++        }
++    }
++    return NULL;
++}
++
++static DWORD WINAPI service_thread_init(LPVOID lpParam)
++{
++    HANDLE hStdout;
++    struct nfs_context* nfs;
++
++    hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
++    if (hStdout == INVALID_HANDLE_VALUE) {
++        return 1;
++    }
++    nfs = (struct nfs_context *)lpParam;
++    nfs_mt_service_thread(nfs);
++    return 0;
++}
++
++int nfs_mt_service_thread_start(struct nfs_context* nfs)
++{
++    nfs->nfsi->service_thread = CreateThread(NULL, 1024*1024, service_thread_init, nfs, 0, NULL);
++    if (nfs->nfsi->service_thread == NULL) {
++        nfs_set_error(nfs, "Failed to start service thread");
++        return -1;
++    }
++    while (nfs->rpc->multithreading_enabled == 0) {
++        Sleep(100);
++    }
++    return 0;
++}
++
++void nfs_mt_service_thread_stop(struct nfs_context* nfs)
++{
++    nfs->rpc->multithreading_enabled = 0;
++    while (WaitForSingleObject(nfs->nfsi->service_thread, INFINITE) != WAIT_OBJECT_0);
++}
++
++int nfs_mt_mutex_init(libnfs_mutex_t* mutex)
++{
++    *mutex = CreateSemaphoreA(NULL, 1, 1, NULL);
++    return 0;
++}
++
++int nfs_mt_mutex_destroy(libnfs_mutex_t* mutex)
++{
++    CloseHandle(*mutex);
++    return 0;
++}
++
++int nfs_mt_mutex_lock(libnfs_mutex_t* mutex)
++{
++    while (WaitForSingleObject(*mutex, INFINITE) != WAIT_OBJECT_0);
++    return 0;
++}
++
++int nfs_mt_mutex_unlock(libnfs_mutex_t* mutex)
++{
++    ReleaseSemaphore(*mutex, 1, NULL);
++    return 0;
++}
++
++int nfs_mt_sem_init(libnfs_sem_t* sem, int value)
++{
++    *sem = CreateSemaphoreA(NULL, 0, 16, NULL);
++    return 0;
++}
++
++int nfs_mt_sem_destroy(libnfs_sem_t* sem)
++{
++    CloseHandle(*sem);
++    return 0;
++}
++
++int nfs_mt_sem_post(libnfs_sem_t* sem)
++{
++    ReleaseSemaphore(*sem, 1, NULL);
++    return 0;
++}
++
++int nfs_mt_sem_wait(libnfs_sem_t* sem)
++{
++    while (WaitForSingleObject(*sem, INFINITE) != WAIT_OBJECT_0);
++    return 0;
++}
++
++#elif HAVE_PTHREAD /* WIN32 */
++
+ #include <unistd.h>
+ #include <sys/syscall.h>
+ 
+@@ -226,124 +343,5 @@ int nfs_mt_sem_wait(libnfs_sem_t *sem)
+ 
+ #endif /* HAVE_PTHREAD */
+ 
+-#ifdef WIN32
+-nfs_tid_t nfs_mt_get_tid(void)
+-{
+-    return GetCurrentThreadId();
+-}
+-static void* nfs_mt_service_thread(void* arg)
+-{
+-    struct nfs_context* nfs = (struct nfs_context*)arg;
+-    struct pollfd pfd;
+-    int revents;
+-    int ret;
+-
+-    nfs->rpc->multithreading_enabled = 1;
+-
+-    while (nfs->rpc->multithreading_enabled) {
+-        pfd.fd = nfs_get_fd(nfs);
+-        pfd.events = nfs_which_events(nfs);
+-        pfd.revents = 0;
+-
+-        ret = poll(&pfd, 1, 0);
+-        if (ret < 0) {
+-            nfs_set_error(nfs, "Poll failed");
+-            revents = -1;
+-        }
+-        else {
+-            revents = pfd.revents;
+-        }
+-        if (nfs_service(nfs, revents) < 0) {
+-            if (revents != -1)
+-                nfs_set_error(nfs, "nfs_service failed");
+-        }
+-    }
+-    return NULL;
+-}
+-
+-static DWORD WINAPI service_thread_init(LPVOID lpParam)
+-{
+-    HANDLE hStdout;
+-    struct nfs_context* nfs;
+-
+-    hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
+-    if (hStdout == INVALID_HANDLE_VALUE) {
+-        return 1;
+-    }
+-    nfs = (struct nfs_context *)lpParam;
+-    nfs_mt_service_thread(nfs);
+-    return 0;
+-}
+-
+-int nfs_mt_service_thread_start(struct nfs_context* nfs)
+-{
+-    nfs->nfsi->service_thread = CreateThread(NULL, 1024*1024, service_thread_init, nfs, 0, NULL);
+-    if (nfs->nfsi->service_thread == NULL) {
+-        nfs_set_error(nfs, "Failed to start service thread");
+-        return -1;
+-    }
+-    while (nfs->rpc->multithreading_enabled == 0) {
+-        Sleep(100);
+-    }
+-    return 0;
+-}
+-
+-void nfs_mt_service_thread_stop(struct nfs_context* nfs)
+-{
+-    nfs->rpc->multithreading_enabled = 0;
+-    while (WaitForSingleObject(nfs->nfsi->service_thread, INFINITE) != WAIT_OBJECT_0);
+-}
+-
+-int nfs_mt_mutex_init(libnfs_mutex_t* mutex)
+-{
+-    *mutex = CreateSemaphoreA(NULL, 1, 1, NULL);
+-    return 0;
+-}
+-
+-int nfs_mt_mutex_destroy(libnfs_mutex_t* mutex)
+-{
+-    CloseHandle(*mutex);
+-    return 0;
+-}
+-
+-int nfs_mt_mutex_lock(libnfs_mutex_t* mutex)
+-{
+-    while (WaitForSingleObject(*mutex, INFINITE) != WAIT_OBJECT_0);
+-    return 0;
+-}
+-
+-int nfs_mt_mutex_unlock(libnfs_mutex_t* mutex)
+-{
+-    ReleaseSemaphore(*mutex, 1, NULL);
+-    return 0;
+-}
+-
+-int nfs_mt_sem_init(libnfs_sem_t* sem, int value)
+-{
+-    *sem = CreateSemaphoreA(NULL, 0, 16, NULL);
+-    return 0;
+-}
+-
+-int nfs_mt_sem_destroy(libnfs_sem_t* sem)
+-{
+-    CloseHandle(*sem);
+-    return 0;
+-}
+-
+-int nfs_mt_sem_post(libnfs_sem_t* sem)
+-{
+-    ReleaseSemaphore(*sem, 1, NULL);
+-    return 0;
+-}
+-
+-int nfs_mt_sem_wait(libnfs_sem_t* sem)
+-{
+-    while (WaitForSingleObject(*sem, INFINITE) != WAIT_OBJECT_0);
+-    return 0;
+-}
+-
+-#endif /* WIN32 */
+-
+-
+ #endif /* HAVE_MULTITHREADING */
+ 
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/nfs/0003-win32-define-struct-timezone-for-non-mingw-w32.patch Added

@@ -0,0 +1,53 @@
+From 42e0694555f80ed93ff2013580d805fa1d928ff7 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Mon, 16 Dec 2024 10:01:27 +0100
+Subject: PATCH 3/5 win32: define struct timezone for non-mingw-w32
+
+The compiler complains if the structure used in the .c file is defined after an
+anonymous version was used in the header.
+---
+ include/win32/win32_compat.h | 8 +++++++-
+ win32/win32_compat.c         | 6 ------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/include/win32/win32_compat.h b/include/win32/win32_compat.h
+index 70214b7..e11bf70 100755
+--- a/include/win32/win32_compat.h
++++ b/include/win32/win32_compat.h
+@@ -150,9 +150,15 @@ struct pollfd {
+ int     getpid(void);
+ int     win32_inet_pton(int af, const char * src, void * dst);
+ int     win32_poll(struct pollfd *fds, unsigned int nfsd, int timeout);
+-int     win32_gettimeofday(struct timeval *tv, struct timezone *tz);
+ #ifdef __MINGW32__
+ # define win32_gettimeofday mingw_gettimeofday
++#else
++struct timezone
++{
++  int  tz_minuteswest; /* minutes W of Greenwich */
++  int  tz_dsttime;     /* type of dst correction */
++};
++int     win32_gettimeofday(struct timeval *tv, struct timezone *tz);
+ #endif
+ 
+ #define DllExport
+diff --git a/win32/win32_compat.c b/win32/win32_compat.c
+index 3654788..fb5f0aa 100644
+--- a/win32/win32_compat.c
++++ b/win32/win32_compat.c
+@@ -157,12 +157,6 @@ int win32_poll(struct pollfd *fds, unsigned int nfds, int timo)
+ #endif
+  
+ #ifndef __MINGW32__
+-struct timezone 
+-{
+-  int  tz_minuteswest; /* minutes W of Greenwich */
+-  int  tz_dsttime;     /* type of dst correction */
+-};
+- 
+ int win32_gettimeofday(struct timeval *tv, struct timezone *tz)
+ {
+   FILETIME ft;
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/nfs/0004-win32-fix-build-with-MSVC.patch Added

@@ -0,0 +1,42 @@
+From 7f4d51641ae8383d51779f104ae4f7ba121b75f6 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Mon, 16 Dec 2024 10:06:20 +0100
+Subject: PATCH 4/5 win32: fix build with MSVC
+
+strndup doesn't exist, but there's a compat version for that.
+---
+ include/win32/win32_compat.h | 2 +-
+ lib/nfs_v4.c                 | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/include/win32/win32_compat.h b/include/win32/win32_compat.h
+index e11bf70..09f8eb1 100755
+--- a/include/win32/win32_compat.h
++++ b/include/win32/win32_compat.h
+@@ -163,7 +163,7 @@ int     win32_gettimeofday(struct timeval *tv, struct timezone *tz);
+ 
+ #define DllExport
+ 
+-#ifdef __MINGW32__
++#if defined(__MINGW32__) || defined(_MSC_VER)
+ char* libnfs_strndup(const char *s, size_t n);
+ #define strndup libnfs_strndup
+ #endif
+diff --git a/lib/nfs_v4.c b/lib/nfs_v4.c
+index 31d89d7..dbbea95 100644
+--- a/lib/nfs_v4.c
++++ b/lib/nfs_v4.c
+@@ -88,6 +88,10 @@
+ #include <pwd.h>
+ #endif
+ 
++#ifdef WIN32
++#include <win32/win32_compat.h>
++#endif
++
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/nfs/0005-win32-don-t-use-pthread-on-Windows.patch Added

@@ -0,0 +1,49 @@
+From e540715f492e7cb13cf811838327f54831832389 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Mon, 16 Dec 2024 10:12:01 +0100
+Subject: PATCH 5/5 win32: don't use pthread on Windows
+
+mingw-w64 has winpthread which is detected as available. But on Windows
+there is custom threading code to use. We should only use one of them.
+And the win32 API doesn't require an extra -lpthread to link.
+
+Fixes #506
+---
+ include/libnfs-multithreading.h | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/include/libnfs-multithreading.h b/include/libnfs-multithreading.h
+index e3caa97..305ad95 100644
+--- a/include/libnfs-multithreading.h
++++ b/include/libnfs-multithreading.h
+@@ -29,7 +29,12 @@ extern "C" {
+ 
+ #ifdef HAVE_MULTITHREADING
+ 
+-#ifdef HAVE_PTHREAD
++#ifdef WIN32
++typedef HANDLE libnfs_thread_t;
++typedef HANDLE libnfs_mutex_t;
++typedef HANDLE libnfs_sem_t;
++typedef DWORD nfs_tid_t;
++#elif defined(HAVE_PTHREAD)
+ #include <pthread.h>
+ typedef pthread_t libnfs_thread_t;
+ typedef pthread_mutex_t libnfs_mutex_t;
+@@ -48,13 +53,6 @@ typedef pid_t nfs_tid_t;
+ #endif
+ #endif /* HAVE_PTHREAD */
+ 
+-#ifdef WIN32
+-typedef HANDLE libnfs_thread_t;
+-typedef HANDLE libnfs_mutex_t;
+-typedef HANDLE libnfs_sem_t;
+-typedef DWORD nfs_tid_t;
+-#endif
+-
+ nfs_tid_t nfs_mt_get_tid(void);
+ int nfs_mt_mutex_init(libnfs_mutex_t *mutex);
+ int nfs_mt_mutex_destroy(libnfs_mutex_t *mutex);
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/nfs/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/nfs/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/nfs/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/nfs/rules.mak Changed

@@ -1,20 +1,32 @@
 # NFS
-NFS_VERSION := 5.0.2
+NFS_VERSION := 6.0.2
 NFS_URL := $(GITHUB)/sahlberg/libnfs/archive/libnfs-$(NFS_VERSION).tar.gz
 
+ifdef BUILD_NETWORK
 PKGS += nfs
 ifeq ($(call need_pkg,"libnfs >= 1.10"),)
 PKGS_FOUND += nfs
 endif
+endif
+
+ifneq ($(findstring gnutls,$(PKGS)),)
+DEPS_nfs = gnutls $(DEPS_gnutls)
+endif
 
 $(TARBALLS)/libnfs-$(NFS_VERSION).tar.gz:
 	$(call download_pkg,$(NFS_URL),nfs)
 
 .sum-nfs: libnfs-$(NFS_VERSION).tar.gz
 
+nfs: UNPACK_DIR=libnfs-libnfs-$(NFS_VERSION)
 nfs: libnfs-$(NFS_VERSION).tar.gz .sum-nfs
 	$(UNPACK)
-	mv libnfs-libnfs-$(NFS_VERSION) libnfs-$(NFS_VERSION)
+	$(APPLY) $(SRC)/nfs/0001-cant-have-win32.h-referenced-from-a-header-we-instal.patch
+	$(APPLY) $(SRC)/nfs/0002-pthread-and-win32-need-to-be-exclusive-in-multithrea.patch
+	$(APPLY) $(SRC)/nfs/0003-win32-define-struct-timezone-for-non-mingw-w32.patch
+	$(APPLY) $(SRC)/nfs/0004-win32-fix-build-with-MSVC.patch
+	$(APPLY) $(SRC)/nfs/0005-win32-don-t-use-pthread-on-Windows.patch
+	$(APPLY) $(SRC)/nfs/0001-cmake-export-the-necessary-library-in-the-pkg-config.patch
 	$(MOVE)
 
 .nfs: nfs toolchain.cmake

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/nvcodec/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/nvcodec/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/nvcodec/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/nvcodec/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/orc/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/orc/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/orc/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/orc/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/png/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/png/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/png/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/png/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/protobuf/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/protobuf/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qt/0002-Satisfy-Windows-7-compatibility.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/qt/0002-Satisfy-Windows-7-compatibility.patch Changed

@@ -1,4 +1,4 @@
-From 0d41cd0bfcd02af594a1b9da9f6784cdb019b334 Mon Sep 17 00:00:00 2001
+From 5ceab2c7433f7c9aff207b1e7d2f1a4fc9680a0d Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <fuzun54@outlook.com>
 Date: Mon, 22 Jan 2024 21:37:39 +0200
 Subject: PATCH Satisfy Windows 7 compatibility
@@ -35,7 +35,7 @@
  28 files changed, 535 insertions(+), 114 deletions(-)
 
 diff --git a/cmake/QtBaseConfigureTests.cmake b/cmake/QtBaseConfigureTests.cmake
-index 66a0b3b6dd..80b1e2c640 100644
+index d41fac2e18e..9490de8fa12 100644
 --- a/cmake/QtBaseConfigureTests.cmake
 +++ b/cmake/QtBaseConfigureTests.cmake
 @@ -163,16 +163,16 @@ function(qt_internal_ensure_latest_win_nt_api)
@@ -61,10 +61,10 @@
              CACHE STRING "Qt platform specific pre-processor defines" FORCE)
      endif()
 diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
-index e17048ce3e..242fb1f6e5 100644
+index e8158f73950..d7432c35e3c 100644
 --- a/src/corelib/CMakeLists.txt
 +++ b/src/corelib/CMakeLists.txt
-@@ -528,17 +528,17 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_animation
+@@ -536,17 +536,17 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_animation
          animation/qvariantanimation.cpp animation/qvariantanimation.h animation/qvariantanimation_p.h
  )
  
@@ -88,7 +88,7 @@
  )
  
  qt_internal_extend_target(Core CONDITION WIN32
-@@ -852,10 +852,10 @@ qt_internal_extend_target(Core CONDITION WASM
+@@ -860,10 +860,10 @@ qt_internal_extend_target(Core CONDITION WASM
  )
  
  # On MS-Win, clang has two flavors, one of which immitates MSVC (so claims to be it)
@@ -104,7 +104,7 @@
  qt_internal_extend_target(Core CONDITION QT_FEATURE_icu
      SOURCES
 diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h
-index 5586d0b927..eb0264b4ee 100644
+index 5586d0b9272..eb0264b4ee2 100644
 --- a/src/corelib/global/qt_windows.h
 +++ b/src/corelib/global/qt_windows.h
 @@ -10,16 +10,16 @@
@@ -128,7 +128,7 @@
  
  #ifndef NOMINMAX
 diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
-index bdcac20dd3..a2ec288240 100644
+index 8300c3b5eea..8795463a74e 100644
 --- a/src/corelib/io/qfilesystemengine_win.cpp
 +++ b/src/corelib/io/qfilesystemengine_win.cpp
 @@ -1,6 +1,11 @@
@@ -144,7 +144,7 @@
  #include "qoperatingsystemversion.h"
  #include "qplatformdefs.h"
 diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
-index a7663b2481..78ad3d3ede 100644
+index a7663b24813..78ad3d3edeb 100644
 --- a/src/corelib/kernel/qeventdispatcher_win.cpp
 +++ b/src/corelib/kernel/qeventdispatcher_win.cpp
 @@ -362,7 +362,15 @@ void QEventDispatcherWin32Private::registerTimer(WinTimerInfo *t)
@@ -165,7 +165,7 @@
      if (!ok)
          ok = SetTimer(internalHwnd, t->timerId, interval, nullptr);
 diff --git a/src/corelib/kernel/qfunctions_win.cpp b/src/corelib/kernel/qfunctions_win.cpp
-index 048fdbc934..c176186888 100644
+index 048fdbc934c..c1761868888 100644
 --- a/src/corelib/kernel/qfunctions_win.cpp
 +++ b/src/corelib/kernel/qfunctions_win.cpp
 @@ -4,6 +4,7 @@
@@ -196,7 +196,7 @@
              return true;
          case APPMODEL_ERROR_NO_PACKAGE:
 diff --git a/src/corelib/thread/qfutex_win_p.h b/src/corelib/thread/qfutex_win_p.h
-index 75a12bd82c..3d2aa021db 100644
+index 75a12bd82c1..3d2aa021db6 100644
 --- a/src/corelib/thread/qfutex_win_p.h
 +++ b/src/corelib/thread/qfutex_win_p.h
 @@ -18,37 +18,65 @@
@@ -273,7 +273,7 @@
  } // namespace QtWindowsFutex
  namespace QtFutex = QtWindowsFutex;
 diff --git a/src/corelib/thread/qmutex_win.cpp b/src/corelib/thread/qmutex_win.cpp
-index 8c7741c113..ce3586a90b 100644
+index 8c7741c1131..ce3586a90b7 100644
 --- a/src/corelib/thread/qmutex_win.cpp
 +++ b/src/corelib/thread/qmutex_win.cpp
 @@ -19,9 +19,9 @@ QMutexPrivate::QMutexPrivate()
@@ -289,7 +289,7 @@
  
  void QMutexPrivate::wakeUp() noexcept
 diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
-index 0fba38d250..78197b4044 100644
+index 88ba6dc8f62..2d17f1b4dee 100644
 --- a/src/corelib/thread/qthread_win.cpp
 +++ b/src/corelib/thread/qthread_win.cpp
 @@ -11,6 +11,7 @@
@@ -297,10 +297,10 @@
  #include <private/qcoreapplication_p.h>
  #include <private/qeventdispatcher_win_p.h>
 +#include <private/qsystemlibrary_p.h>
+ #include "qloggingcategory.h"
  
  #include <qt_windows.h>
- 
-@@ -19,17 +20,6 @@
+@@ -20,17 +21,6 @@
  #endif // _MT
  #include <process.h>
  
@@ -318,7 +318,7 @@
  QT_BEGIN_NAMESPACE
  
  #if QT_CONFIG(thread)
-@@ -263,7 +253,18 @@ unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(voi
+@@ -264,7 +254,18 @@ unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(voi
      QString threadName = std::exchange(thr->d_func()->objectName, {});
      if (Q_LIKELY(threadName.isEmpty()))
          threadName = QString::fromUtf8(thr->metaObject()->className());
@@ -339,10 +339,10 @@
      emit thr->started(QThread::QPrivateSignal());
      QThread::setTerminationEnabled(true);
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 3b3dbd1321..2479d1f0fb 100644
+index 2cc72625131..16c8086decc 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
-@@ -477,7 +477,6 @@ qt_internal_extend_target(Gui CONDITION WIN32
+@@ -479,7 +479,6 @@ qt_internal_extend_target(Gui CONDITION WIN32
          d3d11
          dxgi
          dxguid
@@ -351,7 +351,7 @@
          ../3rdparty/D3D12MemoryAllocator
  )
 diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp
-index c0fe6ec6f5..661c5ec0fe 100644
+index 3faae39a42a..336b8fbe059 100644
 --- a/src/gui/rhi/qrhid3d11.cpp
 +++ b/src/gui/rhi/qrhid3d11.cpp
 @@ -8,6 +8,7 @@
@@ -375,7 +375,7 @@
          result = nullptr;
      }
 diff --git a/src/gui/rhi/qrhid3d12.cpp b/src/gui/rhi/qrhid3d12.cpp
-index 9e55799ac5..257181bba6 100644
+index 3ce8b967e0f..cae5c0e9ebe 100644
 --- a/src/gui/rhi/qrhid3d12.cpp
 +++ b/src/gui/rhi/qrhid3d12.cpp
 @@ -5,6 +5,7 @@
@@ -504,7 +504,7 @@
      if (FAILED(hr)) {
          qWarning("Failed to serialize root signature: %s", qPrintable(QSystemError::windowsComString(hr)));
          return false;
-@@ -5092,7 +5145,11 @@ QD3D12ObjectHandle QD3D12ShaderResourceBindings::createRootSignature(const QD3D1
+@@ -5095,7 +5148,11 @@ QD3D12ObjectHandle QD3D12ShaderResourceBindings::createRootSignature(const QD3D1
      rsDesc.Desc_1_1.Flags = D3D12_ROOT_SIGNATURE_FLAGS(rsFlags);
  
      ID3DBlob *signature = nullptr;
@@ -518,7 +518,7 @@
          qWarning("Failed to serialize root signature: %s", qPrintable(QSystemError::windowsComString(hr)));
          return {};
 diff --git a/src/gui/text/windows/qwindowsfontdatabasebase.cpp b/src/gui/text/windows/qwindowsfontdatabasebase.cpp
-index 84e619b0d9..58af493925 100644
+index 84e619b0d93..58af4939252 100644
 --- a/src/gui/text/windows/qwindowsfontdatabasebase.cpp
 +++ b/src/gui/text/windows/qwindowsfontdatabasebase.cpp
 @@ -6,6 +6,7 @@
@@ -550,7 +550,7 @@
      qCDebug(lcQpaFonts) << __FUNCTION__ << systemFont;
      return systemFont;
 diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
-index acd3754f4e..3c80ad3e1a 100644
+index acd3754f4e5..3c80ad3e1a2 100644
 --- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
 +++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
 @@ -16,7 +16,6 @@ qt_internal_add_plugin(QNLMNIPlugin
@@ -562,7 +562,7 @@
  )
  
 diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt
-index 062dc30143..6fe8102c3a 100644
+index 278af74af0b..e2f1969a321 100644
 --- a/src/plugins/platforms/direct2d/CMakeLists.txt
 +++ b/src/plugins/platforms/direct2d/CMakeLists.txt
 @@ -75,10 +75,8 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
@@ -577,7 +577,7 @@
  
  # Resources:
 diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp
-index 307ca2e550..8f1199e229 100644
+index 307ca2e550d..8f1199e2291 100644
 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp
 +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp
 @@ -2,6 +2,7 @@
@@ -589,7 +589,7 @@
  #include "qwindowsdirect2dhelpers.h"
  #include "qwindowsdirect2dintegration.h"
 diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
-index bbb8c46cf6..9f6d6da936 100644
+index cc4460cb182..fb725ea6061 100644
 --- a/src/plugins/platforms/windows/CMakeLists.txt
 +++ b/src/plugins/platforms/windows/CMakeLists.txt
 @@ -62,10 +62,8 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
@@ -604,7 +604,7 @@
  
  # Resources:
 diff --git a/src/plugins/platforms/windows/qtwindowsglobal.h b/src/plugins/platforms/windows/qtwindowsglobal.h
-index 96a72600eb..067069d8de 100644
+index 96a72600eb9..067069d8de0 100644
 --- a/src/plugins/platforms/windows/qtwindowsglobal.h
 +++ b/src/plugins/platforms/windows/qtwindowsglobal.h
 @@ -60,6 +60,10 @@
@@ -619,7 +619,7 @@
  
  namespace QtWindows
 diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp
-index 026e81cb0c..78c9bf2ea0 100644
+index 026e81cb0c7..78c9bf2ea04 100644
 --- a/src/plugins/platforms/windows/qwin10helpers.cpp
 +++ b/src/plugins/platforms/windows/qwin10helpers.cpp
 @@ -4,6 +4,7 @@
@@ -667,7 +667,7 @@
      if (FAILED(hr))
          return false;
 diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
-index 11a9290a2e..9236070a99 100644
+index 88e9da5557c..82433b04fdc 100644
 --- a/src/plugins/platforms/windows/qwindowscontext.cpp
 +++ b/src/plugins/platforms/windows/qwindowscontext.cpp
 @@ -43,6 +43,8 @@
@@ -864,7 +864,7 @@
              const DWORD errorCode = GetLastError();
              qErrnoWarning(int(errorCode), "EnableNonClientDpiScaling() failed for HWND %p (%lu)",
 diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
-index 4e9be1af96..1916868ba0 100644
+index 4e9be1af967..1916868ba0b 100644
 --- a/src/plugins/platforms/windows/qwindowscontext.h
 +++ b/src/plugins/platforms/windows/qwindowscontext.h
 @@ -44,6 +44,98 @@ struct QWindowsContextPrivate;
@@ -977,7 +977,7 @@
      void setAsyncExpose(bool value);
  
 diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp
-index 5d3a47c22f..b75c712298 100644
+index 5d3a47c22fd..b75c7122987 100644
 --- a/src/plugins/platforms/windows/qwindowsdrag.cpp
 +++ b/src/plugins/platforms/windows/qwindowsdrag.cpp
 @@ -1,6 +1,11 @@
@@ -1009,7 +1009,7 @@
  
                  if (pointerInfo.pointerFlags & POINTER_FLAG_PRIMARY) {
 diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp
-index ba76cda40b..49b2429ce7 100644
+index 5b8e4e58ffe..ab6b19de478 100644
 --- a/src/plugins/platforms/windows/qwindowskeymapper.cpp
 +++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp
 @@ -732,14 +732,23 @@ static inline QString messageKeyText(const MSG &msg)
@@ -1041,7 +1041,7 @@
  }
  
 diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/src/plugins/platforms/windows/qwindowspointerhandler.cpp
-index 7995716444..e1c0eb2e58 100644
+index 7995716444a..e1c0eb2e58f 100644
 --- a/src/plugins/platforms/windows/qwindowspointerhandler.cpp
 +++ b/src/plugins/platforms/windows/qwindowspointerhandler.cpp
 @@ -1,6 +1,11 @@
@@ -1141,7 +1141,7 @@
  
      const auto systemId = (qint64)penInfo->pointerInfo.sourceDevice;
 diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp
-index 2165c56d3c..b1c4d20c43 100644
+index 6c86c47caac..14d10bef072 100644
 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp
 +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp
 @@ -43,9 +43,12 @@ static inline QDpi deviceDPI(HDC hdc)
@@ -1193,10 +1193,10 @@
          case ORIENTATION_PREFERENCE_NONE:
              break;
 diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
-index 7806bec287..ac6362bcca 100644
+index 35445c7a3c9..2d5a20134e4 100644
 --- a/src/plugins/platforms/windows/qwindowstheme.cpp
 +++ b/src/plugins/platforms/windows/qwindowstheme.cpp
-@@ -733,7 +733,11 @@ void QWindowsTheme::refreshFonts()
+@@ -737,7 +737,11 @@ void QWindowsTheme::refreshFonts()
      fixedFont.setStyleHint(QFont::TypeWriter);
  
      LOGFONT lfIconTitleFont;
@@ -1210,7 +1210,7 @@
  
      m_fontsSystemFont = new QFont(QWindowsFontDatabase::systemDefaultFont());
 diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
-index c7033a74c4..e129ca10bf 100644
+index f44a28f5636..06d7c7c5ad0 100644
 --- a/src/plugins/platforms/windows/qwindowswindow.cpp
 +++ b/src/plugins/platforms/windows/qwindowswindow.cpp
 @@ -150,7 +150,7 @@ static QByteArray debugWinExStyle(DWORD exStyle)
@@ -1291,7 +1291,7 @@
          qErrnoWarning("%s: AdjustWindowRectExForDpi failed", __FUNCTION__);
      }
      const QMargins result(qAbs(rect.left), qAbs(rect.top),
-@@ -1572,7 +1590,14 @@ void QWindowsWindow::initialize()
+@@ -1588,7 +1606,14 @@ void QWindowsWindow::initialize()
              QWindowSystemInterface::handleGeometryChange<QWindowSystemInterface::SynchronousDelivery>(w, obtainedGeometry);
          }
      }
@@ -1307,7 +1307,7 @@
  }
  
  QSurfaceFormat QWindowsWindow::format() const
-@@ -2067,7 +2092,12 @@ void QWindowsWindow::handleDpiChanged(HWND hwnd, WPARAM wParam, LPARAM lParam)
+@@ -2083,7 +2108,12 @@ void QWindowsWindow::handleDpiChanged(HWND hwnd, WPARAM wParam, LPARAM lParam)
  
  void QWindowsWindow::handleDpiChangedAfterParent(HWND hwnd)
  {
@@ -1322,7 +1322,7 @@
      setSavedDpi(dpi);
  
 diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
-index bae182b467..ab4793007c 100644
+index bae182b4676..ab4793007c8 100644
 --- a/src/widgets/styles/qwindowsstyle.cpp
 +++ b/src/widgets/styles/qwindowsstyle.cpp
 @@ -62,6 +62,7 @@
@@ -1383,5 +1383,5 @@
      default:
          break;
 -- 
-2.46.2
+2.47.1

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qt/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/qt/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qt/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/qt/rules.mak Changed

@@ -29,6 +29,10 @@
 PKGS_FOUND += qt-tools
 else ifdef QT_USES_SYSTEM_TOOLS
 PKGS_FOUND += qt-tools
+else
+PKGS.tools += qt-tools
+PKGS.tools.qt-tools.config-tool = qmake6
+PKGS.tools.qt-tools.path = $(PREFIX)/bin/qmake6
 endif
 
 $(TARBALLS)/qtbase-everywhere-src-$(QTBASE_VERSION_FULL).tar.xz:
@@ -80,7 +84,7 @@
 	-DFEATURE_sql=OFF -DFEATURE_testlib=OFF \
 	-DFEATURE_xml=OFF -DFEATURE_printsupport=OFF -DFEATURE_network=OFF \
 	-DFEATURE_pdf=OFF \
-	-DQT_BUILD_EXAMPLES=OFF
+	-DQT_BUILD_EXAMPLES=OFF -DQT_GENERATE_SBOM=OFF
 
 ifdef HAVE_WIN32
 ifndef HAVE_CLANG
@@ -110,6 +114,11 @@
 	-DFEATURE_texthtmlparser=OFF -DFEATURE_cssparser=OFF -DFEATURE_textodfwriter=OFF -DFEATURE_textmarkdownreader=OFF \
 	-DFEATURE_textmarkdownwriter=OFF -DINPUT_libb2=no -DFEATURE_harfbuzz=OFF -DFEATURE_freetype=OFF -DINPUT_opengl=no
 
+ifdef QT_USES_SYSTEM_TOOLS
+# We checked the versions match, assume we know what we're going
+QTBASE_CONFIG += -DQT_NO_PACKAGE_VERSION_CHECK=TRUE
+endif
+
 .qt-tools: BUILD_DIR=$</vlc_native
 .qt-tools: qt
 	$(CMAKECLEAN)

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/qtdeclarative/0001-QtQml-do-not-care-about-patch-version-when-checking-.patch Added

@@ -0,0 +1,27 @@
+From 4d163818668fb71745bea44c6c3e01a4a9b3f3e4 Mon Sep 17 00:00:00 2001
+From: Fatih Uzunoglu <fuzun54@outlook.com>
+Date: Wed, 5 Mar 2025 19:29:58 +0200
+Subject: PATCH QtQml: do not care about patch version when checking QML
+ cache
+
+This allows using `qmlcachegen` that has different patch version.
+---
+ src/qml/common/qv4compileddata.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qml/common/qv4compileddata.cpp b/src/qml/common/qv4compileddata.cpp
+index 9dee91f713..0ea3e2912b 100644
+--- a/src/qml/common/qv4compileddata.cpp
++++ b/src/qml/common/qv4compileddata.cpp
+@@ -49,7 +49,7 @@ bool Unit::verifyHeader(QDateTime expectedSourceTimeStamp, QString *errorString)
+         return false;
+     }
+ 
+-    if (qtVersion != quint32(QT_VERSION)) {
++    if ((qtVersion >> 8) != (quint32(QT_VERSION) >> 8)) {
+         *errorString = QString::fromUtf8("Qt version mismatch. Found %1 expected %2")
+                                .arg(qtVersion, 0, 16).arg(QT_VERSION, 0, 16);
+         return false;
+-- 
+2.48.1
+

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qtdeclarative/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/qtdeclarative/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qtdeclarative/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/qtdeclarative/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qtshadertools/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/qtshadertools/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qtsvg/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/qtsvg/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/qtwayland/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/qtwayland/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/sidplay2/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/sidplay2/rules.mak Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/smb2/0001-cmake-add-ENABLE_LIBKRB5-and-ENABLE_GSSAPI-options.patch Added

@@ -0,0 +1,77 @@
+From 3e0f7949c7db82ef427007d8de978fab02703a2f Mon Sep 17 00:00:00 2001
+From: Thomas Guillem <thomas@gllm.fr>
+Date: Tue, 17 Dec 2024 08:18:03 +0100
+Subject: PATCH cmake: add ENABLE_LIBKRB5 and ENABLE_GSSAPI options
+
+ON by default, but the user can now disable these components (like
+configure.ac).
+
+Fixes #384
+---
+ CMakeLists.txt              | 19 ++++++++++++++-----
+ cmake/ConfigureChecks.cmake |  4 ++++
+ 2 files changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0252451..562b8e2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,14 +57,19 @@ endif()
+       option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+     endif()
+       option(ENABLE_EXAMPLES "Build example programs" OFF)
+-    
++      option(ENABLE_LIBKRB5 "Enable libkrb5 support" ON)
++      option(ENABLE_GSSAPI "Enable gssapi support" ON)
+       list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
+   endif()
+ 
+   if(CMAKE_SYSTEM_NAME MATCHES Linux)
+-    find_package(LibKrb5)
++    if (ENABLE_LIBKRB5)
++      find_package(LibKrb5)
++    endif()
+   elseif(IOS)
+-    find_package(GSSAPI)  
++    if (ENABLE_GSSAPI)
++      find_package(GSSAPI)  
++    endif()
+   endif()
+ 
+   if(NOT ESP_PLATFORM)
+@@ -95,9 +100,13 @@ endif()
+     endif()
+     
+     if(CMAKE_SYSTEM_NAME MATCHES Linux)
+-      set(core_DEPENDS ${LIBKRB5_LIBRARY} CACHE STRING "" FORCE)  
++      if (ENABLE_LIBKRB5)
++        set(core_DEPENDS ${LIBKRB5_LIBRARY} CACHE STRING "" FORCE)  
++      endif()
+     elseif(IOS)
+-      set(core_DEPENDS ${GSSAPI_LIBRARIES} CACHE STRING "" FORCE)   
++      if (ENABLE_GSSAPI)
++        set(core_DEPENDS ${GSSAPI_LIBRARIES} CACHE STRING "" FORCE)   
++      endif()
+     endif()
+ 
+     if(MSVC AND BUILD_SHARED_LIBS)
+diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
+index a28846a..d59d890 100644
+--- a/cmake/ConfigureChecks.cmake
++++ b/cmake/ConfigureChecks.cmake
+@@ -6,8 +6,12 @@ endif()
+ check_include_file("arpa/inet.h" HAVE_ARPA_INET_H)
+ check_include_file("dlfcn.h" HAVE_DLFCN_H)
+ check_include_file("fcntl.h" HAVE_FCNTL_H)
++if (ENABLE_GSSAPI)
+ check_include_file("gssapi/gssapi.h" HAVE_GSSAPI_GSSAPI_H)
++endif()
++if (ENABLE_LIBKRB5)
+ check_include_file("krb5/krb5.h" HAVE_LIBKRB5)
++endif()
+ check_include_file("inttypes.h" HAVE_INTTYPES_H)
+ check_include_file("netdb.h" HAVE_NETDB_H)
+ check_include_file("netinet/in.h" HAVE_NETINET_IN_H)
+-- 
+2.45.2
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/smb2/0001-fix-Fixed-undeclared-identifier-ENXIO-in-android.patch Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/smb2/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/smb2/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/smb2/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/smb2/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/speex/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/speex/rules.mak Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/srt/0001-build-fix-implicit-libraries-set-using-Wl-l-libname..patch Added

@@ -0,0 +1,33 @@
+From 64157b23fd0359fdbe706a17154be3733fc0deb2 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Fri, 10 Jan 2025 13:04:59 +0100
+Subject: PATCH build fix implicit libraries set using -Wl,-l:libname.a
+
+We need to turn it to a more generic name in the pkg-config file.
+---
+ CMakeLists.txt | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1492306..49d4869 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1183,7 +1183,14 @@ endif()
+ # obtained by `pkg-config --libs`.
+ if(ENABLE_CXX_DEPS)
+ 	foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES})
+-		if((IS_ABSOLUTE ${LIB} AND EXISTS ${LIB}) OR (${LIB} MATCHES "^-l"))
++		if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
++			set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ${LIB})
++		elseif(${LIB} MATCHES "-l:lib.*.a")
++			string(LENGTH ${LIB} LIBLEN)
++			math(EXPR LIBLEN "${LIBLEN}-8")
++			string(SUBSTRING ${LIB} 6 ${LIBLEN} DIRECT_LIB)
++			set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} "-l${DIRECT_LIB}")
++		elseif(${LIB} MATCHES "^-l")
+ 			set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ${LIB})
+ 		else()
+ 			set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} "-l${LIB}")
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/srt/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/srt/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/srt/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/srt/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/upnp/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/upnp/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/upnp/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/upnp/rules.mak Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/vpl Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/vpl/0001-CMake-depend-on-libc-when-compiling-with-Clang.patch Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/vpl/SHA512SUMS Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/vpl/rules.mak Added

@@ -0,0 +1,47 @@
+# vpl (Intel Video Processing Library)
+
+VPL_VERSION := 2.13.0
+VPL_URL := $(GITHUB)/intel/libvpl/archive/v${VPL_VERSION}/libvpl-${VPL_VERSION}.tar.gz
+
+ifeq ($(call need_pkg,"vpl"),)
+PKGS_FOUND += vpl
+endif
+ifdef HAVE_WIN32
+ifndef HAVE_WINSTORE
+ifeq ($(filter arm aarch64, $(ARCH)),)
+PKGS += vpl
+endif
+endif
+endif
+
+DEPS_vpl :=
+
+ifdef HAVE_WINSTORE
+DEPS_vpl += alloweduwp $(DEPS_alloweduwp)
+endif
+
+ifdef HAVE_WINSTORE
+VPL_VARS := CFLAGS="$(CFLAGS) -DMEDIASDK_UWP_DISPATCHER"
+VPL_VARS += CXXFLAGS="$(CXXFLAGS) -DMEDIASDK_UWP_DISPATCHER"
+endif
+
+# Disable BUILD_EXPERIMENTAL
+# https://github.com/intel/libvpl/issues/168
+VPL_CONF := -DBUILD_EXPERIMENTAL=OFF
+
+$(TARBALLS)/libvpl-$(VPL_VERSION).tar.gz:
+	$(call download_pkg,$(VPL_URL),vpl)
+
+.sum-vpl: libvpl-$(VPL_VERSION).tar.gz
+
+vpl: libvpl-$(VPL_VERSION).tar.gz .sum-vpl
+	$(UNPACK)
+	$(APPLY) $(SRC)/vpl/0001-CMake-depend-on-libc-when-compiling-with-Clang.patch
+	$(MOVE)
+
+.vpl: vpl toolchain.cmake
+	$(CMAKECLEAN)
+	$(HOSTVARS_CMAKE) $(VPL_VARS) $(CMAKE) $(VPL_CONF)
+	+$(CMAKEBUILD)
+	$(CMAKEINSTALL)
+	touch $@

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/vpx/0001-vp9-rc-fix-sizeof-of-member-in-static-function.patch Added

@@ -0,0 +1,32 @@
+From ca8306ea5c292f41057e124ab23760551753ef85 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Thu, 16 Jan 2025 13:11:54 +0100
+Subject: PATCH vp9 rc: fix sizeof of member in static function
+
+It generates a compilation in AppleClang 15.0.0.15000309:
+
+```
+../vp9/ratectrl_rtc.cc:29:67: error: invalid use of member 'cpi_' in static member function
+  rc_api->cpi_ = static_cast<VP9_COMP *>(vpx_memalign(32, sizeof(*cpi_)));
+                                                                  ^~~~
+```
+---
+ vp9/ratectrl_rtc.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vp9/ratectrl_rtc.cc b/vp9/ratectrl_rtc.cc
+index b29e1ec23..43948fb7e 100644
+--- a/vp9/ratectrl_rtc.cc
++++ b/vp9/ratectrl_rtc.cc
+@@ -26,7 +26,7 @@ std::unique_ptr<VP9RateControlRTC> VP9RateControlRTC::Create(
+   std::unique_ptr<VP9RateControlRTC> rc_api(new (std::nothrow)
+                                                 VP9RateControlRTC());
+   if (!rc_api) return nullptr;
+-  rc_api->cpi_ = static_cast<VP9_COMP *>(vpx_memalign(32, sizeof(*cpi_)));
++  rc_api->cpi_ = static_cast<VP9_COMP *>(vpx_memalign(32, sizeof(*rc_api->cpi_)));
+   if (!rc_api->cpi_) return nullptr;
+   vp9_zero(*rc_api->cpi_);
+ 
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/vpx/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/vpx/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/vpx/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/vpx/rules.mak Changed

@@ -1,9 +1,9 @@
 # libvpx
 
-VPX_VERSION := 1.14.1
+VPX_VERSION := 1.15.0
 VPX_URL := $(GITHUB)/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz
 
-ifneq ($(filter arm aarch64 i386 loongarch64 mipsel mips64el ppc64le x86_64, $(ARCH)),)
+ifneq ($(filter arm aarch64 i386 loongarch64 mipsel mips64el ppc64le x86_64 wasm32, $(ARCH)),)
 PKGS += vpx
 endif
 ifeq ($(call need_pkg,"vpx >= 1.5.0"),)
@@ -31,6 +31,7 @@
 	# Disable automatic addition of -fembed-bitcode for iOS
 	# as it is enabled through --extra-cflags if necessary.
 	$(APPLY) $(SRC)/vpx/libvpx-remove-bitcode.patch
+	$(APPLY) $(SRC)/vpx/0001-vp9-rc-fix-sizeof-of-member-in-static-function.patch
 	$(MOVE)
 
 DEPS_vpx =
@@ -97,7 +98,9 @@
 	--disable-install-docs \
 	--disable-dependency-tracking \
 	--enable-vp9-highbitdepth \
-	--disable-tools
+	--disable-tools \
+	--target=$(VPX_TARGET) \
+	--prefix=$(PREFIX)
 
 ifneq ($(filter arm aarch64, $(ARCH)),)
 # Only enable runtime cpu detect on architectures other than arm/aarch64
@@ -109,36 +112,33 @@
 endif
 endif
 
+VPX_CFLAGS=$(CFLAGS)
+
 ifndef BUILD_ENCODERS
 VPX_CONF += --disable-vp8-encoder --disable-vp9-encoder
 endif
 
+ifeq ($(ARCH),i386)
+VPX_CFLAGS += -mstackrealign
+endif
+
 ifndef HAVE_WIN32
 VPX_CONF += --enable-pic
 else
-VPX_CONF += --extra-cflags="-mstackrealign"
 ifeq ($(ARCH),arm)
 # As of libvpx 1.14.0 we have to explicitly disable runtime CPU detection for Windows armv7
 VPX_CONF += --disable-runtime-cpu-detect
 endif
 endif
-ifdef HAVE_MACOSX
-VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)"
-endif
 ifdef HAVE_IOS
 ifeq ($(ARCH),arm)
 # As of libvpx 1.14.0 we have to explicitly disable runtime CPU detection for iOS arm7
 VPX_CONF += --disable-runtime-cpu-detect
 endif
-VPX_CONF += --enable-vp8-decoder --disable-tools
-VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)"
+VPX_CONF += --enable-vp8-decoder
 VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) $(LDFLAGS)
 ifeq ($(ARCH),aarch64)
 VPX_LDFLAGS += -arch arm64
-else
-ifndef HAVE_IOS
-VPX_LDFLAGS += -arch $(ARCH)
-endif
 endif
 endif
 
@@ -146,10 +146,6 @@
 VPX_CONF += --disable-optimizations
 endif
 
-ifdef HAVE_EMSCRIPTEN
-VPX_CONF += --extra-cflags="$(CFLAGS) -pthread"
-endif
-
 # Always enable debug symbols, we strip in the final executables if needed
 VPX_CONF += --enable-debug
 
@@ -168,11 +164,12 @@
 endif
 endif
 
+VPX_CONF += --extra-cflags="$(VPX_CFLAGS)"
+
 .vpx: libvpx
 	rm -rf $(PREFIX)/include/vpx
 	$(MAKEBUILDDIR)
-	cd $(BUILD_DIR) && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) $(BUILD_SRC)/configure --target=$(VPX_TARGET) \
-		$(VPX_CONF) --prefix=$(PREFIX)
+	cd $(BUILD_DIR) && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) $(BUILD_SRC)/configure $(VPX_CONF)
 	+CONFIG_DEBUG=1 $(MAKEBUILD)
 	$(call pkg_static,"$(BUILD_DIRUNPACK)/vpx.pc")
 	+CONFIG_DEBUG=1 $(MAKEBUILD) install

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/vulkan-loader/0003-fix-libunwind-usage-when-static-linking.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/vulkan-loader/0003-fix-libunwind-usage-when-static-linking.patch Changed

@@ -1,4 +1,4 @@
-From ce897781c15a650f59b0c2ffa7dced738b34fa60 Mon Sep 17 00:00:00 2001
+From c2b51b82c5dc3e62dc6bc9778261555a2ebdd67d Mon Sep 17 00:00:00 2001
 From: Steve Lhomme <robux4@ycbcr.xyz>
 Date: Thu, 17 Oct 2024 11:56:18 +0200
 Subject: PATCH 3/3 fix libunwind usage when static linking
@@ -7,22 +7,27 @@
 - set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "atomic;m;-l:libunwind.a;dl;c;-l:libunwind.a;dl")
 - set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "windowsapp;windowsapp;ucrt;windowsapp;ucrtapp;c++;mingw32;-l:libunwind.a;moldname;mingwex;mingw32;-l:libunwind.a;moldname;mingwex")
 ---
- loader/CMakeLists.txt | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ loader/CMakeLists.txt | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 98da79ab8..93ab25f06 100644
+index b29c81a8d..cd5a6a441 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
-@@ -335,7 +335,13 @@ include(FindPkgConfig QUIET)
+@@ -335,7 +335,18 @@ include(FindPkgConfig QUIET)
  if(PKG_CONFIG_FOUND)
      set(VK_API_VERSION "${LOADER_GENERATED_HEADER_VERSION}")
      foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
 -        set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
-+        if (IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
++        if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
++            set(PRIVATE_LIBS "${PRIVATE_LIBS} ${LIB}")
++        elseif(${LIB} MATCHES "-l:lib.*.a")
++            string(LENGTH ${LIB} LIBLEN)
++            math(EXPR LIBLEN "${LIBLEN}-8")
++            string(SUBSTRING ${LIB} 6 ${LIBLEN} DIRECT_LIB)
++            set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${DIRECT_LIB}")
++        elseif(${LIB} MATCHES "-l.*")
 +            set(PRIVATE_LIBS "${PRIVATE_LIBS} ${LIB}")
-+        elseif(${LIB} MATCHES "-l:libunwind.a") # android toolchain
-+            set(PRIVATE_LIBS "${PRIVATE_LIBS} -lunwind")
 +        else()
 +            set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
 +        endif()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/vulkan-loader/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/vulkan-loader/rules.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/x265/0001-Fix-libunwind-static-linking-on-Android-toolchains.patch -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/x265/0001-Fix-libunwind-static-linking-on-Android-toolchains.patch Changed

@@ -1,23 +1,28 @@
-From c5dd262ca6a31ec77a12fe0141fa4de875c6e7ba Mon Sep 17 00:00:00 2001
+From 6e5f1a13bf5abaa1a84a65d6bb4fa3c9eb5fb41a Mon Sep 17 00:00:00 2001
 From: Steve Lhomme <robux4@ycbcr.xyz>
 Date: Wed, 16 Oct 2024 10:43:58 +0200
 Subject: PATCH Fix libunwind static linking on Android toolchains
 
 As well as llvm-mingw with -static-libgcc.
 ---
- source/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
+ source/CMakeLists.txt | 7 +++++++
+ 1 file changed, 7 insertions(+)
 
 diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index 8a3128bb7..8250f9ec7 100755
+index 33b6523f1..4d452e2c0 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -882,6 +882,8 @@ if(X265_LATEST_TAG)
+@@ -649,6 +649,13 @@ if(X265_LATEST_TAG)
      foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
          if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
              list(APPEND PLIBLIST "${LIB}")
-+        elseif(${LIB} MATCHES "-l:libunwind.a") # android toolchain
-+            list(APPEND IMPLICITS_LIST "-lunwind")
++        elseif(${LIB} MATCHES "-l:lib.*.a")
++            string(LENGTH ${LIB} LIBLEN)
++            math(EXPR LIBLEN "${LIBLEN}-8")
++            string(SUBSTRING ${LIB} 6 ${LIBLEN} DIRECT_LIB)
++            list(APPEND PLIBLIST "-l${DIRECT_LIB}")
++        elseif(${LIB} MATCHES "-l.*")
++            list(APPEND PLIBLIST ${LIB})
          else()
              list(APPEND PLIBLIST "-l${LIB}")
          endif()

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/x265/0001-fix-ldl-linking-error-of-x265.patch Added

@@ -0,0 +1,26 @@
+From 6a859d8fc1b064dd9db9f5807b95d621604aab7c Mon Sep 17 00:00:00 2001
+From: Gilles Sabourin <gilles.sabourin@free.fr>
+Date: Sun, 10 Jul 2016 15:21:38 +0200
+Subject: PATCH 1/3 fix ldl linking error of x265
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ source/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 33b6523f1..0ea2487c7 100644
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -713,7 +713,7 @@ if(ENABLE_CLI)
+         if(WIN32 OR NOT ENABLE_SHARED OR INTEL_CXX)
+             # The CLI cannot link to the shared library on Windows, it
+             # requires internal APIs not exported from the DLL
+-            target_link_libraries(cli x265-static ${PLATFORM_LIBS})
++            target_link_libraries(cli x265-static ${PLATFORM_LIBS} ${CMAKE_DL_LIBS})
+         else()
+             target_link_libraries(cli x265-shared ${PLATFORM_LIBS})
+         endif()
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/x265/0001-use-OpenFileMappingW-instead-of-OpenFileMappingA.patch Added

@@ -0,0 +1,64 @@
+From 65ed1f91133be6af7a8403db50e103c005272004 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Mon, 13 Jan 2025 12:53:41 +0100
+Subject: PATCH use OpenFileMappingW instead of OpenFileMappingA
+
+And use the corresponding UWP apps in UWP builds.
+---
+ source/common/ringmem.cpp | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/source/common/ringmem.cpp b/source/common/ringmem.cpp
+index cfd44e83d..8d60f5193 100644
+--- a/source/common/ringmem.cpp
++++ b/source/common/ringmem.cpp
+@@ -135,11 +135,25 @@ namespace X265_NS {
+             int32_t shrMemSize = (itemSize * itemCnt + sizeof(ShrMemCtrl) + RINGMEM_ALLIGNMENT - 1) & ~(RINGMEM_ALLIGNMENT - 1);
+ 
+ #ifdef _WIN32
+-            HANDLE h = OpenFileMappingA(FILE_MAP_WRITE | FILE_MAP_READ, FALSE, nameBuf);
++            wchar_t nameBuf_utf16MAX_PATH * 2;
++
++            void *pool;
++            if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, nameBuf, -1, nameBuf_utf16, sizeof(nameBuf_utf16)/sizeof(wchar_t)))
++                pool = NULL;
++            else
++            {
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
++            HANDLE h = OpenFileMappingW(FILE_MAP_WRITE | FILE_MAP_READ, FALSE, nameBuf_utf16);
++#else
++            HANDLE h = OpenFileMappingFromApp(FILE_MAP_WRITE | FILE_MAP_READ, FALSE, nameBuf_utf16);
++#endif
+             if (!h)
+             {
+-                h = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, shrMemSize, nameBuf);
+-
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
++                h = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, shrMemSize, nameBuf_utf16);
++#else
++                h = CreateFileMappingFromApp(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, shrMemSize, nameBuf_utf16);
++#endif
+                 if (!h)
+                 {
+                     return false;
+@@ -148,11 +162,16 @@ namespace X265_NS {
+                 newCreated = true;
+             }
+ 
+-            void *pool = MapViewOfFile(h, FILE_MAP_ALL_ACCESS, 0, 0, 0);
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
++            pool = MapViewOfFile(h, FILE_MAP_ALL_ACCESS, 0, 0, 0);
++#else
++            pool = MapViewOfFileFromApp(h, FILE_MAP_ALL_ACCESS, 0, 0);
++#endif
+ 
+             ///< should not close the handle here, otherwise the OpenFileMapping would fail
+             //CloseHandle(h);
+             m_handle = h;
++            }
+ 
+             if (!pool)
+             {
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/x265/0003-add-patch-to-enable-detect512.patch Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/x265/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/x265/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/contrib/src/x265/rules.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/contrib/src/x265/rules.mak Changed

@@ -1,7 +1,7 @@
 # x265
 
 #X265_GITURL := https://github.com/videolan/x265
-X265_VERSION := 2.9
+X265_VERSION := 4.1
 X265_SNAPURL := https://bitbucket.org/multicoreware/x265_git/downloads/x265_$(X265_VERSION).tar.gz
 
 ifdef BUILD_ENCODERS
@@ -30,10 +30,10 @@
 
 x265: x265_$(X265_VERSION).tar.gz .sum-x265
 	$(UNPACK)
-	$(APPLY) $(SRC)/x265/x265-ldl-linking.patch
-	$(APPLY) $(SRC)/x265/x265-no-pdb-install.patch
-	$(APPLY) $(SRC)/x265/x265-enable-detect512.patch
+	$(APPLY) $(SRC)/x265/0001-fix-ldl-linking-error-of-x265.patch
+	$(APPLY) $(SRC)/x265/0003-add-patch-to-enable-detect512.patch
 	$(APPLY) $(SRC)/x265/0001-api-use-LoadLibraryExA-instead-of-LoadLibraryA.patch
+	$(APPLY) $(SRC)/x265/0001-use-OpenFileMappingW-instead-of-OpenFileMappingA.patch
 	$(APPLY) $(SRC)/x265/0001-threadpool-disable-group-affinity-in-UWP-builds.patch
 	$(APPLY) $(SRC)/x265/0001-Fix-libunwind-static-linking-on-Android-toolchains.patch
 	$(call pkg_static,"source/x265.pc.in")
@@ -46,6 +46,5 @@
 	$(CMAKECLEAN)
 	$(HOSTVARS_CMAKE) $(CMAKE) -S $</source $(X265_CONF)
 	+$(CMAKEBUILD)
-	sed -e s/'^ *clang_rt^ *'//g -i.orig "$(BUILD_DIR)/x265.pc"
 	$(CMAKEINSTALL)
 	touch $@

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/doc/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/doc/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/doc/libvlc/QtGL/QtGl.pro -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/doc/libvlc/QtGL/QtGl.pro Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/doc/libvlc/QtGL/main.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/doc/libvlc/QtGL/main.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/doc/libvlc/QtPlayer/player.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/doc/libvlc/QtPlayer/player.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/doc/standalone/buildsystem.md -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/doc/standalone/buildsystem.md Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/ci/gitlab-ci.yml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/ci/gitlab-ci.yml Changed

@@ -20,14 +20,14 @@
 
 variables:
     VLC_TEST_TIMEOUT: 60
-    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-posix:20240808131936
-    VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20240731083648
-    VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20240731083648
-    VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20240723100046
-    VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20240731083648
+    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-posix:20241118101328
+    VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20241118101328
+    VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20241118101328
+    VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20241112155431
+    VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20241118101328
     VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20231013031754
     VLC_RASPBIAN_IMAGE: registry.videolan.org/vlc-ubuntu-raspberry:20240806085528
-    VLC_WASM_EMSCRIPTEN: registry.videolan.org/vlc-debian-wasm-emscripten:20240731083648
+    VLC_WASM_EMSCRIPTEN: registry.videolan.org/vlc-debian-wasm-emscripten:20250207201514
 
 .variables-debian: &variables-debian
         HOST_ARCH: x86_64
@@ -179,12 +179,6 @@
         <<: *variables-win64
         LIBVLC_EXTRA_BUILD_FLAGS: -x
 
-win64-llvm:
-    extends: .win-common
-    image:
-        name: $VLC_WIN_LLVM_MSVCRT_IMAGE
-    variables: *variables-win64
-
 win64-arm-llvm:
     extends: .win-common
     image:
@@ -197,15 +191,16 @@
         # branch protection enabled on Windows.
         CONFIGFLAGS: --disable-branch-protection
 
-uwp64-libvlc-llvm:
+uwp32-libvlc-llvm:
     extends: .win-common
     image:
         name: $VLC_WIN_LLVM_UCRT_IMAGE
     variables:
-        <<: *variables-win64
+        <<: *variables-win32
         VLCARCH: win64-uwp
         LIBVLC_EXTRA_BUILD_FLAGS: -z
-        UWP_EXTRA_BUILD_FLAGS: -u -w -x -S 0x0A000007
+        UWP_EXTRA_BUILD_FLAGS: -u -w -x -S 0x0A000007 -m
+    allow_failure: true
 
 .nightly-win-common:
     extends: .win-common
@@ -622,13 +617,13 @@
         name: $VLC_ANDROID_IMAGE
     script: |
         git clone https://code.videolan.org/videolan/libvlcjni.git
-        (cd libvlcjni && git checkout 6eb83177884f08b68e4283de7d9bb5d33379385d)
+        (cd libvlcjni && git checkout 11413ec511ef618e26b0934e71eed7da110685fe)
         if  -n "$VLC_PREBUILT_CONTRIBS_URL" ; then
           CONTRIB_FLAGS="--with-prebuilt-contribs"
         elif  "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" -a "${CI_PROJECT_PATH}" = "videolan/vlc" ; then
           CONTRIB_FLAGS="--package-contribs"
         fi
-        EXTRA_PARAMS="--enable-extra-checks" /bin/sh ./libvlcjni/buildsystem/compile-libvlc.sh --no-jni -a $ANDROID_ARCH $CONTRIB_FLAGS
+        EXTRA_PARAMS="--enable-extra-checks" /bin/sh ./libvlcjni/buildsystem/build-libvlc.sh -a $ANDROID_ARCH $CONTRIB_FLAGS
 
 android-arm:
     extends: .android-common

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/apple/build.conf -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/apple/build.conf Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/macosx/VLC.xcodeproj/project.pbxproj -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/macosx/VLC.xcodeproj/project.pbxproj Changed

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1C1C62011F8260A90052DD4F /* VLCWrappableTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C1C62001F8260A90052DD4F /* VLCWrappableTextField.m */; };
 		1C31138E1E508C6900D4DD76 /* VLCAboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C8A71D58C0A40079E1C1 /* VLCAboutWindowController.m */; };
 		1C3113901E508C6900D4DD76 /* VLCHelpWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C8A41D58C0980079E1C1 /* VLCHelpWindowController.m */; };
 		1C3113921E508C6900D4DD76 /* VLCAddonListItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF0435F1972E26A0022B534 /* VLCAddonListItem.m */; };
@@ -79,6 +78,9 @@
 		5307A6F82969904D001E0C6A /* VLCLibraryMediaSourceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5307A6F72969904D001E0C6A /* VLCLibraryMediaSourceViewController.m */; };
 		53088E152AD7802C00C21358 /* VLCLibraryCarouselViewItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53088E142AD7802C00C21358 /* VLCLibraryCarouselViewItemView.m */; };
 		530F32B32C8C757600233C03 /* VLCLibraryAbstractSegmentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 530F32B22C8C757600233C03 /* VLCLibraryAbstractSegmentViewController.m */; };
+		531062112CE1CB520087F863 /* VLCLibraryHomeViewActionsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 531062102CE1CB520087F863 /* VLCLibraryHomeViewActionsView.m */; };
+		531062162CE259290087F863 /* VLCLibraryHomeViewActionButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 531062152CE259290087F863 /* VLCLibraryHomeViewActionButtonCell.m */; };
+		531062192CE4AEFB0087F863 /* VLCStatusNotifierView.m in Sources */ = {isa = PBXBuildFile; fileRef = 531062182CE4AEFB0087F863 /* VLCStatusNotifierView.m */; };
 		5310AFB12B4FE72700E75F9A /* NSArray+VLCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 5310AFB02B4FE72700E75F9A /* NSArray+VLCAdditions.m */; };
 		5310AFB52B53EC4F00E75F9A /* iCarousel.m in Sources */ = {isa = PBXBuildFile; fileRef = 5310AFB32B53EC4E00E75F9A /* iCarousel.m */; };
 		531343E72A8E7B94007AEDFA /* VLCLibraryWindowNavigationSidebarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 531343E62A8E7B94007AEDFA /* VLCLibraryWindowNavigationSidebarViewController.m */; };
@@ -109,10 +111,8 @@
 		536283F0291146BC00640C15 /* VLCLibraryTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283DE291146BC00640C15 /* VLCLibraryTableView.m */; };
 		536283F1291146BC00640C15 /* VLCLibraryItemInternalMediaItemsDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283DF291146BC00640C15 /* VLCLibraryItemInternalMediaItemsDataSource.m */; };
 		536283F2291146BC00640C15 /* VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283E1291146BC00640C15 /* VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.m */; };
-		536283F3291146BC00640C15 /* VLCLibraryNavigationStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283E2291146BC00640C15 /* VLCLibraryNavigationStack.m */; };
 		536283F4291146BC00640C15 /* VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283E3291146BC00640C15 /* VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m */; };
 		536283F5291146BC00640C15 /* VLCLibraryCollectionViewSupplementaryDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283E5291146BC00640C15 /* VLCLibraryCollectionViewSupplementaryDetailView.m */; };
-		536283F7291146BC00640C15 /* VLCLibraryNavigationState.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283EB291146BC00640C15 /* VLCLibraryNavigationState.m */; };
 		536283F8291146BC00640C15 /* VLCLibrarySongTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283EC291146BC00640C15 /* VLCLibrarySongTableCellView.m */; };
 		536283F9291146BC00640C15 /* VLCLibraryCollectionViewFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283EE291146BC00640C15 /* VLCLibraryCollectionViewFlowLayout.m */; };
 		53628402291147C500640C15 /* VLCBasicView.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283FF291147C500640C15 /* VLCBasicView.m */; };
@@ -129,10 +129,13 @@
 		538A7EDA29A63EE40068AD4F /* VLCFullVideoViewWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 538A7ED929A63EE40068AD4F /* VLCFullVideoViewWindow.m */; };
 		538DC4E32A6B69B50082DECD /* VLCLibraryAudioGroupHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 538DC4E22A6B69B50082DECD /* VLCLibraryAudioGroupHeaderView.m */; };
 		53903D3A29576ED500D0B308 /* VLCLibraryAudioGroupDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 53903D3929576ED500D0B308 /* VLCLibraryAudioGroupDataSource.m */; };
+		539668872D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 539668842D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationStack.m */; };
+		539668882D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationState.m in Sources */ = {isa = PBXBuildFile; fileRef = 539668862D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationState.m */; };
 		539BA79F298C726200918C36 /* VLCAspectRatioRetainingVideoWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 539BA79E298C726200918C36 /* VLCAspectRatioRetainingVideoWindow.m */; };
 		539F114B29E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 539F114A29E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.m */; };
 		539F116D29F9785C00F13460 /* VLCMainVideoViewAudioMediaDecorativeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 539F116C29F9785C00F13460 /* VLCMainVideoViewAudioMediaDecorativeView.m */; };
 		53A1F1172AB7168000686BAA /* VLCLibraryAllAudioGroupsMediaLibraryItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A1F1162AB7168000686BAA /* VLCLibraryAllAudioGroupsMediaLibraryItem.m */; };
+		53A5E83E2CFE16E9008B33C1 /* VLCLibraryCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A5E83D2CFE16E9008B33C1 /* VLCLibraryCollectionView.m */; };
 		53A8F9D12A7E1E6300BC11BF /* VLCLibraryPlaylistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A8F9D02A7E1E6300BC11BF /* VLCLibraryPlaylistViewController.m */; };
 		53A8F9D42A7F815900BC11BF /* VLCLibraryPlaylistDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A8F9D32A7F815900BC11BF /* VLCLibraryPlaylistDataSource.m */; };
 		53A9698A2CD5B9D400E6F66E /* VLCTimeFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A969892CD5B9D400E6F66E /* VLCTimeFormatter.m */; };
@@ -140,12 +143,13 @@
 		53B447CA2939823E00857588 /* VLCLibrarySongsTableViewSongPlayingTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53B447C92939823E00857588 /* VLCLibrarySongsTableViewSongPlayingTableCellView.m */; };
 		53B447F9293BB47B00857588 /* VLCLibraryVideoDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 53B447F3293BB47A00857588 /* VLCLibraryVideoDataSource.m */; };
 		53B447FA293BB47B00857588 /* VLCLibraryVideoGroupDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 53B447F4293BB47A00857588 /* VLCLibraryVideoGroupDescriptor.m */; };
+		53BDE19F2D5C8D1C00254560 /* VLCMediaLibraryFolderObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 53BDE19E2D5C8D1C00254560 /* VLCMediaLibraryFolderObserver.m */; };
 		53C1EF8B2B466B13001AEEF5 /* VLCLibraryHomeViewVideoGridContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53C1EF852B466B13001AEEF5 /* VLCLibraryHomeViewVideoGridContainerView.m */; };
 		53C1EF8C2B466B13001AEEF5 /* VLCLibraryHomeViewStackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53C1EF862B466B13001AEEF5 /* VLCLibraryHomeViewStackViewController.m */; };
 		53CBE30B2C159A4D006BF2E3 /* VLCNoResultsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 53CBE30A2C159A4D006BF2E3 /* VLCNoResultsLabel.m */; };
 		53D021352CC225C6003C008F /* VLCLibraryWindowTitlesSidebarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D021332CC225C6003C008F /* VLCLibraryWindowTitlesSidebarViewController.m */; };
 		53D0213D2CC25520003C008F /* VLCPlayerTitle.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D0213C2CC25520003C008F /* VLCPlayerTitle.m */; };
-		53D21A1F2BB465600085C71B /* VLCLibraryWindowPlaylistSidebarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D21A1E2BB465600085C71B /* VLCLibraryWindowPlaylistSidebarViewController.m */; };
+		53D21A1F2BB465600085C71B /* VLCLibraryWindowPlayQueueSidebarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D21A1E2BB465600085C71B /* VLCLibraryWindowPlayQueueSidebarViewController.m */; };
 		53D8ED9A2B583AAF00142EAD /* VLCLibraryModelChangeDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D8ED992B583AAF00142EAD /* VLCLibraryModelChangeDelegate.m */; };
 		53ED472329C74D1F00795DB1 /* VLCLibraryAudioTableViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 53ED472229C74D1F00795DB1 /* VLCLibraryAudioTableViewDelegate.m */; };
 		53ED472629C78FE700795DB1 /* VLCLibraryAudioGroupTableViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 53ED472529C78FE700795DB1 /* VLCLibraryAudioGroupTableViewDelegate.m */; };
@@ -158,6 +162,8 @@
 		53F0E92D299B002300491D49 /* VLCInputNodePathControlItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 53F0E92C299B002300491D49 /* VLCInputNodePathControlItem.m */; };
 		53F0E930299B17DF00491D49 /* VLCInputNodePathControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 53F0E92F299B17DF00491D49 /* VLCInputNodePathControl.m */; };
 		53F399802AC6D6B400B86241 /* VLCLibraryHomeViewVideoCarouselContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53F3997F2AC6D6B400B86241 /* VLCLibraryHomeViewVideoCarouselContainerView.m */; };
+		53F7B23C2D545FCF00F3B38F /* VLCLibraryAbstractMediaLibrarySegmentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53F7B23B2D545FCF00F3B38F /* VLCLibraryAbstractMediaLibrarySegmentViewController.m */; };
+		53F7B2372D4D499400F3B38F /* VLCFileDragRecognisingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53F7B2362D4D499400F3B38F /* VLCFileDragRecognisingView.m */; };
 		6B0292E61F43256300A50082 /* VLCBottomBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B0292E51F43256300A50082 /* VLCBottomBarView.m */; };
 		6B0AB0F01F1AC8B3003A1B4E /* VLCPlaybackProgressSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B0AB0ED1F1AC8B3003A1B4E /* VLCPlaybackProgressSlider.m */; };
 		6B0AB0F11F1AC8B3003A1B4E /* VLCPlaybackProgressSliderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B0AB0EF1F1AC8B3003A1B4E /* VLCPlaybackProgressSliderCell.m */; };
@@ -175,17 +181,14 @@
 		6B81662A1EBFC34300C26F1B /* VLCDefaultValueSliderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B6A499D1DFD9B23009128AC /* VLCDefaultValueSliderCell.m */; };
 		6B81662C1EBFC38100C26F1B /* VLCUIWidgets.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71514C0D4A90057F8D1 /* VLCUIWidgets.m */; };
 		6BAF886024DB1CEA001044C8 /* VLCSystemVolume.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BAF885F24DB1CEA001044C8 /* VLCSystemVolume.m */; };
-		6BBB05DA1EEFEA29003A1019 /* VLCHUDOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BBB05D91EEFEA29003A1019 /* VLCHUDOutlineView.m */; };
-		6BBB05E01EEFF165003A1019 /* VLCHUDTableCornerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BBB05DF1EEFF165003A1019 /* VLCHUDTableCornerView.m */; };
 		6BBBF9851F7B257100B404CD /* VLCLogMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BBBF9841F7B257100B404CD /* VLCLogMessage.m */; };
 		6BF093F91EE0182B0049D8B0 /* VLCTimeField.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BF093F81EE0182B0049D8B0 /* VLCTimeField.m */; };
-		6BF5C5041EFE66EF008A9C12 /* VLCHUDTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BF5C5031EFE66EF008A9C12 /* VLCHUDTableView.m */; };
 		7D0F5A9B2264EB410009C48A /* VLCHotkeysController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D0F5A9A2264EB410009C48A /* VLCHotkeysController.m */; };
-		7D0F63FF2201F63400FDB91F /* VLCPlaylistTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D0F63FE2201F63400FDB91F /* VLCPlaylistTableCellView.m */; };
+		7D0F63FF2201F63400FDB91F /* VLCPlayQueueTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D0F63FE2201F63400FDB91F /* VLCPlayQueueTableCellView.m */; };
 		7D0F64062202047900FDB91F /* VLCLibraryCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D0F64042202047900FDB91F /* VLCLibraryCollectionViewItem.m */; };
-		7D0F640C2202163E00FDB91F /* VLCPlaylistDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D0F640B2202163E00FDB91F /* VLCPlaylistDataSource.m */; };
+		7D0F640C2202163E00FDB91F /* VLCPlayQueueDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D0F640B2202163E00FDB91F /* VLCPlayQueueDataSource.m */; };
 		7D1BF28A22A153E20027C50F /* VLCRoundedCornerTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D1BF28922A153E20027C50F /* VLCRoundedCornerTextField.m */; };
-		7D1BF28D22A192000027C50F /* VLCPlaylistSortingMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D1BF28C22A192000027C50F /* VLCPlaylistSortingMenuController.m */; };
+		7D1BF28D22A192000027C50F /* VLCPlayQueueSortingMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D1BF28C22A192000027C50F /* VLCPlayQueueSortingMenuController.m */; };
 		7D20081A2289835C002679DF /* VLCTrackingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D2008192289835C002679DF /* VLCTrackingView.m */; };
 		7D22A8F422BC14F80063ECD2 /* VLCLibrarySortingMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D22A8F322BC14F80063ECD2 /* VLCLibrarySortingMenuController.m */; };
 		7D2554C222C8A39300F2D9C2 /* VLCMediaSourceDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D2554C122C8A39300F2D9C2 /* VLCMediaSourceDataSource.m */; };
@@ -196,11 +199,11 @@
 		7D2E0EDE20CD206F0033A221 /* VLCVideoWindowCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D2E0EDD20CD206F0033A221 /* VLCVideoWindowCommon.m */; };
 		7D2FFA40227B8A5B0085D649 /* VLCLinearProgressIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D2FFA3F227B8A5B0085D649 /* VLCLinearProgressIndicator.m */; };
 		7D404ABF2281892C00B28EF4 /* NSView+VLCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D404ABE2281892C00B28EF4 /* NSView+VLCAdditions.m */; };
-		7D445D812202524000263D34 /* VLCPlaylistController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D445D802202524000263D34 /* VLCPlaylistController.m */; };
-		7D445D842202524D00263D34 /* VLCPlaylistItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D445D832202524D00263D34 /* VLCPlaylistItem.m */; };
-		7D445D872202574B00263D34 /* VLCPlaylistModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D445D862202574B00263D34 /* VLCPlaylistModel.m */; };
-		7D445D8B22032B9200263D34 /* VLCPlaylistTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D445D8A22032B9200263D34 /* VLCPlaylistTableView.m */; };
-		7D445D8E2203375100263D34 /* VLCPlaylistMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D445D8D2203375100263D34 /* VLCPlaylistMenuController.m */; };
+		7D445D812202524000263D34 /* VLCPlayQueueController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D445D802202524000263D34 /* VLCPlayQueueController.m */; };
+		7D445D842202524D00263D34 /* VLCPlayQueueItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D445D832202524D00263D34 /* VLCPlayQueueItem.m */; };
+		7D445D872202574B00263D34 /* VLCPlayQueueModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D445D862202574B00263D34 /* VLCPlayQueueModel.m */; };
+		7D445D8B22032B9200263D34 /* VLCPlayQueueTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D445D8A22032B9200263D34 /* VLCPlayQueueTableView.m */; };
+		7D445D8E2203375100263D34 /* VLCPlayQueueMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D445D8D2203375100263D34 /* VLCPlayQueueMenuController.m */; };
 		7D460B0C229EB4C700097948 /* VLCDragDropView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D460B0B229EB4C700097948 /* VLCDragDropView.m */; };
 		7D61DCE4236C1937008133CF /* VLCCustomWindowButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D61DCE3236C1937008133CF /* VLCCustomWindowButton.m */; };
 		7D66D4362200BC340040D04A /* VLCClickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D66D4352200BC340040D04A /* VLCClickerManager.m */; };
@@ -263,8 +266,6 @@
 		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		1C06F2A21F08F1250068846F /* osx_notifications.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = osx_notifications.m; path = ../../../modules/notify/osx_notifications.m; sourceTree = "<group>"; };
 		1C18BE461F2926700053D329 /* keychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = keychain.m; path = ../../../modules/keystore/keychain.m; sourceTree = "<group>"; };
-		1C1C61FF1F8260A90052DD4F /* VLCWrappableTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCWrappableTextField.h; sourceTree = "<group>"; };
-		1C1C62001F8260A90052DD4F /* VLCWrappableTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCWrappableTextField.m; sourceTree = "<group>"; };
 		1C1ED51D2205AC6B00811EC0 /* VLCControlsBarCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCControlsBarCommon.h; sourceTree = "<group>"; };
 		1C1ED5262205B14700811EC0 /* iTunes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTunes.h; sourceTree = "<group>"; };
 		1C1ED5272205B14700811EC0 /* Spotify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Spotify.h; sourceTree = "<group>"; };
@@ -302,6 +303,12 @@
 		53088E142AD7802C00C21358 /* VLCLibraryCarouselViewItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryCarouselViewItemView.m; sourceTree = "<group>"; };
 		530F32B12C8C757600233C03 /* VLCLibraryAbstractSegmentViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryAbstractSegmentViewController.h; sourceTree = "<group>"; };
 		530F32B22C8C757600233C03 /* VLCLibraryAbstractSegmentViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryAbstractSegmentViewController.m; sourceTree = "<group>"; };
+		5310620F2CE1CB520087F863 /* VLCLibraryHomeViewActionsView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryHomeViewActionsView.h; sourceTree = "<group>"; };
+		531062102CE1CB520087F863 /* VLCLibraryHomeViewActionsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryHomeViewActionsView.m; sourceTree = "<group>"; };
+		531062142CE259290087F863 /* VLCLibraryHomeViewActionButtonCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryHomeViewActionButtonCell.h; sourceTree = "<group>"; };
+		531062152CE259290087F863 /* VLCLibraryHomeViewActionButtonCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryHomeViewActionButtonCell.m; sourceTree = "<group>"; };
+		531062172CE4AEFB0087F863 /* VLCStatusNotifierView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCStatusNotifierView.h; sourceTree = "<group>"; };
+		531062182CE4AEFB0087F863 /* VLCStatusNotifierView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCStatusNotifierView.m; sourceTree = "<group>"; };
 		5310AFAF2B4FE72700E75F9A /* NSArray+VLCAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSArray+VLCAdditions.h"; sourceTree = "<group>"; };
 		5310AFB02B4FE72700E75F9A /* NSArray+VLCAdditions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+VLCAdditions.m"; sourceTree = "<group>"; };
 		5310AFB32B53EC4E00E75F9A /* iCarousel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iCarousel.m; sourceTree = "<group>"; };
@@ -325,6 +332,7 @@
 		532CBCFD2C8E025F00899413 /* VLCLibraryDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryDataSource.h; sourceTree = "<group>"; };
 		533B5D2A29CF94C6003DE887 /* VLCBookmarksTableViewDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCBookmarksTableViewDataSource.h; sourceTree = "<group>"; };
 		533B5D2B29CF94C6003DE887 /* VLCBookmarksTableViewDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCBookmarksTableViewDataSource.m; sourceTree = "<group>"; };
+		533D20432D549D2400AB146F /* VLCLibraryItemPresentingCapable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryItemPresentingCapable.h; sourceTree = "<group>"; };
 		5341F1472C96E544003BDF0A /* VLCLibraryWindowChaptersView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCLibraryWindowChaptersView.xib; sourceTree = "<group>"; };
 		5341F1482C9757EF003BDF0A /* VLCLibraryWindowChaptersSidebarViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryWindowChaptersSidebarViewController.h; sourceTree = "<group>"; };
 		5341F1492C9757EF003BDF0A /* VLCLibraryWindowChaptersSidebarViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryWindowChaptersSidebarViewController.m; sourceTree = "<group>"; };
@@ -368,18 +376,14 @@
 		536283DF291146BC00640C15 /* VLCLibraryItemInternalMediaItemsDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryItemInternalMediaItemsDataSource.m; sourceTree = "<group>"; };
 		536283E0291146BC00640C15 /* VLCLibraryTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryTableView.h; sourceTree = "<group>"; };
 		536283E1291146BC00640C15 /* VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.m; sourceTree = "<group>"; };
-		536283E2291146BC00640C15 /* VLCLibraryNavigationStack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryNavigationStack.m; sourceTree = "<group>"; };
 		536283E3291146BC00640C15 /* VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m; sourceTree = "<group>"; };
-		536283E4291146BC00640C15 /* VLCLibraryNavigationState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryNavigationState.h; sourceTree = "<group>"; };
 		536283E5291146BC00640C15 /* VLCLibraryCollectionViewSupplementaryDetailView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryCollectionViewSupplementaryDetailView.m; sourceTree = "<group>"; };
 		536283E6291146BC00640C15 /* VLCLibraryCollectionViewSupplementaryDetailView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryCollectionViewSupplementaryDetailView.h; sourceTree = "<group>"; };
 		536283E8291146BC00640C15 /* VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.h; sourceTree = "<group>"; };
 		536283EA291146BC00640C15 /* VLCLibraryCollectionViewMediaItemSupplementaryDetailView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryCollectionViewMediaItemSupplementaryDetailView.h; sourceTree = "<group>"; };
-		536283EB291146BC00640C15 /* VLCLibraryNavigationState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryNavigationState.m; sourceTree = "<group>"; };
 		536283EC291146BC00640C15 /* VLCLibrarySongTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibrarySongTableCellView.m; sourceTree = "<group>"; };
 		536283ED291146BC00640C15 /* VLCLibraryCollectionViewFlowLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryCollectionViewFlowLayout.h; sourceTree = "<group>"; };
 		536283EE291146BC00640C15 /* VLCLibraryCollectionViewFlowLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryCollectionViewFlowLayout.m; sourceTree = "<group>"; };
-		536283EF291146BC00640C15 /* VLCLibraryNavigationStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryNavigationStack.h; sourceTree = "<group>"; };
 		536283FA2911476A00640C15 /* VLCLibrarySongTableCellView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VLCLibrarySongTableCellView.xib; sourceTree = "<group>"; };
 		536283FC2911476A00640C15 /* VLCLibraryCollectionViewMediaItemSupplementaryDetailView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VLCLibraryCollectionViewMediaItemSupplementaryDetailView.xib; sourceTree = "<group>"; };
 		536283FD2911476A00640C15 /* VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.xib; sourceTree = "<group>"; };
@@ -410,6 +414,11 @@
 		538DC4E42A6B69C00082DECD /* VLCLibraryAudioGroupHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryAudioGroupHeaderView.h; sourceTree = "<group>"; };
 		53903D3829576ED500D0B308 /* VLCLibraryAudioGroupDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryAudioGroupDataSource.h; sourceTree = "<group>"; };
 		53903D3929576ED500D0B308 /* VLCLibraryAudioGroupDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryAudioGroupDataSource.m; sourceTree = "<group>"; };
+		5390E0E52CE0AC3C00A4FC4A /* VLCLibraryHomeViewActionsView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCLibraryHomeViewActionsView.xib; sourceTree = "<group>"; };
+		539668832D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationStack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryMediaSourceViewNavigationStack.h; sourceTree = "<group>"; };
+		539668842D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationStack.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryMediaSourceViewNavigationStack.m; sourceTree = "<group>"; };
+		539668852D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryMediaSourceViewNavigationState.h; sourceTree = "<group>"; };
+		539668862D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationState.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryMediaSourceViewNavigationState.m; sourceTree = "<group>"; };
 		539BA79D298C726200918C36 /* VLCAspectRatioRetainingVideoWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCAspectRatioRetainingVideoWindow.h; sourceTree = "<group>"; };
 		539BA79E298C726200918C36 /* VLCAspectRatioRetainingVideoWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCAspectRatioRetainingVideoWindow.m; sourceTree = "<group>"; };
 		539F114929E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryTwoPaneSplitViewDelegate.h; sourceTree = "<group>"; };
@@ -420,6 +429,8 @@
 		53A1F1152AB7168000686BAA /* VLCLibraryAllAudioGroupsMediaLibraryItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryAllAudioGroupsMediaLibraryItem.h; sourceTree = "<group>"; };
 		53A1F1162AB7168000686BAA /* VLCLibraryAllAudioGroupsMediaLibraryItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryAllAudioGroupsMediaLibraryItem.m; sourceTree = "<group>"; };
 		53A5021D2C9ADFF3000C3CD3 /* VLCLibraryWindowSidebarRootView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCLibraryWindowSidebarRootView.xib; sourceTree = "<group>"; };
+		53A5E83C2CFE16E9008B33C1 /* VLCLibraryCollectionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryCollectionView.h; sourceTree = "<group>"; };
+		53A5E83D2CFE16E9008B33C1 /* VLCLibraryCollectionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryCollectionView.m; sourceTree = "<group>"; };
 		53A8F9CF2A7E1E6300BC11BF /* VLCLibraryPlaylistViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryPlaylistViewController.h; sourceTree = "<group>"; };
 		53A8F9D02A7E1E6300BC11BF /* VLCLibraryPlaylistViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryPlaylistViewController.m; sourceTree = "<group>"; };
 		53A8F9D22A7F815900BC11BF /* VLCLibraryPlaylistDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryPlaylistDataSource.h; sourceTree = "<group>"; };
@@ -435,6 +446,8 @@
 		53B447F0293BB47A00857588 /* VLCLibraryVideoGroupDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryVideoGroupDescriptor.h; sourceTree = "<group>"; };
 		53B447F3293BB47A00857588 /* VLCLibraryVideoDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryVideoDataSource.m; sourceTree = "<group>"; };
 		53B447F4293BB47A00857588 /* VLCLibraryVideoGroupDescriptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryVideoGroupDescriptor.m; sourceTree = "<group>"; };
+		53BDE19D2D5C8D1C00254560 /* VLCMediaLibraryFolderObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCMediaLibraryFolderObserver.h; sourceTree = "<group>"; };
+		53BDE19E2D5C8D1C00254560 /* VLCMediaLibraryFolderObserver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCMediaLibraryFolderObserver.m; sourceTree = "<group>"; };
 		53BFB1E02A6A72160065EA7A /* VLCLibraryAudioGroupHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCLibraryAudioGroupHeaderView.xib; sourceTree = "<group>"; };
 		53C1EF842B466B13001AEEF5 /* VLCLibraryHomeViewContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryHomeViewContainerView.h; sourceTree = "<group>"; };
 		53C1EF852B466B13001AEEF5 /* VLCLibraryHomeViewVideoGridContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryHomeViewVideoGridContainerView.m; sourceTree = "<group>"; };
@@ -449,9 +462,9 @@
 		53D0213B2CC25520003C008F /* VLCPlayerTitle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlayerTitle.h; sourceTree = "<group>"; };
 		53D0213C2CC25520003C008F /* VLCPlayerTitle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlayerTitle.m; sourceTree = "<group>"; };
 		53D21A1B2BB428A20085C71B /* VLCLibraryWindowNavigationSidebarView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCLibraryWindowNavigationSidebarView.xib; sourceTree = "<group>"; };
-		53D21A1C2BB428F00085C71B /* VLCLibraryWindowPlaylistView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCLibraryWindowPlaylistView.xib; sourceTree = "<group>"; };
-		53D21A1D2BB465600085C71B /* VLCLibraryWindowPlaylistSidebarViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryWindowPlaylistSidebarViewController.h; sourceTree = "<group>"; };
-		53D21A1E2BB465600085C71B /* VLCLibraryWindowPlaylistSidebarViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryWindowPlaylistSidebarViewController.m; sourceTree = "<group>"; };
+		53D21A1C2BB428F00085C71B /* VLCLibraryWindowPlayQueueView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCLibraryWindowPlayQueueView.xib; sourceTree = "<group>"; };
+		53D21A1D2BB465600085C71B /* VLCLibraryWindowPlayQueueSidebarViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryWindowPlayQueueSidebarViewController.h; sourceTree = "<group>"; };
+		53D21A1E2BB465600085C71B /* VLCLibraryWindowPlayQueueSidebarViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryWindowPlayQueueSidebarViewController.m; sourceTree = "<group>"; };
 		53D6664E2B6B82940042C03D /* VLCLibraryTableViewDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryTableViewDataSource.h; sourceTree = "<group>"; };
 		53D8ED982B583AAF00142EAD /* VLCLibraryModelChangeDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryModelChangeDelegate.h; sourceTree = "<group>"; };
 		53D8ED992B583AAF00142EAD /* VLCLibraryModelChangeDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryModelChangeDelegate.m; sourceTree = "<group>"; };
@@ -479,6 +492,10 @@
 		53F3997D2AC6D50500B86241 /* VLCLibraryHomeViewVideoContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryHomeViewVideoContainerView.h; sourceTree = "<group>"; };
 		53F3997E2AC6D67F00B86241 /* VLCLibraryHomeViewVideoCarouselContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryHomeViewVideoCarouselContainerView.h; sourceTree = "<group>"; };
 		53F3997F2AC6D6B400B86241 /* VLCLibraryHomeViewVideoCarouselContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryHomeViewVideoCarouselContainerView.m; sourceTree = "<group>"; };
+		53F7B23A2D545FCF00F3B38F /* VLCLibraryAbstractMediaLibrarySegmentViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryAbstractMediaLibrarySegmentViewController.h; sourceTree = "<group>"; };
+		53F7B23B2D545FCF00F3B38F /* VLCLibraryAbstractMediaLibrarySegmentViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryAbstractMediaLibrarySegmentViewController.m; sourceTree = "<group>"; };
+		53F7B2352D4D499400F3B38F /* VLCFileDragRecognisingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCFileDragRecognisingView.h; sourceTree = "<group>"; };
+		53F7B2362D4D499400F3B38F /* VLCFileDragRecognisingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCFileDragRecognisingView.m; sourceTree = "<group>"; };
 		5CCED71014C0D4A90057F8D1 /* VLCExtensionsDialogProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCExtensionsDialogProvider.h; sourceTree = "<group>"; };
 		5CCED71114C0D4A90057F8D1 /* VLCExtensionsDialogProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCExtensionsDialogProvider.m; sourceTree = "<group>"; };
 		5CCED71214C0D4A90057F8D1 /* VLCExtensionsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCExtensionsManager.h; sourceTree = "<group>"; };
@@ -680,10 +697,6 @@
 		6BA1A0632038D93D005EA18A /* ci_filters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ci_filters.m; path = ../../../modules/video_filter/ci_filters.m; sourceTree = "<group>"; };
 		6BAF885E24DB1CEA001044C8 /* VLCSystemVolume.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCSystemVolume.h; sourceTree = "<group>"; };
 		6BAF885F24DB1CEA001044C8 /* VLCSystemVolume.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCSystemVolume.m; sourceTree = "<group>"; };
-		6BBB05D81EEFEA29003A1019 /* VLCHUDOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDOutlineView.h; sourceTree = "<group>"; };
-		6BBB05D91EEFEA29003A1019 /* VLCHUDOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDOutlineView.m; sourceTree = "<group>"; };
-		6BBB05DE1EEFF165003A1019 /* VLCHUDTableCornerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDTableCornerView.h; sourceTree = "<group>"; };
-		6BBB05DF1EEFF165003A1019 /* VLCHUDTableCornerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDTableCornerView.m; sourceTree = "<group>"; };
 		6BBBB8A71D108A17001BD9BA /* VLCRendererMenuController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCRendererMenuController.h; sourceTree = "<group>"; };
 		6BBBB8A81D108A17001BD9BA /* VLCRendererMenuController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCRendererMenuController.m; sourceTree = "<group>"; };
 		6BBBB8B01D10A994001BD9BA /* VLCRendererItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCRendererItem.h; sourceTree = "<group>"; };
@@ -696,24 +709,22 @@
 		6BF093F81EE0182B0049D8B0 /* VLCTimeField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCTimeField.m; sourceTree = "<group>"; };
 		6BF557CF1E4E0E2500C03C9D /* VLCPauseTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = VLCPauseTemplate.pdf; path = "Button-Icons/VLCPauseTemplate.pdf"; sourceTree = "<group>"; };
 		6BF56C3D1FCF00AF004A411A /* audiotoolbox_midi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audiotoolbox_midi.c; path = ../../../modules/codec/audiotoolbox_midi.c; sourceTree = "<group>"; };
-		6BF5C5021EFE66EF008A9C12 /* VLCHUDTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDTableView.h; sourceTree = "<group>"; };
-		6BF5C5031EFE66EF008A9C12 /* VLCHUDTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDTableView.m; sourceTree = "<group>"; };
 		6CEA55642C6BA1BE00CCC2E7 /* PIPSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIPSPI.h; sourceTree = "<group>"; };
 		7D0A387820CBCC4D00D4BF3B /* videotoolbox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = videotoolbox.c; path = ../../../modules/codec/videotoolbox.c; sourceTree = "<group>"; };
 		7D0F5A992264EB410009C48A /* VLCHotkeysController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCHotkeysController.h; sourceTree = "<group>"; };
 		7D0F5A9A2264EB410009C48A /* VLCHotkeysController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCHotkeysController.m; sourceTree = "<group>"; };
-		7D0F63FD2201F63400FDB91F /* VLCPlaylistTableCellView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistTableCellView.h; sourceTree = "<group>"; };
-		7D0F63FE2201F63400FDB91F /* VLCPlaylistTableCellView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistTableCellView.m; sourceTree = "<group>"; };
-		7D0F64002201F66D00FDB91F /* VLCPlaylistTableCellView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCPlaylistTableCellView.xib; sourceTree = "<group>"; };
+		7D0F63FD2201F63400FDB91F /* VLCPlayQueueTableCellView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlayQueueTableCellView.h; sourceTree = "<group>"; };
+		7D0F63FE2201F63400FDB91F /* VLCPlayQueueTableCellView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlayQueueTableCellView.m; sourceTree = "<group>"; };
+		7D0F64002201F66D00FDB91F /* VLCPlayQueueTableCellView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCPlayQueueTableCellView.xib; sourceTree = "<group>"; };
 		7D0F64032202047900FDB91F /* VLCLibraryCollectionViewItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryCollectionViewItem.h; sourceTree = "<group>"; };
 		7D0F64042202047900FDB91F /* VLCLibraryCollectionViewItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryCollectionViewItem.m; sourceTree = "<group>"; };
 		7D0F64052202047900FDB91F /* VLCLibraryCollectionViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCLibraryCollectionViewItem.xib; sourceTree = "<group>"; };
-		7D0F640A2202163E00FDB91F /* VLCPlaylistDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistDataSource.h; sourceTree = "<group>"; };
-		7D0F640B2202163E00FDB91F /* VLCPlaylistDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistDataSource.m; sourceTree = "<group>"; };
+		7D0F640A2202163E00FDB91F /* VLCPlayQueueDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlayQueueDataSource.h; sourceTree = "<group>"; };
+		7D0F640B2202163E00FDB91F /* VLCPlayQueueDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlayQueueDataSource.m; sourceTree = "<group>"; };
 		7D1BF28822A153E20027C50F /* VLCRoundedCornerTextField.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCRoundedCornerTextField.h; sourceTree = "<group>"; };
 		7D1BF28922A153E20027C50F /* VLCRoundedCornerTextField.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCRoundedCornerTextField.m; sourceTree = "<group>"; };
-		7D1BF28B22A192000027C50F /* VLCPlaylistSortingMenuController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistSortingMenuController.h; sourceTree = "<group>"; };
-		7D1BF28C22A192000027C50F /* VLCPlaylistSortingMenuController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistSortingMenuController.m; sourceTree = "<group>"; };
+		7D1BF28B22A192000027C50F /* VLCPlayQueueSortingMenuController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlayQueueSortingMenuController.h; sourceTree = "<group>"; };
+		7D1BF28C22A192000027C50F /* VLCPlayQueueSortingMenuController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlayQueueSortingMenuController.m; sourceTree = "<group>"; };
 		7D2008182289835C002679DF /* VLCTrackingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCTrackingView.h; sourceTree = "<group>"; };
 		7D2008192289835C002679DF /* VLCTrackingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCTrackingView.m; sourceTree = "<group>"; };
 		7D22A8F222BC14F80063ECD2 /* VLCLibrarySortingMenuController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibrarySortingMenuController.h; sourceTree = "<group>"; };
@@ -744,16 +755,16 @@
 		7D2FFA3F227B8A5B0085D649 /* VLCLinearProgressIndicator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLinearProgressIndicator.m; sourceTree = "<group>"; };
 		7D404ABD2281892C00B28EF4 /* NSView+VLCAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSView+VLCAdditions.h"; sourceTree = "<group>"; };
 		7D404ABE2281892C00B28EF4 /* NSView+VLCAdditions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSView+VLCAdditions.m"; sourceTree = "<group>"; };
-		7D445D7F2202524000263D34 /* VLCPlaylistController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistController.h; sourceTree = "<group>"; };
-		7D445D802202524000263D34 /* VLCPlaylistController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistController.m; sourceTree = "<group>"; };
-		7D445D822202524D00263D34 /* VLCPlaylistItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistItem.h; sourceTree = "<group>"; };
-		7D445D832202524D00263D34 /* VLCPlaylistItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistItem.m; sourceTree = "<group>"; };
-		7D445D852202574B00263D34 /* VLCPlaylistModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistModel.h; sourceTree = "<group>"; };
-		7D445D862202574B00263D34 /* VLCPlaylistModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistModel.m; sourceTree = "<group>"; };
-		7D445D8922032B9200263D34 /* VLCPlaylistTableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistTableView.h; sourceTree = "<group>"; };
-		7D445D8A22032B9200263D34 /* VLCPlaylistTableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistTableView.m; sourceTree = "<group>"; };
-		7D445D8C2203375100263D34 /* VLCPlaylistMenuController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistMenuController.h; sourceTree = "<group>"; };
-		7D445D8D2203375100263D34 /* VLCPlaylistMenuController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistMenuController.m; sourceTree = "<group>"; };
+		7D445D7F2202524000263D34 /* VLCPlayQueueController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlayQueueController.h; sourceTree = "<group>"; };
+		7D445D802202524000263D34 /* VLCPlayQueueController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlayQueueController.m; sourceTree = "<group>"; };
+		7D445D822202524D00263D34 /* VLCPlayQueueItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlayQueueItem.h; sourceTree = "<group>"; };
+		7D445D832202524D00263D34 /* VLCPlayQueueItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlayQueueItem.m; sourceTree = "<group>"; };
+		7D445D852202574B00263D34 /* VLCPlayQueueModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlayQueueModel.h; sourceTree = "<group>"; };
+		7D445D862202574B00263D34 /* VLCPlayQueueModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlayQueueModel.m; sourceTree = "<group>"; };
+		7D445D8922032B9200263D34 /* VLCPlayQueueTableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlayQueueTableView.h; sourceTree = "<group>"; };
+		7D445D8A22032B9200263D34 /* VLCPlayQueueTableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlayQueueTableView.m; sourceTree = "<group>"; };
+		7D445D8C2203375100263D34 /* VLCPlayQueueMenuController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlayQueueMenuController.h; sourceTree = "<group>"; };
+		7D445D8D2203375100263D34 /* VLCPlayQueueMenuController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlayQueueMenuController.m; sourceTree = "<group>"; };
 		7D460B0A229EB4C700097948 /* VLCDragDropView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCDragDropView.h; sourceTree = "<group>"; };
 		7D460B0B229EB4C700097948 /* VLCDragDropView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCDragDropView.m; sourceTree = "<group>"; };
 		7D5678EB1D5BA1DC002698F3 /* VLCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCApplication.h; sourceTree = "<group>"; };
@@ -1018,7 +1029,7 @@
 				1C1ED50F2204B04A00811EC0 /* menus */,
 				1C1ED50C2204AFD900811EC0 /* os-integration */,
 				1C1ED5032204A99400811EC0 /* panels */,
-				1C1ED5142205A96600811EC0 /* playlist */,
+				1C1ED5142205A96600811EC0 /* playqueue */,
 				1C1ED5102204B06700811EC0 /* preferences */,
 				6CEA55632C6BA14300CCC2E7 /* private */,
 				1C1ED5062204AB7C00811EC0 /* views */,
@@ -1122,12 +1133,8 @@
 				6B6A499D1DFD9B23009128AC /* VLCDefaultValueSliderCell.m */,
 				7D460B0A229EB4C700097948 /* VLCDragDropView.h */,
 				7D460B0B229EB4C700097948 /* VLCDragDropView.m */,
-				6BBB05D81EEFEA29003A1019 /* VLCHUDOutlineView.h */,
-				6BBB05D91EEFEA29003A1019 /* VLCHUDOutlineView.m */,
-				6BBB05DE1EEFF165003A1019 /* VLCHUDTableCornerView.h */,
-				6BBB05DF1EEFF165003A1019 /* VLCHUDTableCornerView.m */,
-				6BF5C5021EFE66EF008A9C12 /* VLCHUDTableView.h */,
-				6BF5C5031EFE66EF008A9C12 /* VLCHUDTableView.m */,
+				53F7B2352D4D499400F3B38F /* VLCFileDragRecognisingView.h */,
+				53F7B2362D4D499400F3B38F /* VLCFileDragRecognisingView.m */,
 				6B3BE42A1E6217CB008D098A /* VLCImageButton.h */,
 				6B3BE42B1E6217CB008D098A /* VLCImageButton.m */,
 				7DFBDCB5226CDFD600B700A5 /* VLCImageView.h */,
@@ -1148,6 +1155,8 @@
 				6B13E2A71BC67678001AD24A /* VLCScrollingClipView.m */,
 				537976B92A4319330036827E /* VLCSettingTextField.h */,
 				537976B82A4319330036827E /* VLCSettingTextField.m */,
+				531062172CE4AEFB0087F863 /* VLCStatusNotifierView.h */,
+				531062182CE4AEFB0087F863 /* VLCStatusNotifierView.m */,
 				53628401291147C500640C15 /* VLCSubScrollView.h */,
 				53628400291147C500640C15 /* VLCSubScrollView.m */,
 				6BF093F71EE0182B0049D8B0 /* VLCTimeField.h */,
@@ -1160,8 +1169,6 @@
 				6B2EFC5F1F2819F700F3C0EA /* VLCVolumeSlider.m */,
 				6B2EFC611F281A0900F3C0EA /* VLCVolumeSliderCell.h */,
 				6B2EFC621F281A0900F3C0EA /* VLCVolumeSliderCell.m */,
-				1C1C61FF1F8260A90052DD4F /* VLCWrappableTextField.h */,
-				1C1C62001F8260A90052DD4F /* VLCWrappableTextField.m */,
 			);
 			path = views;
 			sourceTree = "<group>";
@@ -1338,10 +1345,14 @@
 				53F0E92C299B002300491D49 /* VLCInputNodePathControlItem.m */,
 				5360E9A62C5CF6270046BA8B /* VLCLibraryAbstractGroupingDataSource.h */,
 				5360E9A72C5CF6270046BA8B /* VLCLibraryAbstractGroupingDataSource.m */,
+				53F7B23A2D545FCF00F3B38F /* VLCLibraryAbstractMediaLibrarySegmentViewController.h */,
+				53F7B23B2D545FCF00F3B38F /* VLCLibraryAbstractMediaLibrarySegmentViewController.m */,
 				530F32B12C8C757600233C03 /* VLCLibraryAbstractSegmentViewController.h */,
 				530F32B22C8C757600233C03 /* VLCLibraryAbstractSegmentViewController.m */,
 				53088E132AD7802C00C21358 /* VLCLibraryCarouselViewItemView.h */,
 				53088E142AD7802C00C21358 /* VLCLibraryCarouselViewItemView.m */,
+				53A5E83C2CFE16E9008B33C1 /* VLCLibraryCollectionView.h */,
+				53A5E83D2CFE16E9008B33C1 /* VLCLibraryCollectionView.m */,
 				5317FE05294E8D1A001702F0 /* VLCLibraryCollectionViewDataSource.h */,
 				5317FE02294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.h */,
 				5317FE03294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.m */,
@@ -1377,10 +1388,7 @@
 				7DFBDCAA2269E77F00B700A5 /* VLCLibraryModel.m */,
 				53D8ED982B583AAF00142EAD /* VLCLibraryModelChangeDelegate.h */,
 				53D8ED992B583AAF00142EAD /* VLCLibraryModelChangeDelegate.m */,
-				536283EF291146BC00640C15 /* VLCLibraryNavigationStack.h */,
-				536283E2291146BC00640C15 /* VLCLibraryNavigationStack.m */,
-				536283E4291146BC00640C15 /* VLCLibraryNavigationState.h */,
-				536283EB291146BC00640C15 /* VLCLibraryNavigationState.m */,
+				533D20432D549D2400AB146F /* VLCLibraryItemPresentingCapable.h */,
 				530771F22AEBB80C00656D3D /* VLCLibraryRepresentedItem.h */,
 				530771F32AEBBD5B00656D3D /* VLCLibraryRepresentedItem.m */,
 				531343E82A8E8965007AEDFA /* VLCLibrarySegment.h */,
@@ -1415,8 +1423,8 @@
 				531343E62A8E7B94007AEDFA /* VLCLibraryWindowNavigationSidebarViewController.m */,
 				5352B37429E149AC0011CE03 /* VLCLibraryWindowPersistentPreferences.h */,
 				5352B37529E149AC0011CE03 /* VLCLibraryWindowPersistentPreferences.m */,
-				53D21A1D2BB465600085C71B /* VLCLibraryWindowPlaylistSidebarViewController.h */,
-				53D21A1E2BB465600085C71B /* VLCLibraryWindowPlaylistSidebarViewController.m */,
+				53D21A1D2BB465600085C71B /* VLCLibraryWindowPlayQueueSidebarViewController.h */,
+				53D21A1E2BB465600085C71B /* VLCLibraryWindowPlayQueueSidebarViewController.m */,
 				53222C002CBBDBEE00CB9FA2 /* VLCLibraryWindowSidebarChildViewController.h */,
 				5341F1512C9865DD003BDF0A /* VLCLibraryWindowSidebarRootViewController.h */,
 				5341F1522C9865DD003BDF0A /* VLCLibraryWindowSidebarRootViewController.m */,
@@ -1426,11 +1434,13 @@
 				53D021332CC225C6003C008F /* VLCLibraryWindowTitlesSidebarViewController.m */,
 				53F020A22A91D4A100E79705 /* VLCLibraryWindowToolbarDelegate.h */,
 				53F020A32A91D4A100E79705 /* VLCLibraryWindowToolbarDelegate.m */,
+				53BDE19D2D5C8D1C00254560 /* VLCMediaLibraryFolderObserver.h */,
+				53BDE19E2D5C8D1C00254560 /* VLCMediaLibraryFolderObserver.m */,
 			);
 			path = library;
 			sourceTree = "<group>";
 		};
-		1C1ED5142205A96600811EC0 /* playlist */ = {
+		1C1ED5142205A96600811EC0 /* playqueue */ = {
 			isa = PBXGroup;
 			children = (
 				7DF812ED1B555A340052293C /* VLCPlaybackContinuityController.h */,
@@ -1441,24 +1451,24 @@
 				7DE9C7DC220728420089108F /* VLCPlayerController.m */,
 				53D0213B2CC25520003C008F /* VLCPlayerTitle.h */,
 				53D0213C2CC25520003C008F /* VLCPlayerTitle.m */,
-				7D445D7F2202524000263D34 /* VLCPlaylistController.h */,
-				7D445D802202524000263D34 /* VLCPlaylistController.m */,
-				7D0F640A2202163E00FDB91F /* VLCPlaylistDataSource.h */,
-				7D0F640B2202163E00FDB91F /* VLCPlaylistDataSource.m */,
-				7D445D822202524D00263D34 /* VLCPlaylistItem.h */,
-				7D445D832202524D00263D34 /* VLCPlaylistItem.m */,
-				7D445D8C2203375100263D34 /* VLCPlaylistMenuController.h */,
-				7D445D8D2203375100263D34 /* VLCPlaylistMenuController.m */,
-				7D1BF28B22A192000027C50F /* VLCPlaylistSortingMenuController.h */,
-				7D1BF28C22A192000027C50F /* VLCPlaylistSortingMenuController.m */,
-				7D445D852202574B00263D34 /* VLCPlaylistModel.h */,
-				7D445D862202574B00263D34 /* VLCPlaylistModel.m */,
-				7D0F63FD2201F63400FDB91F /* VLCPlaylistTableCellView.h */,
-				7D0F63FE2201F63400FDB91F /* VLCPlaylistTableCellView.m */,
-				7D445D8922032B9200263D34 /* VLCPlaylistTableView.h */,
-				7D445D8A22032B9200263D34 /* VLCPlaylistTableView.m */,
+				7D445D7F2202524000263D34 /* VLCPlayQueueController.h */,
+				7D445D802202524000263D34 /* VLCPlayQueueController.m */,
+				7D0F640A2202163E00FDB91F /* VLCPlayQueueDataSource.h */,
+				7D0F640B2202163E00FDB91F /* VLCPlayQueueDataSource.m */,
+				7D445D822202524D00263D34 /* VLCPlayQueueItem.h */,
+				7D445D832202524D00263D34 /* VLCPlayQueueItem.m */,
+				7D445D8C2203375100263D34 /* VLCPlayQueueMenuController.h */,
+				7D445D8D2203375100263D34 /* VLCPlayQueueMenuController.m */,
+				7D1BF28B22A192000027C50F /* VLCPlayQueueSortingMenuController.h */,
+				7D1BF28C22A192000027C50F /* VLCPlayQueueSortingMenuController.m */,
+				7D445D852202574B00263D34 /* VLCPlayQueueModel.h */,
+				7D445D862202574B00263D34 /* VLCPlayQueueModel.m */,
+				7D0F63FD2201F63400FDB91F /* VLCPlayQueueTableCellView.h */,
+				7D0F63FE2201F63400FDB91F /* VLCPlayQueueTableCellView.m */,
+				7D445D8922032B9200263D34 /* VLCPlayQueueTableView.h */,
+				7D445D8A22032B9200263D34 /* VLCPlayQueueTableView.m */,
 			);
-			path = playlist;
+			path = playqueue;
 			sourceTree = "<group>";
 		};
 		1C1ED5162205AA8200811EC0 /* addons */ = {
@@ -1609,6 +1619,10 @@
 		5350E4EB2B1B210E00F276CB /* home-library */ = {
 			isa = PBXGroup;
 			children = (
+				531062142CE259290087F863 /* VLCLibraryHomeViewActionButtonCell.h */,
+				531062152CE259290087F863 /* VLCLibraryHomeViewActionButtonCell.m */,
+				5310620F2CE1CB520087F863 /* VLCLibraryHomeViewActionsView.h */,
+				531062102CE1CB520087F863 /* VLCLibraryHomeViewActionsView.m */,
 				535F1BBE2B4892A200C78D98 /* VLCLibraryHomeViewAudioCarouselContainerView.h */,
 				535F1BBF2B4892A200C78D98 /* VLCLibraryHomeViewAudioCarouselContainerView.m */,
 				535F1BC12B4979D300C78D98 /* VLCLibraryHomeViewBaseCarouselContainerView.h */,
@@ -1931,8 +1945,12 @@
 		7DFBDCB8226CED3700B700A5 /* media-source */ = {
 			isa = PBXGroup;
 			children = (
-				7DFBDCB9226CED6300B700A5 /* VLCMediaSourceProvider.h */,
-				7DFBDCBA226CED6300B700A5 /* VLCMediaSourceProvider.m */,
+				5307A6F62969904D001E0C6A /* VLCLibraryMediaSourceViewController.h */,
+				5307A6F72969904D001E0C6A /* VLCLibraryMediaSourceViewController.m */,
+				539668832D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationStack.h */,
+				539668842D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationStack.m */,
+				539668852D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationState.h */,
+				539668862D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationState.m */,
 				7DFBDCBC226CED7200B700A5 /* VLCMediaSource.h */,
 				7DFBDCBD226CED7200B700A5 /* VLCMediaSource.m */,
 				7DFBDCC2226E445500B700A5 /* VLCMediaSourceBaseDataSource.h */,
@@ -1943,8 +1961,8 @@
 				7D67318422C8F4050000AD40 /* VLCMediaSourceCollectionViewItem.m */,
 				7D2554C422C8E8B500F2D9C2 /* VLCMediaSourceDeviceCollectionViewItem.h */,
 				7D2554C322C8E8B400F2D9C2 /* VLCMediaSourceDeviceCollectionViewItem.m */,
-				5307A6F62969904D001E0C6A /* VLCLibraryMediaSourceViewController.h */,
-				5307A6F72969904D001E0C6A /* VLCLibraryMediaSourceViewController.m */,
+				7DFBDCB9226CED6300B700A5 /* VLCMediaSourceProvider.h */,
+				7DFBDCBA226CED6300B700A5 /* VLCMediaSourceProvider.m */,
 			);
 			path = "media-source";
 			sourceTree = "<group>";
@@ -2082,18 +2100,19 @@
 				7D0F64052202047900FDB91F /* VLCLibraryCollectionViewItem.xib */,
 				536283FC2911476A00640C15 /* VLCLibraryCollectionViewMediaItemSupplementaryDetailView.xib */,
 				53B40FD42AA7618000C814E4 /* VLCLibraryHeroView.xib */,
+				5390E0E52CE0AC3C00A4FC4A /* VLCLibraryHomeViewActionsView.xib */,
 				536283FA2911476A00640C15 /* VLCLibrarySongTableCellView.xib */,
 				7DE2F0482282D7980040DD0A /* VLCLibraryTableCellView.xib */,
 				534E8E3729A04F95009503F8 /* VLCMainVideoView.xib */,
 				7D67318322C8F3F60000AD40 /* VLCMediaSourceCollectionViewItem.xib */,
 				7DF14FBC2270CB1C0008ABE4 /* VLCMediaSourceDeviceCollectionViewItem.xib */,
-				7D0F64002201F66D00FDB91F /* VLCPlaylistTableCellView.xib */,
+				7D0F64002201F66D00FDB91F /* VLCPlayQueueTableCellView.xib */,
 				6B82241A1E4D2A9000833BE1 /* VLCStatusBarIconMainMenu.xib */,
 				7D713D332201BB130042BEB7 /* VLCLibraryWindow.xib */,
 				5341F1472C96E544003BDF0A /* VLCLibraryWindowChaptersView.xib */,
 				53D021362CC22852003C008F /* VLCLibraryWindowTitlesView.xib */,
 				53D21A1B2BB428A20085C71B /* VLCLibraryWindowNavigationSidebarView.xib */,
-				53D21A1C2BB428F00085C71B /* VLCLibraryWindowPlaylistView.xib */,
+				53D21A1C2BB428F00085C71B /* VLCLibraryWindowPlayQueueView.xib */,
 				53A5021D2C9ADFF3000C3CD3 /* VLCLibraryWindowSidebarRootView.xib */,
 			);
 			name = XIBs;
@@ -2205,7 +2224,7 @@
 				5341F14D2C981B7C003BDF0A /* VLCLibraryWindowAbstractSidebarViewController.m in Sources */,
 				7D66D4392200C5B80040D04A /* VLCVideoFilterHelper.m in Sources */,
 				5352B37329DF29BF0011CE03 /* VLCMainVideoViewControlsBar.m in Sources */,
-				7D445D812202524000263D34 /* VLCPlaylistController.m in Sources */,
+				7D445D812202524000263D34 /* VLCPlayQueueController.m in Sources */,
 				7DFBDCBE226CED7200B700A5 /* VLCMediaSource.m in Sources */,
 				536283F2291146BC00640C15 /* VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.m in Sources */,
 				5341F1542C9865F8003BDF0A /* VLCLibraryWindowSidebarRootViewController.m in Sources */,
@@ -2229,9 +2248,11 @@
 				1CCC89012078A3D500E5626F /* Preferences.xib in Sources */,
 				7DC21A7422049A6600F98A02 /* VLCOpenInputMetadata.m in Sources */,
 				1CCC89022078A3D500E5626F /* ResumeDialog.xib in Sources */,
+				531062162CE259290087F863 /* VLCLibraryHomeViewActionButtonCell.m in Sources */,
 				532572032C3D79D80068DEC3 /* VLCLibrarySegmentBookmarkedLocation.m in Sources */,
 				7DE7232E22A51F8D00D72616 /* VLCPositionFormatter.m in Sources */,
 				534E8E3A29A06325009503F8 /* VLCMainVideoViewController.m in Sources */,
+				531062112CE1CB520087F863 /* VLCLibraryHomeViewActionsView.m in Sources */,
 				536EFBF5295BCB8300F4CB13 /* VLCLibraryUIUnits.m in Sources */,
 				1CCC89032078A3D500E5626F /* SimplePreferences.xib in Sources */,
 				537BD6862C59216600446ED0 /* VLCLibraryGroupsViewController.m in Sources */,
@@ -2244,9 +2265,9 @@
 				536BFD1929B181E100BD0776 /* VLCMainVideoViewOverlayView.m in Sources */,
 				536283F1291146BC00640C15 /* VLCLibraryItemInternalMediaItemsDataSource.m in Sources */,
 				5307A6F52967859F001E0C6A /* NSImage+VLCAdditions.m in Sources */,
+				53A5E83E2CFE16E9008B33C1 /* VLCLibraryCollectionView.m in Sources */,
 				5341F14A2C9757EF003BDF0A /* VLCLibraryWindowChaptersSidebarViewController.m in Sources */,
 				1CCC89042078A3D500E5626F /* StreamOutput.xib in Sources */,
-				536283F7291146BC00640C15 /* VLCLibraryNavigationState.m in Sources */,
 				1CCC89052078A3D500E5626F /* TextfieldPanel.xib in Sources */,
 				1CCC89062078A3D500E5626F /* TimeSelectionPanel.xib in Sources */,
 				5307A6F82969904D001E0C6A /* VLCLibraryMediaSourceViewController.m in Sources */,
@@ -2270,7 +2291,7 @@
 				6B397C4F216C8EB200403ED0 /* NSString+Helpers.m in Sources */,
 				1C31138E1E508C6900D4DD76 /* VLCAboutWindowController.m in Sources */,
 				1C3113901E508C6900D4DD76 /* VLCHelpWindowController.m in Sources */,
-				7D1BF28D22A192000027C50F /* VLCPlaylistSortingMenuController.m in Sources */,
+				7D1BF28D22A192000027C50F /* VLCPlayQueueSortingMenuController.m in Sources */,
 				53B447CA2939823E00857588 /* VLCLibrarySongsTableViewSongPlayingTableCellView.m in Sources */,
 				1C3113921E508C6900D4DD76 /* VLCAddonListItem.m in Sources */,
 				7DFBDCB7226CDFD600B700A5 /* VLCImageView.m in Sources */,
@@ -2290,16 +2311,14 @@
 				53ED472629C78FE700795DB1 /* VLCLibraryAudioGroupTableViewDelegate.m in Sources */,
 				536283F9291146BC00640C15 /* VLCLibraryCollectionViewFlowLayout.m in Sources */,
 				6BBBF9851F7B257100B404CD /* VLCLogMessage.m in Sources */,
-				7D445D8E2203375100263D34 /* VLCPlaylistMenuController.m in Sources */,
+				7D445D8E2203375100263D34 /* VLCPlayQueueMenuController.m in Sources */,
 				53903D3A29576ED500D0B308 /* VLCLibraryAudioGroupDataSource.m in Sources */,
 				1C31139A1E508C6900D4DD76 /* VLCBookmarksWindowController.m in Sources */,
 				6B0AB0F01F1AC8B3003A1B4E /* VLCPlaybackProgressSlider.m in Sources */,
 				7D28E6362275B4820098D30E /* NSColor+VLCAdditions.m in Sources */,
-				6BF5C5041EFE66EF008A9C12 /* VLCHUDTableView.m in Sources */,
 				535F1BBA2B47ACCE00C78D98 /* VLCLibraryHomeViewVideoContainerViewDataSource.m in Sources */,
 				53D8ED9A2B583AAF00142EAD /* VLCLibraryModelChangeDelegate.m in Sources */,
 				53B447FA293BB47B00857588 /* VLCLibraryVideoGroupDescriptor.m in Sources */,
-				6BBB05E01EEFF165003A1019 /* VLCHUDTableCornerView.m in Sources */,
 				5360E9A82C5CF6270046BA8B /* VLCLibraryAbstractGroupingDataSource.m in Sources */,
 				1C31139D1E508C6900D4DD76 /* VLCControlsBarCommon.m in Sources */,
 				7DD2F5C52081B73B007EE187 /* VLCRemoteControlService.m in Sources */,
@@ -2316,12 +2335,13 @@
 				1C3113A91E508C6900D4DD76 /* VLCDocumentController.m in Sources */,
 				1C3113AB1E508C6900D4DD76 /* VLCExtensionsDialogProvider.m in Sources */,
 				7D460B0C229EB4C700097948 /* VLCDragDropView.m in Sources */,
-				7D445D872202574B00263D34 /* VLCPlaylistModel.m in Sources */,
+				7D445D872202574B00263D34 /* VLCPlayQueueModel.m in Sources */,
 				7D2554C222C8A39300F2D9C2 /* VLCMediaSourceDataSource.m in Sources */,
 				534E73E529D2FF07009982DE /* VLCBookmark.m in Sources */,
 				7DE2F0442282C84A0040DD0A /* VLCLibraryAudioDataSource.m in Sources */,
-				53D21A1F2BB465600085C71B /* VLCLibraryWindowPlaylistSidebarViewController.m in Sources */,
-				7D0F640C2202163E00FDB91F /* VLCPlaylistDataSource.m in Sources */,
+				531062192CE4AEFB0087F863 /* VLCStatusNotifierView.m in Sources */,
+				53D21A1F2BB465600085C71B /* VLCLibraryWindowPlayQueueSidebarViewController.m in Sources */,
+				7D0F640C2202163E00FDB91F /* VLCPlayQueueDataSource.m in Sources */,
 				1C3113AD1E508C6900D4DD76 /* VLCExtensionsManager.m in Sources */,
 				53A8F9D42A7F815900BC11BF /* VLCLibraryPlaylistDataSource.m in Sources */,
 				7DFBDCBB226CED6300B700A5 /* VLCMediaSourceProvider.m in Sources */,
@@ -2346,14 +2366,13 @@
 				7D0F64062202047900FDB91F /* VLCLibraryCollectionViewItem.m in Sources */,
 				7D713D322201AE350042BEB7 /* VLCLibraryWindow.m in Sources */,
 				7D22A8F422BC14F80063ECD2 /* VLCLibrarySortingMenuController.m in Sources */,
+				53BDE19F2D5C8D1C00254560 /* VLCMediaLibraryFolderObserver.m in Sources */,
 				1C3113C91E508C6900D4DD76 /* VLCOutput.m in Sources */,
-				1C1C62011F8260A90052DD4F /* VLCWrappableTextField.m in Sources */,
-				6BBB05DA1EEFEA29003A1019 /* VLCHUDOutlineView.m in Sources */,
 				535F1BC02B4892A200C78D98 /* VLCLibraryHomeViewAudioCarouselContainerView.m in Sources */,
-				7D445D842202524D00263D34 /* VLCPlaylistItem.m in Sources */,
+				7D445D842202524D00263D34 /* VLCPlayQueueItem.m in Sources */,
 				1C3113CF1E508C6900D4DD76 /* prefs_widgets.m in Sources */,
 				539F114B29E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.m in Sources */,
-				7D0F63FF2201F63400FDB91F /* VLCPlaylistTableCellView.m in Sources */,
+				7D0F63FF2201F63400FDB91F /* VLCPlayQueueTableCellView.m in Sources */,
 				1C3113D11E508C6900D4DD76 /* prefs.m in Sources */,
 				533B5D2C29CF94C6003DE887 /* VLCBookmarksTableViewDataSource.m in Sources */,
 				1C3113D31E508C6900D4DD76 /* VLCResumeDialogController.m in Sources */,
@@ -2368,8 +2387,7 @@
 				1C3113D71E508C6900D4DD76 /* VLCPopupPanelController.m in Sources */,
 				5360E9A52C5BE5550046BA8B /* VLCLibraryMasterDetailViewTableViewDelegate.m in Sources */,
 				7DF0994F23E71E76007CA6EE /* NSMenu+VLCAdditions.m in Sources */,
-				7D445D8B22032B9200263D34 /* VLCPlaylistTableView.m in Sources */,
-				536283F3291146BC00640C15 /* VLCLibraryNavigationStack.m in Sources */,
+				7D445D8B22032B9200263D34 /* VLCPlayQueueTableView.m in Sources */,
 				1C3113D91E508C6900D4DD76 /* VLCSimplePrefsController.m in Sources */,
 				7DFBDCC4226E445500B700A5 /* VLCMediaSourceBaseDataSource.m in Sources */,
 				6B2EFC601F2819F700F3C0EA /* VLCVolumeSlider.m in Sources */,
@@ -2382,14 +2400,18 @@
 				6B4D50A71E7AB52C004479B5 /* NSScreen+VLCAdditions.m in Sources */,
 				1C3113DD1E508C6900D4DD76 /* VLCTrackSynchronizationWindowController.m in Sources */,
 				7D0F5A9B2264EB410009C48A /* VLCHotkeysController.m in Sources */,
+				53F7B2372D4D499400F3B38F /* VLCFileDragRecognisingView.m in Sources */,
 				5362550D293FD639005D64FA /* VLCLibraryWindowController.m in Sources */,
 				6B6FFF701EF9EC350001CEB1 /* CompatibilityFixes.m in Sources */,
 				7D1BF28A22A153E20027C50F /* VLCRoundedCornerTextField.m in Sources */,
 				7DFBDCB4226CD00900B700A5 /* VLCLibraryDataTypes.m in Sources */,
 				53A1F1172AB7168000686BAA /* VLCLibraryAllAudioGroupsMediaLibraryItem.m in Sources */,
 				1C3113DF1E508C6900D4DD76 /* VLCVideoEffectsWindowController.m in Sources */,
+				53F7B23C2D545FCF00F3B38F /* VLCLibraryAbstractMediaLibrarySegmentViewController.m in Sources */,
 				53F0E92D299B002300491D49 /* VLCInputNodePathControlItem.m in Sources */,
 				1C3113E11E508C6900D4DD76 /* VLCVoutView.m in Sources */,
+				539668872D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationStack.m in Sources */,
+				539668882D37B483005CD9D4 /* VLCLibraryMediaSourceViewNavigationState.m in Sources */,
 				1C3113E51E508C6900D4DD76 /* VLCInformationWindowController.m in Sources */,
 				6B7F1FDF1F07DA920002BDD8 /* VLCHexNumberFormatter.m in Sources */,
 				534E73E229D2EDB1009982DE /* VLCBookmarksTableViewDelegate.m in Sources */,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/macosx/env.build.sh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/macosx/env.build.sh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/wasm-emscripten/build.sh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/wasm-emscripten/build.sh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/helpers/extensions.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/helpers/extensions.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/helpers/install.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/helpers/install.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/AfrikaansExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/AfrikaansExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/AlbanianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/AlbanianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/ArabicExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/ArabicExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/BasqueExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/BasqueExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/BengaliExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/BengaliExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/BosnianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/BosnianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/BulgarianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/BulgarianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/CatalanExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/CatalanExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/CroatianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/CroatianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/CzechExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/CzechExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/DanishExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/DanishExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/DutchExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/DutchExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/EnglishExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/EnglishExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/EnglishUKExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/EnglishUKExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/EstonianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/EstonianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/FinnishExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/FinnishExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/FrenchExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/FrenchExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/GalicianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/GalicianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/GermanExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/GermanExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/GreekExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/GreekExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/HebrewExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/HebrewExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/HungarianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/HungarianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/IcelandicExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/IcelandicExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/IndonesianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/IndonesianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/ItalianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/ItalianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/JapaneseExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/JapaneseExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/KhmerExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/KhmerExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/KoreanExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/KoreanExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/LatvianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/LatvianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/LithuanianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/LithuanianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/MalayExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/MalayExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/NorwegianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/NorwegianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/OccitanExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/OccitanExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/PolishExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/PolishExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/PortugueseBRExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/PortugueseBRExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/PortugueseExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/PortugueseExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/PunjabiExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/PunjabiExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/RomanianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/RomanianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/RussianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/RussianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/ScotsGaelicExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/ScotsGaelicExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/SerbianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/SerbianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/SimpChineseExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/SimpChineseExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/SinhalaExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/SinhalaExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/SlovakExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/SlovakExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/SlovenianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/SlovenianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/SoraniExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/SoraniExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/SpanishExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/SpanishExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/SwedishExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/SwedishExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/ThaiExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/ThaiExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/TradChineseExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/TradChineseExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/TurkishExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/TurkishExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/UkrainianExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/UkrainianExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/UzbekExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/UzbekExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/languages/WelshExtra.nsh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/languages/WelshExtra.nsh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/nsProcess/nsProcess.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/nsProcess/nsProcess.c Changed

@@ -20,74 +20,12 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <tlhelp32.h>
+#include <psapi.h>
 #include "pluginapi.h"
 
 /* Defines */
 #define NSIS_MAX_STRLEN 1024
 
-#define SystemProcessInformation     5
-#define STATUS_SUCCESS               0x00000000L
-#define STATUS_INFO_LENGTH_MISMATCH  0xC0000004L
-
-typedef struct _SYSTEM_THREAD_INFO {
-  FILETIME ftCreationTime;
-  DWORD dwUnknown1;
-  DWORD dwStartAddress;
-  DWORD dwOwningPID;
-  DWORD dwThreadID;
-  DWORD dwCurrentPriority;
-  DWORD dwBasePriority;
-  DWORD dwContextSwitches;
-  DWORD dwThreadState;
-  DWORD dwUnknown2;
-  DWORD dwUnknown3;
-  DWORD dwUnknown4;
-  DWORD dwUnknown5;
-  DWORD dwUnknown6;
-  DWORD dwUnknown7;
-} SYSTEM_THREAD_INFO;
-
-typedef struct _SYSTEM_PROCESS_INFO {
-  DWORD dwOffset;
-  DWORD dwThreadCount;
-  DWORD dwUnkown16;
-  FILETIME ftCreationTime;
-  DWORD dwUnkown2;
-  DWORD dwUnkown3;
-  DWORD dwUnkown4;
-  DWORD dwUnkown5;
-  DWORD dwUnkown6;
-  WCHAR *pszProcessName;
-  DWORD dwBasePriority;
-  DWORD dwProcessID;
-  DWORD dwParentProcessID;
-  DWORD dwHandleCount;
-  DWORD dwUnkown7;
-  DWORD dwUnkown8;
-  DWORD dwVirtualBytesPeak;
-  DWORD dwVirtualBytes;
-  DWORD dwPageFaults;
-  DWORD dwWorkingSetPeak;
-  DWORD dwWorkingSet;
-  DWORD dwUnkown9;
-  DWORD dwPagedPool;
-  DWORD dwUnkown10;
-  DWORD dwNonPagedPool;
-  DWORD dwPageFileBytesPeak;
-  DWORD dwPageFileBytes;
-  DWORD dwPrivateBytes;
-  DWORD dwUnkown11;
-  DWORD dwUnkown12;
-  DWORD dwUnkown13;
-  DWORD dwUnkown14;
-  SYSTEM_THREAD_INFO atiANYSIZE_ARRAY;
-} SYSTEM_PROCESS_INFO;
-
-
-/* Include conversion functions */
-//#define xatoi
-//#define xitoa
 
 /* Global variables */
 TCHAR szBufNSIS_MAX_STRLEN;
@@ -178,14 +116,14 @@
 	if (bClose)
 		EnumWindows(EnumWindowsProc, (LPARAM)&window);
 	if (window.prev_hwnd != NULL)
-	{	  
+	{
 	  if (GetExitCodeProcess(hProc,&ec) && ec == STILL_ACTIVE)
 		if (WaitForSingleObject(hProc, 3000) == WAIT_OBJECT_0)
 		{
 		  *bSuccess = bDone = TRUE;
 		}
 		else;
-	  else 
+	  else
 	  {
 		  *bSuccess = bDone = TRUE;
 	  }
@@ -256,7 +194,6 @@
 {
   TCHAR szNameMAX_PATH;
   OSVERSIONINFO osvi;
-  HMODULE hLib;
   HANDLE hProc;
   ULONG uError;
   BOOL bFound=FALSE;
@@ -271,83 +208,63 @@
       osvi.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS)
     return 605;
 
-  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)
+  size_t process_count = 512;
+  DWORD *processIDs = NULL;
+  for (;;)
   {
-    // WinNT/2000/XP
-
-    SYSTEM_PROCESS_INFO *spi;
-    SYSTEM_PROCESS_INFO *spiCount;
-    DWORD dwSize=0x4000;
-    DWORD dwData;
-    ULONG (WINAPI *NtQuerySystemInformationPtr)(ULONG, PVOID, LONG, PULONG);
-
-    if ((hLib=LoadLibraryW(L"NTDLL.DLL")) != NULL)
+    processIDs = realloc(processIDs, process_count * sizeof(DWORD));
+    if (processIDs == NULL)
+        break;
+    DWORD readSize;
+    if (!EnumProcesses(processIDs, process_count*sizeof(DWORD), &readSize))
     {
-      NtQuerySystemInformationPtr=(ULONG(WINAPI *)(ULONG, PVOID, LONG, PULONG))GetProcAddress(hLib, "NtQuerySystemInformation");
-
-      if (NtQuerySystemInformationPtr)
-      {
-        while (1)
-        {
-          if ((spi=LocalAlloc(LMEM_FIXED, dwSize)) != NULL)
-          {
-            uError=(*NtQuerySystemInformationPtr)(SystemProcessInformation, spi, dwSize, &dwData);
-
-            if (uError == STATUS_SUCCESS) break;
-
-            LocalFree(spi);
-
-            if (uError != STATUS_INFO_LENGTH_MISMATCH)
-            {
-              uError=608;
-              break;
-            }
-          }
-          else
-          {
-            uError=608;
-            break;
-          }
-          dwSize*=2;
-        }
-      }
-      else uError=607;
-
-      FreeLibrary(hLib);
+        free(processIDs);
+        processIDs = NULL;
+        break;
+    }
+    if (readSize < process_count * sizeof(DWORD))
+    {
+        process_count = readSize / sizeof(DWORD);
+        break;
     }
-    else uError=606;
-
-    if (uError != STATUS_SUCCESS) return uError;
-
-    spiCount=spi;
 
-    while (1)
+    // there might be more processes
+    process_count *= 2;
+  }
+  if (processIDs != NULL)
+  {
+    const size_t cmpsize = lstrlen(szProcessName);
+    for (size_t i=0; i<process_count; i++)
     {
-      if (spiCount->pszProcessName)
+      hProc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, processIDsi);
+      if (hProc != NULL)
       {
-
-#ifdef UNICODE
-	    lstrcpyn(szName, spiCount->pszProcessName, MAX_PATH);
-#else
-	    WideCharToMultiByte(CP_ACP, 0, spiCount->pszProcessName, -1, szName, MAX_PATH, NULL, NULL);
-#endif		
-
-        if (!lstrcmpi(szName, szProcessName))
+        DWORD proclen = sizeof(szName);
+        BOOL got = QueryFullProcessImageName(hProc, PROCESS_NAME_NATIVE, szName, &proclen);
+        CloseHandle(hProc);
+        if (got != FALSE)
         {
-          // Process found
-          bFound=TRUE;
 
-          if (bTerminate == TRUE)
+          if (proclen < cmpsize + 1)
+          {
+            continue;
+          }
+          if (szNameproclen - cmpsize - 1 == TEXT('\\') &&
+              !lstrcmpi(szProcessName, &szNameproclen - cmpsize))
           {
-			  NiceTerminate(spiCount->dwProcessID, bClose, &bSuccess, &bFailed);
+            // Process found
+            bFound=TRUE;
+
+            if (bTerminate == TRUE)
+            {
+              NiceTerminate(processIDsi, bClose, &bSuccess, &bFailed);
+            }
+            else break;
           }
-          else break;
         }
       }
-      if (spiCount->dwOffset == 0) break;
-      spiCount=(SYSTEM_PROCESS_INFO *)((char *)spiCount + spiCount->dwOffset);
     }
-    LocalFree(spi);
+    free(processIDs);
   }
 
   if (bFound == FALSE) return 603;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/NSIS/vlc.win32.nsi.in -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/NSIS/vlc.win32.nsi.in Changed

@@ -27,7 +27,6 @@
 Unicode true
 
 !define INSTALL_ACTIVEX
-!define INSTALL_MOZILLA
 
 Var ReinstallType
 Var ReinstallUninstallBtn
@@ -539,9 +538,6 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "$(Desc_Section01)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC02a} "$(Desc_Section02a)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC02b} "$(Desc_Section02b)"
-!ifdef INSTALL_MOZILLA
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "$(Desc_Section03)"
-!endif
 !ifdef INSTALL_ACTIVEX
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "$(Desc_Section04)"
 !endif
@@ -563,12 +559,7 @@
 @HAVE_WIN64_TRUE@    MessageBox MB_OK|MB_ICONSTOP "This version of VLC only runs on 64-bit operating systems.$\nPlease get the 32-bit version and try again."
 @HAVE_WIN64_TRUE@    Quit
 @HAVE_WIN64_TRUE@ ${EndUnless}
-${If} ${AtLeastWinXP}
-    ${If} ${IsWinXP}
-    ${AndIf} ${AtMostServicePack} 1
-        Goto WinTooOld
-    ${Endif}
-${Else}
+${IfNot} ${AtLeastWin7}
     Goto WinTooOld
 ${Endif}
 
@@ -578,7 +569,7 @@
 Goto WinOk
 
 WinTooOld:
-    MessageBox MB_OK|MB_ICONSTOP "This version of VLC only runs on Windows XP SP2 and newer."
+    MessageBox MB_OK|MB_ICONSTOP "This version of VLC only runs on Windows 7 and newer."
     Quit
 
 WinOk:

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/build.sh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/build.sh Changed

@@ -150,6 +150,9 @@
 # Check if compiling with clang
 CC=${CC:-$TRIPLET-gcc}
 if ! printf "#ifdef __clang__\n#error CLANG\n#endif" | $CC -E - 1>/dev/null 2>/dev/null; then
+    if ! printf "#if __clang_major__ >= 14\n#error CLANG\n#endif" | $CC -E - 1>/dev/null 2>/dev/null; then
+        COMPILING_WITH_CLANG14=1
+    fi
     COMPILING_WITH_CLANG=1
 else
     COMPILING_WITH_CLANG=0
@@ -182,9 +185,9 @@
 
 # avoid installing wine on WSL
 # wine is needed to build Qt with shaders
-if test -z "`command -v wine`"
+if test -z "$(command -v wine)"
 then
-    if test -n "`command -v wsl.exe`"
+    if test -n "$(command -v wsl.exe)"
     then
         echo "Using wsl.exe to replace wine"
         echo "#!/bin/sh" > build/bin/wine
@@ -201,14 +204,14 @@
 cd ../../
 
 CONTRIB_PREFIX=$TRIPLET
-if  ! -z "$BUILD_UCRT" ; then
+if  -n "$BUILD_UCRT" ; then
 
     if  ! "$COMPILING_WITH_UCRT" -gt 0 ; then
         echo "UCRT builds need a UCRT toolchain"
         exit 1
     fi
 
-    if  ! -z "$WINSTORE" ; then
+    if  -n "$WINSTORE" ; then
         CONTRIBFLAGS="$CONTRIBFLAGS --disable-disc --disable-srt --disable-sdl --disable-SDL_image"
         # FIXME enable discs ?
         # modplug uses GlobalAlloc/Free and lstrcpyA/wsprintfA/lstrcpynA
@@ -227,7 +230,7 @@
     fi
 fi
 
-if  ! -z "$WIXPATH" ; then
+if  -n "$WIXPATH" ; then
     # the CI didn't provide its own WIX, make sure we use our own
     CONTRIBFLAGS="$CONTRIBFLAGS --enable-wix"
 fi
@@ -269,11 +272,11 @@
 VLC_LDFLAGS="$LDFLAGS"
 unset LDFLAGS
 
-if  ! -z "$BUILD_UCRT" ; then
+if  -n "$BUILD_UCRT" ; then
     WIDL=${TRIPLET}-widl
     VLC_CPPFLAGS="$VLC_CPPFLAGS -D__MSVCRT_VERSION__=0xE00 -D_UCRT"
 
-    if  ! -z "$WINSTORE" ; then
+    if  -n "$WINSTORE" ; then
         SHORTARCH="$SHORTARCH-uwp"
         TRIPLET=${TRIPLET}uwp
         VLC_CPPFLAGS="$VLC_CPPFLAGS -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_UNICODE -DUNICODE"
@@ -281,18 +284,24 @@
         if  -z "$NTDDI" ; then
             WINVER=0x0A00
         else
-            WINVER=`echo ${NTDDI} |cut -c 1-6`
+            WINVER=$(echo ${NTDDI} |cut -c 1-6)
             if  "$WINVER" != "0x0A00" ; then
                 echo "Unsupported SDK/NTDDI version ${NTDDI} for Winstore"
             fi
         fi
 
-        VLC_LDFLAGS="$VLC_LDFLAGS -lwindowsapp"
+        if  "${COMPILING_WITH_CLANG14}" = "1" ; then
+            VLC_LDFLAGS="$VLC_LDFLAGS --start-no-unused-arguments"
+            VLC_CFLAGS="$VLC_CFLAGS --start-no-unused-arguments"
+            VLC_CXXFLAGS="$VLC_CXXFLAGS --start-no-unused-arguments"
+        fi
+        VLC_LDFLAGS="$VLC_LDFLAGS -Wl,-lwindowsapp"
         VLC_CFLAGS="$VLC_CFLAGS -Wl,-lwindowsapp"
         VLC_CXXFLAGS="$VLC_CXXFLAGS -Wl,-lwindowsapp"
-        if  "$COMPILING_WITH_CLANG" -gt 0 ; then
-            VLC_CFLAGS="$VLC_CFLAGS -Wno-unused-command-line-argument"
-            VLC_CXXFLAGS="$VLC_CXXFLAGS -Wno-unused-command-line-argument"
+        if  "${COMPILING_WITH_CLANG14}" = "1" ; then
+            VLC_LDFLAGS="$VLC_LDFLAGS --end-no-unused-arguments"
+            VLC_CFLAGS="$VLC_CFLAGS --end-no-unused-arguments"
+            VLC_CXXFLAGS="$VLC_CXXFLAGS --end-no-unused-arguments"
         fi
     else
         SHORTARCH="$SHORTARCH-ucrt"
@@ -301,13 +310,13 @@
     VLC_LDFLAGS="$VLC_LDFLAGS -lucrt"
     if  ! "$COMPILING_WITH_CLANG" -gt 0 ; then
         # assume gcc
-        NEWSPECFILE="`pwd`/specfile-$SHORTARCH"
+        NEWSPECFILE="$(pwd)/specfile-$SHORTARCH"
         # tell gcc to replace msvcrt with ucrtbase+ucrt
         $CC -dumpspecs | sed -e "s/-lmsvcrt/-lucrt/" > $NEWSPECFILE
         VLC_CFLAGS="$VLC_CFLAGS -specs=$NEWSPECFILE"
         VLC_CXXFLAGS="$VLC_CXXFLAGS -specs=$NEWSPECFILE"
 
-        if  ! -z "$WINSTORE" ; then
+        if  -n "$WINSTORE" ; then
             # trick to provide these libraries instead of -ladvapi32 -lshell32 -luser32 -lkernel32
             sed -i -e "s/-ladvapi32/-lwindowsapp -lwindowsappcompat/" $NEWSPECFILE
             sed -i -e "s/-lshell32//" $NEWSPECFILE
@@ -321,7 +330,7 @@
 fi
 
 if  -n "$NTDDI" ; then
-    WINVER=`echo ${NTDDI} |cut -c 1-6`
+    WINVER=$(echo ${NTDDI} |cut -c 1-6)
     VLC_CPPFLAGS="$VLC_CPPFLAGS -DNTDDI_VERSION=$NTDDI"
 fi
 if  -z "$WINVER" ; then
@@ -337,23 +346,34 @@
 echo $PATH
 
 mkdir -p contrib/contrib-$SHORTARCH && cd contrib/contrib-$SHORTARCH
-if  ! -z "$WITH_PDB" ; then
+if  -n "$WITH_PDB" ; then
     CONTRIBFLAGS="$CONTRIBFLAGS --enable-pdb"
-    VLC_CFLAGS="$VLC_CFLAGS -gcodeview"
-    VLC_CXXFLAGS="$VLC_CXXFLAGS -gcodeview"
-    if  ! -z "$PDB_MAP" ; then
+    if  "${COMPILING_WITH_CLANG14}" = "1" ; then
+        VLC_CFLAGS="$VLC_CFLAGS --start-no-unused-arguments"
+        VLC_CXXFLAGS="$VLC_CXXFLAGS --start-no-unused-arguments"
+        VLC_LDFLAGS="$VLC_LDFLAGS --start-no-unused-arguments"
+    fi
+    VLC_CFLAGS="$VLC_CFLAGS -g -gcodeview"
+    VLC_CXXFLAGS="$VLC_CXXFLAGS -g -gcodeview"
+    VLC_LDFLAGS="$VLC_LDFLAGS -Wl,-pdb="
+    if  -n "$PDB_MAP" ; then
         VLC_CFLAGS="$VLC_CFLAGS -fdebug-prefix-map='$VLC_ROOT_PATH'='$PDB_MAP'"
         VLC_CXXFLAGS="$VLC_CXXFLAGS -fdebug-prefix-map='$VLC_ROOT_PATH'='$PDB_MAP'"
     fi
+    if  "${COMPILING_WITH_CLANG14}" = "1" ; then
+        VLC_CFLAGS="$VLC_CFLAGS --end-no-unused-arguments"
+        VLC_CXXFLAGS="$VLC_CXXFLAGS --end-no-unused-arguments"
+        VLC_LDFLAGS="$VLC_LDFLAGS --end-no-unused-arguments"
+    fi
 fi
-if  ! -z "$BREAKPAD" ; then
+if  -n "$BREAKPAD" ; then
      CONTRIBFLAGS="$CONTRIBFLAGS --enable-breakpad"
 fi
 if  "$RELEASE" != "yes" ; then
      CONTRIBFLAGS="$CONTRIBFLAGS --disable-optim"
 fi
-if  ! -z "$DISABLEGUI" ; then
-    CONTRIBFLAGS="$CONTRIBFLAGS --disable-qt --disable-qtsvg --disable-qtdeclarative --disable-qt5compat --disable-qtshadertools --disable-qtwayland"
+if  -n "$DISABLEGUI" ; then
+    CONTRIBFLAGS="$CONTRIBFLAGS --disable-qt --disable-qtsvg --disable-qtdeclarative --disable-qtshadertools --disable-qtwayland"
 fi
 
 if  "$COMPILING_WITH_CLANG" -gt 0 ; then
@@ -361,6 +381,17 @@
     VLC_AR="$TRIPLET-ar"
     # avoid using gcc-ranlib with the clang toolchain, if both are installed
     VLC_RANLIB="$TRIPLET-ranlib"
+    # force linking with the static C++ runtime of LLVM
+    if  "${COMPILING_WITH_CLANG14}" = "1" ; then
+        VLC_CXXFLAGS="$VLC_CXXFLAGS --start-no-unused-arguments"
+        VLC_LDFLAGS="$VLC_LDFLAGS --start-no-unused-arguments"
+    fi
+    VLC_LDFLAGS="$VLC_LDFLAGS -Wl,-l:libunwind.a -Wl,-l:libpthread.a -static-libstdc++"
+    VLC_CXXFLAGS="$VLC_CXXFLAGS -Wl,-l:libunwind.a"
+    if  "${COMPILING_WITH_CLANG14}" = "1" ; then
+        VLC_CXXFLAGS="$VLC_CXXFLAGS --end-no-unused-arguments"
+        VLC_LDFLAGS="$VLC_LDFLAGS --end-no-unused-arguments"
+    fi
 fi
 
 if  -z "$PKG_CONFIG" ; then
@@ -435,6 +466,12 @@
 fi
 cd ../..
 
+# configuration matching configure.sh (goom is called goom2, theora is theoradec+theoraenc)
+MCONFIGFLAGS="-Dlua=enabled -Dflac=enabled -Dtheoradec=enabled -Dtheoraenc=enabled \
+    -Davcodec=enabled -Dmerge-ffmpeg=true \
+    -Dlibass=enabled -Dschroedinger=enabled -Dshout=enabled -Dgoom2=enabled \
+    -Dsse=enabled -Dlibcddb=enabled -Dzvbi=enabled -Dtelx=disabled $MCONFIGFLAGS"
+
 MCONFIGFLAGS="$MCONFIGFLAGS --prefer-static"
 if  "$RELEASE" != "yes" ; then
      CONFIGFLAGS="$CONFIGFLAGS --enable-debug"
@@ -446,26 +483,28 @@
 if  "$I18N" != "yes" ; then
      CONFIGFLAGS="$CONFIGFLAGS --disable-nls"
      MCONFIGFLAGS="$MCONFIGFLAGS -Dnls=disabled"
+else
+     CONFIGFLAGS="$CONFIGFLAGS --enable-nls"
+     MCONFIGFLAGS="$MCONFIGFLAGS -Dnls=enabled"
 fi
-if  ! -z "$BREAKPAD" ; then
+if  -n "$BREAKPAD" ; then
      CONFIGFLAGS="$CONFIGFLAGS --with-breakpad=$BREAKPAD"
 fi
-if  ! -z "$WITH_PDB" ; then
+if  -n "$WITH_PDB" ; then
     CONFIGFLAGS="$CONFIGFLAGS --enable-pdb"
 fi
-if  ! -z "$EXTRA_CHECKS" ; then
+if  -n "$EXTRA_CHECKS" ; then
     CONFIGFLAGS="$CONFIGFLAGS --enable-extra-checks"
+    MCONFIGFLAGS="$MCONFIGFLAGS -Dextra_checks=true"
 fi
-if  ! -z "$DISABLEGUI" ; then
-    CONFIGFLAGS="$CONFIGFLAGS --disable-vlc --disable-qt --disable-skins2"
-    MCONFIGFLAGS="$MCONFIGFLAGS -Dvlc=false -Dqt=disabled"
-    # MCONFIGFLAGS="$MCONFIGFLAGS -Dskins2=disabled"
+if  -n "$DISABLEGUI" ; then
+    CONFIGFLAGS="$CONFIGFLAGS --disable-qt --disable-skins2"
+    MCONFIGFLAGS="$MCONFIGFLAGS -Dqt=disabled -Dskins2=disabled"
 else
-    CONFIGFLAGS="$CONFIGFLAGS --enable-qt --enable-skins2"
-    MCONFIGFLAGS="$MCONFIGFLAGS -Dqt=enabled"
-    # MCONFIGFLAGS="$MCONFIGFLAGS -Dskins2=enabled"
+    CONFIGFLAGS="$CONFIGFLAGS --enable-qt --enable-skins2 --enable-update-check"
+    MCONFIGFLAGS="$MCONFIGFLAGS -Dqt=enabled -Dskins2=enabled -Dupdate-check=enabled"
 fi
-if  ! -z "$WINSTORE" ; then
+if  -n "$WINSTORE" ; then
     CONFIGFLAGS="$CONFIGFLAGS --enable-winstore-app"
     MCONFIGFLAGS="$MCONFIGFLAGS -Dwinstore_app=true"
     # uses CreateFile to access files/drives outside of the app
@@ -473,13 +512,13 @@
     MCONFIGFLAGS="$MCONFIGFLAGS -Dvcd_module=false"
     # other modules that were disabled in the old UWP builds
     CONFIGFLAGS="$CONFIGFLAGS --disable-dxva2"
-    # MCONFIGFLAGS="$MCONFIGFLAGS -Ddxva2=disabled"
+    MCONFIGFLAGS="$MCONFIGFLAGS -Ddxva2=disabled"
 
 else
     CONFIGFLAGS="$CONFIGFLAGS --enable-caca"
     MCONFIGFLAGS="$MCONFIGFLAGS -Dcaca=enabled"
 fi
-if  ! -z "$INSTALL_PATH" ; then
+if  -n "$INSTALL_PATH" ; then
     CONFIGFLAGS="$CONFIGFLAGS --with-packagedir=$INSTALL_PATH"
 fi
 
@@ -533,7 +572,7 @@
     info "Configuring VLC"
     cd ${VLC_ROOT_PATH}
     meson setup ${BUILD_PATH}/$SHORTARCH-meson \
-        -Dc_args="${VLC_CFLAGS}" -Dc_link_args="${VLC_LDFLAGS}" -Dcpp_args="${VLC_CXXFLAGS}" -Dcpp_link_args="${VLC_LDFLAGS} -static-libstdc++" \
+        -Dc_args="${VLC_CFLAGS}" -Dc_link_args="${VLC_LDFLAGS}" -Dcpp_args="${VLC_CXXFLAGS}" -Dcpp_link_args="${VLC_LDFLAGS}" \
         -Dcmake_prefix_path="${BUILD_PATH}/contrib/$CONTRIB_PREFIX" \
         $MCONFIGFLAGS \
         --cross-file ${BUILD_PATH}/$SHORTARCH-meson/crossfile.meson \
@@ -543,55 +582,55 @@
     cd ${BUILD_PATH}/$SHORTARCH-meson
     meson compile -j $JOBS
 else
-info "Bootstrapping"
-${VLC_ROOT_PATH}/bootstrap
+    info "Bootstrapping"
+    ${VLC_ROOT_PATH}/bootstrap
 
-mkdir -p $SHORTARCH
-cd $SHORTARCH
+    mkdir -p $SHORTARCH
+    cd $SHORTARCH
 
-# set environment that will be kept in config.status
-if  -n "$VLC_CPPFLAGS" ; then
-    export CPPFLAGS="$VLC_CPPFLAGS"
-fi
-if  -n "$VLC_CFLAGS" ; then
-    export CFLAGS="$VLC_CFLAGS"
-fi
-if  -n "$VLC_CXXFLAGS" ; then
-    export CXXFLAGS="$VLC_CXXFLAGS"
-fi
-if  -n "$VLC_LDFLAGS" ; then
-    export LDFLAGS="$VLC_LDFLAGS"
-fi
-if  -n "$VLC_AR" ; then
-    export AR="$VLC_AR"
-fi
-if  -n "$VLC_RANLIB" ; then
-    export RANLIB="$VLC_RANLIB"
-fi
-if  -n "$VLC_PKG_CONFIG" ; then
-    export PKG_CONFIG="$VLC_PKG_CONFIG"
-fi
-if  -n "$VLC_PKG_CONFIG_LIBDIR" ; then
-    export PKG_CONFIG_LIBDIR="$VLC_PKG_CONFIG_LIBDIR"
-fi
-
-info "Configuring VLC"
-${SCRIPT_PATH}/configure.sh --host=$TRIPLET --with-contrib=../contrib/$CONTRIB_PREFIX "$WIXPATH" $CONFIGFLAGS
+    # set environment that will be kept in config.status
+    if  -n "$VLC_CPPFLAGS" ; then
+        export CPPFLAGS="$VLC_CPPFLAGS"
+    fi
+    if  -n "$VLC_CFLAGS" ; then
+        export CFLAGS="$VLC_CFLAGS"
+    fi
+    if  -n "$VLC_CXXFLAGS" ; then
+        export CXXFLAGS="$VLC_CXXFLAGS"
+    fi
+    if  -n "$VLC_LDFLAGS" ; then
+        export LDFLAGS="$VLC_LDFLAGS"
+    fi
+    if  -n "$VLC_AR" ; then
+        export AR="$VLC_AR"
+    fi
+    if  -n "$VLC_RANLIB" ; then
+        export RANLIB="$VLC_RANLIB"
+    fi
+    if  -n "$VLC_PKG_CONFIG" ; then
+        export PKG_CONFIG="$VLC_PKG_CONFIG"
+    fi
+    if  -n "$VLC_PKG_CONFIG_LIBDIR" ; then
+        export PKG_CONFIG_LIBDIR="$VLC_PKG_CONFIG_LIBDIR"
+    fi
 
-info "Compiling"
-make -j$JOBS
+    info "Configuring VLC"
+    ${SCRIPT_PATH}/configure.sh --host=$TRIPLET --with-contrib=../contrib/$CONTRIB_PREFIX "$WIXPATH" $CONFIGFLAGS
 
-if  "$INSTALLER" = "n" ; then
-make package-win32-debug-7zip
-make -j$JOBS package-win32 package-msi
-elif  "$INSTALLER" = "r" ; then
-make package-win32
-elif  "$INSTALLER" = "u" ; then
-make package-win32-release
-sha512sum vlc-*-release.7z
-elif  "$INSTALLER" = "m" ; then
-make package-msi
-elif  ! -z "$INSTALL_PATH" ; then
-make package-win-common
-fi
+    info "Compiling"
+    make -j$JOBS
+
+    if  "$INSTALLER" = "n" ; then
+        make package-win32-debug-7zip
+        make -j$JOBS package-win32 package-msi
+    elif  "$INSTALLER" = "r" ; then
+        make package-win32
+    elif  "$INSTALLER" = "u" ; then
+        make package-win32-release
+        sha512sum vlc-*-release.7z
+    elif  "$INSTALLER" = "m" ; then
+        make package-msi
+    elif  -n "$INSTALL_PATH" ; then
+        make package-win-common
+    fi
 fi

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/configure.sh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/configure.sh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/msi/config.wxi.in -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/msi/config.wxi.in Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/msi/msi-heat.py -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/msi/msi-heat.py Changed

@@ -27,7 +27,6 @@
 parser = argparse.ArgumentParser(description="Generate WIX compatible wxs listing")
 parser.add_argument('-d', "--dir", type=pathlib.Path, help='directory with files to list')
 parser.add_argument('-out', type=argparse.FileType('w', encoding='UTF-8'), help="output file")
-parser.add_argument('-pdb', action=argparse.BooleanOptionalAction, help='keep PDB files', default=False)
 parser.add_argument('-dr', "--directory-reference", help='directory reference')
 parser.add_argument('-cg', "--component-group", help='component group')
 args, remaining = parser.parse_known_args()
@@ -50,7 +49,7 @@
 
 fileIdList =
 
-def outputDir(top, parent: str, dir: str, with_pdb: bool):
+def outputDir(top, parent: str, dir: str):
     cwd = top.joinpath(parent).joinpath(dir)
     dirName = os.path.join(parent, dir)
     if dir=='':
@@ -65,7 +64,7 @@
             if not file.is_dir():
                 # args.out.write('          file   <{}>\r\n'.format(file))
                 if not file.name.endswith('.pdb'):
-                    outname = os.path.join(top.name, file.relative_to(top))
+                    outname = os.path.join(top.name, str(file.relative_to(top)))
                     fileId = generate_id('cmp', outname)
                     args.out.write('                    <Component Id="{}" Guid="*">\r\n'.format(fileId))
                     fileIdList.append(fileId)
@@ -75,13 +74,13 @@
         for file in cwd.iterdir():
             if file.is_dir():
                 # args.out.write('         dir    <{}>\r\n'.format(file))
-                outputDir(top, dirName, file.name, with_pdb)
+                outputDir(top, dirName, file.name)
 
     args.out.write('                </Directory>\r\n')
 
 print(args.dir.parent)
 print(args.dir.name)
-outputDir(args.dir, '', '', args.pdb)
+outputDir(args.dir, '', '')
 
 # args.out.write('            </Directory>\r\n')
 args.out.write('        </DirectoryRef>\r\n')

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/package/win32/msi/product.wxs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/package/win32/msi/product.wxs Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/tools/0001-CanonicalizePath-Remove-kMaxComponents-limit.patch Added

@@ -0,0 +1,424 @@
+From 9941df614f2c08093eb76f5cfa402afbd7475a39 Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@google.com>
+Date: Mon, 4 Dec 2023 22:47:37 +0100
+Subject: PATCH 1/2 CanonicalizePath: Remove kMaxComponents limit
+
+This patch refactors the CanonicalizePath() to fix
+two issues and improve performance. This is achieved
+through the following:
+
+- Remove the kMaxPathComponents limit entirely,
+  which fixes ninja-build#1732, by dropping the
+  `components` array entirely, in favor of
+  back-tracking the destination pointer.
+
+- Properly handle '/' and '\' which were incorrectly
+  converted into an empty string. This fixes
+  ninja-build#2008.
+
+- Skip initial '../' components in relative paths,
+  as these are common when referencing source files
+  in build plans, and doing so make the loop after
+  this step run faster in practice since most
+  source files do not need adjustments.
+
+- Simplify the inner loop logic by handling the
+  last component (which is not followed by a
+  trailing directory separator) separately.
+
+  This noticeably improves performance because
+  the inner loop becomes smaller with less branch
+  mis-predictions in the general case.
+
+- Never access or copy the caharacter after the
+  end of the input string.
+
+- Use memchr() to find the next '/' on Posix, which
+  allows the use of SIMD implementations provided by
+  the C runtime (e.g. through IFUNC functions on Linux),
+  resulting in very noticeable speedup. This is also
+  why a statically Ninja executable will be slower
+  than one that links to the C library dynamically :-/
+
+- Avoid performing any writes when the input path
+  doesn't need any adjustment, which is also quite
+  common.
+
+Note that this patch does _not_ remove the 64-bit
+limit for the `slash_bits`  value, which is only
+used on Win32.
+
+Benchmarking was done in several ways:
+
+- On Linux, running `hyperfine canon-perftest` to run the
+  canonicalization benchmark program and measure its total
+  running time. Three compilers were used to generate
+  dynamically-linked executables.
+
+  ```
+               BEFORE (ms)  AFTER (ms)
+
+  GCC 13.2.0      651         369
+  Clang 14.0      591         402
+  Clang 18,0      653         400
+  ```
+
+- On Windows, running `canon-perftest` 5 times and keeping
+  the best reported average result. The number are slower
+  since they only measure the benched function.
+
+  ```
+                   BEFORE (ms)  AFTER (ms)
+
+  Mingw64 GCC 12      246         195
+  ```
+
+- On Linux, run `hyperfine ninja -C out/default -n --quiet`
+  on a large Fuchsia build plan, once with 70000+ pending
+  commands, and once after the build (i.e. `ninja: no work to do`).
+
+  ````
+               BEFORE (s)  AFTER (s)
+
+  pre_build       8.789    8.647
+  post_build      6.703    6.590
+  ```
+---
+ src/util.cc      | 149 +++++++++++++++++++++++++++++++++++------------
+ src/util_test.cc | 101 ++++++++++++++++++++++++++++++--
+ 2 files changed, 208 insertions(+), 42 deletions(-)
+
+diff --git a/src/util.cc b/src/util.cc
+index ef5f103..dcb6abc 100644
+--- a/src/util.cc
++++ b/src/util.cc
+@@ -143,20 +143,19 @@ void CanonicalizePath(char* path, size_t* len, uint64_t* slash_bits) {
+     return;
+   }
+ 
+-  const int kMaxPathComponents = 60;
+-  char* componentskMaxPathComponents;
+-  int component_count = 0;
+-
+   char* start = path;
+   char* dst = start;
++  char* dst_start = dst;
+   const char* src = start;
+   const char* end = start + *len;
++  const char* src_next;
+ 
++  // For absolute paths, skip the leading directory separator
++  // as this one should never be removed from the result.
+   if (IsPathSeparator(*src)) {
+ #ifdef _WIN32
+-
+-    // network path starts with //
+-    if (*len > 1 && IsPathSeparator(*(src + 1))) {
++    // Windows network path starts with //
++    if (src + 2 <= end && IsPathSeparator(src1)) {
+       src += 2;
+       dst += 2;
+     } else {
+@@ -167,50 +166,126 @@ void CanonicalizePath(char* path, size_t* len, uint64_t* slash_bits) {
+     ++src;
+     ++dst;
+ #endif
++    dst_start = dst;
++  } else {
++    // For relative paths, skip any leading ../ as these are quite common
++    // to reference source files in build plans, and doing this here makes
++    // the loop work below faster in general.
++    while (src + 3 <= end && src0 == '.' && src1 == '.' &&
++           IsPathSeparator(src2)) {
++      src += 3;
++      dst += 3;
++    }
+   }
+ 
+-  while (src < end) {
+-    if (*src == '.') {
+-      if (src + 1 == end || IsPathSeparator(src1)) {
+-        // '.' component; eliminate.
+-        src += 2;
+-        continue;
+-      } else if (src1 == '.' && (src + 2 == end || IsPathSeparator(src2))) {
+-        // '..' component.  Back up if possible.
++  // Loop over all components of the paths _except_ the last one, in
++  // order to simplify the loop's code and make it faster.
++  int component_count = 0;
++  char* dst0 = dst;
++  for (; src < end; src = src_next) {
++#ifndef _WIN32
++    // Use memchr() for faster lookups thanks to optimized C library
++    // implementation. `hyperfine canon_perftest` shows a significant
++    // difference (e,g, 484ms vs 437ms).
++    const char* next_sep =
++        static_cast<const char*>(::memchr(src, '/', end - src));
++    if (!next_sep) {
++      // This is the last component, will be handled out of the loop.
++      break;
++    }
++#else
++    // Need to check for both '/' and '\\' so do not use memchr().
++    // Cannot use strpbrk() because end0 can be \0 or something else!
++    const char* next_sep = src;
++    while (next_sep != end && !IsPathSeparator(*next_sep))
++      ++next_sep;
++    if (next_sep == end) {
++      // This is the last component, will be handled out of the loop.
++      break;
++    }
++#endif
++    // Position for next loop iteration.
++    src_next = next_sep + 1;
++    // Length of the component, excluding trailing directory.
++    size_t component_len = next_sep - src;
++
++    if (component_len <= 2) {
++      if (component_len == 0) {
++        continue;  // Ignore empty component, e.g. 'foo//bar' -> 'foo/bar'.
++      }
++      if (src0 == '.') {
++        if (component_len == 1) {
++          continue;  // Ignore '.' component, e.g. './foo' -> 'foo'.
++        } else if (src1 == '.') {
++          // Process the '..' component if found. Back up if possible.
++          if (component_count > 0) {
++            // Move back to start of previous component.
++            --component_count;
++            while (--dst > dst0 && !IsPathSeparator(dst-1)) {
++              // nothing to do here, decrement happens before condition check.
++            }
++          } else {
++            dst0 = '.';
++            dst1 = '.';
++            dst2 = src2;
++            dst += 3;
++          }
++          continue;
++        }
++      }
++    }
++    ++component_count;
++
++    // Copy or skip component, including trailing directory separator.
++    if (dst != src) {
++      ::memmove(dst, src, src_next - src);
++    }
++    dst += src_next - src;
++  }
++
++  // Handling the last component that does not have a trailing separator.
++  // The logic here is _slightly_ different since there is no trailing
++  // directory separator.
++  size_t component_len = end - src;
++  do {
++    if (component_len == 0)
++      break;  // Ignore empty component (e.g. 'foo//' -> 'foo/')
++    if (src0 == '.') {
++      if (component_len == 1)
++        break;  // Ignore trailing '.' (e.g. 'foo/.' -> 'foo/')
++      if (src1 == '.') {
++        // Handle '..'. Back up if possible.
+         if (component_count > 0) {
+-          dst = componentscomponent_count - 1;
+-          src += 3;
+-          --component_count;
++          while (--dst > dst0 && !IsPathSeparator(dst-1)) {
++            // nothing to do here, decrement happens before condition check.
++          }
+         } else {
+-          *dst++ = *src++;
+-          *dst++ = *src++;
+-          *dst++ = *src++;
++          dst0 = '.';
++          dst1 = '.';
++          dst += 2;
++          // No separator to add here.
+         }
+-        continue;
++        break;
+       }
+     }
+-
+-    if (IsPathSeparator(*src)) {
+-      src++;
+-      continue;
++    // Skip or copy last component, no trailing separator.
++    if (dst != src) {
++      ::memmove(dst, src, component_len);
+     }
++    dst += component_len;
++  } while (0);
+ 
+-    if (component_count == kMaxPathComponents)
+-      Fatal("path has too many components : %s", path);
+-    componentscomponent_count = dst;
+-    ++component_count;
+-
+-    while (src != end && !IsPathSeparator(*src))
+-      *dst++ = *src++;
+-    *dst++ = *src++;  // Copy '/' or final \0 character as well.
+-  }
++  // Remove trailing path separator if any, but keep the initial
++  // path separator(s) if there was one (or two on Windows).
++  if (dst > dst_start && IsPathSeparator(dst-1))
++    dst--;
+ 
+   if (dst == start) {
++    // Handle special cases like "aa/.." -> "."
+     *dst++ = '.';
+-    *dst++ = '\0';
+   }
+ 
+-  *len = dst - start - 1;
++  *len = dst - start;  // dst points after the trailing char here.
+ #ifdef _WIN32
+   uint64_t bits = 0;
+   uint64_t bits_mask = 1;
+diff --git a/src/util_test.cc b/src/util_test.cc
+index d58b170..8467e2a 100644
+--- a/src/util_test.cc
++++ b/src/util_test.cc
+@@ -89,13 +89,57 @@ TEST(CanonicalizePath, PathSamples) {
+   EXPECT_EQ("/foo", path);
+ #endif
+ 
++  path = "..";
++  CanonicalizePath(&path);
++  EXPECT_EQ("..", path);
++
++  path = "../";
++  CanonicalizePath(&path);
++  EXPECT_EQ("..", path);
++
++  path = "../foo";
++  CanonicalizePath(&path);
++  EXPECT_EQ("../foo", path);
++
++  path = "../foo/";
++  CanonicalizePath(&path);
++  EXPECT_EQ("../foo", path);
++
++  path = "../..";
++  CanonicalizePath(&path);
++  EXPECT_EQ("../..", path);
++
++  path = "../../";
++  CanonicalizePath(&path);
++  EXPECT_EQ("../..", path);
++
++  path = "./../";
++  CanonicalizePath(&path);
++  EXPECT_EQ("..", path);
++
++  path = "/..";
++  CanonicalizePath(&path);
++  EXPECT_EQ("/..", path);
++
++  path = "/../";
++  CanonicalizePath(&path);
++  EXPECT_EQ("/..", path);
++
++  path = "/../..";
++  CanonicalizePath(&path);
++  EXPECT_EQ("/../..", path);
++
++  path = "/../../";
++  CanonicalizePath(&path);
++  EXPECT_EQ("/../..", path);
++
+   path = "/";
+   CanonicalizePath(&path);
+-  EXPECT_EQ("", path);
++  EXPECT_EQ("/", path);
+ 
+   path = "/foo/..";
+   CanonicalizePath(&path);
+-  EXPECT_EQ("", path);
++  EXPECT_EQ("/", path);
+ 
+   path = ".";
+   CanonicalizePath(&path);
+@@ -171,7 +215,7 @@ TEST(CanonicalizePath, PathSamplesWindows) {
+ 
+   path = "\\";
+   CanonicalizePath(&path);
+-  EXPECT_EQ("", path);
++  EXPECT_EQ("/", path);
+ }
+ 
+ TEST(CanonicalizePath, SlashTracking) {
+@@ -321,8 +365,53 @@ TEST(CanonicalizePath, TooManyComponents) {
+   EXPECT_EQ(58, std::count(path.begin(), path.end(), '\\'));
+   CanonicalizePath(&path, &slash_bits);
+   EXPECT_EQ(slash_bits, 0x3ffffffffffffff);
++
++  // More than 60 components is now completely ok too.
++  path =
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\a\\"
++      "a\\a\\a\\a\\a\\a\\a\\a\\a\\x\\y.h";
++  EXPECT_EQ(218, std::count(path.begin(), path.end(), '\\'));
++  CanonicalizePath(&path, &slash_bits);
++  EXPECT_EQ(slash_bits, 0xffffffffffffffff);
+ }
+-#endif
++#else   // !_WIN32
++TEST(CanonicalizePath, TooManyComponents) {
++  string path;
++  uint64_t slash_bits;
++
++  // More than 60 components is now completely ok.
++  path =
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/"
++      "a/a/a/a/a/a/a/a/a/x/y.h";
++  EXPECT_EQ(218, std::count(path.begin(), path.end(), '/'));
++  CanonicalizePath(&path, &slash_bits);
++  EXPECT_EQ(slash_bits, 0x0);
++}
++#endif  // !_WIN32
+ 
+ TEST(CanonicalizePath, UpDir) {
+   string path, err;
+@@ -353,11 +442,13 @@ TEST(CanonicalizePath, NotNullTerminated) {
+   EXPECT_EQ(strlen("foo"), len);
+   EXPECT_EQ("foo/. bar/.", string(path));
+ 
++  // Verify that foo/..file gets canonicalized to 'file' without
++  // touching the rest of the string.
+   path = "foo/../file bar/.";
+   len = strlen("foo/../file");
+   CanonicalizePath(&path0, &len, &unused);
+   EXPECT_EQ(strlen("file"), len);
+-  EXPECT_EQ("file ./file bar/.", string(path));
++  EXPECT_EQ("file../file bar/.", string(path));
+ }
+ 
+ TEST(PathEscaping, TortureTest) {
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/tools/0002-CanonicalizePath-fix-a-b-._foo-a-replacement.patch Added

@@ -0,0 +1,42 @@
+From 02c738a767bb837acb8d0366ace09804120283e6 Mon Sep 17 00:00:00 2001
+From: Pavel Boldin <pboldin@cloudlinux.com>
+Date: Fri, 15 Mar 2024 15:21:16 +0000
+Subject: PATCH 2/2 CanonicalizePath: fix 'a/b/.._foo' -> 'a'  replacement
+
+Signed-off-by: Pavel Boldin <pboldin@cloudlinux.com>
+---
+ src/util.cc      | 2 +-
+ src/util_test.cc | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/util.cc b/src/util.cc
+index dcb6abc..ff624ba 100644
+--- a/src/util.cc
++++ b/src/util.cc
+@@ -253,7 +253,7 @@ void CanonicalizePath(char* path, size_t* len, uint64_t* slash_bits) {
+     if (src0 == '.') {
+       if (component_len == 1)
+         break;  // Ignore trailing '.' (e.g. 'foo/.' -> 'foo/')
+-      if (src1 == '.') {
++      if (component_len == 2 && src1 == '.') {
+         // Handle '..'. Back up if possible.
+         if (component_count > 0) {
+           while (--dst > dst0 && !IsPathSeparator(dst-1)) {
+diff --git a/src/util_test.cc b/src/util_test.cc
+index 8467e2a..d76954c 100644
+--- a/src/util_test.cc
++++ b/src/util_test.cc
+@@ -152,6 +152,10 @@ TEST(CanonicalizePath, PathSamples) {
+   path = "foo/..";
+   CanonicalizePath(&path);
+   EXPECT_EQ(".", path);
++
++  path = "foo/.._bar";
++  CanonicalizePath(&path);
++  EXPECT_EQ("foo/.._bar", path);
+ }
+ 
+ #ifdef _WIN32
+-- 
+2.45.0.windows.1
+

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/tools/SHA512SUMS -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/tools/SHA512SUMS Changed

@@ -1,6 +1,6 @@
 3954a6ad3f522c135f327ba0d376eb16ae42103849c8cc5cd6c8c6e87b8c5433c95a0f2d4dfa3e6c2705ee0b8996e5b27d0b2248f64a05fc8c902116cc45a7b2  apache-ant-1.9.7.tar.bz2
 3f71d459e2127ef2c98b37f11f5284f0c92318ad8d31c5b6034bed370adfe9f3d0f7a12f87e2efced06c11e2a159de4d4a292b751104e83daf11342f25ba9721  autoconf-2.72.tar.gz
-248cdcc9b3ee315f1508518a8edb02e891646d990ef4fc4e5444950c397f5c91e87ca3947269dc5e0de36b051914e118c66d293f2f3f0de24403d9f2ede0ece4  automake-1.16.5.tar.gz
+11357dfab8cbf4b5d94d9d06e475732ca01df82bef1284888a34bd558afc37b1a239bed1b5eb18a9dbcc326344fb7b1b301f77bb8385131eb8e1e118b677883a  automake-1.17.tar.gz
 cf0096065b273f42bcae2bb628d4a475891e9e9a8cc9a01dabaa64d3b36dd78b4217a61c5ae86f7d8a81a12b5a4b37c09ae5ae31049d722601590aa65a395d5a  cmake-3.29.5.tar.gz
 f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2  m4-1.4.19.tar.gz
 56a9656539448972bc3080357ccc987bd4cbca3847758fe41251eb8af1a5e403a75f38d1344fa2c0bd56de880f37f3eaafbe7116c506f33331e7a8dd8a53cf2a  pkg-config-0.28-1.tar.gz
@@ -14,8 +14,9 @@
 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942  help2man-1.47.6.tar.xz
 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd  nasm-2.14.tar.gz
 37b3a421419b16930e53181c431fe3b4afd55ac54733a5df08376641fd2fb88eeb73ee7abe3788f3e491e7c1b215c7f35aefa66f44b09008ad22b76ab2998830  ninja-1.11.1.tar.gz
-8805f07d0cfe2050305eff009b20973bfe3aab808a263479ed98a31fa026c1a378285928c2dd058e4224abc1b347aeee5c1628c964375135e9b4647819a119bc  meson-1.6.0.tar.gz
+a5d1f00b193ca37ae64f85c9dfc29a2661c167d82d9953b9acd1393b222b05fa5fc03ffdf00fd1ae7a2014da3a7366c35f70bf02e3204e929b74f7b00c17c840  meson-1.7.0.tar.gz
 27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385  libtool-2.4.7.tar.gz
+60599f5c3168a287fe3a35062fd2e32e0b73433fce820bfd18d28b0e3bd7a8fefde6d6f0505fbbc2d664119ab7c539269184993843289932c895847ea1ab9f04  libtool-2.5.4.tar.gz
 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4  gperf-3.1.tar.gz
 1bf28876ee38557042bf790af3d06ae0dcddc2d310480a821fbae1f269d433259b1ef0243fa6eff829ce67a22e8461655d41bbb7382355b7530d5648e296c9d6  config.guess-948ae97ca5703224bd3eada06b7a69f40dd15a02
 14e316b18542d0a971d925a0dfca38f67680f1e2933d170767b59137d527a15d2b785910c9ba0845ebba7e089e3a05fe60aabd6a7c06a7481822942a698f8a6a  config.sub-948ae97ca5703224bd3eada06b7a69f40dd15a02

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/tools/libtool-2.5.4-clang-libs.patch Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/tools/libtool-2.5.4-embed-bitcode.patch Added

@@ -0,0 +1,41 @@
+From 62292dccf7bfdce63e4d700b930cfca44e6d8b83 Mon Sep 17 00:00:00 2001
+From: Alexandre Janniaux <ajanni@videolabs.io>
+Date: Mon, 31 May 2021 10:28:54 +0200
+Subject: PATCH ltmain: add support for -fembed-bitcode
+
+---
+ build-aux/ltmain.in | 1 +
+ m4/libtool.m4       | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+index fa157775..571552b7 100644
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -5349,6 +5349,7 @@ func_mode_link ()
+ 	continue
+ 	;;
+       -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
++      |-fembed-bitcode|-fembed-bitcode-marker \
+       |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ 	func_append compiler_flags " $arg"
+ 	func_append compile_command " $arg"
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+index 8d323b3e..9044afc3 100644
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1156,9 +1156,9 @@ m4_defun(_LT_DARWIN_LINKER_FEATURES,
+   if test yes = "$_lt_dar_can_shared"; then
+     output_verbose_link_cmd=func_echo_all
+     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
++    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -dynamiclib \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+     _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+-    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
++    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -dynamiclib \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+     m4_if($1, CXX,
+    if test yes = "$_lt_dar_needs_single_mod" -a yes != "$lt_cv_apple_cc_single_mod"; then
+       _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+-- 
+2.45.2
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/tools/ninja-1.11.1-replace-pipes-quote-with-shlex-quote.patch Added

@@ -0,0 +1,36 @@
+From 9cf13cd1ecb7ae649394f4133d121a01e191560b Mon Sep 17 00:00:00 2001
+From: Byoungchan Lee <byoungchan.lee@gmx.com>
+Date: Mon, 9 Oct 2023 20:13:20 +0900
+Subject: PATCH Replace pipes.quote with shlex.quote in configure.py
+
+Python 3.12 deprecated the pipes module and it will be removed
+in Python 3.13. In configure.py, I have replaced the usage of pipes.quote
+with shlex.quote, which is the exactly same function as pipes.quote.
+
+For more details, refer to PEP 0594: https://peps.python.org/pep-0594
+---
+ configure.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 588250aa8a..c6973cd1a5 100755
+--- a/configure.py
++++ b/configure.py
+@@ -21,7 +21,7 @@
+ 
+ from optparse import OptionParser
+ import os
+-import pipes
++import shlex
+ import string
+ import subprocess
+ import sys
+@@ -262,7 +262,7 @@ def _run_command(self, cmdline):
+ env_keys = set('CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS')
+ configure_env = dict((k, os.environk) for k in os.environ if k in env_keys)
+ if configure_env:
+-    config_str = ' '.join(k + '=' + pipes.quote(configure_envk)
++    config_str = ' '.join(k + '=' + shlex.quote(configure_envk)
+                            for k in configure_env)
+     n.variable('configure_env', config_str + '$ ')
+ n.newline()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/tools/packages.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/tools/packages.mak Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/extras/tools/tools.mak -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/extras/tools/tools.mak Changed

@@ -37,7 +37,7 @@
 
 download_pkg = $(call download,$(VIDEOLAN)/$(2)/$(lastword $(subst /, ,$(@)))) || \
 	( $(call download,$(1)) && echo "Please upload this package $(lastword $(subst /, ,$(@))) to our FTP" )  \
-	&& grep $(@) $(TOOLS)/SHA512SUMS| $(SHA512SUM)
+	&& grep $(@) $(TOOLS)/SHA512SUMS| $(SHA512SUM) /dev/stdin
 
 ifeq ($(V),1)
 TAR_VERBOSE := v
@@ -117,11 +117,9 @@
 	$(UNPACK)
 	(cd $(UNPACK_DIR) && chmod u+w build-aux/ltmain.sh)
 	$(APPLY) $(TOOLS)/libtool-2.4.7-bitcode.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.7-clang-libs.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.7-response-files.patch
+	$(APPLY) $(TOOLS)/libtool-2.5.4-clang-libs.patch
 	$(APPLY) $(TOOLS)/libtool-2.4.7-lpthread.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.7-embed-bitcode.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.7-emscripten-dlinker.patch
+	$(APPLY) $(TOOLS)/libtool-2.5.4-embed-bitcode.patch
 	$(MOVE)
 
 .buildlibtool: libtool .automake .help2man
@@ -396,6 +394,9 @@
 ninja: UNPACK_DIR=ninja-$(NINJA_BUILD_NAME)
 ninja: ninja-$(NINJA_VERSION).tar.gz
 	$(UNPACK)
+	$(APPLY) $(TOOLS)/ninja-1.11.1-replace-pipes-quote-with-shlex-quote.patch
+	$(APPLY) $(TOOLS)/0001-CanonicalizePath-Remove-kMaxComponents-limit.patch
+	$(APPLY) $(TOOLS)/0002-CanonicalizePath-fix-a-b-._foo-a-replacement.patch
 	$(MOVE)
 
 .buildninja: ninja

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc/libvlc_media.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc/libvlc_media.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc/libvlc_media_player.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc/libvlc_media_player.h Changed

@@ -7,6 +7,7 @@
  *          Jean-Paul Saman <jpsaman@videolan.org>
  *          Pierre d'Herbemont <pdherbemont@videolan.org>
  *          Maxime Chapelet <umxprime at videolabs dot io>
+ *          Alexandre Janniaux <ajanni@videolabs.io>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
@@ -625,6 +626,14 @@
         int opengl_format;
         /** currently unused */
         void *p_surface;
+        struct {
+            /** Pointer to an ANativeWindow, used for video rendering */
+            void *video;
+            /** Pointer to an ANativeWindow, used for subtitles rendering, if
+             * blending subtitles into the video surface is not possible (when
+             * using MediaCodec with direct hw rendering) */
+            void *subtitle;
+        } anw;
     };
     /** Video is full range or studio/limited range. */
     bool full_range;
@@ -651,9 +660,9 @@
  *       uses to render. The host must set a Render target and call Present()
  *       when it needs the drawing from VLC to be done. This object is not valid
  *       anymore after Cleanup is called.
- *
- * Tone mapping, range and color conversion will be done depending on the values
- * set in the output structure.
+ * Tone mapping, range and color conversion will be done depending on the
+ * values set in the output structure. It can be ignored in the \ref
+ * libvlc_video_engine_anw case.
  */
 typedef bool (*libvlc_video_update_output_cb)(void* opaque, const libvlc_video_render_cfg_t *cfg,
                                               libvlc_video_output_cfg_t *output );
@@ -746,6 +755,23 @@
     libvlc_video_engine_d3d11,
     /** Direct3D9 rendering engine */
     libvlc_video_engine_d3d9,
+
+    /**
+     * Android ANativeWindow. It can be set in \ref libvlc_video_output_cfg_t
+     * from the \ref libvlc_video_update_output_cb callback. The ANativeWindow
+     * can be created via:
+     *  - 'ANativeWindow_fromSurface': from a JAVA SurfaceView
+     *  - 'AImageReader_getWindow()': from an 'AImageReader' created with the
+     *  following arguments: \verbatim
+     AImageReader_newWithUsage(1, 1 AIMAGE_FORMAT_PRIVATE,
+                               AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE,
+                               maxImages, &reader);
+     \endverbatim
+     * The width and height from \ref libvlc_video_render_cfg_t should be
+     * ignored as the video size is overridden by the producer (MediaCodec or
+     * EGL vout).
+     */
+    libvlc_video_engine_anw,
 } libvlc_video_engine_t;
 
 
@@ -875,9 +901,12 @@
  * \param cleanup_cb callback called to clean up user data
  * \param window_cb callback called to setup the window
  * \param update_output_cb callback to get the rendering format of the host (cannot be NULL)
- * \param swap_cb callback called after rendering a video frame (cannot be NULL)
- * \param makeCurrent_cb callback called to enter/leave the rendering context (cannot be NULL)
- * \param getProcAddress_cb opengl function loading callback (cannot be NULL for \ref libvlc_video_engine_opengl and for \ref libvlc_video_engine_gles2)
+ * \param swap_cb callback called after rendering a video frame (can only be
+ * NULL when using \ref libvlc_video_engine_anw)
+ * \param makeCurrent_cb callback called to enter/leave the rendering context
+ * (can only be NULL when using \ref libvlc_video_engine_anw)
+ * \param getProcAddress_cb opengl function loading callback (cannot be NULL 
+ * for \ref libvlc_video_engine_opengl and for \ref libvlc_video_engine_gles2)
  * \param metadata_cb callback to provide frame metadata (D3D11 only)
  * \param select_plane_cb callback to select different D3D11 rendering targets
  * \param opaque private pointer passed to callbacks
@@ -904,6 +933,22 @@
                                         void* opaque );
 
 /**
+ * Helper to setup output_callbacks for \ref libvlc_video_engine_anw
+ */
+static inline bool
+libvlc_video_set_anw_callbacks( libvlc_media_player_t *mp,
+                                libvlc_video_output_setup_cb setup_cb,
+                                libvlc_video_output_cleanup_cb cleanup_cb,
+                                libvlc_video_update_output_cb update_output_cb,
+                                void *opaque )
+{
+    return libvlc_video_set_output_callbacks( mp, libvlc_video_engine_anw,
+                                              setup_cb, cleanup_cb, NULL,
+                                              update_output_cb, NULL, NULL,
+                                              NULL, NULL, NULL, opaque );
+}
+
+/**
  * Set the handler where the media player should display its video output.
  *
  * The drawable is an `NSObject` that require responding to two selectors
@@ -928,9 +973,10 @@
  * @protocol VLCPictureInPictureMediaControlling <NSObject>
  * - (void)play;
  * - (void)pause;
- * - (void)seekBy:(int64_t)offset;
+ * - (void)seekBy:(int64_t)offset completion:(dispatch_block_t)completion;;
  * - (int64_t)mediaLength;
  * - (int64_t)mediaTime;
+ * - (BOOL)isMediaSeekable;
  * - (BOOL)isMediaPlaying;
  * @end
  * 
@@ -1317,21 +1363,46 @@
                                                  double f_pos, bool b_fast );
 
 /**
- * Enable A to B loop for the current media
+ * Enable A to B loop for the current media by setting the start time and end
+ * time
+ *
+ * The B time must be higher than the A time.
+ *
+ * \param p_mi the Media Player
+ * \param a_time start time for the loop (in ms)
+ * \param b_time end time for the loop (in ms)
+ * \return 0 on success, -1 on error
+ * \version LibVLC 4.0.0 and later.
+ */
+LIBVLC_API int
+libvlc_media_player_set_abloop_time( libvlc_media_player_t *p_mi,
+                                     libvlc_time_t a_time, libvlc_time_t b_time );
+
+/**
+ * Enable A to B loop for the current media by setting the start position and
+ * end position
  *
- * This function need to be called 2 times with libvlc_abloop_a and
- * libvlc_abloop_b to setup an A to B loop. It uses and stores the
- * current time/position when called. The B time must be higher than the
- * A time.
+ * The B position must be higher than the A position.
  *
  * \param p_mi the Media Player
- * \param abloop select which A/B cursor to set
+ * \param a_pos start position for the loop
+ * \param b_pos end position for the loop
  * \return 0 on success, -1 on error
  * \version LibVLC 4.0.0 and later.
  */
 LIBVLC_API int
-libvlc_media_player_set_abloop( libvlc_media_player_t *p_mi,
-                                libvlc_abloop_t abloop );
+libvlc_media_player_set_abloop_position( libvlc_media_player_t *p_mi,
+                                         double a_pos, double b_pos );
+
+/**
+ * Reset/remove the A to B loop for the current media
+ *
+ * \param p_mi the Media Player
+ * \return 0 on success, -1 on error
+ * \version LibVLC 4.0.0 and later.
+ */
+LIBVLC_API int
+libvlc_media_player_reset_abloop( libvlc_media_player_t *p_mi );
 
 /**
  * Get the A to B loop status
@@ -2039,6 +2110,35 @@
                                               bool b_absolute);
 
 /**
+ * Video stereo modes
+ */
+typedef enum libvlc_video_stereo_mode_t {
+    libvlc_VideoStereoAuto = 0,
+    libvlc_VideoStereoStereo,
+    libvlc_VideoStereoLeftEye,
+    libvlc_VideoStereoRightEye,
+    libvlc_VideoStereoSideBySide,
+} libvlc_video_stereo_mode_t;
+
+/**
+ * Get current video stereo mode.
+ *
+ * \param p_mi the media player
+ * \return the video stereo mode.
+ */
+LIBVLC_API libvlc_video_stereo_mode_t libvlc_video_get_video_stereo_mode(
+                                              libvlc_media_player_t *p_mi );
+
+/**
+ * Set new video stereo mode.
+ *
+ * \param p_mi the media player
+ * \param i_mode new video stereo mode
+ */
+LIBVLC_API void libvlc_video_set_video_stereo_mode( libvlc_media_player_t *p_mi,
+                                      const libvlc_video_stereo_mode_t i_mode );
+
+/**
  * Get the current subtitle delay. Positive values means subtitles are being
  * displayed later, negative values earlier.
  *
@@ -2431,6 +2531,29 @@
  */
 LIBVLC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
                                                    unsigned option, float value );
+/**
+ * Change the projection mode used for rendering the source.
+ *
+ * This changes how the source is mapped to the output w.r.t. 360 playback.
+ *
+ * \param p_mi libvlc media player instance
+ * \param projection_mode the considered projection mode for the source
+ * \version LibVLC 4.0.0 and later.
+ */
+LIBVLC_API void
+libvlc_video_set_projection_mode(libvlc_media_player_t *player,
+                                 libvlc_video_projection_t projection_mode);
+
+/**
+ * Remove previously set projection mode.
+ *
+ * Remove the effects from previous call to libvlc_video_set_projection_mode.
+ *
+ * \param p_mi libvlc media player instance
+ * \version LibVLC 4.0.0 and later.
+ */
+LIBVLC_API void
+libvlc_video_unset_projection_mode(libvlc_media_player_t *player);
 
 /** @} video */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_actions.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_actions.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_addons.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_addons.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_arrays.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_arrays.h Changed

@@ -381,7 +381,7 @@
  * fast and not suck too much. This one is pretty fast and did 0 collisions
  * in wenglish's dictionary.
  */
-static inline uint64_t DictHash( const char *psz_string, int hashsize )
+static inline size_t DictHash(const char *psz_string, size_t hashsize)
 {
     uint64_t i_hash = 0;
     if( psz_string )
@@ -405,13 +405,13 @@
 
 typedef struct vlc_dictionary_t
 {
-    int i_size;
+    size_t i_size;
     vlc_dictionary_entry_t ** p_entries;
 } vlc_dictionary_t;
 
 static void * const kVLCDictionaryNotFound = NULL;
 
-static inline void vlc_dictionary_init( vlc_dictionary_t * p_dict, int i_size )
+static inline void vlc_dictionary_init(vlc_dictionary_t * p_dict, size_t i_size)
 {
     p_dict->p_entries = NULL;
 
@@ -430,7 +430,7 @@
 {
     if( p_dict->p_entries )
     {
-        for( int i = 0; i < p_dict->i_size; i++ )
+        for (size_t i = 0; i < p_dict->i_size; i++)
         {
             vlc_dictionary_entry_t * p_current, * p_next;
             p_current = p_dict->p_entriesi;
@@ -456,7 +456,7 @@
     if( !p_dict->p_entries )
         return 0;
 
-    int i_pos = DictHash( psz_key, p_dict->i_size );
+    size_t i_pos = DictHash(psz_key, p_dict->i_size);
     const vlc_dictionary_entry_t * p_entry = p_dict->p_entriesi_pos;
     for( ; p_entry != NULL; p_entry = p_entry->p_next )
     {
@@ -472,7 +472,7 @@
     if( !p_dict->p_entries )
         return kVLCDictionaryNotFound;
 
-    int i_pos = DictHash( psz_key, p_dict->i_size );
+    size_t i_pos = DictHash(psz_key, p_dict->i_size);
     vlc_dictionary_entry_t * p_entry = p_dict->p_entriesi_pos;
 
     if( !p_entry )
@@ -488,11 +488,11 @@
     return kVLCDictionaryNotFound;
 }
 
-static inline int
+static inline size_t
 vlc_dictionary_keys_count( const vlc_dictionary_t * p_dict )
 {
     vlc_dictionary_entry_t * p_entry;
-    int i, count = 0;
+    size_t i, count = 0;
 
     if( !p_dict->p_entries )
         return 0;
@@ -508,7 +508,7 @@
 vlc_dictionary_is_empty( const vlc_dictionary_t * p_dict )
 {
     if( p_dict->p_entries )
-        for( int i = 0; i < p_dict->i_size; i++ )
+        for (size_t i = 0; i < p_dict->i_size; i++)
             if( p_dict->p_entriesi )
                 return false;
     return true;
@@ -519,7 +519,7 @@
 {
     vlc_dictionary_entry_t * p_entry;
     char ** ppsz_ret;
-    int i, count = vlc_dictionary_keys_count( p_dict );
+    size_t i, count = vlc_dictionary_keys_count(p_dict);
 
     ppsz_ret = (char**)malloc(sizeof(char *) * (count + 1));
     if( unlikely(!ppsz_ret) )
@@ -542,7 +542,7 @@
     if( !p_dict->p_entries )
         vlc_dictionary_init( p_dict, 1 );
 
-    int i_pos = DictHash( psz_key, p_dict->i_size );
+    size_t i_pos = DictHash(psz_key, p_dict->i_size);
     vlc_dictionary_entry_t * p_entry;
 
     p_entry = (vlc_dictionary_entry_t *)malloc(sizeof(*p_entry));
@@ -560,8 +560,8 @@
         {
             /* Here it starts to be not good, rebuild a bigger dictionary */
             struct vlc_dictionary_t new_dict;
-            int i_new_size = ( (p_dict->i_size+2) * 3) / 2; /* XXX: this need tuning */
-            int i;
+            size_t i_new_size = (p_dict->i_size + 2) * 3 / 2; /* XXX: this need tuning */
+            size_t i;
             vlc_dictionary_init( &new_dict, i_new_size );
             for( i = 0; i < p_dict->i_size; i++ )
             {
@@ -596,7 +596,7 @@
     if( !p_dict->p_entries )
         return;
 
-    int i_pos = DictHash( psz_key, p_dict->i_size );
+    size_t i_pos = DictHash(psz_key, p_dict->i_size);
     vlc_dictionary_entry_t * p_entry = p_dict->p_entriesi_pos;
     vlc_dictionary_entry_t * p_prev;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_atomic.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_atomic.h Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_chroma_probe.h Added

@@ -0,0 +1,259 @@
+/*****************************************************************************
+ * vlc_chroma_probe.h: chroma conversion probing
+ *****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef VLC_CHROMA_PROBE_H
+#define VLC_CHROMA_PROBE_H 1
+
+#include <vlc_common.h>
+#include <vlc_vector.h>
+
+/**
+ * \defgroup chroma_probe Chroma conversion probing
+ * \ingroup filter
+ * @{
+ * \file
+ * Chroma conversion probing
+ *
+ * \defgroup chroma_probe_api Chroma probing API
+ * \ingroup chroma_probe
+ *
+ * @{
+ */
+
+#define VLC_CHROMA_CONV_MAX_INDIRECT_STEPS 1
+#define VLC_CHROMA_CONV_CHAIN_COUNT_MAX (2 /* in + out */ + VLC_CHROMA_CONV_MAX_INDIRECT_STEPS)
+
+/**
+ * Chroma conversion result structure
+ */
+struct vlc_chroma_conv_result
+{
+    /**
+     * Array of chromas used to achieve the conversion
+     *
+     * 'chain0' is always equals to the 'in' argument of the
+     * vlc_chroma_conv_Probe() function.
+     *
+     * if the out argument of the vlc_chroma_conv_Probe() is valid,
+     * chainchain_count - 1 is equals to 'out'
+     */
+    vlc_fourcc_t chainVLC_CHROMA_CONV_CHAIN_COUNT_MAX;
+
+    /** Number of chromas in the chain */
+    size_t chain_count;
+
+    /**
+     * Cost of the full conversion, lower is better.
+     */
+    unsigned cost;
+
+    /**
+     * Quality of the conversion, higher is better.
+     *
+     * A quality of 100 means there are no quality loss: same color size and
+     * same vlc_chroma_subtype (or same YUV subsampling for video).
+     */
+    unsigned quality;
+};
+
+/** Only accept YUV output chromas (the input chroma can be RGB) */
+#define VLC_CHROMA_CONV_FLAG_ONLY_YUV 0x1
+/** Only accept RGB output chromas (the input chroma can be YUV) */
+#define VLC_CHROMA_CONV_FLAG_ONLY_RGB 0x2
+/** Sort results by cost instead of quality */
+#define VLC_CHROMA_CONV_FLAG_SORT_COST  0x4
+
+/**
+ * Probe possible chroma conversions
+
+ * Results are sorted by quality, unless VLC_CHROMA_CONV_FLAG_SORT_COST is
+ * specified in flags.
+
+ * @param in the input chroma to convert from, must be valid
+ * @param out the output chroma to convert to, if 0, the function will find all
+ * possible conversion from in to x
+ * @param width video width, used for finer cost calculation, can be 0
+ * @param height video height, used for finer cost calculation, can be 0
+ * @param max_indirect_steps maximum number of indirect conversion steps, must
+ * be lower or equal to @ref VLC_CHROMA_CONV_MAX_INDIRECT_STEPS, if in and out
+ * chromas are CPU chromas, the steps will be automatically lowered to 0
+ * @param flags bitwise flags, cf. VLC_CHROMA_CONV_FLAG_*
+ * @param count pointer to the number of results, must be valid
+ * @return a pointer to an array of results, must be released with free(), can
+ * be NULL
+ */
+VLC_API struct vlc_chroma_conv_result *
+vlc_chroma_conv_Probe(vlc_fourcc_t in, vlc_fourcc_t out,
+                      unsigned width, unsigned height,
+                      unsigned max_indirect_steps, int flags, size_t *count);
+
+/**
+ * Get a string representing the result
+ *
+ * @param res pointer to a valid result
+ * @return a string or NULL, must be released with free()
+ */
+VLC_API char *
+vlc_chroma_conv_result_ToString(const struct vlc_chroma_conv_result *res);
+
+/**
+ * @}
+ *
+ * \defgroup chroma_probe_module Chroma probing module implementation
+ * \ingroup chroma_probe
+ *
+ * @{
+ */
+
+/**
+ * Chroma conversion entry structure
+ */
+struct vlc_chroma_conv_entry
+{
+    /** Cost factor, 0.25 for GPU<->GPU conversions, 0.75 for SIMD, 1 for CPU */
+    float cost_factor;
+    /** input chroma */
+    vlc_fourcc_t in;
+    /** output chroma */
+    vlc_fourcc_t out;
+};
+typedef struct VLC_VECTOR(struct vlc_chroma_conv_entry) vlc_chroma_conv_vec;
+
+/**
+ * Module probe function signature
+ *
+ * @param vec pointer to an allocated vector
+ * @return a VLC error code
+ */
+typedef void (*vlc_chroma_conv_probe)(vlc_chroma_conv_vec *vec);
+
+#define set_callback_chroma_conv_probe(activate) \
+    { \
+        vlc_chroma_conv_probe activate__ = activate; \
+        (void) activate__; \
+        set_callback(activate) \
+    } \
+    set_capability("chroma probe", 100)
+
+/**
+ * Helper that add a chroma conversion
+ *
+ * Must be called inside vlc_chroma_conv_probe()
+ *
+ * @param vec pointer to the vector of chromas
+ * @param cost_factor cf. vlc_chroma_conv_entry.cost_factor
+ * @param in cf. vlc_chroma_conv_entry.in
+ * @param out cf. vlc_chroma_conv_entry.out
+ * @param twoway if true, 'out' can also be converted to 'in'
+ */
+static inline void
+vlc_chroma_conv_add(vlc_chroma_conv_vec *vec, float cost_factor,
+                    vlc_fourcc_t in, vlc_fourcc_t out, bool twoway)
+{
+    {
+        const struct vlc_chroma_conv_entry entry = {
+            cost_factor, in, out
+        };
+        vlc_vector_push(vec, entry);
+    }
+
+    if (twoway)
+    {
+        const struct vlc_chroma_conv_entry entry = {
+            cost_factor, out, in
+        };
+        vlc_vector_push(vec, entry);
+    }
+}
+
+/**
+ * Helper that add an array of out chroma conversions
+ *
+ * Must be called inside vlc_chroma_conv_probe()
+ *
+ * @param vec pointer to the vector of chromas
+ * @param cost_factor cf. vlc_chroma_conv_entry.cost_factor
+ * @param in cf. vlc_chroma_conv_entry.in
+ * @param out_array a list of out chromas
+ * @param out_count number of elements in the out_array
+ */
+static inline void
+vlc_chroma_conv_add_in_outarray(vlc_chroma_conv_vec *vec, float cost_factor,
+                                vlc_fourcc_t in,
+                                const vlc_fourcc_t *out_array, size_t out_count)
+{
+    for (size_t i = 0; i < out_count; i++)
+    {
+        const struct vlc_chroma_conv_entry entry = {
+            cost_factor, in, out_arrayi,
+        };
+        vlc_vector_push(vec, entry);
+    }
+}
+
+/**
+ * Helper that add a list of out chroma conversions
+ */
+#define vlc_chroma_conv_add_in_outlist(vec, cost_factor, in, ...) do { \
+    static const vlc_fourcc_t out_array = { __VA_ARGS__ }; \
+    size_t count = ARRAY_SIZE(out_array); \
+    vlc_chroma_conv_add_in_outarray(vec, cost_factor, in, out_array, count); \
+} while(0)
+
+/**
+ * Helper that add an array of in chroma conversions
+ *
+ * Must be called inside vlc_chroma_conv_probe()
+ *
+ * @param vec pointer to the vector of chromas
+ * @param cost_factor cf. vlc_chroma_conv_entry.cost_factor
+ * @param out cf. vlc_chroma_conv_entry.out
+ * @param in_array a list of out chromas
+ * @param in_count number of elements in the in_array
+ */
+static inline void
+vlc_chroma_conv_add_out_inarray(vlc_chroma_conv_vec *vec, float cost_factor,
+                                vlc_fourcc_t out,
+                                const vlc_fourcc_t *in_array, size_t in_count)
+{
+    for (size_t i = 0; i < in_count; i++)
+    {
+        const struct vlc_chroma_conv_entry entry = {
+            cost_factor, in_arrayi, out,
+        };
+        vlc_vector_push(vec, entry);
+    }
+}
+
+/**
+ * Helper that add a list of in chroma conversions
+ */
+#define vlc_chroma_conv_add_out_inlist(vec, cost_factor, out, ...) do { \
+    static const vlc_fourcc_t in_array = { __VA_ARGS__ }; \
+    size_t count = ARRAY_SIZE(in_array); \
+    vlc_chroma_conv_add_out_inarray(vec, cost_factor, out, in_array, count); \
+} while(0)
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* VLC_CHROMA_PROBE_H */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_configuration.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_configuration.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_es.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_es.h Changed

@@ -26,6 +26,7 @@
 #include <vlc_common.h>
 #include <vlc_fourcc.h>
 #include <vlc_viewpoint.h>
+#include <vlc_replay_gain.h>
 
 /**
  * \file
@@ -47,26 +48,6 @@
 };
 
 /**
- * audio replay gain description
- */
-#define AUDIO_REPLAY_GAIN_MAX (2)
-#define AUDIO_REPLAY_GAIN_TRACK (0)
-#define AUDIO_REPLAY_GAIN_ALBUM (1)
-typedef struct
-{
-    /* true if we have the peak value */
-    bool pb_peakAUDIO_REPLAY_GAIN_MAX;
-    /* peak value where 1.0 means full sample value */
-    float      pf_peakAUDIO_REPLAY_GAIN_MAX;
-
-    /* true if we have the gain value */
-    bool pb_gainAUDIO_REPLAY_GAIN_MAX;
-    /* gain value in dB */
-    float      pf_gainAUDIO_REPLAY_GAIN_MAX;
-} audio_replay_gain_t;
-
-
-/**
  * Audio channel type
  */
 typedef enum audio_channel_type_t
@@ -666,7 +647,7 @@
     int      i_level;         /**< codec specific information: indicates maximum restrictions on the stream (resolution, bitrate, codec features ...) */
 
     bool     b_packetized;  /**< whether the data is packetized (ie. not truncated) */
-    int     i_extra;        /**< length in bytes of extra data pointer */
+    size_t   i_extra;       /**< length in bytes of extra data pointer */
     void    *p_extra;       /**< extra data needed by some decoders or muxers */
 
 };

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_es_out.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_es_out.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_filter.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_filter.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_fixups.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_fixups.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_fourcc.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_fourcc.h Changed

@@ -294,6 +294,8 @@
 #define VLC_CODEC_NV42            VLC_FOURCC('N','V','4','2')
 /* 2 planes Y/UV 4:2:0 10-bit MSB, little endian */
 #define VLC_CODEC_P010            VLC_FOURCC('P','0','1','0')
+/* 2 planes Y/UV 4:2:0 12-bit MSB, little endian */
+#define VLC_CODEC_P012            VLC_FOURCC('P','0','1','2')
 /* 2 planes Y/UV 4:2:0 16-bit, little endian */
 #define VLC_CODEC_P016            VLC_FOURCC('P','0','1','6')
 
@@ -454,6 +456,7 @@
 /* VAAPI opaque surface */
 #define VLC_CODEC_VAAPI_420 VLC_FOURCC('V','A','O','P') /* 4:2:0  8 bpc */
 #define VLC_CODEC_VAAPI_420_10BPP VLC_FOURCC('V','A','O','0') /* 4:2:0 10 bpc */
+#define VLC_CODEC_VAAPI_420_12BPP VLC_FOURCC('V','A','O','2') /* 4:2:0 12 bpc */
 
 /* MediaCodec/IOMX opaque buffer type */
 #define VLC_CODEC_ANDROID_OPAQUE  VLC_FOURCC('A','N','O','P')
@@ -499,6 +502,7 @@
 #define VLC_CODEC_BPG             VLC_FOURCC('B','P','G',0xFB)
 #define VLC_CODEC_JPEGLS          VLC_FOURCC('M','J','L','S')
 #define VLC_CODEC_BMP             VLC_FOURCC('b','m','p',' ')
+#define VLC_CODEC_FARBFELD        VLC_FOURCC('f','a','r','b')
 #define VLC_CODEC_TIFF            VLC_FOURCC('t','i','f','f')
 #define VLC_CODEC_GIF             VLC_FOURCC('g','i','f',' ')
 #define VLC_CODEC_TARGA           VLC_FOURCC('t','g','a',' ')
@@ -574,6 +578,7 @@
 #define VLC_CODEC_ALAC                       VLC_FOURCC('a','l','a','c')
 #define VLC_CODEC_QDM2                       VLC_FOURCC('Q','D','M','2')
 #define VLC_CODEC_QDMC                       VLC_FOURCC('Q','D','M','C')
+#define VLC_CODEC_QOA                        VLC_FOURCC('q','o','a','f')
 #define VLC_CODEC_COOK                       VLC_FOURCC('c','o','o','k')
 #define VLC_CODEC_SIPR                       VLC_FOURCC('s','i','p','r')
 #define VLC_CODEC_TTA                        VLC_FOURCC('T','T','A','1')
@@ -772,37 +777,50 @@
  * It returns a list (terminated with the value 0) of YUV fourccs in
  * decreasing priority order for the given chroma.
  *
- * It will always return a non NULL pointer that must not be freed.
+ * It can return a NULL pointer, it must be freed.
  */
-VLC_API const vlc_fourcc_t * vlc_fourcc_GetYUVFallback( vlc_fourcc_t );
+VLC_API vlc_fourcc_t * vlc_fourcc_GetYUVFallback( vlc_fourcc_t );
 
 /**
  * It returns a list (terminated with the value 0) of RGB fourccs in
  * decreasing priority order for the given chroma.
  *
- * It will always return a non NULL pointer that must not be freed.
+ * It can return a NULL pointer, it must be freed.
  */
-VLC_API const vlc_fourcc_t * vlc_fourcc_GetRGBFallback( vlc_fourcc_t );
+VLC_API vlc_fourcc_t * vlc_fourcc_GetRGBFallback( vlc_fourcc_t );
 
 /**
  * It returns a list (terminated with the value 0) of fourccs in decreasing
  * priority order for the given chroma. It will return either YUV or RGB
  * fallbacks depending on whether or not the fourcc given is YUV.
  *
- * It will always return a non NULL pointer that must not be freed.
+ * It can return a NULL pointer, it must be freed.
  */
-VLC_API const vlc_fourcc_t * vlc_fourcc_GetFallback( vlc_fourcc_t );
+VLC_API vlc_fourcc_t * vlc_fourcc_GetFallback( vlc_fourcc_t );
 
 /**
- * It returns true if the given fourcc is YUV and false otherwise.
+ * Chroma subtype
  */
-VLC_API bool vlc_fourcc_IsYUV( vlc_fourcc_t );
+enum vlc_chroma_subtype
+{
+    VLC_CHROMA_SUBTYPE_OTHER,
+    VLC_CHROMA_SUBTYPE_YUV444,
+    VLC_CHROMA_SUBTYPE_YUV440,
+    VLC_CHROMA_SUBTYPE_YUV422,
+    VLC_CHROMA_SUBTYPE_YUV420,
+    VLC_CHROMA_SUBTYPE_YUV411,
+    VLC_CHROMA_SUBTYPE_YUV410,
+    VLC_CHROMA_SUBTYPE_YUV211,
+    VLC_CHROMA_SUBTYPE_RGB,
+    VLC_CHROMA_SUBTYPE_GREY,
+};
 
 /**
  * Chroma related information.
  */
 typedef struct {
     vlc_fourcc_t fcc;
+    enum vlc_chroma_subtype subtype;
     unsigned plane_count;
     struct {
         vlc_rational_t w;
@@ -810,6 +828,7 @@
     } p4;
     unsigned pixel_size;        /* Number of bytes per pixel for a plane */
     unsigned pixel_bits;        /* Number of bits actually used bits per pixel for a plane */
+    float color_bits;           /* Average number of bits used by one color */
 } vlc_chroma_description_t;
 
 /**
@@ -819,6 +838,36 @@
 VLC_API const vlc_chroma_description_t * vlc_fourcc_GetChromaDescription( vlc_fourcc_t fourcc ) VLC_USED;
 
 /**
+ * Returns true if the chroma description is YUV
+ */
+static inline bool
+vlc_chroma_description_IsYUV(const vlc_chroma_description_t *desc)
+{
+    switch (desc->subtype)
+    {
+        case VLC_CHROMA_SUBTYPE_YUV444:
+        case VLC_CHROMA_SUBTYPE_YUV440:
+        case VLC_CHROMA_SUBTYPE_YUV422:
+        case VLC_CHROMA_SUBTYPE_YUV420:
+        case VLC_CHROMA_SUBTYPE_YUV410:
+        case VLC_CHROMA_SUBTYPE_YUV411:
+        case VLC_CHROMA_SUBTYPE_YUV211:
+            return true;
+        default:
+            return false;
+    }
+}
+
+/**
+ * It returns true if the given fourcc is YUV and false otherwise.
+ */
+static inline bool vlc_fourcc_IsYUV(vlc_fourcc_t fcc)
+{
+    const vlc_chroma_description_t *desc = vlc_fourcc_GetChromaDescription(fcc);
+    return desc == NULL ? false : vlc_chroma_description_IsYUV(desc);
+}
+
+/**
  * Get the average usable bits per pixel for a chroma.
  * \note it may return 0 for opaque or compressed vlc_fourcc_t
  */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_input.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_input.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_messages.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_messages.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_meta.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_meta.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_mouse.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_mouse.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_network.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_network.h Changed

@@ -292,6 +292,16 @@
 # endif
 #endif
 
+/* union of the various sockaddr structures often used together */
+typedef union {
+    struct sockaddr         sa;
+    struct sockaddr_storage ss;
+    struct sockaddr_in      sin;
+#ifdef AF_INET6
+    struct sockaddr_in6     sin6;
+#endif
+} vlc_sockaddr;
+
 VLC_API int vlc_getnameinfo( const struct sockaddr *, int, char *, int, int *, int );
 
 /**
@@ -343,22 +353,22 @@
 
 static inline int net_GetSockAddress( int fd, char *address, int *port )
 {
-    struct sockaddr_storage addr;
-    socklen_t addrlen = sizeof( addr );
+    vlc_sockaddr addr;
+    socklen_t addrlen = sizeof( addr.ss );
 
-    return getsockname( fd, (struct sockaddr *)&addr, &addrlen )
-        || vlc_getnameinfo( (struct sockaddr *)&addr, addrlen, address,
+    return getsockname( fd, &addr.sa, &addrlen )
+        || vlc_getnameinfo( &addr.sa, addrlen, address,
                             NI_MAXNUMERICHOST, port, NI_NUMERICHOST )
         ? VLC_EGENERIC : 0;
 }
 
 static inline int net_GetPeerAddress( int fd, char *address, int *port )
 {
-    struct sockaddr_storage addr;
-    socklen_t addrlen = sizeof( addr );
+    vlc_sockaddr addr;
+    socklen_t addrlen = sizeof( addr.ss );
 
-    return getpeername( fd, (struct sockaddr *)&addr, &addrlen )
-        || vlc_getnameinfo( (struct sockaddr *)&addr, addrlen, address,
+    return getpeername( fd, &addr.sa, &addrlen )
+        || vlc_getnameinfo( &addr.sa, addrlen, address,
                             NI_MAXNUMERICHOST, port, NI_NUMERICHOST )
         ? VLC_EGENERIC : 0;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_player.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_player.h Changed

@@ -768,6 +768,41 @@
 vlc_player_SetAtoBLoop(vlc_player_t *player, enum vlc_player_abloop abloop);
 
 /**
+ * Enable A to B loop of the current media by setting start and end time
+ *
+ * The B time must be higher than the A time.
+ *
+ * @param player locked player instance
+ * @param a_time start time for the loop
+ * @param b_time end time for the loop
+ * @return VLC_SUCCESS or a VLC error code
+ */
+VLC_API int
+vlc_player_SetAtoBLoopTime(vlc_player_t *player, vlc_tick_t a_time, vlc_tick_t b_time);
+
+/**
+ * Enable A to B loop of the current media by setting start and end position
+ *
+ * The B position must be higher than the A position.
+ *
+ * @param player locked player instance
+ * @param a_pos start position for the loop
+ * @param b_pos end position for the loop
+ * @return VLC_SUCCESS or a VLC error code
+ */
+VLC_API int
+vlc_player_SetAtoBLoopPosition(vlc_player_t *player, double a_pos, double b_pos);
+
+/**
+ * Reset/remove the A to B loop of the current media
+ *
+ * @param player locked player instance
+ * @return VLC_SUCCESS or a VLC error code
+ */
+VLC_API int
+vlc_player_ResetAtoBLoop(vlc_player_t *player);
+
+/**
  * Get the A to B loop status
  *
  * @note If the returned status is VLC_PLAYER_ABLOOP_A, then a_time and a_pos

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_preparser.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_preparser.h Changed

@@ -46,33 +46,214 @@
 
 #define VLC_PREPARSER_REQ_ID_INVALID 0
 
-typedef enum input_item_meta_request_option_t
+#define VLC_PREPARSER_TYPE_PARSE            0x01
+#define VLC_PREPARSER_TYPE_FETCHMETA_LOCAL  0x02
+#define VLC_PREPARSER_TYPE_FETCHMETA_NET    0x04
+#define VLC_PREPARSER_TYPE_THUMBNAIL        0x08
+#define VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES 0x10
+#define VLC_PREPARSER_TYPE_FETCHMETA_ALL \
+    (VLC_PREPARSER_TYPE_FETCHMETA_LOCAL|VLC_PREPARSER_TYPE_FETCHMETA_NET)
+
+#define VLC_PREPARSER_OPTION_INTERACT 0x1000
+#define VLC_PREPARSER_OPTION_SUBITEMS 0x2000
+
+/**
+ * Preparser thumbnailer callbacks
+ *
+ * Used by vlc_preparser_GenerateThumbnail()
+ */
+struct vlc_thumbnailer_cbs
+{
+    /**
+     * Event received on thumbnailing completion or error
+     *
+     * This callback will always be called, provided
+     * vlc_preparser_GenerateThumbnail() returned a valid request, and provided
+     * the request is not cancelled before its completion.
+     *
+     * @note This callback is mandatory if calling
+     * vlc_preparser_GenerateThumbnail()
+     *
+     * In case of failure, timeout or cancellation, p_thumbnail will be NULL.
+     * The picture, if any, is owned by the thumbnailer, and must be acquired
+     * by using \link picture_Hold \endlink to use it pass the callback's
+     * scope.
+     *
+     * @param item item used for the thumbnailer
+     * @param status VLC_SUCCESS in case of success, VLC_ETIMEOUT in case of
+     * timeout, -EINTR if cancelled, an error otherwise
+     * @param thumbnail The generated thumbnail, or NULL in case of failure or
+     * timeout
+     * @param data opaque pointer passed by
+     * vlc_preparser_GenerateThumbnail()
+     *
+     */
+    void (*on_ended)(input_item_t *item, int status, picture_t* thumbnail,
+                     void *data);
+};
+
+/**
+ * Preparser thumbnailer to file callbacks
+ *
+ * Used by vlc_preparser_GenerateThumbnailToFiles()
+ */
+struct vlc_thumbnailer_to_files_cbs
 {
-    META_REQUEST_OPTION_NONE          = 0x00,
-    META_REQUEST_OPTION_PARSE         = 0x01,
-    META_REQUEST_OPTION_FETCH_LOCAL   = 0x02,
-    META_REQUEST_OPTION_FETCH_NETWORK = 0x04,
-    META_REQUEST_OPTION_FETCH_ANY     =
-        META_REQUEST_OPTION_FETCH_LOCAL|META_REQUEST_OPTION_FETCH_NETWORK,
-    META_REQUEST_OPTION_DO_INTERACT   = 0x08,
-    META_REQUEST_OPTION_PARSE_SUBITEMS = 0x10,
-} input_item_meta_request_option_t;
+    /**
+     * Event received on thumbnailing completion or error
+     *
+     * This callback will always be called, provided
+     *
+     * vlc_preparser_GenerateThumbnailToFiles() returned a valid request, and
+     * provided the request is not cancelled before its completion.
+     *
+     * @note This callback is mandatory if calling
+     * vlc_preparser_GenerateThumbnailToFiles()
+     *
+     * @param item item used for the thumbnailer
+     * @param status VLC_SUCCESS in case of success, VLC_ETIMEOUT in case of
+     * timeout, -EINTR if cancelled, an error otherwise. A success mean that an
+     * image was generated but it is still possible that the export failed,
+     * check result_array to assure export were successful.
+     * @param array of results, if result_arrayi is true, the outputsi from
+     * vlc_preparser_GenerateThumbnailToFiles() succeeded.
+     * @param result_count size of the array, same than the output_count arg
+     * from vlc_preparser_GenerateThumbnailToFiles()
+     * @param data opaque pointer passed by
+     * vlc_preparser_GenerateThumbnailToFiles()
+     */
+    void (*on_ended)(input_item_t *item, int status,
+                     const bool *result_array, size_t result_count, void *data);
+};
+
+/**
+ * Thumbnailer argument
+ *
+ * Used by vlc_preparser_GenerateThumbnail() and
+ * vlc_preparser_GenerateThumbnailToFiles()
+ */
+struct vlc_thumbnailer_arg
+{
+    /** Seek argument */
+    struct seek
+    {
+        enum
+        {
+            /** Don't seek (default) */
+            VLC_THUMBNAILER_SEEK_NONE,
+            /** Seek by time */
+            VLC_THUMBNAILER_SEEK_TIME,
+            /** Seek by position */
+            VLC_THUMBNAILER_SEEK_POS,
+        } type;
+        union
+        {
+            /** Seek time if type == VLC_THUMBNAILER_SEEK_TIME */
+            vlc_tick_t time;
+            /** Seek position if type == VLC_THUMBNAILER_SEEK_POS */
+            double pos;
+        };
+        enum
+        {
+            /** Precise, but potentially slow */
+            VLC_THUMBNAILER_SEEK_PRECISE,
+            /** Fast, but potentially imprecise */
+            VLC_THUMBNAILER_SEEK_FAST,
+        } speed;
+    } seek;
+
+    /** True to enable hardware decoder (false by default) */
+    bool hw_dec;
+};
+
+/**
+ * Thumbnailer output format
+ */
+enum vlc_thumbnailer_format
+{
+    VLC_THUMBNAILER_FORMAT_PNG,
+    VLC_THUMBNAILER_FORMAT_WEBP,
+    VLC_THUMBNAILER_FORMAT_JPEG,
+};
+
+/**
+ * Thumbnailer output argument
+ *
+ * Used by vlc_preparser_GenerateThumbnailToFiles()
+ */
+struct vlc_thumbnailer_output
+{
+    /**
+     * Thumbnailer output format
+     */
+    enum vlc_thumbnailer_format format;
+
+    /**
+     * Requested width of the thumbnail
+     *
+     * cf. picture_Export() documentation.
+     */
+    int width;
+
+    /**
+     * Requested Height of the thumbnail
+     *
+     * cf. picture_Export() documentation.
+     */
+    int height;
+
+    /**
+     * True if the thumbnail should be cropped
+     *
+     * cf. picture_Export() documentation.
+     */
+    bool crop;
+
+    /** File output path of the thumbnail */
+    const char *file_path;
+    /** File mode bits (cf. "mode_t mode" in `man 2 open`) */
+    unsigned int creat_mode;
+};
+
+/**
+ * Preparser creation configuration
+ */
+struct vlc_preparser_cfg
+{
+    /**
+     * A combination of VLC_PREPARSER_TYPE_* flags, it is used to
+     * setup the executors for each domain. Its possible to select more than
+     * one type
+     */
+    int types;
+
+    /**
+     * The maximum number of threads used by the parser, 0 for default
+     * (1 thread)
+     */
+    unsigned max_parser_threads;
+
+    /**
+     * The maximum number of threads used by the thumbnailer, 0 for default
+     * (1 thread)
+     */
+    unsigned max_thumbnailer_threads;
+
+    /**
+     * Timeout of the preparser and/or thumbnailer, 0 for no limits.
+     */
+    vlc_tick_t timeout;
+};
 
 /**
  * This function creates the preparser object and thread.
  *
  * @param obj the parent object
- * @param max_threads the maximum number of threads used to parse, must be >= 1
- * @param timeout timeout of the preparser, 0 for no limits.
- * @param request_type a combination of META_REQUEST_OPTION_PARSE,
- * META_REQUEST_OPTION_FETCH_LOCAL and META_REQUEST_OPTION_FETCH_NETWORK, it is
- * used to setup the executors for each domain.
+ * @param cfg a pointer to a valid confiuration struct
  * @return a valid preparser object or NULL in case of error
  */
 VLC_API vlc_preparser_t *vlc_preparser_New( vlc_object_t *obj,
-                                            unsigned max_threads,
-                                            vlc_tick_t timeout,
-                                            input_item_meta_request_option_t request_type );
+                                            const struct vlc_preparser_cfg *cfg );
 
 /**
  * This function enqueues the provided item to be preparsed or fetched.
@@ -82,7 +263,9 @@
  *
  * @param preparser the preparser object
  * @param item a valid item to preparse
- * @param option preparse flag, cf @ref input_item_meta_request_option_t
+ * @param type_option a combination of VLC_PREPARSER_TYPE_* and
+ * VLC_PREPARSER_OPTION_* flags. The type must be in the set specified in
+ * vlc_preparser_New() (it is possible to select less types).
  * @param cbs callback to listen to events (can't be NULL)
  * @param cbs_userdata opaque pointer used by the callbacks
  * @param id unique id provided by the caller. This is can be used to cancel
@@ -92,11 +275,79 @@
  * error, the on_preparse_ended will *not* be invoked
  */
 VLC_API vlc_preparser_req_id
-vlc_preparser_Push( vlc_preparser_t *preparser, input_item_t *item,
-                    input_item_meta_request_option_t option,
+vlc_preparser_Push( vlc_preparser_t *preparser, input_item_t *item, int type_option,
                     const input_item_parser_cbs_t *cbs, void *cbs_userdata );
 
 /**
+ * This function enqueues the provided item for generating a thumbnail
+ *
+ * @param preparser the preparser object
+ * @param item a valid item to generate the thumbnail for
+ * @param arg pointer to the arg struct, NULL for default options
+ * @param cbs callback to listen to events (can't be NULL)
+ * @param cbs_userdata opaque pointer used by the callbacks
+ * @return VLC_PREPARSER_REQ_ID_INVALID in case of error, or a valid id if the
+ * item was scheduled for thumbnailing. If this returns an
+ * error, the thumbnailer.on_ended callback will *not* be invoked
+ *
+ * The provided input_item will be held by the thumbnailer and can safely be
+ * released safely after calling this function.
+ */
+VLC_API vlc_preparser_req_id
+vlc_preparser_GenerateThumbnail( vlc_preparser_t *preparser, input_item_t *item,
+                                 const struct vlc_thumbnailer_arg *arg,
+                                 const struct vlc_thumbnailer_cbs *cbs,
+                                 void *cbs_userdata );
+
+/**
+ * Get the best possible format
+ *
+ * @paramout format pointer to the best format
+ * @paramout out_ext pointer to the extension of the format
+ * @return 0 if a format was found, VLC_ENOENT otherwise (in case there are no
+ * "image encoder" modules)
+ */
+VLC_API int
+vlc_preparser_GetBestThumbnailerFormat(enum vlc_thumbnailer_format *format,
+                                       const char **out_ext);
+
+/**
+ * Check if the format is handled by VLC
+ *
+ * @param format format to check
+ * @return 0 if the format was found, VLC_ENOENT otherwise (in case there are
+ * no "image encoder" modules)
+ */
+VLC_API int
+vlc_preparser_CheckThumbnailerFormat(enum vlc_thumbnailer_format format);
+
+/**
+ * This function generates a thumbnail to one or several files
+ *
+ * @param preparser the preparser object
+ * @param item a valid item to generate the thumbnail for
+ * @param arg pointer to the arg struct, NULL for default options
+ * @param outputs array of outputs, one file will be generated per output for a
+ * single thumbnail
+ * @param output_count outputs array size, must be > 1
+ * @param cbs callback to listen to events (can't be NULL)
+ * @param cbs_userdata opaque pointer used by the callbacks
+ * @return VLC_PREPARSER_REQ_ID_INVALID in case of error, or a valid id if the
+ * item was scheduled for thumbnailing. If this returns an
+ * error, the thumbnailer.on_ended callback will *not* be invoked
+ *
+ * The provided input_item will be held by the thumbnailer and can safely be
+ * released safely after calling this function.
+ */
+VLC_API vlc_preparser_req_id
+vlc_preparser_GenerateThumbnailToFiles( vlc_preparser_t *preparser, input_item_t *item,
+                                        const struct vlc_thumbnailer_arg *arg,
+                                        const struct vlc_thumbnailer_output *outputs,
+                                        size_t output_count,
+                                        const struct vlc_thumbnailer_to_files_cbs *cbs,
+                                        void *cbs_userdata );
+
+/**
  * This function cancel all preparsing requests for a given id
  *
  * @param preparser the preparser object
@@ -116,16 +367,6 @@
 VLC_API void vlc_preparser_Delete( vlc_preparser_t *preparser );
 
 /**
- * This function deactivates the preparser
- *
- * All pending requests will be removed, and it will block until the currently
- * running entity has finished (if any).
- *
- * @param preparser the preparser object
- */
-VLC_API void vlc_preparser_Deactivate( vlc_preparser_t *preparser );
-
-/**
  * Do not use, libVLC only fonction, will be removed soon
  */
 VLC_API void vlc_preparser_SetTimeout( vlc_preparser_t *preparser,

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_replay_gain.h Added

@@ -0,0 +1,166 @@
+/*****************************************************************************
+ * vlc_replay_gain.h : common replay gain code
+ *****************************************************************************
+ * Copyright © 2002-2004 VLC authors and VideoLAN
+ * Copyright © 2011-2012 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef VLC_REPLAY_GAIN_H
+#define VLC_REPLAY_GAIN_H 1
+
+#include <vlc_common.h>
+
+/**
+ * \file vlc_replay_gain.h
+ * \defgroup replay_gain Replay Gain
+ * \ingroup input
+ * Functions to read replay gain tags.
+ *
+ * @{
+ */
+
+/** Index for track values */
+#define AUDIO_REPLAY_GAIN_TRACK (0)
+/** Index for album values */
+#define AUDIO_REPLAY_GAIN_ALBUM (1)
+/** Number of replay gain types */
+#define AUDIO_REPLAY_GAIN_MAX (2)
+
+/**
+ * Audio replay gain
+ */
+typedef struct
+{
+    bool    pb_reference_loudness;          /**< true if we have the reference loudness */
+    float   pf_reference_loudness;          /**< reference loudness in LUFS */
+    bool    pb_gainAUDIO_REPLAY_GAIN_MAX; /**< true if we have the gain value */
+    float   pf_gainAUDIO_REPLAY_GAIN_MAX; /**< gain value in dB */
+    bool    pb_peakAUDIO_REPLAY_GAIN_MAX; /**< true if we have the peak value */
+    float   pf_peakAUDIO_REPLAY_GAIN_MAX; /**< peak value where 1.0 means full sample value */
+} audio_replay_gain_t;
+
+/**
+ * Extracts replay gain info from metadata and copies it into a replay gain structure.
+ * Supports both capitalized and lowercase metadata tags.
+ *
+ * \param p_dst Destination replay gain structure to fill
+ * \param p_meta Metadata structure to extract values from
+ * \return VLC_SUCCESS if either an album or track gain was found,
+ *         VLC_EGENERIC if no gain was found,
+ *         VLC_EINVAL if either argument is null
+ */
+VLC_API int vlc_replay_gain_CopyFromMeta( audio_replay_gain_t *p_dst, const vlc_meta_t *p_meta );
+
+/**
+ * Calculates the replay gain multiplier according to the Replay Gain 2.0 Specification.
+ * User preferences control mode, pre-amp, default gain, and peak protection.
+ *
+ * \param obj calling vlc object
+ * \param p_rg replay gain structure
+ * \return linear gain multiplier
+ */
+float replay_gain_CalcMultiplier( vlc_object_t *obj, const audio_replay_gain_t *p_rg );
+
+/**
+ * Merges replay gain structures
+ *
+ * Only copies gain/peak/reference loudness values that are:
+ * - Set in the source
+ * - Not set in the destination
+ *
+ * \param p_dst Destination replay gain structure
+ * \param p_src Source replay gain structure
+ */
+static inline void replay_gain_Merge( audio_replay_gain_t *p_dst, const audio_replay_gain_t *p_src )
+{
+    if( !p_dst || !p_src )
+        return;
+
+    if( !p_dst->pb_reference_loudness && p_src->pb_reference_loudness )
+    {
+        p_dst->pb_reference_loudness = p_src->pb_reference_loudness;
+        p_dst->pf_reference_loudness = p_src->pf_reference_loudness;
+    }
+
+    for( size_t i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
+    {
+        if( !p_dst->pb_gaini && p_src->pb_gaini )
+        {
+            p_dst->pb_gaini = p_src->pb_gaini;
+            p_dst->pf_gaini = p_src->pf_gaini;
+        }
+        if( !p_dst->pb_peaki && p_src->pb_peaki )
+        {
+            p_dst->pb_peaki = p_src->pb_peaki;
+            p_dst->pf_peaki = p_src->pf_peaki;
+        }
+    }
+}
+
+/**
+ * Compares two replay gain structures
+ *
+ * \param p_a First replay gain structure
+ * \param p_b Second replay gain structure
+ * \return true if any gain/peak/reference loudness values or their validity flags differ
+ */
+static inline bool replay_gain_Compare( const audio_replay_gain_t *p_a, const audio_replay_gain_t *p_b )
+{
+    if( !p_a || !p_b )
+        return true;
+
+    if( p_a->pb_reference_loudness != p_b->pb_reference_loudness ||
+        p_a->pf_reference_loudness != p_b->pf_reference_loudness )
+        return true;
+
+   for( size_t i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
+   {
+        if( p_a->pb_gaini != p_b->pb_gaini ||
+            p_a->pb_peaki != p_b->pb_peaki )
+            return true;
+
+        if( ( p_a->pb_gaini && p_a->pf_gaini != p_b->pf_gaini ) ||
+            ( p_a->pb_peaki && p_a->pf_peaki != p_b->pf_peaki ) )
+            return true;
+    }
+    return false;
+}
+
+/**
+ * Reset replay gain structure values
+ *
+ * \param p_dst Replay gain structure
+ */
+static inline void replay_gain_Reset( audio_replay_gain_t *p_rg )
+{
+    if( !p_rg )
+        return;
+
+    p_rg->pb_reference_loudness = false;
+    p_rg->pf_reference_loudness = 0.f;
+
+    for( size_t i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
+    {
+        p_rg->pb_gaini = false;
+        p_rg->pf_gaini = 0.f;
+
+        p_rg->pb_peaki = false;
+        p_rg->pf_peaki = 0.f;
+    }
+}
+/** @} */
+#endif

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_spu.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_spu.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_subpicture.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_subpicture.h Changed

@@ -47,7 +47,6 @@
 /**
  * Video subtitle region spu core private
  */
-typedef struct subpicture_region_private_t subpicture_region_private_t;
 typedef struct vlc_spu_highlight_t vlc_spu_highlight_t;
 typedef struct filter_t vlc_blender_t;
 
@@ -73,9 +72,10 @@
     picture_t       *p_picture;          /**< picture comprising this region */
 
     bool            b_absolute;       /**< position is absolute in the movie */
+    bool            b_in_window;          /**< position the region in window */
     int             i_x;      /**< position of region, relative to alignment */
     int             i_y;      /**< position of region, relative to alignment */
-    int             i_align;                  /**< alignment flags of region */
+    int             i_align;       /**< alignment flags SUBPICTURE_ALIGN_xxx */
     int             i_alpha;                               /**< transparency */
 
     /* Parameters for text regions (p_picture to be rendered) */
@@ -85,7 +85,6 @@
     int             i_max_height;    /** vertical rendering/cropping target/limit */
 
     struct vlc_list node;             /**< for inclusion in a vlc_spu_regions */
-    subpicture_region_private_t *p_private;  /**< Private data for spu_t *only* */
 };
 
 typedef struct vlc_list vlc_spu_regions;
@@ -170,6 +169,25 @@
  */
 VLC_API void vlc_spu_regions_Clear( vlc_spu_regions * );
 
+struct vlc_spu_updater_configuration
+{
+    // source video format of the video under the SPU
+    const video_format_t *video_src;
+    // scaled video format of the video under the SPU
+    const video_format_t *video_dst;
+    unsigned  display_width;
+    unsigned  display_height;
+
+    // source video format of the previous vlc_spu_updater_ops.update call
+    const video_format_t *prev_src;
+    // scaled video format of the previous vlc_spu_updater_ops.update call
+    const video_format_t *prev_dst;
+
+    // timestamp when the SPU will be displayed, between i_start and i_stop
+    // for subtitles
+    vlc_tick_t           pts;
+};
+
 /**
  * Subpicture updater operation virtual table.
  *
@@ -181,9 +199,7 @@
       * the main job of creating the subpicture regions for the
       * current video_format */
     void (*update)(subpicture_t *,
-                   const video_format_t *prev_src, const video_format_t *p_fmt_src,
-                   const video_format_t *prev_dst, const video_format_t *p_fmt_dst,
-                   vlc_tick_t);
+                   const struct vlc_spu_updater_configuration *);
 
     /** Optional callback for subpicture private data cleanup */
     void (*destroy)(subpicture_t *);
@@ -300,7 +316,8 @@
  * This function will update the content of a subpicture created with
  * a non NULL subpicture_updater_t.
  */
-VLC_API void subpicture_Update( subpicture_t *, const video_format_t *src, const video_format_t *, vlc_tick_t );
+VLC_API void subpicture_Update( subpicture_t *, const video_format_t *src, const video_format_t *,
+    unsigned display_width, unsigned display_height, vlc_tick_t );
 
 /**
  * This function will blend a given subpicture onto a picture.

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_tracer.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_tracer.h Changed

@@ -51,7 +51,8 @@
 {
     VLC_TRACER_INT,
     VLC_TRACER_DOUBLE,
-    VLC_TRACER_STRING
+    VLC_TRACER_STRING,
+    VLC_TRACER_UINT,
 };
 
 typedef union
@@ -59,6 +60,7 @@
     int64_t integer;
     double double_;
     const char *string;
+    uint64_t uinteger;
 } vlc_tracer_value_t;
 
 /**
@@ -177,6 +179,14 @@
     return trace;
 }
 
+static inline struct vlc_tracer_entry vlc_tracer_entry_FromUnsigned(const char *key, uint64_t value)
+{
+    vlc_tracer_value_t tracer_value;
+    tracer_value.uinteger = value;
+    struct vlc_tracer_entry trace = { key, tracer_value, VLC_TRACER_UINT };
+    return trace;
+}
+
 static inline struct vlc_tracer_entry vlc_tracer_entry_FromDouble(const char *key, double value)
 {
     vlc_tracer_value_t tracer_value = {
@@ -200,6 +210,7 @@
 
 #define VLC_TRACE(key, value) \
         _Generic((value), \
+        uint64_t: vlc_tracer_entry_FromUnsigned, \
         int64_t: vlc_tracer_entry_FromInt, \
         double: vlc_tracer_entry_FromDouble, \
         char *: vlc_tracer_entry_FromString, \
@@ -213,6 +224,11 @@
     return vlc_tracer_entry_FromInt(key, value);
 }
 
+static inline struct vlc_tracer_entry VLC_TRACE(const char *key, uint64_t value)
+{
+    return vlc_tracer_entry_FromUnsigned(key, value);
+}
+
 static inline struct vlc_tracer_entry VLC_TRACE(const char *key, char *value)
 {
     return vlc_tracer_entry_FromString(key, value);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_viewpoint.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_viewpoint.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_vout.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_vout.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/include/vlc_vout_display.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/include/vlc_vout_display.h Changed

@@ -119,7 +119,12 @@
     struct vlc_window *window; /**< Window */
     struct vout_display_placement display; /**< Display placement properties */
     vlc_icc_profile_t *icc_profile; /**< Currently active ICC profile */
+    /** Final source projection requested for display. */
+    video_projection_mode_t projection;
+
+    /** Initial viewpoint when projection != PROJECTION_MODE_RECTANGULAR */
     vlc_viewpoint_t viewpoint;
+    vlc_stereoscopic_mode_t stereo_mode; /**< Stereoscopic/3D mode used by the display */
 } vout_display_cfg_t;
 
 /**
@@ -323,6 +328,28 @@
      */
     int (*update_format)(vout_display_t *, const video_format_t *fmt,
                          vlc_video_context *ctx);
+
+    /**
+     * Set the source projection used by the display.
+     *
+     * May be NULL.
+     *
+     * \param display the display to change projection for
+     * \param projection the new projection mode considered for the source
+     * \return VLC_SUCCESS on succes, another value if changing projection failed
+     */
+    int (*change_source_projection)(vout_display_t *display,
+                                    video_projection_mode_t projection);
+
+    /**
+     * Notifies the new Stereoscopic 3D mode in \ref vout_display_cfg_t changed.
+     *
+     * May be NULL.
+     *
+     * \retval VLC_SUCCESS if the display handled the change
+     * \retval VLC_EGENERIC if the display handled the change was not handled
+     */
+    int        (*set_stereo)(vout_display_t *, vlc_stereoscopic_mode_t);
 };
 
 /**
@@ -492,6 +519,13 @@
     return cfg->window->type != VLC_WINDOW_TYPE_DUMMY;
 }
 
+static inline int vout_display_ChangeProjection(vout_display_t *vd, video_projection_mode_t projection)
+{
+    if (vd->ops->change_source_projection == NULL)
+        return VLC_ENOTSUP;
+    return vd->ops->change_source_projection(vd, projection);
+}
+
 /**
  * Computes the default display size given the source and
  * the display configuration.

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/lib/core.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/lib/core.c Changed

@@ -29,7 +29,6 @@
 #include <vlc/vlc.h>
 
 #include <vlc_preparser.h>
-#include <vlc_thumbnailer.h>
 #include <vlc_interface.h>
 
 #include <stdarg.h>
@@ -110,7 +109,7 @@
         if (p_instance->parser != NULL)
             vlc_preparser_Delete(p_instance->parser);
         if (p_instance->thumbnailer != NULL)
-            vlc_thumbnailer_Delete(p_instance->thumbnailer);
+            vlc_preparser_Delete(p_instance->thumbnailer);
 
         libvlc_InternalCleanup( p_instance->p_libvlc_int );
         libvlc_InternalDestroy( p_instance->p_libvlc_int );
@@ -266,26 +265,34 @@
         if (default_timeout < 0)
             default_timeout = 0;
 
+        const struct vlc_preparser_cfg cfg = {
+            .types = VLC_PREPARSER_TYPE_PARSE | VLC_PREPARSER_TYPE_FETCHMETA_ALL,
+            .max_parser_threads = max_threads,
+            .timeout = default_timeout,
+        };
+
         parser = instance->parser =
-            vlc_preparser_New(VLC_OBJECT(instance->p_libvlc_int), max_threads,
-                              default_timeout,
-                              META_REQUEST_OPTION_PARSE |
-                              META_REQUEST_OPTION_FETCH_ANY);
+            vlc_preparser_New(VLC_OBJECT(instance->p_libvlc_int), &cfg);
     }
     vlc_mutex_unlock(&instance->lazy_init_lock);
 
     return parser;
 }
 
-vlc_thumbnailer_t *libvlc_get_thumbnailer(libvlc_instance_t *instance)
+vlc_preparser_t *libvlc_get_thumbnailer(libvlc_instance_t *instance)
 {
     vlc_mutex_lock(&instance->lazy_init_lock);
-    vlc_thumbnailer_t *thumb = instance->thumbnailer;
+    vlc_preparser_t *thumb = instance->thumbnailer;
 
     if (thumb == NULL)
     {
+        const struct vlc_preparser_cfg cfg = {
+            .types = VLC_PREPARSER_TYPE_THUMBNAIL,
+            .timeout = 0,
+        };
+
         thumb = instance->thumbnailer =
-            vlc_thumbnailer_Create(VLC_OBJECT(instance->p_libvlc_int), 0);
+            vlc_preparser_New(VLC_OBJECT(instance->p_libvlc_int), &cfg);
     }
     vlc_mutex_unlock(&instance->lazy_init_lock);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/lib/libvlc.sym -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/lib/libvlc.sym Changed

@@ -187,7 +187,9 @@
 libvlc_media_player_unselect_track_type
 libvlc_media_player_select_tracks
 libvlc_media_player_select_tracks_by_ids
-libvlc_media_player_set_abloop
+libvlc_media_player_set_abloop_time
+libvlc_media_player_set_abloop_position
+libvlc_media_player_reset_abloop
 libvlc_media_player_get_abloop
 libvlc_player_program_delete
 libvlc_player_programlist_count
@@ -248,6 +250,7 @@
 libvlc_video_get_spu_text_scale
 libvlc_video_get_teletext
 libvlc_video_get_teletext_transparency
+libvlc_video_get_video_stereo_mode
 libvlc_video_set_adjust_float
 libvlc_video_set_adjust_int
 libvlc_video_set_aspect_ratio
@@ -267,11 +270,14 @@
 libvlc_video_set_marquee_int
 libvlc_video_set_marquee_string
 libvlc_video_set_mouse_input
+libvlc_video_set_projection_mode
+libvlc_video_unset_projection_mode
 libvlc_video_set_scale
 libvlc_video_set_spu_delay
 libvlc_video_set_spu_text_scale
 libvlc_video_set_teletext
 libvlc_video_set_teletext_transparency
+libvlc_video_set_video_stereo_mode
 libvlc_video_take_snapshot
 libvlc_video_new_viewpoint
 libvlc_video_update_viewpoint

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/lib/libvlc_internal.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/lib/libvlc_internal.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/lib/media.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/lib/media.c Changed

@@ -37,7 +37,6 @@
 #include <vlc_common.h>
 #include <vlc_meta.h>
 #include <vlc_url.h>
-#include <vlc_thumbnailer.h>
 #include <vlc_atomic.h>
 
 #include "../src/libvlc.h"
@@ -319,11 +318,14 @@
         case VLC_ETIMEOUT:
             new_status = libvlc_media_parsed_status_timeout;
             break;
+        case -EINTR:
+            new_status = libvlc_media_parsed_status_cancelled;
+            break;
         case VLC_SUCCESS:
             new_status = libvlc_media_parsed_status_done;
             break;
         default:
-            return;
+            vlc_assert_unreachable();
     }
     send_parsed_changed( p_md, new_status );
 
@@ -741,7 +743,7 @@
         return -1;
 
     input_item_t *item = media->p_input_item;
-    input_item_meta_request_option_t parse_scope = 0;
+    int parse_scope = 0;
     unsigned int ref = atomic_load_explicit(&media->worker_count,
                                             memory_order_relaxed);
     do
@@ -762,8 +764,8 @@
         do_parse = true;
     else
     {
-        if (input_net && (parse_flag & libvlc_media_parse_network) == 0)
-            do_parse = false;
+        if (input_net)
+            do_parse = parse_flag & libvlc_media_parse_network;
         else if (parse_flag & libvlc_media_parse_local)
         {
             switch (input_type)
@@ -784,17 +786,17 @@
     }
 
     if (do_parse)
-        parse_scope |= META_REQUEST_OPTION_PARSE;
+        parse_scope |= VLC_PREPARSER_TYPE_PARSE;
 
     do_fetch = false;
     if (parse_flag & libvlc_media_fetch_local)
     {
-        parse_scope |= META_REQUEST_OPTION_FETCH_LOCAL;
+        parse_scope |= VLC_PREPARSER_TYPE_FETCHMETA_LOCAL;
         do_fetch = true;
     }
     if (parse_flag & libvlc_media_fetch_network)
     {
-        parse_scope |= META_REQUEST_OPTION_FETCH_NETWORK;
+        parse_scope |= VLC_PREPARSER_TYPE_FETCHMETA_NET;
         do_fetch = true;
     }
 
@@ -807,8 +809,8 @@
     }
 
     if (parse_flag & libvlc_media_do_interact)
-        parse_scope |= META_REQUEST_OPTION_DO_INTERACT;
-    parse_scope |= META_REQUEST_OPTION_PARSE_SUBITEMS;
+        parse_scope |= VLC_PREPARSER_OPTION_INTERACT;
+    parse_scope |= VLC_PREPARSER_OPTION_SUBITEMS;
 
     if (timeout == -1)
         timeout = var_InheritInteger(inst->p_libvlc_int, "preparse-timeout");
@@ -924,11 +926,15 @@
     unsigned int height;
     bool crop;
     libvlc_picture_type_t type;
-    vlc_thumbnailer_req_id id;
+    vlc_preparser_req_id id;
 };
 
-static void media_on_thumbnail_ready( picture_t* thumbnail, void* data )
+static void media_on_thumbnail_ready( input_item_t *item, int status,
+                                      picture_t* thumbnail, void* data )
 {
+    (void) item;
+    (void) status;
+
     libvlc_media_thumbnail_request_t *req = data;
     libvlc_media_t *p_media = req->md;
     libvlc_event_t event;
@@ -948,18 +954,18 @@
 static libvlc_media_thumbnail_request_t*
 libvlc_media_thumbnail_request( libvlc_instance_t *inst,
                                 libvlc_media_t *md,
-                                const struct vlc_thumbnailer_seek_arg *seek_arg,
+                                const struct vlc_thumbnailer_arg *thumb_arg,
                                 unsigned int width, unsigned int height,
                                 bool crop, libvlc_picture_type_t picture_type,
                                 libvlc_time_t timeout )
 {
     assert( md );
 
-    vlc_thumbnailer_t *thumb = libvlc_get_thumbnailer(inst);
+    vlc_preparser_t *thumb = libvlc_get_thumbnailer(inst);
     if (unlikely(thumb == NULL))
         return NULL;
 
-    vlc_thumbnailer_SetTimeout( thumb, vlc_tick_from_libvlc_time( timeout ) );
+    vlc_preparser_SetTimeout( thumb, vlc_tick_from_libvlc_time( timeout ) );
 
     libvlc_media_thumbnail_request_t *req = malloc( sizeof( *req ) );
     if ( unlikely( req == NULL ) )
@@ -975,8 +981,8 @@
     static const struct vlc_thumbnailer_cbs cbs = {
         .on_ended = media_on_thumbnail_ready,
     };
-    req->id = vlc_thumbnailer_Request( thumb, md->p_input_item, seek_arg,
-                                       &cbs, req );
+    req->id = vlc_preparser_GenerateThumbnail( thumb, md->p_input_item, thumb_arg,
+                                               &cbs, req );
     if ( req->id == VLC_PREPARSER_REQ_ID_INVALID )
     {
         free( req );
@@ -995,13 +1001,16 @@
                                         bool crop, libvlc_picture_type_t picture_type,
                                         libvlc_time_t timeout )
 {
-    const struct vlc_thumbnailer_seek_arg seek_arg = {
-        .type = VLC_THUMBNAILER_SEEK_TIME,
-        .time = vlc_tick_from_libvlc_time( time ),
-        .speed = speed == libvlc_media_thumbnail_seek_fast ?
-            VLC_THUMBNAILER_SEEK_FAST : VLC_THUMBNAILER_SEEK_PRECISE,
+    const struct vlc_thumbnailer_arg thumb_arg = {
+        .seek = {
+            .type = VLC_THUMBNAILER_SEEK_TIME,
+            .time = vlc_tick_from_libvlc_time( time ),
+            .speed = speed == libvlc_media_thumbnail_seek_fast ?
+                VLC_THUMBNAILER_SEEK_FAST : VLC_THUMBNAILER_SEEK_PRECISE,
+        },
+        .hw_dec = false,
     };
-    return libvlc_media_thumbnail_request( inst, md, &seek_arg, width, height,
+    return libvlc_media_thumbnail_request( inst, md, &thumb_arg, width, height,
                                            crop, picture_type, timeout );
 }
 
@@ -1014,23 +1023,26 @@
                                        bool crop, libvlc_picture_type_t picture_type,
                                        libvlc_time_t timeout )
 {
-    const struct vlc_thumbnailer_seek_arg seek_arg = {
-        .type = VLC_THUMBNAILER_SEEK_POS,
-        .pos = pos,
-        .speed = speed == libvlc_media_thumbnail_seek_fast ?
-            VLC_THUMBNAILER_SEEK_FAST : VLC_THUMBNAILER_SEEK_PRECISE,
+    const struct vlc_thumbnailer_arg thumb_arg = {
+        .seek = {
+            .type = VLC_THUMBNAILER_SEEK_POS,
+            .pos = pos,
+            .speed = speed == libvlc_media_thumbnail_seek_fast ?
+                VLC_THUMBNAILER_SEEK_FAST : VLC_THUMBNAILER_SEEK_PRECISE,
+        },
+        .hw_dec = false,
     };
-    return libvlc_media_thumbnail_request( inst, md, &seek_arg, width, height,
+    return libvlc_media_thumbnail_request( inst, md, &thumb_arg, width, height,
                                            crop, picture_type, timeout );
 }
 
 // Destroy a thumbnail request
 void libvlc_media_thumbnail_request_destroy( libvlc_media_thumbnail_request_t *req )
 {
-    vlc_thumbnailer_t *thumb = libvlc_get_thumbnailer(req->instance);
+    vlc_preparser_t *thumb = libvlc_get_thumbnailer(req->instance);
     assert(thumb != NULL);
 
-    vlc_thumbnailer_Cancel( thumb, req->id );
+    vlc_preparser_Cancel( thumb, req->id );
     libvlc_media_release( req->md );
     libvlc_release(req->instance);
     free( req );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/lib/media_player.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/lib/media_player.c Changed

@@ -695,6 +695,8 @@
     var_Create (mp, "crop", VLC_VAR_STRING);
     var_Create (mp, "deinterlace", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
     var_Create (mp, "deinterlace-mode", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+    var_Create (mp, "projection-mode", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+    var_Create (mp, "video-stereo-mode", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
 
     var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
     var_SetInteger (mp, "vbi-page", 100);
@@ -1134,6 +1136,13 @@
         var_SetString ( mp, "vout", "direct3d9" );
         var_SetString ( mp, "dec-dev", "d3d9" );
     }
+    else if ( engine == libvlc_video_engine_anw )
+    {
+        /* Force android-display is using MediaCodec or fallback to GL (any) */
+        var_SetString ( mp, "vout", "android-display,any" );
+        var_SetString ( mp, "dec-dev", "android" );
+        var_SetString( mp, "window", "android");
+    }
     else if ( engine == libvlc_video_engine_disable )
     {
         // use the default display module
@@ -1401,16 +1410,49 @@
 }
 
 int
-libvlc_media_player_set_abloop( libvlc_media_player_t *p_mi,
-                                libvlc_abloop_t abloop )
+libvlc_media_player_set_abloop_time( libvlc_media_player_t *p_mi,
+                                     libvlc_time_t a_time, libvlc_time_t b_time )
 {
+    vlc_tick_t a_tick = vlc_tick_from_libvlc_time(a_time);
+    if (a_tick >= 0)
+        a_tick += VLC_TICK_0;
+
+    vlc_tick_t b_tick = vlc_tick_from_libvlc_time(b_time);
+    if (b_tick >= 0)
+        b_tick += VLC_TICK_0;
+
     vlc_player_t *player = p_mi->player;
     vlc_player_Lock(player);
 
-    int ret = vlc_player_SetAtoBLoop(player, (int) abloop);
+    int ret = vlc_player_SetAtoBLoopTime(player, a_tick, b_tick);
 
     vlc_player_Unlock(player);
-    return ret;
+    return ret == VLC_SUCCESS ? 0 : -1;
+}
+
+int
+libvlc_media_player_set_abloop_position( libvlc_media_player_t *p_mi,
+                                         double a_pos, double b_pos )
+{
+    vlc_player_t *player = p_mi->player;
+    vlc_player_Lock(player);
+
+    int ret = vlc_player_SetAtoBLoopPosition(player, a_pos, b_pos);
+
+    vlc_player_Unlock(player);
+    return ret == VLC_SUCCESS ? 0 : -1;
+}
+
+int
+libvlc_media_player_reset_abloop( libvlc_media_player_t *p_mi )
+{
+    vlc_player_t *player = p_mi->player;
+    vlc_player_Lock(player);
+
+    int ret = vlc_player_ResetAtoBLoop(player);
+
+    vlc_player_Unlock(player);
+    return ret == VLC_SUCCESS ? 0 : -1;
 }
 
 libvlc_abloop_t

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/lib/media_track.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/lib/media_track.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/lib/video.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/lib/video.c Changed

@@ -8,6 +8,7 @@
  *          Filippo Carone <littlejohn@videolan.org>
  *          Jean-Paul Saman <jpsaman _at_ m2x _dot_ nl>
  *          Damien Fouilleul <damienf a_t videolan dot org>
+ *          Alexandre Janniaux <ajanni@videolabs.io>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
@@ -287,12 +288,11 @@
                                    const libvlc_video_viewpoint_t *p_viewpoint,
                                    bool b_absolute )
 {
-    vlc_viewpoint_t update = {
-        .yaw   = p_viewpoint->f_yaw,
-        .pitch = p_viewpoint->f_pitch,
-        .roll  = p_viewpoint->f_roll,
-        .fov   = p_viewpoint->f_field_of_view,
-    };
+    vlc_viewpoint_t update = { .fov = p_viewpoint->f_field_of_view };
+    vlc_viewpoint_from_euler( &update,
+                              p_viewpoint->f_yaw,
+                              p_viewpoint->f_pitch,
+                              p_viewpoint->f_roll);
 
     enum vlc_player_whence whence = b_absolute ? VLC_PLAYER_WHENCE_ABSOLUTE
                                                : VLC_PLAYER_WHENCE_RELATIVE;
@@ -308,6 +308,35 @@
     return 0;
 }
 
+libvlc_video_stereo_mode_t libvlc_video_get_video_stereo_mode(libvlc_media_player_t *p_mi)
+{
+    static_assert( libvlc_VideoStereoAuto       == VIDEO_STEREO_OUTPUT_AUTO &&
+                   libvlc_VideoStereoStereo     == VIDEO_STEREO_OUTPUT_STEREO &&
+                   libvlc_VideoStereoLeftEye    == VIDEO_STEREO_OUTPUT_LEFT_ONLY &&
+                   libvlc_VideoStereoRightEye   == VIDEO_STEREO_OUTPUT_RIGHT_ONLY &&
+                   libvlc_VideoStereoSideBySide == VIDEO_STEREO_OUTPUT_SIDE_BY_SIDE,
+                   "stereo mode mismatch" );
+
+    return var_GetInteger(p_mi, "video-stereo-mode");
+}
+
+void libvlc_video_set_video_stereo_mode(libvlc_media_player_t *p_mi,
+                                       const libvlc_video_stereo_mode_t i_mode)
+{
+    /* This will work even if the video is not currently active */
+    var_SetInteger(p_mi, "video-stereo-mode", i_mode);
+
+    /* Apply to current video outputs (if any) */
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
+    for (size_t i = 0; i < n; i++)
+    {
+        var_SetInteger (pp_voutsi, "video-stereo-mode", i_mode);
+        vout_Release(pp_voutsi);
+    }
+    free (pp_vouts);
+}
+
 int64_t libvlc_video_get_spu_delay( libvlc_media_player_t *p_mi )
 {
     vlc_player_t *player = p_mi->player;
@@ -864,3 +893,34 @@
 {
     return get_float( p_mi, "adjust", adjust_option_bynumber(option) );
 }
+
+void libvlc_video_unset_projection_mode(libvlc_media_player_t *player)
+{
+    var_SetInteger(player, "projection-mode", -1);
+
+    /* Apply to current video outputs (if any) */
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts(player, &n);
+    for (size_t i = 0; i < n; i++)
+    {
+        var_SetInteger(pp_voutsi, "projection-mode", -1);
+        vout_Release(pp_voutsi);
+    }
+    free (pp_vouts);
+}
+
+void libvlc_video_set_projection_mode(libvlc_media_player_t *player,
+                                      libvlc_video_projection_t projection_mode)
+{
+    var_SetInteger(player, "projection-mode", projection_mode);
+
+    /* Apply to current video outputs (if any) */
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts(player, &n);
+    for (size_t i = 0; i < n; i++)
+    {
+        var_SetInteger(pp_voutsi, "projection-mode", projection_mode);
+        vout_Release(pp_voutsi);
+    }
+    free (pp_vouts);
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/meson.build Changed

@@ -1,9 +1,9 @@
 project('VLC', 'c', 'cpp',
     version: '4.0.0-dev',
     default_options: 'c_std=gnu17', 'cpp_std=c++17',
-    meson_version: '>=0.60.0')
+    meson_version: '>=1.1.0')
 
-vlc_copyright_years = '1996-2018'
+vlc_copyright_years = '1996-2025'
 vlc_version_codename = 'Otto Chriek'
 
 # LibVLC library (ABI) version
@@ -102,6 +102,25 @@
     add_languages('objc', native: false)
 endif
 
+if host_machine.cpu_family().startswith('x86')
+    if add_languages('nasm', native: false, required: false)
+        vlc_nasm_args = 
+        if host_machine.cpu_family() == 'x86'
+            vlc_nasm_args += '-DARCH_X86_64=0'
+            if host_system in 'darwin', 'windows'
+                vlc_nasm_args += '-DPREFIX'
+            endif
+        else
+            vlc_nasm_args += '-DARCH_X86_64=1'
+            if host_system == 'darwin'
+                vlc_nasm_args += '-DPREFIX'
+            endif
+        endif
+        add_project_arguments(vlc_nasm_args, language: 'nasm')
+        cdata.set('HAVE_X86ASM', 1)
+    endif
+endif
+
 # Rust build system
 cargo_bin = find_program('cargo', required: get_option('rust'))
 
@@ -139,6 +158,9 @@
 
 # zlib library
 z_dep = dependency('zlib', required: false)
+if z_dep.found()
+    cdata.set('HAVE_ZLIB', 1)
+endif
 
 # Math library
 m_lib = cc.find_library('m', required: false)
@@ -148,6 +170,14 @@
 
 # iconv library
 iconv_dep = dependency('iconv', required: false)
+if not iconv_dep.found()
+    # check in contribs
+    if cc.has_function('iconv_open', prefix: vlc_conf_prefix + '#include <iconv.h>',
+                       dependencies: contrib_dep, cc.find_library('iconv', dirs: contrib_libdir, required: false))
+        iconv_dep = declare_dependency(
+            dependencies: contrib_dep, cc.find_library('iconv', dirs: contrib_libdir))
+    endif
+endif
 iconv_const_test = '''
     #include <stddef.h>
     #include <iconv.h>
@@ -160,7 +190,7 @@
     cdata.set('HAVE_ICONV', 1)
 
     # Check if iconv() prototype uses const
-    if cc.compiles(iconv_const_test, name: 'Test iconv() for const-using prototype')
+    if cc.compiles(iconv_const_test, name: 'Test iconv() for const-using prototype', dependencies: iconv_dep)
         cdata.set('ICONV_CONST', 'const')
     else
         cdata.set('ICONV_CONST', '')
@@ -214,7 +244,7 @@
     'stdckdint.h',
     'arpa/inet.h',
     'threads.h',
-    'netinet/tcp.h',
+    'netinet/tcp.h', { 'prefix' : '#include <sys/types.h>' },
     'search.h',
     'sys/uio.h',
     'sys/socket.h',
@@ -229,27 +259,31 @@
     'poll.h',
     'sys/auxv.h',
     'sys/eventfd.h',
-    'sys/mount.h',
-    'sys/shm.h',
+    'sys/mount.h', { 'prefix' : '#include <sys/types.h>' },
+    # Android API < 26 doesn't have a correct sys/shm.h implementation
+    # Bionic >= 26 source code also says it's not useful because of SELinux.
+    'sys/shm.h', { 'exclude_host': 'android' },
     'sys/soundcard.h',
     'valgrind/valgrind.h',
     'X11/Xlib.h',
     'xlocale.h',
-    'zlib.h',
+    'zlib.h', { 'args' : contrib_inc_args },
     'wordexp.h',
+    'dxgidebug.h',
     'GL/wglew.h',
         { 'prefix' : '#include <windows.h>', '#include <GL/glew.h>',
           'args' : contrib_inc_args },
 
 
-check_cpp_headers = 
-    'dcomp.h',
-        { 'prefix' : '#include <windows.h>',
-          'args' : contrib_inc_args},
-
+check_cpp_headers = 
 
 foreach header : check_c_headers
     header_kwargs = header.get(1, {})
+
+    if host_system in header_kwargs.get('exclude_host', )
+        continue
+    endif
+
     # TODO: Once we require meson 1.0, drop the array join here
     # See: https://github.com/mesonbuild/meson/pull/11099
     if cc.check_header(header0,
@@ -301,14 +335,6 @@
     have_osx = false
 endif
 
-if have_osx
-    add_project_arguments('-mmacosx-version-min=10.11',
-        language: 'c', 'cpp', 'objc')
-    add_project_link_arguments('-mmacosx-version-min=10.11',
-        language: 'c', 'cpp', 'objc')
-endif
-
-
 #
 # Windows and MinGW checks
 #
@@ -346,11 +372,6 @@
         vlc_conf_prefix = vlc_conf_prefix + '#define @0@ @1@\n'.format(d.get(0), d.get(1))
     endforeach
 
-    # Check for HAVE_PROCESS_MITIGATION_IMAGE_LOAD_POLICY type
-    if cc.has_type('PROCESS_MITIGATION_IMAGE_LOAD_POLICY', prefix: '#include <winnt.h>')
-        cdata.set('HAVE_PROCESS_MITIGATION_IMAGE_LOAD_POLICY', 1)
-    endif
-
     mingw_check = '''
     #ifndef __MINGW32__
     # error Not compiling with mingw
@@ -441,8 +462,7 @@
     if get_option('winstore_app')
         have_win_store = true
         windowsappcompat_lib = cc.find_library('windowsappcompat')
-        # TODO: enable when meson 0.63 is required
-        # add_project_dependencies(windowsappcompat_lib, language: 'c', 'cpp')
+        add_project_dependencies(windowsappcompat_lib, language: 'c', 'cpp')
     else
         have_win_desktop = true
     endif
@@ -464,9 +484,6 @@
     '-Wformat-security',
     '-Wduplicated-branches',
     '-Wduplicated-cond',
-), language: 'c', 'cpp')
-
-add_project_arguments(cc.get_supported_arguments(
     '-Wbad-function-cast',
     '-Wwrite-strings',
     '-Wmissing-prototypes',
@@ -478,19 +495,35 @@
     '-pipe'
 ), language: 'c')
 
+add_project_arguments(cpp.get_supported_arguments(
+    '-Wextra',
+    '-Wsign-compare',
+    '-Wundef',
+    '-Wpointer-arith',
+    '-Wvolatile-register-var',
+    '-Wformat',
+    '-Wformat-security',
+    '-Wduplicated-branches',
+    '-Wduplicated-cond',
+), language: 'cpp')
+
 if get_option('extra_checks')
     add_project_arguments(cc.get_supported_arguments(
         '-Werror=missing-field-initializers',
         '-Werror=format',
-        '-Werror=return-mismatch'
-    ), language: 'c', 'cpp')
-    add_project_arguments(cc.get_supported_arguments(
+        '-Werror=return-mismatch',
         '-Werror=incompatible-pointer-types',
         '-Werror=restrict',
         '-Werror=int-conversion',
         '-Werror=implicit-int',
-        '-Werror=declaration-missing-parameter-type'
+        '-Werror=declaration-missing-parameter-type',
+        '-Werror=excess-initializers',
     ), language: 'c')
+    add_project_arguments(cpp.get_supported_arguments(
+        '-Werror=missing-field-initializers',
+        '-Werror=format',
+        '-Werror=excess-initializers',
+    ), language: 'cpp')
 endif
 
 if get_option('branch_protection') \
@@ -512,7 +545,10 @@
 # Check if other libs are needed
 #
 rt_lib = 
-possible_rt_libs = 'rt', 'pthread'
+possible_rt_libs = 'rt'
+if host_system != 'windows'
+    possible_rt_libs += 'pthread'
+endif
 foreach l : possible_rt_libs
     possible_rt_lib_lib = cc.find_library(l, required: false)
     if possible_rt_lib_lib.found() and \
@@ -860,19 +896,16 @@
 
 # Check for struct sockaddr_storage type
 # Define it to `sockaddr` if missing
-have_sockaddr_storage = cc.has_type('struct sockaddr_storage', prefix: '#include <sys/socket.h>')
-
-if not have_sockaddr_storage
-    have_sockaddr_storage = cc.has_type('struct sockaddr_storage', prefix: '#include <winsock2.h>')
+sockaddr_prefix = '#include <sys/types.h>\n'
+if host_system == 'windows'
+    sockaddr_prefix += '#include <winsock2.h>'
+else
+    sockaddr_prefix += '#include <sys/socket.h>'
 endif
 
+have_sockaddr_storage = cc.has_type('struct sockaddr_storage', prefix: sockaddr_prefix)
 if not have_sockaddr_storage
     cdata.set('sockaddr_storage', 'sockaddr')
-endif
-
-# Check for struct ss_family type
-# Define it to `sa_family` if missing
-if not cc.has_type('struct ss_family', prefix: '#include <sys/socket.h>')
     cdata.set('ss_family', 'sa_family')
 endif
 
@@ -942,7 +975,7 @@
 cdata.set('PACKAGE_VERSION_MINOR',      vlc_version_minor)
 cdata.set('PACKAGE_VERSION_REVISION',   vlc_version_revision)
 cdata.set('PACKAGE_VERSION_EXTRA',      vlc_version_extra)
-cdata.set('PACKAGE_VERSION_DEV',        vlc_version_type)
+cdata.set_quoted('PACKAGE_VERSION_DEV', vlc_version_type)
 
 cdata.set('LIBVLC_ABI_MAJOR', libvlc_abi_version_major)
 cdata.set('LIBVLC_ABI_MINOR', libvlc_abi_version_minor)
@@ -981,7 +1014,9 @@
 cdata.set_quoted('LOCALEDIR', localedir_path)
 
 # Enable stream outputs
-cdata.set('ENABLE_SOUT', get_option('stream_outputs'))
+if get_option('stream_outputs')
+    cdata.set('ENABLE_SOUT', 1)
+endif
 
 # Enable VLM
 if get_option('videolan_manager')
@@ -993,10 +1028,14 @@
 
 # Allow running as root
 # (useful for people running on embedded platforms)
-cdata.set('ALLOW_RUN_AS_ROOT', get_option('run_as_root'))
+if get_option('run_as_root')
+    cdata.set('ALLOW_RUN_AS_ROOT', 1)
+endif
 
 # Optimize for memory usage vs speed
-cdata.set('OPTIMIZE_MEMORY', get_option('optimize_memory'))
+if get_option('optimize_memory')
+    cdata.set('OPTIMIZE_MEMORY', 1)
+endif
 
 # Allow binary package maintainer to pass a custom string
 # to avoid cache problem
@@ -1004,6 +1043,10 @@
     cdata.set_quoted('DISTRO_VERSION', get_option('binary_version'))
 endif
 
+if get_option('css_engine').allowed()
+    cdata.set('HAVE_CSS', 1)
+endif
+
 
 # Font options
 if get_option('default_font_path') != ''
@@ -1022,7 +1065,12 @@
     cdata.set_quoted('DEFAULT_MONOSPACE_FAMILY', get_option('default_monospace_font_family'))
 endif
 
-gcrypt_dep = dependency('libgcrypt', required: get_option('libgcrypt'))
+gcrypt_dep = dependency('libgcrypt',
+                         version: '>= 1.6.0',
+                         required: get_option('libgcrypt'))
+if gcrypt_dep.found()
+    cdata.set('HAVE_GCRYPT', 1)
+endif
 
 # Flex/Bison support
 # This defines the `bison_gen` and `flex_gen` generator variables to be used
@@ -1041,11 +1089,6 @@
         arguments: '-o', '@OUTPUT@', '@INPUT@')
 endif
 
-# Generate config.h
-configure_file(input: 'config.h.meson',
-  output: 'config.h',
-  configuration: cdata)
-
 # Some missing functions are implemented in compat
 subdir('compat')
 
@@ -1064,6 +1107,11 @@
 # VLC plugins
 subdir('modules')
 
+# Generate config.h
+configure_file(input: 'config.h.meson',
+  output: 'config.h',
+  configuration: cdata)
+
 if (get_option('tests').allowed())
     # Integration and non-regression tests, some unittest are there too but the
     # modules/, src/ and lib/ folders should be favoured for those.

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/meson_options.txt -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/meson_options.txt Changed

@@ -65,6 +65,11 @@
     value : false,
     description : 'Build targeted for Windows Store apps')
 
+option('update-check',
+    type : 'feature',
+    value : 'disabled',
+    description : 'update checking system')
+
 option('rust',
     type : 'feature',
     value : 'disabled',
@@ -80,15 +85,19 @@
     value : 'no',
     description : 'Should use vendored sources: `no`, `yes` or PATH_TO_VENDORED_SOURCES')
 
-# TODO: Missing pdb option, this should probably be solved in meson itself
+option('sse',
+    type : 'feature',
+    value : 'auto',
+    description : 'SSE (2-4) optimizations')
+
+option('avx',
+    type : 'feature',
+    value : 'auto',
+    description : 'AVX (1-2) optimizations')
 
-# TODO: Missing ssp option
-# TODO: Missing sse option
-# TODO: Missing avx option
 # TODO: Missing neon option
 # TODO: Missing sve option
 # TODO: Missing altivec option
-# TODO: Missing update-check option
 
 # Font options
 
@@ -145,6 +154,11 @@
     value: false,
     description: 'Enable/disable Qt QML debugger')
 
+option('skins2',
+    type : 'feature',
+    value : 'auto',
+    description : 'skins interface module support')
+
 option('dbus',
     type : 'feature',
     value : 'auto',
@@ -170,6 +184,11 @@
     value : 'enabled',
     description : 'Enable/disable avcodec support')
 
+option('merge-ffmpeg',
+    type : 'boolean',
+    value : false,
+    description : 'merge FFmpeg-based plugins')
+
 option('libva',
     type: 'feature',
     value: 'auto',
@@ -200,6 +219,11 @@
     value: 'auto',
     description: 'Enable/disable OSS support (default-enabled on BSD)')
 
+option('sndio',
+    type : 'feature',
+    value : 'auto',
+    description : 'Enable/disable sndio support')
+
 option('ogg',
     type : 'feature',
     value : 'auto',
@@ -252,13 +276,13 @@
 
 option('daaladec',
     type : 'feature',
-    value : 'auto',
-    description : 'Enable/disable daaladec support')
+    value : 'disabled',
+    description : 'Enable/disable experimental daaladec support')
 
 option('daalaenc',
     type : 'feature',
-    value : 'auto',
-    description : 'Enable/disable daalaenc support')
+    value : 'disabled',
+    description : 'Enable/disable experimental daalaenc support')
 
 option('vorbis',
     type : 'feature',
@@ -320,10 +344,10 @@
     value : 'auto',
     description : 'Enable/disable twolame support')
 
-option('mfx',
+option('vpl',
     type : 'feature',
     value : 'auto',
-    description : 'Enable/disable libmfx support')
+    description : 'Enable/disable libvpl support')
 
 option('spatialaudio',
     type : 'feature',
@@ -340,6 +364,11 @@
     value : 'auto',
     description : 'Enable/disable soxr support')
 
+option('speex',
+    type : 'feature',
+    value : 'auto',
+    description : 'Enable/disable speex support')
+
 option('speexdsp',
     type : 'feature',
     value : 'auto',
@@ -415,6 +444,11 @@
     value : 'auto',
     description : 'Enable/disable libdvbpsi support')
 
+option('dvbcsa',
+    type : 'feature',
+    value : 'auto',
+    description : 'Enable/disable libdvbcsa support')
+
 option('aribb24',
     type : 'feature',
     value : 'auto',
@@ -615,6 +649,16 @@
     value: 'auto',
     description: 'Linux udev services discovery')
 
+option('dsm',
+    type: 'feature',
+    value: 'auto',
+    description: 'SMB/CIFS access/sd support')
+
+option('live555',
+    type: 'feature',
+    value: 'auto',
+    description: 'RTSP input through live555')
+
 option('rist',
     type: 'feature',
     value: 'auto',
@@ -640,41 +684,116 @@
     value: 'auto',
     description: 'Harfbuzz support')
 
-# TODO: Missing live555
+option('d3d11va',
+    type: 'feature',
+    value: 'auto',
+    description: 'Direct3D11 avcodec support')
+
+option('dxva2',
+    type: 'feature',
+    value: 'auto',
+    description: 'DXVA2 avcodec support')
+
+option('amf_scaler',
+    type: 'feature',
+    value: 'auto',
+    description: 'AMF HQScaler support')
+
+option('amf_frc',
+    type: 'feature',
+    value: 'auto',
+    description: 'AMF Frame Doubler support')
+
+option('amf_vqenhancer',
+    type: 'feature',
+    value: 'auto',
+    description: 'AMF VQ Enhancer support')
+
+option('directx',
+    type: 'feature',
+    value: 'auto',
+    description: 'DirectX support')
+
+option('projectm',
+    type: 'feature',
+    value: 'auto',
+    description: 'projectM visualization plugin')
+
+option('libssh2',
+    type: 'feature',
+    value: 'auto',
+    description: 'libssh2 support')
+
+option('sftp',
+    type: 'feature',
+    value: 'auto',
+    description: 'SFTP file transfer via libssh2')
+
+option('archive',
+    type: 'feature',
+    value: 'auto',
+    description: 'libarchive support')
+
+option('aribb25',
+    type: 'feature',
+    value: 'auto',
+    description: 'ARIB STD-B25 support')
+
+option('aribcaption',
+    type: 'feature',
+    value: 'auto',
+    description: 'ARIB caption decoder/renderer support')
+
+option('gme',
+    type: 'feature',
+    value: 'auto',
+    description: 'Game Music Emu support')
+
+option('mpc',
+    type: 'feature',
+    value: 'auto',
+    description: 'libmpcdec support')
+
+option('sid',
+    type: 'feature',
+    value: 'auto',
+    description: 'C64 sid demux support')
+
+option('nvdec',
+    type: 'feature',
+    value: 'auto',
+    description: 'NVDEC decoder support')
+
+option('decklink',
+    type: 'feature',
+    value: 'auto',
+    description: 'DeckLink support')
+
+option('nfs',
+    type: 'feature',
+    value: 'auto',
+    description: 'support nfs protocol via libnfs')
+
 # TODO: Missing v4l2
-# TODO: Missing nvdec
-# TODO: Missing decklink
-# TODO: Missing gme
-# TODO: Missing sid
-# TODO: Missing mpc
 # TODO: Missing rpi-omxil
 # TODO: Missing gst-decode
-# TODO: Missing merge-ffmpeg
 # TODO: Missing libva
-# TODO: Missing dxva2
-# TODO: Missing d3d11va
 # TODO: Missing tremor
 # TODO: Missing x26410b
 # TODO: Missing vdpau
-# TODO: Missing directx
 # TODO: Missing kva
 # TODO: Missing mmal
-# TODO: Missing sndio
 # TODO: Missing jack
 # TODO: Missing opensles
 # TODO: Missing kai
 # TODO: Missing qt-qml-cache
 # TODO: Missing qt-qml-debug
-# TODO: Missing skins2
 # TODO: Missing libtar
 # TODO: Missing macosx
 # TODO: Missing sparkle
 # TODO: Missing lirc
-# TODO: Missing projectm
 # TODO: Missing vsxu
 # TODO: Missing kwallet
 # TODO: Missing osx_notifications
-# TODO: Missing dsm
 # TODO: Missing asdcplib
-# TODO: Missing faad2
 # TODO: Missing chromecast

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/amt.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/amt.c Changed

@@ -293,19 +293,10 @@
     vlc_timer_t updateTimer;
 
     /* Mulicast group and source, differentiate between address family based on the sa_family which is the first field (sin_family or sin6_family) in both structs */
-    union {
-        struct sockaddr_in ipv4;
-        struct sockaddr_in6 ipv6;
-    } mcastGroupAddr;
-    union {
-        struct sockaddr_in ipv4;
-        struct sockaddr_in6 ipv6;
-    } mcastSrcAddr;
+    vlc_sockaddr mcastGroupAddr;
+    vlc_sockaddr mcastSrcAddr;
     /* AMT relay imformation */
-    union {
-        struct sockaddr_in ipv4;
-        struct sockaddr_in6 ipv6;
-    } relayDiscoAddr;
+    vlc_sockaddr relayDiscoAddr;
 
     /* AMT Relay Membership Query data (RFC7450) */
     struct relay_mem_query_msg_t {
@@ -477,12 +468,12 @@
     /* Store the binary socket representation of multicast group address */
     if ( serverinfo->ai_family == AF_INET )
     {
-        sys->mcastGroupAddr.ipv4 = *(struct sockaddr_in*)serverinfo->ai_addr;
+        sys->mcastGroupAddr.sin = *(struct sockaddr_in*)serverinfo->ai_addr;
         hints.ai_family = AF_INET; /* now that we know family of the group we can improve the hints for resolving the source */
     }
     else
     {
-        sys->mcastGroupAddr.ipv6 = *(struct sockaddr_in6*)serverinfo->ai_addr;
+        sys->mcastGroupAddr.sin6 = *(struct sockaddr_in6*)serverinfo->ai_addr;
         hints.ai_family = AF_INET6;
     }
     /* Release the allocated memory */
@@ -546,9 +537,9 @@
         /* Store the binary socket representation of multicast source address */
         if ( serverinfo->ai_family == AF_INET )
         {
-            sys->mcastSrcAddr.ipv4 = *(struct sockaddr_in*)serverinfo->ai_addr;
+            sys->mcastSrcAddr.sin = *(struct sockaddr_in*)serverinfo->ai_addr;
         } else {
-            sys->mcastSrcAddr.ipv6 = *(struct sockaddr_in6*)serverinfo->ai_addr;
+            sys->mcastSrcAddr.sin6 = *(struct sockaddr_in6*)serverinfo->ai_addr;
         }
         msg_Dbg( p_access, "Setting multicast source address to %s", mcastSrc);
     }
@@ -665,7 +656,7 @@
 {
     access_sys_t *sys = p_access->p_sys;
     ssize_t len = 0, shift = 0;
-    int tunnel = UDP_HDR_LEN + AMT_HDR_LEN + (sys->mcastGroupAddr.ipv4.sin_family == AF_INET ? IP_HDR_LEN : IPv6_FIXED_HDR_LEN );
+    int tunnel = UDP_HDR_LEN + AMT_HDR_LEN + (sys->mcastGroupAddr.sin.sin_family == AF_INET ? IP_HDR_LEN : IPv6_FIXED_HDR_LEN );
 
     /* Allocate anticipated MTU buffer for holding the UDP packet suitable for native or AMT tunneled multicast */
     block_t *pkt = block_Alloc( sys->mtu + tunnel );
@@ -821,7 +812,7 @@
     /* Otherwise pull native multicast */
         struct sockaddr temp;
         socklen_t temp_size = sizeof( struct sockaddr );
-        len = recvfrom( sys->fd, (char *)pkt->p_buffer, sys->mtu + tunnel, 0, (struct sockaddr*)&temp, &temp_size );
+        len = recvfrom( sys->fd, (char *)pkt->p_buffer, sys->mtu + tunnel, 0, &temp, &temp_size );
         if ( len <= 0 )
         {
             msg_Err(p_access, "recv() call failed: %zd was returned", len);
@@ -894,9 +885,9 @@
         /* Store the binary representation */
         if ( server->ai_family == AF_INET )
         {
-            sys->relayDiscoAddr.ipv4 = *(struct sockaddr_in*)server_addr;
+            sys->relayDiscoAddr.sin = *(struct sockaddr_in*)server_addr;
         } else {
-            sys->relayDiscoAddr.ipv6 = *(struct sockaddr_in6*)server_addr;
+            sys->relayDiscoAddr.sin6 = *(struct sockaddr_in6*)server_addr;
         }
 
         if( amt_sockets_init( p_access ) != 0 )
@@ -942,8 +933,8 @@
 
             /* Arm IGMP timer once we've confirmed we are getting packets */
             vlc_timer_schedule( sys->updateTimer, false,
-                        VLC_TICK_FROM_SEC( sys->relayDiscoAddr.ipv4.sin_family == AF_INET ? sys->relay_query.igmp.qqic : sys->relay_query.mld.qqic), 0 );
-            msg_Err(p_access, "Arming timer. qqic is %d",sys->relayDiscoAddr.ipv4.sin_family == AF_INET ? sys->relay_query.igmp.qqic : sys->relay_query.mld.qqic);
+                        VLC_TICK_FROM_SEC( sys->relayDiscoAddr.sin.sin_family == AF_INET ? sys->relay_query.igmp.qqic : sys->relay_query.mld.qqic), 0 );
+            msg_Err(p_access, "Arming timer. qqic is %d",sys->relayDiscoAddr.sin.sin_family == AF_INET ? sys->relay_query.igmp.qqic : sys->relay_query.mld.qqic);
 
             break;   /* found an active server sending UDP packets, so exit loop */
         }
@@ -1132,16 +1123,12 @@
  */
 static int amt_sockets_init( stream_t *p_access )
 {
-    struct sockaddr *rcvAddr;
-    struct sockaddr_in rcvAddr4;
-    struct sockaddr_in6 rcvAddr6;
+    vlc_sockaddr rcvAddr = {0};
     access_sys_t *sys = p_access->p_sys;
-    memset( &rcvAddr4, 0, sizeof(struct sockaddr_in) );
-    memset( &rcvAddr6, 0, sizeof(struct sockaddr_in6) );
     int enable = 0, res = 0;
 
     /* create UDP socket */
-    sys->sAMT = vlc_socket( sys->relayDiscoAddr.ipv4.sin_family, SOCK_DGRAM, IPPROTO_UDP, true );
+    sys->sAMT = vlc_socket( sys->relayDiscoAddr.sin.sin_family, SOCK_DGRAM, IPPROTO_UDP, true );
     if( sys->sAMT == -1 )
     {
         msg_Err( p_access, "Failed to create UDP socket" );
@@ -1155,23 +1142,29 @@
         goto error;
     }
 
-    rcvAddr4.sin_family      = AF_INET;
-    rcvAddr4.sin_port        = htons( 0 );
-    rcvAddr4.sin_addr.s_addr = INADDR_ANY;
-
-    rcvAddr6.sin6_family      = AF_INET6;
-    rcvAddr6.sin6_port        = htons( 0 );
-    rcvAddr6.sin6_addr = (struct in6_addr) IN6ADDR_ANY_INIT;
-
-    rcvAddr = sys->relayDiscoAddr.ipv4.sin_family == AF_INET ? (struct sockaddr*) &rcvAddr4 : (struct sockaddr*) &rcvAddr6;
+    socklen_t rcvNamelen;
+    if (sys->relayDiscoAddr.sin.sin_family == AF_INET)
+    {
+        rcvNamelen                  = sizeof(rcvAddr.sin);
+        rcvAddr.sin.sin_family      = AF_INET;
+        rcvAddr.sin.sin_port        = htons( 0 );
+        rcvAddr.sin.sin_addr.s_addr = INADDR_ANY;
+    }
+    else
+    {
+        rcvNamelen                  = sizeof(rcvAddr.sin6);
+        rcvAddr.sin6.sin6_family    = AF_INET6;
+        rcvAddr.sin6.sin6_port      = htons( 0 );
+        rcvAddr.sin6.sin6_addr      = (struct in6_addr) IN6ADDR_ANY_INIT;
+    }
 
-    if( bind(sys->sAMT, rcvAddr, sys->relayDiscoAddr.ipv4.sin_family == AF_INET ? sizeof(rcvAddr4) : sizeof(rcvAddr6) ) != 0 )
+    if( bind(sys->sAMT, &rcvAddr.sa, rcvNamelen ) != 0 )
     {
         msg_Err( p_access, "Failed to bind UDP socket error: %s", vlc_strerror(errno) );
         goto error;
     }
 
-    sys->sQuery = vlc_socket( sys->relayDiscoAddr.ipv4.sin_family, SOCK_DGRAM, IPPROTO_UDP, true );
+    sys->sQuery = vlc_socket( sys->relayDiscoAddr.sin.sin_family, SOCK_DGRAM, IPPROTO_UDP, true );
     if( sys->sQuery == -1 )
     {
         msg_Err( p_access, "Failed to create query socket" );
@@ -1179,22 +1172,24 @@
     }
 
     /* bind socket to local address */
-    struct sockaddr_in stLocalAddr4 =
+    vlc_sockaddr stLocalAddr = {0};
+    socklen_t stLocalNamelen;
+    if (sys->relayDiscoAddr.sin.sin_family == AF_INET)
     {
-        .sin_family      = AF_INET,
-        .sin_port        = htons( 0 ),
-        .sin_addr.s_addr = INADDR_ANY,
-    };
-
-    struct sockaddr_in6 stLocalAddr6;
-    memset( &rcvAddr6, 0, sizeof(struct sockaddr_in6) );
-    stLocalAddr6.sin6_family = AF_INET6;
-    stLocalAddr6.sin6_port = htons( 0 );
-    stLocalAddr6.sin6_addr = (struct in6_addr) IN6ADDR_ANY_INIT;
-
-    struct sockaddr *stLocalAddr = sys->relayDiscoAddr.ipv4.sin_family == AF_INET ? (struct sockaddr*) &stLocalAddr4 : (struct sockaddr*) &stLocalAddr6;
+        stLocalNamelen                  = sizeof(stLocalAddr.sin);
+        stLocalAddr.sin.sin_family      = AF_INET;
+        stLocalAddr.sin.sin_port        = htons( 0 );
+        stLocalAddr.sin.sin_addr.s_addr = INADDR_ANY;
+    }
+    else
+    {
+        stLocalNamelen               = sizeof(stLocalAddr.sin6);
+        stLocalAddr.sin6.sin6_family = AF_INET6;
+        stLocalAddr.sin6.sin6_port   = htons( 0 );
+        stLocalAddr.sin6.sin6_addr   = (struct in6_addr) IN6ADDR_ANY_INIT;
+    }
 
-    if( bind(sys->sQuery, stLocalAddr, sys->relayDiscoAddr.ipv4.sin_family == AF_INET ? sizeof(stLocalAddr4) : sizeof(stLocalAddr6) ) != 0 )
+    if( bind(sys->sQuery, &stLocalAddr.sa, stLocalNamelen ) != 0 )
     {
         msg_Err( p_access, "Failed to bind query socket" );
         goto error;
@@ -1250,7 +1245,7 @@
     sys->glob_ulNonce = ulNonce;
 
     /* send it */
-    nRet = sendto( sys->sAMT, chaSendBuffer, sizeof(chaSendBuffer), 0, (struct sockaddr*) &sys->relayDiscoAddr, sys->relayDiscoAddr.ipv4.sin_family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6));
+    nRet = sendto( sys->sAMT, chaSendBuffer, sizeof(chaSendBuffer), 0, &sys->relayDiscoAddr.sa, sys->relayDiscoAddr.sin.sin_family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6));
 
     if( nRet < 0)
     {
@@ -1296,7 +1291,7 @@
      */
 
     chaSendBuffer0 = AMT_REQUEST;
-    chaSendBuffer1 = sys->mcastGroupAddr.ipv4.sin_family == AF_INET6;
+    chaSendBuffer1 = sys->mcastGroupAddr.sin.sin_family == AF_INET6;
     chaSendBuffer2 = 0;
     chaSendBuffer3 = 0;
 
@@ -1319,7 +1314,7 @@
  * Returns: the number of bytes written on success, else 0
  */
 
-static int serialize_ipv6_pkt(amt_ipv6_t *ip, uint8_t *buf, int buflen){
+static int serialize_ipv6_pkt(amt_ipv6_t *ip, char *buf, int buflen){
     if ( buflen < IPv6_HOP_BY_HOP_OPTION_LEN + IPv6_FIXED_HDR_LEN )
     {
         return 0;
@@ -1361,7 +1356,7 @@
  * Returns: the number of bytes written on success, else 0
  */
 
-static int serialize_mld_report(amt_mldv2_listener_report_t *report, uint8_t *buf, int buflen, stream_t *p_access){
+static int serialize_mld_report(amt_mldv2_listener_report_t *report, char *buf, int buflen, stream_t *p_access){
     if ( buflen < MLD_REPORT_LEN )
     {
         return 0;
@@ -1421,7 +1416,7 @@
     ulNonce = sys->glob_ulNonce;
     memcpy( &pSendBuffer8, &ulNonce, NONCE_LEN );
 
-    if ( sys->mcastGroupAddr.ipv4.sin_family == AF_INET )
+    if ( sys->mcastGroupAddr.sin.sin_family == AF_INET )
     {
         /* make IP header for IGMP packet */
         amt_ip_alert_t p_ipHead;
@@ -1440,13 +1435,13 @@
 
         amt_igmpv3_groupRecord_t groupRcd;
         groupRcd.auxDatalen = 0;
-        groupRcd.ssm = sys->mcastGroupAddr.ipv4.sin_addr.s_addr;
+        groupRcd.ssm = sys->mcastGroupAddr.sin.sin_addr.s_addr;
 
-        if( sys->mcastSrcAddr.ipv4.sin_addr.s_addr )
+        if( sys->mcastSrcAddr.sin.sin_addr.s_addr )
         {
             groupRcd.type = leave ? AMT_IGMP_BLOCK:AMT_IGMP_INCLUDE;
             groupRcd.nSrc = htons(1);
-            groupRcd.srcIP0 = sys->mcastSrcAddr.ipv4.sin_addr.s_addr;
+            groupRcd.srcIP0 = sys->mcastSrcAddr.sin.sin_addr.s_addr;
 
         }
         else
@@ -1487,7 +1482,7 @@
 
         make_ipv6(&ip, IPv6_HOP_BY_HOP_OPTION_LEN + MLD_REPORT_LEN, &tmp);
 
-        if( make_mld_report(p_access,leave,&report,&sys->mcastGroupAddr.ipv6.sin6_addr,&sys->mcastSrcAddr.ipv6.sin6_addr) )
+        if( make_mld_report(p_access,leave,&report,&sys->mcastGroupAddr.sin6.sin6_addr,&sys->mcastSrcAddr.sin6.sin6_addr) )
         {
             goto oom;
         }
@@ -1581,18 +1576,27 @@
         return false;
     }
 
-    struct sockaddr_in relayAddr4;
-    relayAddr4.sin_port = htons( AMT_PORT );
-    relayAddr4.sin_family = AF_INET;
-
-    struct sockaddr_in6 relayAddr6;
-    relayAddr6.sin6_port = htons( AMT_PORT );
-    relayAddr6.sin6_family = AF_INET6;
+    vlc_sockaddr relayAddr = {0};
+    socklen_t relayNamelen;
+    void *bin_address_start;
+    if (sys->relayDiscoAddr.sin.sin_family == AF_INET)
+    {
+        relayNamelen               = sizeof(relayAddr.sin);
+        bin_address_start          = &relayAddr.sin.sin_addr;
+        relayAddr.sin.sin_port     = htons( AMT_PORT );
+        relayAddr.sin.sin_family   = AF_INET;
+    }
+    else
+    {
+        relayNamelen               = sizeof(relayAddr.sin6);
+        bin_address_start          = &relayAddr.sin6.sin6_addr;
+        relayAddr.sin6.sin6_port   = htons( AMT_PORT );
+        relayAddr.sin6.sin6_family = AF_INET6;
+    }
 
-    void *bin_address_start = (sys->relayDiscoAddr.ipv4.sin_family == AF_INET) ? (void*) &relayAddr4.sin_addr : (void*) &relayAddr6.sin6_addr;
-    memcpy( bin_address_start , &pkt8, sys->relayDiscoAddr.ipv4.sin_family == AF_INET ? 4 : 16);
+    memcpy( bin_address_start , &pkt8, sys->relayDiscoAddr.sin.sin_family == AF_INET ? 4 : 16);
 
-    int nRet = connect( sys->sAMT, sys->relayDiscoAddr.ipv4.sin_family == AF_INET ? (struct sockaddr*)&relayAddr4 : (struct sockaddr*)&relayAddr6, sys->relayDiscoAddr.ipv4.sin_family == AF_INET ? sizeof(relayAddr4) : sizeof(relayAddr6) );
+    int nRet = connect( sys->sAMT, &relayAddr.sa, relayNamelen );
     if( nRet < 0 )
     {
         msg_Err( p_access, "Error connecting AMT UDP socket: %s", vlc_strerror(errno) );
@@ -1649,7 +1653,7 @@
 
     ssize_t len = recv( sys->sAMT, pkt, i_buf_len, 0 );
 
-    if ( len <= 0 || (sys->mcastGroupAddr.ipv4.sin_family == AF_INET && len != (RELAY_QUERY_MSG_LEN - 40)) || (sys->mcastGroupAddr.ipv4.sin_family == AF_INET6 && len < RELAY_QUERY_MSG_LEN) ) /* subtract 40 for ipv4 case */
+    if ( len <= 0 || (sys->mcastGroupAddr.sin.sin_family == AF_INET && len != (RELAY_QUERY_MSG_LEN - 40)) || (sys->mcastGroupAddr.sin.sin_family == AF_INET6 && len < RELAY_QUERY_MSG_LEN) ) /* subtract 40 for ipv4 case */
     {
         msg_Err(p_access, "length of relay query message invalid!");
         return false;
@@ -1665,7 +1669,7 @@
         return false;
     }
 
-    if ( sys->mcastGroupAddr.ipv4.sin_family == AF_INET )
+    if ( sys->mcastGroupAddr.sin.sin_family == AF_INET )
     {
         size_t shift = AMT_HDR_LEN + MAC_LEN + NONCE_LEN + IP_HDR_IGMP_LEN;
         sys->relay_query.igmp.type = pktshift;
@@ -1754,5 +1758,5 @@
     /* Arms the timer again for a single shot from this callback. That way, the
      * time spent in amt_send_mem_update() is taken into consideration. */
     vlc_timer_schedule( sys->updateTimer, false,
-                        VLC_TICK_FROM_SEC( sys->mcastGroupAddr.ipv4.sin_family == AF_INET ? sys->relay_query.igmp.qqic : sys->relay_query.mld.qqic), 0 );
+                        VLC_TICK_FROM_SEC( sys->mcastGroupAddr.sin.sin_family == AF_INET ? sys->relay_query.igmp.qqic : sys->relay_query.mld.qqic), 0 );
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/bluray.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/bluray.c Changed

@@ -51,7 +51,7 @@
 #include <vlc_url.h>                        /* vlc_path2uri */
 #include <vlc_iso_lang.h>
 #include <vlc_fs.h>
-#include <vlc_subpicture.h> // vlc_spu_highlight_t
+#include <vlc_subpicture.h>
 
 #include "../demux/mpeg/timestamps.h"
 #include "../demux/timestamps_filter.h"
@@ -1585,13 +1585,9 @@
 }
 
 static void subpictureUpdaterUpdate(subpicture_t *p_subpic,
-                                    const video_format_t *prev_src, const video_format_t *p_fmt_src,
-                                    const video_format_t *prev_dst, const video_format_t *p_fmt_dst,
-                                    vlc_tick_t i_ts)
-{
-    VLC_UNUSED(prev_src); VLC_UNUSED(p_fmt_src);
-    VLC_UNUSED(prev_dst); VLC_UNUSED(p_fmt_dst);
-    VLC_UNUSED(i_ts);
+                                    const struct vlc_spu_updater_configuration *cfg)
+{
+    VLC_UNUSED(cfg);
 
     bluray_spu_updater_sys_t *p_upd_sys = p_subpic->updater.sys;
     bluray_overlay_t         *p_overlay = updater_lock_overlay(p_upd_sys);
@@ -1619,7 +1615,7 @@
         if (p_dst == NULL)
             break;
 
-        p_dst->b_absolute = p_src->b_absolute;
+        p_dst->b_absolute = true; p_dst->b_in_window = false;
         p_dst->i_x      = p_src->i_x;
         p_dst->i_y      = p_src->i_y;
         // fields not modified on the source
@@ -1876,7 +1872,6 @@
 
         p_reg = subpicture_region_New(&fmt);
         if (p_reg) {
-            p_reg->b_absolute = true;
             p_reg->i_x = eventov->x;
             p_reg->i_y = eventov->y;
             /* Append it to our list. */
@@ -1997,7 +1992,6 @@
             vlc_mutex_unlock(&ov->lock);
             return;
         }
-        p_reg->b_absolute = true;
         p_reg->i_x = 0;
         p_reg->i_y = 0;
         vlc_spu_regions_push(&ov->regions, p_reg);
@@ -2773,8 +2767,7 @@
         streamFlush(p_sys);
 
         /* stop buffering */
-        bool b_empty;
-        es_out_Control( p_demux->out, ES_OUT_GET_EMPTY, &b_empty );
+        es_out_Control( p_demux->out, ES_OUT_DRAIN );
     }
 
     /* avoid busy loops (read returns no data) */
@@ -3034,8 +3027,12 @@
 
     if(p_sys->b_draining)
     {
-        bool b_empty = false;
-        if(es_out_Control(p_sys->p_out, ES_OUT_GET_EMPTY, &b_empty) != VLC_SUCCESS || b_empty)
+        int ret = es_out_Control(p_sys->p_out, ES_OUT_DRAIN);
+
+        bool b_empty = true;
+        if (ret == VLC_SUCCESS)
+            es_out_Control(p_sys->p_out, ES_OUT_IS_EMPTY, &b_empty);
+        if (b_empty)
         {
             es_out_Control(p_sys->p_out, ES_OUT_RESET_PCR);
             p_sys->b_draining = false;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/cache.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/cache.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/decklink.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/decklink.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/dtv/bdagraph.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/dtv/bdagraph.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/dtv/bdagraph.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/dtv/bdagraph.hpp Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/dtv/qedit.h Added

@@ -0,0 +1,281 @@
+/*****************************************************************************
+ * qedit.h : DirectShow BDA headers for vlc
+ *****************************************************************************
+ * Copyright (C) 2007 the VideoLAN team
+ *
+ * Author: Ken Self <kenself(at)optusnet(dot)com(dot)au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include <mpeg2structs.h>
+
+#ifndef __ISampleGrabberCB_FWD_DEFINED__
+#define __ISampleGrabberCB_FWD_DEFINED__
+typedef interface ISampleGrabberCB ISampleGrabberCB;
+#ifdef __cplusplus
+interface ISampleGrabberCB;
+#endif /* __cplusplus */
+#endif
+
+#ifndef __ISampleGrabber_FWD_DEFINED__
+#define __ISampleGrabber_FWD_DEFINED__
+typedef interface ISampleGrabber ISampleGrabber;
+#ifdef __cplusplus
+interface ISampleGrabber;
+#endif /* __cplusplus */
+#endif
+
+
+/*****************************************************************************
+ * ISampleGrabberCB interface
+ */
+#ifndef __ISampleGrabberCB_INTERFACE_DEFINED__
+#define __ISampleGrabberCB_INTERFACE_DEFINED__
+
+DEFINE_GUID(IID_ISampleGrabberCB, 0x0579154a, 0x2b53, 0x4994, 0xb0,0xd0, 0xe7,0x73,0x14,0x8e,0xff,0x85);
+#if defined(__cplusplus) && !defined(CINTERFACE)
+MIDL_INTERFACE("0579154a-2b53-4994-b0d0-e773148eff85")
+ISampleGrabberCB : public IUnknown
+{
+    virtual HRESULT STDMETHODCALLTYPE SampleCB(
+        double SampleTime,
+        IMediaSample *pSample) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE BufferCB(
+        double SampleTime,
+        BYTE *pBuffer,
+        LONG BufferLen) = 0;
+
+};
+#ifdef __CRT_UUID_DECL
+__CRT_UUID_DECL(ISampleGrabberCB, 0x0579154a, 0x2b53, 0x4994, 0xb0,0xd0, 0xe7,0x73,0x14,0x8e,0xff,0x85)
+#endif
+#else
+typedef struct ISampleGrabberCBVtbl {
+    BEGIN_INTERFACE
+
+    /*** IUnknown methods ***/
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
+        ISampleGrabberCB *This,
+        REFIID riid,
+        void **ppvObject);
+
+    ULONG (STDMETHODCALLTYPE *AddRef)(
+        ISampleGrabberCB *This);
+
+    ULONG (STDMETHODCALLTYPE *Release)(
+        ISampleGrabberCB *This);
+
+    /*** ISampleGrabberCB methods ***/
+    HRESULT (STDMETHODCALLTYPE *SampleCB)(
+        ISampleGrabberCB *This,
+        double SampleTime,
+        IMediaSample *pSample);
+
+    HRESULT (STDMETHODCALLTYPE *BufferCB)(
+        ISampleGrabberCB *This,
+        double SampleTime,
+        BYTE *pBuffer,
+        LONG BufferLen);
+
+    END_INTERFACE
+} ISampleGrabberCBVtbl;
+
+interface ISampleGrabberCB {
+    CONST_VTBL ISampleGrabberCBVtbl* lpVtbl;
+};
+
+#ifdef COBJMACROS
+#ifndef WIDL_C_INLINE_WRAPPERS
+/*** IUnknown methods ***/
+#define ISampleGrabberCB_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
+#define ISampleGrabberCB_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define ISampleGrabberCB_Release(This) (This)->lpVtbl->Release(This)
+/*** ISampleGrabberCB methods ***/
+#define ISampleGrabberCB_SampleCB(This,SampleTime,pSample) (This)->lpVtbl->SampleCB(This,SampleTime,pSample)
+#define ISampleGrabberCB_BufferCB(This,SampleTime,pBuffer,BufferLen) (This)->lpVtbl->BufferCB(This,SampleTime,pBuffer,BufferLen)
+#else
+/*** IUnknown methods ***/
+static FORCEINLINE HRESULT ISampleGrabberCB_QueryInterface(ISampleGrabberCB* This,REFIID riid,void **ppvObject) {
+    return This->lpVtbl->QueryInterface(This,riid,ppvObject);
+}
+static FORCEINLINE ULONG ISampleGrabberCB_AddRef(ISampleGrabberCB* This) {
+    return This->lpVtbl->AddRef(This);
+}
+static FORCEINLINE ULONG ISampleGrabberCB_Release(ISampleGrabberCB* This) {
+    return This->lpVtbl->Release(This);
+}
+/*** ISampleGrabberCB methods ***/
+static FORCEINLINE HRESULT ISampleGrabberCB_SampleCB(ISampleGrabberCB* This,double SampleTime,IMediaSample *pSample) {
+    return This->lpVtbl->SampleCB(This,SampleTime,pSample);
+}
+static FORCEINLINE HRESULT ISampleGrabberCB_BufferCB(ISampleGrabberCB* This,double SampleTime,BYTE *pBuffer,LONG BufferLen) {
+    return This->lpVtbl->BufferCB(This,SampleTime,pBuffer,BufferLen);
+}
+#endif
+#endif
+
+#endif
+
+
+#endif  /* __ISampleGrabberCB_INTERFACE_DEFINED__ */
+
+/*****************************************************************************
+ * ISampleGrabber interface
+ */
+#ifndef __ISampleGrabber_INTERFACE_DEFINED__
+#define __ISampleGrabber_INTERFACE_DEFINED__
+
+DEFINE_GUID(IID_ISampleGrabber, 0x6b652fff, 0x11fe, 0x4fce, 0x92,0xad, 0x02,0x66,0xb5,0xd7,0xc7,0x8f);
+#if defined(__cplusplus) && !defined(CINTERFACE)
+MIDL_INTERFACE("6b652fff-11fe-4fce-92ad-0266b5d7c78f")
+ISampleGrabber : public IUnknown
+{
+    virtual HRESULT STDMETHODCALLTYPE SetOneShot(
+        BOOL OneShot) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE SetMediaType(
+        const AM_MEDIA_TYPE *pType) = 0;
+
+    virtual HRESULT __stdcall GetConnectedMediaType(
+        AM_MEDIA_TYPE *pType) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE SetBufferSamples(
+        BOOL BufferThem) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE GetCurrentBuffer(
+        LONG *pBufferSize,
+        LONG *pBuffer) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE GetCurrentSample(
+        IMediaSample **ppSample) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE SetCallback(
+        ISampleGrabberCB *pCallback,
+        LONG WhichMethodToCallback) = 0;
+
+};
+#ifdef __CRT_UUID_DECL
+__CRT_UUID_DECL(ISampleGrabber, 0x6b652fff, 0x11fe, 0x4fce, 0x92,0xad, 0x02,0x66,0xb5,0xd7,0xc7,0x8f)
+#endif
+#else
+typedef struct ISampleGrabberVtbl {
+    BEGIN_INTERFACE
+
+    /*** IUnknown methods ***/
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
+        ISampleGrabber *This,
+        REFIID riid,
+        void **ppvObject);
+
+    ULONG (STDMETHODCALLTYPE *AddRef)(
+        ISampleGrabber *This);
+
+    ULONG (STDMETHODCALLTYPE *Release)(
+        ISampleGrabber *This);
+
+    /*** ISampleGrabber methods ***/
+    HRESULT (STDMETHODCALLTYPE *SetOneShot)(
+        ISampleGrabber *This,
+        BOOL OneShot);
+
+    HRESULT (STDMETHODCALLTYPE *SetMediaType)(
+        ISampleGrabber *This,
+        const AM_MEDIA_TYPE *pType);
+
+    HRESULT (STDMETHODCALLTYPE *GetConnectedMediaType)(
+        ISampleGrabber *This,
+        AM_MEDIA_TYPE *pType);
+
+    HRESULT (STDMETHODCALLTYPE *SetBufferSamples)(
+        ISampleGrabber *This,
+        BOOL BufferThem);
+
+    HRESULT (STDMETHODCALLTYPE *GetCurrentBuffer)(
+        ISampleGrabber *This,
+        LONG *pBufferSize,
+        LONG *pBuffer);
+
+    HRESULT (STDMETHODCALLTYPE *GetCurrentSample)(
+        ISampleGrabber *This,
+        IMediaSample **ppSample);
+
+    HRESULT (STDMETHODCALLTYPE *SetCallback)(
+        ISampleGrabber *This,
+        ISampleGrabberCB *pCallback,
+        LONG WhichMethodToCallback);
+
+    END_INTERFACE
+} ISampleGrabberVtbl;
+
+interface ISampleGrabber {
+    CONST_VTBL ISampleGrabberVtbl* lpVtbl;
+};
+
+#ifdef COBJMACROS
+#ifndef WIDL_C_INLINE_WRAPPERS
+/*** IUnknown methods ***/
+#define ISampleGrabber_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
+#define ISampleGrabber_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define ISampleGrabber_Release(This) (This)->lpVtbl->Release(This)
+/*** ISampleGrabber methods ***/
+#define ISampleGrabber_SetOneShot(This,OneShot) (This)->lpVtbl->SetOneShot(This,OneShot)
+#define ISampleGrabber_SetMediaType(This,pType) (This)->lpVtbl->SetMediaType(This,pType)
+#define ISampleGrabber_GetConnectedMediaType(This,pType) (This)->lpVtbl->GetConnectedMediaType(This,pType)
+#define ISampleGrabber_SetBufferSamples(This,BufferThem) (This)->lpVtbl->SetBufferSamples(This,BufferThem)
+#define ISampleGrabber_GetCurrentBuffer(This,pBufferSize,pBuffer) (This)->lpVtbl->GetCurrentBuffer(This,pBufferSize,pBuffer)
+#define ISampleGrabber_GetCurrentSample(This,ppSample) (This)->lpVtbl->GetCurrentSample(This,ppSample)
+#define ISampleGrabber_SetCallback(This,pCallback,WhichMethodToCallback) (This)->lpVtbl->SetCallback(This,pCallback,WhichMethodToCallback)
+#else
+/*** IUnknown methods ***/
+static FORCEINLINE HRESULT ISampleGrabber_QueryInterface(ISampleGrabber* This,REFIID riid,void **ppvObject) {
+    return This->lpVtbl->QueryInterface(This,riid,ppvObject);
+}
+static FORCEINLINE ULONG ISampleGrabber_AddRef(ISampleGrabber* This) {
+    return This->lpVtbl->AddRef(This);
+}
+static FORCEINLINE ULONG ISampleGrabber_Release(ISampleGrabber* This) {
+    return This->lpVtbl->Release(This);
+}
+/*** ISampleGrabber methods ***/
+static FORCEINLINE HRESULT ISampleGrabber_SetOneShot(ISampleGrabber* This,BOOL OneShot) {
+    return This->lpVtbl->SetOneShot(This,OneShot);
+}
+static FORCEINLINE HRESULT ISampleGrabber_SetMediaType(ISampleGrabber* This,const AM_MEDIA_TYPE *pType) {
+    return This->lpVtbl->SetMediaType(This,pType);
+}
+static FORCEINLINE HRESULT ISampleGrabber_GetConnectedMediaType(ISampleGrabber* This,AM_MEDIA_TYPE *pType) {
+    return This->lpVtbl->GetConnectedMediaType(This,pType);
+}
+static FORCEINLINE HRESULT ISampleGrabber_SetBufferSamples(ISampleGrabber* This,BOOL BufferThem) {
+    return This->lpVtbl->SetBufferSamples(This,BufferThem);
+}
+static FORCEINLINE HRESULT ISampleGrabber_GetCurrentBuffer(ISampleGrabber* This,LONG *pBufferSize,LONG *pBuffer) {
+    return This->lpVtbl->GetCurrentBuffer(This,pBufferSize,pBuffer);
+}
+static FORCEINLINE HRESULT ISampleGrabber_GetCurrentSample(ISampleGrabber* This,IMediaSample **ppSample) {
+    return This->lpVtbl->GetCurrentSample(This,ppSample);
+}
+static FORCEINLINE HRESULT ISampleGrabber_SetCallback(ISampleGrabber* This,ISampleGrabberCB *pCallback,LONG WhichMethodToCallback) {
+    return This->lpVtbl->SetCallback(This,pCallback,WhichMethodToCallback);
+}
+#endif
+#endif
+
+#endif
+
+
+#endif  /* __ISampleGrabber_INTERFACE_DEFINED__ */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/dvb/scan.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/dvb/scan.c Changed

@@ -991,8 +991,9 @@
 }
 
 /* FIXME handle properly string (convert to utf8) */
-static void PATCallBack( scan_session_t *p_session, dvbpsi_pat_t *p_pat )
+static void PATCallBack( void *opaque, dvbpsi_pat_t *p_pat )
 {
+    scan_session_t *p_session = opaque;
     vlc_object_t *p_obj = p_session->p_obj;
 
     /* */
@@ -1082,8 +1083,9 @@
     }
 }
 
-static void SDTCallBack( scan_session_t *p_session, dvbpsi_sdt_t *p_sdt )
+static void SDTCallBack( void *opaque, dvbpsi_sdt_t *p_sdt )
 {
+    scan_session_t *p_session = opaque;
     vlc_object_t *p_obj = p_session->p_obj;
     dvbpsi_sdt_t **pp_stored_sdt = NULL;
     if( p_sdt->i_table_id == SDT_OTHER_TS_TABLE_ID )
@@ -1435,8 +1437,9 @@
     }
 }
 
-static void NITCallBack( scan_session_t *p_session, dvbpsi_nit_t *p_nit )
+static void NITCallBack( void * opaque, dvbpsi_nit_t *p_nit )
 {
+    scan_session_t *p_session = opaque;
     vlc_object_t *p_obj = p_session->p_obj;
     dvbpsi_nit_t **pp_stored_nit = NULL;
 
@@ -1520,12 +1523,12 @@
 
     if( i_table_id == SDT_CURRENT_TS_TABLE_ID || i_table_id == SDT_OTHER_TS_TABLE_ID )
     {
-        if( !dvbpsi_sdt_attach( h, i_table_id, i_extension, (dvbpsi_sdt_callback)SDTCallBack, p_session ) )
+        if( !dvbpsi_sdt_attach( h, i_table_id, i_extension, SDTCallBack, p_session ) )
             msg_Err( p_session->p_obj, "PSINewTableCallback: failed attaching SDTCallback" );
     }
     else if( i_table_id == NIT_CURRENT_NETWORK_TABLE_ID || i_table_id == NIT_OTHER_NETWORK_TABLE_ID )
     {
-        if( !dvbpsi_nit_attach( h, i_table_id, i_extension, (dvbpsi_nit_callback)NITCallBack, p_session ) )
+        if( !dvbpsi_nit_attach( h, i_table_id, i_extension, NITCallBack, p_session ) )
             msg_Err( p_session->p_obj, "PSINewTableCallback: failed attaching NITCallback" );
     }
 }
@@ -1805,7 +1808,7 @@
                 return false;
 
             p_scan->p_pathandle->p_sys = (void *) p_scan->p_obj;
-            if( !dvbpsi_pat_attach( p_scan->p_pathandle, (dvbpsi_pat_callback)PATCallBack, p_scan ) )
+            if( !dvbpsi_pat_attach( p_scan->p_pathandle, PATCallBack, p_scan ) )
             {
                 dvbpsi_delete( p_scan->p_pathandle );
                 p_scan->p_pathandle = NULL;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/dvdnav.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/dvdnav.c Changed

@@ -126,6 +126,7 @@
     /* */
     bool        b_reset_pcr;
     bool        b_readahead;
+    bool        b_wait_empty;
 
     struct
     {
@@ -879,6 +880,20 @@
     int32_t i_len;
     dvdnav_status_t status;
 
+    if( p_sys->b_wait_empty )
+    {
+        bool b_empty;
+        es_out_Control( p_sys->p_tf_out, ES_OUT_IS_EMPTY, &b_empty );
+        if( !b_empty )
+        {
+            vlc_tick_sleep( VLC_TICK_FROM_MS(40) );
+            return VLC_DEMUXER_SUCCESS;
+        }
+        p_sys->b_wait_empty = false;
+        /* Don't call RESET_PCR directly as we night need to handle NAV events */
+        p_sys->b_reset_pcr = true;
+    }
+
     if( p_sys->b_readahead )
         status = dvdnav_get_next_cache_block( p_sys->dvdnav, &packet, &i_event,
                                               &i_len );
@@ -951,11 +966,7 @@
         vlc_mutex_unlock( &p_sys->still.lock );
 
         if( b_still_init )
-        {
             DemuxForceStill( p_demux );
-            p_sys->b_reset_pcr = true;
-        }
-        vlc_tick_sleep( VLC_TICK_FROM_MS(40) );
         break;
     }
 
@@ -1154,7 +1165,9 @@
             if( unlikely(!p_dsi) )
                 break;
             const dsi_gi_t *p_dsi_gi = &p_dsi->dsi_gi;
-            if( p_dsi_gi->vobu_3rdref_ea != 0 )
+            if( p_dsi_gi->vobu_ea != 0 )
+                p_sys->i_vobu_flush = p_dsi_gi->vobu_ea;
+            else if( p_dsi_gi->vobu_3rdref_ea != 0 )
                 p_sys->i_vobu_flush = p_dsi_gi->vobu_3rdref_ea;
             else if( p_dsi_gi->vobu_2ndref_ea != 0 )
                 p_sys->i_vobu_flush = p_dsi_gi->vobu_2ndref_ea;
@@ -1210,8 +1223,10 @@
     case DVDNAV_WAIT:
         msg_Dbg( p_demux, "DVDNAV_WAIT" );
 
-        bool b_empty;
-        es_out_Control( p_sys->p_tf_out, ES_OUT_GET_EMPTY, &b_empty );
+        bool b_empty = true;
+        int ret = es_out_Control( p_sys->p_tf_out, ES_OUT_DRAIN );
+        if( ret == VLC_SUCCESS )
+            es_out_Control( p_sys->p_tf_out, ES_OUT_IS_EMPTY, &b_empty );
         if( !b_empty )
         {
             vlc_tick_sleep( VLC_TICK_FROM_MS(40) );
@@ -1563,15 +1578,9 @@
 {
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    static const uint8_t buffer = {
-        0x00, 0x00, 0x01, 0xe0, 0x00, 0x07,
-        0x80, 0x00, 0x00,
-        0x00, 0x00, 0x01, 0xB7,
-    };
-    DemuxBlock( p_demux, buffer, sizeof(buffer) );
-
-    bool b_empty;
-    es_out_Control( p_sys->p_tf_out, ES_OUT_GET_EMPTY, &b_empty );
+    int ret = es_out_Control( p_sys->p_tf_out, ES_OUT_DRAIN );
+    if (ret == VLC_SUCCESS)
+        p_sys->b_wait_empty = true;
 }
 
 /*****************************************************************************

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/http/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/http/meson.build Changed

@@ -25,66 +25,67 @@
     include_directories: vlc_include_dirs,
 )
 
-#
-# Tests
-#
-hpack_test = executable('hpack_test',
-    files('hpack.c'),
-    c_args: '-DDEC_TEST',
-    include_directories: vlc_include_dirs)
-hpackenc_test = executable('hpackenc_test',
-    files('hpack.c', 'hpackenc.c'),
-    c_args: '-DENC_TEST',
-    link_with: vlc_libcompat,
-    include_directories: vlc_include_dirs)
-h2frame_test = executable('h2frame_test',
-    files(
-        'h2frame_test.c',
-        'hpack.c',
-        'hpackenc.c',
-        'h2frame.c',
-    ),
-    include_directories: vlc_include_dirs)
-h2output_test = executable('h2output_test',
-    files('h2output_test.c'),
-    link_with: vlc_http_lib,
-    include_directories: vlc_include_dirs)
-h2conn_test = executable('h2conn_test',
-    files('h2conn_test.c'),
-    link_with: vlc_http_lib,
-    include_directories: vlc_include_dirs)
-h1conn_test = executable('h1conn_test',
-    files('h1conn_test.c'),
-    link_with: vlc_http_lib,
-    include_directories: vlc_include_dirs)
-h1chunked_test = executable('h1chunked_test',
-    files('chunked_test.c'),
-    link_with: vlc_http_lib,
-    include_directories: vlc_include_dirs)
-http_msg_test = executable('http_msg_test',
-    files('message_test.c'),
-    link_with: vlc_http_lib,
-    include_directories: vlc_include_dirs)
-http_file_test = executable('http_file_test',
-    files('file_test.c'),
-    link_with: vlc_http_lib,
-    include_directories: vlc_include_dirs)
-http_tunnel_test = executable('http_tunnel_test',
-    files('tunnel_test.c'),
-    link_with: vlc_http_lib,
-    include_directories: vlc_include_dirs)
-
-test('http_hpack', hpack_test, suite: 'http')
-test('http_hpackenc', hpackenc_test, suite: 'http')
-test('http_h2frame_test', h2frame_test, suite: 'http')
-test('http_h2output_test', h2output_test, suite: 'http')
-test('http_h2conn_test', h2conn_test, suite: 'http')
-test('http_h1conn_test', h1conn_test, suite: 'http')
-test('http_h1chunked_test', h1chunked_test, suite: 'http')
-test('http_msg_test', http_msg_test, suite: 'http')
-test('http_file_test', http_file_test, suite: 'http')
-test('http_tunnel_test', http_tunnel_test, suite: 'http', timeout: 90)
+if (get_option('tests').allowed())
+    #
+    # Tests
+    #
+    hpack_test = executable('hpack_test',
+        files('hpack.c'),
+        c_args: '-DDEC_TEST',
+        include_directories: vlc_include_dirs)
+    hpackenc_test = executable('hpackenc_test',
+        files('hpack.c', 'hpackenc.c'),
+        c_args: '-DENC_TEST',
+        link_with: vlc_libcompat,
+        include_directories: vlc_include_dirs)
+    h2frame_test = executable('h2frame_test',
+        files(
+            'h2frame_test.c',
+            'hpack.c',
+            'hpackenc.c',
+            'h2frame.c',
+        ),
+        include_directories: vlc_include_dirs)
+    h2output_test = executable('h2output_test',
+        files('h2output_test.c'),
+        link_with: vlc_http_lib,
+        include_directories: vlc_include_dirs)
+    h2conn_test = executable('h2conn_test',
+        files('h2conn_test.c'),
+        link_with: vlc_http_lib,
+        include_directories: vlc_include_dirs)
+    h1conn_test = executable('h1conn_test',
+        files('h1conn_test.c'),
+        link_with: vlc_http_lib,
+        include_directories: vlc_include_dirs)
+    h1chunked_test = executable('h1chunked_test',
+        files('chunked_test.c'),
+        link_with: vlc_http_lib,
+        include_directories: vlc_include_dirs)
+    http_msg_test = executable('http_msg_test',
+        files('message_test.c'),
+        link_with: vlc_http_lib,
+        include_directories: vlc_include_dirs)
+    http_file_test = executable('http_file_test',
+        files('file_test.c'),
+        link_with: vlc_http_lib,
+        include_directories: vlc_include_dirs)
+    http_tunnel_test = executable('http_tunnel_test',
+        files('tunnel_test.c'),
+        link_with: vlc_http_lib,
+        include_directories: vlc_include_dirs)
 
+    test('http_hpack', hpack_test, suite: 'http')
+    test('http_hpackenc', hpackenc_test, suite: 'http')
+    test('http_h2frame_test', h2frame_test, suite: 'http')
+    test('http_h2output_test', h2output_test, suite: 'http')
+    test('http_h2conn_test', h2conn_test, suite: 'http')
+    test('http_h1conn_test', h1conn_test, suite: 'http')
+    test('http_h1chunked_test', h1chunked_test, suite: 'http')
+    test('http_msg_test', http_msg_test, suite: 'http')
+    test('http_file_test', http_file_test, suite: 'http')
+    test('http_tunnel_test', http_tunnel_test, suite: 'http', timeout: 90)
+endif
 
 #
 # HTTP(S) module

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/http/tunnel_test.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/http/tunnel_test.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/live555.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/live555.cpp Changed

@@ -165,7 +165,7 @@
     vlc_demux_chained_t *p_out_muxed;    /* for muxed stream */
 
     uint8_t         *p_buffer;
-    unsigned int    i_buffer;
+    size_t          i_buffer;
 
     bool            b_rtcp_sync;
     bool            b_flushing_discontinuity;
@@ -194,6 +194,10 @@
 #define CAP_SUBSESSION_PAUSE    (1 << 3)
 #define CAPS_DEFAULT            CAP_RATE_CONTROL
 
+#if LIVEMEDIA_LIBRARY_VERSION_INT < 1732752000 // 2024.11.28
+typedef char EventLoopWatchVariable;
+#endif
+
 struct demux_sys_t
 {
     char            *p_sdp;    /* XXX mallocated */
@@ -232,8 +236,8 @@
     bool             b_no_data;     /* if we never received any data */
     int              i_no_data_ti;  /* consecutive number of TaskInterrupt */
 
-    char             event_rtsp;
-    char             event_data;
+    EventLoopWatchVariable event_rtsp;
+    EventLoopWatchVariable event_data;
 
     bool             b_get_param;   /* Does the server support GET_PARAMETER */
     bool             b_paused;      /* Are we paused? */
@@ -282,13 +286,34 @@
 static void TimeoutPrevention( void * );
 
 static unsigned char* parseH264ConfigStr( char const* configStr,
-                                          unsigned int& configSize );
+                                          size_t& configSize );
 static unsigned char* parseVorbisConfigStr( char const* configStr,
-                                            unsigned int& configSize );
+                                            size_t& configSize );
 static unsigned char* parseOpusConfigStr( char const* configStr,
-                                          unsigned int& configSize,
+                                          size_t& configSize,
                                           audio_format_t& fmt );
 
+#if SIZE_MAX != UINT_MAX
+namespace {
+uint8_t* parseGeneralConfigStr(char const *configStr, size_t &configSize)
+{
+    unsigned size;
+    unsigned char *data = ::parseGeneralConfigStr(configStr, size);
+    configSize = size;
+    return data;
+}
+
+
+uint8_t* parseStreamMuxConfigStr(char const *configStr, size_t &configSize)
+{
+    unsigned size;
+    unsigned char *data = ::parseStreamMuxConfigStr(configStr, size);
+    configSize = size;
+    return data;
+}
+}
+#endif
+
 static char *passwordLessURL( const vlc_url_t *url );
 
 static bool copyExtradata( const void *p_extra, size_t i_extra, es_format_t *dst )
@@ -987,8 +1012,8 @@
                 }
                 else if( !strcmp( sub->codecName(), "MP4A-LATM" ) )
                 {
-                    unsigned int i_extra;
-                    uint8_t      *p_extra;
+                    size_t i_extra;
+                    uint8_t *p_extra;
 
                     tk->fmt.i_codec = VLC_CODEC_MP4A;
 
@@ -1005,8 +1030,8 @@
                 }
                 else if( !strcmp( sub->codecName(), "MPEG4-GENERIC" ) )
                 {
-                    unsigned int i_extra;
-                    uint8_t      *p_extra;
+                    size_t i_extra;
+                    uint8_t *p_extra;
 
                     tk->fmt.i_codec = VLC_CODEC_MP4A;
 
@@ -1037,8 +1062,8 @@
                 else if( !strcmp( sub->codecName(), "VORBIS" ) )
                 {
                     tk->fmt.i_codec = VLC_CODEC_VORBIS;
-                    unsigned int i_extra;
-                    unsigned char *p_extra;
+                    size_t i_extra;
+                    uint8_t *p_extra;
                     if( ( p_extra=parseVorbisConfigStr( sub->fmtp_config(),
                                                         i_extra ) ) )
                     {
@@ -1050,8 +1075,8 @@
                 }
                 else if( !strcmp( sub->codecName(), "OPUS" ) )
                 {
-                    unsigned int i_extra;
-                    void *p_extra = parseOpusConfigStr( sub->fmtp_config(), i_extra, tk->fmt.audio );
+                    size_t i_extra;
+                    uint8_t *p_extra = parseOpusConfigStr( sub->fmtp_config(), i_extra, tk->fmt.audio );
                     tk->fmt.i_codec = VLC_CODEC_OPUS;
                     if( p_extra )
                     {
@@ -1082,8 +1107,8 @@
                 }
                 else if( !strcmp( sub->codecName(), "H264" ) )
                 {
-                    unsigned int i_extra = 0;
-                    uint8_t      *p_extra = NULL;
+                    size_t i_extra = 0;
+                    uint8_t *p_extra = NULL;
 
                     tk->fmt.i_codec = VLC_CODEC_H264;
                     tk->fmt.b_packetized = false;
@@ -1100,11 +1125,11 @@
                 {
                     struct
                     {
-                        unsigned int i_data;
+                        size_t i_data;
                         uint8_t * p_data;
                     } xps3 = {{0, NULL},{0, NULL},{0, NULL}};
-                    unsigned int i_extraTot = 0;
-                    uint8_t      *p_extra;
+                    size_t i_extraTot = 0;
+                    uint8_t *p_extra;
 
                     tk->fmt.i_codec = VLC_CODEC_HEVC;
                     tk->fmt.b_packetized = false;
@@ -1137,13 +1162,13 @@
                 }
                 else if( !strcmp( sub->codecName(), "MP4V-ES" ) )
                 {
-                    unsigned int i_extra;
-                    uint8_t      *p_extra;
+                    size_t i_extra;
+                    uint8_t *p_extra;
 
                     tk->fmt.i_codec = VLC_CODEC_MP4V;
 
-                    if( ( p_extra = parseGeneralConfigStr( sub->fmtp_config(),
-                                                           i_extra ) ) )
+                    if( ( p_extra = parseGeneralConfigStr(sub->fmtp_config(),
+                                                          i_extra ) ) )
                     {
                         copyExtradata( p_extra, i_extra, &tk->fmt );
                         delete p_extra;
@@ -1195,8 +1220,8 @@
                 else if( !strcmp( sub->codecName(), "THEORA" ) )
                 {
                     tk->fmt.i_codec = VLC_CODEC_THEORA;
-                    unsigned int i_extra;
-                    unsigned char *p_extra;
+                    size_t i_extra;
+                    uint8_t *p_extra;
                     if( ( p_extra=parseVorbisConfigStr( sub->fmtp_config(),
                                                         i_extra ) ) )
                     {
@@ -2040,7 +2065,7 @@
         {
             void *p_tmp;
             msg_Dbg( p_demux, "lost %d bytes", i_truncated_bytes );
-            msg_Dbg( p_demux, "increasing buffer size to %d", tk->i_buffer * 2 );
+            msg_Dbg( p_demux, "increasing buffer size to %zu", tk->i_buffer * 2 );
             p_tmp = realloc( tk->p_buffer, tk->i_buffer * 2 );
             if( p_tmp == NULL )
             {
@@ -2347,8 +2372,8 @@
 }
 
 
-static unsigned char* parseH264ConfigStr( char const* configStr,
-                                          unsigned int& configSize )
+static unsigned char*
+parseH264ConfigStr(char const* configStr, size_t& configSize)
 {
     char *dup, *psz;
     size_t i_records = 1;
@@ -2389,22 +2414,27 @@
     return cfg;
 }
 
-static uint8_t *parseVorbisConfigStr( char const* configStr,
-                                      unsigned int& configSize )
+static uint8_t *
+parseVorbisConfigStr(char const* configStr, size_t& configSize)
 {
     configSize = 0;
     if( configStr == NULL || *configStr == '\0' )
         return NULL;
+
+    /* LiveMedia needs an unsigned for decoding. */
+    unsigned decoded;
 #if LIVEMEDIA_LIBRARY_VERSION_INT >= 1332115200 // 2012.03.20
-    unsigned char *p_cfg = base64Decode( configStr, configSize );
+    unsigned char *p_cfg = base64Decode(configStr, decoded);
 #else
     char* configStr_dup = strdup( configStr );
-    unsigned char *p_cfg = base64Decode( configStr_dup, configSize );
+    unsigned char *p_cfg = base64Decode(configStr_dup, decoded);
     free( configStr_dup );
 #endif
+    configSize = decoded;
+
     uint8_t *p_extra = NULL;
     /* skip header count, ident number and length (cf. RFC 5215) */
-    const unsigned int headerSkip = 9;
+    const size_t headerSkip = 9;
     if( configSize > headerSkip && ((uint8_t*)p_cfg)3 == 1 )
     {
         p_extra = (uint8_t *) std::malloc( configSize - headerSkip );
@@ -2419,9 +2449,8 @@
     return p_extra;
 }
 
-static unsigned char* parseOpusConfigStr( char const* configStr,
-                                          unsigned int& configSize,
-                                          audio_format_t& fmt )
+static uint8_t*
+parseOpusConfigStr(char const* configStr, size_t& configSize, audio_format_t& fmt)
 {
     OpusHeader header;
     opus_header_init( &header );
@@ -2458,7 +2487,7 @@
     fmt.i_rate = header.input_sample_rate;
     /* Build extradata with the proper params */
     opus_prepare_header( header.channels, header.input_sample_rate, &header );
-    int i_extra;
+    size_t i_extra;
     uint8_t *p_extra;
     if( opus_write_header( &p_extra, &i_extra, &header, NULL ) )
     {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/meson.build Changed

@@ -8,6 +8,30 @@
     'sources' : files('data.c')
 }
 
+decklink_dep = disabler()
+decklink_cpp_args = 
+if get_option('decklink').allowed()
+if host_system == 'windows'
+    decklink_cpp_args += libcom_cppflags
+endif
+# TODO allow providing a custom location for the DeckLink SDK
+if contrib_dir != ''
+    decklink_dep = declare_dependency(
+        link_args: '-L' + contrib_libdir,
+        compile_args: f'-I@contrib_incdir@/decklink')
+    if not cpp.check_header('DeckLinkAPI.h', dependencies:  decklink_dep )
+        decklink_dep = disabler()
+    endif
+endif
+vlc_modules += {
+    'name' : 'decklink',
+    'sources' : files('decklink.cpp', 'sdi.c', 'sdi.h', 'vlc_decklink.h'),
+    'dependencies' : dl_lib, decklink_dep,
+    'cpp_args' : decklink_cpp_args,
+    'enabled' : decklink_dep.found(),
+}
+endif
+
 # Filesystem access module
 vlc_modules += {
     'name' : 'filesystem',
@@ -106,6 +130,7 @@
     'dependencies' : ksuser_lib,
     'enabled' : get_option('wasapi')
       .require(host_system == 'windows', error_message: 'WASAPI requires Windows')
+      .disable_auto_if(have_win_store)
       .allowed() and ksuser_lib.found()
 }
 
@@ -168,6 +193,18 @@
     endif
 endif
 
+live555_dep = dependency('live555', version: '>= 2011.12.23', required: get_option('live555'))
+# TODO support without pkg-config
+vlc_modules += {
+    'name' : 'live555',
+    'sources' : files('live555.cpp', 'live555_dtsgen.h',
+                      'mms/asf.c', 'mms/asf.h',
+                      'mms/buffer.c', 'mms/buffer.h',
+                      '../codec/opus_header.c', '../codec/opus_header.h'),
+    'dependencies' : live555_dep, socket_libs,
+    'enabled' : live555_dep.found(),
+}
+
 # Shared memory frame buffer capture
 vlc_modules += {
     'name' : 'shm',
@@ -181,7 +218,7 @@
 subdir('screen')
 
 # RDP/Remote Client Desktop capture
-freerdp_dep = dependency('freerdp', required: get_option('freerdp'))
+freerdp_dep = dependency('freerdp2', required: get_option('freerdp'))
 if freerdp_dep.found()
     vlc_modules += {
     'name' : 'rdp',
@@ -208,7 +245,6 @@
 if get_option('vcd_module')
     vcd_cdda_flags = 
 
-    # TODO: Add gcrypt dependency if it's present
     libcddb_dep = dependency('libcddb', version: '>= 0.9.5', required: get_option('libcddb'))
     if libcddb_dep.found()
         vcd_cdda_flags += '-DHAVE_LIBCDDB'
@@ -226,7 +262,7 @@
         needed_vcd_unix_headers_present = false
     endif
 
-    if (needed_vcd_unix_headers_present or 
+    if (needed_vcd_unix_headers_present or
         host_system in 'windows' or have_osx)
 
         vcd_cdda_darwin_deps = 
@@ -243,7 +279,7 @@
             ),
             'c_args' : vcd_cdda_flags,
             'link_with' : vlc_json_lib,
-            'dependencies' : libcddb_dep, vcd_cdda_darwin_deps
+            'dependencies' : libcddb_dep, vcd_cdda_darwin_deps, gcrypt_dep
         }
 
         vlc_modules += {
@@ -289,7 +325,7 @@
 libbluray_dep = dependency('libbluray', version: '>= 1.1.0', required: get_option('bluray'))
 if libbluray_dep.found()
     vlc_modules += {
-        'name' : 'bluray',
+        'name' : 'libbluray',
         'sources' : files('bluray.c'),
         'dependencies' : libbluray_dep
     }
@@ -328,7 +364,7 @@
     endif
 endif
 
-if host_system == 'windows'
+if host_system == 'windows' and have_win_desktop
     strmiids_lib = cc.find_library('strmiids', required: true)
     vlc_modules += {
         'name' : 'dtv',
@@ -339,11 +375,41 @@
         'dependencies' : strmiids_lib,
         'cpp_args' : libcom_cppflags
     }
+
+    vlc_modules += {
+        'name' : 'dshow',
+        'sources' : files(
+            'dshow/dshow.cpp',
+            'dshow/filter.cpp',
+            'dshow/crossbar.cpp',
+        ),
+        'dependencies' : ksuser_lib, strmiids_lib,
+        'cpp_args' : libcom_cppflags,
+        'enabled' : ksuser_lib.found() and have_win_desktop
+    }
 endif
 
+# vlc_access_cache helper lib
+vlc_access_cache_lib = static_library(
+    'vlc_access_cache',
+    files('cache.c',),
+    include_directories: vlc_include_dirs,
+    pic: true,
+    install: false
+)
 
 ## Network stream access modules
 
+# Smb v1
+libdsm_dep = dependency('libdsm', version: '>= 0.2.0', required: get_option('dsm'))
+vlc_modules += {
+    'name' : 'dsm',
+    'sources' : files('dsm/access.c', 'dsm/sd.c', 'smb_common.h'),
+    'dependencies' : libdsm_dep,
+    'link_with' : vlc_access_cache_lib,
+    'enabled' : libdsm_dep.found(),
+}
+
 # FTP
 vlc_modules += {
     'name' : 'ftp',
@@ -351,6 +417,15 @@
     'dependencies' : socket_libs
 }
 
+# SFTP
+libssh2_dep = dependency('libssh2', required: get_option('libssh2'))
+vlc_modules += {
+    'name' : 'sftp',
+    'sources' : files('sftp.c'),
+    'dependencies' : libssh2_dep,
+    'enabled': libssh2_dep.found() and get_option('sftp').allowed(),
+}
+
 # Gopher
 vlc_modules += {
     'name' : 'gopher',
@@ -368,6 +443,15 @@
 # New HTTP(S)
 subdir('http')
 
+# Network file sharing
+nfs_dep = dependency('libnfs', version: '>= 1.10.0', required: get_option('nfs'))
+vlc_modules += {
+    'name' : 'nfs',
+    'sources' : files('nfs.c'),
+    'dependencies' : nfs_dep, socket_libs,
+    'enabled' : nfs_dep.found(),
+}
+
 # TCP
 vlc_modules += {
     'name' : 'tcp',
@@ -390,7 +474,7 @@
 }
 
 # Windows UNC
-if host_system == 'windows'
+if host_system == 'windows' and not have_win_store
     mpr_lib = cc.find_library('mpr', required: true)
     netapi32_lib = cc.find_library('netapi32', required: true)
 
@@ -407,7 +491,8 @@
         'name' : 'avio',
         'sources' : files('avio.c'),
         'dependencies' : avutil_dep, avformat_dep, m_lib,
-        'link_args' : symbolic_linkargs
+        'link_args' : symbolic_linkargs,
+        'enabled' : not get_option('merge-ffmpeg')
     }
 endif
 
@@ -418,6 +503,18 @@
     'dependencies' : socket_libs, threads_dep
 }
 
+# MMS
+vlc_modules += {
+    'name' : 'access_mms',
+    'sources' : files(
+        'mms/mms.c',
+        'mms/mmsh.c',
+        'mms/mmstu.c',
+        'mms/buffer.c',
+        'mms/asf.c',
+    ),
+    'dependencies' : socket_libs
+}
 
 ## Misc

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/mms/mmstu.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/mms/mmstu.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/mms/mmstu.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/mms/mmstu.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/nfs.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/nfs.c Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/pipewire.c Added

@@ -0,0 +1,643 @@
+/*****************************************************************************
+ * @file pipewire.c
+ * @brief PipeWire input plugin for vlc
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Ayush Dey <deyayush6@gmail.com>
+ *          Thomas Guillem <tguillem@videolan.org>
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_aout.h>
+#include <vlc_demux.h>
+#include <vlc_plugin.h>
+#include <spa/param/audio/format-utils.h>
+#include <spa/param/props.h>
+#include <spa/param/video/format-utils.h>
+#include <pipewire/pipewire.h>
+#include "audio_output/vlc_pipewire.h"
+
+#define HELP_TEXT N_( \
+    "Pass pipewire:// to open the default PipeWire source, " \
+    "or pipewire://SOURCE to open a specific source named SOURCE.")
+
+struct vlc_pw_stream
+{
+    struct vlc_pw_context *context;
+    struct pw_stream *stream;
+    struct spa_hook listener;
+    demux_t *demux;
+    struct spa_audio_info audio_format; /**< Audio information about the stream */
+    struct spa_video_info video_format; /**< Video information about the stream */
+    bool es_out_added; /**< Whether es_format_t structure created */
+};
+
+struct demux_sys_t
+{
+    struct vlc_pw_context *context;
+    struct vlc_pw_stream *stream;
+    struct spa_hook listener;
+    es_out_id_t *es;
+    unsigned framesize; /**< Byte size of a sample */
+    vlc_tick_t caching; /**< Caching value */
+    vlc_tick_t interval;
+    bool discontinuity; /**< The next frame will not follow the last one */
+    enum es_format_category_e media_type;
+    uint8_t chans_tableAOUT_CHAN_MAX; /**< Channels order table */
+    uint8_t chans_to_reorder; /**< Number of channels to reorder */
+    vlc_fourcc_t format; /**< Sample format */
+};
+
+/** PipeWire audio sample (PCM) format to VLC codec */
+static vlc_fourcc_t spa_audio_format_to_fourcc(enum spa_audio_format spa_format)
+{
+    switch (spa_format)
+    {
+        case SPA_AUDIO_FORMAT_U8:
+            return VLC_CODEC_U8;
+        case SPA_AUDIO_FORMAT_ALAW:
+            return VLC_CODEC_ALAW;
+        case SPA_AUDIO_FORMAT_ULAW:
+            return VLC_CODEC_MULAW;
+        case SPA_AUDIO_FORMAT_S16_LE:
+            return VLC_CODEC_S16L;
+        case SPA_AUDIO_FORMAT_S16_BE:
+            return VLC_CODEC_S16B;
+        case SPA_AUDIO_FORMAT_F32_LE:
+            return VLC_CODEC_F32L;
+        case SPA_AUDIO_FORMAT_F32_BE:
+            return VLC_CODEC_F32B;
+        case SPA_AUDIO_FORMAT_S32_LE:
+            return VLC_CODEC_S32L;
+        case SPA_AUDIO_FORMAT_S32_BE:
+            return VLC_CODEC_S32B;
+        case SPA_AUDIO_FORMAT_S24_LE:
+            return VLC_CODEC_S24L;
+        case SPA_AUDIO_FORMAT_S24_BE:
+            return VLC_CODEC_S24B;
+        case SPA_AUDIO_FORMAT_S24_32_LE:
+            return VLC_CODEC_S24L32;
+        case SPA_AUDIO_FORMAT_S24_32_BE:
+            return VLC_CODEC_S24B32;
+        default:
+            return 0;
+    }
+}
+
+/** PipeWire video sample (PCM) format to VLC codec */
+static vlc_fourcc_t spa_video_format_to_fourcc(enum spa_video_format spa_format)
+{
+    switch (spa_format)
+    {
+        case SPA_VIDEO_FORMAT_YUY2:
+            return VLC_CODEC_YUYV;
+        case SPA_VIDEO_FORMAT_RGB:
+            return VLC_CODEC_RGB24;
+        case SPA_VIDEO_FORMAT_RGBA:
+            return VLC_CODEC_RGBA;
+        case SPA_VIDEO_FORMAT_RGBx:
+            return VLC_CODEC_RGBX;
+        case SPA_VIDEO_FORMAT_BGRx:
+            return VLC_CODEC_BGRX;
+        default:
+            return 0;
+    }
+}
+
+/** PipeWire to VLC channel mapping */
+static const uint16_t vlc_chans = {
+    SPA_AUDIO_CHANNEL_MONO = AOUT_CHAN_CENTER,
+    SPA_AUDIO_CHANNEL_FL   = AOUT_CHAN_LEFT,
+    SPA_AUDIO_CHANNEL_FR   = AOUT_CHAN_RIGHT,
+    SPA_AUDIO_CHANNEL_RL   = AOUT_CHAN_REARLEFT,
+    SPA_AUDIO_CHANNEL_RR   = AOUT_CHAN_REARRIGHT,
+    SPA_AUDIO_CHANNEL_FC   = AOUT_CHAN_CENTER,
+    SPA_AUDIO_CHANNEL_LFE  = AOUT_CHAN_LFE,
+    SPA_AUDIO_CHANNEL_SL   = AOUT_CHAN_MIDDLELEFT,
+    SPA_AUDIO_CHANNEL_SR   = AOUT_CHAN_MIDDLERIGHT,
+    SPA_AUDIO_CHANNEL_RC   = AOUT_CHAN_REARCENTER,
+};
+
+/**
+ * Initializes the `es_format_t fmt` object (audio properties)
+ */
+static int initialize_audio_format(struct vlc_pw_stream *s, es_format_t *fmt, vlc_fourcc_t format)
+{
+    demux_t *demux = s->demux;
+    struct demux_sys_t *sys = demux->p_sys;
+    es_format_Init(fmt, AUDIO_ES, format);
+    uint32_t channels = s->audio_format.info.raw.channels;
+
+    if (channels == 0)
+    {
+        vlc_pw_error(sys->context, "source should have at least one channel");
+        return -1;
+    }
+
+    uint32_t chans_inAOUT_CHAN_MAX;
+    for (uint32_t i = 0; i < channels; i++)
+    {
+        uint16_t vlc_chan = 0;
+        uint32_t pos = s->audio_format.info.raw.positioni;
+        if (pos < sizeof (vlc_chans) / sizeof (vlc_chans0))
+            vlc_chan = vlc_chanspos;
+
+        if (vlc_chan == 0)
+        {
+            vlc_pw_error(sys->context, "%s channel %u position %u", "unsupported", i, pos);
+            return -1;
+        }
+        chans_ini = vlc_chan;
+        fmt->audio.i_physical_channels |= vlc_chan;
+    }
+
+    sys->chans_to_reorder = aout_CheckChannelReorder(chans_in, NULL, fmt->audio.i_physical_channels,
+                                                     sys->chans_table);
+    sys->format = format;
+    fmt->audio.i_format = format;
+    aout_FormatPrepare(&fmt->audio);
+    fmt->audio.i_rate = s->audio_format.info.raw.rate;
+    fmt->audio.i_blockalign = fmt->audio.i_bitspersample * fmt->audio.i_channels / 8;
+    fmt->i_bitrate = fmt->audio.i_bitspersample * fmt->audio.i_channels * fmt->audio.i_rate;
+    sys->framesize = fmt->audio.i_blockalign;
+    return 0;
+}
+
+/**
+ * Initializes the `es_format_t fmt` object (video properties)
+ */
+static void initialize_video_format(struct vlc_pw_stream *s, es_format_t *fmt, vlc_fourcc_t format)
+{
+    demux_t *demux = s->demux;
+    struct demux_sys_t *sys = demux->p_sys;
+    es_format_Init(fmt, VIDEO_ES, format);
+    fmt->video.i_frame_rate = s->video_format.info.raw.framerate.num;
+    fmt->video.i_frame_rate_base = s->video_format.info.raw.framerate.denom;
+    video_format_Setup(&fmt->video, format, s->video_format.info.raw.size.width,
+                        s->video_format.info.raw.size.height, s->video_format.info.raw.size.width,
+                        s->video_format.info.raw.size.height,
+                        s->video_format.info.raw.pixel_aspect_ratio.num,
+                        s->video_format.info.raw.pixel_aspect_ratio.denom);
+    sys->interval = vlc_tick_from_samples(fmt->video.i_frame_rate,
+                                            fmt->video.i_frame_rate_base);
+}
+
+/**
+ * Parameter change callback.
+ *
+ * This callback is invoked upon stream initialization and
+ * the ES is initialized before the stream starts capturing data.
+ */
+static void on_stream_param_changed(void *data, uint32_t id, const struct spa_pod *param)
+{
+    struct vlc_pw_stream *s = data;
+
+    if(s->es_out_added) /* ES already initialized and added */
+        return;
+
+    demux_t *demux = s->demux;
+    struct demux_sys_t *sys = demux->p_sys;
+    es_format_t fmt;
+    if (param == NULL || id != SPA_PARAM_Format)
+        return;
+
+    if (sys->media_type == AUDIO_ES)
+    {
+        if (spa_format_parse(param, &s->audio_format.media_type, &s->audio_format.media_subtype) < 0)
+            return;
+
+        if (s->audio_format.media_type != SPA_MEDIA_TYPE_audio ||
+            s->audio_format.media_subtype != SPA_MEDIA_SUBTYPE_raw)
+            return;
+
+        if (spa_format_audio_raw_parse(param, &s->audio_format.info.raw) < 0)
+            return;
+
+        vlc_fourcc_t format = spa_audio_format_to_fourcc(s->audio_format.info.raw.format);
+        if (format == 0)
+        {
+            vlc_pw_error(sys->context, "unsupported PipeWire sample format %u",
+                        (unsigned)s->audio_format.info.raw.format);
+            return;
+        }
+
+        if (initialize_audio_format(s, &fmt, format))
+            return;
+    }
+    else
+    {
+        if (spa_format_parse(param, &s->video_format.media_type, &s->video_format.media_subtype) < 0)
+            return;
+
+        if (s->video_format.media_type != SPA_MEDIA_TYPE_video ||
+            s->video_format.media_subtype != SPA_MEDIA_SUBTYPE_raw)
+            return;
+
+        if (spa_format_video_raw_parse(param, &s->video_format.info.raw) < 0)
+            return;
+
+        vlc_fourcc_t format = spa_video_format_to_fourcc(s->video_format.info.raw.format);
+        if (format == 0)
+        {
+            vlc_pw_error(sys->context, "unsupported PipeWire sample format %u",
+                        (unsigned)s->video_format.info.raw.format);
+            return;
+        }
+
+        initialize_video_format(s, &fmt, format);
+    }
+
+    sys->es = es_out_Add (demux->out, &fmt);
+    s->es_out_added = true;
+}
+
+/**
+ * Stream state callback.
+ *
+ * This monitors the stream for state change, looking out for fatal errors.
+ */
+static void stream_state_changed(void *data, enum pw_stream_state old,
+                                 enum pw_stream_state state, const char *err)
+{
+    struct vlc_pw_stream *s = data;
+
+    if (state == PW_STREAM_STATE_ERROR)
+        vlc_pw_error(s->context, "stream error: %s", err);
+    else
+        vlc_pw_debug(s->context, "stream %s",
+                                pw_stream_state_as_string(state));
+    if (old != state)
+        vlc_pw_signal(s->context);
+}
+
+/**
+ * Retrieve latest timings
+ */
+static vlc_tick_t stream_update_latency(struct vlc_pw_stream *s, vlc_tick_t *now)
+{
+    struct pw_time ts;
+
+#if PW_CHECK_VERSION(1, 1, 0)
+    /* PW monotonic clock, same than vlc_tick_now() */
+    *now = VLC_TICK_FROM_NS(pw_stream_get_nsec(s->stream));
+#else
+    *now = vlc_tick_now();
+#endif
+
+    if (pw_stream_get_time_n(s->stream, &ts, sizeof (ts)) < 0
+     || ts.rate.denom == 0)
+        return VLC_TICK_INVALID;
+
+    return (VLC_TICK_FROM_NS(ts.now) + vlc_tick_from_frac(ts.delay * ts.rate.num, ts.rate.denom));
+}
+
+/**
+ * Stream processing callback.
+ *
+ * This consumes data from the server buffer.
+ */
+static void on_process(void *data)
+{
+    struct vlc_pw_stream *s = data;
+    demux_t *demux = s->demux;
+    struct demux_sys_t *sys = demux->p_sys;
+    vlc_tick_t now;
+    vlc_tick_t val = stream_update_latency(s, &now);
+    struct pw_buffer *b = pw_stream_dequeue_buffer(s->stream);
+
+    if (unlikely(b == NULL))
+        return;
+
+    struct spa_buffer *buf = b->buffer;
+    struct spa_data *d = &buf->datas0;
+    struct spa_chunk *chunk = d->chunk;
+    unsigned char *dst = d->data;
+    size_t length = chunk->size;
+
+    /*
+     * If timing data is not available (val == VLC_TICK_INVALID), we can at least
+     * assume that the capture delay is no less than zero.
+     */
+    vlc_tick_t pts = (val != VLC_TICK_INVALID) ? val : now;
+    es_out_SetPCR(demux->out, pts);
+    if (unlikely(sys->es == NULL))
+        goto end;
+
+    vlc_frame_t *frame = vlc_frame_Alloc(length);
+    if (likely(frame != NULL))
+    {
+        memcpy(frame->p_buffer, dst + chunk->offset, length);
+        if (sys->media_type == AUDIO_ES)
+        {
+            frame->i_nb_samples = length / sys->framesize;
+            if (sys->chans_to_reorder != 0)
+                aout_ChannelReorder(frame->p_buffer, length,
+                                    sys->chans_to_reorder, sys->chans_table,
+                                    sys->format);
+        }
+        frame->i_dts = frame->i_pts = pts;
+        if (sys->discontinuity)
+        {
+            frame->i_flags |= VLC_FRAME_FLAG_DISCONTINUITY;
+            sys->discontinuity = false;
+        }
+
+        es_out_Send(demux->out, sys->es, frame);
+    }
+    else
+        sys->discontinuity = true;
+
+    end:
+        pw_stream_queue_buffer(s->stream, b);
+}
+
+/**
+ * Disconnects a stream from source and destroys it.
+ */
+static void vlc_pw_stream_destroy(struct vlc_pw_stream *s)
+{
+    vlc_pw_lock(s->context);
+    pw_stream_flush(s->stream, false);
+    pw_stream_disconnect(s->stream);
+    pw_stream_destroy(s->stream);
+    vlc_pw_unlock(s->context);
+    free(s);
+}
+
+static const struct pw_stream_events stream_events = {
+    PW_VERSION_STREAM_EVENTS,
+    .state_changed = stream_state_changed,
+    .param_changed = on_stream_param_changed,
+    .process = on_process,
+};
+
+static int Control(demux_t *demux, int query, va_list ap)
+{
+    struct demux_sys_t *sys = demux->p_sys;
+    struct vlc_pw_stream *s = sys->stream;
+    
+    switch (query)
+    {
+        case DEMUX_GET_TIME:
+        {
+            struct pw_time ts;
+            
+            if (pw_stream_get_time_n(s->stream, &ts, sizeof(ts)) < 0)
+                return VLC_EGENERIC;
+            *(va_arg(ap, vlc_tick_t *)) = VLC_TICK_FROM_NS(ts.now);
+            break;
+        }
+
+        case DEMUX_GET_PTS_DELAY:
+        {
+            vlc_tick_t *pd = va_arg(ap, vlc_tick_t *);
+
+            *pd = sys->caching;
+            /* in case of VIDEO_ES, cap at one frame, more than enough */
+            if (sys->media_type == VIDEO_ES && *pd > sys->interval)
+                *pd = sys->interval;
+            break;
+        }
+
+        case DEMUX_HAS_UNSUPPORTED_META:
+        case DEMUX_CAN_RECORD:
+        case DEMUX_CAN_PAUSE:
+        case DEMUX_CAN_CONTROL_PACE:
+        case DEMUX_CAN_CONTROL_RATE:
+        case DEMUX_CAN_SEEK:
+            *(va_arg(ap, bool *)) = false;
+            break;
+
+        default:
+            return VLC_EGENERIC;
+    }
+
+    return VLC_SUCCESS;
+}
+
+/**
+ * Global callback
+ * This callback is used to find whether the media_type is AUDIO_ES or VIDEO_ES.
+ */
+static void registry_global(void *data, uint32_t id, uint32_t perms,
+                            const char *type, uint32_t version,
+                            const struct spa_dict *props)
+{
+    demux_t *demux = data;
+    struct demux_sys_t *sys = demux->p_sys;
+
+    if (strcmp(type, PW_TYPE_INTERFACE_Node) == 0)
+    {
+        const char *name = spa_dict_lookup(props, PW_KEY_NODE_NAME);
+        if (unlikely(name == NULL))
+            return;
+
+        const char *class = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS);
+        if (class == NULL)
+            return;
+    
+        if (strstr(class, "Source") == NULL)
+            return;
+
+        if (strcmp(name, demux->psz_location) == 0)
+        {
+            if (strstr(class, "Video") != NULL)
+                sys->media_type = VIDEO_ES;
+        }
+    }
+}
+
+static const struct pw_registry_events global_events = {
+    PW_VERSION_REGISTRY_EVENTS,
+    .global = registry_global
+};
+
+static int Open(vlc_object_t *obj)
+{
+    demux_t *demux = (demux_t *)obj;
+
+    if (demux->out == NULL)
+        return VLC_EGENERIC;
+
+    struct demux_sys_t *sys = malloc(sizeof (*sys));
+    if (unlikely(sys == NULL))
+        return VLC_ENOMEM;
+
+    sys->context = vlc_pw_connect(obj, "access");
+    if (sys->context == NULL)
+    {
+        free(sys);
+        return VLC_EGENERIC;
+    }
+
+    sys->stream = NULL;
+    sys->es = NULL;
+    sys->discontinuity = false;
+    sys->caching = VLC_TICK_FROM_MS( var_InheritInteger(obj, "live-caching") );
+    sys->listener = (struct spa_hook){ };
+    sys->media_type = AUDIO_ES;
+    demux->p_sys = sys;
+
+    /* The `sys->media_type` is set to either `AUDIO_ES` or `VIDEO_ES` during this call,
+       depending on the media type of the capture node. */
+    vlc_pw_lock(sys->context);
+    vlc_pw_registry_listen(sys->context, &sys->listener, &global_events, demux);
+    vlc_pw_roundtrip_unlocked(sys->context);
+    vlc_pw_unlock(sys->context);
+
+    /* Stream parameters */
+    struct spa_audio_info_raw rawaudiofmt = {
+        .rate = 48000,
+        .channels = 2,
+        .format = SPA_AUDIO_FORMAT_S16,
+        .position = { SPA_AUDIO_CHANNEL_FL, SPA_AUDIO_CHANNEL_FR }
+    };
+
+    /* Assemble the stream format and properties */
+    const struct spa_pod *params1;
+    unsigned char buf1024;
+    struct spa_pod_builder builder = SPA_POD_BUILDER_INIT(buf, sizeof (buf));
+    struct pw_properties *props;
+    const char *stream_name;
+
+    if (sys->media_type == AUDIO_ES)
+    {
+        params0 = spa_format_audio_raw_build(&builder, SPA_PARAM_EnumFormat,
+                                                &rawaudiofmt);
+
+        props = pw_properties_new(PW_KEY_MEDIA_TYPE, "Audio",
+                                PW_KEY_MEDIA_CATEGORY, "Capture",
+                                PW_KEY_MEDIA_ROLE, "Raw",
+                                NULL);
+        stream_name = "audio stream";
+    }
+    else
+    {
+        params0 = spa_pod_builder_add_object(&builder,
+                SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
+                SPA_FORMAT_mediaType,       SPA_POD_Id(SPA_MEDIA_TYPE_video),
+                SPA_FORMAT_mediaSubtype,    SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
+                SPA_FORMAT_VIDEO_format,    SPA_POD_CHOICE_ENUM_Id(6,
+                                                SPA_VIDEO_FORMAT_RGB,
+                                                SPA_VIDEO_FORMAT_RGB,
+                                                SPA_VIDEO_FORMAT_RGBA,
+                                                SPA_VIDEO_FORMAT_RGBx,
+                                                SPA_VIDEO_FORMAT_BGRx,
+                                                SPA_VIDEO_FORMAT_YUY2),
+                SPA_FORMAT_VIDEO_size,      SPA_POD_CHOICE_RANGE_Rectangle(
+                                                &SPA_RECTANGLE(320, 240),
+                                                &SPA_RECTANGLE(1, 1),
+                                                &SPA_RECTANGLE(4096, 4096)),
+                SPA_FORMAT_VIDEO_framerate, SPA_POD_CHOICE_RANGE_Fraction(
+                                                &SPA_FRACTION(25, 1),
+                                                &SPA_FRACTION(0, 1),
+                                                &SPA_FRACTION(1000, 1)));
+
+        props = pw_properties_new(PW_KEY_MEDIA_TYPE, "Video",
+                                PW_KEY_MEDIA_CATEGORY, "Capture",
+                                PW_KEY_MEDIA_ROLE, "Camera",
+                                NULL);
+        stream_name = "video stream";
+    }
+
+    pw_properties_set(props, PW_KEY_TARGET_OBJECT, demux->psz_location);
+
+    /* Create the stream */
+    struct vlc_pw_stream *s = malloc(sizeof (*s));
+    if (unlikely(s == NULL))
+    {
+        pw_properties_free(props);
+        vlc_pw_disconnect(sys->context);
+        free(sys);
+        return VLC_EGENERIC;
+    }
+
+    enum pw_stream_flags flags =
+        PW_STREAM_FLAG_AUTOCONNECT |
+        PW_STREAM_FLAG_MAP_BUFFERS;
+
+    enum pw_stream_state state;
+
+    s->context = sys->context;
+    s->listener = (struct spa_hook){ };
+    s->es_out_added = false;
+    s->demux = demux;
+
+    vlc_pw_lock(s->context);
+    s->stream = vlc_pw_stream_new(s->context, stream_name, props);
+    if (unlikely(s->stream == NULL))
+    {
+        vlc_pw_unlock(s->context);
+        free(s);
+        vlc_pw_disconnect(sys->context);
+        free(sys);
+        return VLC_EGENERIC;
+    }
+
+    sys->stream = s;
+    pw_stream_add_listener(s->stream, &s->listener, &stream_events, s);
+    pw_stream_connect(s->stream, PW_DIRECTION_INPUT, PW_ID_ANY, flags,
+                      params, ARRAY_SIZE(params));
+
+    /* Wait for the stream to be ready */
+    while ((state = pw_stream_get_state(s->stream,
+                                        NULL)) == PW_STREAM_STATE_CONNECTING)
+        vlc_pw_wait(s->context);
+
+    vlc_pw_unlock(s->context);
+
+    switch (state)
+    {
+        case PW_STREAM_STATE_PAUSED:
+        case PW_STREAM_STATE_STREAMING:
+            break;
+        default:
+            vlc_pw_stream_destroy(s);
+            vlc_pw_disconnect(sys->context);
+            free(sys);
+            return VLC_EGENERIC;
+    }
+
+    demux->pf_demux = NULL;
+    demux->pf_control = Control;
+    return VLC_SUCCESS;
+}
+
+static void Close (vlc_object_t *obj)
+{
+    demux_t *demux = (demux_t *)obj;
+    struct demux_sys_t *sys = demux->p_sys;
+    vlc_pw_stream_destroy(sys->stream);
+    vlc_pw_disconnect(sys->context);
+    free(sys);
+}
+
+vlc_module_begin ()
+    set_shortname (N_("PipeWire"))
+    set_description (N_("PipeWire input"))
+    set_capability ("access", 0)
+    set_subcategory (SUBCAT_INPUT_ACCESS)
+    set_help (HELP_TEXT)
+
+    add_shortcut ("pipewire", "pw")
+    set_callbacks (Open, Close)
+vlc_module_end ()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/pulse.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/pulse.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/rtp/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/rtp/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/rtp/fmtp.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/rtp/fmtp.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/rtp/h26x.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/rtp/h26x.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/rtp/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/rtp/meson.build Changed

@@ -4,20 +4,23 @@
     install: false,
     pic: true)
 
-if libgcrypt_dep.found()
+if gcrypt_dep.found()
     srtp_lib = static_library('srtp',
                     files('srtp.c', 'srtp.h'),
-                    dependencies: libgcrypt_dep,
+                    dependencies: gcrypt_dep,
                     include_directories: vlc_include_dirs)
-    srtp_rtp_c_args = '-DHAVE_SRTP'
+    srtp_dep = declare_dependency(
+        link_with: srtp_lib,
+        include_directories: include_directories('.'),
+        dependencies: gcrypt_dep,
+        compile_args: '-DHAVE_SRTP')
 else
-    srtp_lib = 
-    srtp_rtp_c_args = 
+    srtp_dep = disabler()
 endif
 
 vlc_modules += {
     'name': 'rtp',
-    'sources': 
+    'sources':
         files(
             'input.c',
             'sdp.c',
@@ -27,9 +30,8 @@
             'rtp.c',
             'rtp.h',
         ),
-    'dependencies': socket_libs,
-    'link_with': rtp_lib, srtp_lib,
-    'c_args': srtp_rtp_c_args,
+    'dependencies': socket_libs, srtp_dep,
+    'link_with': rtp_lib,
 }
 
 vlc_modules += {

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/rtp/mpeg4.c Added

@@ -0,0 +1,391 @@
+/**
+ * @file mpeg4.c
+ */
+/*****************************************************************************
+ * Copyright (C) 2024 VideoLabs, VLC authors and VideoLAN
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ ****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <assert.h>
+
+#include "h26x.h"
+#include "fmtp.h"
+#include "../../packetizer/mpeg4audio.h"
+#include "../../packetizer/mpeg4systems.h"
+
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_bits.h>
+
+struct mpeg4_pt_opaque
+{
+    // RFC 3640
+    uint8_t streamType;
+    uint8_t sizeLength;
+    uint8_t indexLength;
+    uint8_t indexDeltaLength;
+    uint8_t constantSize;
+    uint8_t CTSDeltaLength;
+    uint8_t DTSDeltaLength;
+    uint8_t randomAccessIndication;
+    uint8_t auxiliaryDataSizeLength;
+    // RFC 6416
+    uint8_t object_id;
+    // unsigned profile_level_id;
+    block_t *config;
+    vlc_object_t *obj;
+};
+
+static void *rtp_mpeg4_init(struct vlc_rtp_pt *pt, es_format_t *fmt)
+{
+    struct mpeg4_pt_opaque *opaque = pt->opaque;
+    block_t *config = opaque->config;
+    enum es_format_category_e es_cat = fmt->i_cat;
+    struct rtp_h26x_sys *sys = malloc(sizeof(*sys));
+    if(!sys)
+        return NULL;
+    rtp_h26x_init(sys);
+
+    sys->p_packetizer = demux_PacketizerNew(opaque->obj, fmt, "rtp packetizer");
+    if(!sys->p_packetizer)
+    {
+        free(sys);
+        return NULL;
+    }
+
+    sys->es = vlc_rtp_pt_request_es(pt, &sys->p_packetizer->fmt_out);
+    if(config && es_cat == VIDEO_ES)
+        sys->xps = block_Duplicate(config);
+
+    return sys;
+}
+
+static void *rtp_mpeg4v_init(struct vlc_rtp_pt *pt)
+{
+    es_format_t fmt;
+    es_format_Init (&fmt, VIDEO_ES, VLC_CODEC_MP4V);
+    fmt.b_packetized = false;
+    return rtp_mpeg4_init(pt, &fmt);
+}
+
+static vlc_fourcc_t audioObjectTypeToCodec(uint8_t objectType)
+{
+    switch(objectType)
+    {
+    case MPEG4_AOT_AAC_MAIN:
+    case MPEG4_AOT_AAC_LC:
+    case MPEG4_AOT_AAC_SSR:
+    case MPEG4_AOT_AAC_LTP:
+    case MPEG4_AOT_AAC_SBR:
+    case MPEG4_AOT_AAC_SC:
+    case MPEG4_AOT_SSC:
+    case MPEG4_AOT_AAC_PS:
+    case MPEG4_AOT_ER_AAC_LC:
+    case MPEG4_AOT_ER_AAC_LTP:
+    case MPEG4_AOT_ER_AAC_SC:
+    case MPEG4_AOT_ER_BSAC:
+    case MPEG4_AOT_ER_AAC_LD:
+    case MPEG4_AOT_ER_AAC_ELD:
+        return VLC_CODEC_MP4A;
+    case MPEG4_AOT_CELP:
+    case MPEG4_AOT_ER_CELP:
+        return VLC_CODEC_QCELP;
+    default:
+        return 0;
+    }
+}
+
+static void *rtp_mpeg4a_init(struct vlc_rtp_pt *pt)
+{
+    struct mpeg4_pt_opaque *opaque = pt->opaque;
+    es_format_t fmt;
+    es_format_Init(&fmt, AUDIO_ES, 0);
+    fmt.b_packetized = false;
+
+    if(!opaque->sizeLength && !opaque->constantSize) // RFC 6416 is MP4A-LATM
+    {
+        fmt.i_codec = audioObjectTypeToCodec(opaque->object_id);
+        fmt.i_original_fourcc = VLC_FOURCC('L','A','T','M');
+    }
+    else // RFC 3640 MPEG4-GENERIC
+    {
+        const block_t *config = opaque->config;
+        if(config)
+        {
+            bs_t bs;
+            bs_init(&bs, config->p_buffer, config->i_buffer);
+            MPEG4_asc_t cfg = {0};
+            if(MPEG4_read_AudioSpecificConfig(&bs, &cfg, false) == VLC_SUCCESS)
+            {
+                fmt.i_codec = audioObjectTypeToCodec(cfg.i_object_type);
+                fmt.audio.i_rate = cfg.i_samplerate;
+            }
+            else fmt.i_codec = VLC_CODEC_MP4A;
+        }
+        else
+        {
+            fmt.i_codec = VLC_CODEC_MP4A;
+        }
+    }
+
+    return rtp_mpeg4_init(pt, &fmt);
+}
+
+static void rtp_mpeg4_destroy(struct vlc_rtp_pt *pt, void *data)
+{
+    VLC_UNUSED(pt);
+    struct rtp_h26x_sys *sys = data;
+    if(sys)
+    {
+        if(sys->p_packetizer)
+            demux_PacketizerDestroy(sys->p_packetizer);
+        vlc_rtp_es_destroy(sys->es);
+        rtp_h26x_clear(sys);
+        free(sys);
+    }
+}
+
+static void rtp_mpeg4_decode(struct vlc_rtp_pt *pt, void *data, block_t *block,
+                             const struct vlc_rtp_pktinfo *restrict info)
+{
+    struct mpeg4_pt_opaque *opaque = pt->opaque;
+    struct rtp_h26x_sys *sys = data;
+
+    if(opaque->sizeLength && block->i_buffer > 2)
+    {
+        uint32_t auIndex = (uint32_t) -1;
+
+        uint16_t auHeadersLength = GetWBE(block->p_buffer);
+        size_t data_section_offset = 2 + (auHeadersLength + 7) / 8;
+        if(data_section_offset + 2 >= block->i_buffer)
+            goto drop;
+
+        /* AUX header parsing */
+        if(opaque->auxiliaryDataSizeLength)
+        {
+            const uint8_t *auxheader_data = &block->p_bufferdata_section_offset;
+            size_t auxheader_data_size = block->i_buffer - data_section_offset;
+            bs_t bs;
+            bs_init(&bs, auxheader_data, auxheader_data_size);
+            uint32_t auxSize = bs_read(&bs, opaque->auxiliaryDataSizeLength);
+            data_section_offset += (auxheader_data_size + auxSize + 7) / 8;
+            if(data_section_offset >= block->i_buffer)
+                goto drop;
+        }
+
+        const uint8_t *data_section = &block->p_bufferdata_section_offset;
+        size_t data_section_size = block->i_buffer - data_section_offset;
+
+        /* AU header parsing */
+        bs_t bs;
+        bs_init(&bs, &block->p_buffer2, block->i_buffer - 2);
+
+        while(auHeadersLength >= 8)
+        {
+            /* Get values from current AU header */
+            size_t pos = bs_pos(&bs);
+            uint32_t auSize = opaque->constantSize
+                            ? opaque->constantSize
+                            : bs_read(&bs, opaque->sizeLength);
+            if(opaque->indexLength)
+            {
+                uint32_t auDeltaIndex = 0;
+                if(auIndex == (uint32_t) -1)
+                    auIndex = bs_read(&bs, opaque->indexLength);
+                else
+                    auDeltaIndex = bs_read(&bs, opaque->indexDeltaLength);
+                VLC_UNUSED(auDeltaIndex); // for when we'll reorder
+            }
+
+            uint32_t CTSDelta = 0, DTSDelta = 0, RAPFlag = 0;
+            if(opaque->CTSDeltaLength && bs_read(&bs, 1))
+                CTSDelta = bs_read(&bs, opaque->CTSDeltaLength);
+
+            if(opaque->DTSDeltaLength && bs_read(&bs, 1))
+                DTSDelta = bs_read(&bs, opaque->DTSDeltaLength);
+
+            if(opaque->randomAccessIndication)
+                RAPFlag = bs_read(&bs, 1);
+
+            if(data_section_size < auSize)
+                goto drop;
+
+            /* Extract AU payload data using the current AU header */
+            block_t *au = block_Alloc(auSize);
+            if(au)
+            {
+                memcpy(au->p_buffer, data_section, auSize);
+                if(CTSDelta)
+                    block->i_pts += vlc_tick_from_samples(CTSDelta, pt->frequency);
+                if(DTSDelta)
+                    block->i_dts = block->i_pts - vlc_tick_from_samples(DTSDelta, pt->frequency);
+                if(RAPFlag)
+                    block->i_flags |= BLOCK_FLAG_TYPE_I;
+                h26x_output(sys, au, block->i_pts, true, info->m);
+            }
+            data_section += auSize;
+            data_section_size -= auSize;
+
+            if(bs_eof(&bs) || bs_error(&bs))
+                break;
+            auHeadersLength -= bs_pos(&bs) - pos;
+        }
+    }
+    else
+    {
+        h26x_output(sys, block, block->i_pts, true, info->m);
+        return;
+    }
+
+drop:
+    block_Release(block);
+}
+
+static void rtp_mpeg4_release(struct vlc_rtp_pt *pt)
+{
+    struct mpeg4_pt_opaque *opaque = pt->opaque;
+    if(opaque->config)
+        block_Release(opaque->config);
+    free(opaque);
+}
+
+static const struct vlc_rtp_pt_operations rtp_mpeg4v_ops = {
+    rtp_mpeg4_release, rtp_mpeg4v_init, rtp_mpeg4_destroy, rtp_mpeg4_decode,
+};
+
+static const struct vlc_rtp_pt_operations rtp_mpeg4a_ops = {
+    rtp_mpeg4_release, rtp_mpeg4a_init, rtp_mpeg4_destroy, rtp_mpeg4_decode,
+};
+
+static char hex_to_dec(char c)
+{
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    if (c >= 'A' && c <= 'F')
+        return  c - 'A' + 10;
+    if (c >= 'a' && c <= 'f')
+        return c - 'a' + 10;
+    return  0;
+}
+
+static block_t * mpeg4_decode_config(const char *psz, size_t len)
+{
+    len &= ~1U;
+    if(len == 0)
+        return NULL;
+    block_t *config = block_Alloc(len/2);
+    if(config)
+    {
+        config->i_buffer = 0;
+        for(size_t i=0; i<len; i+=2)
+        {
+            uint8_t v = hex_to_dec(pszi) << 4;
+            v |= hex_to_dec(pszi+1);
+            config->p_bufferconfig->i_buffer++ = v;
+        }
+    }
+    return config;
+}
+
+static int rtp_mpeg4_open(vlc_object_t *obj, struct vlc_rtp_pt *pt,
+                          const struct vlc_sdp_pt *desc)
+{
+    VLC_UNUSED(obj);
+    size_t sprop_len;
+    const char *sprop;
+    struct mpeg4_pt_opaque tmpOpaque = {0};
+
+    /* IETF RFC 6416 */
+    if (vlc_ascii_strcasecmp(desc->name, "MP4V-ES") == 0)
+        pt->ops = &rtp_mpeg4v_ops;
+    else if (vlc_ascii_strcasecmp(desc->name, "MP4A-LATM") == 0)
+        pt->ops = &rtp_mpeg4a_ops;
+    /* IETF RFC 3640 */
+    else if (vlc_ascii_strcasecmp(desc->name, "MPEG4-GENERIC") == 0)
+    {
+        sprop = vlc_sdp_fmtp_get_str(desc, "streamType", &sprop_len);
+        if (sprop && sprop_len)
+        {
+            tmpOpaque.streamType = strtod(sprop, NULL);
+            if(tmpOpaque.streamType == MPEG4_ST_VISUAL_STREAM)
+                pt->ops = &rtp_mpeg4v_ops;
+            else if(tmpOpaque.streamType == MPEG4_ST_AUDIO_STREAM)
+                pt->ops = &rtp_mpeg4a_ops;
+            else
+                return VLC_ENOTSUP;
+        }
+        /* FFmpeg does not set the streamType accordingly */
+        else pt->ops = &rtp_mpeg4a_ops;
+
+        /* Get variables for our AU header */
+        vlc_sdp_fmtp_get(desc, "sizeLength", &tmpOpaque.sizeLength);
+        if (tmpOpaque.sizeLength)
+        {
+            vlc_sdp_fmtp_get(desc, "indexLength", &tmpOpaque.indexLength);
+            vlc_sdp_fmtp_get(desc, "indexDeltaLength", &tmpOpaque.indexDeltaLength);
+        }
+        else
+        {
+            vlc_sdp_fmtp_get(desc, "constantSize", &tmpOpaque.constantSize);
+        }
+
+        vlc_sdp_fmtp_get(desc, "CTSDeltaLength", &tmpOpaque.CTSDeltaLength);
+        vlc_sdp_fmtp_get(desc, "DTSDeltaLength", &tmpOpaque.DTSDeltaLength);
+        vlc_sdp_fmtp_get(desc, "randomAccessIndication", &tmpOpaque.randomAccessIndication);
+        vlc_sdp_fmtp_get(desc, "auxiliaryDataSizeLength", &tmpOpaque.auxiliaryDataSizeLength);
+
+        // if(!tmpOpaque.constantSize && !tmpOpaque.sizeLength)
+        //     return VLC_EINVAL;
+    }
+    else
+        return VLC_ENOTSUP;
+
+    struct mpeg4_pt_opaque *opaque = calloc(1, sizeof(*opaque));
+    if(!opaque)
+        return VLC_ENOMEM;
+    pt->opaque = opaque;
+
+    *opaque = tmpOpaque;
+    opaque->obj = obj;
+
+    // vlc_sdp_fmtp_get(desc, "profile-level-id", &opaque->profile_level_id);
+    vlc_sdp_fmtp_get(desc, "object", &opaque->object_id);
+
+    /*
+     * Video:
+     *  - RFC 3640: Not defined (generic)
+     *  - RFC 6416: MPEG-4 Visual configuration
+     * Audio:
+     *  - RFC 3640: AudioSpecificConfig() element
+     *  - RFC 6416: StreamMuxConfig() element
+     */
+    sprop = vlc_sdp_fmtp_get_str(desc, "config", &sprop_len);
+    if (sprop && sprop_len)
+        opaque->config = mpeg4_decode_config(sprop, sprop_len);
+
+    return VLC_SUCCESS;
+}
+
+vlc_module_begin()
+    set_shortname(N_("RTP MPEG-4"))
+    set_description(N_("RTP MPEG-4 Visual and Audio payload parser"))
+    set_subcategory(SUBCAT_INPUT_DEMUX)
+    set_rtp_parser_callback(rtp_mpeg4_open)
+    add_shortcut("video/MP4V-ES", "audio/MP4A-LATM", "video/MPEG4-GENERIC", "audio/MPEG4-GENERIC")
+    vlc_module_end()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/rtp/xiph.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/rtp/xiph.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/screen/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/screen/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/smb2.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/smb2.c Changed

@@ -119,7 +119,11 @@
     struct smb2_context *   smb2;
     struct smb2fh *         smb2fh;
     struct smb2dir *        smb2dir;
+#ifdef LIBSMB2_SHARE_ENUM_V2
+    struct srvsvc_NetrShareEnum_rep *share_enum;
+#else
     struct srvsvc_netshareenumall_rep *share_enum;
+#endif
     uint64_t                smb2_size;
     vlc_url_t               encoded_url;
     bool                    eof;
@@ -165,7 +169,7 @@
 }
 
 static int
-smb2_check_status(struct vlc_smb2_op *op, const char *psz_func, int status)
+vlc_smb2_check_status(struct vlc_smb2_op *op, const char *psz_func, int status)
 {
     if (status < 0)
     {
@@ -183,12 +187,12 @@
 }
 
 static void
-smb2_set_error(struct vlc_smb2_op *op, const char *psz_func, int err)
+vlc_smb2_set_error(struct vlc_smb2_op *op, const char *psz_func, int err)
 {
     if (op->log && err != -EINTR)
         vlc_error(op->log, "%s failed: %d, %s", psz_func, err, smb2_get_error(op->smb2));
 
-    /* Don't override if set via smb2_check_status */
+    /* Don't override if set via vlc_smb2_check_status */
     if (op->error_status == 0)
         op->error_status = err;
 
@@ -198,10 +202,10 @@
 }
 
 #define VLC_SMB2_CHECK_STATUS(op, status) \
-    smb2_check_status(op, __func__, status)
+    vlc_smb2_check_status(op, __func__, status)
 
 #define VLC_SMB2_SET_ERROR(op, func, err) \
-    smb2_set_error(op, func, err)
+    vlc_smb2_set_error(op, func, err)
 
 #define VLC_SMB2_STATUS_DENIED(x) (x == -ECONNREFUSED || x == -EACCES)
 
@@ -487,17 +491,33 @@
     struct vlc_readdir_helper rdh;
     vlc_readdir_helper_init(&rdh, access, p_node);
 
+#ifdef LIBSMB2_SHARE_ENUM_V2
+    struct srvsvc_SHARE_INFO_1_CONTAINER *ctr = &sys->share_enum->ses.ShareInfo.Level1;
+    size_t ctr_count = ctr->EntriesRead;
+#else
     struct srvsvc_netsharectr *ctr = sys->share_enum->ctr;
+    size_t ctr_count = ctr->ctr1.count;
+#endif
+
     for (uint32_t iinfo = 0;
-         iinfo < ctr->ctr1.count && ret == VLC_SUCCESS; ++iinfo)
+         iinfo < ctr_count && ret == VLC_SUCCESS; ++iinfo)
     {
+#ifdef LIBSMB2_SHARE_ENUM_V2
+       struct srvsvc_SHARE_INFO_1 *info = &ctr->Buffer->share_info_1iinfo;
+       const char *name = info->netname.utf8;
+       uint32_t type = info->type;
+#else
        struct srvsvc_netshareinfo1 *info = &ctr->ctr1.arrayiinfo;
-       if (info->type & SHARE_TYPE_HIDDEN)
+       const char *name = info->name;
+       uint32_t type = info->type;
+#endif
+
+       if (type & SHARE_TYPE_HIDDEN)
            continue;
-       switch (info->type & 0x3)
+       switch (type & 0x3)
        {
            case SHARE_TYPE_DISKTREE:
-               ret = AddItem(access, &rdh, info->name, ITEM_TYPE_DIRECTORY, NULL);
+               ret = AddItem(access, &rdh, name, ITEM_TYPE_DIRECTORY, NULL);
                break;
        }
     }
@@ -551,25 +571,25 @@
 {
     struct access_sys *sys = access->p_sys;
 
-    struct sockaddr_storage addr;
-    if (getsockname(smb2_get_fd(sys->smb2), (struct sockaddr *)&addr,
-                    &(socklen_t){ sizeof(addr) }) != 0)
+    vlc_sockaddr addr;
+    if (getsockname(smb2_get_fd(sys->smb2), &addr.sa,
+                    &(socklen_t){ sizeof(addr.ss) }) != 0)
         return;
 
-    void *sin_addr;
-    switch (addr.ss_family)
+    const void *sin_addr;
+    switch (addr.ss.ss_family)
     {
         case AF_INET6:
-            sin_addr = &((struct sockaddr_in6 *)&addr)->sin6_addr;
+            sin_addr = &addr.sin6.sin6_addr;
             break;
         case AF_INET:
-            sin_addr = &((struct sockaddr_in *)&addr)->sin_addr;
+            sin_addr = &addr.sin.sin_addr;
             break;
         default:
             return;
     }
     char ipINET6_ADDRSTRLEN;
-    if (inet_ntop(addr.ss_family, sin_addr, ip, sizeof(ip)) == NULL)
+    if (inet_ntop(addr.ss.ss_family, sin_addr, ip, sizeof(ip)) == NULL)
         return;
 
     if (strcmp(ip, sys->encoded_url.psz_host) == 0)
@@ -589,7 +609,13 @@
 
     int ret;
     if (do_enum)
+    {
+#ifdef LIBSMB2_SHARE_ENUM_V2
+        ret = smb2_share_enum_async(op.smb2, SHARE_INFO_1, smb2_open_cb, &op);
+#else
         ret = smb2_share_enum_async(op.smb2, smb2_open_cb, &op);
+#endif
+    }
     else
     {
         ret = smb2_stat_async(op.smb2, smb2_url->path, &smb2_stat,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/unc.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/unc.c Changed

@@ -45,8 +45,8 @@
 
 typedef struct
 {
-    int i_smb;
-    uint64_t size;
+    HANDLE h;
+    LARGE_INTEGER size;
     vlc_url_t url;
 } access_sys_t;
 
@@ -120,15 +120,16 @@
     access_sys_t *p_sys = p_access->p_sys;
     int64_t      i_ret;
 
-    if( i_pos >= INT64_MAX )
+    if( i_pos >= LONG_LONG_MAX )
         return VLC_EGENERIC;
 
     msg_Dbg( p_access, "seeking to %"PRId64, i_pos );
 
-    i_ret = lseek( p_sys->i_smb, i_pos, SEEK_SET );
-    if( i_ret == -1 )
+    LARGE_INTEGER pos;
+    pos.QuadPart = i_pos;
+    if( !SetFilePointerEx( p_sys->h, pos, NULL, FILE_BEGIN) )
     {
-        msg_Err( p_access, "seek failed (%s)", vlc_strerror_c(errno) );
+        msg_Err( p_access, "seek failed (%lu)", GetLastError() );
         return VLC_EGENERIC;
     }
 
@@ -138,13 +139,12 @@
 static ssize_t Read( stream_t *p_access, void *p_buffer, size_t i_len )
 {
     access_sys_t *p_sys = p_access->p_sys;
-    int i_read;
+    DWORD i_read;
 
-    i_read = read( p_sys->i_smb, p_buffer, i_len );
-    if( i_read < 0 )
+    if( !ReadFile(p_sys->h, p_buffer, i_len, &i_read, NULL) )
     {
-        msg_Err( p_access, "read failed (%s)", vlc_strerror_c(errno) );
-        i_read = 0;
+        msg_Err( p_access, "read failed (%lu)", GetLastError() );
+        return -1;
     }
 
     return i_read;
@@ -246,7 +246,9 @@
     case STREAM_GET_SIZE:
         if( p_access->pf_readdir != NULL )
             return VLC_EGENERIC;
-        *va_arg( args, uint64_t * ) = sys->size;
+        if( sys->size.QuadPart == LONG_LONG_MIN )
+            return VLC_EGENERIC;
+        *va_arg( args, uint64_t * ) = sys->size.QuadPart;
         break;
 
     case STREAM_GET_PTS_DELAY:
@@ -270,9 +272,9 @@
     stream_t *access = (stream_t *)obj;
     vlc_url_t url;
     vlc_credential credential;
-    char *psz_decoded_path = NULL, *psz_uri = NULL, *psz_var_domain = NULL;
-    int fd;
-    uint64_t size;
+    char *psz_decoded_path = NULL, *psz_var_domain = NULL;
+    HANDLE h;
+    wchar_t *w_uri;
     bool is_dir;
 
     if (vlc_UrlParseFixup(&url, access->psz_url) != 0)
@@ -305,7 +307,7 @@
 
     for (;;)
     {
-        struct stat st;
+        char *psz_uri;
 
         if (smb_get_uri(access, &psz_uri,
                         credential.psz_username, credential.psz_password,
@@ -318,19 +320,20 @@
             return VLC_ENOMEM;
         }
 
-        if (stat(psz_uri, &st) == 0)
+        w_uri = ToWide( psz_uri );
+        free( psz_uri );
+        if( unlikely(w_uri == NULL) )
+            break;
+
+        DWORD f = GetFileAttributesW( w_uri );
+        if (f == INVALID_FILE_ATTRIBUTES)
         {
-            is_dir = S_ISDIR(st.st_mode) != 0;
-            size = st.st_size;
+            free( w_uri );
+            w_uri = NULL;
             break;
         }
 
-        /* stat() fails with servers or shares. Assume directory. */
-        is_dir = true;
-        size = 0;
-
-        if (errno != EACCES)
-            break;
+        is_dir = (f & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY;
 
         errno = 0;
         if (vlc_credential_get(&credential, access, "smb-user",
@@ -344,11 +347,17 @@
     free(psz_var_domain);
     free(psz_decoded_path);
 
+    if ( w_uri == NULL)
+    {
+        vlc_UrlClean(&url);
+        return VLC_EGENERIC;
+    }
+
     /* Init access */
     access_sys_t *sys = vlc_obj_calloc(obj, 1, sizeof (*sys));
     if (unlikely(sys == NULL))
     {
-        free(psz_uri);
+        free(w_uri);
         vlc_UrlClean(&url);
         return VLC_ENOMEM;
     }
@@ -360,20 +369,31 @@
         sys->url = url;
         access->pf_readdir = DirRead;
         access->pf_control = access_vaDirectoryControlHelper;
-        fd = -1;
+        h = INVALID_HANDLE_VALUE;
     }
     else
     {
+        vlc_UrlClean(&url);
+        h = CreateFileW(w_uri, GENERIC_READ,
+            FILE_SHARE_READ | FILE_SHARE_WRITE,
+            NULL, OPEN_EXISTING,
+            FILE_FLAG_RANDOM_ACCESS, NULL);
+        if (h == INVALID_HANDLE_VALUE)
+        {
+            free(w_uri);
+            return VLC_EACCES;
+        }
+
         access->pf_read = Read;
         access->pf_control = Control;
         access->pf_seek = Seek;
-        fd = open(psz_uri, O_RDONLY, 0);
-        vlc_UrlClean(&url);
+
+        if (!GetFileSizeEx(h, &sys->size))
+            sys->size.QuadPart = LONG_LONG_MIN;
     }
-    free(psz_uri);
+    free(w_uri);
 
-    sys->size = size;
-    sys->i_smb = fd;
+    sys->h = h;
 
     return VLC_SUCCESS;
 }
@@ -384,7 +404,7 @@
     access_sys_t *sys = access->p_sys;
 
     vlc_UrlClean(&sys->url);
-    close(sys->i_smb);
+    CloseHandle(sys->h);
 }
 
 vlc_module_begin()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access/v4l2/video.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access/v4l2/video.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/access_output/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/access_output/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/audio_filter/channel_mixer/spatialaudio.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_filter/channel_mixer/spatialaudio.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/audio_filter/spatializer/spatializer.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_filter/spatializer/spatializer.cpp Changed

@@ -45,6 +45,8 @@
 #include "revmodel.hpp"
 #define SPAT_AMP 0.3
 
+#include <array>
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -121,14 +123,13 @@
 
 } // namespace
 
-static const callback_s callbacks = {
+static const std::array<callback_s, 5> callbacks = {{
     { "spatializer-roomsize", RoomCallback,  &revmodel::setroomsize },
     { "spatializer-width",    WidthCallback, &revmodel::setwidth },
     { "spatializer-wet",      WetCallback,   &revmodel::setwet },
     { "spatializer-dry",      DryCallback,   &revmodel::setdry },
     { "spatializer-damp",     DampCallback,  &revmodel::setdamp }
-};
-enum { num_callbacks=sizeof(callbacks)/sizeof(callback_s) };
+}};
 
 static block_t *DoWork( filter_t *, block_t * );
 
@@ -141,10 +142,9 @@
     vlc_object_t *p_aout = vlc_object_parent(p_filter);
 
     /* Delete the callbacks */
-    for(unsigned i=0;i<num_callbacks;++i)
+    for (const auto& cb : callbacks)
     {
-        var_DelCallback( p_aout, callbacksi.psz_name,
-                         callbacksi.fp_callback, p_sys );
+        var_DelCallback(p_aout, cb.psz_name, cb.fp_callback, p_sys);
     }
 
     delete p_sys->p_reverbm;
@@ -177,29 +177,26 @@
 
     vlc_mutex_init( &p_sys->lock );
 
-    for(unsigned i=0;i<num_callbacks;++i)
+    for (const auto& cb : callbacks)
     {
         /* NOTE: C++ pointer-to-member function call from table lookup. */
-        (p_sys->p_reverbm->*(callbacksi.fp_set))
-            (var_CreateGetFloatCommand(p_aout,callbacksi.psz_name));
-        var_AddCallback( p_aout, callbacksi.psz_name,
-                         callbacksi.fp_callback, p_sys );
+        float value = var_CreateGetFloatCommand(p_aout, cb.psz_name);
+        (p_sys->p_reverbm->*(cb.fp_set))(value);
+        var_AddCallback(p_aout, cb.psz_name, cb.fp_callback, p_sys);
     }
 
     p_filter->fmt_in.audio.i_format = VLC_CODEC_FL32;
     aout_FormatPrepare(&p_filter->fmt_in.audio);
     p_filter->fmt_out.audio = p_filter->fmt_in.audio;
 
-    static const struct FilterOperationInitializer {
+    static const struct vlc_filter_operations filter_ops = {
         struct vlc_filter_operations ops {};
-        FilterOperationInitializer()
-        {
-            ops.filter_audio = DoWork;
-            ops.close = Close;
-        }
-    } filter_ops;
+        ops.filter_audio = DoWork;
+        ops.close = Close;
+        return ops;
+    }();
 
-    p_filter->ops = &filter_ops.ops;
+    p_filter->ops = &filter_ops;
     return VLC_SUCCESS;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/audio_output/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_output/Makefile.am Changed

@@ -1,5 +1,9 @@
 aoutdir = $(pluginsdir)/audio_output
 aout_LTLIBRARIES =
+# Install the pkglib/pkglibexec first before relinking the modules.
+# This ensures libtool re-linking is not racy.
+installaoutLTLIBRARIES = install-aoutLTLIBRARIES
+$(installaoutLTLIBRARIES): install-pkglibLTLIBRARIES
 
 libvlc_android_audioformat_jni_la_SOURCES = \
 	audio_output/android/audioformat_jni.c \
@@ -61,6 +65,21 @@
 aout_LTLIBRARIES += libalsa_plugin.la
 endif
 
+libvlc_pipewire_la_SOURCES = audio_output/vlc_pipewire.c audio_output/vlc_pipewire.h
+libvlc_pipewire_la_CFLAGS = $(AM_CFLAGS) $(PIPEWIRE_CFLAGS)
+libvlc_pipewire_la_LIBADD = $(PIPEWIRE_LIBS) $(LTLIBVLCCORE)
+libvlc_pipewire_la_LDFLAGS = \
+	-no-undefined \
+	-export-symbols-regex ^vlc_pw_ \
+	-version-info 0:0:0
+libaout_pipewire_plugin_la_SOURCES = audio_output/pipewire.c
+libaout_pipewire_plugin_la_CFLAGS = $(AM_CFLAGS) $(PIPEWIRE_CFLAGS)
+libaout_pipewire_plugin_la_LIBADD = libvlc_pipewire.la $(PIPEWIRE_LIBS) $(LIBM)
+if HAVE_PIPEWIRE
+pkglib_LTLIBRARIES += libvlc_pipewire.la
+aout_LTLIBRARIES += libaout_pipewire_plugin.la
+endif
+
 libvlc_pulse_la_SOURCES = audio_output/vlcpulse.c audio_output/vlcpulse.h
 libvlc_pulse_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
 libvlc_pulse_la_LIBADD = $(PULSE_LIBS) $(LTLIBVLCCORE)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/audio_output/android/audioformat_jni.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_output/android/audioformat_jni.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/audio_output/android/audiotrack.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_output/android/audiotrack.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/audio_output/android/device.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_output/android/device.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/audio_output/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_output/meson.build Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_output/pipewire.c Added

@@ -0,0 +1,925 @@
+/*****************************************************************************
+ * pipewire.c: PipeWire audio output plugin for VLC
+ *****************************************************************************
+ * Copyright (C) 2022 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+#include <ctype.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <search.h>
+#include <spa/param/audio/format-utils.h>
+#include <spa/param/props.h>
+#include <pipewire/pipewire.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
+#include <vlc_tick.h>
+#include "vlc_pipewire.h"
+
+struct vlc_pw_stream {
+    struct vlc_pw_context *context;
+    struct pw_stream *stream;
+    struct spa_hook listener;
+    size_t stride;
+
+    struct {
+        vlc_frame_t *head;
+        vlc_frame_t **tailp;
+        size_t size;
+    } queue;
+
+    struct {
+        vlc_tick_t pts;
+        ptrdiff_t frames;
+        unsigned int rate;
+        uint64_t injected;
+        vlc_tick_t next_update;
+    } time;
+
+    vlc_tick_t start;
+    vlc_tick_t first_pts;
+    bool starting;
+    bool draining;
+    bool error;
+
+    audio_output_t *aout;
+};
+
+/**
+ * Stream control callback.
+ *
+ * This monitors the stream for control changes and reports them as applicable.
+ */
+static void stream_control_info(void *data, uint32_t id,
+                                const struct pw_stream_control *control)
+{
+    struct vlc_pw_stream *s = data;
+
+    vlc_pw_debug(s->context, "control %"PRIu32" %s", id, control->name);
+
+    switch (id) {
+        case SPA_PROP_mute:
+            aout_MuteReport(s->aout, control->values0 != 0.f);
+            break;
+
+        case SPA_PROP_channelVolumes: {
+            float vol = 0.f;
+
+            for (size_t i = 0; i < control->n_values; i++)
+                 vol = fmaxf(vol, control->valuesi);
+
+            aout_VolumeReport(s->aout, vol);
+            break;
+        }
+    }
+}
+
+/**
+ * Stream state callback.
+ *
+ * This monitors the stream for state change, looking out for fatal errors.
+ */
+static void stream_state_changed(void *data, enum pw_stream_state old,
+                                 enum pw_stream_state state, const char *err)
+{
+    struct vlc_pw_stream *s = data;
+
+    if (state == PW_STREAM_STATE_ERROR)
+    {
+        vlc_pw_error(s->context, "stream error: %s", err);
+        s->error = true;
+    }
+    else
+        vlc_pw_debug(s->context, "stream %s",
+                     pw_stream_state_as_string(state));
+    if (old != state)
+        vlc_pw_signal(s->context);
+}
+
+/**
+ * Retrieve latest timings
+ */
+static int stream_update_latency(struct vlc_pw_stream *s, vlc_tick_t *now)
+{
+    struct pw_time ts;
+
+#if PW_CHECK_VERSION(1, 1, 0)
+    /* PW monotonic clock, same than vlc_tick_now() */
+    *now = VLC_TICK_FROM_NS(pw_stream_get_nsec(s->stream));
+#else
+    *now = vlc_tick_now();
+#endif
+
+    if (pw_stream_get_time_n(s->stream, &ts, sizeof (ts)) < 0
+     || ts.rate.denom == 0)
+        return -1;
+
+    s->time.pts = VLC_TICK_FROM_NS(ts.now);
+    s->time.pts += vlc_tick_from_frac(ts.delay * ts.rate.num, ts.rate.denom);
+    s->time.frames = ts.buffered + ts.queued;
+
+    return 0;
+}
+
+/**
+ * Stream processing callback.
+ *
+ * This fills in the next audio buffer.
+ */
+static void stream_process(void *data)
+{
+    struct vlc_pw_stream *s = data;
+    vlc_tick_t now;
+    int val = stream_update_latency(s, &now);
+    struct pw_buffer *b = pw_stream_dequeue_buffer(s->stream);
+
+    if (likely(b != NULL)) {
+        /* One should have more indirection layers than pizza condiments */
+        struct spa_buffer *buf = b->buffer;
+        struct spa_data *d = &buf->datas0;
+        struct spa_chunk *chunk = d->chunk;
+        unsigned char *dst = d->data;
+        size_t frame_room = d->maxsize / s->stride;
+        size_t room = frame_room * s->stride;
+        vlc_frame_t *block;
+
+        chunk->offset = 0;
+        chunk->stride = s->stride;
+        chunk->size = 0;
+
+        /* Adjust start time */
+        if (s->starting) {
+            /*
+             * If timing data is not available (val != 0), we can at least
+             * assume that the playback delay is no less than zero.
+             */
+            vlc_tick_t pts = (val == 0) ? s->time.pts : now;
+            vlc_tick_t gap = s->start - pts;
+            vlc_tick_t span = vlc_tick_from_samples(frame_room, s->time.rate);
+            size_t skip;
+
+            if (gap >= span) { /* Buffer too early, fill with silence */
+                vlc_pw_debug(s->context, "too early to start, silence");
+                skip = frame_room;
+
+            } else if (gap >= 0) {
+                vlc_pw_debug(s->context, "starting %s time",
+                             val ? "without" : "on");
+                skip = samples_from_vlc_tick(gap, s->time.rate);
+                s->starting = false;
+
+            } else {
+                vlc_pw_warn(s->context, "starting late");
+                skip = 0;
+                s->starting = false;
+            }
+
+            skip *= s->stride;
+            assert(skip <= room);
+            memset(dst, 0, skip);
+            dst += skip;
+            room -= skip;
+        }
+
+        if (!s->starting && s->time.pts != VLC_TICK_INVALID
+         && now >= s->time.next_update && s->first_pts != VLC_TICK_INVALID) {
+            vlc_tick_t elapsed = now - s->time.pts;
+            /* A sample injected now would be delayed by the following amount of vlc_tick_t */
+            vlc_tick_t delay = vlc_tick_from_samples(s->time.frames, s->time.rate)
+                             - elapsed;
+            vlc_tick_t audio_ts = vlc_tick_from_samples(s->time.injected, s->time.rate)
+                                + s->first_pts;
+            aout_TimingReport(s->aout, now + delay, audio_ts);
+            /* Once we have enough points to initiate the clock we can delay the reports */
+            if (now >= s->start + VLC_TICK_FROM_SEC(1))
+                s->time.next_update = now + VLC_TICK_FROM_SEC(1);
+        }
+
+        while ((block = s->queue.head) != NULL) {
+            size_t avail = block->i_buffer;
+            size_t length = (avail < room) ? avail : room;
+
+            memcpy(dst, block->p_buffer, length);
+            block->p_buffer += length;
+            block->i_buffer -= length;
+            dst += length;
+            room -= length;
+            chunk->size += length;
+            assert((length % s->stride) == 0);
+            const size_t written = length / s->stride;
+            s->time.injected += written;
+            s->queue.size -= length;
+
+            if (block->i_buffer > 0) {
+                assert(room == 0);
+                break;
+            }
+
+            s->queue.head = block->p_next;
+            vlc_frame_Release(block);
+        }
+
+        if (s->queue.head == NULL)
+            s->queue.tailp = &s->queue.head;
+
+        b->size = chunk->size / s->stride;
+        pw_stream_queue_buffer(s->stream, b);
+    }
+
+    if (s->queue.head == NULL && s->draining) {
+        s->first_pts = s->start = VLC_TICK_INVALID;
+        s->starting = false;
+        s->draining = false;
+        pw_stream_flush(s->stream, true);
+    }
+}
+
+/**
+ * Stream drain callback.
+ *
+ * This monitors the stream for completion of draining.
+ */
+static void stream_drained(void *data)
+{
+    struct vlc_pw_stream *s = data;
+
+    vlc_pw_debug(s->context, "stream drained");
+    aout_DrainedReport(s->aout);
+}
+
+static void stream_trigger_done(void *data)
+{
+    struct vlc_pw_stream *s = data;
+
+    vlc_pw_debug(s->context, "stream trigger done");
+}
+
+static const struct pw_stream_events stream_events = {
+    PW_VERSION_STREAM_EVENTS,
+    .state_changed = stream_state_changed,
+    .control_info = stream_control_info,
+    .process = stream_process,
+    .drained = stream_drained,
+    .trigger_done = stream_trigger_done,
+};
+
+static enum pw_stream_state vlc_pw_stream_get_state(struct vlc_pw_stream *s)
+{
+    /* PW Workaround: The error state can be notified via
+     * stream_state_changed() but never returned by pw_stream_get_state() */
+    return s->error ? PW_STREAM_STATE_ERROR
+                    : pw_stream_get_state(s->stream, NULL);
+}
+
+/**
+ * Queues an audio buffer for playback.
+ */
+static void vlc_pw_stream_play(struct vlc_pw_stream *s, vlc_frame_t *block,
+                               vlc_tick_t date)
+{
+    assert((block->i_buffer % s->stride) == 0);
+    vlc_pw_lock(s->context);
+    if (vlc_pw_stream_get_state(s) == PW_STREAM_STATE_ERROR) {
+        vlc_frame_Release(block);
+        goto out;
+    }
+
+    if (s->start == VLC_TICK_INVALID) {
+        /* Upon flush or drain, the stream is implicitly inactivated. This
+         * re-activates it. In other cases, this should be a no-op. */
+        pw_stream_set_active(s->stream, true);
+        assert(!s->starting);
+        s->starting = true;
+        s->time.next_update = VLC_TICK_0;
+        s->first_pts = block->i_pts;
+    }
+    if (s->starting)
+        s->start = date
+                 - vlc_tick_from_samples(s->queue.size / s->stride, s->time.rate);
+
+    *(s->queue.tailp) = block;
+    s->queue.tailp = &block->p_next;
+    s->queue.size += block->i_buffer;
+out:
+    s->draining = false;
+    vlc_pw_unlock(s->context);
+}
+
+/**
+ * Pauses or resumes the playback.
+ */
+static void vlc_pw_stream_set_pause(struct vlc_pw_stream *s, bool paused,
+                                    vlc_tick_t date)
+{
+    vlc_pw_lock(s->context);
+    pw_stream_set_active(s->stream, !paused);
+    s->time.pts = VLC_TICK_INVALID;
+    if (unlikely(s->starting)) {
+        assert(s->start != VLC_TICK_INVALID);
+        if (paused)
+            s->start -= date;
+        else
+            s->start += date;
+    }
+    vlc_pw_unlock(s->context);
+}
+
+/**
+ * Flushes (discards) all pending audio buffers.
+ */
+static void vlc_pw_stream_flush(struct vlc_pw_stream *s)
+{
+    vlc_pw_lock(s->context);
+    vlc_frame_ChainRelease(s->queue.head);
+    s->queue.head = NULL;
+    s->queue.tailp = &s->queue.head;
+    s->queue.size = 0;
+    s->time.pts = VLC_TICK_INVALID;
+    s->time.injected = 0;
+    s->first_pts = s->start = VLC_TICK_INVALID;
+    s->starting = false;
+    s->draining = false;
+    s->error = false;
+    pw_stream_flush(s->stream, false);
+    vlc_pw_unlock(s->context);
+}
+
+/**
+ * Starts draining.
+ *
+ * This flags the start of draining. stream_drained() will be called by the
+ * thread loop whence draining completes.
+ */
+static void vlc_pw_stream_drain(struct vlc_pw_stream *s)
+{
+    vlc_pw_lock(s->context);
+    bool empty = s->start == VLC_TICK_INVALID;
+    s->first_pts = s->start = VLC_TICK_INVALID;
+    if (vlc_pw_stream_get_state(s) == PW_STREAM_STATE_ERROR || empty)
+        stream_drained(s); /* Don't wait on a failed stream */
+    else if (s->queue.head == NULL)
+        pw_stream_flush(s->stream, true); /* Drain now */
+    else
+        s->draining = true; /* Let ->process() drain */
+    vlc_pw_unlock(s->context);
+}
+
+static void vlc_pw_stream_set_volume(struct vlc_pw_stream *s, float vol)
+{
+    const struct pw_stream_control *old;
+
+    vlc_pw_lock(s->context);
+    old = pw_stream_get_control(s->stream, SPA_PROP_channelVolumes);
+    if (old != NULL) {
+        float valuesSPA_AUDIO_MAX_CHANNELS;
+        float oldvol = 0.f;
+
+        assert(old->n_values <= ARRAY_SIZE(values));
+        /* Try to preserve the balance */
+        for (size_t i = 0; i < old->n_values; i++)
+            oldvol = fmaxf(oldvol, old->valuesi);
+
+        float delta = vol - oldvol;
+
+        for (size_t i = 0; i < old->n_values; i++)
+            valuesi = fmaxf(0.f, old->valuesi + delta);
+
+        pw_stream_set_control(s->stream, SPA_PROP_channelVolumes,
+                              old->n_values, values, 0);
+    }
+    vlc_pw_unlock(s->context);
+}
+
+static void vlc_pw_stream_set_mute(struct vlc_pw_stream *s, bool mute)
+{
+    float value = mute ? 1.f : 0.f;
+
+    vlc_pw_lock(s->context);
+    pw_stream_set_control(s->stream, SPA_PROP_mute, 1, &value, 0);
+    vlc_pw_unlock(s->context);
+}
+
+static void vlc_pw_stream_select_device(struct vlc_pw_stream *s,
+                                        const char *name)
+{
+    struct spa_dict_item items = {
+        SPA_DICT_ITEM_INIT(PW_KEY_OBJECT_SERIAL, name),
+    };
+    struct spa_dict dict = SPA_DICT_INIT(items, ARRAY_SIZE(items));
+
+    vlc_pw_debug(s->context, "setting object serial: %s", name);
+    vlc_pw_lock(s->context);
+    pw_stream_update_properties(s->stream, &dict);
+    vlc_pw_unlock(s->context);
+}
+
+static void vlc_pw_stream_destroy(struct vlc_pw_stream *s)
+{
+    vlc_pw_stream_flush(s);
+    vlc_pw_lock(s->context);
+    pw_stream_disconnect(s->stream);
+    pw_stream_destroy(s->stream);
+    vlc_pw_unlock(s->context);
+    free(s);
+}
+
+struct vlc_pw_aout {
+    struct vlc_pw_context *context;
+    struct vlc_pw_stream *stream;
+    struct spa_hook listener;
+    void *nodes;
+    struct {
+        uint64_t target;
+        float volume;
+        signed char mute;
+    } initial;
+};
+
+static struct vlc_pw_stream *vlc_pw_stream_create(audio_output_t *aout,
+                                           audio_sample_format_t *restrict fmt)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+    struct vlc_pw_context *ctx = sys->context;
+    struct spa_audio_info_raw rawfmt = {
+        .rate = fmt->i_rate,
+        .channels = fmt->i_channels,
+    };
+
+    enum spa_audio_iec958_codec encoding = SPA_AUDIO_IEC958_CODEC_PCM; /* PCM by default */
+
+    /* Map possible audio output formats */
+    switch (fmt->i_format) {
+        case VLC_CODEC_FL64:
+            rawfmt.format = SPA_AUDIO_FORMAT_F64;
+            break;
+        case VLC_CODEC_FL32:
+            rawfmt.format = SPA_AUDIO_FORMAT_F32;
+            break;
+        case VLC_CODEC_S32N:
+            rawfmt.format = SPA_AUDIO_FORMAT_S32;
+            break;
+        case VLC_CODEC_S16N:
+            rawfmt.format = SPA_AUDIO_FORMAT_S16;
+            break;
+        case VLC_CODEC_U8:
+            rawfmt.format = SPA_AUDIO_FORMAT_U8;
+            break;
+        case VLC_CODEC_A52:
+            fmt->i_format = VLC_CODEC_SPDIFL;
+            fmt->i_bytes_per_frame = 4;
+            fmt->i_frame_length = 1;
+            fmt->i_physical_channels = AOUT_CHANS_2_0;
+            fmt->i_channels = 2;
+            encoding = SPA_AUDIO_IEC958_CODEC_AC3;
+            break;
+        case VLC_CODEC_EAC3:
+            fmt->i_format = VLC_CODEC_SPDIFL;
+            fmt->i_bytes_per_frame = 4;
+            fmt->i_frame_length = 1;
+            fmt->i_physical_channels = AOUT_CHANS_2_0;
+            fmt->i_channels = 2;
+            encoding = SPA_AUDIO_IEC958_CODEC_EAC3;
+            break;
+        case VLC_CODEC_DTS:
+            fmt->i_format = VLC_CODEC_SPDIFL;
+            fmt->i_bytes_per_frame = 4;
+            fmt->i_frame_length = 1;
+            fmt->i_physical_channels = AOUT_CHANS_2_0;
+            fmt->i_channels = 2;
+            encoding = SPA_AUDIO_IEC958_CODEC_DTS;
+            break;
+        default:
+            vlc_pw_error(sys->context, "unknown format");
+            errno = ENOTSUP;
+            return NULL;
+    }
+
+    /* Map audio channels */
+    if (encoding == SPA_AUDIO_IEC958_CODEC_PCM)
+    {
+        size_t mapped = 0;
+
+        if (fmt->i_channels > SPA_AUDIO_MAX_CHANNELS) {
+            vlc_pw_error(sys->context, "too many channels");
+            errno = ENOTSUP;
+            return NULL;
+        }
+
+        static const unsigned char map = {
+            SPA_AUDIO_CHANNEL_FC,
+            SPA_AUDIO_CHANNEL_FL,
+            SPA_AUDIO_CHANNEL_FR,
+            0 /* unassigned */,
+            SPA_AUDIO_CHANNEL_RC,
+            SPA_AUDIO_CHANNEL_RL,
+            SPA_AUDIO_CHANNEL_RR,
+            0 /* unassigned */,
+            SPA_AUDIO_CHANNEL_SL,
+            SPA_AUDIO_CHANNEL_SR,
+            0 /* unassigned */,
+            0 /* unassigned */,
+            SPA_AUDIO_CHANNEL_LFE,
+        };
+
+        for (size_t i = 0; i < ARRAY_SIZE(map); i++)
+            if ((fmt->i_physical_channels >> i) & 1)
+                rawfmt.positionmapped++ = mapi;
+
+        while (mapped < fmt->i_channels) {
+            rawfmt.positionmapped = SPA_AUDIO_CHANNEL_START_Aux + mapped;
+            mapped++;
+        }
+    }
+
+    /* Assemble the stream format */
+    const struct spa_pod *params1;
+    unsigned char buf1024;
+    struct spa_pod_builder builder = SPA_POD_BUILDER_INIT(buf, sizeof (buf));
+
+    if (encoding == SPA_AUDIO_IEC958_CODEC_PCM)
+    {
+        params0 = spa_format_audio_raw_build(&builder, SPA_PARAM_EnumFormat,
+                                               &rawfmt);
+    }
+    else /* pass-through */
+    {
+        struct spa_audio_info_iec958 iecfmt = {
+            .rate = fmt->i_rate,
+            .codec = encoding
+        };
+        params0 = spa_format_audio_iec958_build(&builder, SPA_PARAM_EnumFormat,
+                                                  &iecfmt);
+    }
+
+    /* Assemble stream properties */
+    struct pw_properties *props;
+
+    props = pw_properties_new(PW_KEY_MEDIA_TYPE, "Audio",
+                              PW_KEY_MEDIA_CATEGORY, "Playback",
+                              NULL);
+    if (unlikely(props == NULL))
+        return NULL;
+
+    char *role = var_InheritString(aout, "role");
+    if (role != NULL) { /* Capitalise the first character */
+        pw_properties_setf(props, PW_KEY_MEDIA_ROLE, "%c%s",
+                           toupper((unsigned char)role0), role + 1);
+        free(role);
+    }
+
+    /* Create the stream */
+    struct vlc_pw_stream *s = malloc(sizeof (*s));
+    if (unlikely(s == NULL)) {
+        pw_properties_free(props);
+        return NULL;
+    }
+
+    enum pw_stream_flags flags =
+        PW_STREAM_FLAG_AUTOCONNECT |
+        PW_STREAM_FLAG_MAP_BUFFERS;
+        /*PW_STREAM_FLAG_EXCLUSIVE TODO*/
+    enum pw_stream_state state;
+
+    s->context = ctx;
+    s->listener = (struct spa_hook){ };
+    s->stride = fmt->i_bytes_per_frame;
+    s->queue.head = NULL;
+    s->queue.tailp = &s->queue.head;
+    s->queue.size = 0;
+    s->time.pts = VLC_TICK_INVALID;
+    s->time.rate = fmt->i_rate;
+    s->time.injected = 0;
+    s->first_pts = s->start = VLC_TICK_INVALID;
+    s->starting = false;
+    s->draining = false;
+    s->error = false;
+    s->aout = aout;
+
+    vlc_pw_lock(s->context);
+    s->stream = vlc_pw_stream_new(s->context, "audio stream", props);
+    if (unlikely(s->stream == NULL)) {
+        vlc_pw_unlock(s->context);
+        free(s);
+        return NULL;
+    }
+
+    if (sys->initial.target != SPA_ID_INVALID) {
+        char target21;
+        struct spa_dict_item items = {
+            SPA_DICT_ITEM_INIT(PW_KEY_TARGET_OBJECT, target),
+        };
+        struct spa_dict dict = SPA_DICT_INIT(items, ARRAY_SIZE(items));
+
+        snprintf(target, sizeof (target), "%"PRIu64, sys->initial.target);
+        pw_stream_update_properties(s->stream, &dict);
+    }
+
+    pw_stream_add_listener(s->stream, &s->listener, &stream_events, s);
+    pw_stream_connect(s->stream, PW_DIRECTION_OUTPUT, PW_ID_ANY, flags,
+                      params, ARRAY_SIZE(params));
+
+    if (encoding == SPA_AUDIO_IEC958_CODEC_PCM)
+    {
+        /* Wait for the PCM stream to be ready */
+        while ((state = vlc_pw_stream_get_state(s)) == PW_STREAM_STATE_CONNECTING)
+            vlc_pw_wait(s->context);
+    }
+    else
+    {
+        /* In case of passthrough, an error can be triggered just after the
+         * CONNECTING -> PAUSED state, so wait for the STREAMING state or any
+         * errors. */
+        while ((state = vlc_pw_stream_get_state(s)) == PW_STREAM_STATE_CONNECTING
+             || state == PW_STREAM_STATE_PAUSED)
+            vlc_pw_wait(s->context);
+    }
+    vlc_pw_unlock(s->context);
+
+    switch (state) {
+        case PW_STREAM_STATE_PAUSED:
+        case PW_STREAM_STATE_STREAMING:
+            break;
+        default:
+            vlc_pw_stream_destroy(s);
+            errno = ENOBUFS;
+            return NULL;
+    }
+
+    /* Apply initial controls */
+    sys->initial.target = SPA_ID_INVALID;
+
+    if (sys->initial.mute >= 0) {
+        vlc_pw_stream_set_mute(s, sys->initial.mute);
+        sys->initial.mute = -1;
+    }
+    if (!isnan(sys->initial.volume)) {
+        vlc_pw_stream_set_volume(s, sys->initial.volume);
+        sys->initial.volume = NAN;
+    }
+    return s;
+}
+
+static void Play(audio_output_t *aout, vlc_frame_t *block, vlc_tick_t date)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+    vlc_pw_stream_play(sys->stream, block, date);
+}
+
+static void Pause(audio_output_t *aout, bool paused, vlc_tick_t date)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+    vlc_pw_stream_set_pause(sys->stream, paused, date);
+}
+
+static void Flush(audio_output_t *aout)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+    vlc_pw_stream_flush(sys->stream);
+}
+
+static void Drain(audio_output_t *aout)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+    vlc_pw_stream_drain(sys->stream);
+}
+
+static void Stop(audio_output_t *aout)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+    vlc_pw_stream_destroy(sys->stream);
+    sys->stream = NULL;
+}
+
+static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+
+    sys->stream = vlc_pw_stream_create(aout, fmt);
+    return (sys->stream != NULL) ? VLC_SUCCESS : -errno;
+}
+
+static int VolumeSet(audio_output_t *aout, float volume)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+
+    if (sys->stream != NULL) {
+        vlc_pw_stream_set_volume(sys->stream, volume);
+        return 0;
+    }
+
+    sys->initial.volume = volume;
+    aout_VolumeReport(aout, volume);
+    return 0;
+}
+
+static int MuteSet(audio_output_t *aout, bool mute)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+
+    if (sys->stream != NULL) {
+        vlc_pw_stream_set_mute(sys->stream, mute);
+        return 0;
+    }
+
+    sys->initial.mute = mute;
+    aout_MuteReport(aout, mute);
+    return 0;
+}
+
+struct vlc_pw_node {
+    uint32_t id;
+    uint64_t serial;
+};
+
+static int node_by_id(const void *a, const void *b)
+{
+    const struct vlc_pw_node *na = a, *nb = b;
+
+    if (na->id > nb->id)
+        return +1;
+    if (na->id < nb->id)
+        return -1;
+    return 0;
+}
+
+static int DeviceSelect(audio_output_t *aout, const char *name)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+
+    if (sys->stream != NULL) {
+        vlc_pw_stream_select_device(sys->stream, name);
+        return 0;
+    }
+
+    sys->initial.target = strtoul(name, NULL, 10);
+    aout_DeviceReport(aout, name);
+    return 0;
+}
+
+static void registry_node(audio_output_t *aout, uint32_t id, uint32_t perms,
+                          uint32_t version, const struct spa_dict *props)
+{
+    struct vlc_pw_aout *sys = aout->sys;
+    char serialstr21;
+    uint64_t serial;
+
+    if (props == NULL)
+        return;
+
+    const char *class = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS);
+    if (class == NULL)
+        return;
+    if (strcmp(class, "Audio/Sink") && strcmp(class, "Audio/Duplex"))
+        return; /* Not an audio output */
+    if (!spa_atou64(spa_dict_lookup(props, PW_KEY_OBJECT_SERIAL), &serial, 0))
+        return;
+
+    const char *desc = spa_dict_lookup(props, PW_KEY_NODE_DESCRIPTION);
+    if (unlikely(desc == NULL))
+        desc = "???";
+
+    struct vlc_pw_node *node = malloc(sizeof (*node));
+    if (unlikely(node == NULL))
+        return;
+
+    node->id = id;
+    node->serial = serial;
+
+    struct vlc_pw_node **pp = tsearch(node, &sys->nodes, node_by_id);
+    if (unlikely(pp == NULL)) { /* Memory allocation error in the tree */
+        free(node);
+        return;
+    }
+    if (*pp != node) { /* Existing node, update it */
+        free(*pp);
+        *pp = node;
+    }
+
+    snprintf(serialstr, sizeof (serialstr), "%"PRIu64, serial);
+    aout_HotplugReport(aout, serialstr, desc);
+    (void) perms; (void) version;
+}
+
+/**
+ * Global callback.
+ *
+ * This gets called for every initial, then every new, object from the PipeWire
+ * server. We can find the usable playback devices through this.
+ */
+static void registry_global(void *data, uint32_t id, uint32_t perms,
+                            const char *name, uint32_t version,
+                            const struct spa_dict *props)
+{
+    audio_output_t *aout = data;
+
+    if (strcmp(name, PW_TYPE_INTERFACE_Node) == 0)
+        registry_node(aout, id, perms, version, props);
+}
+
+/**
+ * Global removal callback.
+ *
+ * This gets called when an object disappers. We can detect when a playback
+ * device is unplugged here.
+ */
+static void registry_global_remove(void *data, uint32_t id)
+{
+    audio_output_t *aout = data;
+    struct vlc_pw_aout *sys = aout->sys;
+    struct vlc_pw_node key = { .id = id };
+    struct vlc_pw_node **pp = tfind(&key, &sys->nodes, node_by_id);
+
+    if (pp != NULL) { /* A known device has been removed */
+        struct vlc_pw_node *node = *pp;
+        char serialstr11;
+
+        snprintf(serialstr, sizeof (serialstr), "%"PRIu64, node->serial);
+        aout_HotplugReport(aout, serialstr, NULL);
+        tdelete(node, &sys->nodes, node_by_id);
+        free(node);
+    }
+}
+
+static const struct pw_registry_events events = {
+    PW_VERSION_REGISTRY_EVENTS,
+    .global = registry_global,
+    .global_remove =  registry_global_remove
+};
+
+static void Close(vlc_object_t *obj)
+{
+    audio_output_t *aout = (audio_output_t *)obj;
+    struct vlc_pw_aout *sys = aout->sys;
+
+    vlc_pw_disconnect(sys->context);
+    tdestroy(sys->nodes, free);
+    free(sys);
+}
+
+static int Open(vlc_object_t *obj)
+{
+    audio_output_t *aout = (audio_output_t *)obj;
+
+    struct vlc_pw_aout *sys = malloc(sizeof (*sys));
+    if (unlikely(sys == NULL))
+        return VLC_ENOMEM;
+
+    sys->context = vlc_pw_connect(obj, "audio output");
+    if (sys->context == NULL) {
+        free(sys);
+        return -errno;
+    }
+
+    sys->initial.target = SPA_ID_INVALID;
+    sys->initial.volume = NAN;
+    sys->initial.mute = -1;
+    sys->nodes = NULL;
+
+    aout->sys = sys;
+    aout->start = Start;
+    aout->stop = Stop;
+    aout->time_get = NULL;
+    aout->play = Play;
+    aout->pause = Pause;
+    aout->flush = Flush;
+    aout->drain = Drain;
+    aout->volume_set = VolumeSet;
+    aout->mute_set = MuteSet;
+    aout->device_select = DeviceSelect;
+
+    vlc_pw_lock(sys->context);
+    vlc_pw_registry_listen(sys->context, &sys->listener, &events, aout);
+    vlc_pw_roundtrip_unlocked(sys->context); /* Enumerate device nodes */
+    vlc_pw_unlock(sys->context);
+    return VLC_SUCCESS;
+}
+
+vlc_module_begin()
+    set_shortname("PipeWire")
+    set_description(N_("PipeWire audio output"))
+    set_capability("audio output", 200)
+    set_subcategory(SUBCAT_AUDIO_AOUT)
+    add_shortcut("pipewire", "pw")
+    set_callbacks(Open, Close)
+vlc_module_end()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/audio_output/pulse.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_output/pulse.c Changed

@@ -38,10 +38,13 @@
 static int  Open        ( vlc_object_t * );
 static void Close       ( vlc_object_t * );
 
+#define DISTRO_KLUDGE 50
+#include <vlc_modules.h>
+
 vlc_module_begin ()
     set_shortname( "PulseAudio" )
     set_description( N_("Pulseaudio audio output") )
-    set_capability( "audio output", 160 )
+    set_capability( "audio output", 160 + DISTRO_KLUDGE )
     set_subcategory( SUBCAT_AUDIO_AOUT )
     add_shortcut( "pulseaudio", "pa" )
     set_callbacks( Open, Close )
@@ -67,6 +70,9 @@
     pa_threaded_mainloop *mainloop; /**< PulseAudio thread */
     pa_time_event *drain_trigger; /**< Drain stream trigger */
     bool draining;
+#if DISTRO_KLUDGE > 0
+    bool is_pipewire;
+#endif
     pa_cvolume cvolume; /**< actual sink input volume */
 
     bool start_date_reached;
@@ -1163,6 +1169,13 @@
 
     msg_Dbg(aout, "server %s version %s on %s@%s", info->server_name,
             info->server_version, info->user_name, info->host_name);
+#if DISTRO_KLUDGE > 0
+    aout_sys_t *sys = aout->sys;
+
+    sys->is_pipewire = strcasestr(info->server_name, "pipewire") != NULL;
+    pa_threaded_mainloop_signal(sys->mainloop, 0);
+#endif
+
     (void) ctx;
 }
 
@@ -1231,10 +1244,29 @@
     aout->mute_set = MuteSet;
     aout->device_select = StreamMove;
 
+#if DISTRO_KLUDGE > 0
+    sys->is_pipewire = false;
+#endif
     pa_threaded_mainloop_lock(sys->mainloop);
     op = pa_context_get_server_info(sys->context, server_info_cb, aout);
     if (likely(op != NULL))
+    {
+#if DISTRO_KLUDGE > 0
+        if (!obj->force)
+        {
+            while (pa_operation_get_state(op) == PA_OPERATION_RUNNING)
+                pa_threaded_mainloop_wait(sys->mainloop);
+            if (sys->is_pipewire && module_exists("aout_pipewire")) {
+                msg_Dbg(aout, "refusing to use PipeWire");
+                pa_threaded_mainloop_unlock(sys->mainloop);
+                vlc_pa_disconnect(obj, sys->context, sys->mainloop);
+                free(sys);
+                return -ENOTSUP;
+            }
+        }
+#endif
         pa_operation_unref(op);
+    }
 
     /* Sinks (output devices) list */
     op = pa_context_get_sink_info_list(sys->context, sink_add_cb, aout);

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_output/vlc_pipewire.c Added

@@ -0,0 +1,320 @@
+/*****************************************************************************
+ * vlc_pipewire.c: common PipeWire code
+ *****************************************************************************
+ * Copyright (C) 2022 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <locale.h>
+#include <pwd.h>
+#include <unistd.h>
+#include <pipewire/pipewire.h>
+#include <vlc_common.h>
+#include <vlc_fs.h>
+#include <vlc_tick.h>
+#include "vlc_pipewire.h"
+
+const char vlc_module_name = "vlcpipewire";
+
+struct vlc_pw_context {
+    struct pw_thread_loop *loop;
+    struct pw_context *context;
+    struct pw_core *core;
+    struct pw_registry *registry;
+    struct vlc_logger *logger;
+    const char *type;
+};
+
+static
+void vlc_pw_vlog(struct vlc_pw_context *ctx, int prio,
+                 const char *file, unsigned int line, const char *func,
+                 const char *fmt, va_list ap)
+{
+    vlc_vaLog(&ctx->logger, prio, ctx->type, "pipewire", file, line, func, fmt,
+              ap);
+}
+
+void (vlc_pw_log)(struct vlc_pw_context *ctx, int prio,
+                  const char *file, unsigned int line, const char *func,
+                  const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    vlc_pw_vlog(ctx, prio, file, line, func, fmt, ap);
+    va_end(ap);
+}
+
+int (vlc_pw_perror)(struct vlc_pw_context *ctx, const char *file,
+                    unsigned int line, const char *func, const char *desc)
+{
+    int err = errno;
+    (vlc_pw_log)(ctx, VLC_MSG_ERR, file, line, func,
+                 "PipeWire %s error: %s", desc, vlc_strerror_c(err));
+    errno = err;
+    return err;
+}
+
+void vlc_pw_lock(struct vlc_pw_context *ctx)
+{
+    pw_thread_loop_lock(ctx->loop);
+}
+
+void vlc_pw_unlock(struct vlc_pw_context *ctx)
+{
+    pw_thread_loop_unlock(ctx->loop);
+}
+
+void vlc_pw_signal(struct vlc_pw_context *ctx)
+{
+    pw_thread_loop_signal(ctx->loop, false);
+}
+
+void vlc_pw_wait(struct vlc_pw_context *ctx)
+{
+    pw_thread_loop_wait(ctx->loop);
+}
+
+struct pw_stream *vlc_pw_stream_new(struct vlc_pw_context *ctx,
+                                    const char *name,
+                                    struct pw_properties *props)
+{
+    return pw_stream_new(ctx->core, name, props);
+}
+
+struct vlc_pw_rt {
+    struct vlc_pw_context *context;
+    int seq;
+    bool done;
+};
+
+static void roundtrip_done(void *data, uint32_t id, int seq)
+{
+    struct vlc_pw_rt *rt = data;
+
+    if (id == PW_ID_CORE && seq == rt->seq) {
+        rt->done = true;
+        vlc_pw_signal(rt->context);
+    }
+}
+
+void vlc_pw_roundtrip_unlocked(struct vlc_pw_context *ctx)
+{
+    static const struct pw_core_events events = {
+        PW_VERSION_CORE_EVENTS,
+        .done = roundtrip_done,
+    };
+    struct spa_hook listener = { };
+    struct vlc_pw_rt rt;
+
+    rt.context = ctx;
+    rt.done = false;
+
+    pw_core_add_listener(ctx->core, &listener, &events, &rt);
+    rt.seq = pw_core_sync(ctx->core, PW_ID_CORE, 0);
+    while (!rt.done)
+        vlc_pw_wait(ctx);
+    spa_hook_remove(&listener);
+}
+
+int vlc_pw_registry_listen(struct vlc_pw_context *ctx, struct spa_hook *hook,
+                           const struct pw_registry_events *evts, void *data)
+{
+    if (ctx->registry == NULL) {
+        ctx->registry = pw_core_get_registry(ctx->core, PW_VERSION_REGISTRY,
+                                             0);
+        if (unlikely(ctx->registry == NULL))
+            return -errno;
+    }
+
+    *hook = (struct spa_hook){ };
+    pw_registry_add_listener(ctx->registry, hook, evts, data);
+    return 0;
+}
+
+void vlc_pw_disconnect(struct vlc_pw_context *ctx)
+{
+    pw_thread_loop_stop(ctx->loop);
+
+    if (ctx->registry != NULL)
+        pw_proxy_destroy((struct pw_proxy *)ctx->registry);
+
+    pw_core_disconnect(ctx->core);
+    pw_context_destroy(ctx->context);
+    pw_thread_loop_destroy(ctx->loop);
+    pw_deinit();
+    free(ctx);
+}
+
+static int vlc_pw_properties_set_var(struct pw_properties *props,
+                                     const char *name,
+                                     vlc_object_t *obj, const char *varname)
+{
+    char *str = var_InheritString(obj, varname);
+    int ret = -1;
+
+    if (str != NULL) {
+        ret = pw_properties_set(props, name, str);
+        free(str);
+    }
+    return ret;
+}
+
+static int vlc_pw_properties_set_env(struct pw_properties *props,
+                                     const char *name, const char *varname)
+{
+    const char *str = getenv(varname);
+    int ret = -1;
+
+    if (str != NULL)
+        ret = pw_properties_set(props, name, str);
+
+    return ret;
+}
+
+static int getusername(uid_t uid, char *restrict buf, size_t buflen)
+{
+    struct passwd pwbuf, *pw;
+
+    if (getpwuid_r(uid, &pwbuf, buf, buflen, &pw))
+        return -1;
+
+    memmove(buf, pw->pw_name, strlen(pw->pw_name) + 1);
+    return 0;
+}
+
+static int getmachineid(char *restrict buf, size_t buflen)
+{
+    if (buflen <= 32) {
+        errno = ENAMETOOLONG;
+        return -1;
+    }
+
+    FILE *stream = vlc_fopen("/var/lib/dbus/machine-id", "rt");
+    if (stream == NULL)
+        return -1;
+
+    int ret;
+
+    if (fread(buf, 1, 32, stream) == 32) {
+        buf32 = '\0';
+        ret = 0;
+    } else {
+        errno = ENXIO;
+        ret = -1;
+    }
+    fclose(stream);
+    return ret;
+}
+
+struct vlc_pw_context *vlc_pw_connect(vlc_object_t *obj, const char *name)
+{
+    struct vlc_logger *logger = obj->logger;
+    const char *version = pw_get_library_version();
+    int err;
+
+    vlc_debug(logger, "using PipeWire run-time v%s (built v%s)", version,
+              pw_get_headers_version());
+
+    /* Safe use of pw_deinit() requires 0.3.49 */
+    if (strverscmp(version, "0.3.49") < 0) {
+        vlc_error(logger, "PipeWire version %s required, %s detected",
+                  "0.3.49", version);
+        errno = ENOSYS;
+        return NULL;
+    }
+
+    struct vlc_pw_context *ctx = malloc(sizeof (*ctx));
+    if (unlikely(ctx == NULL))
+        return NULL;
+
+    pw_init(NULL, NULL);
+
+    ctx->logger = logger;
+    ctx->type = name;
+    ctx->loop = pw_thread_loop_new(name, NULL);
+    ctx->registry = NULL;
+
+    if (likely(ctx->loop != NULL)) {
+        struct spa_dict empty = SPA_DICT_INIT(NULL, 0);
+        struct pw_properties *props = pw_properties_new_dict(&empty);
+
+        if (likely(props != NULL)) {
+            char buf256;
+
+            vlc_pw_properties_set_var(props, PW_KEY_APP_NAME, obj,
+                                      "user-agent");
+            vlc_pw_properties_set_var(props, PW_KEY_APP_ID, obj, "app-id");
+            vlc_pw_properties_set_var(props, PW_KEY_APP_VERSION, obj,
+                                      "app-version");
+            vlc_pw_properties_set_var(props, PW_KEY_APP_ICON_NAME, obj,
+                                      "app-icon-name");
+            pw_properties_set(props, PW_KEY_APP_LANGUAGE,
+                              setlocale(LC_MESSAGES, NULL));
+            pw_properties_setf(props, PW_KEY_APP_PROCESS_ID, "%d",
+                               (int)getpid());
+            /*PW_KEY_APP_PROCESS_BINARY*/
+
+            if (getusername(getuid(), buf, sizeof (buf)) == 0)
+                pw_properties_set(props, PW_KEY_APP_PROCESS_USER, buf);
+            if (gethostname(buf, sizeof (buf)) == 0)
+                pw_properties_set(props, PW_KEY_APP_PROCESS_HOST, buf);
+            if (getmachineid(buf, sizeof (buf)) == 0)
+                pw_properties_set(props, PW_KEY_APP_PROCESS_MACHINE_ID, buf);
+
+            vlc_pw_properties_set_env(props, PW_KEY_APP_PROCESS_SESSION_ID,
+                                      "XDG_SESSION_ID");
+            vlc_pw_properties_set_env(props, PW_KEY_WINDOW_X11_DISPLAY,
+                                      "DISPLAY");
+        }
+
+        ctx->context = pw_context_new(pw_thread_loop_get_loop(ctx->loop),
+                                      props, 0);
+
+        if (likely(ctx->context != NULL)) {
+            ctx->core = pw_context_connect(ctx->context, NULL, 0);
+
+            if (ctx->core != NULL) {
+                if (likely(pw_thread_loop_start(ctx->loop) == 0))
+                    return ctx;
+
+                err = errno;
+                pw_core_disconnect(ctx->core);
+            } else {
+                err = errno;
+                vlc_pw_perror(ctx, "context connection");
+            }
+
+            pw_context_destroy(ctx->context);
+        } else
+            err = errno;
+
+        pw_thread_loop_destroy(ctx->loop);
+    } else
+        err = errno;
+
+    pw_deinit();
+    errno = err;
+    free(ctx);
+    return NULL;
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/audio_output/vlc_pipewire.h Added

@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * vlc_pipewire.h: common PipeWire code
+ *****************************************************************************
+ * Copyright (C) 2022 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include <stdint.h>
+
+struct vlc_pw_context;
+struct vlc_logger;
+struct spa_dict;
+struct spa_hook;
+struct pw_properties;
+struct pw_registry_events;
+
+VLC_EXPORT void vlc_pw_log(struct vlc_pw_context *ctx, int prio,
+                const char *file, unsigned int line, const char *func,
+                const char *fmt, ...);
+VLC_EXPORT int vlc_pw_perror(struct vlc_pw_context *ctx, const char *file,
+                  unsigned int line, const char *func, const char *desc);
+
+#define vlc_pw_log(ctx, prio, ...) \
+        vlc_pw_log(ctx, prio, __FILE__, __LINE__, __func__, __VA_ARGS__)
+#define vlc_pw_error(ctx, ...) \
+        vlc_pw_log(ctx, VLC_MSG_ERR, __VA_ARGS__)
+#define vlc_pw_warn(ctx, ...) \
+        vlc_pw_log(ctx, VLC_MSG_WARN, __VA_ARGS__)
+#define vlc_pw_debug(ctx, ...) \
+        vlc_pw_log(ctx, VLC_MSG_DBG, __VA_ARGS__)
+#define vlc_pw_perror(ctx, desc) \
+        vlc_pw_perror(ctx, __FILE__, __LINE__, __func__, desc)
+
+VLC_EXPORT void vlc_pw_lock(struct vlc_pw_context *ctx);
+VLC_EXPORT void vlc_pw_unlock(struct vlc_pw_context *ctx);
+VLC_EXPORT void vlc_pw_signal(struct vlc_pw_context *ctx);
+VLC_EXPORT void vlc_pw_wait(struct vlc_pw_context *ctx);
+
+VLC_EXPORT struct pw_stream *vlc_pw_stream_new(struct vlc_pw_context *ctx,
+                                    const char *name, struct pw_properties *);
+
+VLC_EXPORT void vlc_pw_roundtrip_unlocked(struct vlc_pw_context *ctx);
+
+VLC_EXPORT int vlc_pw_registry_listen(struct vlc_pw_context *ctx, struct spa_hook *hook,
+                           const struct pw_registry_events *, void *);
+
+VLC_EXPORT void vlc_pw_disconnect(struct vlc_pw_context *ctx);
+VLC_EXPORT struct vlc_pw_context *vlc_pw_connect(vlc_object_t *obj, const char *name);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/Makefile.am Changed

@@ -433,7 +433,7 @@
 	packetizer/hevc_nal.c packetizer/hevc_nal.h \
 	packetizer/h26x_nal_common.h \
 	codec/avcodec/dxva_blocklist.c
-libdxva2_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) -luuid
+libdxva2_plugin_la_LIBADD = libd3d9_common.la -ld3d9 $(LIBCOM) -luuid -ldxva2
 if !HAVE_WINSTORE
 if HAVE_AVCODEC_DXVA2
 codec_LTLIBRARIES += libdxva2_plugin.la
@@ -554,7 +554,8 @@
 
 libshine_plugin_la_SOURCES = codec/shine.c
 libshine_plugin_la_CFLAGS = $(AM_CFLAGS) $(SHINE_CFLAGS)
-libshine_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' $(SHINE_LIBS)
+libshine_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libshine_plugin_la_LIBADD = $(SHINE_LIBS)
 EXTRA_LTLIBRARIES += libshine_plugin.la
 if ENABLE_SOUT
 codec_LTLIBRARIES += $(LTLIBshine)
@@ -576,7 +577,8 @@
 codec_LTLIBRARIES += libvpx_alpha_plugin.la
 
 libaom_plugin_la_SOURCES = codec/aom.c \
-                           packetizer/iso_color_tables.h
+                           packetizer/iso_color_tables.h \
+                           packetizer/av1_obu.c packetizer/av1_obu.h
 libaom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libaom_plugin_la_CFLAGS = $(AM_CFLAGS) $(AOM_CFLAGS) $(CPPFLAGS_aom)
 libaom_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
@@ -616,9 +618,9 @@
 ### Hardware encoders ###
 
 libqsv_plugin_la_SOURCES = codec/qsv.c demux/mpeg/timestamps.h
-libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(MFX_CFLAGS)
+libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(VPL_CFLAGS)
 libqsv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
-libqsv_plugin_la_LIBADD = $(MFX_LIBS)
+libqsv_plugin_la_LIBADD = $(VPL_LIBS)
 EXTRA_LTLIBRARIES += libqsv_plugin.la
 codec_LTLIBRARIES += $(LTLIBqsv)
 
@@ -627,7 +629,7 @@
 libdmo_plugin_la_SOURCES = codec/dmo/dmo.c codec/dmo/dmo.h codec/dmo/buffer.c
 libdmo_plugin_la_LIBADD = $(LIBM)
 if HAVE_WIN32
-libdmo_plugin_la_LIBADD += $(LIBCOM) -luuid
+libdmo_plugin_la_LIBADD += $(LIBCOM) -luuid -lmsdmo
 if !HAVE_WINSTORE
 codec_LTLIBRARIES += libdmo_plugin.la
 endif

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/aom.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/aom.c Changed

@@ -43,6 +43,7 @@
 #endif
 
 #include "../packetizer/iso_color_tables.h"
+#include "../packetizer/av1_obu.h"
 
 #ifndef AOM_USAGE_GOOD_QUALITY
 # define AOM_USAGE_GOOD_QUALITY 0
@@ -586,6 +587,41 @@
     };
     p_enc->ops = &ops;
 
+    /* "The caller owns the memory associated with this buffer, and must free the
+       'buf' member of the aom_fixed_buf_t as well as the aom_fixed_buf_t pointer.
+       Memory returned must be freed via call to free()." */
+    aom_fixed_buf_t *p_headers = aom_codec_get_global_headers(ctx);
+
+    if (p_headers) {
+
+        av1_OBU_sequence_header_t *p_sequence_header = AV1_OBU_parse_sequence_header(p_headers->buf, p_headers->sz);
+        if (!p_sequence_header) {
+            free(p_headers->buf);
+            free(p_headers);
+            goto error;
+        }
+
+        p_enc->fmt_out.i_extra =
+                AV1_create_DecoderConfigurationRecord((uint8_t **)&p_enc->fmt_out.p_extra,
+                                                      p_sequence_header,
+                                                      1,
+                                                      (const uint8_t **)&p_headers->buf,
+                                                      &p_headers->sz);
+
+        /* Free everything regardless of whether or not the config record parsing succeeded. */
+        free(p_headers->buf);
+        free(p_headers);
+        AV1_release_sequence_header(p_sequence_header);
+
+        if (!p_enc->fmt_out.i_extra) {
+            msg_Err(p_enc, "Could not create decoder configuration record");
+            goto error;
+        }
+
+    } else {
+        goto error;
+    }
+
     return VLC_SUCCESS;
 
 error:

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/arib/libaribcaption.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/arib/libaribcaption.c Changed

@@ -107,16 +107,16 @@
 }
 
 static void SubpictureUpdate(subpicture_t *p_subpic,
-                             const video_format_t *prev_src, const video_format_t *p_src_format,
-                             const video_format_t *prev_dst, const video_format_t *p_dst_format,
-                             vlc_tick_t i_ts)
+                             const struct vlc_spu_updater_configuration *cfg)
 {
     libaribcaption_spu_updater_sys_t *p_spusys = p_subpic->updater.sys;
     decoder_sys_t *p_sys = p_spusys->p_dec_sys;
+    const video_format_t *p_src_format = cfg->video_src;
+    const video_format_t *p_dst_format = cfg->video_dst;
 
-    bool b_src_changed = p_src_format->i_visible_width  != prev_src->i_visible_width ||
-                         p_src_format->i_visible_height != prev_src->i_visible_height;
-    bool b_dst_changed = !video_format_IsSimilar(prev_dst, p_dst_format);
+    bool b_src_changed = p_src_format->i_visible_width  != cfg->prev_src->i_visible_width ||
+                         p_src_format->i_visible_height != cfg->prev_src->i_visible_height;
+    bool b_dst_changed = !video_format_IsSimilar(cfg->prev_dst, p_dst_format);
 
     unsigned i_render_area_width  = p_dst_format->i_visible_width;
     unsigned i_render_area_height = p_src_format->i_visible_height * p_dst_format->i_visible_width /
@@ -127,7 +127,7 @@
                                                           i_render_area_height);
     }
 
-    const vlc_tick_t i_stream_date = p_spusys->i_pts + (i_ts - p_subpic->i_start);
+    const vlc_tick_t i_stream_date = p_spusys->i_pts + (cfg->pts - p_subpic->i_start);
 
     /* Retrieve the expected render status for detecting whether the subtitle image changed */
     aribcc_render_status_t status = aribcc_renderer_try_render(p_sys->p_renderer,
@@ -178,7 +178,7 @@
         if (!region)
             break;
 
-        region->b_absolute = true;
+        region->b_absolute = true; region->b_in_window = false;
         region->i_x = image->dst_x;
         region->i_y = image->dst_y;
         region->i_align = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/arib/substext.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/arib/substext.h Changed

@@ -47,13 +47,10 @@
 } arib_spu_updater_sys_t;
 
 static void SubpictureTextUpdate(subpicture_t *subpic,
-                                 const video_format_t *prev_src, const video_format_t *fmt_src,
-                                 const video_format_t *prev_dst, const video_format_t *fmt_dst,
-                                 vlc_tick_t ts)
+                                 const struct vlc_spu_updater_configuration *cfg)
 {
     arib_spu_updater_sys_t *sys = subpic->updater.sys;
-    VLC_UNUSED(fmt_src); VLC_UNUSED(ts);
-    VLC_UNUSED(prev_src); VLC_UNUSED(prev_dst);
+    const video_format_t *fmt_dst = cfg->video_dst;
 
     if ( !sys->first )
         return;
@@ -76,7 +73,7 @@
         r->fmt.i_sar_den = 1;
 
         r->p_text = text_segment_New( p_region->psz_text );
-        r->b_absolute = true;
+        r->b_absolute = true; r->b_in_window = false;
         r->i_align  = SUBPICTURE_ALIGN_LEFT | SUBPICTURE_ALIGN_TOP;
 
         if (p_region->i_planewidth > 0 && p_region->i_planeheight > 0)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/chroma.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/chroma.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/chroma.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/chroma.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/d3d11va.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/d3d11va.c Changed

@@ -29,6 +29,7 @@
   * See https://msdn.microsoft.com/en-us/library/windows/desktop/hh162912%28v=vs.85%29.aspx
   **/
 
+#include <process.h>
 #include <winapifamily.h>
 #undef WINAPI_FAMILY
 #define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP
@@ -63,8 +64,7 @@
 
 #include "directx_va.h"
 
-static int Open(vlc_va_t *, AVCodecContext *, enum AVPixelFormat hwfmt, const AVPixFmtDescriptor *,
-                const es_format_t *, vlc_decoder_device *, video_format_t *, vlc_video_context **);
+static int Open(vlc_va_t *va, struct vlc_va_cfg *cfg);
 
 vlc_module_begin()
     set_description(N_("Direct3D11 Video Acceleration"))
@@ -225,12 +225,21 @@
         ctx->hwaccel_context = NULL;
 }
 
-static const struct vlc_va_operations ops = { Get, Close, };
+static const struct vlc_va_operations ops =
+{
+    .get = Get,
+    .close = Close,
+};
 
-static int Open(vlc_va_t *va, AVCodecContext *ctx, enum AVPixelFormat hwfmt, const AVPixFmtDescriptor *desc,
-                const es_format_t *fmt_in, vlc_decoder_device *dec_device,
-                video_format_t *fmt_out, vlc_video_context **vtcx_out)
+static int Open(vlc_va_t *va, struct vlc_va_cfg *cfg)
 {
+    AVCodecContext *ctx = cfg->avctx;
+    enum AVPixelFormat hwfmt = cfg->hwfmt;
+    const AVPixFmtDescriptor *desc = cfg->desc;
+    const es_format_t *fmt_in = cfg->fmt_in;
+    vlc_decoder_device *dec_device = cfg->dec_device;
+    video_format_t *fmt_out = cfg->video_fmt_out;
+
     int err = VLC_EGENERIC;
 
     ctx->hwaccel_context = NULL;
@@ -304,7 +313,7 @@
 
     va->ops = &ops;
     *fmt_out = final_fmt;
-    *vtcx_out = sys->vctx;
+    cfg->vctx_out = sys->vctx;
     return VLC_SUCCESS;
 
 error:

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/directx_va.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/directx_va.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/dxva2.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/dxva2.c Changed

@@ -41,7 +41,6 @@
 {
     struct d3d9_pic_context ctx;
     struct vlc_va_surface_t *va_surface;
-    HINSTANCE               dxva2_dll;
 };
 
 #define DXVA2_PICCONTEXT_FROM_PICCTX(pic_ctx)  \
@@ -49,8 +48,7 @@
 
 #include "directx_va.h"
 
-static int Open(vlc_va_t *, AVCodecContext *, enum AVPixelFormat hwfmt, const AVPixFmtDescriptor *,
-                const es_format_t *, vlc_decoder_device *, video_format_t *, vlc_video_context **);
+static int Open(vlc_va_t *va, struct vlc_va_cfg *cfg);
 
 vlc_module_begin()
     set_description(N_("DirectX Video Acceleration (DXVA) 2.0"))
@@ -65,9 +63,6 @@
     /* Direct3D */
     vlc_video_context      *vctx;
 
-    /* DLL */
-    HINSTANCE              dxva2_dll;
-
     /* Device manager */
     IDirect3DDeviceManager9  *devmng;
     HANDLE                   device;
@@ -114,12 +109,10 @@
 {
     struct dxva2_pic_context *pic_ctx = DXVA2_PICCONTEXT_FROM_PICCTX(ctx);
     struct vlc_va_surface_t *va_surface = pic_ctx->va_surface;
-    HINSTANCE dxva2_dll = pic_ctx->dxva2_dll;
     static_assert(offsetof(struct dxva2_pic_context, ctx.s) == 0,
         "Cast assumption failure");
     d3d9_pic_context_destroy(ctx);
     va_surface_Release(va_surface);
-    FreeLibrary(dxva2_dll);
 }
 
 static picture_context_t *dxva2_pic_context_copy(picture_context_t *ctx)
@@ -129,7 +122,6 @@
     if (unlikely(pic_ctx==NULL))
         return NULL;
     *pic_ctx = *src_ctx;
-    pic_ctx->dxva2_dll = LoadLibrary(TEXT("DXVA2.DLL"));
     vlc_video_context_Hold(pic_ctx->ctx.s.vctx);
     va_surface_AddRef(pic_ctx->va_surface);
     AcquireD3D9PictureSys(&pic_ctx->ctx.picsys);
@@ -157,7 +149,6 @@
     if (unlikely(pic_ctx==NULL))
         return NULL;
     pic_ctx->va_surface = va_surface;
-    pic_ctx->dxva2_dll = LoadLibrary(TEXT("DXVA2.DLL"));
     return &pic_ctx->ctx.s;
 }
 
@@ -204,12 +195,21 @@
         va_pool_Close(sys->va_pool);
 }
 
-static const struct vlc_va_operations ops = { Get, Close, };
+static const struct vlc_va_operations ops =
+{
+    .get = Get,
+    .close = Close,
+};
 
-static int Open(vlc_va_t *va, AVCodecContext *ctx, enum AVPixelFormat hwfmt, const AVPixFmtDescriptor *desc,
-                const es_format_t *fmt_in, vlc_decoder_device *dec_device,
-                video_format_t *fmt_out, vlc_video_context **vtcx_out)
+static int Open(vlc_va_t *va, struct vlc_va_cfg *cfg)
 {
+    AVCodecContext *ctx = cfg->avctx;
+    enum AVPixelFormat hwfmt = cfg->hwfmt;
+    const AVPixFmtDescriptor *desc = cfg->desc;
+    const es_format_t *fmt_in = cfg->fmt_in;
+    vlc_decoder_device *dec_device = cfg->dec_device;
+    video_format_t *fmt_out = cfg->video_fmt_out;
+
     int err = VLC_EGENERIC;
 
     if ( hwfmt != AV_PIX_FMT_DXVA2_VLD )
@@ -237,15 +237,6 @@
     va->sys = sys;
 
     /* Load dll*/
-    sys->dxva2_dll = LoadLibrary(TEXT("DXVA2.DLL"));
-    if (!sys->dxva2_dll) {
-        msg_Warn(va, "cannot load DXVA2 decoder DLL");
-        if (sys->vctx)
-            vlc_video_context_Release(sys->vctx);
-        free( sys );
-        return VLC_EGENERIC;
-    }
-
     struct va_pool_cfg pool_cfg = {
         D3dCreateDevice,
         DxDestroyVideoDecoder,
@@ -292,7 +283,7 @@
 
     va->ops = &ops;
     *fmt_out = final_fmt;
-    *vtcx_out = sys->vctx;
+    cfg->vctx_out = sys->vctx;
     return VLC_SUCCESS;
 
 error:
@@ -310,20 +301,8 @@
 
     d3d9_decoder_device_t *d3d9_decoder = GetD3D9OpaqueContext(sys->vctx);
 
-    HRESULT (WINAPI *CreateDeviceManager9)(UINT *pResetToken,
-                                           IDirect3DDeviceManager9 **);
-    CreateDeviceManager9 =
-      (void *)GetProcAddress(sys->dxva2_dll,
-                             "DXVA2CreateDirect3DDeviceManager9");
-
-    if (!CreateDeviceManager9) {
-        msg_Err(va, "cannot load function");
-        return VLC_EGENERIC;
-    }
-    msg_Dbg(va, "got CreateDeviceManager9");
-
     UINT token;
-    if (FAILED(CreateDeviceManager9(&token, &sys->devmng))) {
+    if (FAILED(DXVA2CreateDirect3DDeviceManager9(&token, &sys->devmng))) {
         msg_Err(va, " OurDirect3DCreateDeviceManager9 failed");
         return VLC_EGENERIC;
     }
@@ -615,8 +594,6 @@
     IDirect3DDeviceManager9_CloseDeviceHandle(sys->devmng, sys->device);
     IDirectXVideoDecoderService_Release(sys->d3ddec);
     IDirect3DDeviceManager9_Release(sys->devmng);
-    if (sys->dxva2_dll)
-        FreeLibrary(sys->dxva2_dll);
 
     free(sys);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/encoder.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/encoder.c Changed

@@ -247,19 +247,29 @@
         p_context->time_base.den = CLOCK_FREQ;
 
     msg_Dbg( p_enc, "Time base for probing set to %d/%d", p_context->time_base.num, p_context->time_base.den );
-    if( p_codec->supported_framerates )
+
+    const AVRational *supported_framerates;
+#if LIBAVCODEC_VERSION_CHECK( 61, 13, 100 )
+    if (avcodec_get_supported_config(p_context, p_codec, AV_CODEC_CONFIG_FRAME_RATE, 0,
+                                     (const void **)&supported_framerates, NULL) < 0)
+        supported_framerates = NULL;
+#else
+    supported_framerates = p_codec->supported_framerates;
+#endif
+
+    if( supported_framerates )
     {
         /* We are finding fps values so 1/time_base */
         AVRational target = {
             .num = p_context->time_base.den,
             .den = p_context->time_base.num
         };
-        int idx = av_find_nearest_q_idx(target, p_codec->supported_framerates);
+        int idx = av_find_nearest_q_idx(target, supported_framerates);
 
-        p_context->time_base.num = p_codec->supported_frameratesidx.den ?
-                                    p_codec->supported_frameratesidx.den : 1;
-        p_context->time_base.den = p_codec->supported_frameratesidx.den ?
-                                    p_codec->supported_frameratesidx.num : CLOCK_FREQ;
+        p_context->time_base.num = supported_frameratesidx.den ?
+                                    supported_frameratesidx.den : 1;
+        p_context->time_base.den = supported_frameratesidx.den ?
+                                    supported_frameratesidx.num : CLOCK_FREQ;
 
         /* If we have something reasonable on supported framerates, use that*/
         if( p_context->time_base.den && p_context->time_base.den < CLOCK_FREQ )
@@ -574,7 +584,16 @@
         p_context->pix_fmt = FindFfmpegChroma( p_enc->fmt_in.video.i_chroma, &uv_flipped );
         assert(!uv_flipped); // I420/RGB24 should not be flipped
 
-        if( p_codec->pix_fmts )
+        const enum AVPixelFormat *pix_fmts;
+#if LIBAVCODEC_VERSION_CHECK( 61, 13, 100 )
+        if (avcodec_get_supported_config(p_context, p_codec, AV_CODEC_CONFIG_PIX_FORMAT, 0,
+                                        (const void **)&pix_fmts, NULL) < 0)
+            pix_fmts = NULL;
+#else
+        pix_fmts = p_codec->pix_fmts;
+#endif
+
+        if( pix_fmts )
         {
             static const enum AVPixelFormat vlc_pix_fmts = {
                 AV_PIX_FMT_YUV420P,
@@ -582,8 +601,8 @@
                 AV_PIX_FMT_RGB24,
             };
             bool found = false;
-            const enum AVPixelFormat *p = p_codec->pix_fmts;
-            for( ; !found && *p != -1; p++ )
+            const enum AVPixelFormat *p = pix_fmts;
+            for( ; !found && *p != AV_PIX_FMT_NONE; p++ )
             {
                 for( size_t i = 0; i < ARRAY_SIZE(vlc_pix_fmts); ++i )
                 {
@@ -595,7 +614,7 @@
                     }
                 }
             }
-            if (!found) p_context->pix_fmt = p_codec->pix_fmts0;
+            if (!found) p_context->pix_fmt = pix_fmts0;
             GetVlcChroma( &p_enc->fmt_in.video, p_context->pix_fmt );
             p_enc->fmt_in.i_codec = p_enc->fmt_in.video.i_chroma;
         }
@@ -720,22 +739,29 @@
     }
     else if( p_enc->fmt_in.i_cat == AUDIO_ES )
     {
+        const enum AVSampleFormat *sample_fmts;
+#if LIBAVCODEC_VERSION_CHECK( 61, 13, 100 )
+        if (avcodec_get_supported_config(p_context, p_codec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0,
+                                        (const void **)&sample_fmts, NULL) < 0)
+            sample_fmts = NULL;
+#else
+        sample_fmts = p_codec->sample_fmts;
+#endif
+
         p_context->codec_type  = AVMEDIA_TYPE_AUDIO;
-        p_context->sample_fmt  = p_codec->sample_fmts ?
-                                    p_codec->sample_fmts0 :
-                                    AV_SAMPLE_FMT_S16;
+        p_context->sample_fmt  = sample_fmts ? sample_fmts0 : AV_SAMPLE_FMT_S16;
 
         /* Try to match avcodec input format to vlc format so we could avoid one
            format conversion */
         if( GetVlcAudioFormat( p_context->sample_fmt ) != p_enc->fmt_in.i_codec
-            && p_codec->sample_fmts )
+            && sample_fmts )
         {
             msg_Dbg( p_enc, "Trying to find more suitable sample format instead of %s", av_get_sample_fmt_name( p_context->sample_fmt ) );
-            for( unsigned int i=0; p_codec->sample_fmtsi != -1; i++ )
+            for( unsigned int i=0; sample_fmtsi != AV_SAMPLE_FMT_NONE; i++ )
             {
-                if( GetVlcAudioFormat( p_codec->sample_fmtsi ) == p_enc->fmt_in.i_codec )
+                if( GetVlcAudioFormat( sample_fmtsi ) == p_enc->fmt_in.i_codec )
                 {
-                    p_context->sample_fmt = p_codec->sample_fmtsi;
+                    p_context->sample_fmt = sample_fmtsi;
                     msg_Dbg( p_enc, "Using %s as new sample format", av_get_sample_fmt_name( p_context->sample_fmt ) );
                     break;
                 }
@@ -744,14 +770,14 @@
         p_sys->b_planar = av_sample_fmt_is_planar( p_context->sample_fmt );
         // Try if we can use interleaved format for codec input as VLC doesn't really do planar audio yet
         // FIXME: Remove when planar/interleaved audio in vlc is equally supported
-        if( p_sys->b_planar && p_codec->sample_fmts )
+        if( p_sys->b_planar && sample_fmts )
         {
             msg_Dbg( p_enc, "Trying to find packet sample format instead of planar %s", av_get_sample_fmt_name( p_context->sample_fmt ) );
-            for( unsigned int i=0; p_codec->sample_fmtsi != -1; i++ )
+            for( unsigned int i=0; sample_fmtsi != AV_SAMPLE_FMT_NONE; i++ )
             {
-                if( !av_sample_fmt_is_planar( p_codec->sample_fmtsi ) )
+                if( !av_sample_fmt_is_planar( sample_fmtsi ) )
                 {
-                    p_context->sample_fmt = p_codec->sample_fmtsi;
+                    p_context->sample_fmt = sample_fmtsi;
                     msg_Dbg( p_enc, "Changing to packet format %s as new sample format", av_get_sample_fmt_name( p_context->sample_fmt ) );
                     break;
                 }
@@ -1244,8 +1270,19 @@
         frame->pict_type = 0;
 
         frame->repeat_pict = p_pict->i_nb_fields - 2;
+#if LIBAVUTIL_VERSION_CHECK( 58, 7, 100 )
+        if (p_pict->b_progressive)
+            frame->flags &= ~AV_FRAME_FLAG_INTERLACED;
+        else
+            frame->flags |= AV_FRAME_FLAG_INTERLACED;
+        if (p_pict->b_top_field_first)
+            frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
+        else
+            frame->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST;
+#else
         frame->interlaced_frame = !p_pict->b_progressive;
         frame->top_field_first = !!p_pict->b_top_field_first;
+#endif
 
         frame->format = p_sys->p_context->pix_fmt;
         frame->width = p_sys->p_context->width;
@@ -1506,9 +1543,8 @@
     av_frame_free( &p_sys->frame );
 
     vlc_avcodec_lock();
-    avcodec_close( p_sys->p_context );
-    vlc_avcodec_unlock();
     avcodec_free_context( &p_sys->p_context );
+    vlc_avcodec_unlock();
 
 
     av_free( p_sys->p_interleave_buf );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/fourcc.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/fourcc.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/subtitle.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/subtitle.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/va.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/va.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/va.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/va.h Changed

@@ -30,6 +30,58 @@
 typedef struct vlc_decoder_device vlc_decoder_device;
 typedef struct vlc_video_context vlc_video_context;
 
+struct vlc_va_cfg
+{
+    /**
+     * AVContext to set the hwaccel_context on.
+     *
+     * The VA can assume fields codec_id, coded_width, coded_height,
+     * active_thread_type, thread_count, framerate, profile, refs (H264) and
+     * hw_pix_fmt are set correctly */
+    AVCodecContext *avctx;
+
+    /** avcodec hardare PIX_FMT */
+    enum AVPixelFormat hwfmt;
+
+    /**  Description of the hardware fornat */
+    const AVPixFmtDescriptor *desc;
+
+    /** VLC format of the content to decode */
+    const es_format_t *fmt_in;
+
+    /** Decoder device that will be used to create the video context */
+    vlc_decoder_device *dec_device;
+
+    /**
+     * Resulting Video format
+     *
+     * Valid, can be changed by the module to change the size or chroma.
+     */
+    video_format_t *video_fmt_out;
+
+    /**
+     * Pointer to the used video context
+     *
+     * The video context must be allocated from the dec_device, filled and set
+     * to this pointer.
+     */
+    vlc_video_context *vctx_out;
+
+    /**
+     * Indicate if the module is using the new AVHWFramesContext API
+     *
+     * False, by default, set to true if the module is using this API
+     */
+    bool use_hwframes;
+
+    /**
+     * Request more pictures
+     *
+     * 0 by default, set if from the module
+     */
+    unsigned extra_pictures;
+};
+
 struct vlc_va_operations {
     int (*get)(vlc_va_t *, picture_t *pic, AVCodecContext *ctx, AVFrame *frame);
     void (*close)(vlc_va_t *, AVCodecContext* ctx);
@@ -42,10 +94,7 @@
     const struct vlc_va_operations *ops;
 };
 
-typedef int (*vlc_va_open)(vlc_va_t *, AVCodecContext *,
-                           enum AVPixelFormat hwfmt, const AVPixFmtDescriptor *,
-                           const es_format_t *, vlc_decoder_device *,
-                           video_format_t *, vlc_video_context **);
+typedef int (*vlc_va_open)(vlc_va_t *, struct vlc_va_cfg *cfg);
 
 #define set_va_callback(activate, priority) \
     { \
@@ -66,16 +115,10 @@
 /**
  * Creates an accelerated video decoding back-end for libavcodec.
  * @param obj parent VLC object
- * @param avctx AVContext to set the hwaccel_context on. The VA can assume fields
- *   codec_id, coded_width, coded_height, active_thread_type, thread_count,
- *   framerate, profile, refs (H264) and hw_pix_fmt are set correctly.
- * @param fmt VLC format of the content to decode
+ * @param cfg pointer to a configuration struct
  * @return a new VLC object on success, NULL on error.
  */
-vlc_va_t *vlc_va_New(vlc_object_t *obj, AVCodecContext * avctx,
-                     enum AVPixelFormat hwfmt, const AVPixFmtDescriptor *,
-                     const es_format_t *fmt, vlc_decoder_device *device,
-                     video_format_t *, vlc_video_context **vtcx_out);
+vlc_va_t *vlc_va_New(vlc_object_t *obj, struct vlc_va_cfg *cfg);
 
 /**
  * Get a hardware video surface for a libavcodec frame.

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/vaapi.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/vaapi.c Changed

@@ -158,26 +158,125 @@
     av_buffer_unref(&vaapi_vctx->hwframes_ref);
 }
 
-static const struct vlc_va_operations ops = { Get, Delete, };
+static const struct vlc_va_operations ops =
+{
+    .get = Get,
+    .close = Delete,
+};
 
 static const struct vlc_video_context_operations vaapi_ctx_ops =
 {
     .destroy = vaapi_ctx_destroy,
 };
 
-static int Create(vlc_va_t *va, AVCodecContext *ctx, enum AVPixelFormat hwfmt,
-                  const AVPixFmtDescriptor *desc,
-                  const es_format_t *fmt_in, vlc_decoder_device *dec_device,
-                  video_format_t *fmt_out, vlc_video_context **vtcx_out)
+static int CheckCodecConfig(vlc_va_t *va, AVCodecContext *ctx, VADisplay va_dpy,
+                            const AVPixFmtDescriptor *sw_desc)
+{
+    assert(ctx->codec_id == AV_CODEC_ID_AV1);
+
+    if (sw_desc->nb_components < 2)
+        return VLC_EGENERIC;
+
+    int va_rt_format, vc_fourcc;
+    switch (sw_desc->comp0.depth)
+    {
+        case 8:
+            va_rt_format = VA_RT_FORMAT_YUV420;
+            vc_fourcc = VA_FOURCC_NV12;
+            break;
+        case 10:
+            va_rt_format = VA_RT_FORMAT_YUV420_10BPP;
+            vc_fourcc = VA_FOURCC_P010;
+            break;
+        default:
+            return VLC_EGENERIC;
+    }
+
+    VAProfile profile;
+    switch (ctx->profile)
+    {
+        case FF_PROFILE_AV1_MAIN:
+            profile = VAProfileAV1Profile0;
+            break;
+        case FF_PROFILE_AV1_HIGH:
+            profile = VAProfileAV1Profile1;
+            break;
+        default:
+            return VLC_EGENERIC;
+    }
+
+    VAConfigID config_id = VA_INVALID_ID;
+    VASurfaceID render_target = VA_INVALID_ID;
+    VAContextID context_id = VA_INVALID_ID;
+
+    config_id = vlc_vaapi_CreateConfigChecked(VLC_OBJECT(va), va_dpy, profile,
+                                              VAEntrypointVLD, 0);
+    if (config_id == VA_INVALID_ID)
+        goto error;
+
+    VASurfaceAttrib fourcc_attribs1 = {
+        {
+            .type = VASurfaceAttribPixelFormat,
+            .flags = VA_SURFACE_ATTRIB_SETTABLE,
+            .value.type    = VAGenericValueTypeInteger,
+            .value.value.i = vc_fourcc,
+        }
+    };
+
+    VA_CALL(VLC_OBJECT(va), vaCreateSurfaces, va_dpy, va_rt_format,
+            ctx->coded_width, ctx->coded_height, &render_target, 1,
+            fourcc_attribs, 1);
+
+    context_id = vlc_vaapi_CreateContext(VLC_OBJECT(va), va_dpy, config_id,
+                                         ctx->coded_width, ctx->coded_height,
+                                         VA_PROGRESSIVE, &render_target, 1);
+
+error:
+    if (render_target != VA_INVALID_ID)
+        VA_CALL(VLC_OBJECT(va), vaDestroySurfaces, va_dpy, &render_target, 1);
+
+    if (config_id != VA_INVALID_ID)
+        vlc_vaapi_DestroyConfig(VLC_OBJECT(va), va_dpy, config_id);
+
+    if (context_id != VA_INVALID_ID)
+    {
+        vlc_vaapi_DestroyContext(VLC_OBJECT(va), va_dpy, context_id);
+        return VLC_SUCCESS;
+    }
+    return VLC_EGENERIC;
+}
+
+static int Create(vlc_va_t *va, struct vlc_va_cfg *cfg)
 {
-    VLC_UNUSED(desc);
-    VLC_UNUSED(fmt_in);
+    AVCodecContext *ctx = cfg->avctx;
+    enum AVPixelFormat hwfmt = cfg->hwfmt;
+    vlc_decoder_device *dec_device = cfg->dec_device;
+    video_format_t *fmt_out = cfg->video_fmt_out;
+
     if ( hwfmt != AV_PIX_FMT_VAAPI || dec_device == NULL ||
         dec_device->type != VLC_DECODER_DEVICE_VAAPI)
         return VLC_EGENERIC;
 
     VADisplay va_dpy = dec_device->opaque;
 
+    switch (ctx->codec_id)
+    {
+        case AV_CODEC_ID_AV1:
+        {
+            /* Tested with ffmpeg @2d077f9, and few AV1 samples, 10 extra
+             * pictures are needed to avoid deadlocks (cf. commit description)
+             * when playing and seeking. */
+            cfg->extra_pictures = 10;
+
+            int ret = CheckCodecConfig(va, ctx, va_dpy, cfg->desc);
+            if (ret != VLC_SUCCESS)
+                return ret;
+            break;
+        }
+        default:
+            break;
+    }
+
     AVBufferRef *hwdev_ref = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI);
     if (hwdev_ref == NULL)
         return VLC_EGENERIC;
@@ -234,6 +333,12 @@
             case AV_PIX_FMT_YUV420P10LE:
                 vlc_chroma = VLC_CODEC_VAAPI_420_10BPP;
                 break;
+#if LIBAVUTIL_VERSION_CHECK( 57, 36, 100 )
+            case AV_PIX_FMT_P012LE:
+            case AV_PIX_FMT_P012BE:
+                vlc_chroma = VLC_CODEC_VAAPI_420_12BPP;
+                break;
+#endif
             default:
                 break;
         }
@@ -241,8 +346,9 @@
 
     if (vlc_chroma == 0)
     {
-        msg_Warn(va, "ffmpeg chroma not compatible with vlc: hw: %d, sw: %d",
-                 hwframes_ctx->format, hwframes_ctx->sw_format);
+        msg_Warn(va, "ffmpeg chroma not compatible with vlc: hw: %s, sw: %s",
+                 av_get_pix_fmt_name(hwframes_ctx->format),
+                 av_get_pix_fmt_name(hwframes_ctx->sw_format));
         av_buffer_unref(&hwframes_ref);
         return VLC_EGENERIC;
     }
@@ -278,7 +384,8 @@
 
     va->ops = &ops;
     va->sys = vctx;
-    *vtcx_out = vctx;
+    cfg->vctx_out = vctx;
+    cfg->use_hwframes = true;
     return VLC_SUCCESS;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/avcodec/video.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/avcodec/video.c Changed

@@ -123,18 +123,20 @@
     bool palette_sent;
 
     /* VA API */
-    vlc_va_t *p_va; /* Protected by lock */
+    vlc_va_t *p_va;
     enum AVPixelFormat pix_fmt;
     int profile;
     int level;
     vlc_video_context *vctx_out;
+    bool use_hwframes;
 
     // decoder output seen by lavc, regardless of texture padding
     unsigned decoder_width;
     unsigned decoder_height;
 
     /* Protect dec->fmt_out, decoder_Update*() and decoder_NewPicture()
-     * functions */
+     * functions from lavc_GetFrame(). ffmpeg_GetFormat() doesn't need locking
+     * as ffmpeg is taking care of the synchronisation. */
     vlc_mutex_t lock;
 } decoder_sys_t;
 
@@ -352,8 +354,7 @@
     else if (ctx->time_base.num > 0 && ctx->time_base.den > 0)
     {
         fmt->i_frame_rate = ctx->time_base.den;
-        fmt->i_frame_rate_base = ctx->time_base.num
-                                 * __MAX(ctx->ticks_per_frame, 1);
+        fmt->i_frame_rate_base = ctx->time_base.num;
     }
 
     get_video_color_settings(ctx, fmt);
@@ -362,8 +363,7 @@
 
 static int lavc_UpdateVideoFormat(decoder_t *dec, AVCodecContext *ctx,
                                   enum AVPixelFormat fmt,
-                                  enum AVPixelFormat swfmt,
-                                  vlc_decoder_device **pp_dec_device)
+                                  enum AVPixelFormat swfmt)
 {
     video_format_t fmt_out;
     int val;
@@ -376,12 +376,10 @@
 
     /* always have date in fields/ticks units */
     if(p_sys->pts.i_divider_num)
-        date_Change(&p_sys->pts, fmt_out.i_frame_rate *
-                                 __MAX(ctx->ticks_per_frame, 1),
+        date_Change(&p_sys->pts, fmt_out.i_frame_rate,
                                  fmt_out.i_frame_rate_base);
     else
-        date_Init(&p_sys->pts, fmt_out.i_frame_rate *
-                               __MAX(ctx->ticks_per_frame, 1),
+        date_Init(&p_sys->pts, fmt_out.i_frame_rate,
                                fmt_out.i_frame_rate_base);
 
     fmt_out.p_palette = dec->fmt_out.video.p_palette;
@@ -407,11 +405,6 @@
     p_sys->decoder_width  = dec->fmt_out.video.i_width;
     p_sys->decoder_height = dec->fmt_out.video.i_height;
 
-    if (pp_dec_device)
-    {
-        *pp_dec_device = decoder_GetDecoderDevice(dec);
-        return *pp_dec_device == NULL;
-    }
     return 0;
 }
 
@@ -712,13 +705,10 @@
     return VLC_SUCCESS;
 }
 
-static int ffmpeg_OpenVa(decoder_t *p_dec, AVCodecContext *p_context,
-                         enum AVPixelFormat hwfmt, enum AVPixelFormat swfmt,
-                         const AVPixFmtDescriptor *src_desc,
-                         vlc_mutex_t *open_lock)
+static int lavc_UpdateHWVideoFormat(decoder_t *p_dec, AVCodecContext *p_context,
+                                    enum AVPixelFormat hwfmt, enum AVPixelFormat swfmt,
+                                    vlc_decoder_device **pp_dec_device)
 {
-    decoder_sys_t *p_sys = p_dec->p_sys;
-
     if( hwfmt == AV_PIX_FMT_NONE )
         return VLC_EGENERIC;
 
@@ -730,40 +720,94 @@
         return VLC_EGENERIC;
     }
     const AVPixFmtDescriptor *dsc = av_pix_fmt_desc_get(hwfmt);
-    vlc_decoder_device *init_device = NULL;
     msg_Dbg(p_dec, "trying format %s", dsc ? dsc->name : "unknown");
-    if (lavc_UpdateVideoFormat(p_dec, p_context, hwfmt, swfmt, &init_device))
+    if (lavc_UpdateVideoFormat(p_dec, p_context, hwfmt, swfmt))
         return VLC_EGENERIC; /* Unsupported brand of hardware acceleration */
-    if (open_lock)
-        vlc_mutex_unlock(open_lock);
+
+    *pp_dec_device = decoder_GetDecoderDevice(p_dec);
+    if (*pp_dec_device == NULL)
+        return VLC_EGENERIC;
+
+    return VLC_SUCCESS;
+}
+
+static void ffmpeg_CloseVa(decoder_t *p_dec, AVCodecContext *context)
+{
+    decoder_sys_t *p_sys = p_dec->p_sys;
+    assert(p_sys->p_va != NULL);
+    assert(p_sys->vctx_out != NULL);
+
+    vlc_va_Delete(p_sys->p_va, NULL);
+    p_sys->p_va = NULL;
+    vlc_video_context_Release(p_sys->vctx_out);
+    p_sys->vctx_out = NULL;
+    p_sys->use_hwframes = false;
+
+    if (context != NULL)
+        context->hwaccel_context = NULL;
+}
+
+static int ffmpeg_OpenVa(decoder_t *p_dec, AVCodecContext *p_context,
+                         enum AVPixelFormat hwfmt,
+                         const AVPixFmtDescriptor *src_desc,
+                         vlc_decoder_device *dec_device)
+{
+    decoder_sys_t *p_sys = p_dec->p_sys;
 
     p_dec->fmt_out.video.i_chroma = 0; // make sure the va sets its output chroma
-    vlc_video_context *vctx_out;
-    vlc_va_t *va = vlc_va_New(VLC_OBJECT(p_dec), p_context, hwfmt, src_desc,
-                                p_dec->fmt_in, init_device,
-                                &p_dec->fmt_out.video, &vctx_out);
-    if (init_device)
-        vlc_decoder_device_Release(init_device);
-    if (open_lock)
-        vlc_mutex_lock(open_lock);
+    struct vlc_va_cfg cfg = {
+        .avctx = p_context,
+        .hwfmt = hwfmt,
+        .desc = src_desc,
+        .fmt_in = p_dec->fmt_in,
+        .dec_device = dec_device,
+        .video_fmt_out = &p_dec->fmt_out.video,
+        .vctx_out = NULL,
+        .use_hwframes = false,
+        .extra_pictures = 0,
+    };
+    vlc_va_t *va = vlc_va_New(VLC_OBJECT(p_dec), &cfg);
+
     if (va == NULL)
         return VLC_EGENERIC; /* Unsupported codec profile or such */
     assert(p_dec->fmt_out.video.i_chroma != 0);
-    assert(vctx_out != NULL);
+    assert(cfg.vctx_out != NULL);
     p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma;
+    p_dec->i_extra_picture_buffers += cfg.extra_pictures;
 
-    if (decoder_UpdateVideoOutput(p_dec, vctx_out))
+    if (decoder_UpdateVideoOutput(p_dec, cfg.vctx_out))
     {
         vlc_va_Delete(va, p_context);
         return VLC_EGENERIC; /* Unsupported codec profile or such */
     }
 
     p_sys->p_va = va;
-    p_sys->vctx_out = vlc_video_context_Hold( vctx_out );
+    p_sys->vctx_out = vlc_video_context_Hold( cfg.vctx_out );
     p_sys->pix_fmt = hwfmt;
+    p_sys->use_hwframes = cfg.use_hwframes;
     return VLC_SUCCESS;
 }
 
+static int ffmpeg_RecreateVa(decoder_t *p_dec, AVCodecContext *p_context,
+                             enum AVPixelFormat swfmt)
+{
+    decoder_sys_t *p_sys = p_dec->p_sys;
+    assert(p_sys->vctx_out != NULL);
+
+    vlc_decoder_device *dec_device =
+        vlc_video_context_HoldDevice(p_sys->vctx_out);
+
+    ffmpeg_CloseVa(p_dec, p_context);
+
+    const AVPixFmtDescriptor *src_desc = av_pix_fmt_desc_get(swfmt);
+
+    int ret = ffmpeg_OpenVa(p_dec, p_context, p_sys->pix_fmt,
+                            src_desc, dec_device);
+    if (dec_device != NULL)
+        vlc_decoder_device_Release(dec_device);
+    return ret;
+}
+
 static const enum AVPixelFormat hwfmts =
 {
 #ifdef _WIN32
@@ -782,7 +826,7 @@
 
     if (fmt_in->i_extra > 4)
     {
-        // in ISOBMFF/WebM/Matroska the first 4 bytes are from the AV1CodecConfigurationBox
+        // in ISOBMFF/WebM/Matroska the first 4 bytes are from the AV1CodecConfigurationRecord
         // and then one or more OBU
         const uint8_t *obu_start = ((const uint8_t*) fmt_in->p_extra) + 4;
         int obu_size = fmt_in->i_extra - 4;
@@ -871,7 +915,17 @@
 
     for( size_t i = 0; hwfmtsi != AV_PIX_FMT_NONE; i++ )
     {
-        if (ffmpeg_OpenVa(p_dec, p_context, hwfmtsi, p_context->sw_pix_fmt, src_desc, NULL) == VLC_SUCCESS)
+        vlc_decoder_device *dec_device;
+        int ret = lavc_UpdateHWVideoFormat(p_dec, p_context, hwfmtsi,
+                                           p_context->sw_pix_fmt, &dec_device);
+        if (ret != VLC_SUCCESS)
+            continue;
+
+        ret = ffmpeg_OpenVa(p_dec, p_context, hwfmtsi, src_desc, dec_device);
+        if (dec_device != NULL)
+            vlc_decoder_device_Release(dec_device);
+
+        if (ret == VLC_SUCCESS)
             // we have a matching hardware decoder
             return VLC_SUCCESS;
     }
@@ -995,9 +1049,11 @@
         date_Get( &p_sys->pts ) == VLC_TICK_INVALID )
         return VLC_TICK_INVALID;
 
+#if LIBAVCODEC_VERSION_CHECK( 60, 12, 100 )
+    int i_tick = p_context->codec_descriptor->props & AV_CODEC_PROP_FIELDS ? 2 : 1;
+#else
     int i_tick = p_context->ticks_per_frame;
-    if( i_tick <= 0 )
-        i_tick = 1;
+#endif
 
     /* interpolate the next PTS */
     return date_Increment( &p_sys->pts, i_tick + frame->repeat_pict );
@@ -1559,7 +1615,7 @@
              * then picture buffer can be allocated. */
             if (p_sys->p_va == NULL
              && lavc_UpdateVideoFormat(p_dec, p_context, p_context->pix_fmt,
-                                       p_context->pix_fmt, NULL) == 0
+                                       p_context->pix_fmt) == 0
              && decoder_UpdateVideoOutput(p_dec, NULL) == 0)
                 p_pic = decoder_NewPicture(p_dec);
 
@@ -1614,8 +1670,13 @@
         /* Hack to force display of still pictures */
         p_pic->b_force = p_sys->b_first_frame;
         p_pic->i_nb_fields = 2 + frame->repeat_pict;
+#if LIBAVUTIL_VERSION_CHECK( 58, 7, 100 )
+        p_pic->b_progressive = !(frame->flags & AV_FRAME_FLAG_INTERLACED);
+        p_pic->b_top_field_first = !!(frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST);
+#else
         p_pic->b_progressive = !frame->interlaced_frame;
         p_pic->b_top_field_first = frame->top_field_first;
+#endif
         p_pic->b_still = p_frame_info && p_frame_info->b_eos;
 
         if (DecodeSidedata(p_dec, frame, p_pic))
@@ -1691,11 +1752,7 @@
     avcodec_free_context( &ctx );
 
     if( p_sys->p_va )
-    {
-        vlc_va_Delete( p_sys->p_va, NULL );
-        vlc_video_context_Release( p_sys->vctx_out );
-        p_sys->vctx_out = NULL;
-    }
+        ffmpeg_CloseVa(p_dec, NULL);
 
     free( p_sys );
 }
@@ -1916,37 +1973,33 @@
     }
     FrameSetPicture( frame, NULL );
 
-    vlc_mutex_lock(&sys->lock);
     if (sys->p_va == NULL)
     {
         if (!sys->b_direct_rendering)
-        {
-            vlc_mutex_unlock(&sys->lock);
             return avcodec_default_get_buffer2(ctx, frame, flags);
-        }
 
+        vlc_mutex_lock(&sys->lock);
         /* Most unaccelerated decoders do not call get_format(), so we need to
          * update the output video format here. The MT semaphore must be held
          * to protect p_dec->fmt_out. */
-        if (lavc_UpdateVideoFormat(dec, ctx, ctx->pix_fmt, ctx->pix_fmt, NULL) ||
+        if (lavc_UpdateVideoFormat(dec, ctx, ctx->pix_fmt, ctx->pix_fmt) ||
             decoder_UpdateVideoOutput(dec, NULL))
         {
             vlc_mutex_unlock(&sys->lock);
             return -1;
         }
+        vlc_mutex_unlock(&sys->lock);
     }
 
     if (sys->p_va != NULL)
     {
         int ret = lavc_va_GetFrame(ctx, frame, flags);
-        vlc_mutex_unlock(&sys->lock);
         return ret;
     }
 
     /* Some codecs set pix_fmt only after the 1st frame has been decoded,
      * so we need to check for direct rendering again. */
     int ret = lavc_dr_GetFrame(ctx, frame, flags);
-    vlc_mutex_unlock(&sys->lock);
     if (ret)
         ret = avcodec_default_get_buffer2(ctx, frame, flags);
     return ret;
@@ -1962,6 +2015,7 @@
     /* Enumerate available formats */
     enum AVPixelFormat defaultfmt = avcodec_default_get_format(p_context, pi_fmt);
     enum AVPixelFormat swfmt = AV_PIX_FMT_NONE;
+    enum AVPixelFormat skipfmt = AV_PIX_FMT_NONE;
     bool can_hwaccel = false;
 
     for (size_t i = 0; pi_fmti != AV_PIX_FMT_NONE; i++)
@@ -2030,7 +2084,24 @@
      for (size_t i = 0; pi_fmti != AV_PIX_FMT_NONE; i++)
         if (pi_fmti == p_sys->pix_fmt)
         {
-            msg_Dbg(p_dec, "reusing decoder output format %d", pi_fmti);
+            if (p_sys->use_hwframes)
+            {
+                /* When using hwframes API, ffmpeg is reseting the hardware
+                 * context of the AVCodecContext before calling the
+                 * `get_format` callback. Therefore, the va context need to be
+                 * closed and opened again. */
+                msg_Dbg(p_dec, "recreating decoder output format %d", pi_fmti);
+                int ret = ffmpeg_RecreateVa(p_dec, p_context, swfmt);
+                if (ret != VLC_SUCCESS)
+                {
+                    msg_Err(p_dec, "error restarting va module");
+                    skipfmt = p_sys->pix_fmt; /* Don't retry this fmt */
+                    p_sys->pix_fmt = AV_PIX_FMT_NONE;
+                    goto no_reuse;
+                }
+            }
+            else
+                msg_Dbg(p_dec, "reusing decoder output format %d", pi_fmti);
             return p_sys->pix_fmt;
         }
 
@@ -2042,11 +2113,7 @@
         // switching to a software decoder will not silently decode nothing
         // (get_format will fail to use AV_PIX_FMT_NONE)
         assert(!p_sys->b_hardware_only);
-        vlc_va_Delete(p_sys->p_va, NULL);
-        p_sys->p_va = NULL;
-        vlc_video_context_Release( p_sys->vctx_out );
-        p_sys->vctx_out = NULL;
-        p_context->hwaccel_context = NULL;
+        ffmpeg_CloseVa(p_dec, p_context);
     }
 
     p_sys->profile = p_context->profile;
@@ -2055,9 +2122,6 @@
     if (!can_hwaccel)
         return swfmt;
 
-
-    vlc_mutex_lock(&p_sys->lock);
-
     const AVPixFmtDescriptor *src_desc = av_pix_fmt_desc_get(swfmt);
 
     for( size_t i = 0; hwfmtsi != AV_PIX_FMT_NONE; i++ )
@@ -2067,14 +2131,25 @@
             if( hwfmtsi == pi_fmtj )
                 hwfmt = hwfmtsi;
 
-        if (ffmpeg_OpenVa(p_dec, p_context, hwfmt, swfmt, src_desc, &p_sys->lock) != VLC_SUCCESS)
+        if (hwfmt == skipfmt)
+            continue;
+
+        vlc_decoder_device *dec_device;
+        int ret = lavc_UpdateHWVideoFormat(p_dec, p_context, hwfmt, swfmt,
+                                           &dec_device);
+        if (ret != VLC_SUCCESS)
+            continue;
+
+        ret = ffmpeg_OpenVa(p_dec, p_context, hwfmt, src_desc, dec_device);
+        if (dec_device != NULL)
+            vlc_decoder_device_Release(dec_device);
+
+        if (ret != VLC_SUCCESS)
             continue;
 
-        vlc_mutex_unlock(&p_sys->lock);
         return hwfmt;
     }
 
-    vlc_mutex_unlock(&p_sys->lock);
     /* Fallback to default behaviour */
     p_sys->pix_fmt = swfmt;
     return swfmt;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/cc.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/cc.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/cc.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/cc.h Changed

@@ -37,6 +37,7 @@
     CC_PAYLOAD_DVD,
     CC_PAYLOAD_REPLAYTV,
     CC_PAYLOAD_SCTE20,
+    CC_PAYLOAD_CDP,
 };
 typedef struct
 {
@@ -336,7 +337,7 @@
         }
         c->b_reorder = false;
     }
-    else /* CC_PAYLOAD_SCTE20 */
+    else if( i_payload_type == CC_PAYLOAD_SCTE20 )
     {
         /* user_data(2)
          *          (u32 stripped earlier)
@@ -383,6 +384,68 @@
         }
         c->b_reorder = true;
     }
+    else // CC_PAYLOAD_CDP
+    {
+#       define CDP_FLAG_TIME_CODE_PRESENT  (1<<7)
+#       define CDP_FLAG_CC_DATA_PRESENT    (1<<6)
+#       define CDP_FLAG_SVC_INFO_PRESENT   (1<<5)
+#       define CDP_FLAG_SVC_INFO_START     (1<<4)
+#       define CDP_FLAG_SVC_INFO_CHANGE    (1<<3)
+#       define CDP_FLAG_SVC_INFO_COMPLETE  (1<<2)
+#       define CDP_FLAG_CAPTION_SVC_ACTIVE (1<<1)
+
+        if(i_src < 7)
+            return;
+
+        /* ST334-2 5.2 cdp_header() */
+        uint8_t cdp_length = p_src2;
+        if(cdp_length < 8 || cdp_length > i_src)
+            return;
+        uint8_t cdp_flags = p_src4;
+
+        /* skip header */
+        p_src += 7; i_src -= 7;
+
+        /* 5.3 time_code_section() */
+        if( cdp_flags & CDP_FLAG_TIME_CODE_PRESENT )
+        {
+            if( i_src < 5 ) // Shall be 5 bytes
+                return;
+            p_src += 5; i_src += 5;
+        }
+        /* 5.4 ccdata_section */
+        if( cdp_flags & CDP_FLAG_CC_DATA_PRESENT )
+        {
+            /* ccdata_section()
+             *      u8 0x72
+             *      u3 marker bits(111)
+             *      u5 cc_count
+             *      for cc_count
+             *          u5 marker bits(1111 1)
+             *          u1 cc_valid
+             *          u2 cc_type
+             *          u8 cc_data_1
+             *          u8 cc_data_2
+             */
+            if( i_src < 2 || p_src0 != 0x72 ) // marker
+                return;
+
+            const uint8_t *cc = &p_src1;
+            const int i_count_cc = cc0&0x1f;
+
+            if( i_src - 2 < i_count_cc*3 )  // broken packet
+                return;
+            cc += 1;
+            for( int i = 0; i < i_count_cc; i++, cc += 3 )
+            {
+                if( c->i_data + 3 > CC_MAX_DATA_SIZE )
+                    break;
+                cc_AppendData( c, cc0, &cc1 );
+            }
+        }
+        /* remaining data */
+        c->b_reorder = false;
+    }
 }
 
 
@@ -429,6 +492,10 @@
         i_src -= 2;
         p_src += 2;
     }
+    else if (p_src0 == 0x96 && p_src1 == 0x69) /* CDP */
+    {
+        i_payload_type = CC_PAYLOAD_CDP;
+    }
     else
     {
 #if 0

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/cea708.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/cea708.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/cvdsub.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/cvdsub.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/daala.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/daala.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/dav1d.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/dav1d.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/dmo/dmo.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/dmo/dmo.c Changed

@@ -609,11 +609,6 @@
     DMO_PARTIAL_MEDIATYPE dmo_partial_type;
     int i_err;
 
-    long (STDCALL *OurDMOEnum)( const GUID *, DWORD, DWORD,
-                               const DMO_PARTIAL_MEDIATYPE *,
-                               DWORD, const DMO_PARTIAL_MEDIATYPE *,
-                               IEnumDMO ** );
-
     IEnumDMO *p_enum_dmo = NULL;
     WCHAR *psz_dmo_name;
     GUID clsid_dmo;
@@ -645,34 +640,18 @@
                                         p_fmt->i_original_fourcc : p_fmt->i_codec;
     }
 
-    /* Load msdmo DLL */
-    *p_hmsdmo_dll = LoadLibrary( TEXT( "msdmo.dll" ) );
-    if( *p_hmsdmo_dll == NULL )
-    {
-        msg_Dbg( p_this, "failed loading msdmo.dll" );
-        return VLC_EGENERIC;
-    }
-    OurDMOEnum = (void *)GetProcAddress( *p_hmsdmo_dll, "DMOEnum" );
-    if( OurDMOEnum == NULL )
-    {
-        msg_Dbg( p_this, "GetProcAddress failed to find DMOEnum()" );
-        FreeLibrary( *p_hmsdmo_dll );
-        return VLC_EGENERIC;
-    }
-
     if( !b_out )
     {
-        i_err = OurDMOEnum( &GUID_NULL, 1 /*DMO_ENUMF_INCLUDE_KEYED*/,
+        i_err = DMOEnum( &GUID_NULL, 1 /*DMO_ENUMF_INCLUDE_KEYED*/,
                             1, &dmo_partial_type, 0, NULL, &p_enum_dmo );
     }
     else
     {
-        i_err = OurDMOEnum( &GUID_NULL, 1 /*DMO_ENUMF_INCLUDE_KEYED*/,
+        i_err = DMOEnum( &GUID_NULL, 1 /*DMO_ENUMF_INCLUDE_KEYED*/,
                             0, NULL, 1, &dmo_partial_type, &p_enum_dmo );
     }
     if( i_err )
     {
-        FreeLibrary( *p_hmsdmo_dll );
         /* return VLC_EGENERIC; */
         /* Try loading the dll directly */
         goto loader;
@@ -703,7 +682,6 @@
 
     if( !*pp_dmo )
     {
-        FreeLibrary( *p_hmsdmo_dll );
         /* return VLC_EGENERIC; */
         /* Try loading the dll directly */
         goto loader;
@@ -1078,8 +1056,6 @@
     i = 0;
     while( !IMediaObject_GetInputType( p_dmo, 0, i++, &dmo_type ) )
     {
-        p_vih = (VIDEOINFOHEADER *)dmo_type.pbFormat;
-
         msg_Dbg( p_enc, "available input chroma: %4.4s",
                  (char *)&dmo_type.subtype.Data1 );
         if( !memcmp( &dmo_type.subtype, &MEDIASUBTYPE_RGB565, 16 ) )
@@ -1157,8 +1133,8 @@
     }
 
     IMediaObject_GetOutputType( p_dmo, 0, i_selected, &dmo_type );
-    ((VIDEOINFOHEADER *)dmo_type.pbFormat)->dwBitRate =
-        p_enc->fmt_out.i_bitrate;
+    memcpy( dmo_type.pbFormat + offsetof(VIDEOINFOHEADER, dwBitRate),
+            &(DWORD){ p_enc->fmt_out.i_bitrate }, sizeof(DWORD) );
 
     /* Get the private data for the codec */
     while( 1 )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/dvbsub.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/dvbsub.c Changed

@@ -269,7 +269,6 @@
     int                i_ancillary_id;
     vlc_tick_t         i_pts;
 
-    bool               b_absolute;
     int                i_spu_position;
     int                i_spu_x;
     int                i_spu_y;
@@ -368,12 +367,10 @@
     i_posy = var_CreateGetInteger( p_this, DVBSUB_CFG_PREFIX "y" );
 
     /* Check if subpicture position was overridden */
-    p_sys->b_absolute = true;
     p_sys->i_spu_x = p_sys->i_spu_y = 0;
 
     if( ( i_posx >= 0 ) && ( i_posy >= 0 ) )
     {
-        p_sys->b_absolute = true;
         p_sys->i_spu_x = i_posx;
         p_sys->i_spu_y = i_posy;
     }
@@ -1485,6 +1482,11 @@
     int i_base_x;
     int i_base_y;
 
+    if ( p_sys->p_page == NULL)
+    {
+        return NULL;
+    }
+
     /* Allocate the subpicture internal data. */
     p_spu = decoder_NewSubpicture( p_dec, NULL );
     if( !p_spu )
@@ -1519,11 +1521,6 @@
         i_base_y += p_sys->display.i_y;
     }
 
-    if ( p_sys->p_page == NULL)
-    {
-        return p_spu;
-    }
-
     /* Loop on region definitions */
 #ifdef DEBUG_DVBSUB
     msg_Dbg( p_dec, "rendering %i regions", p_sys->p_page->i_region_defs );
@@ -1614,7 +1611,7 @@
             msg_Err( p_dec, "cannot allocate SPU region" );
             continue;
         }
-        p_spu_region->b_absolute = p_sys->b_absolute;
+        p_spu_region->b_absolute = true; p_spu_region->b_in_window = false;
         p_spu_region->i_x = i_base_x + p_regiondef->i_x;
         p_spu_region->i_y = i_base_y + p_regiondef->i_y;
         p_spu_region->i_align = p_sys->i_spu_position;
@@ -1655,7 +1652,7 @@
             p_spu_region->fmt.i_height = p_spu_region->fmt.i_visible_height = p_region->i_height;
 
             p_spu_region->p_text = text_segment_New( p_object_def->psz_text );
-            p_spu_region->b_absolute = p_sys->b_absolute;
+            p_spu_region->b_absolute = true; p_spu_region->b_in_window = false;
             p_spu_region->i_x = i_base_x + p_regiondef->i_x + p_object_def->i_x;
             p_spu_region->i_y = i_base_y + p_regiondef->i_y + p_object_def->i_y;
             p_spu_region->i_align = p_sys->i_spu_position;
@@ -1992,6 +1989,9 @@
     msg_Dbg( p_enc, "encoding subpicture" );
 #endif
     p_block = block_Alloc( 64000 );
+    if( unlikely(p_block == NULL) )
+        return NULL;
+
     bs_init( s, p_block->p_buffer, p_block->i_buffer );
 
     bs_write( s, 8, 0x20 ); /* Data identifier */
@@ -2020,6 +2020,12 @@
 
         /* Send another (empty) subtitle to signal the end of display */
         p_block_stop = block_Alloc( 64000 );
+        if( unlikely(p_block_stop == NULL) )
+        {
+            block_Release(p_block);
+            return NULL;
+        }
+
         bs_init( s, p_block_stop->p_buffer, p_block_stop->i_buffer );
         bs_write( s, 8, 0x20 ); /* Data identifier */
         bs_write( s, 8, 0x0 );  /* Subtitle stream id */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/faad.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/faad.c Changed

@@ -157,7 +157,7 @@
         p_dec->fmt_out.audio.i_rate = i_rate;
         p_dec->fmt_out.audio.i_channels = i_channels;
         p_dec->fmt_out.audio.i_physical_channels
-            = mpeg4_asc_channelsbyindexi_channels;
+            = MPEG4_asc_channelsbyindexi_channels;
         date_Init( &p_sys->date, i_rate, 1 );
     }
     else
@@ -328,7 +328,7 @@
         p_dec->fmt_out.audio.i_rate = i_rate;
         p_dec->fmt_out.audio.i_channels = i_channels;
         p_dec->fmt_out.audio.i_physical_channels
-            = mpeg4_asc_channelsbyindexi_channels;
+            = MPEG4_asc_channelsbyindexi_channels;
         date_Init( &p_sys->date, i_rate, 1 );
     }
 
@@ -399,7 +399,7 @@
                     p_dec->fmt_out.audio.i_rate = i_rate;
                     p_dec->fmt_out.audio.i_channels = i_channels;
                     p_dec->fmt_out.audio.i_physical_channels
-                        = mpeg4_asc_channelsbyindexi_channels;
+                        = MPEG4_asc_channelsbyindexi_channels;
                     date_Init( &p_sys->date, i_rate, 1 );
                 }
             }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/fdkaac.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/fdkaac.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/flac.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/flac.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/fluidsynth.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/fluidsynth.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/hxxx_helper.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/hxxx_helper.c Changed

@@ -859,17 +859,6 @@
 }
 
 int
-h264_helper_get_current_dpb_values(const struct hxxx_helper *hh,
-                                   uint8_t *p_depth, unsigned *p_delay)
-{
-    const struct hxxx_helper_nal *hsps = h264_helper_get_current_sps(hh);
-    if (hsps == NULL)
-        return VLC_EGENERIC;
-    return h264_get_dpb_values(hsps->h264_sps, p_depth, p_delay) ?
-           VLC_SUCCESS : VLC_EGENERIC;
-}
-
-int
 hxxx_helper_get_current_profile_level(const struct hxxx_helper *hh,
                                       uint8_t *p_profile, uint8_t *p_level)
 {
@@ -890,17 +879,6 @@
     return VLC_EGENERIC;
 }
 
-int h264_helper_get_constraint_flag(const struct hxxx_helper *hh,
-                                    uint8_t *pi_constraints) {
-    
-    assert(hh->i_codec == VLC_CODEC_H264);
-    const struct hxxx_helper_nal *hsps = h264_helper_get_current_sps(hh);
-    if (hsps && hsps->h264_sps &&
-        h264_get_constraints_set(hsps->h264_sps, pi_constraints))
-        return VLC_SUCCESS;
-    return VLC_EGENERIC;
-}
-
 int
 hxxx_helper_get_chroma_chroma(const struct hxxx_helper *hh, uint8_t *pi_chroma_format,
                               uint8_t *pi_depth_luma, uint8_t *pi_depth_chroma)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/hxxx_helper.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/hxxx_helper.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/jpeg.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/jpeg.c Changed

@@ -288,31 +288,26 @@
     fmt->projection_mode = PROJECTION_MODE_EQUIRECTANGULAR;
 
     /* pose handling */
+    float yaw = 0.f, pitch = 0.f, roll = 0.f;
     float value;
     if (getRDFFloat(psz_rdf, &value, "PoseHeadingDegrees") &&
         value >= 0.f && value <= 360.f)
-        fmt->pose.yaw = value;
+        yaw = value;
 
-    if (getRDFFloat(psz_rdf, &value, "PosePitchDegrees"))
-        fmt->pose.pitch = value;
-
-    if (getRDFFloat(psz_rdf, &value, "PoseRollDegrees"))
-        fmt->pose.roll = value;
+    getRDFFloat(psz_rdf, &pitch, "PosePitchDegrees");
+    getRDFFloat(psz_rdf, &roll, "PoseRollDegrees");
 
     /* initial view */
-    if (getRDFFloat(psz_rdf, &value, "InitialViewHeadingDegrees"))
-        fmt->pose.yaw = value;
-
-    if (getRDFFloat(psz_rdf, &value, "InitialViewPitchDegrees"))
-        fmt->pose.pitch = value;
-
-    if (getRDFFloat(psz_rdf, &value, "InitialViewRollDegrees"))
-        fmt->pose.roll = value;
+    getRDFFloat(psz_rdf, &yaw, "InitialViewHeadingDegrees");
+    getRDFFloat(psz_rdf, &pitch, "InitialViewPitchDegrees");
+    getRDFFloat(psz_rdf, &roll, "InitialViewRollDegrees");
 
     if (getRDFFloat(psz_rdf, &value, "InitialHorizontalFOVDegrees") &&
         value >= FIELD_OF_VIEW_DEGREES_MIN && value <= FIELD_OF_VIEW_DEGREES_MAX)
         fmt->pose.fov = value;
 
+    vlc_viewpoint_from_euler(&fmt->pose, yaw, pitch, roll);
+
     free(psz_rdf);
 
     return true;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/kate.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/kate.c Changed

@@ -525,9 +525,9 @@
     decoder_sys_t *p_sys = p_dec->p_sys;
     kate_packet kp;
 
-    unsigned pi_sizeXIPH_MAX_HEADER_COUNT;
+    size_t pi_sizeXIPH_MAX_HEADER_COUNT;
     const void *pp_dataXIPH_MAX_HEADER_COUNT;
-    unsigned i_count;
+    size_t i_count;
     if( xiph_SplitHeaders( pi_size, pp_data, &i_count,
                            p_dec->fmt_in->i_extra, p_dec->fmt_in->p_extra) )
         return VLC_EGENERIC;
@@ -800,19 +800,19 @@
    Looks good with white though since it's all luma. Hopefully that will be the
    common case. */
 static void TigerUpdateSubpicture( subpicture_t *p_subpic,
-                                   const video_format_t *prev_src, const video_format_t *p_fmt_src,
-                                   const video_format_t *prev_dst, const video_format_t *p_fmt_dst,
-                                   vlc_tick_t ts )
+                                   const struct vlc_spu_updater_configuration *cfg )
 {
     kate_spu_updater_sys_t *p_spusys = p_subpic->updater.sys;
     decoder_sys_t *p_sys = p_spusys->p_dec_sys;
+    const video_format_t *p_fmt_src = cfg->video_src;
+    const video_format_t *p_fmt_dst = cfg->video_dst;
     plane_t *p_plane;
     /* time in seconds from the start of the stream */
-    kate_float t = (p_spusys->i_start + ts - p_subpic->i_start ) / 1000000.0f;
+    kate_float t = secf_from_vlc_tick( p_spusys->i_start + cfg->pts - p_subpic->i_start );
 
     bool new_regions = false;
-    if( !video_format_IsSimilar(prev_src, p_fmt_src) ||
-        !video_format_IsSimilar(prev_dst, p_fmt_dst) )
+    if( !video_format_IsSimilar(cfg->prev_src, p_fmt_src) ||
+        !video_format_IsSimilar(cfg->prev_dst, p_fmt_dst) )
         new_regions = true;
 
     if (!new_regions)
@@ -1153,10 +1153,12 @@
     SetupText( p_dec, p_region, ev );
 
     /* default positioning */
-    p_region->b_absolute = false;
+    p_region->b_absolute = false; p_region->b_in_window = false;
 #ifdef HAVE_TIGER
     if( p_sys->b_use_tiger)
-        p_region->b_absolute = true;
+    {
+        p_region->b_absolute = true; p_region->b_in_window = false;
+    }
 #endif
     p_region->i_align = SUBPICTURE_ALIGN_BOTTOM;
     if (p_bitmap_region)
@@ -1173,7 +1175,7 @@
     {
         if (kin.has.region)
         {
-            p_region->b_absolute = true;
+            p_region->b_absolute = true; p_region->b_in_window = false;
             p_region->i_x = kin.region_x;
             p_region->i_y = kin.region_y;
             if (p_bitmap_region)
@@ -1190,6 +1192,7 @@
     if (p_bitmap_region)
     {
         p_bitmap_region->b_absolute = p_region->b_absolute;
+        p_bitmap_region->b_in_window = p_region->b_in_window;
         vlc_spu_regions_push(&p_spu->regions, p_bitmap_region);
     }
     vlc_spu_regions_push(&p_spu->regions, p_region);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/libass.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/libass.c Changed

@@ -94,10 +94,7 @@
 static void DecSysHold( decoder_sys_t *p_sys );
 
 /* */
-static void SubpictureUpdate( subpicture_t *,
-                              const video_format_t *, const video_format_t *,
-                              const video_format_t *, const video_format_t *,
-                              vlc_tick_t );
+static void SubpictureUpdate( subpicture_t *, const struct vlc_spu_updater_configuration * );
 static void SubpictureDestroy( subpicture_t * );
 
 typedef struct
@@ -416,16 +413,16 @@
  *
  ****************************************************************************/
 static void SubpictureUpdate( subpicture_t *p_subpic,
-                              const video_format_t *prev_src, const video_format_t *p_fmt_src,
-                              const video_format_t *prev_dst, const video_format_t *p_fmt_dst,
-                              vlc_tick_t i_ts )
+                              const struct vlc_spu_updater_configuration *cfg )
 {
     libass_spu_updater_sys_t *p_spusys = p_subpic->updater.sys;
     decoder_sys_t *p_sys = p_spusys->p_dec_sys;
+    const video_format_t *p_fmt_src = cfg->video_src;
+    const video_format_t *p_fmt_dst = cfg->video_dst;
 
-    bool b_fmt_src = p_fmt_src->i_visible_width  != prev_src->i_visible_width ||
-                     p_fmt_src->i_visible_height != prev_src->i_visible_height;
-    bool b_fmt_dst = !video_format_IsSimilar(prev_dst, p_fmt_dst);
+    bool b_fmt_src = p_fmt_src->i_visible_width  != cfg->prev_src->i_visible_width ||
+                     p_fmt_src->i_visible_height != cfg->prev_src->i_visible_height;
+    bool b_fmt_dst = !video_format_IsSimilar(cfg->prev_dst, p_fmt_dst);
 
     vlc_mutex_lock( &p_sys->lock );
 
@@ -445,7 +442,7 @@
     }
 
     /* */
-    const vlc_tick_t i_stream_date = p_spusys->i_pts + (i_ts - p_subpic->i_start);
+    const vlc_tick_t i_stream_date = p_spusys->i_pts + (cfg->pts - p_subpic->i_start);
     int i_changed;
     ASS_Image *p_img = ass_render_frame( p_sys->p_renderer, p_sys->p_track,
                                          MS_FROM_VLC_TICK( i_stream_date ), &i_changed );
@@ -498,7 +495,7 @@
         r = subpicture_region_New( &fmt_region );
         if( !r )
             break;
-        r->b_absolute = true;
+        r->b_absolute = true; r->b_in_window = false;
         r->i_x = regioni.x0;
         r->i_y = regioni.y0;
         r->i_align = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/meson.build Changed

@@ -41,7 +41,7 @@
 }
 
 # faad decoder plugin
-faad_lib = cc.find_library('faad', required: get_option('faad'))
+faad_lib = dependency('faad2', required: get_option('faad'))
 vlc_modules += {
     'name' : 'faad',
     'sources' : files('faad.c'),
@@ -102,7 +102,18 @@
 }
 
 # libmad codec
-mad_dep = dependency('mad', required: get_option('mad'))
+mad_dep = disabler()
+if get_option('mad').allowed()
+# TODO add support for a custom folder for libmad
+if cc.check_header('mad.h')
+    mad_dep = cc.find_library('mad')
+elif cc.check_header('mad.h', dependencies: contrib_dep )
+    if cc.find_library('mad', dirs: contrib_libdir).found()
+        mad_dep = declare_dependency(
+            dependencies: cc.find_library('mad', dirs: contrib_libdir), contrib_dep)
+    endif
+endif
+endif
 vlc_modules += {
     'name' : 'mad',
     'sources' : files('mad.c'),
@@ -269,6 +280,14 @@
     'enabled' : aribb24_dep.found()
 }
 
+libaribcaption_dep = dependency('libaribcaption', 'aribcaption', required: get_option('aribcaption'))
+vlc_modules += {
+    'name' : 'aribcaption',
+    'sources' : files('arib/libaribcaption.c'),
+    'dependencies' : libaribcaption_dep,
+    'enabled' : libaribcaption_dep.found()
+}
+
 # scte18 decoder
 vlc_modules += {
     'name' : 'scte18',
@@ -388,20 +407,22 @@
         webvtt_bison_files,
     
 
-    # CSS parser test
-    css_parser_test = executable('css_parser_test',
-        files(
-            'webvtt/css_test.c',
-            'webvtt/css_parser.c'
-        ),
-        webvtt_lex_files, webvtt_bison_files,
-        link_with: vlc_libcompat,
-        dependencies: libvlccore_dep,
-        include_directories: 
-            vlc_include_dirs,
-            include_directories('webvtt'))
-
-    test('css_parser', css_parser_test, suite: 'css_parser')
+    if (get_option('tests').allowed())
+        # CSS parser test
+        css_parser_test = executable('css_parser_test',
+            files(
+                'webvtt/css_test.c',
+                'webvtt/css_parser.c'
+            ),
+            webvtt_lex_files, webvtt_bison_files,
+            link_with: vlc_libcompat,
+            dependencies: libvlccore_dep,
+            include_directories: 
+                vlc_include_dirs,
+                include_directories('webvtt'))
+
+        test('css_parser', css_parser_test, suite: 'css_parser')
+    endif
 
 endif
 
@@ -473,6 +494,15 @@
     'enabled' : daaladec_dep.found() and daalaenc_dep.found(),
 }
 
+# Speex codec plugin
+speex_dep = dependency('speex', version: '>= 1.0.5', required: get_option('speex'))
+vlc_modules += {
+    'name' : 'speex',
+    'sources' : files('speex.c'),
+    'dependencies' : speex_dep, ogg_dep,
+    'enabled' : speex_dep.found() and ogg_dep.found(),
+}
+
 # Vorbis codec
 vorbis_dep    = dependency('vorbis', 'Vorbis', version: '>= 1.1', required: get_option('vorbis'))
 vorbisenc_dep = dependency('vorbisenc', version: '>= 1.1', required: get_option('vorbis'))
@@ -508,12 +538,6 @@
             'videotoolbox/dpb.h',
             'videotoolbox/pacer.c',
             'videotoolbox/pacer.h',
-            'hxxx_helper.c',
-            '../packetizer/hxxx_nal.c',
-            '../packetizer/hxxx_sei.c',
-            '../packetizer/h264_slice.c',
-            '../packetizer/h264_nal.c',
-            '../packetizer/hevc_nal.c'
         ),
         'dependencies' : 
             frameworks'VideoToolbox',
@@ -521,19 +545,13 @@
             frameworks'CoreMedia',
             frameworks'CoreVideo',
         ,
-        'link_with' : libvlc_vtutils,
+        'link_with' : hxxxhelper_lib, libvlc_vtutils,
     }
 
     vlc_modules += {
         'name' : 'videotoolbox_enc',
         'sources' : files(
             'videotoolbox/encoder.c',
-            'hxxx_helper.c',
-            '../packetizer/hxxx_nal.c',
-            '../packetizer/hxxx_sei.c',
-            '../packetizer/h264_slice.c',
-            '../packetizer/h264_nal.c',
-            '../packetizer/hevc_nal.c'
         ),
         'dependencies' : 
             frameworks'VideoToolbox',
@@ -541,16 +559,21 @@
             frameworks'CoreMedia',
             frameworks'CoreVideo',
         ,
-        'link_with' : libvlc_vtutils,
+        'link_with' : hxxxhelper_lib, libvlc_vtutils,
     }
 
 endif
 
 # FFmpeg common helper library
+libavcodec_common = disabler()
+avcodec_compile_dep = disabler()
 if avcodec_dep.found()
+    avcodec_compile_dep = avcodec_dep.partial_dependency(includes:true, compile_args:true)
     libavcodec_common = static_library('avcodec_common',
         files('avcodec/fourcc.c', 'avcodec/chroma.c'),
-        dependencies: avutil_dep, avcodec_dep,
+        dependencies: 
+            avcodec_dep.partial_dependency(includes:true, compile_args:true)
+        ,
         install: false,
         include_directories: 
             vlc_include_dirs,
@@ -565,7 +588,19 @@
     avcodec_extra_sources += 'avcodec/encoder.c'
 endif
 
-# TODO: Implement the merge-ffmpeg option
+avcodec_deps =  avutil_dep, avcodec_dep 
+avcodec_cargs = 
+if get_option('merge-ffmpeg')
+    avcodec_extra_sources += 
+        '../demux/avformat/demux.c',
+        '../access/avio.c',
+        '../packetizer/avparser.c' 
+    avcodec_deps +=  avformat_dep, m_lib 
+    avcodec_cargs += '-DMERGE_FFMPEG'
+    if get_option('stream_outputs')
+        avcodec_extra_sources += '../demux/avformat/mux.c'
+    endif
+endif
 
 vlc_modules += {
     'name' : 'avcodec',
@@ -580,7 +615,8 @@
             '../packetizer/av1.h',
             avcodec_extra_sources
     ),
-    'dependencies' : avutil_dep, avcodec_dep,
+    'dependencies' : avcodec_deps,
+    'c_args' : avcodec_cargs,
     'link_with' : libavcodec_common,
     'link_args' : symbolic_linkargs,
     'enabled' : avcodec_dep.found(),
@@ -605,33 +641,7 @@
         libva_dep.found()
 }
 
-
 if host_system == 'windows'
-    d3d11_common_lib = static_library('d3d11_common',
-        files(
-            '../video_chroma/d3d11_fmt.cpp',
-            '../video_chroma/dxgi_fmt.c',
-            ),
-        include_directories: vlc_include_dirs,
-        cpp_args : libcom_cppflags,
-        pic: true,
-        install: false,
-        dependencies: 
-            cc.find_library('dxguid'),
-            cc.find_library('wbemuuid'),
-            cc.find_library('uuid'),
-        
-    )
-    d3d9_common_lib = static_library('d3d9_common',
-        files(
-            '../video_chroma/d3d9_fmt.c',
-            '../video_chroma/dxgi_fmt.c',
-            ),
-        include_directories: vlc_include_dirs,
-        pic: true,
-        install: false
-    )
-
     mft_deps =  cc.find_library('mfplat'), cc.find_library('d3d11') 
     vlc_modules += {
         'name' : 'mft',
@@ -639,16 +649,70 @@
                 'mft.cpp',
                 'mft_d3d.cpp',
                 'mft_d3d11.cpp',
-                'hxxx_helper.c',
-                '../packetizer/hxxx_nal.c',
-                '../packetizer/hxxx_sei.c',
-                '../packetizer/h264_slice.c',
-                '../packetizer/h264_nal.c',
-                '../packetizer/hevc_nal.c'
             ),
-        'link_with' :  d3d11_common_lib ,
+        'link_with' :  hxxxhelper_lib, d3d11_common_lib ,
+        'cpp_args' : libcom_cppflags,
         'dependencies' : mft_deps
     }
+
+    if (get_option('d3d11va').
+        enable_auto_if(cc.check_header('libavcodec/d3d11va.h', args: contrib_inc_args))
+        .allowed())
+        vlc_modules += {
+            'name' : 'd3d11va',
+            'sources' : files(
+                    'avcodec/d3d11va.c',
+                    'avcodec/directx_va.c',
+                    'avcodec/va_surface.c',
+                    '../packetizer/h264_nal.c',
+                    '../packetizer/hevc_nal.c',
+                    'avcodec/dxva_blocklist.c',
+                ),
+            'c_args' : '-DHAVE_LIBAVCODEC_D3D11VA_H=1',
+            'link_with' :  d3d11_common_lib ,
+            'dependencies' : avcodec_compile_dep,
+            'include_directories' : 
+                vlc_include_dirs,
+                include_directories('avcodec')
+            ,
+        }
+    endif
+
+    if (get_option('dxva2').
+        enable_auto_if(cc.check_header('libavcodec/dxva2.h', args: contrib_inc_args))
+        .allowed() and have_win_desktop)
+        vlc_modules += {
+            'name' : 'dxva2',
+            'sources' : files(
+                    'avcodec/dxva2.c',
+                    'avcodec/directx_va.c',
+                    'avcodec/va_surface.c',
+                    '../packetizer/h264_nal.c',
+                    '../packetizer/hevc_nal.c',
+                    'avcodec/dxva_blocklist.c',
+                ),
+            'c_args' :  '-DHAVE_LIBAVCODEC_DXVA2_H=1' ,
+            'link_with' :  d3d9_common_lib ,
+            'include_directories' : 
+                vlc_include_dirs,
+                include_directories('avcodec')
+            ,
+            'dependencies' : avcodec_compile_dep, cc.find_library('dxva2'),
+        }
+    endif
+
+    vlc_modules += {
+        'name' : 'dmo',
+        'sources' : files(
+                'dmo/dmo.c',
+                'dmo/buffer.c',
+            ),
+        'dependencies': 
+            cc.find_library('uuid'),
+            cc.find_library('msdmo'),
+        ,
+        'enabled' : have_win_desktop,
+    }
 endif
 
 # OpenMAX IL codec
@@ -762,23 +826,26 @@
 vpx_alpha_sources = files('vpx_alpha.c')
 vpx_alpha_with =  
 vpx_alpha_deps =  
+vpx_alpha_cxx_args =  
 if host_system == 'windows'
     vpx_alpha_sources += files('alpha_d3d11.cpp')
     vpx_alpha_with +=  d3d11_common_lib 
     vpx_alpha_deps +=  cc.find_library('d3d11') 
+    vpx_alpha_cxx_args += libcom_cppflags
 endif
 vlc_modules += {
     'name' : 'vpx_alpha',
     'sources' : vpx_alpha_sources,
     'link_with' : vpx_alpha_with,
     'dependencies' : vpx_alpha_deps,
+    'cpp_args' : vpx_alpha_cxx_args,
 }
 
 # libaom AV1 codec
 aom_dep = dependency('aom', required: get_option('aom'))
 vlc_modules += {
     'name' : 'aom',
-    'sources' : files('aom.c'),
+    'sources' : files('aom.c', '../packetizer/av1_obu.c'),
     'dependencies' : aom_dep,
     'enabled' : aom_dep.found(),
 }
@@ -813,11 +880,18 @@
     'enabled' : dav1d_dep.found(),
 }
 
+# tests
+vlc_modules += {
+    'name': 'hxxxhelper_testdec',
+    'sources': files('hxxx_helper_testdec.c'),
+    'link_with' : hxxxhelper_lib,
+    'include_directories': vlc_include_dirs,
+}
 
 ## Hardware encoders
 
 # QSV encoder
-qsv_dep = dependency('libmfx', required: get_option('mfx'))
+qsv_dep = dependency('vpl', required: get_option('vpl'))
 vlc_modules += {
     'name' : 'qsv',
     'sources' : files('qsv.c'),

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/mft.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/mft.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/mft_d3d.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/mft_d3d.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/mft_d3d11.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/mft_d3d11.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/omxil/mediacodec.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/omxil/mediacodec.c Changed

@@ -323,7 +323,7 @@
     return VLC_SUCCESS;
 }
 
-static int ParseVideoExtraH264(decoder_t *p_dec, uint8_t *p_extra, int i_extra)
+static int ParseVideoExtraH264(decoder_t *p_dec, uint8_t *p_extra, size_t i_extra)
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     struct hxxx_helper *hh = &p_sys->video.hh;
@@ -342,7 +342,7 @@
     return VLC_SUCCESS;
 }
 
-static int ParseVideoExtraHEVC(decoder_t *p_dec, uint8_t *p_extra, int i_extra)
+static int ParseVideoExtraHEVC(decoder_t *p_dec, uint8_t *p_extra, size_t i_extra)
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     struct hxxx_helper *hh = &p_sys->video.hh;
@@ -361,10 +361,10 @@
     return VLC_SUCCESS;
 }
 
-static int ParseVideoExtraVc1(decoder_t *p_dec, uint8_t *p_extra, int i_extra)
+static int ParseVideoExtraVc1(decoder_t *p_dec, uint8_t *p_extra, size_t i_extra)
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
-    int offset = 0;
+    size_t offset = 0;
 
     if (i_extra < 4)
         return VLC_EGENERIC;
@@ -386,7 +386,7 @@
     return CSDDup(p_sys, p_extra + offset, i_extra - offset);
 }
 
-static int ParseVideoExtraWmv3(decoder_t *p_dec, uint8_t *p_extra, int i_extra)
+static int ParseVideoExtraWmv3(decoder_t *p_dec, uint8_t *p_extra, size_t i_extra)
 {
     /* WMV3 initialisation data :
      * 8 fixed bytes
@@ -423,7 +423,7 @@
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     uint8_t *p_extra = p_dec->fmt_in->p_extra;
-    int i_extra = p_dec->fmt_in->i_extra;
+    size_t i_extra = p_dec->fmt_in->i_extra;
 
     switch (p_dec->fmt_in->i_codec)
     {
@@ -720,10 +720,14 @@
      * to modify its layout. */
 
     p_sys->video.surfacetexture = NULL;
-    bool use_surfacetexture =
-        p_dec->fmt_out.video.projection_mode != PROJECTION_MODE_RECTANGULAR
-     || (!p_sys->api.b_support_rotation && p_dec->fmt_out.video.orientation != ORIENT_NORMAL)
-     || !AWindowHandler_canSetVideoLayout(awh);
+    int awh_caps = AWindowHandler_getCapabilities(awh);
+    bool can_set_video_layout = awh_caps & AWH_CAPS_SET_VIDEO_LAYOUT;
+    bool can_use_surfacetexture = awh_caps & AWH_CAPS_SURFACE_VIEW;
+
+    bool use_surfacetexture = can_use_surfacetexture
+     && (p_dec->fmt_out.video.projection_mode != PROJECTION_MODE_RECTANGULAR
+      || (!p_sys->api.b_support_rotation && p_dec->fmt_out.video.orientation != ORIENT_NORMAL)
+      || !can_set_video_layout);
 
     if (!use_surfacetexture)
     {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/opus.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/opus.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/opus_header.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/opus_header.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/opus_header.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/opus_header.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/qsv.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/qsv.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/scte18.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/scte18.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/scte27.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/scte27.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/speex.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/speex.c Changed

@@ -409,9 +409,9 @@
     decoder_sys_t *p_sys = p_dec->p_sys;
     ogg_packet oggpacket;
 
-    unsigned pi_sizeXIPH_MAX_HEADER_COUNT;
+    size_t pi_sizeXIPH_MAX_HEADER_COUNT;
     const void *pp_dataXIPH_MAX_HEADER_COUNT;
-    unsigned i_count;
+    size_t i_count;
     if( xiph_SplitHeaders( pi_size, pp_data, &i_count,
                            p_dec->fmt_in->i_extra, p_dec->fmt_in->p_extra) )
         return VLC_EGENERIC;
@@ -606,6 +606,9 @@
                 / 8;
 
             p_new_block = block_Alloc( i_bytes_in_speex_frame );
+            if( unlikely(p_new_block == NULL) )
+                return NULL;
+
             memset( p_new_block->p_buffer, 0xff, i_bytes_in_speex_frame );
 
             /*
@@ -635,9 +638,13 @@
                 speex_bits_write( &p_sys->bits,
                     (char*)p_block->p_buffer,
                     p_block->i_buffer - i_bytes_in_speex_frame );
+
                 p_block = block_Realloc( p_block,
                     0,
                     p_block->i_buffer-i_bytes_in_speex_frame );
+                if( unlikely(p_block == NULL) )
+                    return NULL;
+
                 *pp_block = p_block;
             }
             else
@@ -1158,6 +1165,9 @@
         speex_bits_reset( &p_sys->bits );
 
         p_block = block_Alloc( i_out );
+        if( unlikely(p_block == NULL) )
+            break;
+
         memcpy( p_block->p_buffer, p_sys->p_buffer_out, i_out );
 
         p_block->i_length = vlc_tick_from_samples(

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/spudec/parse.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/spudec/parse.c Changed

@@ -184,6 +184,13 @@
     }
 }
 
+static void UpdateDvdSpu(subpicture_t * p_spu,
+                         const struct vlc_spu_updater_configuration * cfg)
+{
+    p_spu->i_original_picture_width  = cfg->video_src->i_visible_width;
+    p_spu->i_original_picture_height = cfg->video_src->i_visible_height;
+}
+
 /*****************************************************************************
  * OutputPicture:
  *****************************************************************************
@@ -198,7 +205,15 @@
     uint16_t *p_pixeldata;
 
     /* Allocate the subpicture internal data. */
-    p_spu = decoder_NewSubpicture( p_dec, NULL );
+    static const struct vlc_spu_updater_ops spu_ops =
+    {
+        .update = UpdateDvdSpu,
+    };
+
+    static const subpicture_updater_t updater = {
+        .ops = &spu_ops,
+    };
+    p_spu = decoder_NewSubpicture( p_dec, &updater );
     if( !p_spu ) return;
 
     p_spu->i_original_picture_width =
@@ -871,14 +886,7 @@
     }
     vlc_spu_regions_push(&p_spu->regions, p_region);
 
-    if (p_spu->i_original_picture_width == 0 && p_spu->i_original_picture_height == 0)
-    {
-        assert(p_spu_properties->i_width != 0);
-        assert(p_spu_properties->i_height != 0);
-        p_spu->i_original_picture_width  = p_spu_properties->i_width;
-        p_spu->i_original_picture_height = p_spu_properties->i_height;
-    }
-    p_region->b_absolute = true;
+    p_region->b_absolute = true; p_region->b_in_window = false;
     p_region->i_x = p_spu_properties->i_x;
     p_region->i_y = p_spu_properties->i_y + p_spu_data->i_y_top_offset;
     p_p = p_region->p_picture->p->p_pixels;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/spudec/spudec.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/spudec/spudec.c Changed

@@ -82,6 +82,8 @@
     p_sys->b_packetizer = b_packetizer;
     p_sys->b_disabletrans = var_InheritBool( p_dec, "dvdsub-transparency" );
     p_sys->i_spu_size = 0;
+    p_sys->buffer     = NULL;
+    p_sys->buffer_size = 0;
     p_sys->i_spu      = 0;
     p_sys->p_block    = NULL;
 
@@ -123,6 +125,7 @@
         block_ChainRelease( p_sys->p_block );
     }
 
+    free( p_sys->buffer );
     free( p_sys );
 }
 
@@ -143,8 +146,19 @@
         return VLCDEC_SUCCESS;
     }
 
-    /* FIXME: what the, we shouldn’t need to allocate 64k of buffer --sam. */
-    p_sys->i_spu = block_ChainExtract( p_spu_block, p_sys->buffer, sizeof(p_sys->buffer) );
+    size_t block_size;
+    vlc_frame_ChainProperties( p_spu_block, NULL, &block_size, NULL );
+    if ( p_sys->buffer_size < block_size )
+    {
+        void *bigger = realloc( p_sys->buffer, block_size );
+        if ( unlikely(bigger == NULL) )
+        {
+            return VLCDEC_ECRITICAL;
+        }
+        p_sys->buffer = bigger;
+        p_sys->buffer_size = block_size;
+    }
+    p_sys->i_spu = block_ChainExtract( p_spu_block, p_sys->buffer, block_size );
     p_sys->i_pts = p_spu_block->i_pts;
     block_ChainRelease( p_spu_block );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/spudec/spudec.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/spudec/spudec.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/stl.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/stl.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/subsdec.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/subsdec.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/substext.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/substext.h Changed

@@ -48,7 +48,8 @@
     /* store above percentile meanings as modifier flags */
     int flags; /* subpicture_updater_sys_region_flags_e */
     int align; /* alignment of the region itself */
-    bool b_absolute; /* position absolute to the video coordinates */
+    bool b_absolute;  /**< position is absolute in the movie */
+    bool b_in_window; /**< position the region in whole window */
     int inner_align; /* alignment of content inside the region */
     text_style_t *p_region_style;
     text_segment_t *p_segments;
@@ -77,7 +78,9 @@
 {
     memset(p_updtregion, 0, sizeof(*p_updtregion));
     p_updtregion->align = SUBPICTURE_ALIGN_BOTTOM;
-    p_updtregion->inner_align = 0;
+    p_updtregion->b_absolute = false;
+    p_updtregion->b_in_window = false;
+    p_updtregion->inner_align = 0 ; // centered
 }
 
 static inline substext_updater_region_t *SubpictureUpdaterSysRegionNew( void )
@@ -97,15 +100,15 @@
 }
 
 static void SubpictureTextUpdate(subpicture_t *subpic,
-                                 const video_format_t *prev_src, const video_format_t *fmt_src,
-                                 const video_format_t *prev_dst, const video_format_t *fmt_dst,
-                                 vlc_tick_t ts)
+                                 const struct vlc_spu_updater_configuration *cfg)
 {
     subtext_updater_sys_t *sys = subpic->updater.sys;
+    const video_format_t *fmt_src = cfg->video_src;
+    const video_format_t *fmt_dst = cfg->video_dst;
 
-    if (fmt_src->i_visible_height == prev_src->i_visible_height &&
-        video_format_IsSimilar(prev_dst, fmt_dst) &&
-        (sys->i_next_update == VLC_TICK_INVALID || sys->i_next_update > ts))
+    if (fmt_src->i_visible_height == cfg->prev_src->i_visible_height &&
+        video_format_IsSimilar(cfg->prev_dst, fmt_dst) &&
+        (sys->i_next_update == VLC_TICK_INVALID || sys->i_next_update > cfg->pts))
         return;
 
     substext_updater_region_t *p_updtregion = &sys->region;
@@ -142,6 +145,20 @@
     {
         sar.num = 4;
         sar.den = 3;
+    }
+    else
+    {
+        sar.num = 1;
+        sar.den = 1;
+    }
+
+    if ( p_updtregion->b_in_window )
+    {
+        subpic->i_original_picture_width  = cfg->display_width;
+        subpic->i_original_picture_height = cfg->display_height;
+    }
+    else if( sys->region.flags & UPDT_REGION_USES_GRID_COORDINATES )
+    {
         subpic->i_original_picture_width  = fmt_dst->i_visible_height * sar.num / sar.den;
         subpic->i_original_picture_height = fmt_dst->i_visible_height;
     }
@@ -149,12 +166,18 @@
     {
         subpic->i_original_picture_width  = fmt_dst->i_width * fmt_dst->i_sar_num / fmt_dst->i_sar_den;
         subpic->i_original_picture_height = fmt_dst->i_height;
-        sar.num = 1;
-        sar.den = 1;
     }
 
     bool b_schedule_blink_update = false;
 
+    video_format_t render_fmt = *fmt_dst;
+    if (p_updtregion->b_in_window)
+    {
+        render_fmt.i_x_offset = render_fmt.i_y_offset = 0;
+        render_fmt.i_width  = render_fmt.i_visible_width  = cfg->display_width;
+        render_fmt.i_height = render_fmt.i_visible_height = cfg->display_height;
+    }
+
     for( substext_updater_region_t *update_region = &sys->region;
                                     update_region; update_region = update_region->p_next )
     {
@@ -167,6 +190,7 @@
 
         r->p_text = text_segment_Copy( update_region->p_segments );
         r->b_absolute = update_region->b_absolute;
+        r->b_in_window = update_region->b_in_window;
         r->i_align = update_region->align;
         r->text_flags |= update_region->inner_align & SUBPICTURE_ALIGN_MASK;
         if (update_region->flags & UPDT_REGION_IGNORE_BACKGROUND)
@@ -179,25 +203,25 @@
         {
             const float margin_ratio = sys->margin_ratio;
             const int   margin_h     = margin_ratio * ( b_gridmode ? subpic->i_original_picture_width
-                                                                   : fmt_dst->i_visible_width );
-            const int   margin_v     = margin_ratio * fmt_dst->i_visible_height;
+                                                                   : render_fmt.i_visible_width );
+            const int   margin_v     = margin_ratio * render_fmt.i_visible_height;
 
             /* subpic invisible margins sizes */
-            const int outerright_h = fmt_dst->i_width - (fmt_dst->i_visible_width + fmt_dst->i_x_offset);
-            const int outerbottom_v = fmt_dst->i_height - (fmt_dst->i_visible_height + fmt_dst->i_y_offset);
+            const int outerright_h = render_fmt.i_width - (render_fmt.i_visible_width + render_fmt.i_x_offset);
+            const int outerbottom_v = render_fmt.i_height - (render_fmt.i_visible_height + render_fmt.i_y_offset);
             /* regions usable */
-            const int inner_w = fmt_dst->i_visible_width - margin_h * 2;
-            const int inner_h = fmt_dst->i_visible_height - margin_v * 2;
+            const int inner_w = render_fmt.i_visible_width - margin_h * 2;
+            const int inner_h = render_fmt.i_visible_height - margin_v * 2;
 
             if (r->i_align & SUBPICTURE_ALIGN_LEFT)
-                r->i_x = margin_h + fmt_dst->i_x_offset;
+                r->i_x = margin_h + render_fmt.i_x_offset;
             else if (r->i_align & SUBPICTURE_ALIGN_RIGHT)
                 r->i_x = margin_h + outerright_h;
             else
                 r->i_x = 0;
 
             if (r->i_align & SUBPICTURE_ALIGN_TOP )
-                r->i_y = margin_v + fmt_dst->i_y_offset;
+                r->i_y = margin_v + render_fmt.i_y_offset;
             else if (r->i_align & SUBPICTURE_ALIGN_BOTTOM )
                 r->i_y = margin_v + outerbottom_v;
             else
@@ -225,8 +249,8 @@
 
         } else {
             /* FIXME it doesn't adapt on crop settings changes */
-            r->i_x = update_region->origin.x * fmt_dst->i_width  / update_region->extent.x;
-            r->i_y = update_region->origin.y * fmt_dst->i_height / update_region->extent.y;
+            r->i_x = update_region->origin.x * render_fmt.i_width  / update_region->extent.x;
+            r->i_y = update_region->origin.y * render_fmt.i_height / update_region->extent.y;
         }
 
         /* Add missing default style, if any, to all segments */
@@ -266,9 +290,9 @@
     }
 
     if( b_schedule_blink_update &&
-        (sys->i_next_update == VLC_TICK_INVALID || sys->i_next_update < ts) )
+        (sys->i_next_update == VLC_TICK_INVALID || sys->i_next_update < cfg->pts) )
     {
-        sys->i_next_update = ts + VLC_TICK_FROM_SEC(1);
+        sys->i_next_update = cfg->pts + VLC_TICK_FROM_SEC(1);
         sys->b_blink_even = !sys->b_blink_even;
     }
 }
@@ -318,6 +342,7 @@
         text_style_Delete(sys->p_default_style);
         free(sys);
     }
-    sys->region.b_absolute = true;
+    sys->region.b_absolute = true; sys->region.b_in_window = false;
+    sys->i_next_update = VLC_TICK_INVALID;
     return subpic;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/substx3g.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/substx3g.c Changed

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * substx3gsub.c : MP4 tx3g subtitles decoder
+ * substx3g.c : MP4 tx3g subtitles decoder
  *****************************************************************************
  * Copyright (C) 2014 VLC authors and VideoLAN
  *
@@ -321,16 +321,14 @@
     if ( i_psz_bytelength > 2 &&
          ( !memcmp( p_pszstart, "\xFE\xFF", 2 ) || !memcmp( p_pszstart, "\xFF\xFE", 2 ) )
        )
-    {
         psz_subtitle = FromCharset( "UTF-16", p_pszstart, i_psz_bytelength );
-        if ( !psz_subtitle )
-            return VLCDEC_SUCCESS;
-    }
     else
-    {
         psz_subtitle = strndup( (const char*) p_pszstart, i_psz_bytelength );
-        if ( !psz_subtitle )
-            return VLCDEC_SUCCESS;
+
+    if ( !psz_subtitle )
+    {
+        block_Release( p_block );
+        return VLCDEC_SUCCESS;
     }
 
     for( uint16_t i=0; i < i_psz_bytelength; i++ )
@@ -344,6 +342,7 @@
     {
         text_segment_Delete( p_segment3g->s );
         free( p_segment3g );
+        block_Release( p_block );
         return VLCDEC_SUCCESS;
     }
 
@@ -353,6 +352,7 @@
     {
         text_segment_Delete( p_segment3g->s );
         free( p_segment3g );
+        block_Release( p_block );
         return VLCDEC_SUCCESS;
     }
 
@@ -415,7 +415,7 @@
     p_spu->i_stop     = p_block->i_pts + p_block->i_length;
     p_spu->b_ephemer  = (p_block->i_length == 0);
 
-    p_spu_sys->region.b_absolute = false;
+    p_spu_sys->region.b_absolute = false; p_spu_sys->region.b_in_window = false;
     p_spu_sys->region.align = SUBPICTURE_ALIGN_BOTTOM;
 
     text_style_Merge( p_spu_sys->p_default_style, p_root_style, true );
@@ -569,11 +569,13 @@
  * Encoder entry/exit
  *****************************************************************************/
 #ifdef ENABLE_SOUT
-static void FillExtradataTx3g( void **pp_extra, int *pi_extra )
+static void FillExtradataTx3g(void **pp_extra, size_t *pi_extra)
 {
     size_t i_extra = 32 + 37;
     uint8_t *p_extra = calloc( 1, i_extra );
-    if( p_extra )
+    if (p_extra == NULL)
+        return;
+
     {
         p_extra4 = 0x01;/* 1  center, horizontal */
         p_extra5 = 0xFF;/* -1 bottom, vertical */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/subsusf.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/subsusf.c Changed

@@ -65,6 +65,7 @@
     ATTRIBUTE_X_PERCENT = (1 << 2),
     ATTRIBUTE_Y         = (1 << 3),
     ATTRIBUTE_Y_PERCENT = (1 << 4),
+    ATTRIBUTE_REL_WINDOW = (1 << 5),
 };
 
 typedef struct
@@ -325,8 +326,8 @@
     char *psz_align    = GrabAttributeValue( "alignment", psz_subtitle );
     char *psz_margin_x = GrabAttributeValue( "horizontal-margin", psz_subtitle );
     char *psz_margin_y = GrabAttributeValue( "vertical-margin", psz_subtitle );
-    /* -- UNSUPPORTED
     char *psz_relative = GrabAttributeValue( "relative-to", psz_subtitle );
+    /* -- UNSUPPORTED
     char *psz_rotate_x = GrabAttributeValue( "rotate-x", psz_subtitle );
     char *psz_rotate_y = GrabAttributeValue( "rotate-y", psz_subtitle );
     char *psz_rotate_z = GrabAttributeValue( "rotate-z", psz_subtitle );
@@ -380,6 +381,13 @@
 
         free( psz_margin_y );
     }
+    if( psz_relative )
+    {
+        if( !strcasecmp( "Window", psz_relative ) )
+            i_mask |= ATTRIBUTE_REL_WINDOW;
+
+        free( psz_relative );
+    }
     return i_mask;
 }
 
@@ -392,6 +400,10 @@
     i_mask = ParsePositionAttributeList( psz_subtitle, &i_align, &i_x, &i_y );
 
     p_region->b_absolute = false;
+    if( i_mask & ATTRIBUTE_REL_WINDOW )
+        p_region->b_in_window = true;
+    else
+        p_region->b_in_window = false;
     if( i_mask & ATTRIBUTE_ALIGNMENT )
         p_region->i_align = i_align;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/svcdsub.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/svcdsub.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/svg.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/svg.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/telx.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/telx.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/textst.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/textst.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/theora.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/theora.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/ttml/genttml.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/ttml/genttml.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/ttml/imageupdater.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/ttml/imageupdater.h Changed

@@ -74,17 +74,13 @@
 }
 
 static void TTML_ImageSpuUpdate(subpicture_t *p_spu,
-                                const video_format_t *prev_src, const video_format_t *p_fmt_src,
-                                const video_format_t *prev_dst, const video_format_t *p_fmt_dst,
-                                vlc_tick_t i_ts)
+                                const struct vlc_spu_updater_configuration *cfg)
 {
-    VLC_UNUSED(p_fmt_src);
-    VLC_UNUSED(i_ts);
-    VLC_UNUSED(prev_src);
     ttml_image_updater_sys_t *p_sys = p_spu->updater.sys;
+    const video_format_t *p_fmt_dst = cfg->video_dst;
 
-    if (p_fmt_dst->i_visible_width  == prev_dst->i_visible_width &&
-        p_fmt_dst->i_visible_height == prev_dst->i_visible_height)
+    if (p_fmt_dst->i_visible_width  == cfg->prev_dst->i_visible_width &&
+        p_fmt_dst->i_visible_height == cfg->prev_dst->i_visible_height)
         return;
 
     vlc_spu_regions_Clear( &p_spu->regions );
@@ -99,7 +95,7 @@
         if (unlikely(r == NULL))
             return;
 
-        r->b_absolute = true;
+        r->b_absolute = true; r->b_in_window = false;
         r->i_align = SUBPICTURE_ALIGN_LEFT|SUBPICTURE_ALIGN_TOP;
 
         if( p_updtregion->i_flags & ORIGIN_X_IS_RATIO )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/ttml/substtml.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/ttml/substtml.c Changed

@@ -584,7 +584,7 @@
 static void DictionaryMerge( const vlc_dictionary_t *p_src, vlc_dictionary_t *p_dst,
                              bool b_override )
 {
-    for( int i = 0; i < p_src->i_size; ++i )
+    for (size_t i = 0; i < p_src->i_size; ++i)
     {
         for ( const vlc_dictionary_entry_t* p_entry = p_src->p_entriesi;
                                             p_entry != NULL; p_entry = p_entry->p_next )
@@ -677,7 +677,7 @@
                              const vlc_dictionary_t *p_dict,
                              ttml_style_t *p_ttml_style )
 {
-    for( int i = 0; i < p_dict->i_size; ++i )
+    for (size_t i = 0; i < p_dict->i_size; ++i)
     {
         for ( vlc_dictionary_entry_t* p_entry = p_dict->p_entriesi;
               p_entry != NULL; p_entry = p_entry->p_next )
@@ -827,7 +827,7 @@
             if( (p_region = ttml_region_New( false )) )
             {
                 /* Fill from its own attributes */
-                for( int i = 0; i < merged.i_size; ++i )
+                for (size_t i = 0; i < merged.i_size; ++i)
                 {
                     for ( vlc_dictionary_entry_t* p_entry = merged.p_entriesi;
                           p_entry != NULL; p_entry = p_entry->p_next )
@@ -1119,7 +1119,7 @@
             vlc_dictionary_init( &context.regions, 1 );
             ConvertNodesToRegionContent( &context, p_nss, p_bodynode, NULL, NULL, playbacktime );
 
-            for( int i = 0; i < context.regions.i_size; ++i )
+            for (size_t i = 0; i < context.regions.i_size; ++i)
             {
                 for ( const vlc_dictionary_entry_t* p_entry = context.regions.p_entriesi;
                                                     p_entry != NULL; p_entry = p_entry->p_next )
@@ -1167,7 +1167,7 @@
         /* broken legacy align var (can't handle center...). Will change only regions content. */
         if( p_dec_sys->i_align & SUBPICTURE_ALIGN_MASK )
             p_spu_sys->region.inner_align = p_dec_sys->i_align;
-        p_updtregion->b_absolute = true;
+        p_updtregion->b_absolute = true; p_updtregion->b_in_window = false;
 
         p_spu_sys->margin_ratio = 0.0;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/ttml/ttml.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/ttml/ttml.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/videotoolbox/decoder.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/videotoolbox/decoder.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/vorbis.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/vorbis.c Changed

@@ -38,6 +38,7 @@
 #include <vlc_aout.h>
 #include <vlc_input_item.h>
 #include <vlc_sout.h>
+#include <vlc_replay_gain.h>
 #include "../demux/xiph.h"
 
 #include <ogg/ogg.h>
@@ -350,9 +351,9 @@
     decoder_sys_t *p_sys = p_dec->p_sys;
     ogg_packet oggpacket;
 
-    unsigned pi_sizeXIPH_MAX_HEADER_COUNT;
+    size_t pi_sizeXIPH_MAX_HEADER_COUNT;
     const void *pp_dataXIPH_MAX_HEADER_COUNT;
-    unsigned i_count;
+    size_t i_count;
     if( xiph_SplitHeaders( pi_size, pp_data, &i_count,
                            p_dec->fmt_in->i_extra, p_dec->fmt_in->p_extra) )
         return VLC_EGENERIC;
@@ -405,6 +406,36 @@
     }
     ParseVorbisComments( p_dec );
 
+    int i_ret = vlc_replay_gain_CopyFromMeta( &p_dec->fmt_out.audio_replay_gain, p_dec->p_description );
+
+    /* use replay gain if available; otherwise see vorbisgain(1) */
+    if( i_ret != VLC_SUCCESS && p_dec->p_description != NULL )
+    {
+        audio_replay_gain_t *p_arg = &p_dec->fmt_out.audio_replay_gain;
+        replay_gain_Reset( p_arg );
+
+        const char *track_gain = vlc_meta_GetExtra( p_dec->p_description, "RG_RADIO" );
+        if( track_gain )
+        {
+            p_arg->pb_gainAUDIO_REPLAY_GAIN_TRACK = true;
+            p_arg->pf_gainAUDIO_REPLAY_GAIN_TRACK = vlc_strtof_c( track_gain, NULL );
+        }
+
+        const char *track_peak = vlc_meta_GetExtra( p_dec->p_description, "RG_PEAK" );
+        if( track_peak )
+        {
+            p_arg->pb_peakAUDIO_REPLAY_GAIN_TRACK = true;
+            p_arg->pf_peakAUDIO_REPLAY_GAIN_TRACK = vlc_strtof_c( track_peak, NULL );
+        }
+
+        const char *album_gain = vlc_meta_GetExtra( p_dec->p_description, "RG_AUDIOPHILE" );
+        if( album_gain )
+        {
+            p_arg->pb_gainAUDIO_REPLAY_GAIN_ALBUM = true;
+            p_arg->pf_gainAUDIO_REPLAY_GAIN_ALBUM = vlc_strtof_c( album_gain, NULL );
+        }
+    }
+
     /* The next packet in order is the codebooks header
      * We need to watch out that this packet is not missing as a
      * missing or corrupted header is fatal. */
@@ -620,38 +651,7 @@
             *psz_value = '\0';
             psz_value++;
 
-            if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) ||
-                !strcasecmp( psz_name, "RG_RADIO" ) )
-            {
-                audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
-
-                r->pb_gainAUDIO_REPLAY_GAIN_TRACK = true;
-                r->pf_gainAUDIO_REPLAY_GAIN_TRACK = vlc_atof_c( psz_value );
-            }
-            else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_PEAK" ) ||
-                     !strcasecmp( psz_name, "RG_PEAK" ) )
-            {
-                audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
-
-                r->pb_peakAUDIO_REPLAY_GAIN_TRACK = true;
-                r->pf_peakAUDIO_REPLAY_GAIN_TRACK = vlc_atof_c( psz_value );
-            }
-            else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_GAIN" ) ||
-                     !strcasecmp( psz_name, "RG_AUDIOPHILE" ) )
-            {
-                audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
-
-                r->pb_gainAUDIO_REPLAY_GAIN_ALBUM = true;
-                r->pf_gainAUDIO_REPLAY_GAIN_ALBUM = vlc_atof_c( psz_value );
-            }
-            else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_PEAK" ) )
-            {
-                audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
-
-                r->pb_peakAUDIO_REPLAY_GAIN_ALBUM = true;
-                r->pf_peakAUDIO_REPLAY_GAIN_ALBUM = vlc_atof_c( psz_value );
-            }
-            else if( !strcasecmp( psz_name, "METADATA_BLOCK_PICTURE" ) )
+            if( !strcasecmp( psz_name, "METADATA_BLOCK_PICTURE" ) )
             { /* Do nothing, for now */ }
             else
             {
@@ -939,6 +939,12 @@
         {
             int i_block_size;
             p_block = block_Alloc( oggpacket.bytes );
+            if( unlikely(p_block == NULL) ) {
+                block_ChainRelease( p_chain );
+                p_chain = NULL;
+                break;
+            }
+
             memcpy( p_block->p_buffer, oggpacket.packet, oggpacket.bytes );
 
             i_block_size = vorbis_packet_blocksize( &p_sys->vi, &oggpacket );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/vpx.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/vpx.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/vt_utils.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/vt_utils.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/webvtt/subsvtt.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/webvtt/subsvtt.c Changed

@@ -1623,6 +1623,8 @@
         }
 
         *pp_append = p_new;
+        while( *pp_append )
+            pp_append = &((*pp_append)->p_next);
 
         if( p_cue->settings.vertical == WEBVTT_ALIGN_LEFT )
         {
@@ -1796,6 +1798,7 @@
             }
 
             p_updtregion->b_absolute = false; /* can't be absolute as snap to lines can overlap ! */
+            p_updtregion->b_in_window = false;
             p_updtregion->align = SUBPICTURE_ALIGN_TOP|SUBPICTURE_ALIGN_LEFT;
             p_updtregion->inner_align = GetCueTextAlignment( (const webvtt_dom_cue_t *)p_vttregion->p_child );
             p_updtregion->origin.x = v.i_left;
@@ -1845,7 +1848,8 @@
                 continue;
             }
 
-            p_updtregion->b_absolute = false; /* can't be absolute as snap to lines can overlap ! */
+            /* can't be absolute as snap to lines can overlap ! */
+            p_updtregion->b_absolute = false; p_updtregion->b_in_window = false;
             if( p_cue->settings.line.b_auto )
             {
                 p_updtregion->align = SUBPICTURE_ALIGN_BOTTOM;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/x265.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/x265.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/codec/zvbi.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/codec/zvbi.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/common.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/common.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/control/hotkeys.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/control/hotkeys.c Changed

@@ -40,6 +40,7 @@
 #include <vlc_actions.h>
 #include <vlc_spu.h>
 #include <vlc_executor.h>
+#include <vlc_vout_osd.h>
 #include "math.h"
 
 struct intf_sys_t
@@ -575,7 +576,7 @@
 PLAYER_ACTION_HANDLER(Viewpoint)
 {
     VLC_UNUSED(intf);
-    vlc_viewpoint_t viewpoint;
+    vlc_viewpoint_t viewpoint = { .fov = 0.f };
     switch (action_id)
     {
         case ACTIONID_VIEWPOINT_FOV_IN:
@@ -585,10 +586,12 @@
             viewpoint.fov = +1.f;
             break;
         case ACTIONID_VIEWPOINT_ROLL_CLOCK:
-            viewpoint.roll = -1.f;
+            vlc_viewpoint_from_euler(&viewpoint,
+                                     0.f, 0.f, -1.f);
             break;
         case ACTIONID_VIEWPOINT_ROLL_ANTICLOCK:
-            viewpoint.roll = +1.f;
+            vlc_viewpoint_from_euler(&viewpoint,
+                                     0.f, 0.f, 1.f);
             break;
         default:
             vlc_assert_unreachable();
@@ -913,6 +916,12 @@
     }
 }
 
+VOUT_ACTION_HANDLER(Projection)
+{
+    (void)intf; (void)action_id;
+    var_ToggleBool(vout, "override-projection");
+}
+
 /****************
  * action table *
  ****************/
@@ -991,6 +1000,7 @@
     VLC_ACTION_VOUT(TOGGLE_AUTOSCALE, ZOOM_DOUBLE, Zoom)
     VLC_ACTION_VOUT(DEINTERLACE, DEINTERLACE_MODE, Deinterlace)
     VLC_ACTION_VOUT(SUBPOS_DOWN, SUBTITLE_TEXT_SCALE_UP, SubtitleDisplay)
+    VLC_ACTION_VOUT(PROJECTION_TOGGLE, PROJECTION_TOGGLE, Projection)
     /* null action */
     { .type = NULL_ACTION }
 
@@ -1109,11 +1119,11 @@
     {
         int i_horizontal = newval.coords.x - sys->vrnav.x;
         int i_vertical   = newval.coords.y - sys->vrnav.y;
-        vlc_viewpoint_t viewpoint =
-        {
-            .yaw   = -i_horizontal * 0.05f,
-            .pitch = -i_vertical   * 0.05f,
-        };
+        vlc_viewpoint_t viewpoint = { .fov = 0.f };
+        vlc_viewpoint_from_euler(&viewpoint,
+            -i_horizontal * 0.05f, /* yaw */
+            -i_vertical   * 0.05f, /* pitch */
+            0);                    /* roll */
         vlc_player_Lock(player);
         vlc_player_UpdateViewpoint(player, &viewpoint,
                                    VLC_PLAYER_WHENCE_RELATIVE);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/control/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/control/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/control/netsync.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/control/netsync.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/control/win_msg.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/control/win_msg.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/adaptive/Streams.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/adaptive/Streams.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/adaptive/Streams.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/adaptive/Streams.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/adaptive/plumbing/FakeESOut.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/adaptive/plumbing/FakeESOut.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/adaptive/plumbing/FakeESOut.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/adaptive/plumbing/FakeESOut.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/adaptive/plumbing/FakeESOutID.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/adaptive/plumbing/FakeESOutID.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/adaptive/tools/FormatNamespace.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/adaptive/tools/FormatNamespace.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/aiff.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/aiff.c Changed

@@ -32,6 +32,7 @@
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_aout.h>
+#include <vlc_meta.h>
 #include <limits.h>
 
 #include "mp4/coreaudio.h"
@@ -44,12 +45,13 @@
  * Module descriptor
  *****************************************************************************/
 static int  Open    ( vlc_object_t * );
+static void Close   ( vlc_object_t * );
 
 vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_DEMUX )
     set_description( N_("AIFF demuxer" ) )
     set_capability( "demux", 10 )
-    set_callback( Open )
+    set_callbacks( Open, Close )
     add_shortcut( "aiff" )
     add_file_extension("aiff")
 vlc_module_end ()
@@ -78,6 +80,7 @@
 
     bool        b_reorder;
     uint8_t     pi_chan_tableAOUT_CHAN_MAX;
+    vlc_meta_t  *p_meta;
     vlc_fourcc_t audio_fourcc;
 } demux_sys_t;
 
@@ -104,11 +107,65 @@
 }
 
 /*****************************************************************************
+ * ReadTextChunk: reads aiff text chunks - name, author, copyright, annotation
+ *****************************************************************************/
+static int ReadTextChunk( demux_t *p_demux,  uint64_t i_chunk_size, uint32_t i_data_size )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    const uint8_t *p_peek;
+
+    ssize_t ret = vlc_stream_Peek( p_demux->s, &p_peek, i_chunk_size );
+    if( ret == -1 || (size_t) ret != i_chunk_size )
+        return VLC_EGENERIC;
+
+    static const struct {
+        const char  psz_name4;
+        int         i_meta;
+    } p_dsc4 = {
+        { "NAME", vlc_meta_Title },
+        { "AUTH", vlc_meta_Artist },
+        { "(c) ", vlc_meta_Copyright },
+        { "ANNO", vlc_meta_Description }
+    };
+
+    for( size_t i = 0; i < ARRAY_SIZE( p_dsc ); i++ )
+    {
+        if( memcmp(p_peek, p_dsci.psz_name, 4) )
+            continue;
+
+        char *psz_value = malloc( i_data_size + 1 );
+
+        if( unlikely(psz_value == NULL) )
+            return VLC_ENOMEM;
+
+        if( !p_sys->p_meta )
+        {
+            p_sys->p_meta = vlc_meta_New();
+            if( unlikely(p_sys->p_meta == NULL) )
+            {
+                free( psz_value );
+                return VLC_ENOMEM;
+            }
+        }
+
+        memcpy( psz_value, (char*)&p_peek8, i_data_size );
+        psz_valuei_data_size = '\0';
+        vlc_meta_Set( p_sys->p_meta, p_dsci.i_meta, psz_value );
+        free( psz_value );
+
+        return VLC_SUCCESS;
+    }
+
+    return VLC_EGENERIC;
+}
+
+/*****************************************************************************
  * Open
  *****************************************************************************/
 static int Open( vlc_object_t *p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
+    demux_sys_t *p_sys;
 
     const uint8_t *p_peek;
 
@@ -121,19 +178,24 @@
     if( vlc_stream_Read( p_demux->s, NULL, 12 ) != 12 )
         return VLC_EGENERIC;
 
-    /* Fill p_demux field */
-    demux_sys_t *p_sys = vlc_obj_calloc( p_this, 1, sizeof (*p_sys) );
-    es_format_Init( &p_sys->fmt, AUDIO_ES, VLC_FOURCC( 't', 'w', 'o', 's' ) );
+    p_sys = vlc_obj_calloc( p_this, 1, sizeof( *p_sys ) );
+
+    if( unlikely(p_sys == NULL) )
+        return VLC_ENOMEM;
+
+    p_demux->p_sys = p_sys;
+
     p_sys->i_time = 0;
     p_sys->i_ssnd_pos = -1;
     p_sys->b_reorder = false;
+    es_format_Init( &p_sys->fmt, AUDIO_ES, VLC_FOURCC( 't', 'w', 'o', 's' ) );
 
     const uint32_t *pi_channels_in = NULL;
 
     for( ;; )
     {
         if( vlc_stream_Peek( p_demux->s, &p_peek, 8 ) < 8 )
-            return VLC_EGENERIC;
+            break;
 
         uint32_t i_data_size = GetDWBE( &p_peek4 );
         uint64_t i_chunk_size = UINT64_C( 8 ) + i_data_size + ( i_data_size & 1 );
@@ -184,13 +246,13 @@
                                           &p_sys->fmt.audio.i_channels,
                                           &pi_channels_in ) != VLC_SUCCESS )
                 msg_Warn( p_demux, "discarding chan mapping" );
-
         }
-
-        if( p_sys->i_ssnd_pos >= 12 && p_sys->fmt.audio.i_channels != 0 )
+        else
         {
-            /* We have found the 2 needed chunks */
-            break;
+            int i_ret = ReadTextChunk( p_demux, i_chunk_size, i_data_size );
+
+            if( unlikely(i_ret == VLC_ENOMEM) )
+                return VLC_ENOMEM;
         }
 
         /* consume chunk data */
@@ -228,7 +290,7 @@
     p_sys->i_ssnd_fsize = p_sys->fmt.audio.i_channels *
                           ((p_sys->fmt.audio.i_bitspersample + 7) / 8);
 
-    if( p_sys->i_ssnd_fsize <= 0 || p_sys->fmt.audio.i_rate == 0 )
+    if( p_sys->i_ssnd_fsize <= 0 || p_sys->fmt.audio.i_rate == 0 || p_sys->i_ssnd_pos < 12 )
     {
         msg_Err( p_demux, "invalid audio parameters" );
         return VLC_EGENERIC;
@@ -255,7 +317,6 @@
 
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;
-    p_demux->p_sys = p_sys;
 
     return VLC_SUCCESS;
 }
@@ -308,6 +369,18 @@
 }
 
 /*****************************************************************************
+ * Close: frees unused data
+ *****************************************************************************/
+static void Close( vlc_object_t * p_this )
+{
+    demux_t     *p_demux = (demux_t*)p_this;
+    demux_sys_t *p_sys = p_demux->p_sys;
+
+    if( p_sys->p_meta )
+        vlc_meta_Delete( p_sys->p_meta );
+}
+
+/*****************************************************************************
  * Control:
  *****************************************************************************/
 static int Control( demux_t *p_demux, int i_query, va_list args )
@@ -374,6 +447,15 @@
             }
             return VLC_EGENERIC;
         }
+        case DEMUX_GET_META:
+        {
+            vlc_meta_t *p_meta = va_arg( args, vlc_meta_t * );
+            if( !p_sys->p_meta )
+                return VLC_EGENERIC;
+            vlc_meta_Merge( p_meta, p_sys->p_meta );
+            return VLC_SUCCESS;
+        }
+
         case DEMUX_SET_TIME:
         case DEMUX_GET_FPS:
             return VLC_EGENERIC;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/asf/asf.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/asf/asf.c Changed

@@ -737,10 +737,6 @@
             ASF_FindObject( p_hdr, &asf_object_advanced_mutual_exclusion, 0 );
     if (! p_mutex ) return;
 
-#if ( UINT_MAX > SIZE_MAX / 2 )
-    if ( p_sys->i_track > (size_t)SIZE_MAX / sizeof(*p_prios->pi_stream_numbers) )
-        return;
-#endif
     p_prios->pi_stream_numbers = vlc_alloc( p_sys->i_track, sizeof(*p_prios->pi_stream_numbers) );
     if ( !p_prios->pi_stream_numbers ) return;
 
@@ -764,10 +760,6 @@
             ASF_FindObject( p_hdr, &asf_object_bitrate_mutual_exclusion_guid, 0 );
     if (! p_bitrate_mutex ) return;
 
-#if ( UINT_MAX > SIZE_MAX / 2 )
-    if ( p_sys->i_track > (size_t)SIZE_MAX / sizeof(*p_prios->pi_stream_numbers) )
-        return;
-#endif
     p_prios->pi_stream_numbers = vlc_alloc( p_sys->i_track, sizeof(*p_prios->pi_stream_numbers) );
     if ( !p_prios->pi_stream_numbers ) return;
 
@@ -1232,9 +1224,6 @@
         es_format_Clean( &fmt );
     }
 
-    free( fmt_priorities_ex.pi_stream_numbers );
-    free( fmt_priorities_bitrate_ex.pi_stream_numbers );
-
     p_sys->i_data_begin = p_sys->p_root->p_data->i_object_pos + 50;
     if( p_sys->p_root->p_data->i_object_size > 50 ) /* see libasf ASF_OBJECT_DATA <= 50 handling */
     { /* local file */
@@ -1367,6 +1356,8 @@
         }
     }
 #endif
+    free( fmt_priorities_ex.pi_stream_numbers );
+    free( fmt_priorities_bitrate_ex.pi_stream_numbers );
 
     p_sys->packet_sys.pi_preroll = &p_sys->p_fp->i_preroll;
     p_sys->packet_sys.pi_preroll_start = &p_sys->i_preroll_start;
@@ -1375,6 +1366,8 @@
     return VLC_SUCCESS;
 
 error:
+    free( fmt_priorities_ex.pi_stream_numbers );
+    free( fmt_priorities_bitrate_ex.pi_stream_numbers );
     DemuxEnd( p_demux );
     return VLC_EGENERIC;
 }
@@ -1446,4 +1439,3 @@
         p_sys->tracki = 0;
     }
 }
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/asf/asfpacket.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/asf/asfpacket.c Changed

@@ -227,7 +227,6 @@
     vlc_tick_t i_pkt_time_delta = 0;
     uint32_t i_payload_data_length = 0;
     uint32_t i_temp_payload_length = 0;
-    *p_packetsys->pi_preroll = __MIN( *p_packetsys->pi_preroll, VLC_TICK_MAX );
 
     /* First packet, in case we do not have index to guess preroll start time */
     if ( *p_packetsys->pi_preroll_start == ASFPACKET_PREROLL_FROM_CURRENT )
@@ -337,7 +336,7 @@
     if( p_packetsys->pf_updatesendtime )
         p_packetsys->pf_updatesendtime( p_packetsys, pkt->send_time );
 
-    uint32_t i_subpayload_count = 0;
+    vlc_tick_t i_subpayload_delta = 0;
     while (i_payload_data_length && pkt->i_skip < pkt->left )
     {
         uint32_t i_sub_payload_data_length = i_payload_data_length;
@@ -356,7 +355,7 @@
         }
 
         vlc_tick_t i_payload_pts;
-        i_payload_pts = i_pkt_time + i_pkt_time_delta * i_subpayload_count;
+        i_payload_pts = i_pkt_time + i_subpayload_delta;
         if ( p_tkinfo->p_sp )
             i_payload_pts -= VLC_TICK_FROM_MSFTIME(p_tkinfo->p_sp->i_time_offset);
 
@@ -392,7 +391,7 @@
         else
             i_payload_data_length = 0;
 
-        i_subpayload_count++;
+        i_subpayload_delta += i_pkt_time_delta;
     }
 
     return 0;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/avformat/demux.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/avformat/demux.c Changed

@@ -117,20 +117,32 @@
 #endif
 }
 
+static inline void* GetStreamSideData(const AVStream *s, enum AVPacketSideDataType type)
+{
+#if LIBAVCODEC_VERSION_CHECK( 60, 29, 100 )
+    const AVCodecParameters *cp = s->codecpar;
+    const AVPacketSideData *psd =
+        av_packet_side_data_get(cp->coded_side_data, cp->nb_coded_side_data, type);
+    return psd ? psd->data : NULL;
+#else
+    return av_stream_get_side_data(s, type, NULL);
+#endif
+}
+
 /*****************************************************************************
  * Open
  *****************************************************************************/
 
-static void get_rotation(es_format_t *fmt, AVStream *s)
+static void get_rotation(es_format_t *fmt, const AVStream *s)
 {
     char const *kRotateKey = "rotate";
     AVDictionaryEntry *rotation = av_dict_get(s->metadata, kRotateKey, NULL, 0);
     long angle = 0;
 
-    int32_t *matrix = (int32_t *)av_stream_get_side_data(s, AV_PKT_DATA_DISPLAYMATRIX, NULL);
+    int32_t *matrix = GetStreamSideData(s, AV_PKT_DATA_DISPLAYMATRIX);
     if( matrix ) {
-        int64_t det = (int64_t)matrix0 * matrix4 - (int64_t)matrix1 * matrix3;
-        if (det < 0) {
+        bool flipped = (int64_t)matrix0 * matrix4 < (int64_t)matrix1 * matrix3;
+        if (flipped) {
             /* Flip the matrix to decouple flip and rotation operations.
              * Always assume an horizontal flip for simplicity,
              * it can be changed later if rotation is 180º. */
@@ -142,7 +154,7 @@
             fmt->video.orientation = ORIENT_ROTATED_270;
 
         else if (angle > 135 || angle < -135) {
-            if (det < 0)
+            if (flipped)
                 fmt->video.orientation = ORIENT_VFLIPPED;
             else
                 fmt->video.orientation = ORIENT_ROTATED_180;
@@ -154,7 +166,7 @@
             fmt->video.orientation = ORIENT_NORMAL;
 
         /* Flip is already applied to the 180º case. */
-        if (det < 0 && !(angle > 135 || angle < -135)) {
+        if (flipped && !(angle > 135 || angle < -135)) {
             video_transform_t transform = (video_transform_t)fmt->video.orientation;
             /* Flip first then rotate */
             fmt->video.orientation = ORIENT_HFLIPPED;
@@ -178,12 +190,11 @@
     }
 }
 
-static void get_dovi_config(es_format_t *fmt, AVStream *s)
+static void get_dovi_config(es_format_t *fmt, const AVStream *s)
 {
 #if LIBAVUTIL_VERSION_CHECK( 57, 16, 100 )
-    AVDOVIDecoderConfigurationRecord *cfg =
-    (AVDOVIDecoderConfigurationRecord *)
-        av_stream_get_side_data(s, AV_PKT_DATA_DOVI_CONF, NULL);
+    const AVDOVIDecoderConfigurationRecord *cfg =
+        GetStreamSideData(s, AV_PKT_DATA_DOVI_CONF);
     if (!cfg)
         return;
 
@@ -197,6 +208,19 @@
 #endif
 }
 
+static void get_palette(es_format_t *fmt, const AVStream *s)
+{
+    const uint8_t *pal = GetStreamSideData(s, AV_PKT_DATA_PALETTE);
+    if (pal) {
+        video_palette_t *p_palette = fmt->video.p_palette;
+        for (size_t i=0; i<ARRAY_SIZE(p_palette->palette); i++)
+        {
+            memcpy(p_palette->palettei, pal, sizeof(p_palette->palette0));
+            pal += sizeof(p_palette->palette0);
+        }
+    }
+}
+
 static AVDictionary * BuildAVOptions( demux_t *p_demux )
 {
     char *psz_opts = var_InheritString( p_demux, "avformat-options" );
@@ -516,8 +540,8 @@
 
             get_rotation(&es_fmt, s);
             get_dovi_config(&es_fmt, s);
+            get_palette(&es_fmt, s);
 
-# warning FIXME: implement palette transmission
             psz_type = "video";
 
             AVRational rate;
@@ -609,13 +633,13 @@
         {
             const bool    b_ogg = !strcmp( p_sys->fmt->name, "ogg" );
             const uint8_t *p_extra = cp->extradata;
-            unsigned      i_extra  = cp->extradata_size;
+            size_t i_extra = cp->extradata_size;
 
             if( cp->codec_id == AV_CODEC_ID_THEORA && b_ogg )
             {
-                unsigned pi_size3;
+                size_t pi_size3;
                 const void *pp_data3;
-                unsigned i_count;
+                size_t i_count;
                 for( i_count = 0; i_count < 3; i_count++ )
                 {
                     if( i_extra < 2 )
@@ -641,7 +665,7 @@
                     0, 0, 0, 0,
                     0, 0, 0, 0,
                 };
-                unsigned pi_size2;
+                size_t pi_size2;
                 const void *pp_data2;
 
                 pi_size0 = i_extra;
@@ -667,7 +691,7 @@
                     0, 0, 0, 0, /* User Comment List Length */
 
                 };
-                unsigned pi_size2;
+                size_t pi_size2;
                 const void *pp_data2;
 
                 pi_size0 = i_extra;
@@ -817,14 +841,16 @@
 
     // handle extra data change, this can happen for FLV
 #if LIBAVUTIL_VERSION_MAJOR < 57
-    int side_data_size;
+# define EXTRA_SIZE_TYPE int
 #else
-    size_t side_data_size;
+# define EXTRA_SIZE_TYPE size_t
 #endif
-    uint8_t *side_data = av_packet_get_side_data( &pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_data_size );
-    if( side_data_size > 0 ) {
+    EXTRA_SIZE_TYPE side_data_size_query;
+    uint8_t *side_data = av_packet_get_side_data( &pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_data_size_query );
+    if( side_data_size_query > 0 ) {
         // ignore new extradata which is the same as previous version
-        if( side_data_size != p_track->es_format.i_extra ||
+        size_t side_data_size = (size_t)side_data_size_query;
+        if (side_data_size != p_track->es_format.i_extra ||
             memcmp( side_data, p_track->es_format.p_extra, side_data_size ) != 0 )
         {
             msg_Warn( p_demux, "New extra data found, seek may not work as expected" );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/avformat/mux.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/avformat/mux.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/avi/avi.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/avi/avi.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/caf.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/caf.c Changed

@@ -533,9 +533,9 @@
 {
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    const unsigned int kALAC_NEW_KUKI_SIZE = 24;
-    const unsigned int kALAC_LIB_REQ_KUKI_SIZE = 36;
-    int i_extra;
+    const size_t kALAC_NEW_KUKI_SIZE = 24;
+    const size_t kALAC_LIB_REQ_KUKI_SIZE = 36;
+    size_t i_extra;
 
     if( i_size == kALAC_NEW_KUKI_SIZE || i_size == kALAC_LIB_REQ_KUKI_SIZE )
     {
@@ -544,7 +544,7 @@
     else
     {
         msg_Warn( p_demux, "Unknown alac magic cookie. Passing it on to the decoder as is and hoping for the best." );
-        i_extra = ( int )i_size;
+        i_extra = i_size;
     }
 
     p_sys->fmt.i_extra = i_extra;
@@ -676,7 +676,7 @@
         i_offset = 0;
     }
 
-    p_sys->fmt.i_extra = (int)i_kuki_size;
+    p_sys->fmt.i_extra = i_kuki_size;
     p_sys->fmt.p_extra = malloc( i_kuki_size );
 
     if( !p_sys->fmt.p_extra )
@@ -716,9 +716,9 @@
         int error = ProcessAACCookie( p_demux, p_peek, i_size );
         if( error ) return error;
     }
-    else
+    else if( p_sys->fmt.i_codec != 0 )
     {
-        p_sys->fmt.i_extra = (int)i_size;
+        p_sys->fmt.i_extra = i_size;
         p_sys->fmt.p_extra = malloc( i_size );
 
         if( !p_sys->fmt.p_extra )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/dash/mpd/IsoffMainParser.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/dash/mpd/IsoffMainParser.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/flac.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/flac.c Changed

@@ -36,6 +36,7 @@
 #include <vlc_input.h>                /* vlc_input_attachment, vlc_seekpoint */
 #include <vlc_codec.h>                /* decoder_t */
 #include <vlc_charset.h>              /* EnsureUTF8 */
+#include <vlc_replay_gain.h>
 
 #include <assert.h>
 #include <limits.h>
@@ -744,6 +745,8 @@
             i_peek = vlc_stream_Peek( p_demux->s, &p_peek, 4+i_len );
             if( i_peek == 4+i_len )
                 ParseComment( p_demux, p_peek, i_peek );
+
+            vlc_replay_gain_CopyFromMeta( &p_fmt->audio_replay_gain, p_sys->p_meta );
         }
         else if( i_type == META_PICTURE )
         {
@@ -818,7 +821,7 @@
     vorbis_ParseComment( NULL, &p_sys->p_meta, &p_data4, i_data - 4,
         &p_sys->i_attachments, &p_sys->attachments,
         &p_sys->i_cover_score, &p_sys->i_cover_idx,
-        &p_sys->i_title_seekpoints, &p_sys->pp_title_seekpoints, NULL, NULL );
+        &p_sys->i_title_seekpoints, &p_sys->pp_title_seekpoints );
 }
 
 static void ParsePicture( demux_t *p_demux, const uint8_t *p_data, size_t i_data )

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/g64rtp.c Added

@@ -0,0 +1,945 @@
+/*****************************************************************************
+ * g64rtp.c : G64 raw RTP input module for vlc
+ *****************************************************************************
+ * Copyright (C) 2023 VideoLabs, VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
+#include <vlc_plugin.h>
+#include <vlc_modules.h>
+#include <vlc_vector.h>
+#include <vlc_charset.h>
+#include <vlc_meta.h>
+
+#include "../access/rtp/rtp.h"
+#include "../access/rtp/sdp.h"
+
+/*****************************************************************************
+ * Definitions of structures used by this plugin
+ *****************************************************************************/
+
+//#define G64_DEBUG
+
+typedef struct
+{
+    vlc_tick_t time;
+    uint64_t offset;
+} index_t;
+
+typedef struct VLC_VECTOR(index_t) vec_index_t;
+
+typedef struct
+{
+    es_out_id_t *es;
+    struct vlc_rtp_es dummy_es;
+    vlc_fourcc_t fcc;
+    uint8_t i_type;
+
+    struct vlc_rtp_pt pt;
+    void *ptpriv;
+
+    vlc_tick_t pcr;
+
+    vec_index_t index;
+    uint64_t i_start_offset;
+
+    vlc_tick_t i_first_pts;
+    vlc_tick_t i_duration;
+    char *psz_title;
+
+} demux_sys_t;
+
+#define G64_WRAP_HEADER_BYTES   25
+#define G64_FLAG_HIDDEN         0x01
+#define G64_FLAG_RANDOM_ACCESS  0x04
+
+typedef struct
+{
+    enum
+    {
+        UNIT_RTP,
+        UNIT_FRAMEMETA,
+    } type;
+    uint64_t pts;
+    uint8_t flags;
+    uint32_t size;
+} dump_unit_wrapper_t;
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+
+
+/*
+#	Type		ReceptionTime		Intrval	Size	Keyfram	Hidden	First	Last	Count	Error	RTP TimeStamp
+
+0	AxisH264 (96)	24/12/2022 01:11:40.797	0	112978	Yes	Yes	43704	43786	83	-	675574737
+BEX as 01D9172C4C2A22D0
+DEC as 13316314300 7970000
+
+1	AxisH264 (96)	24/12/2022 01:11:40.843	46	9641		Yes	43787	43793	7	-	675578337
+DEC as 13316314300 8430000
+
+5	AxisH264 (96)	24/12/2022 01:11:41.003	36	15424		Yes	43826	43836	11	-	675592735
+DEC as 13316314301 0030000
+13316314301 in secs is 154124 days, 0 hours, 11 minutes and 41 seconds.
+
+30	AxisH264 (96)	24/12/2022 01:11:42.003	30	14203		Yes	44102	44112	11	-	675682736
+DEC as 13316314302 0030000
+
+55	AxisH264 (96)	24/12/2022 01:11:43.003	36	13777		Yes	44365	44374	10	-	675772736
+DEC as 13316314303 0030000
+
+1555	AxisH264 (96)	24/12/2022 01:12:43.007	44	14217			61619	61629	11	-	681172723
+DEC as 13316314363 0070000
+
+6776	AxisH264 (96)	24/12/2022 01:16:11.840	40	14670			55442	55452	11	-	699968282
+DEC as 13316314571 8400000
+13316314571 in secs is 154124 days, 0 hours, 16 minutes and 11 seconds.
+
+Epoch + sub 10⁷ with Offset 0x2B61082F0 ?
+
+*/
+
+static vlc_tick_t make_vlc_timestamp( uint64_t ts )
+{
+    if( ts == 0xFFFFFFFFFFFFFFFFU ) /* This is All 0xFF */
+        return VLC_TICK_INVALID;
+    ts = (ts % 10000000) + ((ts / 10000000) - 0x2B61082F0) * 10000000;
+    return VLC_TICK_0 + ts / 10;
+}
+
+/*
+    {File Header}
+    |@000 30    Signature & version
+    |@030 08    End Time Timestamp
+    |           FIXME Metadata starts from here.
+    |           Might be variable number of entries. Go figure.
+    |@038 54    Fixedsize? Fixeddata? Unknown
+            |+000 07    Unknown
+            |+000 53    Fixed? Fixeddata? Unknown
+    |@090 20     Some Metadata header
+            |+000 16    Entity UUID
+            |+000 04    $M1 Metadata characters count in UTF16
+    |@110 $M1*2 Metadata bytes
+    | ( if version >= 5 )
+        |+000 20    Some Metadata header
+                |+000 16    Entity UUID
+                |+000 04    $M2 Metadata characters count in UTF16
+        |+000 $M2*2 Metadata bytes
+        |+000 60    Some UUID meta
+                |+000 16    Usage UUID
+                |+000 16    Origin UUID
+                |+000 16    MediaType UUID
+    |+000 04    Fixedsize? Fixeddata? Unkown
+    | ( if version >= 5 )
+        |+000 02    Fixedsize? Fixeddata? Unkown
+    |+000 04    Fixedsize? Fixeddata? Unkown
+    |+000 04    First Unit Header backward offset 0xFFFFFFFF
+
+    {RTP Dump Wrapper}
+        |+000 08    Timestamp
+        |+000 01    Flags
+        |+000 04    Wrapped packets size $VAR
+        |+000 12    ? 0x80 .. 0x30 (seems saved rtp packet header)
+        |+000 $VAR  Wrapped packets
+            | 1..N
+                |+000 06    RTP Packet Wrapper
+                    |+000 02    Fixed? 0x00 (0x1F|0x1D)
+                    |+000 02    Payload size $VAR2
+                    |+000 02    Unknown (maybe high bytes for $VAR2)
+                |+000 $VAR2 RTP Packet
+        |+000 04    Total Wrapper size, backward navigation offset
+
+    {Frame Metadata}
+        |+000 08    Timestamp == 0xFFFFFFFFFFFFFFFF
+        |+000 04    Frame Meta Payload size $VAR
+        |+000 13    Unknown
+        |+000 $VAR  Payload
+            |+000 06    Unknown
+            | 1..N
+                |+000 51    Index Entry
+                    |+000 18    Unknown
+                    |+000 08    Timestamp
+                    |+000 25    Unknown
+        |+000 04    Total size, backward navigation offset
+
+    {IFrame Index}
+        |+000 08    Timestamp == 0xFFFFFFFF
+        | 1..N
+            |+000 08    Timestamp
+            |+000 08    File offset
+            |+000 02    Unknown
+        |+000 02    Unknown
+        |+000 04    Total size, backward navigation offset
+
+    File Layout
+        | {File Header}
+        | {RTP Dump Wrapper}
+        | {Frame Metadata}
+        | {IFrame Index}
+*/
+
+#if 0
+static int parse_framemetadata_payload( stream_t *s, uint32_t payloadsize )
+{
+    fprintf(stderr," parse_framemetadata_unitpayload @%"PRIu64"\n", vlc_stream_Tell(s));
+    if( vlc_stream_Read( s, NULL, 6 ) != 6 )
+        return VLC_EGENERIC;
+    payloadsize -= 6;
+    while( payloadsize >= 51 )
+    {
+        uint8_t unitheader51;
+        if( vlc_stream_Read( s, unitheader, 51 ) != 51 )
+            return VLC_EGENERIC;
+        uint64_t ts = make_vlc_timestamp( GetQWLE( &unitheader18 ) );
+        fprintf(stderr,"dump index %"PRId64" %u %u\n", ts,
+                GetDWLE( &unitheader22 ), GetDWLE( &unitheader26 ));
+        payloadsize -= 51;
+    }
+    assert(payloadsize == 0);
+    return payloadsize == 0 ? VLC_SUCCESS : VLC_EGENERIC;
+}
+#endif
+
+static int parse_iframeindex_payload( stream_t *s, uint32_t payloadsize, vec_index_t *index )
+{
+    msg_Dbg( s, "parsing index @%" PRIu64, vlc_stream_Tell(s) );
+
+    if( index && !vlc_vector_reserve( index, payloadsize / 18 ) )
+        return VLC_EGENERIC;
+
+    while( payloadsize > 18 )
+    {
+        uint8_t unitheader18;
+        if( vlc_stream_Read( s, unitheader, 18 ) != 18 )
+            return VLC_EGENERIC;
+
+        index_t entry;
+        entry.time = make_vlc_timestamp( GetQWLE( &unitheader0 ) );
+        entry.offset = GetQWLE( &unitheader8 );
+        if( index )
+            vlc_vector_push( index, entry );
+
+        payloadsize -= 18;
+    }
+
+    if( payloadsize == 2 )
+        if( vlc_stream_Read( s, NULL, 2 ) != 2 )
+            return VLC_EGENERIC;
+
+    return payloadsize == 2 ? VLC_SUCCESS : VLC_EGENERIC;
+}
+
+static int parse_metadata( stream_t *s, char **ppsz )
+{
+    uint8_t header20;
+    if( vlc_stream_Read( s, header, 20 ) != 20 )
+        return VLC_EGENERIC;
+    uint32_t sz = GetDWLE( &header16 ) * 2;
+    void *buf;
+    if( ppsz && (buf = malloc( sz )) )
+    {
+        int i_ret;
+        if( vlc_stream_Read( s, buf, sz ) == sz )
+        {
+            *ppsz = FromCharset( "UTF-16LE", buf, sz );
+             i_ret = *ppsz ? VLC_SUCCESS : VLC_EGENERIC;
+        }
+        else
+            i_ret = VLC_EGENERIC;
+        free( buf );
+        return i_ret;
+    }
+    else
+    {
+        if( vlc_stream_Read( s, NULL, sz ) != sz )
+            return VLC_EGENERIC;
+    }
+    return VLC_SUCCESS;
+}
+
+static int parse_file_header( stream_t *s, char **ppsz_title )
+{
+    const uint8_t *p_peek;
+    uint8_t prevoffset4;
+    char *psz_title = NULL, **pp_meta = &psz_title;
+
+    if( vlc_stream_Peek( s, &p_peek, 27 ) != 27 ||
+        memcmp( p_peek, "Genetec", 7 ) )
+        return VLC_EGENERIC;
+
+    /* Version */
+    const uint8_t version = p_peek26 - '0';
+    int uuidtextcount = version < 5 ? 1 : 2;
+    int uuidcount = version < 5 ? 0 : 3;
+
+    if( vlc_stream_Seek( s, 30 + 60 ) != VLC_SUCCESS )
+        return VLC_EGENERIC;
+
+    /* Parse UUID+text entries */
+    for( ; uuidtextcount; uuidtextcount-- )
+    {
+        if( parse_metadata( s, pp_meta ) != VLC_SUCCESS )
+            goto error;
+        pp_meta = NULL;
+    }
+
+    /* Parse UUID entries */
+    for( ; uuidcount; uuidcount-- )
+    {
+        if( vlc_stream_Read( s, NULL, 16 ) != 16 )
+            goto error;
+    }
+
+    ssize_t toread = version < 5 ? 10 : 12;
+    if (vlc_stream_Read( s, NULL, toread ) != toread ||
+        vlc_stream_Read( s, prevoffset, 4 ) != 4 ||
+        GetDWLE( prevoffset ) != 0xFFFFFFFFU )
+        goto error;
+
+    *ppsz_title = psz_title;
+
+    return VLC_SUCCESS;
+
+error:
+    free( psz_title );
+    return VLC_EGENERIC;
+}
+
+static int parse_wrapper_header( const uint8_t pG64_WRAP_HEADER_BYTES, dump_unit_wrapper_t *unit )
+{
+#ifdef G64_DEBUG
+    fprintf(stderr, "dump unit: ");
+    for(int i=0; i<G64_WRAP_HEADER_BYTES; i++)
+        fprintf(stderr, "%2.2x ", pi);
+#endif
+    if( pG64_WRAP_HEADER_BYTES - 1 == 0x30 && p13 == 0x80 )
+    {
+        unit->type = UNIT_RTP;
+        unit->pts = make_vlc_timestamp( GetQWLE(&p0) );
+        unit->flags = p8;
+        unit->size = GetDWLE(&p9);
+#ifdef G64_DEBUG
+        fprintf(stderr, "%"PRId64" %u %2.2x\n", unit->pts, unit->size, unit->flags);
+#endif
+        return VLC_SUCCESS;
+    }
+
+    return VLC_EGENERIC;
+}
+
+static int g64_rtp_pt_instantiate( vlc_object_t *obj, struct vlc_rtp_pt *restrict pt,
+                               const struct vlc_sdp_pt *restrict desc, const char *mime )
+{
+    int ret = VLC_ENOTSUP;
+
+    module_t **mods;
+    ssize_t n = vlc_module_match( "rtp parser", mime, true, &mods, NULL );
+
+    for ( ssize_t i = 0; i < n; i++ )
+    {
+        vlc_rtp_parser_cb cb = vlc_module_map( vlc_object_logger(obj), modsi );
+        if ( cb == NULL )
+            continue;
+
+        ret = cb(obj, pt, desc);
+        if ( ret == VLC_SUCCESS )
+        {
+            msg_Dbg( obj, "- module \"%s\"", module_get_name(modsi, true) );
+            assert( pt->ops != NULL );
+            ret = VLC_SUCCESS;
+            break;
+        }
+    }
+
+    free( mods );
+    return ret;
+}
+
+static void g64_dummy_es_destroy( struct vlc_rtp_es *es )
+{
+    VLC_UNUSED(es);
+}
+
+static void g64_dummy_es_decode( struct vlc_rtp_es *es, block_t *block )
+{
+    VLC_UNUSED(es);
+    block_Release( block );
+}
+
+static const struct vlc_rtp_es_operations g64_dummy_es_ops =
+{
+    g64_dummy_es_destroy, g64_dummy_es_decode,
+};
+
+struct g64_es_id {
+    struct vlc_rtp_es es;
+    es_out_t *out;
+    es_out_id_t *id;
+    vlc_tick_t *ppts;
+};
+
+static void g64_es_id_destroy( struct vlc_rtp_es *es )
+{
+    struct g64_es_id *ei = container_of(es, struct g64_es_id, es);
+    free( ei );
+}
+
+static void g64_es_id_send( struct vlc_rtp_es *es, block_t *block )
+{
+    struct g64_es_id *ei = container_of(es, struct g64_es_id, es);
+    block->i_pts = *ei->ppts;
+
+    es_out_Send( ei->out, ei->id, block );
+}
+
+static const struct vlc_rtp_es_operations g64_es_id_ops = {
+    g64_es_id_destroy, g64_es_id_send,
+};
+
+static struct vlc_rtp_es *g64_rtp_es_request( struct vlc_rtp_pt *pt,
+                                              const es_format_t *restrict fmt )
+{
+    demux_t *demux = pt->owner.data;
+    demux_sys_t *p_sys  = demux->p_sys;
+    VLC_UNUSED(fmt);
+    assert(fmt->i_codec == p_sys->fcc);
+
+    struct g64_es_id *ei = malloc(sizeof (*ei));
+    if (unlikely(ei == NULL))
+        return &p_sys->dummy_es;
+
+    ei->es.ops = &g64_es_id_ops;
+    ei->out = demux->out;
+    ei->id = p_sys->es;
+    ei->ppts = &p_sys->pcr;
+    return &ei->es;
+}
+
+static struct vlc_rtp_es *g64_rtp_mux_request( struct vlc_rtp_pt *pt,
+                                               const char *name )
+{
+    VLC_UNUSED(pt);
+    VLC_UNUSED(name);
+    return NULL;
+}
+
+static void g64_rtp_pt_clear( struct vlc_rtp_pt *pt, void **pptriv )
+{
+    vlc_rtp_pt_end( pt, *pptriv );
+    if (pt->ops->release != NULL)
+        pt->ops->release( pt );
+    *pptriv = NULL;
+}
+
+static const struct vlc_rtp_pt_owner_operations g64_pt_owner_ops = {
+    g64_rtp_es_request,
+    g64_rtp_mux_request,
+};
+
+static int g64_rtp_pt_init( demux_t *p_demux, struct vlc_rtp_pt *pt, vlc_fourcc_t fcc )
+{
+    struct vlc_rtp_pt_owner owner = {
+        &g64_pt_owner_ops, p_demux
+    };
+
+    static const struct
+    {
+        vlc_fourcc_t fcc;
+        const char *mime;
+        const char *parameters;
+    } payloads = {
+        { VLC_CODEC_H264, "video/H264", "packetization-mode=1;" },
+        { VLC_CODEC_HEVC, "video/H265", NULL },
+        { VLC_CODEC_MULAW, "audio/PCMU", NULL },
+    };
+
+    for(unsigned i=0;i<ARRAY_SIZE(payloads); i++)
+    {
+        if(payloadsi.fcc != fcc)
+            continue;
+
+        /* we mostly don't care about SDP values here,
+           we just need correct mime and parameters to open the pt */
+        struct vlc_sdp_pt sdp = {0};
+        sdp.channel_count = 2;
+        sdp.clock_rate = 90000;
+        strcat(sdp.name, strchr(payloadsi.mime,'/') + 1);
+        sdp.parameters = payloadsi.parameters;
+        pt->owner = owner;
+        pt->frequency = 90000;
+        pt->channel_count = 2;
+        pt->number = 96;
+
+        if ( g64_rtp_pt_instantiate( VLC_OBJECT(p_demux), pt, &sdp,
+                                     payloadsi.mime ) == VLC_SUCCESS )
+            return VLC_SUCCESS;
+
+        break;
+    }
+
+    return VLC_EGENERIC;
+}
+
+static int LoadIndex( stream_t *s, vec_index_t *index )
+{
+    uint64_t i_size;
+    const uint8_t *p_peek;
+
+    if( vlc_stream_GetSize( s, &i_size ) != VLC_SUCCESS ||
+        vlc_stream_Seek( s, i_size - 4 ) != VLC_SUCCESS ||
+        vlc_stream_Peek( s, &p_peek, 4 ) != 4 )
+        return VLC_EGENERIC;
+
+    uint32_t i_offset = GetDWLE( p_peek );
+    if( i_offset < 14 + 18 ||
+        i_offset > i_size - 4 - 4 ||
+        vlc_stream_Seek( s, i_size - i_offset - 4 - 4 ) != VLC_SUCCESS )
+        return VLC_EGENERIC;
+
+    uint8_t header12;
+    if( vlc_stream_Read( s, header, 12 ) != 12 ||
+        GetQWLE( &header4 ) != 0xFFFFFFFFFFFFFFFFU )
+        return VLC_EGENERIC;
+
+    return parse_iframeindex_payload( s, i_offset + 4 - 12, index );
+}
+
+static int BuildIndex( stream_t *s, vec_index_t *index )
+{
+    for( ;; )
+    {
+        index_t entry = { 0, vlc_stream_Tell(s) };
+
+        uint8_t unit_headerG64_WRAP_HEADER_BYTES;
+        if( vlc_stream_Read( s, unit_header, G64_WRAP_HEADER_BYTES )
+                != G64_WRAP_HEADER_BYTES )
+            break;
+
+        dump_unit_wrapper_t unit;
+        if( parse_wrapper_header(unit_header, &unit) != VLC_SUCCESS ||
+            unit.size < 12 || unit.type != UNIT_RTP )
+            break;
+
+        if( unit.flags & G64_FLAG_RANDOM_ACCESS )
+        {
+            entry.time = unit.pts;
+            if( !vlc_vector_push( index, entry ) )
+                break;
+        }
+
+        if( vlc_stream_Seek( s, vlc_stream_Tell(s) + unit.size - 8 ) != VLC_SUCCESS )
+            return VLC_EGENERIC;
+    }
+
+    return index->size ? VLC_SUCCESS : VLC_EGENERIC;
+}
+
+static void parse_rtp( demux_t *p_demux, block_t *p_block )
+{
+    demux_sys_t *p_sys  = p_demux->p_sys;
+
+    if ( p_block->i_buffer < 12 )
+        goto end;
+
+    const uint8_t version = p_block->p_buffer0 >> 6;
+    const uint8_t pad = p_block->p_buffer0 & 0x20;
+    const uint8_t ext = p_block->p_buffer0 & 0x10;
+    const uint8_t cc = p_block->p_buffer0 & 0x0f;
+    const uint8_t mbit = p_block->p_buffer1 & 0x80;
+    //const uint8_t pt = p_block->p_buffer1 & 0x7f;
+
+    if ( version != 0x02 )
+        goto end;
+
+    p_block->p_buffer += 12;
+    p_block->i_buffer -= 12;
+
+    if ( pad )
+    {
+        if( p_block->i_buffer < 2 )
+            goto end;
+
+        uint8_t trunc = p_block->p_bufferp_block->i_buffer - 1;
+        if (trunc > 0 && trunc < p_block->i_buffer)
+            p_block->i_buffer -= trunc;
+        else
+            goto end;
+    }
+
+    if ( cc )
+    {
+        if( cc * 4 > p_block->i_buffer )
+            goto end;
+        p_block->p_buffer += cc * 4;
+        p_block->i_buffer -= cc * 4;
+    }
+
+    if ( ext )
+    {
+        if ( p_block->i_buffer < 4 )
+            goto end;
+        unsigned extlen = GetWBE( &p_block->p_buffer2 );
+        if( extlen * 4 > p_block->i_buffer - 4 )
+            goto end;
+        p_block->p_buffer += 4 + extlen * 4;
+        p_block->i_buffer -= 4 + extlen * 4;
+    }
+
+    const struct vlc_rtp_pktinfo pktinfo = { .m = mbit };
+    vlc_rtp_pt_decode( &p_sys->pt, p_sys->ptpriv, p_block, &pktinfo );
+
+    return;
+
+end:
+    block_Release( p_block );
+}
+
+static int parse_rtp_dumps( demux_t *p_demux, uint32_t size )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+
+    while( size >= 6 )
+    {
+        /* Process one packet dump */
+        uint8_t header6;
+        if( vlc_stream_Read( p_demux->s, header, 6 ) != 6 )
+            break;
+
+        if( header0 != 0x00 || header1 != p_sys->i_type )
+            break;
+
+        uint16_t sz = GetWBE( &header2 );
+
+        if( sz > size + 6 )
+            break;
+
+        block_t *p_block = vlc_stream_Block( p_demux->s, sz );
+        if( p_block == NULL )
+            break;
+
+        parse_rtp( p_demux, p_block );
+
+        size -= 6 + sz;
+    }
+
+    return (size != 0) ? VLC_DEMUXER_EOF : VLC_DEMUXER_SUCCESS;
+}
+
+/*****************************************************************************
+ * Demux: reads and demuxes data packets
+ *****************************************************************************
+ * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
+ *****************************************************************************/
+static int Demux( demux_t *p_demux )
+{
+    demux_sys_t *p_sys  = p_demux->p_sys;
+
+    uint8_t unit_headerG64_WRAP_HEADER_BYTES;
+    if( vlc_stream_Read( p_demux->s, unit_header, G64_WRAP_HEADER_BYTES )
+            != G64_WRAP_HEADER_BYTES )
+        return VLC_DEMUXER_EOF;
+
+    dump_unit_wrapper_t unit;
+    if( parse_wrapper_header( unit_header, &unit ) != VLC_SUCCESS ||
+        unit.size < 12 || unit.type != UNIT_RTP )
+        return VLC_DEMUXER_EOF;
+
+    if ( p_sys->pcr == VLC_TICK_INVALID && unit.pts != VLC_TICK_INVALID )
+        es_out_SetPCR( p_demux->out, unit.pts );
+    p_sys->pcr = unit.pts;
+
+    int ret = parse_rtp_dumps( p_demux, unit.size - 12 );
+    uint8_t wrappersize4;
+    if(ret != VLC_DEMUXER_SUCCESS)
+    {
+        msg_Err( p_demux, "Invalid wrapper bytes @%"PRIu64,
+                vlc_stream_Tell(p_demux->s) - 6);
+        ret = VLC_DEMUXER_EOF;
+    }
+    else if( vlc_stream_Read( p_demux->s, wrappersize, 4 ) != 4 ||
+        GetDWLE(wrappersize) != unit.size + 13 )
+    {
+        msg_Err( p_demux, "Invalid end of wrapper @%"PRIu64,
+                 vlc_stream_Tell(p_demux->s) );
+        ret = VLC_DEMUXER_EOF;
+    }
+
+    if( p_sys->pcr != VLC_TICK_INVALID )
+        es_out_SetPCR( p_demux->out, p_sys->pcr );
+
+    return ret;
+}
+
+static int SeekTo( demux_t *p_demux, vlc_tick_t ts, bool b_precise )
+{
+    demux_sys_t *p_sys  = p_demux->p_sys;
+
+    if( p_sys->index.size == 0 )
+        return VLC_EGENERIC;
+
+    /* delete and replace session first as we can't reset */
+    struct vlc_rtp_pt newpt = {0};
+    if( g64_rtp_pt_init( p_demux, &newpt, p_sys->fcc ) != VLC_SUCCESS )
+        return VLC_EGENERIC;
+    g64_rtp_pt_clear( &p_sys->pt, &p_sys->ptpriv );
+    p_sys->pt = newpt;
+    p_sys->ptpriv = vlc_rtp_pt_begin( &p_sys->pt );
+
+    uint64_t offset = p_sys->i_start_offset;
+    for( size_t i=0; i<p_sys->index.size; i++ )
+    {
+        if( p_sys->index.datai.time > ts )
+            break;
+        offset = p_sys->index.datai.offset;
+    }
+
+    p_sys->pcr = VLC_TICK_INVALID;
+    int ret = vlc_stream_Seek( p_demux->s, offset );
+    if( ret == VLC_SUCCESS && b_precise )
+        b_precise = es_out_SetNextDisplayTime( p_demux->out, ts );
+    return ret;
+}
+
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+    demux_sys_t *p_sys  = p_demux->p_sys;
+    switch( i_query )
+    {
+        case DEMUX_GET_LENGTH:
+        {
+            *va_arg(args, vlc_tick_t *) = p_sys->i_duration;
+            return VLC_SUCCESS;
+        }
+
+        case DEMUX_GET_NORMAL_TIME:
+        {
+            if( p_sys->i_first_pts != VLC_TICK_INVALID )
+            {
+                *va_arg(args, vlc_tick_t *) = p_sys->i_first_pts;
+                return VLC_SUCCESS;
+            }
+            return VLC_EGENERIC;
+        }
+
+        case DEMUX_GET_TIME:
+            if( p_sys->pcr == VLC_TICK_INVALID )
+                return VLC_EGENERIC;
+            *va_arg(args, vlc_tick_t *) = p_sys->pcr;
+            return VLC_SUCCESS;
+
+        case DEMUX_SET_TIME:
+        {
+            vlc_tick_t ts = va_arg(args, vlc_tick_t);
+            bool b_precise = va_arg( args, int );
+            return SeekTo( p_demux, p_sys->i_first_pts + ts, b_precise );
+        }
+
+        case DEMUX_GET_POSITION:
+        {
+            if( p_sys->i_duration == 0 || p_sys->pcr == VLC_TICK_INVALID )
+                return VLC_EGENERIC;
+            *va_arg(args, double *) = (p_sys->pcr - p_sys->i_first_pts) / (double) p_sys->i_duration;
+            return VLC_SUCCESS;
+        }
+
+        case DEMUX_SET_POSITION:
+        {
+            if( p_sys->i_duration == 0 )
+                return VLC_EGENERIC;
+            double f = va_arg(args, double);
+            bool b_precise = va_arg( args, int );
+            return SeekTo( p_demux, p_sys->i_first_pts + p_sys->i_duration * f, b_precise );
+        }
+
+        case DEMUX_GET_META:
+        {
+            vlc_meta_t *p_meta;
+            if ( p_sys->psz_title && (p_meta = va_arg(args, vlc_meta_t *)) )
+            {
+                vlc_meta_Set( p_meta, vlc_meta_Title, p_sys->psz_title );
+                return VLC_SUCCESS;
+            }
+            return VLC_EGENERIC;
+        }
+
+        default:
+            return demux_vaControlHelper( p_demux->s, 0, -1, -1, -1,
+                                          i_query, args );
+    }
+}
+
+/*****************************************************************************
+ * Close:
+ *****************************************************************************/
+static void Close( vlc_object_t *p_this )
+{
+    demux_t *p_demux = (demux_t*) p_this;
+    demux_sys_t *p_sys  = p_demux->p_sys;
+    if( p_sys->pt.ops )
+        g64_rtp_pt_clear( &p_sys->pt, &p_sys->ptpriv );
+    if( p_sys->es )
+        es_out_Del( p_demux->out, p_sys->es );
+    vlc_vector_clear( &p_sys->index );
+    free( p_sys->psz_title );
+    free( p_sys );
+}
+
+/*****************************************************************************
+ * Open:
+ *****************************************************************************/
+
+static int Open( vlc_object_t * p_this )
+{
+    demux_t *p_demux = (demux_t*) p_this;
+    demux_sys_t *p_sys;
+    es_format_t fmt;
+    char *psz_title = NULL;
+
+    if( parse_file_header( p_demux->s, &psz_title ) != VLC_SUCCESS )
+        return VLC_EGENERIC;
+
+    const uint8_t *p_peek;
+    if( vlc_stream_Peek( p_demux->s, &p_peek, G64_WRAP_HEADER_BYTES + 6 ) !=
+        G64_WRAP_HEADER_BYTES + 6 )
+    {
+        free( psz_title );
+        return VLC_EGENERIC;
+    }
+
+    switch( p_peekG64_WRAP_HEADER_BYTES + 1 )
+    {
+        case 0x1F:
+        case 0x1D:
+        case 0x21:
+        case 0x31:
+        case 0x34:
+            es_format_Init( &fmt, VIDEO_ES, VLC_CODEC_H264 );
+            break;
+        case 0x3D:
+        case 0x41:
+        case 0x43:
+            es_format_Init( &fmt, VIDEO_ES, VLC_CODEC_HEVC );
+            break;
+        case 0xD2:
+            es_format_Init( &fmt, AUDIO_ES, VLC_CODEC_MULAW );
+            fmt.audio.i_channels = 1;
+            fmt.audio.i_rate = 8000;
+            break;
+        default:
+            msg_Err(p_this, "unknown %2.2x", p_peekG64_WRAP_HEADER_BYTES + 1);
+            free( psz_title );
+            return VLC_EGENERIC;
+    }
+
+    p_demux->p_sys = p_sys = calloc( 1, sizeof(demux_sys_t) );
+    if( !p_sys )
+    {
+        free( psz_title );
+        return VLC_ENOMEM;
+    }
+
+    p_sys->i_type = p_peekG64_WRAP_HEADER_BYTES + 1;
+    vlc_vector_init( &p_sys->index );
+    p_sys->i_start_offset = vlc_stream_Tell( p_demux->s );
+    p_sys->psz_title = psz_title;
+
+    p_sys->fcc = fmt.i_codec;
+    fmt.b_packetized = true;
+
+    p_sys->es = es_out_Add( p_demux->out, &fmt );
+    if( !p_sys->es )
+    {
+        Close( p_this );
+        return VLC_EGENERIC;
+    }
+    p_sys->dummy_es.ops = &g64_dummy_es_ops;
+
+    /* Build RTP pt */
+    if( g64_rtp_pt_init( p_demux, &p_sys->pt, fmt.i_codec ) != VLC_SUCCESS )
+    {
+        Close( p_this );
+        return VLC_EGENERIC;
+    }
+
+    p_sys->ptpriv = vlc_rtp_pt_begin( &p_sys->pt );
+
+    if( !p_demux->b_preparsing && vlc_stream_CanSeek( p_demux->s ) )
+    {
+        /* Load native index from end of file */
+         int ret = LoadIndex( p_demux->s, &p_sys->index );
+         if( vlc_stream_Seek( p_demux->s, p_sys->i_start_offset ) )
+         {
+             Close( p_this );
+             return VLC_EGENERIC;
+         }
+
+         /* Build Index if file is truncated */
+         if( ret != VLC_SUCCESS && vlc_stream_CanFastSeek( p_demux->s ) )
+         {
+             msg_Warn( p_demux, "Can't load index. Trying to rebuild" );
+                if( BuildIndex( p_demux->s, &p_sys->index ) != VLC_SUCCESS )
+                    msg_Warn( p_demux, "Can't build index. Won't be able to seek" );
+                if( vlc_stream_Seek( p_demux->s, p_sys->i_start_offset ) )
+                {
+                    Close( p_this );
+                    return VLC_EGENERIC;
+                }
+         }
+    }
+
+    if( p_sys->index.size > 0 )
+    {
+        p_sys->i_first_pts = p_sys->index.data0.time;
+        p_sys->i_duration = p_sys->index.datap_sys->index.size -1.time - p_sys->i_first_pts;
+    }
+    else
+    {
+        p_sys->i_first_pts = VLC_TICK_INVALID;
+        p_sys->i_duration = 0;
+    }
+
+    p_demux->pf_demux   = Demux;
+    p_demux->pf_control = Control;
+    return VLC_SUCCESS;
+}
+
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+
+vlc_module_begin ()
+    set_shortname( "G64 raw RTP" )
+    set_description( N_("G64 Raw RTP") )
+    set_capability( "demux", 10 )
+    set_subcategory( SUBCAT_INPUT_DEMUX )
+    set_callbacks( Open, Close )
+vlc_module_end ()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/image.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/image.c Changed

@@ -660,6 +660,10 @@
     { .codec = VLC_CODEC_WEBP,
       .detect = IsWebP,
     },
+    { .codec = VLC_CODEC_FARBFELD,
+      .marker_size = 8,
+      .marker = { 'f', 'a', 'r', 'b', 'f', 'e', 'l', 'd' },
+    },
     { .codec = VLC_CODEC_BPG,
       .marker_size = 4,
       .marker = { 'B', 'P', 'G', 0xFB },
@@ -708,6 +712,30 @@
     return 0;
 }
 
+static int parse_farbfeld_header(vlc_object_t *object, es_format_t *fmt)
+{
+    demux_t *demux = (demux_t*)object;
+
+    const uint8_t *p_peek;
+    if (vlc_stream_Peek(demux->s, &p_peek, 16) < 16)
+        return VLC_EGENERIC;
+
+    uint32_t width = GetDWBE(p_peek + 8);
+    uint32_t height = GetDWBE(p_peek + 12);
+
+    if (width == 0 || height == 0)
+        return VLC_EGENERIC;
+
+    /* Farbfeld is essentially just a header followed by pixels. */
+    fmt->video.i_width = width;
+    fmt->video.i_height = height;
+    fmt->video.i_chroma = fmt->i_codec = VLC_CODEC_RGBA64;
+
+    vlc_stream_Read(demux->s, NULL, 16);
+
+    return VLC_SUCCESS;
+}
+
 static int Open(vlc_object_t *object)
 {
     demux_t *demux = (demux_t*)object;
@@ -728,6 +756,12 @@
     es_format_Init(&fmt, VIDEO_ES, codec);
     fmt.video.i_chroma = fmt.i_codec;
 
+    if (codec == VLC_CODEC_FARBFELD)
+    {
+        if (parse_farbfeld_header(object, &fmt))
+            return VLC_EGENERIC;
+    }
+
     block_t *data = Load(demux);
     if (data && var_InheritBool(demux, "image-decode")) {
         char *string = var_InheritString(demux, "image-chroma");

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/meson.build Changed

@@ -20,21 +20,30 @@
 
 # OGG demux
 ogg_dep = dependency('ogg', version: '>= 1.0', required: get_option('ogg'))
+ogg_deps = ogg_dep
+ogg_c_args = 
+if vorbis_dep.found()
+    ogg_c_args += '-DHAVE_LIBVORBIS'
+    ogg_deps += vorbis_dep
+endif
 if ogg_dep.found()
     vlc_modules += {
         'name' : 'ogg',
         'sources' : files('ogg.c', 'oggseek.c', 'ogg_granule.c'),
         'link_with' : xiph_meta_lib,
-        'dependencies' : ogg_dep
+        'dependencies' : ogg_deps,
+        'c_args' : ogg_c_args,
     }
 endif
 
-# Xiph test
-xiph_test = executable('xiph_test',
-    files('xiph_test.c'),
-    include_directories: vlc_include_dirs)
+if (get_option('tests').allowed())
+    # Xiph test
+    xiph_test = executable('xiph_test',
+        files('xiph_test.c'),
+        include_directories: vlc_include_dirs)
 
-test('xiph_test', xiph_test, suite: 'demux')
+    test('xiph_test', xiph_test, suite: 'demux')
+endif
 
 # Demux dump
 vlc_modules += {
@@ -84,6 +93,12 @@
     'sources' : files('hx.c'),
 }
 
+# G64 RTP dumps demuxer
+vlc_modules += {
+    'name' : 'g64rtp',
+    'sources' : files('g64rtp.c'),
+}
+
 # MPEG PS demux
 vlc_modules += {
     'name' : 'ps',
@@ -231,9 +246,10 @@
             'avformat/avformat.c',
             avformat_extra_sources
         ),
-        'dependencies' : avformat_dep, avutil_dep,
+        'dependencies' : avformat_dep, avutil_dep, avcodec_dep,
         'link_with' : libavcodec_common,
-        'link_args' : symbolic_linkargs
+        'link_args' : symbolic_linkargs,
+        'enabled' : not get_option('merge-ffmpeg'),
     }
 endif
 
@@ -338,6 +354,16 @@
 # TS demux
 aribb24_dep = dependency('aribb24', version: '>= 1.0.1', required: get_option('aribb24'))
 libdvbpsi_dep = dependency('libdvbpsi', version: '>= 1.2.0', required: get_option('libdvbpsi'))
+
+libdvbpsi_c_args = 
+libdvbcsa_dep = dependency('dvbcsa', required: get_option('dvbcsa'))
+if libdvbcsa_dep.found()
+    if cc.has_function('dvbcsa_decrypt', dependencies: libdvbcsa_dep) and \
+       cc.check_header('dvbcsa/dvbcsa.h', dependencies: libdvbcsa_dep)
+        libdvbpsi_c_args += '-DHAVE_DVBCSA'
+    endif
+endif
+
 if libdvbpsi_dep.found()
     arrib24_define = 
     if aribb24_dep.found()
@@ -369,11 +395,54 @@
             '../codec/atsc_a65.c',
             '../codec/opus_header.c',
         ),
-        'dependencies' : libdvbpsi_dep, aribb24_dep,
-        'c_args' : arrib24_define
+        'dependencies' : libdvbpsi_dep, aribb24_dep, libdvbcsa_dep,
+        'c_args' : libdvbpsi_c_args, arrib24_define,
     }
 endif
 
+# GME
+gme_dep = dependency('libgme', required: get_option('gme'))
+vlc_modules += {
+    'name' : 'gme',
+    'sources' : files('gme.c'),
+    'dependencies' : gme_dep,
+    'enabled': gme_dep.found(),
+}
+
+# mpc
+mpc_dep = disabler()
+if get_option('mpc').allowed()
+if cc.check_header('mpc/mpcdec.h')
+    mpc_dep = cc.find_library('mpcdec')
+    cdata.set('HAVE_MPC_MPCDEC_H', 1)
+elif cc.check_header('mpc/mpcdec.h', dependencies: contrib_dep )
+    if cc.find_library('mpcdec', dirs: contrib_libdir).found()
+        mpc_dep = declare_dependency(
+            dependencies: cc.find_library('mpcdec', dirs: contrib_libdir), contrib_dep)
+        cdata.set('HAVE_MPC_MPCDEC_H', 1)
+    endif
+endif
+endif
+vlc_modules += {
+    'name' : 'mpc',
+    'sources' : files('mpc.c'),
+    'dependencies' : mpc_dep, m_lib,
+    'enabled' : mpc_dep.found(),
+}
+
+# sid
+sid_dep = dependency('libsidplay2', required: get_option('sid'))
+if cpp.check_header('sidplay/builders/resid.h', dependencies: sid_dep)
+resid_dep = cpp.find_library('resid-builder', dirs: contrib_libdir)
+vlc_modules += {
+    'name' : 'sid',
+    'sources' : files('sid.cpp'),
+    'dependencies' : sid_dep, resid_dep,
+    'enabled': sid_dep.found() and resid_dep.found()
+}
+endif
+
+
 # Adaptive streams demuxer
 
 vlc_modules += {
@@ -585,9 +654,8 @@
 
     ),
     'include_directories' : include_directories('adaptive', './'),
-    'dependencies' : socket_libs, m_lib, z_dep,
+    'dependencies' : socket_libs, m_lib, z_dep, gcrypt_dep,
     'link_with' : vlc_http_lib,
-    # TODO: Add optional GCRYPT dependency!
 }
 
 # noseek demux

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/chapter_command_dvd.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/chapter_command_dvd.cpp Changed

@@ -570,29 +570,30 @@
     return f_result;
 }
 
-void dvd_command_interpretor_c::ProcessNavAction( uint16_t button )
+bool dvd_command_interpretor_c::ProcessNavAction( uint16_t button )
 {
     const pci_t & pci = pci_packet;
 
     if( button <= 0 || button > pci.hli.hl_gi.btn_ns )
-        return;
+        return false;
 
     SetSPRM( 0x88, button );
     const btni_t & button_ptr = pci.hli.btnitbutton-1;
     if ( button_ptr.auto_action_mode )
     {
         // process the button action
-        Interpret( button_ptr.cmd.bytes, 8 );
+        return Interpret( button_ptr.cmd.bytes, 8 );
     }
+    return false;
 }
 
-void dvd_command_interpretor_c::HandleKeyEvent( NavivationKey key )
+bool dvd_command_interpretor_c::HandleKeyEvent( NavivationKey key )
 {
     const pci_t & pci = pci_packet;
     uint16_t i_curr_button = GetSPRM( 0x88 );
 
     if( i_curr_button <= 0 || i_curr_button > pci.hli.hl_gi.btn_ns )
-        return;
+        return false;
 
     const btni_t & button_ptr = pci.hli.btniti_curr_button-1;
 
@@ -604,11 +605,12 @@
     case DOWN:  return ProcessNavAction( button_ptr.down );
     case OK:
         // process the button action
-        Interpret( button_ptr.cmd.bytes, 8 );
-        break;
-    default:
-        break;
+        return Interpret( button_ptr.cmd.bytes, 8 );
+    case MENU:
+    case POPUP:
+        return false;
     }
+    vlc_assert_unreachable();
 }
 
 void dvd_command_interpretor_c::HandleMousePressed( unsigned x, unsigned y )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/chapter_command_dvd.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/chapter_command_dvd.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/demux.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/demux.cpp Changed

@@ -53,9 +53,10 @@
 
     /* verify the EBML Header... it shouldn't be bigger than 1kB */
     p_l0 = p_stream1->estream.FindNextID(EBML_INFO(EbmlHead), 1024);
-    if (p_l0 == NULL)
+    if (p_l0 == nullptr || p_l0->IsDummy())
     {
         msg_Err( p_demux, "No EBML header found" );
+        delete p_l0;
         return false;
     }
 
@@ -89,13 +90,14 @@
 
     // find all segments in this file
     p_l0 = p_stream1->estream.FindNextID(EBML_INFO(KaxSegment), UINT64_MAX);
-    if (p_l0 == NULL)
+    if (p_l0 == nullptr || p_l0->IsDummy())
     {
         msg_Err( p_demux, "No segment found" );
+        delete p_l0;
         return false;
     }
 
-    while (p_l0 != 0)
+    while (p_l0 != nullptr)
     {
         bool b_l0_handled = false;
 
@@ -130,10 +132,15 @@
         {
             p_l0->SkipData(p_stream1->estream, Context_KaxMatroska);
             p_l0 = p_stream1->estream.FindNextID(EBML_INFO(KaxSegment), UINT64_MAX);
+            if (p_l0 != nullptr && p_l0->IsDummy())
+            {
+                delete p_l0;
+                p_l0 = nullptr;
+            }
         }
         else
         {
-            p_l0 = NULL;
+            p_l0 = nullptr;
         }
 
         if( b_l0_handled == false )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/events.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/events.cpp Changed

@@ -100,7 +100,8 @@
     if( !is_running )
         return VLC_EGENERIC;
 
-    QueueEvent( EventInfo{ key } );
+    if ( !HandleKeyEvent( key ) )
+        return VLC_EGENERIC;
 
     return VLC_SUCCESS;
 }
@@ -145,10 +146,6 @@
                     HandleMouseEvent( ev );
                     break;
 
-                case EventInfo::ActionEvent:
-                    HandleKeyEvent( ev );
-                    break;
-
                 case EventInfo::ButtonDataEvent:
                     HandleButtonData( ev );
                     break;
@@ -166,14 +163,7 @@
     return NULL;
 }
 
-void event_thread_t::HandleKeyEvent( EventInfo const& ev )
-{
-    msg_Dbg( p_demux, "Handle Key Event");
-
-    HandleKeyEvent( ev.nav.key );
-}
-
-void event_thread_t::HandleKeyEvent( NavivationKey key )
+bool event_thread_t::HandleKeyEvent( NavivationKey key )
 {
     demux_sys_t* p_sys = (demux_sys_t*)p_demux->p_sys;
 
@@ -181,10 +171,10 @@
 
     auto interpretor = p_sys->GetDVDInterpretor();
     if (!interpretor)
-        return;
+        return false;
 
     // process the button action
-    interpretor->HandleKeyEvent( key );
+    return interpretor->HandleKeyEvent( key );
 }
 
 void event_thread_t::HandleMouseEvent( EventInfo const& event )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/events.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/events.hpp Changed

@@ -72,7 +72,6 @@
     struct EventInfo {
         enum {
             ESMouseEvent,
-            ActionEvent,
             ButtonDataEvent,
         } type;
 
@@ -82,12 +81,6 @@
         {
         }
 
-        EventInfo( NavivationKey key )
-            : type( ActionEvent )
-            , nav{ key }
-        {
-        }
-
         EventInfo( block_t * block )
             : type( ButtonDataEvent )
             , button_data( block, block_Release )
@@ -114,7 +107,6 @@
 
     static void EventMouse( vlc_mouse_t const* state, void* userdata );
 
-    void HandleKeyEvent( EventInfo const& );
     void HandleMouseEvent( EventInfo const& );
     void HandleButtonData( EventInfo const& );
 
@@ -133,7 +125,7 @@
     typedef std::list<EventInfo> pending_events_t;
     pending_events_t pending_events; // protected by "lock"
 
-    void QueueEvent(const EventInfo e)
+    void QueueEvent(const EventInfo & e)
     {
         vlc_mutex_locker lock_guard( &lock );
 
@@ -143,7 +135,7 @@
         vlc_cond_signal( &wait );
     }
 
-    void HandleKeyEvent( NavivationKey key );
+    bool HandleKeyEvent( NavivationKey key );
     void HandleMousePressed( unsigned x, unsigned y );
     void HandleButtonData( block_t * );
 };

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/matroska_segment.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/matroska_segment.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/matroska_segment_parse.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/matroska_segment_parse.cpp Changed

@@ -257,8 +257,14 @@
         unsigned int chroma_sit_horizontal;
       } track_video_info;
 
+      struct {
+          float yaw;
+          float pitch;
+          float roll;
+      } pose;
+
     } metadata_payload = {
-      this, p_track, &sys.demuxer, bSupported, 3, { }
+      this, p_track, &sys.demuxer, bSupported, 3, { }, { }
     };
 
     MKV_SWITCH_CREATE( EbmlTypeDispatcher, MetaDataHandlers, MetaDataCapture )
@@ -623,17 +629,17 @@
         E_CASE( KaxVideoProjectionPoseYaw, pose )
         {
             ONLY_FMT(VIDEO);
-            vars.tk->fmt.video.pose.yaw = static_cast<float>( pose );
+            vars.pose.yaw = static_cast<float>( pose );
         }
         E_CASE( KaxVideoProjectionPosePitch, pose )
         {
             ONLY_FMT(VIDEO);
-            vars.tk->fmt.video.pose.pitch = static_cast<float>( pose );
+            vars.pose.pitch = static_cast<float>( pose );
         }
         E_CASE( KaxVideoProjectionPoseRoll, pose )
         {
             ONLY_FMT(VIDEO);
-            vars.tk->fmt.video.pose.roll = static_cast<float>( pose );
+            vars.pose.roll = static_cast<float>( pose );
         }
 #endif
         E_CASE( KaxVideoFlagInterlaced, fint ) // UNUSED
@@ -1059,6 +1065,11 @@
 
     MetaDataHandlers::Dispatcher().iterate ( m->begin(), m->end(), &metadata_payload );
 
+    vlc_viewpoint_from_euler( &p_track->fmt.video.pose,
+                              metadata_payload.pose.yaw,
+                              metadata_payload.pose.pitch,
+                              metadata_payload.pose.roll);
+
     if( p_track->i_number == 0 )
     {
         msg_Warn( &sys.demuxer, "Missing KaxTrackNumber, discarding track!" );
@@ -1737,7 +1748,8 @@
                 vars.p_fmt->i_codec       = GetFOURCC( &p_bih->biCompression );
 
                 /* Very unlikely yet possible: bug #5659*/
-                const unsigned int min_extra = std::min(GetDWLE( &p_bih->biSize ), vars.p_tk->i_extra_data);
+                const size_t min_extra = std::min(static_cast<size_t>(GetDWLE(&p_bih->biSize)),
+                                                  vars.p_tk->i_extra_data);
                 if ( min_extra > sizeof( VLC_BITMAPINFOHEADER ))
                 {
                     vars.p_fmt->i_extra = min_extra - sizeof( VLC_BITMAPINFOHEADER );
@@ -1841,6 +1853,8 @@
             vars.p_tk->b_pts_only = true;
 
             fill_extra_data( vars.p_tk, 0 );
+            if (vars.p_fmt->i_extra <= 4)
+                vars.p_fmt->b_packetized = false; // force full extradata by the packetizer
         }
         S_CASE("V_CAVS") {
             vars.p_fmt->i_codec = VLC_CODEC_CAVS;
@@ -2066,7 +2080,7 @@
             }
             const uint8_t tags16 = {'O','p','u','s','T','a','g','s',
                                        0, 0, 0, 0, 0, 0, 0, 0};
-            unsigned ps2 = { vars.p_tk->i_extra_data, 16 };
+            size_t ps2 = { vars.p_tk->i_extra_data, 16 };
             const void *pkt2 = { static_cast<const void *>( vars.p_tk->p_extra_data ),
                                    static_cast<const void *>( tags ) };
 
@@ -2265,7 +2279,7 @@
         }
         S_CASE("A_QUICKTIME/QDMC") {
             vars.p_fmt->i_cat   = AUDIO_ES;
-            vars.p_fmt->i_codec = VLC_FOURCC('Q','D','M','C');
+            vars.p_fmt->i_codec = VLC_CODEC_QDMC;
 
             fill_extra_data( vars.p_tk, 0 );
         }
@@ -2297,7 +2311,7 @@
         }
         S_CASE("S_TEXT/USF") {
             ONLY_FMT(SPU);
-            vars.p_tk->fmt.i_codec = VLC_FOURCC( 'u', 's', 'f', ' ' );
+            vars.p_tk->fmt.i_codec = VLC_CODEC_USF;
             vars.p_tk->fmt.subs.psz_encoding = strdup( "UTF-8" );
             fill_extra_data( vars.p_tk, 0 );
         }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/matroska_segment_seeker.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/matroska_segment_seeker.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/mkv.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/mkv.cpp Changed

@@ -537,8 +537,8 @@
 }
 
 /* Needed by matroska_segment::Seek() and Seek */
-void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock,
-                  KaxBlockAdditions *additions,
+static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock,
+                  const KaxBlockAdditions *additions,
                   vlc_tick_t i_pts, int64_t i_duration, bool b_key_picture,
                   bool b_discardable_picture )
 {
@@ -654,10 +654,10 @@
                 size_t i_addition = 0;
                 if(additions)
                 {
-                    KaxBlockMore *blockmore = FindChild<KaxBlockMore>(*additions);
+                    auto blockmore = FindChild<const KaxBlockMore>(*additions);
                     if(blockmore)
                     {
-                        KaxBlockAdditional *addition = FindChild<KaxBlockAdditional>(*blockmore);
+                        auto addition = FindChild<const KaxBlockAdditional>(*blockmore);
                         if(addition)
                         {
                             i_addition = static_cast<std::string::size_type>(addition->GetSize());
@@ -705,16 +705,16 @@
         case VLC_CODEC_VP9:
             if (additions && track.fmt.i_level) // contains alpha extradata
             {
-                KaxBlockMore *blockMore = FindChild<KaxBlockMore>(*additions);
+                auto blockMore = FindChild<const KaxBlockMore>(*additions);
                 if(blockMore == nullptr)
                     break;
-                KaxBlockAddID *addId = FindChild<KaxBlockAddID>(*blockMore);
+                auto addId = FindChild<const KaxBlockAddID>(*blockMore);
                 if(addId == nullptr)
                     break;
                 if (static_cast<uint64_t>(*addId) != 1)
                     break;
 
-                KaxBlockAdditional *addition = FindChild<KaxBlockAdditional>(*blockMore);
+                auto addition = FindChild<const KaxBlockAdditional>(*blockMore);
                 if(addition == nullptr)
                     break;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/mkv.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/mkv.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/stream_io_callback.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/stream_io_callback.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mkv/virtual_segment.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mkv/virtual_segment.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mock.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mock.c Changed

@@ -235,6 +235,8 @@
     X(can_record, bool, add_bool, Bool, true, NO_FREE) \
     X(error, bool, add_bool, Bool, false, NO_FREE) \
     X(pts_delay, vlc_tick_t, add_integer, Unsigned, DEFAULT_PTS_DELAY, NO_FREE) \
+    X(pts_offset, vlc_tick_t, add_integer, Unsigned, 0, NO_FREE) \
+    X(time_offset, vlc_tick_t, add_integer, Ssize, 0, NO_FREE) \
     X(discontinuities, char *, add_string, String, NULL, FREE_CB) \
     X(config, char *, add_string, String, NULL, FREE_CB)
 
@@ -300,7 +302,7 @@
 {
     mock_track_vector tracks;
 
-    vlc_tick_t pts;
+    vlc_tick_t clock;
     vlc_tick_t audio_pts;
     vlc_tick_t video_pts;
 
@@ -506,7 +508,7 @@
                 if (new_title >= sys->title_count)
                     return VLC_EGENERIC;
                 sys->current_title = new_title;
-                sys->pts = sys->audio_pts = sys->video_pts = VLC_TICK_0;
+                sys->clock = sys->audio_pts = sys->video_pts = VLC_TICK_0 + sys->pts_offset;
                 sys->updates |= INPUT_UPDATE_TITLE;
                 return VLC_SUCCESS;
             }
@@ -517,8 +519,8 @@
                 const int seekpoint_idx = va_arg(args, int);
                 if (seekpoint_idx < sys->chapter_count)
                 {
-                    sys->pts = sys->audio_pts = sys->video_pts =
-                        (seekpoint_idx * sys->chapter_gap) + VLC_TICK_0;
+                    sys->clock = sys->audio_pts = sys->video_pts =
+                        (seekpoint_idx * sys->chapter_gap) + sys->pts_offset + VLC_TICK_0;
                     sys->current_chapter = seekpoint_idx;
                     return VLC_SUCCESS;
                 }
@@ -546,24 +548,27 @@
             }
             return VLC_EGENERIC;
         case DEMUX_GET_POSITION:
-            *va_arg(args, double *) = sys->pts / (double) sys->length;
+            *va_arg(args, double *) = (sys->clock - VLC_TICK_0 - sys->pts_offset) / (double) sys->length;
             return VLC_SUCCESS;
         case DEMUX_SET_POSITION:
             if (!sys->can_seek)
                 return VLC_EGENERIC;
-            sys->pts = sys->video_pts = sys->audio_pts =
-                VLC_TICK_0 + va_arg(args, double) * sys->length;
+            sys->clock = sys->video_pts = sys->audio_pts =
+                VLC_TICK_0 + sys->pts_offset + va_arg(args, double) * sys->length;
             return VLC_SUCCESS;
         case DEMUX_GET_LENGTH:
             *va_arg(args, vlc_tick_t *) = sys->length;
             return VLC_SUCCESS;
+        case DEMUX_GET_NORMAL_TIME:
+            *va_arg(args, vlc_tick_t *) = VLC_TICK_0 + sys->pts_offset;
+            return VLC_SUCCESS;
         case DEMUX_GET_TIME:
-            *va_arg(args, vlc_tick_t *) = sys->pts;
+            *va_arg(args, vlc_tick_t *) = sys->time_offset + sys->clock - VLC_TICK_0 - sys->pts_offset;
             return VLC_SUCCESS;
         case DEMUX_SET_TIME:
             if (!sys->can_seek)
                 return VLC_EGENERIC;
-            sys->pts = sys->video_pts = sys->audio_pts = va_arg(args, vlc_tick_t);
+            sys->clock = sys->video_pts = sys->audio_pts = va_arg(args, vlc_tick_t) + VLC_TICK_0 + sys->time_offset;
             return VLC_SUCCESS;
         case DEMUX_GET_TITLE_INFO:
             if (sys->title_count > 0)
@@ -809,7 +814,7 @@
     {
         if (track->id ||
            (track->video.add_track_at != VLC_TICK_INVALID &&
-            pts < track->video.add_track_at))
+            (pts - VLC_TICK_0 - sys->pts_offset) < track->video.add_track_at))
             continue;
         track->id = es_out_Add(demux->out, & track->fmt);
         if (!track->id)
@@ -1208,35 +1213,35 @@
 
     /* Add late tracks if any */
     bool created;
-    ret = CheckAndCreateTracksEs(demux, sys->pts, &created);
+    ret = CheckAndCreateTracksEs(demux, sys->clock, &created);
     if (ret != VLC_SUCCESS)
         return VLC_DEMUXER_EGENERIC;
 
     if (sys->pcr_points.size > sys->next_pcr_index)
     {
         const struct pcr_point *pt = &sys->pcr_points.datasys->next_pcr_index;
-        if (sys->pts >= pt->oldpcr)
+        if (sys->clock >= pt->oldpcr)
         {
-            sys->audio_pts = sys->video_pts = sys->pts = pt->newpcr;
+            sys->audio_pts = sys->video_pts = sys->clock = pt->newpcr;
             sys->next_pcr_index++;
         }
     }
 
-    vlc_tick_t prev_pts = sys->pts;
+    vlc_tick_t prev_pts = sys->clock;
     if (sys->audio_track_count > 0
      && (sys->video_track_count > 0 || sys->sub_track_count > 0))
-        sys->pts = __MIN(sys->audio_pts, sys->video_pts);
+        sys->clock = __MIN(sys->audio_pts, sys->video_pts);
     else if (sys->audio_track_count > 0)
-        sys->pts = sys->audio_pts;
+        sys->clock = sys->audio_pts;
     else if (sys->video_track_count > 0 || sys->sub_track_count > 0)
-        sys->pts = sys->video_pts;
+        sys->clock = sys->video_pts;
 
-    if (sys->pts > sys->length)
-        sys->pts = sys->length;
+    if (sys->clock > VLC_TICK_0 + sys->pts_offset + sys->length)
+        sys->clock = VLC_TICK_0 + sys->pts_offset + sys->length;
 
     if (sys->chapter_gap > 0)
     {
-        int chapter_index = sys->pts / sys->chapter_gap;
+        int chapter_index = (sys->clock - VLC_TICK_0 - sys->pts_offset) / sys->chapter_gap;
         if (chapter_index != sys->current_chapter)
         {
             sys->updates |= INPUT_UPDATE_SEEKPOINT;
@@ -1247,12 +1252,12 @@
     if (!sys->can_control_pace)
     {
         /* Simulate a live input */
-        vlc_tick_t delay = sys->pts - prev_pts;
+        vlc_tick_t delay = sys->clock - prev_pts;
         delay = delay - delay / 1000 /* Sleep a little less */;
         vlc_tick_sleep(delay);
     }
 
-    es_out_SetPCR(demux->out, sys->pts);
+    es_out_SetPCR(demux->out, sys->clock);
 
     const vlc_tick_t video_step_length =
         (sys->video_track_count > 0 || sys->sub_track_count > 0) ?
@@ -1268,8 +1273,8 @@
     if (sys->audio_track_count > 0)
     {
         ret = DemuxAudio(demux, audio_step_length,
-                         __MIN(step_length + sys->audio_pts, sys->length));
-        if (sys->audio_pts + audio_step_length < sys->length)
+                         __MIN(step_length + sys->audio_pts - VLC_TICK_0, sys->length));
+        if (sys->audio_pts - VLC_TICK_0 + audio_step_length <= sys->length)
             eof = false;
     }
 
@@ -1277,16 +1282,16 @@
      && (sys->video_track_count > 0 || sys->sub_track_count > 0))
     {
         ret = DemuxVideo(demux, video_step_length,
-                         __MIN(step_length + sys->video_pts, sys->length));
-        if (sys->video_pts + video_step_length < sys->length)
+                         __MIN(step_length + sys->video_pts - VLC_TICK_0 - sys->pts_offset, sys->length));
+        if (sys->video_pts - VLC_TICK_0 - sys->pts_offset + video_step_length < sys->length)
             eof = false;
     }
 
     /* No audio/video/sub: simulate that we read some inputs */
     if (step_length == 0)
     {
-        sys->pts += sys->input_sample_length;
-        if (sys->pts + sys->input_sample_length < sys->length)
+        sys->clock += sys->input_sample_length;
+        if (sys->clock - VLC_TICK_0 - sys->pts_offset + sys->input_sample_length < sys->length)
             eof = false;
     }
 
@@ -1535,8 +1540,8 @@
 
         assert(index < pcr_count);
         struct pcr_point *point = &sys->pcr_points.dataindex++;
-        point->oldpcr = oldpcrval;
-        point->newpcr = newpcrval;
+        point->oldpcr = VLC_TICK_0 + oldpcrval;
+        point->newpcr = VLC_TICK_0 + newpcrval;
     }
 
     return VLC_SUCCESS;
@@ -1705,7 +1710,7 @@
     if (CheckAndCreateTracksEs(demux, VLC_TICK_0, &created) != VLC_SUCCESS)
         goto error;
 
-    sys->pts = sys->audio_pts = sys->video_pts = VLC_TICK_0;
+    sys->clock = sys->audio_pts = sys->video_pts = VLC_TICK_0 + sys->pts_offset;
     sys->current_title = 0;
     sys->chapter_gap = sys->chapter_count > 0 ?
                        (sys->length / sys->chapter_count) : VLC_TICK_INVALID;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mp4/attachments.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mp4/attachments.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mp4/avci.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mp4/avci.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mp4/essetup.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mp4/essetup.c Changed

@@ -30,7 +30,7 @@
 #include "avci.h"
 #include "../xiph.h"
 #include "../../packetizer/iso_color_tables.h"
-#include "mpeg4.h"
+#include "../../packetizer/mpeg4systems.h"
 #include "qt_palette.h"
 
 #include <vlc_demux.h>
@@ -110,7 +110,7 @@
 
         /* Fallback */
     default:
-        if( MPEG4_Codec_By_ObjectType( p_decconfig->i_objectProfileIndication,
+        if( MPEG4_get_codec_by_ObjectType( p_decconfig->i_objectProfileIndication,
                                        p_decconfig->p_decoder_specific_info,
                                        p_decconfig->i_decoder_specific_info_len,
                                        &p_fmt->i_codec,
@@ -402,9 +402,10 @@
     const MP4_Box_t *p_prhd = MP4_BoxGet( p_sample, "sv3d/proj/prhd" );
     if (p_prhd && BOXDATA(p_prhd))
     {
-        p_fmt->video.pose.yaw = BOXDATA(p_prhd)->f_pose_yaw_degrees;
-        p_fmt->video.pose.pitch = BOXDATA(p_prhd)->f_pose_pitch_degrees;
-        p_fmt->video.pose.roll = BOXDATA(p_prhd)->f_pose_roll_degrees;
+        vlc_viewpoint_from_euler(&p_fmt->video.pose,
+                                  BOXDATA(p_prhd)->f_pose_yaw_degrees,
+                                  BOXDATA(p_prhd)->f_pose_pitch_degrees,
+                                  BOXDATA(p_prhd)->f_pose_roll_degrees);
     }
 
     const MP4_Box_t *p_equi = MP4_BoxGet( p_sample, "sv3d/proj/equi" );
@@ -619,6 +620,8 @@
                 CopyExtradata( BOXDATA(p_av1C)->p_av1C,
                                BOXDATA(p_av1C)->i_av1C,
                                p_fmt );
+                if (p_fmt->i_extra <= 4)
+                    p_fmt->b_packetized = false; // force full extradata by the packetizer
             }
             break;
         }
@@ -770,7 +773,7 @@
         case ATOM_H264:
         case VLC_FOURCC('W','V','C','1'):
         {
-            MP4_Box_t *p_strf = MP4_BoxGet(  p_sample, "strf", 0 );
+            MP4_Box_t *p_strf = MP4_BoxGet(  p_sample, "strf" );
             if ( p_strf && BOXDATA(p_strf) )
             {
                 p_fmt->video.i_width = BOXDATA(p_strf)->bmiHeader.biWidth;
@@ -906,7 +909,7 @@
                 p_vCtd && p_vCtd->data.p_binary &&
                 p_vCtC && p_vCtC->data.p_binary )
             {
-                unsigned headers_sizes3 = {
+                size_t headers_sizes3 = {
                     p_vCtH->data.p_binary->i_blob,
                     p_vCtd->data.p_binary->i_blob,
                     p_vCtC->data.p_binary->i_blob
@@ -951,7 +954,7 @@
         }
         case ATOM_fLaC:
         {
-            const MP4_Box_t *p_dfLa = MP4_BoxGet(  p_sample, "dfLa", 0 );
+            const MP4_Box_t *p_dfLa = MP4_BoxGet(  p_sample, "dfLa" );
             if( p_dfLa && p_dfLa->data.p_binary->i_blob > 4 &&
                 GetDWBE(p_dfLa->data.p_binary->p_blob) == 0 ) /* fullbox header, avoids creating dedicated parser */
             {
@@ -976,7 +979,7 @@
             p_fmt->audio.i_channels = 0;
             p_fmt->audio.i_bitspersample = 0;
 
-            const MP4_Box_t *p_dec3 = MP4_BoxGet(  p_sample, "dec3", 0 );
+            const MP4_Box_t *p_dec3 = MP4_BoxGet(  p_sample, "dec3" );
             if( p_dec3 && BOXDATA(p_dec3) )
             {
                 p_fmt->i_bitrate = BOXDATA(p_dec3)->i_data_rate * 1000;
@@ -992,7 +995,7 @@
             p_fmt->audio.i_channels = 0;
             p_fmt->audio.i_bitspersample = 0;
 
-            MP4_Box_t *p_dac3 = MP4_BoxGet(  p_sample, "dac3", 0 );
+            MP4_Box_t *p_dac3 = MP4_BoxGet(  p_sample, "dac3" );
             if( p_dac3 && BOXDATA(p_dac3) )
             {
                 static const int pi_bitrate = {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mp4/heif.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mp4/heif.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mp4/libmp4.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mp4/libmp4.c Changed

@@ -5657,7 +5657,7 @@
  **
  *****************************************************************************
  *****************************************************************************/
-static bool get_token( char **ppsz_path, char **ppsz_token, int *pi_number )
+static bool get_token( const char **ppsz_path, char **ppsz_token, int *pi_number )
 {
     size_t i_len ;
     if( !*ppsz_path0 )
@@ -5705,11 +5705,9 @@
     return true;
 }
 
-static void MP4_BoxGet_Internal( const MP4_Box_t **pp_result, const MP4_Box_t *p_box,
-                                 const char *psz_fmt, va_list args)
+static void MP4_BoxGet_Path( const MP4_Box_t **pp_result, const MP4_Box_t *p_box,
+                             const char *psz_path)
 {
-    char *psz_dup;
-    char *psz_path;
     char *psz_token = NULL;
 
     if( !p_box )
@@ -5718,18 +5716,9 @@
         return;
     }
 
-    if( vasprintf( &psz_path, psz_fmt, args ) == -1 )
-        psz_path = NULL;
-
-    if( !psz_path || !psz_path0 )
-    {
-        free( psz_path );
-        *pp_result = NULL;
-        return;
-    }
+    assert( psz_path && psz_path0 );
 
 //    fprintf( stderr, "path:'%s'\n", psz_path );
-    psz_dup = psz_path; /* keep this pointer, as it need to be unallocated */
     for( ; ; )
     {
         int i_number;
@@ -5740,7 +5729,6 @@
 //                 psz_path,psz_token,i_number );
         if( !psz_token )
         {
-            free( psz_dup );
             *pp_result = p_box;
             return;
         }
@@ -5826,11 +5814,36 @@
 
 error_box:
     free( psz_token );
-    free( psz_dup );
     *pp_result = NULL;
     return;
 }
 
+static void MP4_BoxGet_Internal( const MP4_Box_t **pp_result, const MP4_Box_t *p_box,
+                                 const char *psz_fmt, va_list args)
+{
+    char *psz_path;
+
+    if( !p_box )
+    {
+        *pp_result = NULL;
+        return;
+    }
+
+    if( vasprintf( &psz_path, psz_fmt, args ) == -1 )
+        psz_path = NULL;
+
+    if( !psz_path || !psz_path0 )
+    {
+        free( psz_path );
+        *pp_result = NULL;
+        return;
+    }
+
+    MP4_BoxGet_Path( pp_result, p_box, psz_path );
+
+    free( psz_path );
+}
+
 /*****************************************************************************
  * MP4_BoxGet: find a box given a path relative to p_box
  *****************************************************************************
@@ -5840,8 +5853,7 @@
  * ex: /moov/trak12
  *     ../mdia
  *****************************************************************************/
-VLC_FORMAT(2, 3)
-MP4_Box_t *MP4_BoxGet( const MP4_Box_t *p_box, const char *psz_fmt, ... )
+MP4_Box_t *MP4_BoxGetVa( const MP4_Box_t *p_box, const char *psz_fmt, ... )
 {
     va_list args;
     const MP4_Box_t *p_result;
@@ -5853,6 +5865,15 @@
     return( (MP4_Box_t *) p_result );
 }
 
+MP4_Box_t *MP4_BoxGet( const MP4_Box_t *p_box, const char *psz_fmt )
+{
+    const MP4_Box_t *p_result;
+
+    MP4_BoxGet_Path( &p_result, p_box, psz_fmt );
+
+    return( (MP4_Box_t *) p_result );
+}
+
 /*****************************************************************************
  * MP4_BoxCount: count box given a path relative to p_box
  *****************************************************************************
@@ -5862,8 +5883,7 @@
  * ex: /moov/trak12
  *     ../mdia
  *****************************************************************************/
-VLC_FORMAT(2, 3)
-unsigned MP4_BoxCount( const MP4_Box_t *p_box, const char *psz_fmt, ... )
+unsigned MP4_BoxCountVa( const MP4_Box_t *p_box, const char *psz_fmt, ... )
 {
     va_list args;
     unsigned i_count;
@@ -5875,6 +5895,28 @@
     if( !p_result )
     {
         return( 0 );
+    }
+
+    i_count = 1;
+    for( p_next = p_result->p_next; p_next != NULL; p_next = p_next->p_next)
+    {
+        if( p_next->i_type == p_result->i_type)
+        {
+            i_count++;
+        }
+    }
+    return( i_count );
+}
+
+unsigned MP4_BoxCount( const MP4_Box_t *p_box, const char *psz_fmt )
+{
+    unsigned i_count;
+    const MP4_Box_t *p_result, *p_next;
+
+    MP4_BoxGet_Path( &p_result, p_box, psz_fmt );
+    if( !p_result )
+    {
+        return( 0 );
     }
 
     i_count = 1;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mp4/libmp4.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mp4/libmp4.h Changed

@@ -1967,7 +1967,7 @@
 void MP4_BoxDumpStructure( stream_t *p_input, const MP4_Box_t *p_box );
 
 /*****************************************************************************
- * MP4_BoxGet: find a box given a path relative to p_box
+ * MP4_BoxGetVa: find a box given a path relative to p_box
  *****************************************************************************
  * Path Format: . .. / as usual
  *              number to specifie box number ex: trak12
@@ -1975,10 +1975,20 @@
  * ex: /moov/trak12
  *     ../mdia
  *****************************************************************************/
-MP4_Box_t *MP4_BoxGet( const MP4_Box_t *p_box, const char *psz_fmt, ... );
+MP4_Box_t *MP4_BoxGetVa( const MP4_Box_t *p_box, const char *psz_fmt, ... ) VLC_FORMAT(2, 3);
 
 /*****************************************************************************
- * MP4_BoxCount: find number of box given a path relative to p_box
+ * MP4_BoxGet: find a box given a path relative to p_box
+ *****************************************************************************
+ * Path Format: . .. / as usual
+ *
+ * ex: /moov/mvex
+ *     ../mdia
+ *****************************************************************************/
+MP4_Box_t *MP4_BoxGet( const MP4_Box_t *p_box, const char *psz_fmt) ;
+
+/*****************************************************************************
+ * MP4_BoxCountVa: find number of box given a path relative to p_box
  *****************************************************************************
  * Path Format: . .. / as usual
  *              number to specifie box number ex: trak12
@@ -1986,7 +1996,17 @@
  * ex: /moov/trak
  *     ../mdia
  *****************************************************************************/
-unsigned MP4_BoxCount( const MP4_Box_t *p_box, const char *psz_fmt, ... );
+unsigned MP4_BoxCountVa( const MP4_Box_t *p_box, const char *psz_fmt, ... ) VLC_FORMAT(2, 3);
+
+/*****************************************************************************
+ * MP4_BoxCount: find number of box given a path relative to p_box
+ *****************************************************************************
+ * Path Format: . .. / as usual
+ *
+ * ex: /moov/mvex
+ *     ../mdia
+ *****************************************************************************/
+unsigned MP4_BoxCount( const MP4_Box_t *p_box, const char *psz_fmt );
 
 MP4_Box_t * MP4_BoxExtract( MP4_Box_t **pp_chain, uint32_t i_type );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mp4/meta.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mp4/meta.c Changed

@@ -395,9 +395,10 @@
                               "%*"PRIX32" %*"PRIX32" %"PRIX32" %"PRIX32,
                               &values0, &values1, &values2, &values3 ) == 4 )
         {
-            values0 = __MIN(values0, values1); /* left / right volume */
+            values0 = __MAX(values0, values1); /* left / right volume */
             if( values0 )
-                data.NORM.volume_adjust =  -10.0 * log10( values0 / 10000.0 );
+                data.NORM.volume_adjust = -10.0 * log10( values0 / 1000.0 );
+
             values2 = __MAX(values2, values3); /* left / right peak */
             if( values2 )
                 data.NORM.peak = values2 / 32768.0;
@@ -420,6 +421,13 @@
         }
         ctx->ituncb( &data, ctx->priv );
     }
+    else if( !strncasecmp(psz_key, "REPLAYGAIN_", 11) )
+    {
+        char *psz_val = StringConvert( p_data );
+        if( psz_val )
+            vlc_meta_SetExtra( ctx->p_meta, psz_key, psz_val );
+        free( psz_val );
+    }
 }
 
 static void SetupmdirMeta( vlc_meta_t *p_meta, const MP4_Box_t *p_box, void *priv )
@@ -618,4 +626,3 @@
         }
     }
 }
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mp4/mp4.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mp4/mp4.c Changed

@@ -36,8 +36,10 @@
 #include <vlc_plugin.h>
 #include <vlc_dialog.h>
 #include <vlc_url.h>
+#include <vlc_replay_gain.h>
 #include <assert.h>
 #include <limits.h>
+#include <math.h>
 #include "meta.h"
 #include "attachments.h"
 #include "heif.h"
@@ -715,12 +717,38 @@
     for( unsigned i=0; i<i_tracks; i++ )
     {
         MP4_TrackInit( &p_sys->tracki,
-                       MP4_BoxGet( p_sys->p_root, "/moov/trak%d", i ) );
+                       MP4_BoxGetVa( p_sys->p_root, "/moov/trak%u", i ) );
     }
 
     return VLC_SUCCESS;
 }
 
+static block_t * MP4_CDP_Convert( block_t *p_block )
+{
+    /* FinalCut ST334-2 CDP put inside CC violation */
+    if (p_block->i_buffer < 8 + 7)
+        goto out;
+
+    if(memcmp(&p_block->p_buffer4, "ccdp", 4))
+        goto out;
+
+    uint_fast32_t ccdp_size = GetDWBE(p_block->p_buffer);
+    if (ccdp_size > p_block->i_buffer || ccdp_size < 8)
+        goto out;
+
+    p_block->p_buffer += 8;
+    p_block->i_buffer = ccdp_size - 8;
+    /* Let cc.h handle extraction */
+    cc_data_t cc;
+    cc_Init(&cc);
+    cc_Extract(&cc, CC_PAYLOAD_CDP, true, p_block->p_buffer, p_block->i_buffer);
+    memcpy(p_block->p_buffer, cc.p_data, cc.i_data);
+    p_block->i_buffer = cc.i_data;
+
+out:
+    return p_block;
+}
+
 static block_t * MP4_EIA608_Convert( block_t * p_block )
 {
     /* Rebuild codec data from encap */
@@ -731,6 +759,9 @@
     if (p_block->i_buffer < 8)
         goto out;
 
+    if(!memcmp(&p_block->p_buffer4, "ccdp", 4))
+        return MP4_CDP_Convert(p_block);
+
     uint_fast32_t cdat_size = GetDWBE(p_block->p_buffer) - 8;
     if (cdat_size > p_block->i_buffer)
         goto out;
@@ -1019,6 +1050,8 @@
 
     p_sys->context.i_lastseqnumber = UINT32_MAX;
     p_sys->i_attachments = -1;
+    p_sys->qt.f_replay_gain_norm = NAN;
+    p_sys->qt.f_replay_gain_peak = NAN;
 
     p_demux->p_sys = p_sys;
 
@@ -1123,7 +1156,7 @@
 
         for( i = 0; i < i_count; i++ )
         {
-            MP4_Box_t *p_rdrf = MP4_BoxGet( p_rmra, "rmda%d/rdrf", i );
+            MP4_Box_t *p_rdrf = MP4_BoxGetVa( p_rmra, "rmda%d/rdrf", i );
             char      *psz_ref;
             uint32_t  i_ref_type;
 
@@ -1238,7 +1271,7 @@
     b_enabled_es = false;
     for( unsigned i = 0; i < p_sys->i_tracks; i++ )
     {
-        MP4_Box_t *p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak%d", i );
+        MP4_Box_t *p_trak = MP4_BoxGetVa( p_sys->p_root, "/moov/trak%u", i );
 
         /* Enabled check as explained above */
         MP4_Box_t *p_tkhd = MP4_BoxGet( p_trak, "tkhd" );
@@ -1277,7 +1310,7 @@
     /* now process each track and extract all useful information */
     for( unsigned i = 0; i < p_sys->i_tracks; i++ )
     {
-        const MP4_Box_t *p_trakbox = MP4_BoxGet( p_sys->p_root, "/moov/trak%u", i );
+        const MP4_Box_t *p_trakbox = MP4_BoxGetVa( p_sys->p_root, "/moov/trak%u", i );
         MP4_TrackSetup( p_demux, &p_sys->tracki, p_trakbox, true, !b_enabled_es );
         mp4_track_t *p_track = &p_sys->tracki;
 
@@ -3198,7 +3231,7 @@
         return VLC_EGENERIC;
     }
 
-    const MP4_Box_t *p_sample = MP4_BoxGet( p_track->p_stsd, "%d",
+    const MP4_Box_t *p_sample = MP4_BoxGetVa( p_track->p_stsd, "%d",
                                             i_sample_description_index - 1 );
     if( !p_sample ||
         ( !p_sample->data.p_payload && p_track->fmt.i_cat != SPU_ES ) )
@@ -3229,37 +3262,36 @@
                     (float)p_fmt->video.i_frame_rate_base;
             break;
         case AUDIO_ES:
+        {
+            int i_ret = VLC_EGENERIC;
             if( p_sys->p_meta )
             {
-                audio_replay_gain_t *p_arg = &p_fmt->audio_replay_gain;
-                const char *psz_meta = vlc_meta_GetExtra( p_sys->p_meta, "replaygain_track_gain" );
-                if( psz_meta )
-                {
-                    double f_gain = vlc_atof_c( psz_meta );
-                    p_arg->pf_gainAUDIO_REPLAY_GAIN_TRACK = f_gain;
-                    p_arg->pb_gainAUDIO_REPLAY_GAIN_TRACK = f_gain != 0;
-                }
-                psz_meta = vlc_meta_GetExtra( p_sys->p_meta, "replaygain_track_peak" );
-                if( psz_meta )
-                {
-                    double f_gain = vlc_atof_c( psz_meta );
-                    p_arg->pf_peakAUDIO_REPLAY_GAIN_TRACK = f_gain;
-                    p_arg->pb_peakAUDIO_REPLAY_GAIN_TRACK = f_gain > 0;
-                }
+                i_ret = vlc_replay_gain_CopyFromMeta( &p_fmt->audio_replay_gain, p_sys->p_meta );
             }
 
-            if( p_sys->qt.f_replay_gain_peak > 0 )
+            /* use replay gain if available; otherwise use sound check */
+            if( i_ret != VLC_SUCCESS )
             {
                 audio_replay_gain_t *p_arg = &p_fmt->audio_replay_gain;
-                if( !p_arg->pb_gainAUDIO_REPLAY_GAIN_TRACK )
+                replay_gain_Reset( p_arg );
+
+                if( isfinite(p_sys->qt.f_replay_gain_norm) )
                 {
-                    p_arg->pf_gainAUDIO_REPLAY_GAIN_TRACK = p_sys->qt.f_replay_gain_norm;
                     p_arg->pb_gainAUDIO_REPLAY_GAIN_TRACK = true;
+                    p_arg->pf_gainAUDIO_REPLAY_GAIN_TRACK = p_sys->qt.f_replay_gain_norm;
                 }
-                if( !p_arg->pb_peakAUDIO_REPLAY_GAIN_TRACK )
+
+                if( isfinite(p_sys->qt.f_replay_gain_peak) )
                 {
-                    p_arg->pf_peakAUDIO_REPLAY_GAIN_TRACK = p_sys->qt.f_replay_gain_peak;
                     p_arg->pb_peakAUDIO_REPLAY_GAIN_TRACK = true;
+                    p_arg->pf_peakAUDIO_REPLAY_GAIN_TRACK = p_sys->qt.f_replay_gain_peak;
+                }
+
+                if( p_arg->pb_gainAUDIO_REPLAY_GAIN_TRACK )
+                {
+                    /* sound check uses -16 LUFS as the reference level */
+                    p_arg->pb_reference_loudness = true;
+                    p_arg->pf_reference_loudness = -16.f;
                 }
             }
 
@@ -3329,6 +3361,7 @@
                     break;
             }
             break;
+        }
         default:
             break;
     }
@@ -3622,7 +3655,7 @@
         msg_Warn( p_demux, "recreate ES for trackId 0x%x",
                   p_track->i_track_ID );
 
-        const MP4_Box_t *p_newsample = MP4_BoxGet( p_track->p_stsd, "%d",
+        const MP4_Box_t *p_newsample = MP4_BoxGetVa( p_track->p_stsd, "%d",
                                                    p_track->chunki_chunk.i_sample_description_index - 1 );
         if( p_newsample == NULL )
         {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mpeg/es.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mpeg/es.c Changed

@@ -30,6 +30,8 @@
 # include "config.h"
 #endif
 
+#include <math.h>
+
 #include <vlc_common.h>
 #include <vlc_arrays.h>
 #include <vlc_plugin.h>
@@ -37,6 +39,7 @@
 #include <vlc_codec.h>
 #include <vlc_codecs.h>
 #include <vlc_input.h>
+#include <vlc_replay_gain.h>
 
 #include "../../packetizer/a52.h"
 #include "../../packetizer/dts_header.h"
@@ -362,8 +365,7 @@
     struct mpga_frameheader_s mpgah;
     struct xing_info_s xing;
 
-    float rgf_replay_gainAUDIO_REPLAY_GAIN_MAX;
-    float rgf_replay_peakAUDIO_REPLAY_GAIN_MAX;
+    audio_replay_gain_t audio_replay_gain;
 
     sync_table_t mllt;
     struct
@@ -435,6 +437,9 @@
     p_sys->f_fps = var_InheritFloat( p_demux, "es-fps" );
     p_sys->p_packetized_data = NULL;
     p_sys->chapters.i_current = 0;
+    p_sys->xing.f_peak_signal = NAN;
+    p_sys->xing.f_radio_replay_gain = NAN;
+    p_sys->xing.f_audiophile_replay_gain = NAN;
     TAB_INIT(p_sys->chapters.i_count, p_sys->chapters.p_entry);
 
     if( vlc_stream_Seek( p_demux->s, p_sys->i_stream_offset ) )
@@ -468,19 +473,7 @@
     }
 
     es_format_t *p_fmt = &p_sys->p_packetizer->fmt_out;
-    for( int i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
-    {
-        if ( p_sys->rgf_replay_gaini != 0.0 )
-        {
-            p_fmt->audio_replay_gain.pb_gaini = true;
-            p_fmt->audio_replay_gain.pf_gaini = p_sys->rgf_replay_gaini;
-        }
-        if ( p_sys->rgf_replay_peaki != 0.0 )
-        {
-            p_fmt->audio_replay_gain.pb_peaki = true;
-            p_fmt->audio_replay_gain.pf_peaki = p_sys->rgf_replay_peaki;
-        }
-    }
+    replay_gain_Merge( &p_fmt->audio_replay_gain, &p_sys->audio_replay_gain );
 
     for( ;; )
     {
@@ -1270,30 +1263,7 @@
             bool b_updated;
             if( ID3HandleTag( p_payload, i_payload, i_tag, p_meta, &b_updated ) )
             {
-                char ** ppsz_keys = vlc_meta_CopyExtraNames( p_meta );
-                if( ppsz_keys )
-                {
-                    for( size_t i = 0; ppsz_keysi; ++i )
-                    {
-                        float *pf = NULL;
-                        if(     !strcasecmp( ppsz_keysi, "REPLAYGAIN_TRACK_GAIN" ) )
-                            pf = &p_sys->rgf_replay_gainAUDIO_REPLAY_GAIN_TRACK;
-                        else if( !strcasecmp( ppsz_keysi, "REPLAYGAIN_TRACK_PEAK" ) )
-                            pf = &p_sys->rgf_replay_peakAUDIO_REPLAY_GAIN_TRACK;
-                        else if( !strcasecmp( ppsz_keysi, "REPLAYGAIN_ALBUM_GAIN" ) )
-                            pf = &p_sys->rgf_replay_gainAUDIO_REPLAY_GAIN_ALBUM;
-                        else if( !strcasecmp( ppsz_keysi, "REPLAYGAIN_ALBUM_PEAK" ) )
-                            pf = &p_sys->rgf_replay_peakAUDIO_REPLAY_GAIN_ALBUM;
-                        if( pf )
-                        {
-                            const char *psz_val = vlc_meta_GetExtra( p_meta, ppsz_keysi );
-                            if( psz_val )
-                                *pf = vlc_atof_c( psz_val );
-                        }
-                        free( ppsz_keysi );
-                    }
-                    free( ppsz_keys );
-                }
+                vlc_replay_gain_CopyFromMeta( &p_sys->audio_replay_gain, p_meta );
             }
             vlc_meta_Delete( p_meta );
         }
@@ -1421,9 +1391,23 @@
             p_sys->b_estimate_bitrate = false;
         }
 
-        p_sys->rgf_replay_peakAUDIO_REPLAY_GAIN_TRACK = xing->f_peak_signal;
-        p_sys->rgf_replay_gainAUDIO_REPLAY_GAIN_TRACK = xing->f_radio_replay_gain;
-        p_sys->rgf_replay_gainAUDIO_REPLAY_GAIN_ALBUM = xing->f_audiophile_replay_gain;
+        if( isfinite(xing->f_radio_replay_gain) )
+        {
+            p_sys->audio_replay_gain.pb_gainAUDIO_REPLAY_GAIN_TRACK = true;
+            p_sys->audio_replay_gain.pf_gainAUDIO_REPLAY_GAIN_TRACK = xing->f_radio_replay_gain;
+        }
+
+        if( isfinite(xing->f_peak_signal) )
+        {
+            p_sys->audio_replay_gain.pb_peakAUDIO_REPLAY_GAIN_TRACK = true;
+            p_sys->audio_replay_gain.pf_peakAUDIO_REPLAY_GAIN_TRACK = xing->f_peak_signal;
+        }
+
+        if( isfinite(xing->f_audiophile_replay_gain) )
+        {
+            p_sys->audio_replay_gain.pb_gainAUDIO_REPLAY_GAIN_ALBUM = true;
+            p_sys->audio_replay_gain.pf_gainAUDIO_REPLAY_GAIN_ALBUM = xing->f_audiophile_replay_gain;
+        }
 
         msg_Dbg( p_demux, "Using '%4.4s' infotag"
                           "(%"PRIu32" bytes, %"PRIu32" frames, %u samples/frame)",

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mpeg/h26x.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mpeg/h26x.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mpeg/ps.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mpeg/ps.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mpeg/ts.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mpeg/ts.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mpeg/ts_psi.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mpeg/ts_psi.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/mpeg/ts_si.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/mpeg/ts_si.c Changed

@@ -150,8 +150,9 @@
     }\
     } while(0)\
 
-static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
+static void SDTCallBack( void *opaque, dvbpsi_sdt_t *p_sdt )
 {
+    demux_t              *p_demux = opaque;
     demux_sys_t          *p_sys = p_demux->p_sys;
     ts_pid_t             *sdt = GetPID(p_sys, TS_SI_SDT_PID);
     ts_pat_t             *p_pat = ts_pid_Get(&p_sys->pids, 0)->u.p_pat;
@@ -383,8 +384,9 @@
 }
 #undef CVT_FROM_BCD
 
-static void TDTCallBack( demux_t *p_demux, dvbpsi_tot_t *p_tdt )
+static void TDTCallBack( void *opaque, dvbpsi_tot_t *p_tdt )
 {
+    demux_t            *p_demux = opaque;
     demux_sys_t        *p_sys = p_demux->p_sys;
 
 
@@ -490,8 +492,9 @@
     }
 }
 
-static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
+static void EITCallBack( void *opaque, dvbpsi_eit_t *p_eit )
 {
+    demux_t            *p_demux = opaque;
     demux_sys_t        *p_sys = p_demux->p_sys;
     const dvbpsi_eit_event_t *p_evt;
     uint64_t i_runevt = 0;
@@ -783,7 +786,7 @@
 #endif
     if( p_pid->i_pid == TS_SI_SDT_PID && i_table_id == 0x42 )
     {
-        if( !dvbpsi_sdt_attach( h, i_table_id, i_extension, (dvbpsi_sdt_callback)SDTCallBack, p_demux ) )
+        if( !dvbpsi_sdt_attach( h, i_table_id, i_extension, SDTCallBack, p_demux ) )
             msg_Err( p_demux, "SINewTableCallback: failed attaching SDTCallback" );
     }
     else if( p_pid->i_pid == TS_SI_EIT_PID &&
@@ -791,13 +794,13 @@
                (i_table_id >= 0x50 && i_table_id <= 0x5f) ) ) /* Schedule */
     {
         if( !dvbpsi_eit_attach( h, i_table_id, i_extension,
-                                (dvbpsi_eit_callback)EITCallBack, p_demux ) )
+                                EITCallBack, p_demux ) )
             msg_Err( p_demux, "SINewTableCallback: failed attaching EITCallback" );
     }
     else if( p_pid->i_pid == TS_SI_TDT_PID &&
             (i_table_id == TS_SI_TDT_TABLE_ID || i_table_id == TS_SI_TOT_TABLE_ID) )
     {
-        if( !dvbpsi_tot_attach( h, i_table_id, i_extension, (dvbpsi_tot_callback)TDTCallBack, p_demux ) )
+        if( !dvbpsi_tot_attach( h, i_table_id, i_extension, TDTCallBack, p_demux ) )
             msg_Err( p_demux, "SINewTableCallback: failed attaching TDTCallback" );
     }
     else if( p_pid->i_pid == TS_ARIB_CDT_PID && i_table_id == TS_ARIB_CDT_TABLE_ID )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/ogg.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/ogg.c Changed

@@ -39,6 +39,7 @@
 #include <vlc_demux.h>
 #include <vlc_meta.h>
 #include <vlc_input.h>
+#include <vlc_replay_gain.h>
 
 #include <ogg/ogg.h>
 
@@ -154,7 +155,7 @@
 static void Ogg_ResetStream( logical_stream_t *p_stream );
 
 /* */
-static void Ogg_ExtractMeta( demux_t *p_demux, es_format_t *p_fmt, const uint8_t *p_headers, int i_headers );
+static void Ogg_ExtractMeta( demux_t *p_demux, es_format_t *p_fmt, const uint8_t *p_headers, size_t i_headers );
 
 /* Logical bitstream headers */
 static bool Ogg_ReadDaalaHeader( logical_stream_t *, ogg_packet * );
@@ -2431,22 +2432,22 @@
  */
 static bool Ogg_IsVorbisFormatCompatible( const es_format_t *p_new, const es_format_t *p_old )
 {
-    unsigned pi_new_sizeXIPH_MAX_HEADER_COUNT;
+    size_t pi_new_sizeXIPH_MAX_HEADER_COUNT;
     const void *pp_new_dataXIPH_MAX_HEADER_COUNT;
-    unsigned i_new_count;
+    size_t i_new_count;
 
-    if( xiph_SplitHeaders(pi_new_size, pp_new_data, &i_new_count, p_new->i_extra, p_new->p_extra ) )
+    if (xiph_SplitHeaders(pi_new_size, pp_new_data, &i_new_count, p_new->i_extra, p_new->p_extra))
         i_new_count = 0;
 
-    unsigned pi_old_sizeXIPH_MAX_HEADER_COUNT;
+    size_t pi_old_sizeXIPH_MAX_HEADER_COUNT;
     const void *pp_old_dataXIPH_MAX_HEADER_COUNT;
-    unsigned i_old_count;
+    size_t i_old_count;
 
-    if( xiph_SplitHeaders(pi_old_size, pp_old_data, &i_old_count, p_old->i_extra, p_old->p_extra ) )
+    if (xiph_SplitHeaders(pi_old_size, pp_old_data, &i_old_count, p_old->i_extra, p_old->p_extra))
         i_old_count = 0;
 
     bool b_match = i_new_count == i_old_count;
-    for( unsigned i = 0; i < i_new_count && b_match; i++ )
+    for (size_t i = 0; i < i_new_count && b_match; i++)
     {
         /* Ignore vorbis comment */
         if( i == 1 )
@@ -2462,16 +2463,16 @@
 static bool Ogg_IsOpusFormatCompatible( const es_format_t *p_new,
                                         const es_format_t *p_old )
 {
-    unsigned pi_new_sizeXIPH_MAX_HEADER_COUNT;
+    size_t pi_new_sizeXIPH_MAX_HEADER_COUNT;
     const void *pp_new_dataXIPH_MAX_HEADER_COUNT;
-    unsigned i_new_count;
+    size_t i_new_count;
 
-    if( xiph_SplitHeaders(pi_new_size, pp_new_data, &i_new_count, p_new->i_extra, p_new->p_extra ) )
+    if(xiph_SplitHeaders(pi_new_size, pp_new_data, &i_new_count, p_new->i_extra, p_new->p_extra ) )
         i_new_count = 0;
 
-    unsigned pi_old_sizeXIPH_MAX_HEADER_COUNT;
+    size_t pi_old_sizeXIPH_MAX_HEADER_COUNT;
     const void *pp_old_dataXIPH_MAX_HEADER_COUNT;
-    unsigned i_old_count;
+    size_t i_old_count;
 
     if( xiph_SplitHeaders(pi_old_size, pp_old_data, &i_old_count, p_old->i_extra, p_old->p_extra ) )
         i_old_count = 0;
@@ -2564,23 +2565,17 @@
 }
 
 static void Ogg_ExtractComments( demux_t *p_demux, es_format_t *p_fmt,
-                                 const void *p_headers, unsigned i_headers )
+                                 const void *p_headers, size_t i_headers )
 {
     demux_sys_t *p_ogg = p_demux->p_sys;
     int i_cover_score = 0;
     int i_cover_idx = 0;
-    float pf_replay_gainAUDIO_REPLAY_GAIN_MAX;
-    float pf_replay_peakAUDIO_REPLAY_GAIN_MAX;
-    for(int i=0; i< AUDIO_REPLAY_GAIN_MAX; i++ )
-    {
-        pf_replay_gaini = 0;
-        pf_replay_peaki = 0;
-    }
+
     vorbis_ParseComment( p_fmt, &p_ogg->p_meta, p_headers, i_headers,
                          &p_ogg->i_attachments, &p_ogg->attachments,
                          &i_cover_score, &i_cover_idx,
-                         &p_ogg->i_seekpoints, &p_ogg->pp_seekpoints,
-                         &pf_replay_gain, &pf_replay_peak );
+                         &p_ogg->i_seekpoints, &p_ogg->pp_seekpoints );
+
     if( p_ogg->p_meta != NULL && i_cover_idx < p_ogg->i_attachments )
     {
         char psz_url128;
@@ -2589,19 +2584,33 @@
         vlc_meta_Set( p_ogg->p_meta, vlc_meta_ArtworkURL, psz_url );
     }
 
-    for ( int i=0; i<AUDIO_REPLAY_GAIN_MAX;i++ )
+    int i_ret = vlc_replay_gain_CopyFromMeta( &p_fmt->audio_replay_gain, p_ogg->p_meta );
+
+    /* use replay gain if available; otherwise use IETF RFC7845 §5.2.1 */
+    if( i_ret != VLC_SUCCESS && p_ogg->p_meta != NULL )
     {
-        if ( pf_replay_gaini != 0 )
+        audio_replay_gain_t *p_arg = &p_fmt->audio_replay_gain;
+        replay_gain_Reset( p_arg );
+
+        const char *track_gain = vlc_meta_GetExtra( p_ogg->p_meta, "R128_TRACK_GAIN" );
+        if( track_gain )
         {
-            p_fmt->audio_replay_gain.pb_gaini = true;
-            p_fmt->audio_replay_gain.pf_gaini = pf_replay_gaini;
-            msg_Dbg( p_demux, "setting replay gain %d to %f", i, pf_replay_gaini );
+            p_arg->pb_gainAUDIO_REPLAY_GAIN_TRACK = true;
+            p_arg->pf_gainAUDIO_REPLAY_GAIN_TRACK = vlc_strtof_c( track_gain, NULL ) / 256.f;
         }
-        if ( pf_replay_peaki != 0 )
+
+        const char *album_gain = vlc_meta_GetExtra( p_ogg->p_meta, "R128_ALBUM_GAIN" );
+        if( album_gain )
+        {
+            p_arg->pb_gainAUDIO_REPLAY_GAIN_ALBUM = true;
+            p_arg->pf_gainAUDIO_REPLAY_GAIN_ALBUM = vlc_strtof_c( album_gain, NULL ) / 256.f;
+        }
+
+        if( track_gain || album_gain )
         {
-            p_fmt->audio_replay_gain.pb_peaki = true;
-            p_fmt->audio_replay_gain.pf_peaki = pf_replay_peaki;
-            msg_Dbg( p_demux, "setting replay peak %d to %f", i, pf_replay_gaini );
+            /* EBU R128 uses -23 LUFS as the reference level */
+            p_arg->pb_reference_loudness = true;
+            p_arg->pf_reference_loudness = -23.f;
         }
     }
 
@@ -2621,7 +2630,7 @@
 }
 
 static void Ogg_ExtractFlacComments( demux_t *p_demux, es_format_t *p_fmt,
-                                     const uint8_t *p_headers, unsigned i_headers )
+                                     const uint8_t *p_headers, size_t i_headers )
 {
     /* Skip Streaminfo 42 bytes / 1st page */
     if(i_headers <= 46)
@@ -2636,11 +2645,11 @@
 }
 
 static void Ogg_ExtractXiphMeta( demux_t *p_demux, es_format_t *p_fmt,
-                                 const void *p_headers, unsigned i_headers, unsigned i_skip )
+                                 const void *p_headers, size_t i_headers, unsigned i_skip )
 {
-    unsigned pi_sizeXIPH_MAX_HEADER_COUNT;
+    size_t pi_sizeXIPH_MAX_HEADER_COUNT;
     const void *pp_dataXIPH_MAX_HEADER_COUNT;
-    unsigned i_count;
+    size_t i_count;
 
     if( xiph_SplitHeaders( pi_size, pp_data, &i_count, i_headers, p_headers ) )
         return;
@@ -2653,7 +2662,7 @@
     }
 }
 
-static void Ogg_ExtractMeta( demux_t *p_demux, es_format_t *p_fmt, const uint8_t *p_headers, int i_headers )
+static void Ogg_ExtractMeta( demux_t *p_demux, es_format_t *p_fmt, const uint8_t *p_headers, size_t i_headers )
 {
     demux_sys_t *p_ogg = p_demux->p_sys;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/ogg.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/ogg.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/playlist/m3u.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/playlist/m3u.c Changed

@@ -195,12 +195,14 @@
     vlc_tick_t i_duration;
     const char**ppsz_options;
     int   i_options;
+    vlc_meta_priority_t priority;
 };
 
 static void entry_meta_Init( struct entry_meta_s *e )
 {
     memset(e, 0, sizeof(*e));
     e->i_duration = INPUT_DURATION_INDEFINITE;
+    e->priority = VLC_META_PRIORITY_BASIC;
 }
 
 static void entry_meta_Clean( struct entry_meta_s *e )
@@ -233,15 +235,15 @@
 
     vlc_mutex_lock( &p_input->lock );
     if( meta->psz_artist )
-        vlc_meta_SetWithPlaylistPriority( p_input->p_meta, vlc_meta_Artist, meta->psz_artist );
+        vlc_meta_SetWithPriority( p_input->p_meta, vlc_meta_Artist, meta->psz_artist, meta->priority );
     if( meta->psz_name )
-        vlc_meta_SetWithPlaylistPriority( p_input->p_meta, vlc_meta_Title, meta->psz_name );
+        vlc_meta_SetWithPriority( p_input->p_meta, vlc_meta_Title, meta->psz_name, meta->priority );
     if( meta->psz_album_art )
-        vlc_meta_SetWithPlaylistPriority( p_input->p_meta, vlc_meta_ArtworkURL, meta->psz_album_art );
+        vlc_meta_SetWithPriority( p_input->p_meta, vlc_meta_ArtworkURL, meta->psz_album_art, meta->priority );
     if( meta->psz_language )
-        vlc_meta_SetWithPlaylistPriority( p_input->p_meta, vlc_meta_Language, meta->psz_language );
+        vlc_meta_SetWithPriority( p_input->p_meta, vlc_meta_Language, meta->psz_language, meta->priority );
     if( meta->psz_grouptitle )
-        vlc_meta_SetWithPlaylistPriority( p_input->p_meta, vlc_meta_Publisher, meta->psz_grouptitle );
+        vlc_meta_SetWithPriority( p_input->p_meta, vlc_meta_Publisher, meta->psz_grouptitle, meta->priority );
     vlc_mutex_unlock( &p_input->lock );
     if( meta->psz_tvgid )
         input_item_AddInfo( p_input, "XMLTV", "tvg-id", "%s", meta->psz_tvgid );
@@ -286,6 +288,7 @@
                 psz_parse += sizeof("EXTINF:") - 1;
                 meta.i_duration = INPUT_DURATION_INDEFINITE;
                 parseEXTINF( psz_parse, pf_dup, &meta );
+                meta.priority = VLC_META_PRIORITY_PLAYLIST;
             }
             else if( !strncasecmp( psz_parse, "EXTGRP:", sizeof("EXTGRP:") -1 ) )
             {
@@ -317,6 +320,7 @@
                 {
                     free( meta.psz_album_art );
                     meta.psz_album_art = pf_dup( psz_parse );
+                    meta.priority = VLC_META_PRIORITY_PLAYLIST;
                 }
             }
             else if ( !strncasecmp( psz_parse, "PLAYLIST:",

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/rawdv.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/rawdv.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/subtitle.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/subtitle.c Changed

@@ -245,6 +245,9 @@
 
 static block_t *ToTextBlock( const subtitle_t *p_subtitle )
 {
+    if ( p_subtitle->psz_text == NULL )
+        return NULL;
+
     block_t *p_block;
     size_t i_len = strlen( p_subtitle->psz_text ) + 1;
 
@@ -258,6 +261,9 @@
 
 static block_t *ToEIA608Block( const subtitle_t *p_subtitle )
 {
+    if ( p_subtitle->psz_text == NULL )
+        return NULL;
+
     block_t *p_block;
     const size_t i_len = strlen( p_subtitle->psz_text );
     const size_t i_block = (1 + i_len / 5) * 3;
@@ -1077,31 +1083,29 @@
     }
 
     /* Now read text until an empty line */
-    psz_text = strdup("");
-    if( !psz_text )
-        return VLC_ENOMEM;
-
+    size_t i_old = 0;
+    psz_text = NULL;
     for( ;; )
     {
         const char *s = TextGetLine( txt );
         size_t i_len;
-        size_t i_old;
 
         i_len = s ? strlen( s ) : 0;
         if( i_len <= 0 )
         {
+            if (psz_text)
+                psz_texti_old = '\0';
             p_subtitle->psz_text = psz_text;
             return VLC_SUCCESS;
         }
 
-        i_old = strlen( psz_text );
         psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 );
         if( !psz_text )
-        {
             return VLC_ENOMEM;
-        }
-        strcat( psz_text, s );
-        strcat( psz_text, "\n" );
+
+        memcpy( &psz_texti_old, s, i_len );
+        psz_texti_old + i_len + 0 = '\n';
+        i_old += i_len + 1;
 
         /* replace br by \n */
         if( b_replace_br )
@@ -1112,6 +1116,7 @@
             {
                 *p++ = '\n';
                 memmove( p, &p3, strlen(&p3)+1 );
+                i_old -= 3;
             }
         }
     }
@@ -1514,14 +1519,12 @@
     }
 
     /* Now read text until a line containing "}" */
-    psz_text = strdup("");
-    if( !psz_text )
-        return VLC_ENOMEM;
+    size_t i_old = 0;
+    psz_text = NULL;
     for( ;; )
     {
         const char *s = TextGetLine( txt );
-        int i_len;
-        int i_old;
+        size_t i_len;
 
         if( !s )
         {
@@ -1532,16 +1535,19 @@
         i_len = strlen( s );
         if( i_len == 1 && s0 == '}')
         {
+            if (psz_text)
+                psz_texti_old = '\0';
             p_subtitle->psz_text = psz_text;
             return VLC_SUCCESS;
         }
 
-        i_old = strlen( psz_text );
         psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 );
         if( !psz_text )
             return VLC_ENOMEM;
-        strcat( psz_text, s );
-        strcat( psz_text, "\n" );
+
+        memcpy( &psz_texti_old, s, i_len );
+        psz_texti_old + i_len + 0 = '\n';
+        i_old += i_len + 1;
     }
 }
 
@@ -1606,8 +1612,9 @@
     VLC_UNUSED(p_props);
     VLC_UNUSED( i_idx );
 
-    char *psz_text = strdup( "" );
-    int i_old = 0;
+    char *psz_text = NULL;
+    size_t i_old = 0;
+    size_t i_len;
     int i_firstline = 1;
 
     for( ;; )
@@ -1641,16 +1648,20 @@
         /* Text Lines */
         else
         {
-            i_old = strlen( psz_text ) + 1;
-            psz_text = realloc_or_free( psz_text, i_old + strlen( s ) + 1 );
+            i_len = strlen( s );
+            psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 );
             if( !psz_text )
                  return VLC_ENOMEM;
-            strcat( psz_text, s );
-            strcat( psz_text, "\n" );
+
+            memcpy( &psz_texti_old, s, i_len );
+            psz_texti_old + i_len + 0 = '\n';
+            i_old += i_len + 1;
             if( txt->i_line == txt->i_line_count )
                 break;
         }
     }
+    if (psz_text)
+        psz_texti_old = '\0';
     p_subtitle->psz_text = psz_text;
     return VLC_SUCCESS;
 }
@@ -1708,8 +1719,6 @@
 {
     VLC_UNUSED( i_idx );
 
-    char *psz_text = strdup( "" );
-
     if( !p_props->mpsub.b_inited )
     {
         p_props->mpsub.f_total = 0.0;
@@ -1720,58 +1729,52 @@
 
     for( ;; )
     {
-        char p_dummy;
-        char *psz_temp;
-
         const char *s = TextGetLine( txt );
         if( !s )
         {
-            free( psz_text );
             return VLC_EGENERIC;
         }
 
-        if( strstr( s, "FORMAT" ) )
-        {
-            if( sscanf (s, "FORMAT=TIM%c", &p_dummy ) == 1 && p_dummy == 'E')
-            {
-                p_props->mpsub.i_factor = 100;
-                break;
-            }
-
-            psz_temp = malloc( strlen(s) );
-            if( !psz_temp )
-            {
-                free( psz_text );
-                return VLC_ENOMEM;
-            }
-
-            if( sscanf( s, "FORMAT=%^\r\n", psz_temp ) )
-            {
-                float f_fps = vlc_strtof_c( psz_temp, NULL );
-
-                if( f_fps > 0.f && var_GetFloat( p_obj, "sub-original-fps" ) <= 0.f )
-                    var_SetFloat( p_obj, "sub-original-fps", f_fps );
-
-                p_props->mpsub.i_factor = 1;
-                free( psz_temp );
-                break;
-            }
-            free( psz_temp );
-        }
+        if ( *s =='#' || *s == '\0' )
+            continue;
 
         /* Data Lines */
-        float f1 = vlc_strtof_c( s, &psz_temp );
-        if( *psz_temp )
+        float wait, duration;
+        if( sscanf( s, "%f %f", &wait, &duration ) == 2 )
         {
-            float f2 = vlc_strtof_c( psz_temp, NULL );
+            float f1 = wait;
+            float f2 = duration;
             p_props->mpsub.f_total += f1 * p_props->mpsub.i_factor;
             p_subtitle->i_start = VLC_TICK_0 + llroundf(10000.f * p_props->mpsub.f_total);
             p_props->mpsub.f_total += f2 * p_props->mpsub.i_factor;
             p_subtitle->i_stop = VLC_TICK_0 + llroundf(10000.f * p_props->mpsub.f_total);
             break;
         }
+
+        if( !strncmp( s, "FORMAT=", strlen("FORMAT=") ) )
+        {
+            const char *psz_format = s + strlen( "FORMAT=" );
+            if( !strncmp( psz_format, "TIME", strlen("TIME") ) && (psz_format4 == '\0' || psz_format4 == ' ') )
+            {
+                // FORMAT=TIME may be followed by a comment
+                p_props->mpsub.i_factor = 100;
+            }
+            else
+            {
+                float f_fps;
+                if( sscanf( psz_format, "%f", &f_fps ) == 1 )
+                {
+                    if( f_fps > 0.f && var_GetFloat( p_obj, "sub-original-fps" ) <= 0.f )
+                        var_SetFloat( p_obj, "sub-original-fps", f_fps );
+
+                    p_props->mpsub.i_factor = 1;
+                }
+            }
+        }
     }
 
+    char *psz_text = NULL;
+    size_t i_old = 0;
     for( ;; )
     {
         const char *s = TextGetLine( txt );
@@ -1786,16 +1789,17 @@
         if( i_len == 0 )
             break;
 
-        size_t i_old = strlen( psz_text );
-
         psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 );
         if( !psz_text )
              return VLC_ENOMEM;
 
-        strcat( psz_text, s );
-        strcat( psz_text, "\n" );
+        memcpy( &psz_texti_old, s, i_len );
+        psz_texti_old + i_len + 0 = '\n';
+        i_old += i_len + 1;
     }
 
+    if (psz_text)
+        psz_texti_old = '\0';
     p_subtitle->psz_text = psz_text;
     return VLC_SUCCESS;
 }
@@ -2155,6 +2159,7 @@
     }
 
     /* Get the following Lines */
+    size_t i_old = strlen( psz_text );
     for( ;; )
     {
         const char *s = TextGetLine( txt );
@@ -2175,16 +2180,16 @@
             break;
         }
 
-        size_t i_old = strlen( psz_text );
-
         psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 );
         if( !psz_text )
             return VLC_ENOMEM;
 
-        strcat( psz_text, s );
-        strcat( psz_text, "\n" );
+        memcpy( &psz_texti_old, s, i_len );
+        psz_texti_old + i_len + 0 = '\n';
+        i_old += i_len + 1;
     }
 
+    psz_texti_old = '\0';
     /* Remove the starting ">" that remained after the sscanf */
     memmove( &psz_text0, &psz_text1, strlen( psz_text ) );
 
@@ -2330,30 +2335,29 @@
     }
 
     /* Now read text until an empty line */
-    psz_text = strdup("");
-    if( !psz_text )
-        return VLC_ENOMEM;
-
+    size_t i_old = 0;
+    psz_text = NULL;
     for( ;; )
     {
         const char *s = TextGetLine( txt );
         size_t i_len;
-        size_t i_old;
 
         i_len = s ? strlen( s ) : 0;
         if( i_len <= 0 )
         {
+            if (psz_text)
+                psz_texti_old = '\0';
             p_subtitle->psz_text = psz_text;
             return VLC_SUCCESS;
         }
 
-        i_old = strlen( psz_text );
         psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 );
         if( !psz_text )
             return VLC_ENOMEM;
 
-        strcat( psz_text, s );
-        strcat( psz_text, "\n" );
+        memcpy( &psz_texti_old, s, i_len );
+        psz_texti_old + i_len + 0 = '\n';
+        i_old += i_len + 1;
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/ttml.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/ttml.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/ty.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/ty.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/wav.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/wav.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/xiph.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/xiph.h Changed

@@ -25,7 +25,7 @@
 #define XIPH_MAX_HEADER_COUNT (256)
 
 /* Temp ffmpeg vorbis format */
-static inline bool xiph_IsLavcFormat(const void *extra, unsigned i_extra,
+static inline bool xiph_IsLavcFormat(const void *extra, size_t i_extra,
                                      vlc_fourcc_t i_codec)
 {
     switch(i_codec)
@@ -39,7 +39,7 @@
     }
 }
 
-static inline unsigned xiph_CountLavcHeaders(const void *p_extra, unsigned i_extra)
+static inline unsigned xiph_CountLavcHeaders(const void *p_extra, size_t i_extra)
 {
     const uint8_t *p = (const uint8_t*) p_extra;
     const uint8_t *p_end = &pi_extra;
@@ -56,7 +56,7 @@
     return 3;
 }
 
-static inline unsigned xiph_CountHeaders(const void *p_extra, unsigned i_extra)
+static inline unsigned xiph_CountHeaders(const void *p_extra, size_t i_extra)
 {
     const uint8_t *p = (const uint8_t*) p_extra;
     if (!i_extra)
@@ -76,9 +76,9 @@
         return xiph_CountHeaders(p_extra, i_extra);
 }
 
-static inline int xiph_SplitLavcHeaders(unsigned packet_size,
-                                        const void *packet, unsigned *packet_count,
-                                        unsigned i_extra, const void *p_extra)
+static inline int xiph_SplitLavcHeaders(size_t packet_size,
+                                        const void *packet, size_t *packet_count,
+                                        size_t i_extra, const void *p_extra)
 {
     const uint8_t *current = (const uint8_t *)p_extra;
     const uint8_t *end = &currenti_extra;
@@ -103,9 +103,9 @@
     return VLC_SUCCESS;
 }
 
-static inline int xiph_SplitHeaders(unsigned packet_size,
-                                    const void *packet, unsigned *packet_count,
-                                    unsigned i_extra, const void *p_extra)
+static inline int xiph_SplitHeaders(size_t packet_size,
+                                    const void *packet, size_t *packet_count,
+                                    size_t i_extra, const void *p_extra)
 {
     const uint8_t *current = (const uint8_t *)p_extra;
     const uint8_t *end = &currenti_extra;
@@ -158,18 +158,18 @@
     return VLC_SUCCESS;
 }
 
-static inline int xiph_PackHeaders(int *extra_size, void **extra,
-                                   unsigned packet_size,
+static inline int xiph_PackHeaders(size_t *extra_size, void **extra,
+                                   size_t packet_size,
                                    const void *const packet,
-                                   unsigned packet_count)
+                                   size_t packet_count)
 {
     if (packet_count <= 0 || packet_count > XIPH_MAX_HEADER_COUNT)
         return VLC_EGENERIC;
 
     /* Compute the size needed for the whole extra data */
-    unsigned payload_size = 0;
-    unsigned header_size = 1;
-    for (unsigned i = 0; i < packet_count; i++) {
+    size_t payload_size = 0;
+    size_t header_size = 1;
+    for (size_t i = 0; i < packet_count; i++) {
         payload_size += packet_sizei;
         if (i < packet_count - 1)
             header_size += 1 + packet_sizei / 255;
@@ -184,8 +184,8 @@
     /* Write the header */
     uint8_t *current = (uint8_t*)*extra;
     *current++ = packet_count - 1;
-    for (unsigned i = 0; i < packet_count - 1; i++) {
-        unsigned t = packet_sizei;
+    for (size_t i = 0; i < packet_count - 1; i++) {
+        size_t t = packet_sizei;
         for (;;) {
             if (t >= 255) {
                 *current++ = 255;
@@ -198,7 +198,7 @@
     }
 
     /* Copy the payloads */
-    for (unsigned i = 0; i < packet_count; i++) {
+    for (size_t i = 0; i < packet_count; i++) {
         if (packet_sizei > 0) {
             memcpy(current, packeti, packet_sizei);
             current += packet_sizei;
@@ -208,12 +208,12 @@
     return VLC_SUCCESS;
 }
 
-static inline int xiph_AppendHeaders(int *extra_size, void **extra,
-                                     unsigned size, const void *data)
+static inline int xiph_AppendHeaders(size_t *extra_size, void **extra,
+                                     size_t size, const void *data)
 {
-    unsigned packet_sizeXIPH_MAX_HEADER_COUNT;
+    size_t packet_sizeXIPH_MAX_HEADER_COUNT;
     const void *packetXIPH_MAX_HEADER_COUNT;
-    unsigned count;
+    size_t count;
 
     if (*extra_size > 0 && *extra) {
         if (xiph_SplitHeaders(packet_size, packet, &count, *extra_size, *extra))
@@ -236,7 +236,7 @@
 
     free(old);
 
-    if (*extra_size <= 0)
+    if (*extra_size == 0)
         return VLC_EGENERIC;
     return VLC_SUCCESS;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/xiph_metadata.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/xiph_metadata.c Changed

@@ -327,9 +327,7 @@
         const uint8_t *p_data, size_t i_data,
         int *i_attachments, input_attachment_t ***attachments,
         int *i_cover_score, int *i_cover_idx,
-        int *i_seekpoint, seekpoint_t ***ppp_seekpoint,
-        float (* ppf_replay_gain)AUDIO_REPLAY_GAIN_MAX,
-        float (* ppf_replay_peak)AUDIO_REPLAY_GAIN_MAX )
+        int *i_seekpoint, seekpoint_t ***ppp_seekpoint )
 {
     if( i_data < 8 )
         return;
@@ -465,27 +463,6 @@
                     *i_attachments, *attachments, p_attachment );
             }
         }
-        else if ( ppf_replay_gain && ppf_replay_peak && !strncmp(psz_comment, "REPLAYGAIN_", 11) )
-        {
-            char *p = strchr( psz_comment, '=' );
-            if (!p) goto next_comment;
-            if ( !strncasecmp(psz_comment, "REPLAYGAIN_TRACK_GAIN=", 22) )
-            {
-                (*ppf_replay_gain)AUDIO_REPLAY_GAIN_TRACK = vlc_atof_c( ++p );
-            }
-            else if ( !strncasecmp(psz_comment, "REPLAYGAIN_ALBUM_GAIN=", 22) )
-            {
-                (*ppf_replay_gain)AUDIO_REPLAY_GAIN_ALBUM = vlc_atof_c( ++p );
-            }
-            else if ( !strncasecmp(psz_comment, "REPLAYGAIN_ALBUM_PEAK=", 22) )
-            {
-                (*ppf_replay_peak)AUDIO_REPLAY_GAIN_ALBUM = vlc_atof_c( ++p );
-            }
-            else if ( !strncasecmp(psz_comment, "REPLAYGAIN_TRACK_PEAK=", 22) )
-            {
-                (*ppf_replay_peak)AUDIO_REPLAY_GAIN_TRACK = vlc_atof_c( ++p );
-            }
-        }
         else if( !strncasecmp(psz_comment, "CHAPTER", 7) )
         {
             unsigned int i_chapt;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/xiph_metadata.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/xiph_metadata.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/demux/xiph_test.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/demux/xiph_test.c Changed

@@ -44,12 +44,12 @@
 struct params_s
 {
     const void *packetsXIPH_MAX_HEADER_COUNT;
-    unsigned packets_sizesXIPH_MAX_HEADER_COUNT;
-    unsigned packets_count;
+    size_t packets_sizesXIPH_MAX_HEADER_COUNT;
+    size_t packets_count;
     bool lavc;
     vlc_fourcc_t codec;
     void *p_append;
-    int i_append;
+    size_t i_append;
 };
 
 #define BAILOUT(run) { fprintf(stderr, "failed %s line %d\n", run, __LINE__); \
@@ -87,8 +87,8 @@
 }
 
 static int SplitCompare(const char *run,
-                        unsigned packet_size,
-                        const void *packet, unsigned packet_count,
+                        size_t packet_size,
+                        const void *packet, size_t packet_count,
                         const struct params_s *source)
 {
     EXPECT(source->packets_count == packet_count);
@@ -105,8 +105,8 @@
                  const struct params_s *source)
 {
     const void *packetsXIPH_MAX_HEADER_COUNT;
-    unsigned packet_sizesXIPH_MAX_HEADER_COUNT;
-    unsigned packet_count;
+    size_t packet_sizesXIPH_MAX_HEADER_COUNT;
+    size_t packet_count;
     int ret = xiph_SplitHeaders(packet_sizes, packets, &packet_count,
                                 i_extra, p_extra);
     if(ret == VLC_SUCCESS)
@@ -119,8 +119,8 @@
                  const struct params_s *source)
 {
     const void *packetsXIPH_MAX_HEADER_COUNT;
-    unsigned packet_sizesXIPH_MAX_HEADER_COUNT;
-    unsigned packet_count;
+    size_t packet_sizesXIPH_MAX_HEADER_COUNT;
+    size_t packet_count;
     int ret = xiph_SplitLavcHeaders(packet_sizes, packets, &packet_count,
                                     i_extra, p_extra);
     if(ret == VLC_SUCCESS)
@@ -130,13 +130,13 @@
 
 static int test_xiph_PackHeaders(const char *run,
                  const uint8_t *p_extra, size_t i_extra,
-                 const struct params_s *source)
+                 struct params_s *source)
 {
     void *p_result;
-    int i_result;
+    size_t i_result;
 
     int ret = xiph_PackHeaders(&i_result, &p_result,
-                               (unsigned *) source->packets_sizes,
+                               source->packets_sizes,
                                source->packets, source->packets_count);
     if(ret == VLC_SUCCESS)
     {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/Makefile.am Changed

@@ -101,10 +101,14 @@
 	gui/macosx/library/VLCInputNodePathControlItem.m \
 	gui/macosx/library/VLCLibraryAbstractGroupingDataSource.h \
 	gui/macosx/library/VLCLibraryAbstractGroupingDataSource.m \
+	gui/macosx/library/VLCLibraryAbstractMediaLibrarySegmentViewController.h \
+	gui/macosx/library/VLCLibraryAbstractMediaLibrarySegmentViewController.m \
 	gui/macosx/library/VLCLibraryAbstractSegmentViewController.h \
 	gui/macosx/library/VLCLibraryAbstractSegmentViewController.m \
 	gui/macosx/library/VLCLibraryCarouselViewItemView.h \
 	gui/macosx/library/VLCLibraryCarouselViewItemView.m \
+	gui/macosx/library/VLCLibraryCollectionView.h \
+	gui/macosx/library/VLCLibraryCollectionView.m \
 	gui/macosx/library/VLCLibraryCollectionViewDataSource.h \
 	gui/macosx/library/VLCLibraryCollectionViewDelegate.h \
 	gui/macosx/library/VLCLibraryCollectionViewDelegate.m \
@@ -131,6 +135,7 @@
 	gui/macosx/library/VLCLibraryImageCache.m \
 	gui/macosx/library/VLCLibraryItemInternalMediaItemsDataSource.h \
 	gui/macosx/library/VLCLibraryItemInternalMediaItemsDataSource.m \
+	gui/macosx/library/VLCLibraryItemPresentingCapable.h \
 	gui/macosx/library/VLCLibraryMasterDetailViewTableViewDataSource.h \
 	gui/macosx/library/VLCLibraryMasterDetailViewTableViewDelegate.h \
 	gui/macosx/library/VLCLibraryMasterDetailViewTableViewDelegate.m \
@@ -140,10 +145,6 @@
 	gui/macosx/library/VLCLibraryModel.m \
 	gui/macosx/library/VLCLibraryModelChangeDelegate.h \
 	gui/macosx/library/VLCLibraryModelChangeDelegate.m \
-	gui/macosx/library/VLCLibraryNavigationStack.h \
-	gui/macosx/library/VLCLibraryNavigationStack.m \
-	gui/macosx/library/VLCLibraryNavigationState.h \
-	gui/macosx/library/VLCLibraryNavigationState.m \
 	gui/macosx/library/VLCLibraryRepresentedItem.h \
 	gui/macosx/library/VLCLibraryRepresentedItem.m \
 	gui/macosx/library/VLCLibrarySegment.h \
@@ -178,8 +179,8 @@
 	gui/macosx/library/VLCLibraryWindowNavigationSidebarViewController.m \
 	gui/macosx/library/VLCLibraryWindowPersistentPreferences.h \
 	gui/macosx/library/VLCLibraryWindowPersistentPreferences.m \
-	gui/macosx/library/VLCLibraryWindowPlaylistSidebarViewController.h \
-	gui/macosx/library/VLCLibraryWindowPlaylistSidebarViewController.m \
+	gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.h \
+	gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.m \
 	gui/macosx/library/VLCLibraryWindowSidebarChildViewController.h \
 	gui/macosx/library/VLCLibraryWindowSidebarRootViewController.h \
 	gui/macosx/library/VLCLibraryWindowSidebarRootViewController.m \
@@ -189,10 +190,16 @@
 	gui/macosx/library/VLCLibraryWindowTitlesSidebarViewController.m \
 	gui/macosx/library/VLCLibraryWindowToolbarDelegate.h \
 	gui/macosx/library/VLCLibraryWindowToolbarDelegate.m \
+	gui/macosx/library/VLCMediaLibraryFolderObserver.h \
+	gui/macosx/library/VLCMediaLibraryFolderObserver.m \
 	gui/macosx/library/groups-library/VLCLibraryGroupsDataSource.h \
 	gui/macosx/library/groups-library/VLCLibraryGroupsDataSource.m \
 	gui/macosx/library/groups-library/VLCLibraryGroupsViewController.h \
 	gui/macosx/library/groups-library/VLCLibraryGroupsViewController.m \
+	gui/macosx/library/home-library/VLCLibraryHomeViewActionButtonCell.h \
+	gui/macosx/library/home-library/VLCLibraryHomeViewActionButtonCell.m \
+	gui/macosx/library/home-library/VLCLibraryHomeViewActionsView.h \
+	gui/macosx/library/home-library/VLCLibraryHomeViewActionsView.m \
 	gui/macosx/library/home-library/VLCLibraryHomeViewAudioCarouselContainerView.h \
 	gui/macosx/library/home-library/VLCLibraryHomeViewAudioCarouselContainerView.m \
 	gui/macosx/library/home-library/VLCLibraryHomeViewBaseCarouselContainerView.h \
@@ -253,6 +260,10 @@
 	gui/macosx/library/media-source/VLCMediaSourceDataSource.m \
 	gui/macosx/library/media-source/VLCMediaSourceDeviceCollectionViewItem.h \
 	gui/macosx/library/media-source/VLCMediaSourceDeviceCollectionViewItem.m \
+	gui/macosx/library/media-source/VLCLibraryMediaSourceViewNavigationStack.h \
+	gui/macosx/library/media-source/VLCLibraryMediaSourceViewNavigationStack.m \
+	gui/macosx/library/media-source/VLCLibraryMediaSourceViewNavigationState.h \
+	gui/macosx/library/media-source/VLCLibraryMediaSourceViewNavigationState.m \
 	gui/macosx/library/media-source/VLCMediaSourceProvider.h \
 	gui/macosx/library/media-source/VLCMediaSourceProvider.m \
 	gui/macosx/library/playlist-library/VLCLibraryPlaylistDataSource.h \
@@ -320,30 +331,30 @@
 	gui/macosx/panels/dialogs/VLCResumeDialogController.m \
 	gui/macosx/panels/dialogs/VLCTextfieldPanelController.h \
 	gui/macosx/panels/dialogs/VLCTextfieldPanelController.m \
-	gui/macosx/playlist/VLCPlaybackContinuityController.h \
-	gui/macosx/playlist/VLCPlaybackContinuityController.m \
-	gui/macosx/playlist/VLCPlayerChapter.h \
-	gui/macosx/playlist/VLCPlayerChapter.m \
-	gui/macosx/playlist/VLCPlayerController.h \
-	gui/macosx/playlist/VLCPlayerController.m \
-	gui/macosx/playlist/VLCPlayerTitle.h \
-	gui/macosx/playlist/VLCPlayerTitle.m \
-	gui/macosx/playlist/VLCPlaylistController.h \
-	gui/macosx/playlist/VLCPlaylistController.m \
-	gui/macosx/playlist/VLCPlaylistDataSource.h \
-	gui/macosx/playlist/VLCPlaylistDataSource.m \
-	gui/macosx/playlist/VLCPlaylistItem.h \
-	gui/macosx/playlist/VLCPlaylistItem.m \
-	gui/macosx/playlist/VLCPlaylistMenuController.h \
-	gui/macosx/playlist/VLCPlaylistMenuController.m \
-	gui/macosx/playlist/VLCPlaylistModel.h \
-	gui/macosx/playlist/VLCPlaylistModel.m \
-	gui/macosx/playlist/VLCPlaylistSortingMenuController.h \
-	gui/macosx/playlist/VLCPlaylistSortingMenuController.m \
-	gui/macosx/playlist/VLCPlaylistTableCellView.h \
-	gui/macosx/playlist/VLCPlaylistTableCellView.m \
-	gui/macosx/playlist/VLCPlaylistTableView.h \
-	gui/macosx/playlist/VLCPlaylistTableView.m \
+	gui/macosx/playqueue/VLCPlaybackContinuityController.h \
+	gui/macosx/playqueue/VLCPlaybackContinuityController.m \
+	gui/macosx/playqueue/VLCPlayerChapter.h \
+	gui/macosx/playqueue/VLCPlayerChapter.m \
+	gui/macosx/playqueue/VLCPlayerController.h \
+	gui/macosx/playqueue/VLCPlayerController.m \
+	gui/macosx/playqueue/VLCPlayerTitle.h \
+	gui/macosx/playqueue/VLCPlayerTitle.m \
+	gui/macosx/playqueue/VLCPlayQueueController.h \
+	gui/macosx/playqueue/VLCPlayQueueController.m \
+	gui/macosx/playqueue/VLCPlayQueueDataSource.h \
+	gui/macosx/playqueue/VLCPlayQueueDataSource.m \
+	gui/macosx/playqueue/VLCPlayQueueItem.h \
+	gui/macosx/playqueue/VLCPlayQueueItem.m \
+	gui/macosx/playqueue/VLCPlayQueueMenuController.h \
+	gui/macosx/playqueue/VLCPlayQueueMenuController.m \
+	gui/macosx/playqueue/VLCPlayQueueModel.h \
+	gui/macosx/playqueue/VLCPlayQueueModel.m \
+	gui/macosx/playqueue/VLCPlayQueueSortingMenuController.h \
+	gui/macosx/playqueue/VLCPlayQueueSortingMenuController.m \
+	gui/macosx/playqueue/VLCPlayQueueTableCellView.h \
+	gui/macosx/playqueue/VLCPlayQueueTableCellView.m \
+	gui/macosx/playqueue/VLCPlayQueueTableView.h \
+	gui/macosx/playqueue/VLCPlayQueueTableView.m \
 	gui/macosx/preferences/VLCHotkeyChangeWindow.h \
 	gui/macosx/preferences/VLCHotkeyChangeWindow.m \
 	gui/macosx/preferences/VLCSimplePrefsController.h \
@@ -368,12 +379,8 @@
 	gui/macosx/views/VLCDefaultValueSliderCell.m \
 	gui/macosx/views/VLCDragDropView.h \
 	gui/macosx/views/VLCDragDropView.m \
-	gui/macosx/views/VLCHUDOutlineView.h \
-	gui/macosx/views/VLCHUDOutlineView.m \
-	gui/macosx/views/VLCHUDTableCornerView.h \
-	gui/macosx/views/VLCHUDTableCornerView.m \
-	gui/macosx/views/VLCHUDTableView.h \
-	gui/macosx/views/VLCHUDTableView.m \
+	gui/macosx/views/VLCFileDragRecognisingView.h \
+	gui/macosx/views/VLCFileDragRecognisingView.m \
 	gui/macosx/views/VLCImageButton.h \
 	gui/macosx/views/VLCImageButton.m \
 	gui/macosx/views/VLCImageView.h \
@@ -394,6 +401,8 @@
 	gui/macosx/views/VLCScrollingClipView.m \
 	gui/macosx/views/VLCSettingTextField.h \
 	gui/macosx/views/VLCSettingTextField.m \
+	gui/macosx/views/VLCStatusNotifierView.h \
+	gui/macosx/views/VLCStatusNotifierView.m \
 	gui/macosx/views/VLCSubScrollView.h \
 	gui/macosx/views/VLCSubScrollView.m \
 	gui/macosx/views/VLCTimeField.h \
@@ -406,8 +415,6 @@
 	gui/macosx/views/VLCVolumeSlider.m \
 	gui/macosx/views/VLCVolumeSliderCell.h \
 	gui/macosx/views/VLCVolumeSliderCell.m \
-	gui/macosx/views/VLCWrappableTextField.h \
-	gui/macosx/views/VLCWrappableTextField.m \
 	gui/macosx/windows/VLCAboutWindowController.h \
 	gui/macosx/windows/VLCAboutWindowController.m \
 	gui/macosx/windows/VLCDetachedAudioWindow.h \
@@ -484,16 +491,17 @@
 	gui/macosx/UI/VLCLibraryWindow.xib \
 	gui/macosx/UI/VLCLibraryWindowChaptersView.xib \
 	gui/macosx/UI/VLCLibraryWindowNavigationSidebarView.xib \
-	gui/macosx/UI/VLCLibraryWindowPlaylistView.xib \
+	gui/macosx/UI/VLCLibraryWindowPlayQueueView.xib \
 	gui/macosx/UI/VLCLibraryWindowSidebarRootView.xib \
 	gui/macosx/UI/VLCLibraryWindowTitlesView.xib \
 	gui/macosx/UI/VLCLibraryTableCellView.xib \
-	gui/macosx/UI/VLCPlaylistTableCellView.xib \
+	gui/macosx/UI/VLCPlayQueueTableCellView.xib \
 	gui/macosx/UI/VLCLibraryCarouselViewItemView.xib \
 	gui/macosx/UI/VLCLibraryCollectionViewItem.xib \
 	gui/macosx/UI/VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.xib \
 	gui/macosx/UI/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.xib \
 	gui/macosx/UI/VLCLibraryHeroView.xib \
+	gui/macosx/UI/VLCLibraryHomeViewActionsView.xib \
 	gui/macosx/UI/VLCLibrarySongTableCellView.xib \
 	gui/macosx/UI/VLCMainVideoView.xib \
 	gui/macosx/UI/VLCMainVideoViewAudioMediaDecorativeView.xib \

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/Resources/vlc.scriptTerminology -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/Resources/vlc.scriptTerminology Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/AudioEffects.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/AudioEffects.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -103,13 +103,13 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" utility="YES" HUD="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="254" width="473" height="281"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="3440" height="1440"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="475" height="281"/>
+                <rect key="frame" x="0.0" y="0.0" width="473" height="281"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jb1-f1-iF3">
-                        <rect key="frame" x="40" y="254" width="395" height="24"/>
+                        <rect key="frame" x="40" y="254" width="393" height="24"/>
                         <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="ZdJ-0F-LWH">
                             <font key="font" metaFont="system"/>
                             <segments>
@@ -125,22 +125,22 @@
                         </connections>
                     </segmentedControl>
                     <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="EuA-vb-mSS">
-                        <rect key="frame" x="0.0" y="246" width="475" height="5"/>
+                        <rect key="frame" x="0.0" y="245" width="473" height="5"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="1" id="3Ct-NZ-Azh"/>
                         </constraints>
                     </box>
                     <tabView drawsBackground="NO" type="noTabsNoBorder" initialItem="81" translatesAutoresizingMaskIntoConstraints="NO" id="80">
-                        <rect key="frame" x="0.0" y="35" width="475" height="211"/>
+                        <rect key="frame" x="0.0" y="33" width="473" height="212"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="Graphic Equalizer" identifier="equalizer" id="81">
                                 <view key="view" id="84">
-                                    <rect key="frame" x="0.0" y="0.0" width="475" height="211"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="473" height="212"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <button horizontalHuggingPriority="750" verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="192">
-                                            <rect key="frame" x="14" y="193" width="58" height="18"/>
+                                        <button mirrorLayoutDirectionWhenInternationalizing="always" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="192">
+                                            <rect key="frame" x="16" y="194" width="57" height="16"/>
                                             <buttonCell key="cell" type="check" title="Enable" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="193">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="message" size="11"/>
@@ -150,7 +150,7 @@
                                             </connections>
                                         </button>
                                         <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="194">
-                                            <rect key="frame" x="92" y="193" width="57" height="18"/>
+                                            <rect key="frame" x="97" y="194" width="56" height="16"/>
                                             <buttonCell key="cell" type="check" title="2 Pass" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="195">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="message" size="11"/>
@@ -160,7 +160,7 @@
                                             </connections>
                                         </button>
                                         <popUpButton horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="168">
-                                            <rect key="frame" x="156" y="190" width="312" height="22"/>
+                                            <rect key="frame" x="161" y="190" width="306" height="22"/>
                                             <popUpButtonCell key="cell" type="push" title="headphones" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="181" id="169">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="message" size="11"/>
@@ -228,121 +228,121 @@
                                             </connections>
                                         </popUpButton>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="721">
-                                            <rect key="frame" x="46" y="0.0" width="384" height="181"/>
+                                            <rect key="frame" x="56" y="0.0" width="362" height="180"/>
                                             <subviews>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="196">
-                                                    <rect key="frame" x="14" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="12" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="197"/>
                                                     <connections>
                                                         <action selector="equalizerPreAmpSliderUpdated:" target="-2" id="7Xa-Z8-5gG"/>
                                                     </connections>
                                                 </slider>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="60" translatesAutoresizingMaskIntoConstraints="NO" id="90">
-                                                    <rect key="frame" x="38" y="170" width="36" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="60" translatesAutoresizingMaskIntoConstraints="NO" id="90">
+                                                    <rect key="frame" x="36" y="169" width="36" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="right" title="+20 dB" id="158">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="60" translatesAutoresizingMaskIntoConstraints="NO" id="91">
-                                                    <rect key="frame" x="38" y="101" width="25" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="60" translatesAutoresizingMaskIntoConstraints="NO" id="91">
+                                                    <rect key="frame" x="36" y="101" width="25" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" continuous="YES" sendsActionOnEndEditing="YES" alignment="right" title="0 dB" id="157">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="60" translatesAutoresizingMaskIntoConstraints="NO" id="92">
-                                                    <rect key="frame" x="38" y="32" width="35" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="60" translatesAutoresizingMaskIntoConstraints="NO" id="92">
+                                                    <rect key="frame" x="36" y="32" width="35" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="right" title="-20 dB" id="156">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="93" customClass="VLCWrappableTextField">
-                                                    <rect key="frame" x="12" y="14" width="65" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="93">
+                                                    <rect key="frame" x="12" y="14" width="62" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Preamp" id="155">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="95">
-                                                    <rect key="frame" x="90" y="14" width="20" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="95">
+                                                    <rect key="frame" x="87" y="14" width="20" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="60" id="153">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="96">
-                                                    <rect key="frame" x="117" y="14" width="24" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="96">
+                                                    <rect key="frame" x="112" y="14" width="24" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="170" id="152">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="100">
-                                                    <rect key="frame" x="174" y="14" width="26" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="100">
+                                                    <rect key="frame" x="165" y="14" width="26" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="600" id="148">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="101">
-                                                    <rect key="frame" x="146" y="14" width="25" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="101">
+                                                    <rect key="frame" x="146" y="13" width="25" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="310" id="147">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="102">
-                                                    <rect key="frame" x="207" y="14" width="19" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="102">
+                                                    <rect key="frame" x="207" y="13" width="19" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="1K" id="146">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="104">
-                                                    <rect key="frame" x="291" y="14" width="25" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="104">
+                                                    <rect key="frame" x="291" y="13" width="25" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="12K" id="144">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="107">
-                                                    <rect key="frame" x="235" y="14" width="20" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="107">
+                                                    <rect key="frame" x="222" y="14" width="20" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="3K" id="141">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="109">
-                                                    <rect key="frame" x="264" y="14" width="20" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="109">
+                                                    <rect key="frame" x="249" y="14" width="20" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="6K" id="139">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="110">
-                                                    <rect key="frame" x="320" y="14" width="25" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="110">
+                                                    <rect key="frame" x="320" y="13" width="25" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="14K" id="138">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="111">
-                                                    <rect key="frame" x="349" y="14" width="25" height="11"/>
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" preferredMaxLayoutWidth="30" translatesAutoresizingMaskIntoConstraints="NO" id="111">
+                                                    <rect key="frame" x="349" y="13" width="25" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="16K" id="137">
                                                         <font key="font" metaFont="miniSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -350,70 +350,70 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="198">
-                                                    <rect key="frame" x="91" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="87" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="199"/>
                                                     <connections>
                                                         <action selector="equalizerBandSliderUpdated:" target="-2" id="Pq9-mK-6gi"/>
                                                     </connections>
                                                 </slider>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="200">
-                                                    <rect key="frame" x="120" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="114" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="201"/>
                                                     <connections>
                                                         <action selector="equalizerBandSliderUpdated:" target="-2" id="V5y-cd-ebf"/>
                                                     </connections>
                                                 </slider>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="202">
-                                                    <rect key="frame" x="149" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="141" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="203"/>
                                                     <connections>
                                                         <action selector="equalizerBandSliderUpdated:" target="-2" id="KN9-Ll-nEK"/>
                                                     </connections>
                                                 </slider>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="204">
-                                                    <rect key="frame" x="178" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="168" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="205"/>
                                                     <connections>
                                                         <action selector="equalizerBandSliderUpdated:" target="-2" id="35G-ln-i5e"/>
                                                     </connections>
                                                 </slider>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="206">
-                                                    <rect key="frame" x="207" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="195" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="207"/>
                                                     <connections>
                                                         <action selector="equalizerBandSliderUpdated:" target="-2" id="LEn-my-NvY"/>
                                                     </connections>
                                                 </slider>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="208">
-                                                    <rect key="frame" x="236" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="222" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="209"/>
                                                     <connections>
                                                         <action selector="equalizerBandSliderUpdated:" target="-2" id="h2x-ra-iQ3"/>
                                                     </connections>
                                                 </slider>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="210">
-                                                    <rect key="frame" x="265" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="249" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="211"/>
                                                     <connections>
                                                         <action selector="equalizerBandSliderUpdated:" target="-2" id="m57-Q8-ZCE"/>
                                                     </connections>
                                                 </slider>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="212">
-                                                    <rect key="frame" x="294" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="276" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="213"/>
                                                     <connections>
                                                         <action selector="equalizerBandSliderUpdated:" target="-2" id="wbc-hi-c1U"/>
                                                     </connections>
                                                 </slider>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="214">
-                                                    <rect key="frame" x="323" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="303" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="215"/>
                                                     <connections>
                                                         <action selector="equalizerBandSliderUpdated:" target="-2" id="LPs-jK-YbG"/>
                                                     </connections>
                                                 </slider>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="216">
-                                                    <rect key="frame" x="352" y="31" width="18" height="150"/>
+                                                    <rect key="frame" x="330" y="30" width="20" height="152"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-20" maxValue="20" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="217"/>
                                                     <connections>
                                                         <action selector="equalizerBandSliderUpdated:" target="-2" id="ATa-AV-o2U"/>
@@ -507,11 +507,11 @@
                             </tabViewItem>
                             <tabViewItem label="Compressor" identifier="compressor" id="82">
                                 <view key="view" id="83">
-                                    <rect key="frame" x="0.0" y="0.0" width="475" height="211"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="473" height="212"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="218">
-                                            <rect key="frame" x="14" y="190" width="203" height="18"/>
+                                            <rect key="frame" x="16" y="191" width="202" height="16"/>
                                             <buttonCell key="cell" type="check" title="Enable dynamic range compressor" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="219">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="message" size="11"/>
@@ -521,7 +521,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="621">
-                                            <rect key="frame" x="426" y="191" width="39" height="15"/>
+                                            <rect key="frame" x="424" y="191" width="39" height="15"/>
                                             <buttonCell key="cell" type="roundRect" title="Reset" bezelStyle="roundedRect" image="buttonCell:622:image" imagePosition="overlaps" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="622">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="miniSystem"/>
@@ -531,9 +531,9 @@
                                             </connections>
                                         </button>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="723">
-                                            <rect key="frame" x="37" y="0.0" width="402" height="178"/>
+                                            <rect key="frame" x="36" y="0.0" width="402" height="177"/>
                                             <subviews>
-                                                <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="220">
+                                                <textField focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="220">
                                                     <rect key="frame" x="8" y="30" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="0.0" usesSingleLineMode="YES" id="223">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -541,7 +541,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="248" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="248">
                                                     <rect key="frame" x="8" y="4" width="50" height="22"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="RMS/peak" id="261">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -550,7 +550,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider horizontalHuggingPriority="240" translatesAutoresizingMaskIntoConstraints="NO" id="221">
-                                                    <rect key="frame" x="10" y="44" width="46" height="134"/>
+                                                    <rect key="frame" x="8" y="43" width="50" height="136"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="46" id="JbG-c4-qiJ"/>
                                                     </constraints>
@@ -559,7 +559,7 @@
                                                         <action selector="compressorSliderUpdated:" target="-2" id="scd-cx-Z2t"/>
                                                     </connections>
                                                 </slider>
-                                                <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="224">
+                                                <textField focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="224">
                                                     <rect key="frame" x="64" y="30" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="24.9 ms" usesSingleLineMode="YES" id="227">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -567,7 +567,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="249" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="249">
                                                     <rect key="frame" x="64" y="4" width="50" height="22"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Attack" id="260">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -576,13 +576,13 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider horizontalHuggingPriority="240" translatesAutoresizingMaskIntoConstraints="NO" id="225">
-                                                    <rect key="frame" x="66" y="44" width="46" height="134"/>
+                                                    <rect key="frame" x="64" y="43" width="50" height="136"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="1.5" maxValue="400" doubleValue="25" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="226"/>
                                                     <connections>
                                                         <action selector="compressorSliderUpdated:" target="-2" id="TSd-Vu-uAC"/>
                                                     </connections>
                                                 </slider>
-                                                <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="228">
+                                                <textField focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="228">
                                                     <rect key="frame" x="120" y="30" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="800.0 ms" usesSingleLineMode="YES" id="231">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -590,7 +590,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="250" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="250">
                                                     <rect key="frame" x="120" y="4" width="50" height="22"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Release" id="259">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -599,13 +599,13 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider horizontalHuggingPriority="240" translatesAutoresizingMaskIntoConstraints="NO" id="229">
-                                                    <rect key="frame" x="122" y="44" width="46" height="134"/>
+                                                    <rect key="frame" x="120" y="43" width="50" height="136"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" minValue="2" maxValue="800" doubleValue="245.06977982954544" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="230"/>
                                                     <connections>
                                                         <action selector="compressorSliderUpdated:" target="-2" id="tJL-Vg-pRk"/>
                                                     </connections>
                                                 </slider>
-                                                <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="232">
+                                                <textField focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="232">
                                                     <rect key="frame" x="176" y="30" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="-11.0 dB" usesSingleLineMode="YES" id="235">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -613,7 +613,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="251" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="251">
                                                     <rect key="frame" x="176" y="4" width="50" height="22"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Threshold" id="258">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -622,13 +622,13 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider horizontalHuggingPriority="240" translatesAutoresizingMaskIntoConstraints="NO" id="233">
-                                                    <rect key="frame" x="178" y="44" width="46" height="134"/>
+                                                    <rect key="frame" x="176" y="43" width="50" height="136"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-30" doubleValue="-11" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="234"/>
                                                     <connections>
                                                         <action selector="compressorSliderUpdated:" target="-2" id="Otq-ED-0CI"/>
                                                     </connections>
                                                 </slider>
-                                                <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="236">
+                                                <textField focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="236">
                                                     <rect key="frame" x="232" y="30" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="8.0:1" usesSingleLineMode="YES" id="239">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -636,7 +636,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="252" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="252">
                                                     <rect key="frame" x="232" y="4" width="50" height="22"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Ratio" id="257">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -645,13 +645,13 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider horizontalHuggingPriority="240" translatesAutoresizingMaskIntoConstraints="NO" id="237">
-                                                    <rect key="frame" x="234" y="44" width="46" height="134"/>
+                                                    <rect key="frame" x="232" y="43" width="50" height="136"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="1" maxValue="20" doubleValue="8" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="238"/>
                                                     <connections>
                                                         <action selector="compressorSliderUpdated:" target="-2" id="Vee-cn-Xep"/>
                                                     </connections>
                                                 </slider>
-                                                <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="240">
+                                                <textField focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="240">
                                                     <rect key="frame" x="288" y="30" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="2.5 dB" usesSingleLineMode="YES" id="243">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -659,7 +659,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="253" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="253">
                                                     <rect key="frame" x="288" y="4" width="50" height="22"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Knee radius" id="256">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -668,13 +668,13 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider horizontalHuggingPriority="240" translatesAutoresizingMaskIntoConstraints="NO" id="241">
-                                                    <rect key="frame" x="290" y="44" width="46" height="134"/>
+                                                    <rect key="frame" x="288" y="43" width="50" height="136"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="1" maxValue="10" doubleValue="2.5" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="242"/>
                                                     <connections>
                                                         <action selector="compressorSliderUpdated:" target="-2" id="gaI-my-uOm"/>
                                                     </connections>
                                                 </slider>
-                                                <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="244">
+                                                <textField focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="244">
                                                     <rect key="frame" x="344" y="30" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="7.0 dB" usesSingleLineMode="YES" id="247">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -683,13 +683,13 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="245">
-                                                    <rect key="frame" x="346" y="44" width="46" height="134"/>
+                                                    <rect key="frame" x="344" y="43" width="50" height="136"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="24" doubleValue="7" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="246"/>
                                                     <connections>
                                                         <action selector="compressorSliderUpdated:" target="-2" id="iSY-Me-sMB"/>
                                                     </connections>
                                                 </slider>
-                                                <textField verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="254" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="749" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="254">
                                                     <rect key="frame" x="344" y="4" width="50" height="22"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Makeup gain" id="255">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -794,11 +794,11 @@
                             </tabViewItem>
                             <tabViewItem label="Spatializer" identifier="spatializer" id="85">
                                 <view key="view" id="86">
-                                    <rect key="frame" x="0.0" y="0.0" width="475" height="211"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="473" height="212"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="262">
-                                            <rect key="frame" x="7" y="190" width="116" height="18"/>
+                                            <rect key="frame" x="9" y="191" width="115" height="16"/>
                                             <buttonCell key="cell" type="check" title="Enable Spatializer" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="305">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="message" size="11"/>
@@ -808,7 +808,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="618">
-                                            <rect key="frame" x="426" y="191" width="39" height="15"/>
+                                            <rect key="frame" x="424" y="191" width="39" height="15"/>
                                             <buttonCell key="cell" type="roundRect" title="Reset" bezelStyle="roundedRect" image="buttonCell:619:image" imagePosition="overlaps" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="619">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="miniSystem"/>
@@ -818,9 +818,9 @@
                                             </connections>
                                         </button>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="725">
-                                            <rect key="frame" x="93" y="0.0" width="290" height="178"/>
+                                            <rect key="frame" x="92" y="0.0" width="290" height="177"/>
                                             <subviews>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="265">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="265">
                                                     <rect key="frame" x="8" y="33" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="2.0" usesSingleLineMode="YES" id="302">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -829,7 +829,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider translatesAutoresizingMaskIntoConstraints="NO" id="266">
-                                                    <rect key="frame" x="10" y="47" width="46" height="131"/>
+                                                    <rect key="frame" x="8" y="46" width="50" height="133"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="46" id="WiR-no-cPu"/>
                                                     </constraints>
@@ -838,7 +838,7 @@
                                                         <action selector="spatializerSliderUpdated:" target="-2" id="TzD-ul-6Gx"/>
                                                     </connections>
                                                 </slider>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="267">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="267">
                                                     <rect key="frame" x="64" y="33" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="2.0" usesSingleLineMode="YES" id="300">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -847,13 +847,13 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider translatesAutoresizingMaskIntoConstraints="NO" id="268">
-                                                    <rect key="frame" x="66" y="47" width="46" height="131"/>
+                                                    <rect key="frame" x="64" y="46" width="50" height="133"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="10" doubleValue="2" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="299"/>
                                                     <connections>
                                                         <action selector="spatializerSliderUpdated:" target="-2" id="smf-XD-GHV"/>
                                                     </connections>
                                                 </slider>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="269">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="269">
                                                     <rect key="frame" x="120" y="33" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="0.0" usesSingleLineMode="YES" id="298">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -862,13 +862,13 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider translatesAutoresizingMaskIntoConstraints="NO" id="270">
-                                                    <rect key="frame" x="122" y="47" width="46" height="131"/>
+                                                    <rect key="frame" x="120" y="46" width="50" height="133"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="10" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="297"/>
                                                     <connections>
                                                         <action selector="spatializerSliderUpdated:" target="-2" id="bnX-CW-h45"/>
                                                     </connections>
                                                 </slider>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="271">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="271">
                                                     <rect key="frame" x="176" y="33" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="0.0" usesSingleLineMode="YES" id="296">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -877,13 +877,13 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider translatesAutoresizingMaskIntoConstraints="NO" id="272">
-                                                    <rect key="frame" x="178" y="47" width="46" height="131"/>
+                                                    <rect key="frame" x="176" y="46" width="50" height="133"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="10" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="295"/>
                                                     <connections>
                                                         <action selector="spatializerSliderUpdated:" target="-2" id="wM1-xe-t5e"/>
                                                     </connections>
                                                 </slider>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="273">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="273">
                                                     <rect key="frame" x="232" y="33" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="0.0" usesSingleLineMode="YES" id="294">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -892,13 +892,13 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider translatesAutoresizingMaskIntoConstraints="NO" id="274">
-                                                    <rect key="frame" x="234" y="47" width="46" height="131"/>
+                                                    <rect key="frame" x="232" y="46" width="50" height="133"/>
                                                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="10" tickMarkPosition="right" numberOfTickMarks="9" sliderType="linear" id="293"/>
                                                     <connections>
                                                         <action selector="spatializerSliderUpdated:" target="-2" id="CoP-xd-gur"/>
                                                     </connections>
                                                 </slider>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="277" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="277">
                                                     <rect key="frame" x="8" y="13" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Size" id="290">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -906,7 +906,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="278" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="278">
                                                     <rect key="frame" x="64" y="13" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Width" id="289">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -914,7 +914,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="279" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="279">
                                                     <rect key="frame" x="120" y="13" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Wet" id="288">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -922,7 +922,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="280" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="280">
                                                     <rect key="frame" x="176" y="13" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Dry" id="287">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -930,7 +930,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="281" customClass="VLCWrappableTextField">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="281">
                                                     <rect key="frame" x="232" y="13" width="50" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Dump" id="286">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -1039,11 +1039,11 @@
                                         <box borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="727">
                                             <rect key="frame" x="16" y="143" width="442" height="40"/>
                                             <view key="contentView" id="eB4-KX-Qdy">
-                                                <rect key="frame" x="3" y="3" width="436" height="34"/>
+                                                <rect key="frame" x="4" y="5" width="434" height="32"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="341">
-                                                        <rect key="frame" x="15" y="10" width="82" height="14"/>
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="341">
+                                                        <rect key="frame" x="15" y="8" width="82" height="14"/>
                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Maximum level" usesSingleLineMode="YES" id="348">
                                                             <font key="font" metaFont="message" size="11"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1051,7 +1051,7 @@
                                                         </textFieldCell>
                                                     </textField>
                                                     <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="342">
-                                                        <rect key="frame" x="110" y="10" width="308" height="15"/>
+                                                        <rect key="frame" x="110" y="8" width="308" height="15"/>
                                                         <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" minValue="0.10000000000000001" maxValue="10" doubleValue="5" tickMarkPosition="above" sliderType="linear" id="347"/>
                                                         <connections>
                                                             <action selector="filterVolumeNormSliderUpdated:" target="-2" id="YLf-gK-UkJ"/>
@@ -1178,7 +1178,7 @@
                                                         <action selector="advancedPitchSliderUpdated:" target="-2" id="Zz3-Jj-zs3"/>
                                                     </connections>
                                                 </slider>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="8cX-Go-0bh">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="8cX-Go-0bh">
                                                     <rect key="frame" x="8" y="34" width="70" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="0.0 semitones" usesSingleLineMode="YES" id="Ycq-EF-cb9">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -1186,7 +1186,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="Fbj-Sr-i4z" userLabel="StreoPannerScale">
+                                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="755" translatesAutoresizingMaskIntoConstraints="NO" id="Fbj-Sr-i4z" userLabel="StreoPannerScale">
                                                     <rect key="frame" x="122" y="34" width="22" height="11"/>
                                                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="0.0" usesSingleLineMode="YES" id="Inp-23-uMg">
                                                         <font key="font" metaFont="miniSystem"/>
@@ -1235,10 +1235,7 @@
                         </tabViewItems>
                     </tabView>
                     <popUpButton verticalHuggingPriority="750" horizontalCompressionResistancePriority="400" translatesAutoresizingMaskIntoConstraints="NO" id="701">
-                        <rect key="frame" x="17" y="6" width="175" height="22"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="169" id="XQy-DD-QvZ"/>
-                        </constraints>
+                        <rect key="frame" x="16" y="5" width="177" height="22"/>
                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" id="702">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="message" size="11"/>
@@ -1250,11 +1247,14 @@
                                 </items>
                             </menu>
                         </popUpButtonCell>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="169" id="XQy-DD-QvZ"/>
+                        </constraints>
                         <connections>
                             <action selector="profileSelectorAction:" target="-2" id="uTq-Bz-2S2"/>
                         </connections>
                     </popUpButton>
-                    <button horizontalHuggingPriority="200" misplaced="YES" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="Dqv-cc-ZvK">
+                    <button mirrorLayoutDirectionWhenInternationalizing="always" horizontalHuggingPriority="200" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Dqv-cc-ZvK">
                         <rect key="frame" x="197" y="8" width="258" height="18"/>
                         <buttonCell key="cell" type="check" title="Apply profile at launch" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="fiO-IL-qum">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -1293,127 +1293,127 @@
         <image name="buttonCell:619:image" width="1" height="1">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
-S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCgpMDM2PD9VJG51bGzWDQ4PEBESExQVFhcYVk5T
+S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCkqMTQ3PUBVJG51bGzWDQ4PEBESExQVFhcYVk5T
 U2l6ZV5OU1Jlc2l6aW5nTW9kZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVwc1dOU0NvbG9ygAIQAIAN
-EiDLAACAA4ALVnsxLCAxfdIbDxweWk5TLm9iamVjdHOhHYAEgArSGw8gI6IhIoAFgAaACdIlDyYnXxAU
-TlNUSUZGUmVwcmVzZW50YXRpb26AB4AITxEGTE1NACoAAAAKAAAAEAEAAAMAAAABAAEAAAEBAAMAAAAB
-AAEAAAECAAMAAAACAAgACAEDAAMAAAABAAEAAAEGAAMAAAABAAEAAAEKAAMAAAABAAEAAAERAAQAAAAB
-AAAACAESAAMAAAABAAEAAAEVAAMAAAABAAIAAAEWAAMAAAABAAEAAAEXAAQAAAABAAAAAgEcAAMAAAAB
-AAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAACAAEAAYdzAAcAAAV8AAAA0AAAAAAAAAV8
-YXBwbAIgAABtbnRyR1JBWVhZWiAH0AACAA4ADAAAAABhY3NwQVBQTAAAAABub25lAAAAAAAAAAAAAAAA
-AAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAVkZXNjAAAAwAAAAG9kc2NtAAABMAAAA+5jcHJ0AAAFIAAAADh3dHB0AAAFWAAAABRrVFJD
-AAAFbAAAAA5kZXNjAAAAAAAAABVHZW5lcmljIEdyYXkgUHJvZmlsZQAAAAAAAAAAAAAAFUdlbmVyaWMg
-R3JheSBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-bWx1YwAAAAAAAAATAAAADHB0QlIAAAAqAAAA9GZyRlUAAAAqAAABHnpoVFcAAAAQAAABSGl0SVQAAAAu
-AAABWG5iTk8AAAAsAAABhmtvS1IAAAAYAAABsmRlREUAAAA6AAABynN2U0UAAAAuAAACBHpoQ04AAAAQ
-AAACMmphSlAAAAAWAAACQnB0UE8AAAA4AAACWG5sTkwAAAAqAAACkGVzRVMAAAAoAAACumZpRkkAAAAs
-AAAC4nBsUEwAAAA2AAADDnJ1UlUAAAAmAAADRGFyRUcAAAAoAAADamVuVVMAAAAoAAADkmRhREsAAAA0
-AAADugBQAGUAcgBmAGkAbAAgAEMAaQBuAHoAYQAgAEcAZQBuAOkAcgBpAGMAbwBQAHIAbwBmAGkAbAAg
-AGcA6QBuAOkAcgBpAHEAdQBlACAAZwByAGkAc5AadShwcJaOgnJfaWPPj/AAUAByAG8AZgBpAGwAbwAg
-AGcAcgBpAGcAaQBvACAAZwBlAG4AZQByAGkAYwBvAEcAZQBuAGUAcgBpAHMAawAgAGcAcgDlAHQAbwBu
-AGUAcAByAG8AZgBpAGzHfLwYACAARwByAGEAeQAg1QS4XNMMx3wAQQBsAGwAZwBlAG0AZQBpAG4AZQBz
-ACAARwByAGEAdQBzAHQAdQBmAGUAbgAtAFAAcgBvAGYAaQBsAEcAZQBuAGUAcgBpAHMAawAgAGcAcgDl
-AHMAawBhAGwAZQBwAHIAbwBmAGkAbGZukBpwcF6mY8+P8GWHTvZOAIIsMLAw7DCkMNcw7TDVMKEwpDDr
-AFAAZQByAGYAaQBsACAAZwBlAG4A6QByAGkAYwBvACAAZABlACAAYwBpAG4AegBlAG4AdABvAHMAQQBs
-AGcAZQBtAGUAZQBuACAAZwByAGkAagBzAHAAcgBvAGYAaQBlAGwAUABlAHIAZgBpAGwAIABnAHIAaQBz
-ACAAZwBlAG4A6QByAGkAYwBvAFkAbABlAGkAbgBlAG4AIABoAGEAcgBtAGEAYQBwAHIAbwBmAGkAaQBs
-AGkAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcAByAG8AZgBpAGwAIABzAHoAYQByAG8BWwBjAGkEHgQx
-BEkEOAQ5ACAEQQQ1BEAESwQ5ACAEPwRABD4ERAQ4BDsETAZFBkQGQQAgBioGOQYxBkoGQQAgAEcAcgBh
-AHkAIAYnBkQGOQYnBkUARwBlAG4AZQByAGkAYwAgAEcAcgBhAHkAIABQAHIAbwBmAGkAbABlAEcAZQBu
-AGUAcgBlAGwAIABnAHIA5QB0AG8AbgBlAGIAZQBzAGsAcgBpAHYAZQBsAHMAZQAAdGV4dAAAAABDb3B5
-cmlnaHQgMjAwNyBBcHBsZSBJbmMuLCBhbGwgcmlnaHRzIHJlc2VydmVkLgBYWVogAAAAAAAA81EAAQAA
-AAEWzGN1cnYAAAAAAAAAAQHNAADSKissLVokY2xhc3NuYW1lWCRjbGFzc2VzXxAQTlNCaXRtYXBJbWFn
-ZVJlcKMsLi9aTlNJbWFnZVJlcFhOU09iamVjdNIqKzEyV05TQXJyYXmiMS/SKis0NV5OU011dGFibGVB
-cnJheaM0MS/TNzgPOTo7V05TV2hpdGVcTlNDb2xvclNwYWNlRDAgMAAQA4AM0iorPT5XTlNDb2xvcqI9
-L9IqK0BBV05TSW1hZ2WiQC8ACAARABoAJAApADIANwBJAEwAUQBTAGIAaAB1AHwAiwCSAJ8ApgCuALAA
-sgC0ALkAuwC9AMQAyQDUANYA2ADaAN8A4gDkAOYA6ADtAQQBBgEIB1gHXQdoB3EHhAeIB5MHnAehB6kH
-rAexB8AHxAfLB9MH4AflB+cH6QfuB/YH+Qf+CAYAAAAAAAACAQAAAAAAAABCAAAAAAAAAAAAAAAAAAAI
-CQ
+EiDLAACAA4ALVnsxLCAxfdIbDxweWk5TLm9iamVjdHOhHYAEgArSGw8gI6IhIoAFgAaACdMPJSYnKBRf
+EBROU1RJRkZSZXByZXNlbnRhdGlvbl8QGU5TSW50ZXJuYWxMYXlvdXREaXJlY3Rpb26ACIAHTxEGTE1N
+ACoAAAAKAAAAEAEAAAMAAAABAAEAAAEBAAMAAAABAAEAAAECAAMAAAACAAgACAEDAAMAAAABAAEAAAEG
+AAMAAAABAAEAAAEKAAMAAAABAAEAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAIAAAEW
+AAMAAAABAAEAAAEXAAQAAAABAAAAAgEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFT
+AAMAAAACAAEAAYdzAAcAAAV8AAAA0AAAAAAAAAV8YXBwbAIgAABtbnRyR1JBWVhZWiAH0AACAA4ADAAA
+AABhY3NwQVBQTAAAAABub25lAAAAAAAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVkZXNjAAAAwAAAAG9kc2NtAAABMAAA
+A+5jcHJ0AAAFIAAAADh3dHB0AAAFWAAAABRrVFJDAAAFbAAAAA5kZXNjAAAAAAAAABVHZW5lcmljIEdy
+YXkgUHJvZmlsZQAAAAAAAAAAAAAAFUdlbmVyaWMgR3JheSBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbWx1YwAAAAAAAAATAAAADHB0QlIAAAAqAAAA9GZy
+RlUAAAAqAAABHnpoVFcAAAAQAAABSGl0SVQAAAAuAAABWG5iTk8AAAAsAAABhmtvS1IAAAAYAAABsmRl
+REUAAAA6AAABynN2U0UAAAAuAAACBHpoQ04AAAAQAAACMmphSlAAAAAWAAACQnB0UE8AAAA4AAACWG5s
+TkwAAAAqAAACkGVzRVMAAAAoAAACumZpRkkAAAAsAAAC4nBsUEwAAAA2AAADDnJ1UlUAAAAmAAADRGFy
+RUcAAAAoAAADamVuVVMAAAAoAAADkmRhREsAAAA0AAADugBQAGUAcgBmAGkAbAAgAEMAaQBuAHoAYQAg
+AEcAZQBuAOkAcgBpAGMAbwBQAHIAbwBmAGkAbAAgAGcA6QBuAOkAcgBpAHEAdQBlACAAZwByAGkAc5Aa
+dShwcJaOgnJfaWPPj/AAUAByAG8AZgBpAGwAbwAgAGcAcgBpAGcAaQBvACAAZwBlAG4AZQByAGkAYwBv
+AEcAZQBuAGUAcgBpAHMAawAgAGcAcgDlAHQAbwBuAGUAcAByAG8AZgBpAGzHfLwYACAARwByAGEAeQAg
+1QS4XNMMx3wAQQBsAGwAZwBlAG0AZQBpAG4AZQBzACAARwByAGEAdQBzAHQAdQBmAGUAbgAtAFAAcgBv
+AGYAaQBsAEcAZQBuAGUAcgBpAHMAawAgAGcAcgDlAHMAawBhAGwAZQBwAHIAbwBmAGkAbGZukBpwcF6m
+Y8+P8GWHTvZOAIIsMLAw7DCkMNcw7TDVMKEwpDDrAFAAZQByAGYAaQBsACAAZwBlAG4A6QByAGkAYwBv
+ACAAZABlACAAYwBpAG4AegBlAG4AdABvAHMAQQBsAGcAZQBtAGUAZQBuACAAZwByAGkAagBzAHAAcgBv
+AGYAaQBlAGwAUABlAHIAZgBpAGwAIABnAHIAaQBzACAAZwBlAG4A6QByAGkAYwBvAFkAbABlAGkAbgBl
+AG4AIABoAGEAcgBtAGEAYQBwAHIAbwBmAGkAaQBsAGkAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcABy
+AG8AZgBpAGwAIABzAHoAYQByAG8BWwBjAGkEHgQxBEkEOAQ5ACAEQQQ1BEAESwQ5ACAEPwRABD4ERAQ4
+BDsETAZFBkQGQQAgBioGOQYxBkoGQQAgAEcAcgBhAHkAIAYnBkQGOQYnBkUARwBlAG4AZQByAGkAYwAg
+AEcAcgBhAHkAIABQAHIAbwBmAGkAbABlAEcAZQBuAGUAcgBlAGwAIABnAHIA5QB0AG8AbgBlAGIAZQBz
+AGsAcgBpAHYAZQBsAHMAZQAAdGV4dAAAAABDb3B5cmlnaHQgMjAwNyBBcHBsZSBJbmMuLCBhbGwgcmln
+aHRzIHJlc2VydmVkLgBYWVogAAAAAAAA81EAAQAAAAEWzGN1cnYAAAAAAAAAAQHNAADSKywtLlokY2xh
+c3NuYW1lWCRjbGFzc2VzXxAQTlNCaXRtYXBJbWFnZVJlcKMtLzBaTlNJbWFnZVJlcFhOU09iamVjdNIr
+LDIzV05TQXJyYXmiMjDSKyw1Nl5OU011dGFibGVBcnJheaM1MjDTODkPOjs8V05TV2hpdGVcTlNDb2xv
+clNwYWNlRDAgMAAQA4AM0issPj9XTlNDb2xvcqI+MNIrLEFCV05TSW1hZ2WiQTAACAARABoAJAApADIA
+NwBJAEwAUQBTAGIAaAB1AHwAiwCSAJ8ApgCuALAAsgC0ALkAuwC9AMQAyQDUANYA2ADaAN8A4gDkAOYA
+6ADvAQYBIgEkASYHdgd7B4YHjweiB6YHsQe6B78HxwfKB88H3gfiB+kH8Qf+CAMIBQgHCAwIFAgXCBwI
+JAAAAAAAAAIBAAAAAAAAAEMAAAAAAAAAAAAAAAAAAAgnA
 </mutableData>
         </image>
         <image name="buttonCell:622:image" width="1" height="1">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
-S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCgpMDM2PD9VJG51bGzWDQ4PEBESExQVFhcYVk5T
+S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCkqMTQ3PUBVJG51bGzWDQ4PEBESExQVFhcYVk5T
 U2l6ZV5OU1Jlc2l6aW5nTW9kZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVwc1dOU0NvbG9ygAIQAIAN
-EiDLAACAA4ALVnsxLCAxfdIbDxweWk5TLm9iamVjdHOhHYAEgArSGw8gI6IhIoAFgAaACdIlDyYnXxAU
-TlNUSUZGUmVwcmVzZW50YXRpb26AB4AITxEGTE1NACoAAAAKAAAAEAEAAAMAAAABAAEAAAEBAAMAAAAB
-AAEAAAECAAMAAAACAAgACAEDAAMAAAABAAEAAAEGAAMAAAABAAEAAAEKAAMAAAABAAEAAAERAAQAAAAB
-AAAACAESAAMAAAABAAEAAAEVAAMAAAABAAIAAAEWAAMAAAABAAEAAAEXAAQAAAABAAAAAgEcAAMAAAAB
-AAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAACAAEAAYdzAAcAAAV8AAAA0AAAAAAAAAV8
-YXBwbAIgAABtbnRyR1JBWVhZWiAH0AACAA4ADAAAAABhY3NwQVBQTAAAAABub25lAAAAAAAAAAAAAAAA
-AAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAVkZXNjAAAAwAAAAG9kc2NtAAABMAAAA+5jcHJ0AAAFIAAAADh3dHB0AAAFWAAAABRrVFJD
-AAAFbAAAAA5kZXNjAAAAAAAAABVHZW5lcmljIEdyYXkgUHJvZmlsZQAAAAAAAAAAAAAAFUdlbmVyaWMg
-R3JheSBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-bWx1YwAAAAAAAAATAAAADHB0QlIAAAAqAAAA9GZyRlUAAAAqAAABHnpoVFcAAAAQAAABSGl0SVQAAAAu
-AAABWG5iTk8AAAAsAAABhmtvS1IAAAAYAAABsmRlREUAAAA6AAABynN2U0UAAAAuAAACBHpoQ04AAAAQ
-AAACMmphSlAAAAAWAAACQnB0UE8AAAA4AAACWG5sTkwAAAAqAAACkGVzRVMAAAAoAAACumZpRkkAAAAs
-AAAC4nBsUEwAAAA2AAADDnJ1UlUAAAAmAAADRGFyRUcAAAAoAAADamVuVVMAAAAoAAADkmRhREsAAAA0
-AAADugBQAGUAcgBmAGkAbAAgAEMAaQBuAHoAYQAgAEcAZQBuAOkAcgBpAGMAbwBQAHIAbwBmAGkAbAAg
-AGcA6QBuAOkAcgBpAHEAdQBlACAAZwByAGkAc5AadShwcJaOgnJfaWPPj/AAUAByAG8AZgBpAGwAbwAg
-AGcAcgBpAGcAaQBvACAAZwBlAG4AZQByAGkAYwBvAEcAZQBuAGUAcgBpAHMAawAgAGcAcgDlAHQAbwBu
-AGUAcAByAG8AZgBpAGzHfLwYACAARwByAGEAeQAg1QS4XNMMx3wAQQBsAGwAZwBlAG0AZQBpAG4AZQBz
-ACAARwByAGEAdQBzAHQAdQBmAGUAbgAtAFAAcgBvAGYAaQBsAEcAZQBuAGUAcgBpAHMAawAgAGcAcgDl
-AHMAawBhAGwAZQBwAHIAbwBmAGkAbGZukBpwcF6mY8+P8GWHTvZOAIIsMLAw7DCkMNcw7TDVMKEwpDDr
-AFAAZQByAGYAaQBsACAAZwBlAG4A6QByAGkAYwBvACAAZABlACAAYwBpAG4AegBlAG4AdABvAHMAQQBs
-AGcAZQBtAGUAZQBuACAAZwByAGkAagBzAHAAcgBvAGYAaQBlAGwAUABlAHIAZgBpAGwAIABnAHIAaQBz
-ACAAZwBlAG4A6QByAGkAYwBvAFkAbABlAGkAbgBlAG4AIABoAGEAcgBtAGEAYQBwAHIAbwBmAGkAaQBs
-AGkAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcAByAG8AZgBpAGwAIABzAHoAYQByAG8BWwBjAGkEHgQx
-BEkEOAQ5ACAEQQQ1BEAESwQ5ACAEPwRABD4ERAQ4BDsETAZFBkQGQQAgBioGOQYxBkoGQQAgAEcAcgBh
-AHkAIAYnBkQGOQYnBkUARwBlAG4AZQByAGkAYwAgAEcAcgBhAHkAIABQAHIAbwBmAGkAbABlAEcAZQBu
-AGUAcgBlAGwAIABnAHIA5QB0AG8AbgBlAGIAZQBzAGsAcgBpAHYAZQBsAHMAZQAAdGV4dAAAAABDb3B5
-cmlnaHQgMjAwNyBBcHBsZSBJbmMuLCBhbGwgcmlnaHRzIHJlc2VydmVkLgBYWVogAAAAAAAA81EAAQAA
-AAEWzGN1cnYAAAAAAAAAAQHNAADSKissLVokY2xhc3NuYW1lWCRjbGFzc2VzXxAQTlNCaXRtYXBJbWFn
-ZVJlcKMsLi9aTlNJbWFnZVJlcFhOU09iamVjdNIqKzEyV05TQXJyYXmiMS/SKis0NV5OU011dGFibGVB
-cnJheaM0MS/TNzgPOTo7V05TV2hpdGVcTlNDb2xvclNwYWNlRDAgMAAQA4AM0iorPT5XTlNDb2xvcqI9
-L9IqK0BBV05TSW1hZ2WiQC8ACAARABoAJAApADIANwBJAEwAUQBTAGIAaAB1AHwAiwCSAJ8ApgCuALAA
-sgC0ALkAuwC9AMQAyQDUANYA2ADaAN8A4gDkAOYA6ADtAQQBBgEIB1gHXQdoB3EHhAeIB5MHnAehB6kH
-rAexB8AHxAfLB9MH4AflB+cH6QfuB/YH+Qf+CAYAAAAAAAACAQAAAAAAAABCAAAAAAAAAAAAAAAAAAAI
-CQ
+EiDLAACAA4ALVnsxLCAxfdIbDxweWk5TLm9iamVjdHOhHYAEgArSGw8gI6IhIoAFgAaACdMPJSYnKBRf
+EBROU1RJRkZSZXByZXNlbnRhdGlvbl8QGU5TSW50ZXJuYWxMYXlvdXREaXJlY3Rpb26ACIAHTxEGTE1N
+ACoAAAAKAAAAEAEAAAMAAAABAAEAAAEBAAMAAAABAAEAAAECAAMAAAACAAgACAEDAAMAAAABAAEAAAEG
+AAMAAAABAAEAAAEKAAMAAAABAAEAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAIAAAEW
+AAMAAAABAAEAAAEXAAQAAAABAAAAAgEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFT
+AAMAAAACAAEAAYdzAAcAAAV8AAAA0AAAAAAAAAV8YXBwbAIgAABtbnRyR1JBWVhZWiAH0AACAA4ADAAA
+AABhY3NwQVBQTAAAAABub25lAAAAAAAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVkZXNjAAAAwAAAAG9kc2NtAAABMAAA
+A+5jcHJ0AAAFIAAAADh3dHB0AAAFWAAAABRrVFJDAAAFbAAAAA5kZXNjAAAAAAAAABVHZW5lcmljIEdy
+YXkgUHJvZmlsZQAAAAAAAAAAAAAAFUdlbmVyaWMgR3JheSBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbWx1YwAAAAAAAAATAAAADHB0QlIAAAAqAAAA9GZy
+RlUAAAAqAAABHnpoVFcAAAAQAAABSGl0SVQAAAAuAAABWG5iTk8AAAAsAAABhmtvS1IAAAAYAAABsmRl
+REUAAAA6AAABynN2U0UAAAAuAAACBHpoQ04AAAAQAAACMmphSlAAAAAWAAACQnB0UE8AAAA4AAACWG5s
+TkwAAAAqAAACkGVzRVMAAAAoAAACumZpRkkAAAAsAAAC4nBsUEwAAAA2AAADDnJ1UlUAAAAmAAADRGFy
+RUcAAAAoAAADamVuVVMAAAAoAAADkmRhREsAAAA0AAADugBQAGUAcgBmAGkAbAAgAEMAaQBuAHoAYQAg
+AEcAZQBuAOkAcgBpAGMAbwBQAHIAbwBmAGkAbAAgAGcA6QBuAOkAcgBpAHEAdQBlACAAZwByAGkAc5Aa
+dShwcJaOgnJfaWPPj/AAUAByAG8AZgBpAGwAbwAgAGcAcgBpAGcAaQBvACAAZwBlAG4AZQByAGkAYwBv
+AEcAZQBuAGUAcgBpAHMAawAgAGcAcgDlAHQAbwBuAGUAcAByAG8AZgBpAGzHfLwYACAARwByAGEAeQAg
+1QS4XNMMx3wAQQBsAGwAZwBlAG0AZQBpAG4AZQBzACAARwByAGEAdQBzAHQAdQBmAGUAbgAtAFAAcgBv
+AGYAaQBsAEcAZQBuAGUAcgBpAHMAawAgAGcAcgDlAHMAawBhAGwAZQBwAHIAbwBmAGkAbGZukBpwcF6m
+Y8+P8GWHTvZOAIIsMLAw7DCkMNcw7TDVMKEwpDDrAFAAZQByAGYAaQBsACAAZwBlAG4A6QByAGkAYwBv
+ACAAZABlACAAYwBpAG4AegBlAG4AdABvAHMAQQBsAGcAZQBtAGUAZQBuACAAZwByAGkAagBzAHAAcgBv
+AGYAaQBlAGwAUABlAHIAZgBpAGwAIABnAHIAaQBzACAAZwBlAG4A6QByAGkAYwBvAFkAbABlAGkAbgBl
+AG4AIABoAGEAcgBtAGEAYQBwAHIAbwBmAGkAaQBsAGkAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcABy
+AG8AZgBpAGwAIABzAHoAYQByAG8BWwBjAGkEHgQxBEkEOAQ5ACAEQQQ1BEAESwQ5ACAEPwRABD4ERAQ4
+BDsETAZFBkQGQQAgBioGOQYxBkoGQQAgAEcAcgBhAHkAIAYnBkQGOQYnBkUARwBlAG4AZQByAGkAYwAg
+AEcAcgBhAHkAIABQAHIAbwBmAGkAbABlAEcAZQBuAGUAcgBlAGwAIABnAHIA5QB0AG8AbgBlAGIAZQBz
+AGsAcgBpAHYAZQBsAHMAZQAAdGV4dAAAAABDb3B5cmlnaHQgMjAwNyBBcHBsZSBJbmMuLCBhbGwgcmln
+aHRzIHJlc2VydmVkLgBYWVogAAAAAAAA81EAAQAAAAEWzGN1cnYAAAAAAAAAAQHNAADSKywtLlokY2xh
+c3NuYW1lWCRjbGFzc2VzXxAQTlNCaXRtYXBJbWFnZVJlcKMtLzBaTlNJbWFnZVJlcFhOU09iamVjdNIr
+LDIzV05TQXJyYXmiMjDSKyw1Nl5OU011dGFibGVBcnJheaM1MjDTODkPOjs8V05TV2hpdGVcTlNDb2xv
+clNwYWNlRDAgMAAQA4AM0issPj9XTlNDb2xvcqI+MNIrLEFCV05TSW1hZ2WiQTAACAARABoAJAApADIA
+NwBJAEwAUQBTAGIAaAB1AHwAiwCSAJ8ApgCuALAAsgC0ALkAuwC9AMQAyQDUANYA2ADaAN8A4gDkAOYA
+6ADvAQYBIgEkASYHdgd7B4YHjweiB6YHsQe6B78HxwfKB88H3gfiB+kH8Qf+CAMIBQgHCAwIFAgXCBwI
+JAAAAAAAAAIBAAAAAAAAAEMAAAAAAAAAAAAAAAAAAAgnA
 </mutableData>
         </image>
         <image name="buttonCell:rEJ-M5-S37:image" width="1" height="1">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
-S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCgpMDM2PD9VJG51bGzWDQ4PEBESExQVFhcYVk5T
+S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCkqMTQ3PUBVJG51bGzWDQ4PEBESExQVFhcYVk5T
 U2l6ZV5OU1Jlc2l6aW5nTW9kZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVwc1dOU0NvbG9ygAIQAIAN
-EiDLAACAA4ALVnsxLCAxfdIbDxweWk5TLm9iamVjdHOhHYAEgArSGw8gI6IhIoAFgAaACdIlDyYnXxAU
-TlNUSUZGUmVwcmVzZW50YXRpb26AB4AITxEGTE1NACoAAAAKAAAAEAEAAAMAAAABAAEAAAEBAAMAAAAB
-AAEAAAECAAMAAAACAAgACAEDAAMAAAABAAEAAAEGAAMAAAABAAEAAAEKAAMAAAABAAEAAAERAAQAAAAB
-AAAACAESAAMAAAABAAEAAAEVAAMAAAABAAIAAAEWAAMAAAABAAEAAAEXAAQAAAABAAAAAgEcAAMAAAAB
-AAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAACAAEAAYdzAAcAAAV8AAAA0AAAAAAAAAV8
-YXBwbAIgAABtbnRyR1JBWVhZWiAH0AACAA4ADAAAAABhY3NwQVBQTAAAAABub25lAAAAAAAAAAAAAAAA
-AAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAVkZXNjAAAAwAAAAG9kc2NtAAABMAAAA+5jcHJ0AAAFIAAAADh3dHB0AAAFWAAAABRrVFJD
-AAAFbAAAAA5kZXNjAAAAAAAAABVHZW5lcmljIEdyYXkgUHJvZmlsZQAAAAAAAAAAAAAAFUdlbmVyaWMg
-R3JheSBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-bWx1YwAAAAAAAAATAAAADHB0QlIAAAAqAAAA9GZyRlUAAAAqAAABHnpoVFcAAAAQAAABSGl0SVQAAAAu
-AAABWG5iTk8AAAAsAAABhmtvS1IAAAAYAAABsmRlREUAAAA6AAABynN2U0UAAAAuAAACBHpoQ04AAAAQ
-AAACMmphSlAAAAAWAAACQnB0UE8AAAA4AAACWG5sTkwAAAAqAAACkGVzRVMAAAAoAAACumZpRkkAAAAs
-AAAC4nBsUEwAAAA2AAADDnJ1UlUAAAAmAAADRGFyRUcAAAAoAAADamVuVVMAAAAoAAADkmRhREsAAAA0
-AAADugBQAGUAcgBmAGkAbAAgAEMAaQBuAHoAYQAgAEcAZQBuAOkAcgBpAGMAbwBQAHIAbwBmAGkAbAAg
-AGcA6QBuAOkAcgBpAHEAdQBlACAAZwByAGkAc5AadShwcJaOgnJfaWPPj/AAUAByAG8AZgBpAGwAbwAg
-AGcAcgBpAGcAaQBvACAAZwBlAG4AZQByAGkAYwBvAEcAZQBuAGUAcgBpAHMAawAgAGcAcgDlAHQAbwBu
-AGUAcAByAG8AZgBpAGzHfLwYACAARwByAGEAeQAg1QS4XNMMx3wAQQBsAGwAZwBlAG0AZQBpAG4AZQBz
-ACAARwByAGEAdQBzAHQAdQBmAGUAbgAtAFAAcgBvAGYAaQBsAEcAZQBuAGUAcgBpAHMAawAgAGcAcgDl
-AHMAawBhAGwAZQBwAHIAbwBmAGkAbGZukBpwcF6mY8+P8GWHTvZOAIIsMLAw7DCkMNcw7TDVMKEwpDDr
-AFAAZQByAGYAaQBsACAAZwBlAG4A6QByAGkAYwBvACAAZABlACAAYwBpAG4AegBlAG4AdABvAHMAQQBs
-AGcAZQBtAGUAZQBuACAAZwByAGkAagBzAHAAcgBvAGYAaQBlAGwAUABlAHIAZgBpAGwAIABnAHIAaQBz
-ACAAZwBlAG4A6QByAGkAYwBvAFkAbABlAGkAbgBlAG4AIABoAGEAcgBtAGEAYQBwAHIAbwBmAGkAaQBs
-AGkAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcAByAG8AZgBpAGwAIABzAHoAYQByAG8BWwBjAGkEHgQx
-BEkEOAQ5ACAEQQQ1BEAESwQ5ACAEPwRABD4ERAQ4BDsETAZFBkQGQQAgBioGOQYxBkoGQQAgAEcAcgBh
-AHkAIAYnBkQGOQYnBkUARwBlAG4AZQByAGkAYwAgAEcAcgBhAHkAIABQAHIAbwBmAGkAbABlAEcAZQBu
-AGUAcgBlAGwAIABnAHIA5QB0AG8AbgBlAGIAZQBzAGsAcgBpAHYAZQBsAHMAZQAAdGV4dAAAAABDb3B5
-cmlnaHQgMjAwNyBBcHBsZSBJbmMuLCBhbGwgcmlnaHRzIHJlc2VydmVkLgBYWVogAAAAAAAA81EAAQAA
-AAEWzGN1cnYAAAAAAAAAAQHNAADSKissLVokY2xhc3NuYW1lWCRjbGFzc2VzXxAQTlNCaXRtYXBJbWFn
-ZVJlcKMsLi9aTlNJbWFnZVJlcFhOU09iamVjdNIqKzEyV05TQXJyYXmiMS/SKis0NV5OU011dGFibGVB
-cnJheaM0MS/TNzgPOTo7V05TV2hpdGVcTlNDb2xvclNwYWNlRDAgMAAQA4AM0iorPT5XTlNDb2xvcqI9
-L9IqK0BBV05TSW1hZ2WiQC8ACAARABoAJAApADIANwBJAEwAUQBTAGIAaAB1AHwAiwCSAJ8ApgCuALAA
-sgC0ALkAuwC9AMQAyQDUANYA2ADaAN8A4gDkAOYA6ADtAQQBBgEIB1gHXQdoB3EHhAeIB5MHnAehB6kH
-rAexB8AHxAfLB9MH4AflB+cH6QfuB/YH+Qf+CAYAAAAAAAACAQAAAAAAAABCAAAAAAAAAAAAAAAAAAAI
-CQ
+EiDLAACAA4ALVnsxLCAxfdIbDxweWk5TLm9iamVjdHOhHYAEgArSGw8gI6IhIoAFgAaACdMPJSYnKBRf
+EBROU1RJRkZSZXByZXNlbnRhdGlvbl8QGU5TSW50ZXJuYWxMYXlvdXREaXJlY3Rpb26ACIAHTxEGTE1N
+ACoAAAAKAAAAEAEAAAMAAAABAAEAAAEBAAMAAAABAAEAAAECAAMAAAACAAgACAEDAAMAAAABAAEAAAEG
+AAMAAAABAAEAAAEKAAMAAAABAAEAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAIAAAEW
+AAMAAAABAAEAAAEXAAQAAAABAAAAAgEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFT
+AAMAAAACAAEAAYdzAAcAAAV8AAAA0AAAAAAAAAV8YXBwbAIgAABtbnRyR1JBWVhZWiAH0AACAA4ADAAA
+AABhY3NwQVBQTAAAAABub25lAAAAAAAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVkZXNjAAAAwAAAAG9kc2NtAAABMAAA
+A+5jcHJ0AAAFIAAAADh3dHB0AAAFWAAAABRrVFJDAAAFbAAAAA5kZXNjAAAAAAAAABVHZW5lcmljIEdy
+YXkgUHJvZmlsZQAAAAAAAAAAAAAAFUdlbmVyaWMgR3JheSBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbWx1YwAAAAAAAAATAAAADHB0QlIAAAAqAAAA9GZy
+RlUAAAAqAAABHnpoVFcAAAAQAAABSGl0SVQAAAAuAAABWG5iTk8AAAAsAAABhmtvS1IAAAAYAAABsmRl
+REUAAAA6AAABynN2U0UAAAAuAAACBHpoQ04AAAAQAAACMmphSlAAAAAWAAACQnB0UE8AAAA4AAACWG5s
+TkwAAAAqAAACkGVzRVMAAAAoAAACumZpRkkAAAAsAAAC4nBsUEwAAAA2AAADDnJ1UlUAAAAmAAADRGFy
+RUcAAAAoAAADamVuVVMAAAAoAAADkmRhREsAAAA0AAADugBQAGUAcgBmAGkAbAAgAEMAaQBuAHoAYQAg
+AEcAZQBuAOkAcgBpAGMAbwBQAHIAbwBmAGkAbAAgAGcA6QBuAOkAcgBpAHEAdQBlACAAZwByAGkAc5Aa
+dShwcJaOgnJfaWPPj/AAUAByAG8AZgBpAGwAbwAgAGcAcgBpAGcAaQBvACAAZwBlAG4AZQByAGkAYwBv
+AEcAZQBuAGUAcgBpAHMAawAgAGcAcgDlAHQAbwBuAGUAcAByAG8AZgBpAGzHfLwYACAARwByAGEAeQAg
+1QS4XNMMx3wAQQBsAGwAZwBlAG0AZQBpAG4AZQBzACAARwByAGEAdQBzAHQAdQBmAGUAbgAtAFAAcgBv
+AGYAaQBsAEcAZQBuAGUAcgBpAHMAawAgAGcAcgDlAHMAawBhAGwAZQBwAHIAbwBmAGkAbGZukBpwcF6m
+Y8+P8GWHTvZOAIIsMLAw7DCkMNcw7TDVMKEwpDDrAFAAZQByAGYAaQBsACAAZwBlAG4A6QByAGkAYwBv
+ACAAZABlACAAYwBpAG4AegBlAG4AdABvAHMAQQBsAGcAZQBtAGUAZQBuACAAZwByAGkAagBzAHAAcgBv
+AGYAaQBlAGwAUABlAHIAZgBpAGwAIABnAHIAaQBzACAAZwBlAG4A6QByAGkAYwBvAFkAbABlAGkAbgBl
+AG4AIABoAGEAcgBtAGEAYQBwAHIAbwBmAGkAaQBsAGkAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcABy
+AG8AZgBpAGwAIABzAHoAYQByAG8BWwBjAGkEHgQxBEkEOAQ5ACAEQQQ1BEAESwQ5ACAEPwRABD4ERAQ4
+BDsETAZFBkQGQQAgBioGOQYxBkoGQQAgAEcAcgBhAHkAIAYnBkQGOQYnBkUARwBlAG4AZQByAGkAYwAg
+AEcAcgBhAHkAIABQAHIAbwBmAGkAbABlAEcAZQBuAGUAcgBlAGwAIABnAHIA5QB0AG8AbgBlAGIAZQBz
+AGsAcgBpAHYAZQBsAHMAZQAAdGV4dAAAAABDb3B5cmlnaHQgMjAwNyBBcHBsZSBJbmMuLCBhbGwgcmln
+aHRzIHJlc2VydmVkLgBYWVogAAAAAAAA81EAAQAAAAEWzGN1cnYAAAAAAAAAAQHNAADSKywtLlokY2xh
+c3NuYW1lWCRjbGFzc2VzXxAQTlNCaXRtYXBJbWFnZVJlcKMtLzBaTlNJbWFnZVJlcFhOU09iamVjdNIr
+LDIzV05TQXJyYXmiMjDSKyw1Nl5OU011dGFibGVBcnJheaM1MjDTODkPOjs8V05TV2hpdGVcTlNDb2xv
+clNwYWNlRDAgMAAQA4AM0issPj9XTlNDb2xvcqI+MNIrLEFCV05TSW1hZ2WiQTAACAARABoAJAApADIA
+NwBJAEwAUQBTAGIAaAB1AHwAiwCSAJ8ApgCuALAAsgC0ALkAuwC9AMQAyQDUANYA2ADaAN8A4gDkAOYA
+6ADvAQYBIgEkASYHdgd7B4YHjweiB6YHsQe6B78HxwfKB88H3gfiB+kH8Qf+CAMIBQgHCAwIFAgXCBwI
+JAAAAAAAAAIBAAAAAAAAAEMAAAAAAAAAAAAAAAAAAAgnA
 </mutableData>
         </image>
     </resources>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/Bookmarks.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/Bookmarks.xib Changed

@@ -62,11 +62,11 @@
                             <rect key="frame" x="1" y="1" width="472" height="241"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" autosaveColumns="NO" autosaveName="bookmarks-table" headerView="111" id="110" customClass="VLCHUDTableView">
+                                <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" autosaveColumns="NO" autosaveName="bookmarks-table" headerView="111" id="110">
                                     <rect key="frame" x="0.0" y="0.0" width="472" height="218"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
                                         <tableColumn identifier="name" width="128" minWidth="10" maxWidth="3.4028234663852886e+38" id="CfE-Sy-6N7">
@@ -93,7 +93,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         </tableColumn>
-                                        <tableColumn identifier="time_offset" width="71" minWidth="30" maxWidth="1000" id="113">
+                                        <tableColumn identifier="time_offset" width="42" minWidth="30" maxWidth="1000" id="113">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Time">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -108,7 +108,6 @@
                                     </tableColumns>
                                 </tableView>
                             </subviews>
-                            <color key="backgroundColor" name="controlDarkShadowColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
                         <constraints>
                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="Y3p-2z-GZy"/>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/Help.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/Help.xib Changed

@@ -3,7 +3,6 @@
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
-        <plugIn identifier="com.apple.WebKitIBPlugin" version="14113"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -11,8 +10,9 @@
             <connections>
                 <outlet property="backButton" destination="2257" id="c2X-ol-C9I"/>
                 <outlet property="forwardButton" destination="2258" id="iEY-oD-cv3"/>
-                <outlet property="helpWebView" destination="2241" id="cMX-Wb-U2g"/>
                 <outlet property="homeButton" destination="2256" id="sWB-6l-roa"/>
+                <outlet property="progressIndicator" destination="d97-0g-MPE" id="abc-ol-def"/>
+                <outlet property="visualEffectView" destination="FtB-z3-gSh" id="1234"/>
                 <outlet property="window" destination="2239" id="2342"/>
             </connections>
         </customObject>
@@ -28,59 +28,71 @@
                 <rect key="frame" x="0.0" y="0.0" width="480" height="400"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <webView translatesAutoresizingMaskIntoConstraints="NO" id="2241">
-                        <rect key="frame" x="0.0" y="40" width="480" height="360"/>
-                        <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12" plugInsEnabled="NO" javaEnabled="NO" javaScriptEnabled="NO" javaScriptCanOpenWindowsAutomatically="NO" loadsImagesAutomatically="NO" allowsAnimatedImages="NO" allowsAnimatedImageLooping="NO">
-                            <nil key="identifier"/>
-                        </webPreferences>
-                        <connections>
-                            <outlet property="frameLoadDelegate" destination="-2" id="2340"/>
-                        </connections>
-                    </webView>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2256">
-                        <rect key="frame" x="20" y="8" width="27" height="25"/>
-                        <buttonCell key="cell" type="roundTextured" title="⌂" bezelStyle="texturedRounded" alignment="center" borderStyle="border" inset="2" id="2275">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="systemBold" size="20"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="helpGoHome:" target="-2" id="2338"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2257">
-                        <rect key="frame" x="55" y="8" width="30" height="25"/>
-                        <buttonCell key="cell" type="roundTextured" title="←" bezelStyle="texturedRounded" alignment="center" borderStyle="border" inset="2" id="2276">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="systemBold" size="18"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="goBack:" target="2241" id="2267"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2258">
-                        <rect key="frame" x="93" y="8" width="30" height="25"/>
-                        <buttonCell key="cell" type="roundTextured" title="→" bezelStyle="texturedRounded" alignment="center" borderStyle="border" inset="2" id="2277">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="systemBold" size="18"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="goForward:" target="2241" id="2266"/>
-                        </connections>
-                    </button>
+                    <visualEffectView blendingMode="behindWindow" material="titlebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="FtB-z3-gSh">
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="40"/>
+                        <subviews>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2256">
+                                <rect key="frame" x="9" y="8" width="31" height="23"/>
+                                <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="house" catalog="system" imagePosition="overlaps" alignment="center" borderStyle="border" inset="2" id="2275">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="helpGoHome:" target="-2" id="2338"/>
+                                </connections>
+                            </button>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2257">
+                                <rect key="frame" x="43" y="8" width="22" height="23"/>
+                                <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="chevron.left" catalog="system" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="2276">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="helpGoBack:" target="-2" id="Jpt-6K-wje"/>
+                                </connections>
+                            </button>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2258">
+                                <rect key="frame" x="68" y="8" width="22" height="23"/>
+                                <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="chevron.right" catalog="system" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="2277">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="helpGoForward:" target="-2" id="olV-gO-PNO"/>
+                                </connections>
+                            </button>
+                            <progressIndicator wantsLayer="YES" maxValue="100" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="d97-0g-MPE">
+                                <rect key="frame" x="454" y="10" width="16" height="20"/>
+                            </progressIndicator>
+                        </subviews>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="2258" secondAttribute="bottom" constant="10" id="FaY-hq-qr1"/>
+                            <constraint firstItem="2256" firstAttribute="top" secondItem="FtB-z3-gSh" secondAttribute="top" constant="10" id="Hoe-j8-9a3"/>
+                            <constraint firstItem="2257" firstAttribute="leading" secondItem="2256" secondAttribute="trailing" constant="5" id="Kcg-D1-gaL"/>
+                            <constraint firstItem="2257" firstAttribute="top" secondItem="FtB-z3-gSh" secondAttribute="top" constant="10" id="LxE-Q8-gUz"/>
+                            <constraint firstAttribute="bottom" secondItem="d97-0g-MPE" secondAttribute="bottom" constant="10" id="QwV-el-tJ7"/>
+                            <constraint firstItem="d97-0g-MPE" firstAttribute="top" secondItem="FtB-z3-gSh" secondAttribute="top" constant="10" id="RZ2-3B-lrf"/>
+                            <constraint firstAttribute="bottom" secondItem="2256" secondAttribute="bottom" constant="10" id="UD7-Co-ctx"/>
+                            <constraint firstAttribute="trailing" secondItem="d97-0g-MPE" secondAttribute="trailing" constant="10" id="gWB-OK-EUY"/>
+                            <constraint firstAttribute="bottom" secondItem="2257" secondAttribute="bottom" constant="10" id="ld4-Qs-QKq"/>
+                            <constraint firstItem="2258" firstAttribute="leading" secondItem="2257" secondAttribute="trailing" constant="5" id="ocS-aj-xnD"/>
+                            <constraint firstAttribute="height" constant="40" id="ohq-yT-YZR"/>
+                            <constraint firstItem="2258" firstAttribute="top" secondItem="FtB-z3-gSh" secondAttribute="top" constant="10" id="wNK-tJ-Ti3"/>
+                            <constraint firstItem="2256" firstAttribute="leading" secondItem="FtB-z3-gSh" secondAttribute="leading" constant="10" id="ypi-IG-Txn"/>
+                        </constraints>
+                    </visualEffectView>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="2257" firstAttribute="leading" secondItem="2256" secondAttribute="trailing" constant="8" id="6Va-Ur-0gs"/>
-                    <constraint firstItem="2241" firstAttribute="top" secondItem="2240" secondAttribute="top" id="7J6-p5-r45"/>
-                    <constraint firstAttribute="trailing" secondItem="2241" secondAttribute="trailing" id="CYF-2C-pXI"/>
-                    <constraint firstItem="2258" firstAttribute="leading" secondItem="2257" secondAttribute="trailing" constant="8" id="JGE-np-3B3"/>
-                    <constraint firstItem="2241" firstAttribute="leading" secondItem="2240" secondAttribute="leading" id="XlN-01-Yyk"/>
-                    <constraint firstItem="2256" firstAttribute="leading" secondItem="2240" secondAttribute="leading" constant="20" id="YuN-8j-3ks"/>
-                    <constraint firstAttribute="bottom" secondItem="2256" secondAttribute="bottom" constant="10" id="ZKn-0H-1ii"/>
-                    <constraint firstAttribute="bottom" secondItem="2241" secondAttribute="bottom" constant="40" id="qEX-nC-QiS"/>
-                    <constraint firstItem="2256" firstAttribute="centerY" secondItem="2257" secondAttribute="centerY" id="vba-6f-BZO"/>
-                    <constraint firstItem="2257" firstAttribute="centerY" secondItem="2258" secondAttribute="centerY" id="xIG-Tk-diy"/>
+                    <constraint firstItem="FtB-z3-gSh" firstAttribute="leading" secondItem="2240" secondAttribute="leading" id="2QX-pH-XaP"/>
+                    <constraint firstAttribute="trailing" secondItem="FtB-z3-gSh" secondAttribute="trailing" id="6pc-cs-Zwy"/>
+                    <constraint firstAttribute="bottom" secondItem="FtB-z3-gSh" secondAttribute="bottom" id="XNK-O0-XXZ"/>
                 </constraints>
             </view>
         </window>
     </objects>
+    <resources>
+        <image name="chevron.left" catalog="system" width="10" height="14"/>
+        <image name="chevron.right" catalog="system" width="10" height="14"/>
+        <image name="house" catalog="system" width="19" height="16"/>
+    </resources>
 </document>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/MainMenu.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/MainMenu.xib Changed

@@ -68,7 +68,7 @@
                 <outlet property="hide_others" destination="145" id="TV9-HK-Ave"/>
                 <outlet property="info" destination="1192" id="BPE-5A-AU4"/>
                 <outlet property="jumpToTime" destination="5138" id="XK6-rV-lr9"/>
-                <outlet property="libraryPlaylistMode" destination="Zo7-ru-vku" id="uNJ-jw-lG2"/>
+                <outlet property="libraryPlayQueueMode" destination="Zo7-ru-vku" id="uNJ-jw-lG2"/>
                 <outlet property="license" destination="2834" id="0tU-nu-6dP"/>
                 <outlet property="mcopyItem" destination="197" id="aBx-7l-f4e"/>
                 <outlet property="messages" destination="1003" id="q4C-pt-kQo"/>
@@ -85,8 +85,8 @@
                 <outlet property="open_recent" destination="4815" id="Hzh-wK-cxa"/>
                 <outlet property="pasteItem" destination="203" id="H04-s9-3uF"/>
                 <outlet property="play" destination="5142" id="B2I-n1-EOc"/>
+                <outlet property="playQueue" destination="1002" id="nhI-Gw-yev"/>
                 <outlet property="player" destination="999" id="A2q-jC-Whd"/>
-                <outlet property="playlist" destination="1002" id="nhI-Gw-yev"/>
                 <outlet property="postprocessing" destination="2133" id="Yn3-kZ-0qr"/>
                 <outlet property="postprocessingMenu" destination="2132" id="7NO-zF-sUN"/>
                 <outlet property="prefs" destination="801" id="Kaq-ct-Qwu"/>
@@ -118,7 +118,7 @@
                 <outlet property="services" destination="1996" id="X3H-XI-xFK"/>
                 <outlet property="show_all" destination="150" id="XQ2-CW-0PI"/>
                 <outlet property="snapshot" destination="2249" id="6bO-HY-I3I"/>
-                <outlet property="sortPlaylist" destination="lkj-Wj-TYr" id="T45-2w-c0O"/>
+                <outlet property="sortPlayQueue" destination="lkj-Wj-TYr" id="T45-2w-c0O"/>
                 <outlet property="stop" destination="5156" id="irh-Cr-vBT"/>
                 <outlet property="subtitleSize" destination="5543" id="PTJ-Qy-QQd"/>
                 <outlet property="subtitleSizeLabel" destination="Jqh-Tt-S94" id="xLh-4s-Sis"/>
@@ -281,7 +281,7 @@
                                     <action selector="intfOpenDisc:" target="-2" id="Y60-I1-fEt"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Open Network..." keyEquivalent="n" id="446">
+                            <menuItem title="Open Stream..." keyEquivalent="n" id="446">
                                 <connections>
                                     <action selector="intfOpenNet:" target="-2" id="76C-uE-5DX"/>
                                 </connections>
@@ -446,13 +446,13 @@
                                     <action selector="toggleAtoBloop:" target="-2" id="Wrv-He-P33"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Library Playlist Mode" id="Zo7-ru-vku">
+                            <menuItem title="Library Play Queue Mode" id="Zo7-ru-vku">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
-                                    <action selector="toggleLibraryPlaylistMode:" target="-2" id="p9z-8M-8a4"/>
+                                    <action selector="toggleLibraryPlayQueueMode:" target="-2" id="p9z-8M-8a4"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Sort Playlist" id="lkj-Wj-TYr">
+                            <menuItem title="Sort Play Queue" id="lkj-Wj-TYr">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="5141"/>
@@ -726,10 +726,10 @@
                                     <action selector="showMainWindow:" target="-2" id="BXQ-oU-PvS"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Playlist" keyEquivalent="p" id="1002">
+                            <menuItem title="Play Queue" keyEquivalent="p" id="1002">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                 <connections>
-                                    <action selector="showPlaylist:" target="-2" id="Kqz-Ng-6tj"/>
+                                    <action selector="showPlayQueue:" target="-2" id="Kqz-Ng-6tj"/>
                                 </connections>
                             </menuItem>
                             <menuItem title="Detached Audio Window..." keyEquivalent="a" id="pI6-7D-CgE">

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/Open.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/Open.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -144,14 +144,14 @@
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="162" y="354" width="602" height="426"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="800"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <value key="minSize" type="size" width="530" height="107"/>
             <view key="contentView" id="637">
-                <rect key="frame" x="0.0" y="0.0" width="602" height="426"/>
+                <rect key="frame" x="0.0" y="0.0" width="602" height="425"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <tabView identifier="central tab view" translatesAutoresizingMaskIntoConstraints="NO" id="678">
-                        <rect key="frame" x="13" y="142" width="576" height="278"/>
+                        <rect key="frame" x="13" y="141" width="576" height="278"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="262" id="i1N-3L-NiL">
                                 <attributedString key="userComments">
@@ -174,11 +174,11 @@
                                         <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="3487">
                                             <rect key="frame" x="1" y="-1" width="554" height="47"/>
                                             <view key="contentView" id="7Lj-Zt-bjd">
-                                                <rect key="frame" x="3" y="3" width="548" height="41"/>
+                                                <rect key="frame" x="4" y="5" width="546" height="39"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="96" translatesAutoresizingMaskIntoConstraints="NO" id="3477">
-                                                        <rect key="frame" x="436" y="10" width="96" height="19"/>
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" preferredMaxLayoutWidth="96" translatesAutoresizingMaskIntoConstraints="NO" id="3477">
+                                                        <rect key="frame" x="435" y="8" width="96" height="19"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="96" id="HrV-me-zUS"/>
                                                         </constraints>
@@ -188,16 +188,16 @@
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                     </textField>
-                                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3478">
-                                                        <rect key="frame" x="375" y="12" width="55" height="14"/>
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3478">
+                                                        <rect key="frame" x="374" y="10" width="55" height="14"/>
                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="Stop time" usesSingleLineMode="YES" id="3479">
                                                             <font key="font" metaFont="message" size="11"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                     </textField>
-                                                    <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="96" translatesAutoresizingMaskIntoConstraints="NO" id="3473">
-                                                        <rect key="frame" x="274" y="10" width="96" height="19"/>
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" preferredMaxLayoutWidth="96" translatesAutoresizingMaskIntoConstraints="NO" id="3473">
+                                                        <rect key="frame" x="273" y="8" width="96" height="19"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="96" id="LaV-0q-7Px"/>
                                                         </constraints>
@@ -207,8 +207,8 @@
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                     </textField>
-                                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3475">
-                                                        <rect key="frame" x="213" y="12" width="56" height="14"/>
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3475">
+                                                        <rect key="frame" x="212" y="10" width="56" height="14"/>
                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="Start time" usesSingleLineMode="YES" id="3476">
                                                             <font key="font" metaFont="message" size="11"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -216,7 +216,7 @@
                                                         </textFieldCell>
                                                     </textField>
                                                     <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="3485">
-                                                        <rect key="frame" x="15" y="10" width="113" height="18"/>
+                                                        <rect key="frame" x="17" y="9" width="112" height="16"/>
                                                         <buttonCell key="cell" type="check" title="Custom playback" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="3486">
                                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                             <font key="font" metaFont="message" size="11"/>
@@ -244,16 +244,16 @@
                                                 <constraint firstAttribute="height" constant="41" id="Pjd-9n-xU7"/>
                                             </constraints>
                                         </box>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3342">
-                                            <rect key="frame" x="54" y="193" width="96" height="16"/>
+                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3342">
+                                            <rect key="frame" x="54" y="194" width="96" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="bla bla bla.mov" usesSingleLineMode="YES" id="3343">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3328">
-                                            <rect key="frame" x="54" y="193" width="83" height="16"/>
+                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3328">
+                                            <rect key="frame" x="54" y="194" width="83" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Choose a file" usesSingleLineMode="YES" id="3329">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -261,14 +261,14 @@
                                             </textFieldCell>
                                         </textField>
                                         <imageView translatesAutoresizingMaskIntoConstraints="NO" id="3335">
-                                            <rect key="frame" x="39" y="121" width="16" height="15"/>
+                                            <rect key="frame" x="39" y="123" width="16" height="14"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="16" id="koH-wm-Oyf"/>
                                             </constraints>
                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="generic" id="3336"/>
                                         </imageView>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3334">
-                                            <rect key="frame" x="60" y="121" width="479" height="14"/>
+                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3334">
+                                            <rect key="frame" x="60" y="123" width="479" height="14"/>
                                             <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" sendsActionOnEndEditing="YES" title="&quot;Such Great Heights.txt&quot;" usesSingleLineMode="YES" id="3337">
                                                 <font key="font" metaFont="message" size="11"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -276,7 +276,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <imageView translatesAutoresizingMaskIntoConstraints="NO" id="3332">
-                                            <rect key="frame" x="39" y="69" width="16" height="16"/>
+                                            <rect key="frame" x="39" y="69" width="16" height="18"/>
                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="generic" id="3333"/>
                                         </imageView>
                                         <imageView translatesAutoresizingMaskIntoConstraints="NO" id="3326">
@@ -287,8 +287,8 @@
                                             </constraints>
                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="generic" id="3327"/>
                                         </imageView>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3008">
-                                            <rect key="frame" x="60" y="69" width="479" height="14"/>
+                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3008">
+                                            <rect key="frame" x="60" y="69" width="479" height="17"/>
                                             <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" sendsActionOnEndEditing="YES" title="&quot;Such Great Heights.mp3&quot;" usesSingleLineMode="YES" id="3009">
                                                 <font key="font" metaFont="message" size="11"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -296,7 +296,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3004">
-                                            <rect key="frame" x="440" y="77" width="102" height="32"/>
+                                            <rect key="frame" x="447" y="80" width="96" height="32"/>
                                             <buttonCell key="cell" type="push" title="Choose..." bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" inset="2" id="3005">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -306,7 +306,7 @@
                                             </connections>
                                         </button>
                                         <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2995">
-                                            <rect key="frame" x="15" y="86" width="230" height="18"/>
+                                            <rect key="frame" x="15" y="89" width="233" height="18"/>
                                             <buttonCell key="cell" type="check" title="Play another media synchronously" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="2998">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -316,7 +316,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1269">
-                                            <rect key="frame" x="440" y="129" width="102" height="32"/>
+                                            <rect key="frame" x="447" y="131" width="96" height="32"/>
                                             <buttonCell key="cell" type="push" title="Settings..." bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" inset="2" id="2884">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -326,7 +326,7 @@
                                             </connections>
                                         </button>
                                         <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="1112">
-                                            <rect key="frame" x="15" y="137" width="126" height="18"/>
+                                            <rect key="frame" x="15" y="139" width="131" height="18"/>
                                             <buttonCell key="cell" type="check" title="Load subtitle file:" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="2883">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -336,7 +336,7 @@
                                             </connections>
                                         </button>
                                         <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="834">
-                                            <rect key="frame" x="57" y="169" width="204" height="18"/>
+                                            <rect key="frame" x="59" y="170" width="203" height="16"/>
                                             <buttonCell key="cell" type="check" title="Treat as a pipe rather than as a file" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="2882">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="message" size="11"/>
@@ -346,7 +346,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="686">
-                                            <rect key="frame" x="440" y="184" width="102" height="32"/>
+                                            <rect key="frame" x="447" y="185" width="96" height="32"/>
                                             <buttonCell key="cell" type="push" title="Browse..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="2881">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -410,12 +410,9 @@
                                     <subviews>
                                         <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3166">
                                             <rect key="frame" x="163" y="205" width="203" height="26"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="198" id="dwD-kf-qo1"/>
-                                            </constraints>
                                             <popUpButtonCell key="cell" type="push" title="GANGS_OF_NEW_YORK" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3169" id="3167">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="message"/>
                                                 <menu key="menu" title="OtherViews" id="3168">
                                                     <items>
                                                         <menuItem title="GANGS_OF_NEW_YORK" state="on" id="3169"/>
@@ -424,6 +421,9 @@
                                                     </items>
                                                 </menu>
                                             </popUpButtonCell>
+                                            <constraints>
+                                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="198" id="dwD-kf-qo1"/>
+                                            </constraints>
                                             <connections>
                                                 <action selector="discSelectorChanged:" target="-2" id="lMm-4A-mou"/>
                                             </connections>
@@ -442,24 +442,24 @@
                                     <rect key="frame" x="10" y="33" width="556" height="232"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="725">
-                                            <rect key="frame" x="17" y="192" width="30" height="17"/>
+                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="725">
+                                            <rect key="frame" x="17" y="193" width="30" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="URL" usesSingleLineMode="YES" id="2885">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="456" translatesAutoresizingMaskIntoConstraints="NO" id="730" customClass="VLCOpenTextField">
-                                            <rect key="frame" x="52" y="190" width="484" height="22"/>
+                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="456" translatesAutoresizingMaskIntoConstraints="NO" id="730" customClass="VLCOpenTextField">
+                                            <rect key="frame" x="52" y="191" width="484" height="21"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" usesSingleLineMode="YES" id="2886">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="2809" customClass="VLCWrappableTextField">
-                                            <rect key="frame" x="17" y="149" width="521" height="28"/>
+                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="2809">
+                                            <rect key="frame" x="17" y="150" width="521" height="28"/>
                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="2887">
                                                 <font key="font" metaFont="message" size="11"/>
                                                 <string key="title">To Open a usual network stream (HTTP, RTSP, MMS, FTP, etc.), just enter the URL in the field above. If you want to open a RTP or UDP stream, press the button below.</string>
@@ -468,7 +468,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2810">
-                                            <rect key="frame" x="189" y="33" width="179" height="32"/>
+                                            <rect key="frame" x="192" y="33" width="173" height="32"/>
                                             <buttonCell key="cell" type="push" title="Open RTP/UDP Stream" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="2888">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -502,7 +502,7 @@
                                             <rect key="frame" x="216" y="198" width="124" height="26"/>
                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="2889">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="message"/>
                                                 <menu key="menu" title="OtherViews" id="2328">
                                                     <items>
                                                         <menuItem title="Screen" id="2330">
@@ -534,14 +534,14 @@
                                                                     <box title="Title" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="3014" userLabel="Video Box">
                                                                         <rect key="frame" x="-3" y="94" width="522" height="96"/>
                                                                         <view key="contentView" id="5ez-W4-Btp">
-                                                                            <rect key="frame" x="3" y="3" width="516" height="90"/>
+                                                                            <rect key="frame" x="4" y="5" width="514" height="88"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                             <subviews>
                                                                                 <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3071">
-                                                                                    <rect key="frame" x="221" y="26" width="76" height="26"/>
+                                                                                    <rect key="frame" x="221" y="24" width="76" height="26"/>
                                                                                     <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3074" id="3072">
                                                                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                                                        <font key="font" metaFont="system"/>
+                                                                                        <font key="font" metaFont="message"/>
                                                                                         <menu key="menu" title="OtherViews" id="3073">
                                                                                             <items>
                                                                                                 <menuItem title="Item 1" state="on" id="3074"/>
@@ -555,7 +555,7 @@
                                                                                     </connections>
                                                                                 </popUpButton>
                                                                                 <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="3490">
-                                                                                    <rect key="frame" x="15" y="63" width="62" height="18"/>
+                                                                                    <rect key="frame" x="15" y="61" width="62" height="18"/>
                                                                                     <buttonCell key="cell" type="check" title="Video" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3491">
                                                                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                         <font key="font" metaFont="systemBold" size="14"/>
@@ -580,14 +580,14 @@
                                                                     <box title="Title" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="3429" userLabel="Audio Box">
                                                                         <rect key="frame" x="-3" y="-4" width="522" height="96"/>
                                                                         <view key="contentView" id="vMn-AX-cmE">
-                                                                            <rect key="frame" x="3" y="3" width="516" height="90"/>
+                                                                            <rect key="frame" x="4" y="5" width="514" height="88"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                             <subviews>
                                                                                 <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3438">
-                                                                                    <rect key="frame" x="221" y="26" width="76" height="26"/>
+                                                                                    <rect key="frame" x="221" y="24" width="76" height="26"/>
                                                                                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="3439">
                                                                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                                                        <font key="font" metaFont="system"/>
+                                                                                        <font key="font" metaFont="message"/>
                                                                                         <menu key="menu" title="OtherViews" id="3440">
                                                                                             <items>
                                                                                                 <menuItem title="Item 1" id="3443"/>
@@ -601,7 +601,7 @@
                                                                                     </connections>
                                                                                 </popUpButton>
                                                                                 <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="3492">
-                                                                                    <rect key="frame" x="15" y="63" width="62" height="18"/>
+                                                                                    <rect key="frame" x="15" y="61" width="62" height="18"/>
                                                                                     <buttonCell key="cell" type="check" title="Audio" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3493">
                                                                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                         <font key="font" metaFont="systemBold" size="14"/>
@@ -652,7 +652,7 @@
                                                             <customView misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2346" userLabel="Centered Screen View">
                                                                 <rect key="frame" x="48" y="0.0" width="421" height="188"/>
                                                                 <subviews>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2349">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2349">
                                                                         <rect key="frame" x="140" y="134" width="43" height="19"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="43" id="HO8-k1-06b"/>
@@ -671,7 +671,7 @@
                                                                             <outlet property="nextKeyView" destination="2492" id="2765"/>
                                                                         </connections>
                                                                     </textField>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2351">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2351">
                                                                         <rect key="frame" x="15" y="136" width="120" height="14"/>
                                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Frames per Second:" usesSingleLineMode="YES" id="2961">
                                                                             <font key="font" metaFont="message" size="11"/>
@@ -686,7 +686,7 @@
                                                                             <action selector="takeIntValueFrom:" target="2349" id="3471"/>
                                                                         </connections>
                                                                     </stepper>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2492">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2492">
                                                                         <rect key="frame" x="140" y="107" width="43" height="19"/>
                                                                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center" title="0" drawsBackground="YES" id="2963">
                                                                             <font key="font" metaFont="message" size="11"/>
@@ -698,7 +698,7 @@
                                                                             <outlet property="nextKeyView" destination="2496" id="2766"/>
                                                                         </connections>
                                                                     </textField>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2493">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2493">
                                                                         <rect key="frame" x="15" y="109" width="120" height="14"/>
                                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Subscreen left:" usesSingleLineMode="YES" id="2964">
                                                                             <font key="font" metaFont="message" size="11"/>
@@ -706,7 +706,7 @@
                                                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2494">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2494">
                                                                         <rect key="frame" x="140" y="78" width="43" height="19"/>
                                                                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center" title="0" drawsBackground="YES" id="2965">
                                                                             <font key="font" metaFont="message" size="11"/>
@@ -718,7 +718,7 @@
                                                                             <outlet property="nextKeyView" destination="2498" id="2768"/>
                                                                         </connections>
                                                                     </textField>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2495">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2495">
                                                                         <rect key="frame" x="15" y="80" width="120" height="14"/>
                                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Subscreen top:" usesSingleLineMode="YES" id="2966">
                                                                             <font key="font" metaFont="message" size="11"/>
@@ -726,7 +726,7 @@
                                                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2496">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2496">
                                                                         <rect key="frame" x="322" y="107" width="43" height="19"/>
                                                                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center" title="0" drawsBackground="YES" id="2967">
                                                                             <font key="font" metaFont="message" size="11"/>
@@ -738,7 +738,7 @@
                                                                             <outlet property="nextKeyView" destination="2494" id="2767"/>
                                                                         </connections>
                                                                     </textField>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2497">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2497">
                                                                         <rect key="frame" x="221" y="109" width="96" height="14"/>
                                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Subscreen width:" usesSingleLineMode="YES" id="2968">
                                                                             <font key="font" metaFont="message" size="11"/>
@@ -746,7 +746,7 @@
                                                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2498">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2498">
                                                                         <rect key="frame" x="322" y="78" width="43" height="19"/>
                                                                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center" title="0" drawsBackground="YES" id="2969">
                                                                             <font key="font" metaFont="message" size="11"/>
@@ -758,7 +758,7 @@
                                                                             <outlet property="nextKeyView" destination="2508" id="2769"/>
                                                                         </connections>
                                                                     </textField>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2499">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2499">
                                                                         <rect key="frame" x="217" y="80" width="100" height="14"/>
                                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Subscreen height:" usesSingleLineMode="YES" id="2970">
                                                                             <font key="font" metaFont="message" size="11"/>
@@ -766,7 +766,7 @@
                                                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <button misplaced="YES" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2508">
+                                                                    <button mirrorLayoutDirectionWhenInternationalizing="always" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2508">
                                                                         <rect key="frame" x="137" y="56" width="114" height="18"/>
                                                                         <buttonCell key="cell" type="check" title="Follow the mouse" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="2971">
                                                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -804,7 +804,7 @@
                                                                             <action selector="takeIntValueFrom:" target="2498" id="2782"/>
                                                                         </connections>
                                                                     </stepper>
-                                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3462">
+                                                                    <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3462">
                                                                         <rect key="frame" x="15" y="164" width="120" height="14"/>
                                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Screen:" usesSingleLineMode="YES" id="3467">
                                                                             <font key="font" metaFont="message" size="11"/>
@@ -830,11 +830,11 @@
                                                                     <box misplaced="YES" title="Title" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="3504">
                                                                         <rect key="frame" x="17" y="16" width="387" height="34"/>
                                                                         <view key="contentView" id="xDE-mO-H1Z">
-                                                                            <rect key="frame" x="3" y="3" width="381" height="28"/>
+                                                                            <rect key="frame" x="4" y="5" width="379" height="26"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                             <subviews>
                                                                                 <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3506">
-                                                                                    <rect key="frame" x="118" y="1" width="251" height="22"/>
+                                                                                    <rect key="frame" x="118" y="-1" width="251" height="22"/>
                                                                                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" enabled="NO" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="3507">
                                                                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                                         <font key="font" metaFont="message" size="11"/>
@@ -850,8 +850,8 @@
                                                                                         <action selector="qtkAudioChanged:" target="-2" id="TJW-rd-MC9"/>
                                                                                     </connections>
                                                                                 </popUpButton>
-                                                                                <button misplaced="YES" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="3515">
-                                                                                    <rect key="frame" x="14" y="4" width="97" height="18"/>
+                                                                                <button mirrorLayoutDirectionWhenInternationalizing="always" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3515">
+                                                                                    <rect key="frame" x="14" y="2" width="97" height="18"/>
                                                                                     <buttonCell key="cell" type="check" title="Capture Audio" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="3516">
                                                                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                         <font key="font" metaFont="message" size="11"/>
@@ -961,7 +961,7 @@
                         </connections>
                     </tabView>
                     <button identifier="mrl button" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2836">
-                        <rect key="frame" x="20" y="131" width="13" height="13"/>
+                        <rect key="frame" x="20" y="130" width="13" height="13"/>
                         <buttonCell key="cell" type="disclosureTriangle" bezelStyle="disclosure" image="buttonCell:2893:image" imagePosition="above" alignment="center" borderStyle="border" inset="2" id="2893">
                             <behavior key="behavior" pushIn="YES" changeBackground="YES" changeGray="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
@@ -971,16 +971,16 @@
                         </connections>
                     </button>
                     <customView identifier="mrl view" translatesAutoresizingMaskIntoConstraints="NO" id="2837" userLabel="MRL View">
-                        <rect key="frame" x="35" y="90" width="532" height="39"/>
+                        <rect key="frame" x="35" y="89" width="532" height="39"/>
                         <subviews>
                             <box title="Media Resource Locator (MRL)" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2838">
                                 <rect key="frame" x="-3" y="-4" width="538" height="45"/>
                                 <view key="contentView" id="U10-hR-gJf">
-                                    <rect key="frame" x="3" y="3" width="532" height="39"/>
+                                    <rect key="frame" x="4" y="5" width="530" height="37"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="474" translatesAutoresizingMaskIntoConstraints="NO" id="2840">
-                                            <rect key="frame" x="16" y="10" width="500" height="19"/>
+                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="474" translatesAutoresizingMaskIntoConstraints="NO" id="2840">
+                                            <rect key="frame" x="16" y="9" width="498" height="19"/>
                                             <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" usesSingleLineMode="YES" id="2990">
                                                 <font key="font" metaFont="message" size="11"/>
                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -1006,8 +1006,8 @@
                             <constraint firstItem="2838" firstAttribute="centerY" secondItem="2837" secondAttribute="centerY" id="fJw-W6-omc"/>
                         </constraints>
                     </customView>
-                    <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="929">
-                        <rect key="frame" x="18" y="58" width="113" height="18"/>
+                    <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="929">
+                        <rect key="frame" x="18" y="56" width="117" height="18"/>
                         <buttonCell key="cell" type="check" title="Stream output:" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="2890">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
@@ -1017,7 +1017,7 @@
                         </connections>
                     </button>
                     <button identifier="settings button" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1256">
-                        <rect key="frame" x="486" y="49" width="102" height="32"/>
+                        <rect key="frame" x="493" y="48" width="96" height="32"/>
                         <buttonCell key="cell" type="push" title="Settings..." bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" inset="2" id="2891">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -1027,7 +1027,7 @@
                         </connections>
                     </button>
                     <button identifier="open button" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="640">
-                        <rect key="frame" x="486" y="12" width="102" height="32"/>
+                        <rect key="frame" x="493" y="12" width="96" height="32"/>
                         <buttonCell key="cell" type="push" title="Open" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="2867">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -1040,7 +1040,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="641">
-                        <rect key="frame" x="404" y="12" width="82" height="32"/>
+                        <rect key="frame" x="419" y="12" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="2868">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -1053,7 +1053,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kwb-cv-hMZ">
-                        <rect key="frame" x="33" y="131" width="166" height="14"/>
+                        <rect key="frame" x="33" y="130" width="166" height="14"/>
                         <buttonCell key="cell" type="square" title="Media Resource Locator (MRL)" bezelStyle="shadowlessSquare" alignment="left" imageScaling="proportionallyDown" inset="2" id="VXw-Fk-qfp">
                             <behavior key="behavior" lightByContents="YES"/>
                             <font key="font" metaFont="message" size="11"/>
@@ -1093,20 +1093,20 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="37" y="107" width="531" height="324"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="800"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <value key="minSize" type="size" width="213" height="107"/>
-            <view key="contentView" id="1264">
-                <rect key="frame" x="0.0" y="0.0" width="531" height="289"/>
+            <view key="contentView" misplaced="YES" id="1264">
+                <rect key="frame" x="0.0" y="0.0" width="531" height="324"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <box title="Subtitle File" translatesAutoresizingMaskIntoConstraints="NO" id="1267">
-                        <rect key="frame" x="17" y="158" width="497" height="111"/>
+                        <rect key="frame" x="17" y="155" width="495" height="111"/>
                         <view key="contentView" id="c0q-Fr-KVn">
-                            <rect key="frame" x="3" y="3" width="491" height="91"/>
+                            <rect key="frame" x="4" y="5" width="487" height="89"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1266">
-                                    <rect key="frame" x="384" y="46" width="96" height="32"/>
+                                    <rect key="frame" x="387" y="45" width="90" height="32"/>
                                     <buttonCell key="cell" type="push" title="Browse..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="2895">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -1115,16 +1115,16 @@
                                         <action selector="subFileBrowse:" target="-2" id="Fno-mE-c9n"/>
                                     </connections>
                                 </button>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1274">
-                                    <rect key="frame" x="353" y="15" width="24" height="16"/>
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1274">
+                                    <rect key="frame" x="349" y="16" width="24" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="fps" usesSingleLineMode="YES" id="2896">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1275">
-                                    <rect key="frame" x="382" y="13" width="70" height="21"/>
+                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1275">
+                                    <rect key="frame" x="378" y="14" width="70" height="21"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="0" drawsBackground="YES" id="2897">
                                         <numberFormatter key="formatter" formatterBehavior="custom10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="Mlw-Rg-ocy">
                                             <real key="minimum" value="0.0"/>
@@ -1143,22 +1143,22 @@
                                     </connections>
                                 </textField>
                                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1276">
-                                    <rect key="frame" x="458" y="9" width="19" height="28"/>
+                                    <rect key="frame" x="454" y="10" width="19" height="28"/>
                                     <stepperCell key="cell" continuous="YES" alignment="left" increment="0.20000000000000001" maxValue="100" id="2898"/>
                                     <connections>
                                         <binding destination="-2" name="value" keyPath="self.fileSubFps" id="Tjy-DO-Rbd"/>
                                     </connections>
                                 </stepper>
-                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1278">
-                                    <rect key="frame" x="214" y="15" width="37" height="16"/>
+                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1278">
+                                    <rect key="frame" x="210" y="16" width="37" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="delay" usesSingleLineMode="YES" id="2899">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1279">
-                                    <rect key="frame" x="256" y="13" width="70" height="21"/>
+                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1279">
+                                    <rect key="frame" x="252" y="14" width="70" height="21"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="70" id="9an-Lk-17c"/>
                                     </constraints>
@@ -1180,14 +1180,14 @@
                                     </connections>
                                 </textField>
                                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="1280">
-                                    <rect key="frame" x="331" y="9" width="19" height="28"/>
+                                    <rect key="frame" x="327" y="10" width="19" height="28"/>
                                     <stepperCell key="cell" continuous="YES" alignment="left" increment="0.5" minValue="-10000" maxValue="10000" id="2901"/>
                                     <connections>
                                         <binding destination="-2" name="value" keyPath="self.fileSubDelay" id="Cpm-Ab-isP"/>
                                     </connections>
                                 </stepper>
                                 <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="1336">
-                                    <rect key="frame" x="15" y="14" width="75" height="18"/>
+                                    <rect key="frame" x="15" y="15" width="79" height="18"/>
                                     <buttonCell key="cell" type="check" title="Override" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="2902">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -1197,23 +1197,23 @@
                                     </connections>
                                 </button>
                                 <imageView translatesAutoresizingMaskIntoConstraints="NO" id="3371">
-                                    <rect key="frame" x="17" y="48" width="32" height="32"/>
+                                    <rect key="frame" x="17" y="46" width="32" height="32"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="32" id="ZPL-jA-txx"/>
                                         <constraint firstAttribute="height" constant="32" id="ljP-vi-77k"/>
                                     </constraints>
                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="generic" id="3376"/>
                                 </imageView>
-                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3372">
-                                    <rect key="frame" x="54" y="56" width="83" height="16"/>
+                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3372">
+                                    <rect key="frame" x="54" y="54" width="83" height="16"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Choose a file" id="3375">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3373">
-                                    <rect key="frame" x="54" y="56" width="278" height="16"/>
+                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3373">
+                                    <rect key="frame" x="54" y="54" width="278" height="16"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="bla bla bla.movbla bla bla.movbla bla bla.mov" id="3374">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1256,7 +1256,7 @@
                         <font key="titleFont" metaFont="system"/>
                     </box>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1304">
-                        <rect key="frame" x="421" y="12" width="96" height="32"/>
+                        <rect key="frame" x="427" y="12" width="90" height="32"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="2903">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -1269,21 +1269,21 @@
                         </connections>
                     </button>
                     <box title="Font Properties" translatesAutoresizingMaskIntoConstraints="NO" id="2137">
-                        <rect key="frame" x="17" y="52" width="497" height="101"/>
+                        <rect key="frame" x="17" y="49" width="497" height="101"/>
                         <view key="contentView" id="46J-Uu-Jvw">
-                            <rect key="frame" x="3" y="3" width="491" height="81"/>
+                            <rect key="frame" x="4" y="5" width="489" height="79"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2139">
-                                    <rect key="frame" x="20" y="18" width="144" height="16"/>
+                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2139">
+                                    <rect key="frame" x="20" y="16" width="144" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Subtitles text encoding" usesSingleLineMode="YES" id="2904">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2142">
-                                    <rect key="frame" x="20" y="51" width="125" height="16"/>
+                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2142">
+                                    <rect key="frame" x="20" y="49" width="125" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Subtitle justification" usesSingleLineMode="YES" id="2905">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1291,13 +1291,10 @@
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2153">
-                                    <rect key="frame" x="349" y="45" width="130" height="26"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="125" id="CaP-RX-nlL"/>
-                                    </constraints>
+                                    <rect key="frame" x="346" y="42" width="132" height="27"/>
                                     <popUpButtonCell key="cell" type="push" title="Left" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2149" id="2906">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
+                                        <font key="font" metaFont="message"/>
                                         <menu key="menu" title="OtherViews" id="2150">
                                             <items>
                                                 <menuItem title="Left" state="on" id="2149"/>
@@ -1305,12 +1302,15 @@
                                             </items>
                                         </menu>
                                     </popUpButtonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="125" id="CaP-RX-nlL"/>
+                                    </constraints>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2158">
-                                    <rect key="frame" x="349" y="12" width="130" height="26"/>
+                                    <rect key="frame" x="346" y="9" width="132" height="27"/>
                                     <popUpButtonCell key="cell" type="push" title="System Default" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2154" id="2907">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
+                                        <font key="font" metaFont="message"/>
                                         <menu key="menu" title="OtherViews" id="2157">
                                             <items>
                                                 <menuItem title="System Default" state="on" id="2154"/>
@@ -1362,14 +1362,14 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="246" y="437" width="696" height="250"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="800"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <value key="minSize" type="size" width="213" height="107"/>
-            <view key="contentView" id="2793">
-                <rect key="frame" x="0.0" y="0.0" width="696" height="249"/>
+            <view key="contentView" misplaced="YES" id="2793">
+                <rect key="frame" x="0.0" y="0.0" width="696" height="250"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autosizesCells="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2794">
-                        <rect key="frame" x="168" y="155" width="120" height="48"/>
+                        <rect key="frame" x="168" y="154" width="120" height="48"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="48" id="Yd6-Rr-hgY"/>
                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="d4I-AJ-V0j"/>
@@ -1397,24 +1397,24 @@
                             <action selector="openNetModeChanged:" target="-2" id="Mp3-t0-2g5"/>
                         </connections>
                     </matrix>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" translatesAutoresizingMaskIntoConstraints="NO" id="2797">
-                        <rect key="frame" x="377" y="186" width="30" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" translatesAutoresizingMaskIntoConstraints="NO" id="2797">
+                        <rect key="frame" x="377" y="185" width="30" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Port" usesSingleLineMode="YES" id="2976">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" translatesAutoresizingMaskIntoConstraints="NO" id="2798">
-                        <rect key="frame" x="338" y="158" width="69" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" translatesAutoresizingMaskIntoConstraints="NO" id="2798">
+                        <rect key="frame" x="338" y="157" width="69" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="IP Address" usesSingleLineMode="YES" id="2977">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2799" customClass="VLCOpenTextField">
-                        <rect key="frame" x="412" y="184" width="78" height="21"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2799" customClass="VLCOpenTextField">
+                        <rect key="frame" x="412" y="183" width="78" height="21"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="78" id="pW6-zg-Iah"/>
                         </constraints>
@@ -1428,14 +1428,14 @@
                         </connections>
                     </textField>
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2800">
-                        <rect key="frame" x="495" y="180" width="19" height="28"/>
+                        <rect key="frame" x="495" y="179" width="19" height="28"/>
                         <stepperCell key="cell" continuous="YES" alignment="left" maxValue="65535" doubleValue="1234" valueWraps="YES" id="2979"/>
                         <connections>
                             <action selector="openNetStepperChanged:" target="-2" id="cOb-FE-uz7"/>
                         </connections>
                     </stepper>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2801" customClass="VLCOpenTextField">
-                        <rect key="frame" x="412" y="156" width="119" height="21"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2801" customClass="VLCOpenTextField">
+                        <rect key="frame" x="412" y="155" width="119" height="21"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="119" id="5hI-l9-myn"/>
                         </constraints>
@@ -1445,8 +1445,8 @@
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="760" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2802">
-                        <rect key="frame" x="543" y="158" width="49" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="760" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2802">
+                        <rect key="frame" x="543" y="157" width="49" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="DDD-Jw-3lI"/>
                         </constraints>
@@ -1456,8 +1456,8 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2803" customClass="VLCOpenTextField">
-                        <rect key="frame" x="597" y="156" width="58" height="21"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2803" customClass="VLCOpenTextField">
+                        <rect key="frame" x="597" y="155" width="58" height="21"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="58" id="LHb-P2-YuL"/>
                         </constraints>
@@ -1471,14 +1471,14 @@
                         </connections>
                     </textField>
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="2804">
-                        <rect key="frame" x="660" y="152" width="19" height="28"/>
+                        <rect key="frame" x="660" y="151" width="19" height="28"/>
                         <stepperCell key="cell" continuous="YES" alignment="left" tag="1" maxValue="65535" doubleValue="1234" valueWraps="YES" id="2983"/>
                         <connections>
                             <action selector="openNetStepperChanged:" target="-2" id="TlS-ML-UbZ"/>
                         </connections>
                     </stepper>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2807">
-                        <rect key="frame" x="609" y="12" width="73" height="32"/>
+                        <rect key="frame" x="616" y="12" width="67" height="32"/>
                         <buttonCell key="cell" type="push" title="Open" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="2984">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -1491,7 +1491,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2808">
-                        <rect key="frame" x="527" y="12" width="82" height="32"/>
+                        <rect key="frame" x="542" y="12" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="2985">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -1503,8 +1503,8 @@
                             <action selector="openNetUDPButtonAction:" target="-2" id="jxT-wR-kT9"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="2811" customClass="VLCWrappableTextField">
-                        <rect key="frame" x="17" y="57" width="662" height="70"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="2811">
+                        <rect key="frame" x="17" y="56" width="662" height="70"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="2986">
                             <font key="font" metaFont="message" size="11"/>
                             <string key="title">If you want to open a multicast stream, enter the respective IP address given by the stream provider. In unicast mode, VLC uses your machine's IP automatically.
@@ -1515,24 +1515,24 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2852">
-                        <rect key="frame" x="34" y="213" width="55" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2852">
+                        <rect key="frame" x="34" y="212" width="55" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Protocol" usesSingleLineMode="YES" id="2987">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2853">
-                        <rect key="frame" x="166" y="213" width="124" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2853">
+                        <rect key="frame" x="166" y="212" width="124" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Mode" usesSingleLineMode="YES" id="2988">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2854">
-                        <rect key="frame" x="353" y="213" width="54" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2854">
+                        <rect key="frame" x="353" y="212" width="54" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Address" usesSingleLineMode="YES" id="2989">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -1540,7 +1540,7 @@
                         </textFieldCell>
                     </textField>
                     <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autosizesCells="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2860">
-                        <rect key="frame" x="36" y="155" width="92" height="48"/>
+                        <rect key="frame" x="36" y="154" width="92" height="48"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="48" id="sOX-j9-zbu"/>
                         </constraints>
@@ -1612,7 +1612,7 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3081">
-                    <rect key="frame" x="31" y="85" width="233" height="32"/>
+                    <rect key="frame" x="33" y="86" width="229" height="32"/>
                     <buttonCell key="cell" type="push" title="Open VIDEO_TS or BDMV folder" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3088">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -1621,7 +1621,7 @@
                         <action selector="openSpecialMediaFolder:" target="-2" id="PGL-xT-u1u"/>
                     </connections>
                 </button>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3084">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3084">
                     <rect key="frame" x="114" y="173" width="68" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Audio CD" usesSingleLineMode="YES" id="3085">
                         <font key="font" metaFont="systemBold"/>
@@ -1629,8 +1629,8 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3104">
-                    <rect key="frame" x="118" y="157" width="59" height="14"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3104">
+                    <rect key="frame" x="118" y="157" width="60" height="14"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="%i tracks " usesSingleLineMode="YES" id="3105">
                         <font key="font" metaFont="message" size="11"/>
                         <color key="textColor" name="disabledControlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1658,7 +1658,7 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3096">
-                    <rect key="frame" x="31" y="85" width="233" height="32"/>
+                    <rect key="frame" x="33" y="86" width="229" height="32"/>
                     <buttonCell key="cell" type="push" title="Open VIDEO_TS or BDMV folder" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3099">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -1667,7 +1667,7 @@
                         <action selector="openSpecialMediaFolder:" target="-2" id="JMW-uG-By3"/>
                     </connections>
                 </button>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3094">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3094">
                     <rect key="frame" x="104" y="173" width="88" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Insert a disc" usesSingleLineMode="YES" id="3101">
                         <font key="font" metaFont="systemBold"/>
@@ -1692,7 +1692,7 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3108">
-                    <rect key="frame" x="31" y="85" width="233" height="32"/>
+                    <rect key="frame" x="33" y="86" width="229" height="32"/>
                     <buttonCell key="cell" type="push" title="Open VIDEO_TS or BDMV folder" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="3113">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -1702,7 +1702,7 @@
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3183">
-                    <rect key="frame" x="83" y="140" width="130" height="27"/>
+                    <rect key="frame" x="82" y="139" width="132" height="27"/>
                     <buttonCell key="cell" type="push" title="Disable DVD menus" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="3184">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="message" size="11"/>
@@ -1711,8 +1711,8 @@
                         <action selector="dvdreadOptionChanged:" target="-2" id="1xF-jH-wsI"/>
                     </connections>
                 </button>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3110">
-                    <rect key="frame" x="109" y="172" width="78" height="16"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3110">
+                    <rect key="frame" x="108" y="170" width="80" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="DVD_TITLE" usesSingleLineMode="YES" id="3111">
                         <font key="font" metaFont="systemBold"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1740,24 +1740,24 @@
             <rect key="frame" x="0.0" y="0.0" width="295" height="205"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3148">
-                    <rect key="frame" x="54" y="91" width="47" height="14"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3148">
+                    <rect key="frame" x="52" y="93" width="46" height="14"/>
                     <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Chapter" usesSingleLineMode="YES" id="3159">
                         <font key="font" metaFont="message" size="11"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3149">
-                    <rect key="frame" x="73" y="121" width="28" height="14"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3149">
+                    <rect key="frame" x="71" y="123" width="27" height="14"/>
                     <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Title" usesSingleLineMode="YES" id="3158">
                         <font key="font" metaFont="message" size="11"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3150">
-                    <rect key="frame" x="106" y="118" width="152" height="19"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3150">
+                    <rect key="frame" x="103" y="120" width="152" height="19"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="152" id="P9Y-Jr-mkf"/>
                     </constraints>
@@ -1770,8 +1770,8 @@
                         <action selector="dvdreadOptionChanged:" target="-2" id="kcG-pd-mkp"/>
                     </connections>
                 </textField>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3151">
-                    <rect key="frame" x="106" y="88" width="152" height="19"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3151">
+                    <rect key="frame" x="103" y="90" width="152" height="19"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="152" id="SfY-bP-G6B"/>
                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="152" id="WNu-Q2-wZw"/>
@@ -1786,7 +1786,7 @@
                     </connections>
                 </textField>
                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3152">
-                    <rect key="frame" x="263" y="116" width="15" height="22"/>
+                    <rect key="frame" x="260" y="118" width="15" height="22"/>
                     <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="1" maxValue="999" doubleValue="1" valueWraps="YES" id="3155">
                         <font key="font" metaFont="message" size="11"/>
                     </stepperCell>
@@ -1795,7 +1795,7 @@
                     </connections>
                 </stepper>
                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="3153">
-                    <rect key="frame" x="263" y="86" width="15" height="22"/>
+                    <rect key="frame" x="260" y="88" width="15" height="22"/>
                     <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" tag="1" minValue="1" maxValue="999" doubleValue="1" valueWraps="YES" id="3154">
                         <font key="font" metaFont="message" size="11"/>
                     </stepperCell>
@@ -1804,7 +1804,7 @@
                     </connections>
                 </stepper>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3186">
-                    <rect key="frame" x="31" y="44" width="233" height="32"/>
+                    <rect key="frame" x="33" y="44" width="229" height="32"/>
                     <buttonCell key="cell" type="push" title="Open VIDEO_TS or BDMV folder" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3189">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -1814,7 +1814,7 @@
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3192">
-                    <rect key="frame" x="85" y="141" width="126" height="27"/>
+                    <rect key="frame" x="84" y="142" width="128" height="27"/>
                     <buttonCell key="cell" type="push" title="Enable DVD menus" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="3195">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="message" size="11"/>
@@ -1823,8 +1823,8 @@
                         <action selector="dvdreadOptionChanged:" target="-2" id="QNN-GH-YXF"/>
                     </connections>
                 </button>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3193">
-                    <rect key="frame" x="109" y="173" width="78" height="16"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3193">
+                    <rect key="frame" x="108" y="173" width="80" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="DVD_TITLE" usesSingleLineMode="YES" id="3194">
                         <font key="font" metaFont="systemBold"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1866,24 +1866,24 @@
             <rect key="frame" x="0.0" y="0.0" width="295" height="205"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3243">
-                    <rect key="frame" x="54" y="91" width="47" height="14"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3243">
+                    <rect key="frame" x="52" y="91" width="46" height="14"/>
                     <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Chapter" usesSingleLineMode="YES" id="3244">
                         <font key="font" metaFont="message" size="11"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3242">
-                    <rect key="frame" x="73" y="121" width="28" height="14"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3242">
+                    <rect key="frame" x="71" y="121" width="27" height="14"/>
                     <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Title" usesSingleLineMode="YES" id="3245">
                         <font key="font" metaFont="message" size="11"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3241">
-                    <rect key="frame" x="106" y="118" width="152" height="19"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3241">
+                    <rect key="frame" x="103" y="118" width="152" height="19"/>
                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="1" drawsBackground="YES" id="3246">
                         <font key="font" metaFont="message" size="11"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1893,8 +1893,8 @@
                         <action selector="vcdOptionChanged:" target="-2" id="gIZ-a1-Uco"/>
                     </connections>
                 </textField>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3240">
-                    <rect key="frame" x="106" y="88" width="152" height="19"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3240">
+                    <rect key="frame" x="103" y="88" width="152" height="19"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="152" id="mo1-bK-5VC"/>
                     </constraints>
@@ -1908,7 +1908,7 @@
                     </connections>
                 </textField>
                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3239">
-                    <rect key="frame" x="263" y="116" width="15" height="22"/>
+                    <rect key="frame" x="260" y="116" width="15" height="22"/>
                     <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="1" maxValue="999" doubleValue="1" valueWraps="YES" id="3248">
                         <font key="font" metaFont="message" size="11"/>
                     </stepperCell>
@@ -1917,7 +1917,7 @@
                     </connections>
                 </stepper>
                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="3238">
-                    <rect key="frame" x="263" y="86" width="15" height="22"/>
+                    <rect key="frame" x="260" y="86" width="15" height="22"/>
                     <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" tag="1" minValue="1" maxValue="999" doubleValue="1" valueWraps="YES" id="3249">
                         <font key="font" metaFont="message" size="11"/>
                     </stepperCell>
@@ -1926,7 +1926,7 @@
                     </connections>
                 </stepper>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3237">
-                    <rect key="frame" x="31" y="45" width="233" height="32"/>
+                    <rect key="frame" x="33" y="46" width="229" height="32"/>
                     <buttonCell key="cell" type="push" title="Open VIDEO_TS or BDMV folder" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3250">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -1935,8 +1935,8 @@
                         <action selector="openSpecialMediaFolder:" target="-2" id="2CS-0k-grY"/>
                     </connections>
                 </button>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3234">
-                    <rect key="frame" x="109" y="173" width="78" height="16"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3234">
+                    <rect key="frame" x="108" y="173" width="80" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="VCD_TITLE" usesSingleLineMode="YES" id="3253">
                         <font key="font" metaFont="systemBold"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1977,7 +1977,7 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3293">
-                    <rect key="frame" x="31" y="85" width="233" height="32"/>
+                    <rect key="frame" x="33" y="86" width="229" height="32"/>
                     <buttonCell key="cell" type="push" title="Open VIDEO_TS or BDMV folder" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3294">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -1986,8 +1986,8 @@
                         <action selector="openSpecialMediaFolder:" target="-2" id="r36-Sr-6wo"/>
                     </connections>
                 </button>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3291">
-                    <rect key="frame" x="114" y="172" width="68" height="16"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3291">
+                    <rect key="frame" x="112" y="172" width="71" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="BD_TITLE" usesSingleLineMode="YES" id="3296">
                         <font key="font" metaFont="systemBold"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -2012,53 +2012,54 @@
         <image name="buttonCell:2893:image" width="1" height="1">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
-S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCgpMDM2PD9VJG51bGzWDQ4PEBESExQVFhcYVk5T
+S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCkqMTQ3PUBVJG51bGzWDQ4PEBESExQVFhcYVk5T
 U2l6ZV5OU1Jlc2l6aW5nTW9kZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVwc1dOU0NvbG9ygAIQAIAN
-EiDDAACAA4ALVnsxLCAxfdIbDxweWk5TLm9iamVjdHOhHYAEgArSGw8gI6IhIoAFgAaACdIlDyYnXxAU
-TlNUSUZGUmVwcmVzZW50YXRpb26AB4AITxEIxE1NACoAAAAKAAAAEAEAAAMAAAABAAEAAAEBAAMAAAAB
-AAEAAAECAAMAAAACAAgACAEDAAMAAAABAAEAAAEGAAMAAAABAAEAAAEKAAMAAAABAAEAAAERAAQAAAAB
-AAAACAESAAMAAAABAAEAAAEVAAMAAAABAAIAAAEWAAMAAAABAAEAAAEXAAQAAAABAAAAAgEcAAMAAAAB
-AAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAACAAEAAYdzAAcAAAf0AAAA0AAAAAAAAAf0
-YXBwbAIgAABtbnRyR1JBWVhZWiAH0AACAA4ADAAAAABhY3NwQVBQTAAAAABub25lAAAAAAAAAAAAAAAA
-AAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAVkZXNjAAAAwAAAAG9kc2NtAAABMAAABmZjcHJ0AAAHmAAAADh3dHB0AAAH0AAAABRrVFJD
-AAAH5AAAAA5kZXNjAAAAAAAAABVHZW5lcmljIEdyYXkgUHJvZmlsZQAAAAAAAAAAAAAAFUdlbmVyaWMg
-R3JheSBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-bWx1YwAAAAAAAAAfAAAADHNrU0sAAAAqAAABhGVuVVMAAAAoAAABrmNhRVMAAAAsAAAB1nZpVk4AAAAs
-AAACAnB0QlIAAAAqAAACLnVrVUEAAAAsAAACWGZyRlUAAAAqAAAChGh1SFUAAAAuAAACrnpoVFcAAAAQ
-AAAC3G5iTk8AAAAsAAAC7GtvS1IAAAAYAAADGGNzQ1oAAAAkAAADMGhlSUwAAAAgAAADVHJvUk8AAAAk
-AAADdGRlREUAAAA6AAADmGl0SVQAAAAuAAAD0nN2U0UAAAAuAAAEAHpoQ04AAAAQAAAELmphSlAAAAAW
-AAAEPmVsR1IAAAAkAAAEVHB0UE8AAAA4AAAEeG5sTkwAAAAqAAAEsGVzRVMAAAAoAAAE2nRoVEgAAAAk
-AAAFAnRyVFIAAAAiAAAFJmZpRkkAAAAsAAAFSGhySFIAAAA6AAAFdHBsUEwAAAA2AAAFrnJ1UlUAAAAm
-AAAF5GFyRUcAAAAoAAAGCmRhREsAAAA0AAAGMgBWAWEAZQBvAGIAZQBjAG4A/QAgAHMAaQB2AP0AIABw
-AHIAbwBmAGkAbABHAGUAbgBlAHIAaQBjACAARwByAGEAeQAgAFAAcgBvAGYAaQBsAGUAUABlAHIAZgBp
-AGwAIABkAGUAIABnAHIAaQBzACAAZwBlAG4A6AByAGkAYwBDHqUAdQAgAGgA7ABuAGgAIABNAOAAdQAg
-AHgA4QBtACAAQwBoAHUAbgBnAFAAZQByAGYAaQBsACAAQwBpAG4AegBhACAARwBlAG4A6QByAGkAYwBv
-BBcEMAQzBDAEOwRMBD0EOAQ5ACAEPwRABD4ERAQwBDkEOwAgAEcAcgBhAHkAUAByAG8AZgBpAGwAIABn
-AOkAbgDpAHIAaQBxAHUAZQAgAGcAcgBpAHMAwQBsAHQAYQBsAOEAbgBvAHMAIABzAHoA/AByAGsAZQAg
-AHAAcgBvAGYAaQBskBp1KHBwlo6Ccl9pY8+P8ABHAGUAbgBlAHIAaQBzAGsAIABnAHIA5QB0AG8AbgBl
-AHAAcgBvAGYAaQBsx3y8GAAgAEcAcgBhAHkAINUEuFzTDMd8AE8AYgBlAGMAbgD9ACABYQBlAGQA/QAg
-AHAAcgBvAGYAaQBsBeQF6AXVBeQF2QXcACAARwByAGEAeQAgBdsF3AXcBdkAUAByAG8AZgBpAGwAIABn
-AHIAaQAgAGcAZQBuAGUAcgBpAGMAQQBsAGwAZwBlAG0AZQBpAG4AZQBzACAARwByAGEAdQBzAHQAdQBm
-AGUAbgAtAFAAcgBvAGYAaQBsAFAAcgBvAGYAaQBsAG8AIABnAHIAaQBnAGkAbwAgAGcAZQBuAGUAcgBp
-AGMAbwBHAGUAbgBlAHIAaQBzAGsAIABnAHIA5QBzAGsAYQBsAGUAcAByAG8AZgBpAGxmbpAacHBepmPP
-j/Blh072TgCCLDCwMOwwpDDXMO0w1TChMKQw6wOTA7UDvQO5A7oDzAAgA8ADwQO/A8YDrwO7ACADswO6
-A8EDuQBQAGUAcgBmAGkAbAAgAGcAZQBuAOkAcgBpAGMAbwAgAGQAZQAgAGMAaQBuAHoAZQBuAHQAbwBz
-AEEAbABnAGUAbQBlAGUAbgAgAGcAcgBpAGoAcwBwAHIAbwBmAGkAZQBsAFAAZQByAGYAaQBsACAAZwBy
-AGkAcwAgAGcAZQBuAOkAcgBpAGMAbw5CDhsOIw5EDh8OJQ5MDioONQ5ADhcOMg4XDjEOSA4nDkQOGwBH
-AGUAbgBlAGwAIABHAHIAaQAgAFAAcgBvAGYAaQBsAGkAWQBsAGUAaQBuAGUAbgAgAGgAYQByAG0AYQBh
-AHAAcgBvAGYAaQBpAGwAaQBHAGUAbgBlAHIAaQENAGsAaQAgAHAAcgBvAGYAaQBsACAAcwBpAHYAaQBo
-ACAAdABvAG4AbwB2AGEAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcAByAG8AZgBpAGwAIABzAHoAYQBy
-AG8BWwBjAGkEHgQxBEkEOAQ5ACAEQQQ1BEAESwQ5ACAEPwRABD4ERAQ4BDsETAZFBkQGQQAgBioGOQYx
-BkoGQQAgAEcAcgBhAHkAIAYnBkQGOQYnBkUARwBlAG4AZQByAGUAbAAgAGcAcgDlAHQAbwBuAGUAYgBl
-AHMAawByAGkAdgBlAGwAcwBlAAB0ZXh0AAAAAENvcHlyaWdodCAyMDA3IEFwcGxlIEluYy4sIGFsbCBy
-aWdodHMgcmVzZXJ2ZWQuAFhZWiAAAAAAAADzUQABAAAAARbMY3VydgAAAAAAAAABAc0AANIqKywtWiRj
-bGFzc25hbWVYJGNsYXNzZXNfEBBOU0JpdG1hcEltYWdlUmVwoywuL1pOU0ltYWdlUmVwWE5TT2JqZWN0
-0iorMTJXTlNBcnJheaIxL9IqKzQ1Xk5TTXV0YWJsZUFycmF5ozQxL9M3OA85OjtXTlNXaGl0ZVxOU0Nv
-bG9yU3BhY2VEMCAwABADgAzSKis9PldOU0NvbG9yoj0v0iorQEFXTlNJbWFnZaJALwAIABEAGgAkACkA
-MgA3AEkATABRAFMAYgBoAHUAfACLAJIAnwCmAK4AsACyALQAuQC7AL0AxADJANQA1gDYANoA3wDiAOQA
-5gDoAO0BBAEGAQgJ0AnVCeAJ6Qn8CgAKCwoUChkKIQokCikKOAo8CkMKSwpYCl0KXwphCmYKbgpxCnYK
-fgAAAAAAAAIBAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAqBA
+EiDDAACAA4ALVnsxLCAxfdIbDxweWk5TLm9iamVjdHOhHYAEgArSGw8gI6IhIoAFgAaACdMPJSYnKBRf
+EBROU1RJRkZSZXByZXNlbnRhdGlvbl8QGU5TSW50ZXJuYWxMYXlvdXREaXJlY3Rpb26ACIAHTxEIxE1N
+ACoAAAAKAAAAEAEAAAMAAAABAAEAAAEBAAMAAAABAAEAAAECAAMAAAACAAgACAEDAAMAAAABAAEAAAEG
+AAMAAAABAAEAAAEKAAMAAAABAAEAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAIAAAEW
+AAMAAAABAAEAAAEXAAQAAAABAAAAAgEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFT
+AAMAAAACAAEAAYdzAAcAAAf0AAAA0AAAAAAAAAf0YXBwbAIgAABtbnRyR1JBWVhZWiAH0AACAA4ADAAA
+AABhY3NwQVBQTAAAAABub25lAAAAAAAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVkZXNjAAAAwAAAAG9kc2NtAAABMAAA
+BmZjcHJ0AAAHmAAAADh3dHB0AAAH0AAAABRrVFJDAAAH5AAAAA5kZXNjAAAAAAAAABVHZW5lcmljIEdy
+YXkgUHJvZmlsZQAAAAAAAAAAAAAAFUdlbmVyaWMgR3JheSBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbWx1YwAAAAAAAAAfAAAADHNrU0sAAAAqAAABhGVu
+VVMAAAAoAAABrmNhRVMAAAAsAAAB1nZpVk4AAAAsAAACAnB0QlIAAAAqAAACLnVrVUEAAAAsAAACWGZy
+RlUAAAAqAAAChGh1SFUAAAAuAAACrnpoVFcAAAAQAAAC3G5iTk8AAAAsAAAC7GtvS1IAAAAYAAADGGNz
+Q1oAAAAkAAADMGhlSUwAAAAgAAADVHJvUk8AAAAkAAADdGRlREUAAAA6AAADmGl0SVQAAAAuAAAD0nN2
+U0UAAAAuAAAEAHpoQ04AAAAQAAAELmphSlAAAAAWAAAEPmVsR1IAAAAkAAAEVHB0UE8AAAA4AAAEeG5s
+TkwAAAAqAAAEsGVzRVMAAAAoAAAE2nRoVEgAAAAkAAAFAnRyVFIAAAAiAAAFJmZpRkkAAAAsAAAFSGhy
+SFIAAAA6AAAFdHBsUEwAAAA2AAAFrnJ1UlUAAAAmAAAF5GFyRUcAAAAoAAAGCmRhREsAAAA0AAAGMgBW
+AWEAZQBvAGIAZQBjAG4A/QAgAHMAaQB2AP0AIABwAHIAbwBmAGkAbABHAGUAbgBlAHIAaQBjACAARwBy
+AGEAeQAgAFAAcgBvAGYAaQBsAGUAUABlAHIAZgBpAGwAIABkAGUAIABnAHIAaQBzACAAZwBlAG4A6ABy
+AGkAYwBDHqUAdQAgAGgA7ABuAGgAIABNAOAAdQAgAHgA4QBtACAAQwBoAHUAbgBnAFAAZQByAGYAaQBs
+ACAAQwBpAG4AegBhACAARwBlAG4A6QByAGkAYwBvBBcEMAQzBDAEOwRMBD0EOAQ5ACAEPwRABD4ERAQw
+BDkEOwAgAEcAcgBhAHkAUAByAG8AZgBpAGwAIABnAOkAbgDpAHIAaQBxAHUAZQAgAGcAcgBpAHMAwQBs
+AHQAYQBsAOEAbgBvAHMAIABzAHoA/AByAGsAZQAgAHAAcgBvAGYAaQBskBp1KHBwlo6Ccl9pY8+P8ABH
+AGUAbgBlAHIAaQBzAGsAIABnAHIA5QB0AG8AbgBlAHAAcgBvAGYAaQBsx3y8GAAgAEcAcgBhAHkAINUE
+uFzTDMd8AE8AYgBlAGMAbgD9ACABYQBlAGQA/QAgAHAAcgBvAGYAaQBsBeQF6AXVBeQF2QXcACAARwBy
+AGEAeQAgBdsF3AXcBdkAUAByAG8AZgBpAGwAIABnAHIAaQAgAGcAZQBuAGUAcgBpAGMAQQBsAGwAZwBl
+AG0AZQBpAG4AZQBzACAARwByAGEAdQBzAHQAdQBmAGUAbgAtAFAAcgBvAGYAaQBsAFAAcgBvAGYAaQBs
+AG8AIABnAHIAaQBnAGkAbwAgAGcAZQBuAGUAcgBpAGMAbwBHAGUAbgBlAHIAaQBzAGsAIABnAHIA5QBz
+AGsAYQBsAGUAcAByAG8AZgBpAGxmbpAacHBepmPPj/Blh072TgCCLDCwMOwwpDDXMO0w1TChMKQw6wOT
+A7UDvQO5A7oDzAAgA8ADwQO/A8YDrwO7ACADswO6A8EDuQBQAGUAcgBmAGkAbAAgAGcAZQBuAOkAcgBp
+AGMAbwAgAGQAZQAgAGMAaQBuAHoAZQBuAHQAbwBzAEEAbABnAGUAbQBlAGUAbgAgAGcAcgBpAGoAcwBw
+AHIAbwBmAGkAZQBsAFAAZQByAGYAaQBsACAAZwByAGkAcwAgAGcAZQBuAOkAcgBpAGMAbw5CDhsOIw5E
+Dh8OJQ5MDioONQ5ADhcOMg4XDjEOSA4nDkQOGwBHAGUAbgBlAGwAIABHAHIAaQAgAFAAcgBvAGYAaQBs
+AGkAWQBsAGUAaQBuAGUAbgAgAGgAYQByAG0AYQBhAHAAcgBvAGYAaQBpAGwAaQBHAGUAbgBlAHIAaQEN
+AGsAaQAgAHAAcgBvAGYAaQBsACAAcwBpAHYAaQBoACAAdABvAG4AbwB2AGEAVQBuAGkAdwBlAHIAcwBh
+AGwAbgB5ACAAcAByAG8AZgBpAGwAIABzAHoAYQByAG8BWwBjAGkEHgQxBEkEOAQ5ACAEQQQ1BEAESwQ5
+ACAEPwRABD4ERAQ4BDsETAZFBkQGQQAgBioGOQYxBkoGQQAgAEcAcgBhAHkAIAYnBkQGOQYnBkUARwBl
+AG4AZQByAGUAbAAgAGcAcgDlAHQAbwBuAGUAYgBlAHMAawByAGkAdgBlAGwAcwBlAAB0ZXh0AAAAAENv
+cHlyaWdodCAyMDA3IEFwcGxlIEluYy4sIGFsbCByaWdodHMgcmVzZXJ2ZWQuAFhZWiAAAAAAAADzUQAB
+AAAAARbMY3VydgAAAAAAAAABAc0AANIrLC0uWiRjbGFzc25hbWVYJGNsYXNzZXNfEBBOU0JpdG1hcElt
+YWdlUmVwoy0vMFpOU0ltYWdlUmVwWE5TT2JqZWN00issMjNXTlNBcnJheaIyMNIrLDU2Xk5TTXV0YWJs
+ZUFycmF5ozUyMNM4OQ86OzxXTlNXaGl0ZVxOU0NvbG9yU3BhY2VEMCAwABADgAzSKyw+P1dOU0NvbG9y
+oj4w0issQUJXTlNJbWFnZaJBMAAIABEAGgAkACkAMgA3AEkATABRAFMAYgBoAHUAfACLAJIAnwCmAK4A
+sACyALQAuQC7AL0AxADJANQA1gDYANoA3wDiAOQA5gDoAO8BBgEiASQBJgnuCfMJ/goHChoKHgopCjIK
+Nwo/CkIKRwpWCloKYQppCnYKewp9Cn8KhAqMCo8KlAqcAAAAAAAAAgEAAAAAAAAAQwAAAAAAAAAAAAAA
+AAAACp8
 </mutableData>
         </image>
         <image name="generic" width="512" height="512"/>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/ResumeDialog.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/ResumeDialog.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -22,14 +22,14 @@
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="549" height="160"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <value key="minSize" type="size" width="446" height="133"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="549" height="160"/>
+                <rect key="frame" x="0.0" y="0.0" width="549" height="158"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="3" customClass="VLCWrappableTextField">
-                        <rect key="frame" x="102" y="83" width="429" height="32"/>
+                    <textField focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="3">
+                        <rect key="frame" x="102" y="84" width="429" height="30"/>
                         <constraints>
                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="425" id="kkj-bo-hIa"/>
                         </constraints>
@@ -39,8 +39,8 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="42">
-                        <rect key="frame" x="102" y="123" width="132" height="17"/>
+                    <textField focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="42">
+                        <rect key="frame" x="102" y="122" width="132" height="16"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Continue playback?" id="43">
                             <font key="font" metaFont="systemBold"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -48,7 +48,7 @@
                         </textFieldCell>
                     </textField>
                     <imageView translatesAutoresizingMaskIntoConstraints="NO" id="55">
-                        <rect key="frame" x="20" y="75" width="65" height="65"/>
+                        <rect key="frame" x="20" y="73" width="65" height="65"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="65" id="rlw-rm-gTQ"/>
                             <constraint firstAttribute="width" constant="65" id="zgb-HV-gIF"/>
@@ -56,7 +56,7 @@
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="VLC" id="56"/>
                     </imageView>
                     <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="85X-TN-2Hu">
-                        <rect key="frame" x="102" y="59" width="219" height="18"/>
+                        <rect key="frame" x="102" y="59" width="223" height="18"/>
                         <buttonCell key="cell" type="check" title="Always continue media playback" bezelStyle="regularSquare" imagePosition="left" inset="2" id="xHm-jn-IdY">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
@@ -66,7 +66,7 @@
                         </connections>
                     </button>
                     <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="21">
-                        <rect key="frame" x="440" y="13" width="95" height="32"/>
+                        <rect key="frame" x="447" y="13" width="89" height="32"/>
                         <buttonCell key="cell" type="push" title="Continue" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="22">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -79,7 +79,7 @@
                         </connections>
                     </button>
                     <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9">
-                        <rect key="frame" x="356" y="13" width="84" height="32"/>
+                        <rect key="frame" x="371" y="13" width="78" height="32"/>
                         <buttonCell key="cell" type="push" title="Restart" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="10">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/SimplePreferences.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/SimplePreferences.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -166,19 +166,19 @@
             <windowStyleMask key="styleMask" titled="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="105" y="903" width="580" height="620"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <view key="contentView" id="2266">
                 <rect key="frame" x="0.0" y="0.0" width="580" height="620"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b28-nA-RR5">
-                        <rect key="frame" x="0.0" y="45" width="580" height="575"/>
+                        <rect key="frame" x="0.0" y="44" width="580" height="576"/>
                         <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="ecH-Hh-jJF" customClass="VLCSimplePrefsClipView">
-                            <rect key="frame" x="1" y="1" width="578" height="573"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <rect key="frame" x="1" y="1" width="578" height="574"/>
+                            <autoresizingMask key="autoresizingMask"/>
                             <subviews>
                                 <view translatesAutoresizingMaskIntoConstraints="NO" id="HOX-DS-Fgr" userLabel="content view">
-                                    <rect key="frame" x="0.0" y="0.0" width="578" height="573"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="578" height="574"/>
                                 </view>
                             </subviews>
                             <constraints>
@@ -196,19 +196,19 @@
                             <rect key="frame" x="-100" y="-100" width="568" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="0.5" horizontal="NO" id="5eR-1v-88a">
+                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="5eR-1v-88a">
                             <rect key="frame" x="563" y="1" width="16" height="573"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
                     <box boxType="oldStyle" borderType="none" title="Title" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2410" userLabel="Bottom view">
-                        <rect key="frame" x="0.0" y="0.0" width="580" height="45"/>
+                        <rect key="frame" x="0.0" y="0.0" width="580" height="44"/>
                         <view key="contentView" id="uTV-TS-NBc">
-                            <rect key="frame" x="0.0" y="0.0" width="580" height="45"/>
+                            <rect key="frame" x="0.0" y="0.0" width="580" height="44"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2275">
-                                    <rect key="frame" x="496" y="8" width="70" height="32"/>
+                                    <rect key="frame" x="503" y="8" width="64" height="32"/>
                                     <buttonCell key="cell" type="push" title="Save" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3448">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -221,7 +221,7 @@
                                     </connections>
                                 </button>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2276">
-                                    <rect key="frame" x="414" y="8" width="82" height="32"/>
+                                    <rect key="frame" x="429" y="8" width="76" height="32"/>
                                     <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3449">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -234,7 +234,7 @@
                                     </connections>
                                 </button>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2277">
-                                    <rect key="frame" x="321" y="8" width="93" height="32"/>
+                                    <rect key="frame" x="344" y="8" width="87" height="32"/>
                                     <buttonCell key="cell" type="push" title="Reset All" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3450">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -245,7 +245,7 @@
                                     </connections>
                                 </button>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3636">
-                                    <rect key="frame" x="14" y="8" width="91" height="32"/>
+                                    <rect key="frame" x="13" y="8" width="85" height="32"/>
                                     <buttonCell key="cell" type="push" title="Show all" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="3637">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -285,16 +285,16 @@
         </window>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView translatesAutoresizingMaskIntoConstraints="NO" id="2311" userLabel="Interface">
-            <rect key="frame" x="0.0" y="0.0" width="597" height="530"/>
+            <rect key="frame" x="0.0" y="-19" width="597" height="549"/>
             <subviews>
                 <box borderType="line" title="General Settings" translatesAutoresizingMaskIntoConstraints="NO" id="kup-aY-Wqq">
-                    <rect key="frame" x="18" y="384" width="563" height="125"/>
+                    <rect key="frame" x="18" y="397" width="563" height="131"/>
                     <view key="contentView" id="wFl-aV-3Hn">
-                        <rect key="frame" x="3" y="3" width="557" height="107"/>
+                        <rect key="frame" x="4" y="5" width="555" height="111"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3892">
-                                <rect key="frame" x="15" y="79" width="117" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3892">
+                                <rect key="frame" x="15" y="83" width="117" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Language" usesSingleLineMode="YES" id="3893">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -302,21 +302,21 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3900">
-                                <rect key="frame" x="145" y="73" width="395" height="25"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="288" id="Kfa-pp-08X"/>
-                                </constraints>
+                                <rect key="frame" x="144" y="77" width="395" height="25"/>
                                 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="3901">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="3902"/>
                                 </popUpButtonCell>
+                                <constraints>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="288" id="Kfa-pp-08X"/>
+                                </constraints>
                                 <connections>
                                     <action selector="interfaceSettingChanged:" target="-2" id="iZ8-Hl-fvA"/>
                                 </connections>
                             </popUpButton>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="r3P-eU-tEX">
-                                <rect key="frame" x="15" y="46" width="185" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="r3P-eU-tEX">
+                                <rect key="frame" x="15" y="49" width="189" height="18"/>
                                 <buttonCell key="cell" type="check" title="Enable VLC status bar icon" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Vhy-1T-Knj">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -325,8 +325,8 @@
                                     <action selector="interfaceSettingChanged:" target="-2" id="Ys3-K6-647"/>
                                 </connections>
                             </button>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="MeC-2c-kJf">
-                                <rect key="frame" x="15" y="15" width="186" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MeC-2c-kJf">
+                                <rect key="frame" x="15" y="16" width="190" height="18"/>
                                 <buttonCell key="cell" type="check" title="Use large text for list views" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QEl-8k-Hyj">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -351,13 +351,13 @@
                     </view>
                 </box>
                 <box borderType="line" title="Playback control" translatesAutoresizingMaskIntoConstraints="NO" id="CZP-ZN-k6p">
-                    <rect key="frame" x="18" y="316" width="563" height="64"/>
+                    <rect key="frame" x="18" y="328" width="563" height="65"/>
                     <view key="contentView" id="gj4-zO-E26">
-                        <rect key="frame" x="3" y="3" width="557" height="46"/>
+                        <rect key="frame" x="4" y="5" width="555" height="45"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3919">
-                                <rect key="frame" x="15" y="18" width="117" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3919">
+                                <rect key="frame" x="15" y="17" width="117" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Continue playback" usesSingleLineMode="YES" id="3923">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -365,10 +365,10 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3920">
-                                <rect key="frame" x="145" y="12" width="398" height="25"/>
+                                <rect key="frame" x="144" y="11" width="398" height="25"/>
                                 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="3921">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="3922"/>
                                 </popUpButtonCell>
                                 <connections>
@@ -387,13 +387,13 @@
                     </view>
                 </box>
                 <box verticalHuggingPriority="251" verticalCompressionResistancePriority="751" borderType="line" title="Playback behaviour" translatesAutoresizingMaskIntoConstraints="NO" id="EKZ-iB-CMo">
-                    <rect key="frame" x="18" y="227" width="563" height="85"/>
+                    <rect key="frame" x="18" y="237" width="563" height="87"/>
                     <view key="contentView" id="BMS-wa-oJS">
-                        <rect key="frame" x="3" y="3" width="557" height="67"/>
+                        <rect key="frame" x="4" y="5" width="555" height="67"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="3564">
-                                <rect key="frame" x="16" y="41" width="284" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3564">
+                                <rect key="frame" x="16" y="40" width="288" height="18"/>
                                 <buttonCell key="cell" type="check" title="Enable notifications on playlist item change" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3565">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -402,8 +402,8 @@
                                     <action selector="interfaceSettingChanged:" target="-2" id="ZE0-IR-FYq"/>
                                 </connections>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3910">
-                                <rect key="frame" x="16" y="14" width="116" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3910">
+                                <rect key="frame" x="16" y="12" width="116" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Pause iTunes" usesSingleLineMode="YES" id="3914">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -411,10 +411,10 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3911">
-                                <rect key="frame" x="144" y="8" width="398" height="25"/>
+                                <rect key="frame" x="144" y="6" width="396" height="25"/>
                                 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="3912">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="3913"/>
                                 </popUpButtonCell>
                                 <connections>
@@ -438,13 +438,13 @@
                     </constraints>
                 </box>
                 <box verticalHuggingPriority="249" borderType="line" title="Privacy / Network Interaction" translatesAutoresizingMaskIntoConstraints="NO" id="2318">
-                    <rect key="frame" x="18" y="114" width="563" height="109"/>
+                    <rect key="frame" x="18" y="118" width="563" height="115"/>
                     <view key="contentView" id="nnH-Tj-ON7">
-                        <rect key="frame" x="3" y="3" width="557" height="91"/>
+                        <rect key="frame" x="4" y="5" width="555" height="95"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="3556">
-                                <rect key="frame" x="14" y="37" width="217" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3556">
+                                <rect key="frame" x="14" y="38" width="221" height="18"/>
                                 <buttonCell key="cell" type="check" title="Automatically check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="3557">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -453,8 +453,8 @@
                                     <action selector="interfaceSettingChanged:" target="-2" id="t18-Rf-im8"/>
                                 </connections>
                             </button>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="3928">
-                                <rect key="frame" x="14" y="65" width="161" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3928">
+                                <rect key="frame" x="14" y="68" width="165" height="18"/>
                                 <buttonCell key="cell" type="check" title="Allow metadata access" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="3929">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -463,7 +463,7 @@
                                     <action selector="interfaceSettingChanged:" target="-2" id="5zR-84-Rjx"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3560">
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3560">
                                 <rect key="frame" x="42" y="17" width="153" height="14"/>
                                 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Last check on June 27 2045" id="3561">
                                     <font key="font" metaFont="message" size="11"/>
@@ -487,12 +487,12 @@
                     </view>
                 </box>
                 <box borderType="line" title="HTTP Server" translatesAutoresizingMaskIntoConstraints="NO" id="drh-ot-Vyn">
-                    <rect key="frame" x="18" y="17" width="563" height="90"/>
+                    <rect key="frame" x="18" y="17" width="563" height="94"/>
                     <view key="contentView" id="Who-VF-GbQ">
-                        <rect key="frame" x="3" y="3" width="557" height="72"/>
+                        <rect key="frame" x="4" y="5" width="555" height="74"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3875">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3875">
                                 <rect key="frame" x="14" y="20" width="118" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Password" usesSingleLineMode="YES" id="3876">
                                     <font key="font" metaFont="system"/>
@@ -500,8 +500,8 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3884" customClass="NSSecureTextField">
-                                <rect key="frame" x="147" y="17" width="393" height="21"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3884" customClass="NSSecureTextField">
+                                <rect key="frame" x="147" y="17" width="391" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3885">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -512,8 +512,8 @@
                                     <outlet property="delegate" destination="-2" id="CTK-cN-vZp"/>
                                 </connections>
                             </textField>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="lpZ-9y-Vfn">
-                                <rect key="frame" x="14" y="46" width="187" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lpZ-9y-Vfn">
+                                <rect key="frame" x="14" y="47" width="191" height="18"/>
                                 <buttonCell key="cell" type="check" title="Enable VLC HTTP interface" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Nby-oq-jkQ">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -561,16 +561,16 @@
             <point key="canvasLocation" x="256" y="428.5"/>
         </customView>
         <customView translatesAutoresizingMaskIntoConstraints="NO" id="2330" userLabel="Audio">
-            <rect key="frame" x="0.0" y="0.0" width="596" height="399"/>
+            <rect key="frame" x="0.0" y="-10" width="598" height="409"/>
             <subviews>
                 <box title="Last.fm" translatesAutoresizingMaskIntoConstraints="NO" id="2363">
-                    <rect key="frame" x="17" y="16" width="562" height="117"/>
+                    <rect key="frame" x="17" y="16" width="564" height="121"/>
                     <view key="contentView" id="7U2-xM-E1M">
-                        <rect key="frame" x="3" y="3" width="556" height="99"/>
+                        <rect key="frame" x="4" y="5" width="556" height="101"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2365">
-                                <rect key="frame" x="14" y="72" width="190" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2365">
+                                <rect key="frame" x="14" y="73" width="194" height="18"/>
                                 <buttonCell key="cell" type="check" title="Enable Last.fm submissions" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3472">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -579,7 +579,7 @@
                                     <action selector="audioSettingChanged:" target="-2" id="mPN-4p-aHO"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2367">
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2367">
                                 <rect key="frame" x="175" y="44" width="361" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3474">
                                     <font key="font" metaFont="system"/>
@@ -592,7 +592,7 @@
                                     <outlet property="nextKeyView" destination="2369" id="3427"/>
                                 </connections>
                             </textField>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2368">
+                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2368">
                                 <rect key="frame" x="106" y="16" width="63" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Password" usesSingleLineMode="YES" id="3475">
                                     <font key="font" metaFont="system"/>
@@ -600,7 +600,7 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2369" customClass="NSSecureTextField">
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2369" customClass="NSSecureTextField">
                                 <rect key="frame" x="175" y="13" width="361" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3476">
                                     <font key="font" metaFont="system"/>
@@ -613,7 +613,7 @@
                                     <outlet property="nextKeyView" destination="2336" id="3428"/>
                                 </connections>
                             </textField>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2366">
+                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2366">
                                 <rect key="frame" x="99" y="47" width="70" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="User name" usesSingleLineMode="YES" id="3473">
                                     <font key="font" metaFont="system"/>
@@ -640,12 +640,12 @@
                     </view>
                 </box>
                 <box title="Effects" translatesAutoresizingMaskIntoConstraints="NO" id="2347">
-                    <rect key="frame" x="17" y="138" width="562" height="59"/>
+                    <rect key="frame" x="17" y="140" width="564" height="61"/>
                     <view key="contentView" id="N65-iQ-8gY">
-                        <rect key="frame" x="3" y="3" width="556" height="41"/>
+                        <rect key="frame" x="4" y="5" width="556" height="41"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2357">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2357">
                                 <rect key="frame" x="9" y="13" width="160" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Visualization" usesSingleLineMode="YES" id="3470">
                                     <font key="font" metaFont="system"/>
@@ -654,10 +654,10 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2358">
-                                <rect key="frame" x="173" y="8" width="366" height="25"/>
+                                <rect key="frame" x="172" y="7" width="368" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2361" id="3471">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="2359">
                                         <items>
                                             <menuItem title="Default" state="on" id="2361"/>
@@ -682,13 +682,13 @@
                     </view>
                 </box>
                 <box title="General Audio" translatesAutoresizingMaskIntoConstraints="NO" id="2332">
-                    <rect key="frame" x="17" y="202" width="562" height="154"/>
+                    <rect key="frame" x="17" y="204" width="564" height="160"/>
                     <view key="contentView" id="sX1-um-Nbr">
-                        <rect key="frame" x="3" y="3" width="556" height="136"/>
+                        <rect key="frame" x="4" y="5" width="556" height="140"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2335">
-                                <rect key="frame" x="173" y="52" width="311" height="19"/>
+                                <rect key="frame" x="173" y="47" width="311" height="28"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="205" id="4Mt-lP-4oa"/>
                                 </constraints>
@@ -699,8 +699,8 @@
                                     <action selector="audioSettingChanged:" target="-2" id="5xq-tt-Vti"/>
                                 </connections>
                             </slider>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2336">
-                                <rect key="frame" x="490" y="51" width="46" height="21"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2336">
+                                <rect key="frame" x="490" y="53" width="46" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="46" id="96N-ME-SLD"/>
                                 </constraints>
@@ -729,15 +729,15 @@
                                     <outlet property="nextKeyView" destination="2346" id="3424"/>
                                 </connections>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2345">
-                                <rect key="frame" x="10" y="18" width="159" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2345">
+                                <rect key="frame" x="10" y="17" width="159" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Preferred Audio language" usesSingleLineMode="YES" id="3464">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2346">
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2346">
                                 <rect key="frame" x="175" y="15" width="361" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3465">
                                     <font key="font" metaFont="system"/>
@@ -750,7 +750,7 @@
                                 </connections>
                             </textField>
                             <matrix verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" allowsEmptySelection="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3664">
-                                <rect key="frame" x="12" y="78" width="524" height="48"/>
+                                <rect key="frame" x="12" y="82" width="524" height="48"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="48" id="Vw9-Mr-7S2"/>
                                 </constraints>
@@ -803,8 +803,8 @@
                         </constraints>
                     </view>
                 </box>
-                <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2331">
-                    <rect key="frame" x="18" y="363" width="101" height="18"/>
+                <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2331">
+                    <rect key="frame" x="18" y="372" width="105" height="18"/>
                     <buttonCell key="cell" type="check" title="Enable Audio" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3457">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
@@ -834,10 +834,10 @@
             <point key="canvasLocation" x="265.5" y="1003"/>
         </customView>
         <customView translatesAutoresizingMaskIntoConstraints="NO" id="2440" userLabel="Video">
-            <rect key="frame" x="0.0" y="0.0" width="582" height="523"/>
+            <rect key="frame" x="0.0" y="-20" width="582" height="543"/>
             <subviews>
-                <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2448">
-                    <rect key="frame" x="18" y="487" width="101" height="18"/>
+                <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2448">
+                    <rect key="frame" x="18" y="506" width="106" height="18"/>
                     <buttonCell key="cell" type="check" title="Enable Video" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3477">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
@@ -847,13 +847,13 @@
                     </connections>
                 </button>
                 <box verticalHuggingPriority="249" title="Display" translatesAutoresizingMaskIntoConstraints="NO" id="2449">
-                    <rect key="frame" x="17" y="350" width="548" height="131"/>
+                    <rect key="frame" x="17" y="358" width="548" height="141"/>
                     <view key="contentView" id="eGM-I9-pBb">
-                        <rect key="frame" x="3" y="3" width="542" height="113"/>
+                        <rect key="frame" x="4" y="5" width="540" height="121"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2452">
-                                <rect key="frame" x="15" y="87" width="214" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2452">
+                                <rect key="frame" x="15" y="94" width="218" height="18"/>
                                 <buttonCell key="cell" type="check" title="Show video within main window" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3479">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -862,8 +862,8 @@
                                     <action selector="videoSettingChanged:" target="-2" id="jdL-pA-9Ed"/>
                                 </connections>
                             </button>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2451">
-                                <rect key="frame" x="15" y="10" width="107" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2451">
+                                <rect key="frame" x="15" y="11" width="111" height="18"/>
                                 <buttonCell key="cell" type="check" title="Always on top" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3478">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -872,8 +872,8 @@
                                     <action selector="videoSettingChanged:" target="-2" id="m6x-T2-Ao2"/>
                                 </connections>
                             </button>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="rpy-5O-tek">
-                                <rect key="frame" x="15" y="62" width="278" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rpy-5O-tek">
+                                <rect key="frame" x="15" y="67" width="281" height="18"/>
                                 <buttonCell key="cell" type="check" title="Pause the video playback when minimized" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="v2U-aI-gRI">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -882,8 +882,8 @@
                                     <action selector="videoSettingChanged:" target="-2" id="sk0-pw-9AE"/>
                                 </connections>
                             </button>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="4a1-oW-HKH">
-                                <rect key="frame" x="15" y="36" width="263" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4a1-oW-HKH">
+                                <rect key="frame" x="15" y="39" width="267" height="18"/>
                                 <buttonCell key="cell" type="check" title="Resize interface to the native video size" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="rNV-hL-qNL">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -892,8 +892,8 @@
                                     <action selector="videoSettingChanged:" target="-2" id="Thc-PT-O88"/>
                                 </connections>
                             </button>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="3728">
-                                <rect key="frame" x="269" y="10" width="146" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3728">
+                                <rect key="frame" x="268" y="11" width="150" height="18"/>
                                 <buttonCell key="cell" type="check" title="Window decorations" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3729">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -922,13 +922,13 @@
                     </view>
                 </box>
                 <box title="Fullscreen" translatesAutoresizingMaskIntoConstraints="NO" id="9CN-jv-NQ1">
-                    <rect key="frame" x="17" y="228" width="548" height="118"/>
+                    <rect key="frame" x="17" y="230" width="548" height="124"/>
                     <view key="contentView" id="DfV-6B-rTp">
-                        <rect key="frame" x="3" y="3" width="542" height="100"/>
+                        <rect key="frame" x="4" y="5" width="540" height="104"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="5Db-fa-Ffw">
-                                <rect key="frame" x="14" y="73" width="130" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5Db-fa-Ffw">
+                                <rect key="frame" x="14" y="76" width="133" height="18"/>
                                 <buttonCell key="cell" type="check" title="Start in fullscreen" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="dib-dQ-tMp">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -937,8 +937,8 @@
                                     <action selector="videoSettingChanged:" target="-2" id="9Dw-qx-0Eo"/>
                                 </connections>
                             </button>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="i5X-iK-Hbj">
-                                <rect key="frame" x="269" y="73" width="224" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="i5X-iK-Hbj">
+                                <rect key="frame" x="268" y="76" width="228" height="18"/>
                                 <buttonCell key="cell" type="check" title="Black screens in Fullscreen mode" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="mR8-Zk-i3R">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -947,8 +947,8 @@
                                     <action selector="videoSettingChanged:" target="-2" id="cL2-0Y-iKD"/>
                                 </connections>
                             </button>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="6mo-Qc-MZV">
-                                <rect key="frame" x="14" y="44" width="187" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6mo-Qc-MZV">
+                                <rect key="frame" x="14" y="45" width="191" height="18"/>
                                 <buttonCell key="cell" type="check" title="Use native fullscreen mode" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="8UZ-lD-mnI">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -958,10 +958,10 @@
                                 </connections>
                             </button>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="74n-z2-A2G">
-                                <rect key="frame" x="269" y="10" width="259" height="25"/>
+                                <rect key="frame" x="267" y="9" width="260" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="Screen 1 (1280 * 800)" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2ni-Sy-Xtp" id="HOa-K5-WKi">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="Q7U-7F-NwP">
                                         <items>
                                             <menuItem title="Screen 1 (1280 * 800)" state="on" id="2ni-Sy-Xtp"/>
@@ -974,8 +974,8 @@
                                     <action selector="videoSettingChanged:" target="-2" id="43z-cH-dlV"/>
                                 </connections>
                             </popUpButton>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pch-Ac-iPY">
-                                <rect key="frame" x="14" y="15" width="251" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pch-Ac-iPY">
+                                <rect key="frame" x="14" y="15" width="250" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Fullscreen video device" usesSingleLineMode="YES" id="Ft8-Q4-fXE">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1002,21 +1002,21 @@
                     </view>
                 </box>
                 <box title="Video" translatesAutoresizingMaskIntoConstraints="NO" id="3722">
-                    <rect key="frame" x="17" y="135" width="548" height="89"/>
+                    <rect key="frame" x="17" y="136" width="548" height="90"/>
                     <view key="contentView" id="Kie-O4-kEN">
-                        <rect key="frame" x="3" y="3" width="542" height="71"/>
+                        <rect key="frame" x="4" y="5" width="540" height="70"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3707">
-                                <rect key="frame" x="14" y="16" width="251" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3707">
+                                <rect key="frame" x="14" y="16" width="250" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Deinterlace mode" usesSingleLineMode="YES" id="3708">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3705">
-                                <rect key="frame" x="14" y="42" width="251" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3705">
+                                <rect key="frame" x="14" y="42" width="250" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Deinterlace" usesSingleLineMode="YES" id="3714">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1024,10 +1024,10 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3704">
-                                <rect key="frame" x="269" y="37" width="259" height="25"/>
+                                <rect key="frame" x="267" y="36" width="260" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="3718" id="3715">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="3716">
                                         <items>
                                             <menuItem title="Item1" state="on" id="3718"/>
@@ -1041,10 +1041,10 @@
                                 </connections>
                             </popUpButton>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3706">
-                                <rect key="frame" x="269" y="11" width="259" height="25"/>
+                                <rect key="frame" x="267" y="10" width="260" height="25"/>
                                 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="3709">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="3710">
                                         <items>
                                             <menuItem title="Item1" id="3712"/>
@@ -1076,13 +1076,13 @@
                     </view>
                 </box>
                 <box title="Video snapshots" translatesAutoresizingMaskIntoConstraints="NO" id="2466">
-                    <rect key="frame" x="17" y="16" width="548" height="115"/>
+                    <rect key="frame" x="17" y="16" width="548" height="116"/>
                     <view key="contentView" id="0VI-tx-88U">
-                        <rect key="frame" x="3" y="3" width="542" height="97"/>
+                        <rect key="frame" x="4" y="5" width="540" height="96"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2468">
-                                <rect key="frame" x="78" y="66" width="356" height="21"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2468">
+                                <rect key="frame" x="78" y="66" width="362" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3486">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1094,8 +1094,8 @@
                                     <outlet property="nextKeyView" destination="2474" id="3429"/>
                                 </connections>
                             </textField>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2470">
-                                <rect key="frame" x="13" y="69" width="47" height="16"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2470">
+                                <rect key="frame" x="13" y="68" width="47" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Folder" usesSingleLineMode="YES" id="3487">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1103,7 +1103,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2473">
-                                <rect key="frame" x="436" y="59" width="96" height="32"/>
+                                <rect key="frame" x="441" y="59" width="90" height="32"/>
                                 <buttonCell key="cell" type="push" title="Browse..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3488">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1112,7 +1112,7 @@
                                     <action selector="videoSettingChanged:" target="-2" id="OpE-LJ-bwy"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2474">
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2474">
                                 <rect key="frame" x="78" y="40" width="210" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="vlcsnap-" drawsBackground="YES" id="3489">
                                     <font key="font" metaFont="system"/>
@@ -1125,8 +1125,8 @@
                                     <outlet property="nextKeyView" destination="2468" id="3430"/>
                                 </connections>
                             </textField>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2475">
-                                <rect key="frame" x="13" y="43" width="47" height="16"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2475">
+                                <rect key="frame" x="13" y="42" width="47" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Prefix" usesSingleLineMode="YES" id="3490">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1134,7 +1134,7 @@
                                 </textFieldCell>
                             </textField>
                             <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2476">
-                                <rect key="frame" x="294" y="42" width="155" height="18"/>
+                                <rect key="frame" x="294" y="41" width="159" height="18"/>
                                 <buttonCell key="cell" type="check" title="Sequential numbering" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3491">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1143,8 +1143,8 @@
                                     <action selector="videoSettingChanged:" target="-2" id="qnw-Lv-7dq"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2477">
-                                <rect key="frame" x="13" y="14" width="47" height="16"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2477">
+                                <rect key="frame" x="13" y="13" width="47" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Format" usesSingleLineMode="YES" id="3492">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1152,13 +1152,10 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2478">
-                                <rect key="frame" x="76" y="8" width="215" height="25"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="210" id="QXI-vw-6ZO"/>
-                                </constraints>
+                                <rect key="frame" x="75" y="7" width="217" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="PNG" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2481" id="3493">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="2479">
                                         <items>
                                             <menuItem title="PNG" state="on" id="2481"/>
@@ -1166,6 +1163,9 @@
                                         </items>
                                     </menu>
                                 </popUpButtonCell>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="210" id="QXI-vw-6ZO"/>
+                                </constraints>
                                 <connections>
                                     <action selector="videoSettingChanged:" target="-2" id="buC-OF-Rew"/>
                                 </connections>
@@ -1198,7 +1198,7 @@
                     </view>
                 </box>
                 <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hrj-mH-eqd" userLabel="half size helper view">
-                    <rect key="frame" x="291" y="485" width="271" height="23"/>
+                    <rect key="frame" x="291" y="503" width="271" height="23"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="23" id="5d3-4W-bXj"/>
                     </constraints>
@@ -1237,29 +1237,29 @@
             <rect key="frame" x="0.0" y="0.0" width="572" height="422"/>
             <subviews>
                 <box title="Codecs / Muxers" translatesAutoresizingMaskIntoConstraints="NO" id="2585">
-                    <rect key="frame" x="17" y="248" width="538" height="154"/>
+                    <rect key="frame" x="17" y="242" width="538" height="160"/>
                     <view key="contentView" id="30i-kg-rYI">
-                        <rect key="frame" x="3" y="3" width="532" height="136"/>
+                        <rect key="frame" x="4" y="5" width="530" height="140"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2593">
-                                <rect key="frame" x="14" y="75" width="240" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2593">
+                                <rect key="frame" x="14" y="77" width="240" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Repair AVI Files" usesSingleLineMode="YES" id="3519">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3434">
-                                <rect key="frame" x="14" y="43" width="240" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3434">
+                                <rect key="frame" x="14" y="45" width="240" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Skip the Loop filter for H.264 decoding" usesSingleLineMode="YES" id="3522">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="lem-yf-jZB">
-                                <rect key="frame" x="14" y="11" width="94" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lem-yf-jZB">
+                                <rect key="frame" x="14" y="12" width="98" height="18"/>
                                 <buttonCell key="cell" type="check" title="Skip frames" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="lfl-mG-es8">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1268,8 +1268,8 @@
                                     <action selector="inputSettingChanged:" target="-2" id="tI4-5J-NJ2"/>
                                 </connections>
                             </button>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="mFh-ke-4yF">
-                                <rect key="frame" x="267" y="11" width="250" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mFh-ke-4yF">
+                                <rect key="frame" x="267" y="12" width="246" height="18"/>
                                 <buttonCell key="cell" type="check" title="Fast seek" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="XWc-M2-awg">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1279,10 +1279,10 @@
                                 </connections>
                             </button>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2594">
-                                <rect key="frame" x="267" y="69" width="251" height="25"/>
+                                <rect key="frame" x="266" y="71" width="251" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2598" id="3520">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="2595">
                                         <items>
                                             <menuItem title="Item1" state="on" id="2598"/>
@@ -1296,10 +1296,10 @@
                                 </connections>
                             </popUpButton>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3435">
-                                <rect key="frame" x="267" y="37" width="251" height="25"/>
+                                <rect key="frame" x="266" y="39" width="251" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="3439" id="3523">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="3436">
                                         <items>
                                             <menuItem title="Item1" state="on" id="3439"/>
@@ -1313,7 +1313,7 @@
                                 </connections>
                             </popUpButton>
                             <button verticalHuggingPriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="E3R-AI-QGD">
-                                <rect key="frame" x="14" y="108" width="201" height="18"/>
+                                <rect key="frame" x="14" y="111" width="205" height="18"/>
                                 <buttonCell key="cell" type="check" title="Enable hardware acceleration" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="atu-5u-S8s">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1348,13 +1348,13 @@
                     </view>
                 </box>
                 <box borderType="line" title="Record directory or filename" translatesAutoresizingMaskIntoConstraints="NO" id="3623">
-                    <rect key="frame" x="17" y="181" width="538" height="62"/>
+                    <rect key="frame" x="17" y="175" width="538" height="64"/>
                     <view key="contentView" id="7b2-vV-8CM">
-                        <rect key="frame" x="3" y="3" width="532" height="44"/>
+                        <rect key="frame" x="4" y="5" width="530" height="44"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3614">
-                                <rect key="frame" x="16" y="12" width="406" height="20"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3614">
+                                <rect key="frame" x="15" y="12" width="413" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="aEu-v9-mQg"/>
                                 </constraints>
@@ -1369,7 +1369,7 @@
                                 </connections>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3616">
-                                <rect key="frame" x="424" y="4" width="96" height="32"/>
+                                <rect key="frame" x="429" y="5" width="90" height="32"/>
                                 <buttonCell key="cell" type="push" title="Browse..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3617">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1392,13 +1392,13 @@
                     </constraints>
                 </box>
                 <box title="Network" translatesAutoresizingMaskIntoConstraints="NO" id="2563">
-                    <rect key="frame" x="17" y="114" width="538" height="63"/>
+                    <rect key="frame" x="17" y="107" width="538" height="64"/>
                     <view key="contentView" id="1lv-cw-XiH">
-                        <rect key="frame" x="3" y="3" width="532" height="45"/>
+                        <rect key="frame" x="4" y="5" width="530" height="44"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3742">
-                                <rect key="frame" x="10" y="5" width="512" height="32"/>
+                                <rect key="frame" x="8" y="5" width="514" height="32"/>
                                 <buttonCell key="cell" type="push" title="Edit default application settings for network protocols" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3743">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1419,19 +1419,16 @@
                     </constraints>
                 </box>
                 <box title="Caching" translatesAutoresizingMaskIntoConstraints="NO" id="2572">
-                    <rect key="frame" x="17" y="20" width="538" height="89"/>
+                    <rect key="frame" x="17" y="12" width="538" height="90"/>
                     <view key="contentView" id="deK-kX-Lvr">
-                        <rect key="frame" x="3" y="3" width="532" height="71"/>
+                        <rect key="frame" x="4" y="5" width="530" height="70"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2580">
-                                <rect key="frame" x="267" y="37" width="251" height="25"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="197" id="5lH-sw-4lb"/>
-                                </constraints>
+                                <rect key="frame" x="266" y="36" width="251" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2583" id="3514">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="2581">
                                         <items>
                                             <menuItem title="Item1" state="on" id="2583"/>
@@ -1440,20 +1437,23 @@
                                         </items>
                                     </menu>
                                 </popUpButtonCell>
+                                <constraints>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="197" id="5lH-sw-4lb"/>
+                                </constraints>
                                 <connections>
                                     <action selector="inputSettingChanged:" target="-2" id="dYl-jy-tc2"/>
                                 </connections>
                             </popUpButton>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2574">
-                                <rect key="frame" x="14" y="43" width="240" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2574">
+                                <rect key="frame" x="14" y="42" width="240" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Default Caching Level" usesSingleLineMode="YES" id="3513">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="3162" customClass="VLCWrappableTextField">
-                                <rect key="frame" x="15" y="24" width="502" height="11"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="3162">
+                                <rect key="frame" x="15" y="24" width="500" height="11"/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Use the complete preferences to configure custom caching values for each access module." id="3515">
                                     <font key="font" metaFont="miniSystem"/>
                                     <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -1495,16 +1495,16 @@
             <point key="canvasLocation" x="883" y="140"/>
         </customView>
         <customView translatesAutoresizingMaskIntoConstraints="NO" id="2523" userLabel="Subtitles &amp; OSD Settings">
-            <rect key="frame" x="0.0" y="0.0" width="571" height="399"/>
+            <rect key="frame" x="0.0" y="-5" width="571" height="404"/>
             <subviews>
                 <box title="Display Settings" translatesAutoresizingMaskIntoConstraints="NO" id="2537">
-                    <rect key="frame" x="17" y="16" width="537" height="212"/>
+                    <rect key="frame" x="16" y="16" width="537" height="216"/>
                     <view key="contentView" id="YRd-Qa-GBI">
-                        <rect key="frame" x="3" y="3" width="531" height="194"/>
+                        <rect key="frame" x="4" y="5" width="529" height="196"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2541">
-                                <rect key="frame" x="141" y="164" width="280" height="21"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2541">
+                                <rect key="frame" x="141" y="166" width="274" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3499">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -1516,8 +1516,8 @@
                                     <outlet property="nextKeyView" destination="3594" id="3599"/>
                                 </connections>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2542">
-                                <rect key="frame" x="13" y="167" width="113" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2542">
+                                <rect key="frame" x="13" y="169" width="113" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Font" usesSingleLineMode="YES" id="3500">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1525,7 +1525,7 @@
                                 </textFieldCell>
                             </textField>
                             <button horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2543">
-                                <rect key="frame" x="423" y="157" width="98" height="32"/>
+                                <rect key="frame" x="416" y="160" width="104" height="32"/>
                                 <buttonCell key="cell" type="push" title="Choose..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3501">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1534,8 +1534,8 @@
                                     <action selector="showFontPicker:" target="-2" id="E58-CZ-jFO"/>
                                 </connections>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2549">
-                                <rect key="frame" x="13" y="139" width="61" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2549">
+                                <rect key="frame" x="13" y="138" width="61" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Font Size" usesSingleLineMode="YES" id="3503">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1543,10 +1543,10 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2550">
-                                <rect key="frame" x="139" y="102" width="285" height="25"/>
+                                <rect key="frame" x="138" y="99" width="281" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2553" id="3504">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="2551">
                                         <items>
                                             <menuItem title="Item1" state="on" id="2553"/>
@@ -1559,8 +1559,8 @@
                                     <action selector="osdSettingChanged:" target="-2" id="uHy-A5-OFR"/>
                                 </connections>
                             </popUpButton>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2555">
-                                <rect key="frame" x="13" y="108" width="113" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2555">
+                                <rect key="frame" x="13" y="105" width="113" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Text Color" usesSingleLineMode="YES" id="3505">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1568,10 +1568,10 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3682">
-                                <rect key="frame" x="139" y="43" width="285" height="25"/>
+                                <rect key="frame" x="138" y="41" width="281" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="3688" id="3685">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="3686">
                                         <items>
                                             <menuItem title="Item1" state="on" id="3688"/>
@@ -1584,8 +1584,8 @@
                                     <action selector="osdSettingChanged:" target="-2" id="jyO-mG-U6b"/>
                                 </connections>
                             </popUpButton>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3683">
-                                <rect key="frame" x="13" y="49" width="113" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3683">
+                                <rect key="frame" x="13" y="47" width="113" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Outline Thickness" usesSingleLineMode="YES" id="3684">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1593,10 +1593,10 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3691">
-                                <rect key="frame" x="139" y="13" width="285" height="25"/>
+                                <rect key="frame" x="138" y="12" width="281" height="25"/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="3697" id="3694">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="3695">
                                         <items>
                                             <menuItem title="Item1" state="on" id="3697"/>
@@ -1609,16 +1609,16 @@
                                     <action selector="osdSettingChanged:" target="-2" id="pld-OJ-u5X"/>
                                 </connections>
                             </popUpButton>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3692">
-                                <rect key="frame" x="13" y="19" width="113" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3692">
+                                <rect key="frame" x="13" y="18" width="113" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Outline Color" usesSingleLineMode="YES" id="3693">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3568">
-                                <rect key="frame" x="13" y="79" width="113" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3568">
+                                <rect key="frame" x="13" y="77" width="113" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Opacity" usesSingleLineMode="YES" id="3574">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1626,7 +1626,7 @@
                                 </textFieldCell>
                             </textField>
                             <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3569">
-                                <rect key="frame" x="139" y="77" width="230" height="19"/>
+                                <rect key="frame" x="139" y="69" width="224" height="28"/>
                                 <sliderCell key="cell" continuous="YES" alignment="left" maxValue="100" doubleValue="100" tickMarkPosition="above" sliderType="linear" id="3573">
                                     <font key="font" metaFont="user"/>
                                 </sliderCell>
@@ -1635,7 +1635,7 @@
                                 </connections>
                             </slider>
                             <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="3584">
-                                <rect key="frame" x="427" y="107" width="87" height="18"/>
+                                <rect key="frame" x="421" y="104" width="91" height="18"/>
                                 <buttonCell key="cell" type="check" title="Force Bold" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3585">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1644,8 +1644,8 @@
                                     <action selector="osdSettingChanged:" target="-2" id="3JT-kF-0RI"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3594">
-                                <rect key="frame" x="375" y="76" width="46" height="21"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3594">
+                                <rect key="frame" x="369" y="74" width="46" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="46" id="N9V-Sb-2yE"/>
                                 </constraints>
@@ -1668,7 +1668,7 @@
                                 </connections>
                             </textField>
                             <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3MP-L5-isz">
-                                <rect key="frame" x="139" y="137" width="241" height="19"/>
+                                <rect key="frame" x="139" y="130" width="235" height="28"/>
                                 <sliderCell key="cell" continuous="YES" alignment="left" minValue="10" maxValue="500" doubleValue="100" tickMarkPosition="above" sliderType="linear" id="KzQ-5z-7Sh">
                                     <font key="font" metaFont="user"/>
                                 </sliderCell>
@@ -1676,8 +1676,8 @@
                                     <action selector="osdSettingChanged:" target="-2" id="B0M-7t-a7N"/>
                                 </connections>
                             </slider>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yfD-4K-I4T">
-                                <rect key="frame" x="386" y="139" width="37" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yfD-4K-I4T">
+                                <rect key="frame" x="380" y="138" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="gTV-LT-cpO">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1734,13 +1734,13 @@
                     </view>
                 </box>
                 <box title="On Screen Display" translatesAutoresizingMaskIntoConstraints="NO" id="2524">
-                    <rect key="frame" x="17" y="325" width="537" height="54"/>
+                    <rect key="frame" x="17" y="326" width="537" height="58"/>
                     <view key="contentView" id="GNq-vl-Idl">
-                        <rect key="frame" x="3" y="3" width="531" height="36"/>
+                        <rect key="frame" x="4" y="5" width="529" height="38"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="2526">
-                                <rect key="frame" x="14" y="9" width="94" height="18"/>
+                            <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2526">
+                                <rect key="frame" x="14" y="10" width="98" height="18"/>
                                 <buttonCell key="cell" type="check" title="Enable OSD" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3494">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1759,21 +1759,21 @@
                     </view>
                 </box>
                 <box title="SPU language" translatesAutoresizingMaskIntoConstraints="NO" id="1aw-Yd-yzY">
-                    <rect key="frame" x="17" y="233" width="537" height="87"/>
+                    <rect key="frame" x="17" y="235" width="537" height="88"/>
                     <view key="contentView" id="clp-fm-5xs">
-                        <rect key="frame" x="3" y="3" width="531" height="69"/>
+                        <rect key="frame" x="4" y="5" width="529" height="68"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2529">
-                                <rect key="frame" x="16" y="43" width="175" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2529">
+                                <rect key="frame" x="16" y="42" width="175" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Preferred Subtitle Language" usesSingleLineMode="YES" id="3495">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2530">
-                                <rect key="frame" x="206" y="40" width="308" height="21"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2530">
+                                <rect key="frame" x="206" y="40" width="306" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3496">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1784,8 +1784,8 @@
                                     <outlet property="delegate" destination="-2" id="AOP-2P-emL"/>
                                 </connections>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2531">
-                                <rect key="frame" x="16" y="15" width="175" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2531">
+                                <rect key="frame" x="16" y="14" width="175" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Default Encoding" usesSingleLineMode="YES" id="3497">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1793,10 +1793,10 @@
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2532">
-                                <rect key="frame" x="204" y="9" width="313" height="25"/>
+                                <rect key="frame" x="203" y="8" width="313" height="25"/>
                                 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2665" id="3498">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
+                                    <font key="font" metaFont="message"/>
                                     <menu key="menu" title="OtherViews" id="2533">
                                         <items>
                                             <menuItem title="Default" id="2534"/>
@@ -1848,21 +1848,20 @@
             <rect key="frame" x="0.0" y="0.0" width="570" height="494"/>
             <subviews>
                 <scrollView verticalHuggingPriority="750" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="0.0" verticalLineScroll="19" verticalPageScroll="0.0" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2669">
-                    <rect key="frame" x="20" y="54" width="530" height="396"/>
+                    <rect key="frame" x="20" y="56" width="530" height="394"/>
                     <clipView key="contentView" id="EbT-aN-Pgg">
-                        <rect key="frame" x="1" y="0.0" width="528" height="395"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <rect key="frame" x="1" y="1" width="528" height="392"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" emptySelection="NO" autosaveName="sprefs_hotkeys_view" headerView="3541" id="2670">
-                                <rect key="frame" x="0.0" y="0.0" width="528" height="372"/>
+                                <rect key="frame" x="0.0" y="0.0" width="528" height="369"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
-                                    <tableColumn identifier="action" editable="NO" width="301.5" minWidth="40" maxWidth="1000" id="2671">
+                                    <tableColumn identifier="action" editable="NO" width="297" minWidth="40" maxWidth="1000" id="2671">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Action">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
                                         </tableHeaderCell>
@@ -1873,9 +1872,8 @@
                                         </textFieldCell>
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                     </tableColumn>
-                                    <tableColumn identifier="shortcut" editable="NO" width="220.69820000000001" minWidth="8" maxWidth="1000" id="2672">
+                                    <tableColumn identifier="shortcut" editable="NO" width="216" minWidth="8" maxWidth="1000" id="2672">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Shortcut">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
                                         </tableHeaderCell>
@@ -1910,16 +1908,16 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2673">
-                    <rect key="frame" x="18" y="458" width="345" height="16"/>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2673">
+                    <rect key="frame" x="18" y="458" width="344" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Double-click an action to change the associated hotkey:" usesSingleLineMode="YES" id="3524">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <button verticalHuggingPriority="750" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="6Ro-o1-WEd">
-                    <rect key="frame" x="18" y="18" width="225" height="18"/>
+                <button mirrorLayoutDirectionWhenInternationalizing="always" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6Ro-o1-WEd">
+                    <rect key="frame" x="18" y="19" width="229" height="18"/>
                     <buttonCell key="cell" type="check" title="Control playback with media keys" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="kZN-TJ-neV">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
@@ -1946,12 +1944,12 @@
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="433" y="441" width="440" height="170"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <view key="contentView" id="2678">
                 <rect key="frame" x="0.0" y="0.0" width="440" height="170"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="2679">
+                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="2679">
                         <rect key="frame" x="159" y="102" width="122" height="32"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="3527">
                             <font key="font" metaFont="system"/>
@@ -1961,16 +1959,16 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2800">
-                        <rect key="frame" x="152" y="77" width="137" height="17"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2800">
+                        <rect key="frame" x="151" y="77" width="139" height="17"/>
                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="${PRESSED_KEYS}" usesSingleLineMode="YES" id="3530">
                             <font key="font" metaFont="systemBold" size="14"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2803">
-                        <rect key="frame" x="111" y="55" width="218" height="14"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2803">
+                        <rect key="frame" x="111" y="55" width="219" height="14"/>
                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="This combination is already taken by %s" usesSingleLineMode="YES" id="3531">
                             <font key="font" metaFont="message" size="11"/>
                             <color key="textColor" name="controlShadowColor" catalog="System" colorSpace="catalog"/>
@@ -1978,7 +1976,7 @@
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2792">
-                        <rect key="frame" x="285" y="12" width="82" height="32"/>
+                        <rect key="frame" x="300" y="12" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3529">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -1988,7 +1986,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2791">
-                        <rect key="frame" x="367" y="12" width="59" height="32"/>
+                        <rect key="frame" x="374" y="12" width="53" height="32"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3528">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -1998,7 +1996,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Dd-AY-La9">
-                        <rect key="frame" x="14" y="12" width="72" height="32"/>
+                        <rect key="frame" x="13" y="12" width="66" height="32"/>
                         <buttonCell key="cell" type="push" title="Clear" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="MXS-Da-DZW">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -2037,12 +2035,12 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="340" y="383" width="485" height="254"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <view key="contentView" id="3746">
                 <rect key="frame" x="0.0" y="0.0" width="485" height="254"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3747">
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3747">
                         <rect key="frame" x="59" y="217" width="368" height="17"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="Open network streams using the following protocols" usesSingleLineMode="YES" id="3748">
                             <font key="font" metaFont="systemBold" size="14"/>
@@ -2050,7 +2048,7 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3749">
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3749">
                         <rect key="frame" x="139" y="196" width="208" height="13"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Note that these are system-wide settings" id="3750">
                             <font key="font" metaFont="menu" size="10"/>
@@ -2059,7 +2057,7 @@
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3767">
-                        <rect key="frame" x="402" y="12" width="70" height="32"/>
+                        <rect key="frame" x="409" y="12" width="64" height="32"/>
                         <buttonCell key="cell" type="push" title="Save" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3768">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -2072,7 +2070,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3769">
-                        <rect key="frame" x="325" y="12" width="82" height="32"/>
+                        <rect key="frame" x="340" y="12" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3770">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -2085,13 +2083,10 @@
                         </connections>
                     </button>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3789">
-                        <rect key="frame" x="77" y="150" width="130" height="25"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="125" id="1ju-0u-22Z"/>
-                        </constraints>
+                        <rect key="frame" x="76" y="150" width="132" height="25"/>
                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="3790">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="message"/>
                             <menu key="menu" title="OtherViews" id="3791">
                                 <items>
                                     <menuItem title="Item 1" id="3792"/>
@@ -2100,8 +2095,11 @@
                                 </items>
                             </menu>
                         </popUpButtonCell>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="125" id="1ju-0u-22Z"/>
+                        </constraints>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3795">
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3795">
                         <rect key="frame" x="47" y="156" width="28" height="16"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="FTP" id="3796">
                             <font key="font" metaFont="system"/>
@@ -2110,10 +2108,10 @@
                         </textFieldCell>
                     </textField>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3797">
-                        <rect key="frame" x="77" y="124" width="130" height="25"/>
+                        <rect key="frame" x="76" y="125" width="132" height="25"/>
                         <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3804" id="3800">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="message"/>
                             <menu key="menu" title="OtherViews" id="3801">
                                 <items>
                                     <menuItem title="Item 1" state="on" id="3804"/>
@@ -2123,8 +2121,8 @@
                             </menu>
                         </popUpButtonCell>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3798">
-                        <rect key="frame" x="40" y="130" width="35" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3798">
+                        <rect key="frame" x="40" y="131" width="35" height="16"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="MMS" id="3799">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -2132,10 +2130,10 @@
                         </textFieldCell>
                     </textField>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3805">
-                        <rect key="frame" x="77" y="98" width="130" height="25"/>
+                        <rect key="frame" x="76" y="100" width="132" height="25"/>
                         <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3810" id="3808">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="message"/>
                             <menu key="menu" title="OtherViews" id="3809">
                                 <items>
                                     <menuItem title="Item 1" state="on" id="3810"/>
@@ -2145,8 +2143,8 @@
                             </menu>
                         </popUpButtonCell>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3806">
-                        <rect key="frame" x="34" y="104" width="41" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3806">
+                        <rect key="frame" x="34" y="106" width="41" height="16"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="RTMP" id="3807">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -2154,10 +2152,10 @@
                         </textFieldCell>
                     </textField>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3813">
-                        <rect key="frame" x="322" y="150" width="130" height="25"/>
+                        <rect key="frame" x="321" y="150" width="132" height="25"/>
                         <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3820" id="3816">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="message"/>
                             <menu key="menu" title="OtherViews" id="3817">
                                 <items>
                                     <menuItem title="Item 1" state="on" id="3820"/>
@@ -2167,7 +2165,7 @@
                             </menu>
                         </popUpButtonCell>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3814">
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3814">
                         <rect key="frame" x="283" y="156" width="37" height="16"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="RTSP" id="3815">
                             <font key="font" metaFont="system"/>
@@ -2176,10 +2174,10 @@
                         </textFieldCell>
                     </textField>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3821">
-                        <rect key="frame" x="77" y="72" width="130" height="25"/>
+                        <rect key="frame" x="76" y="75" width="132" height="25"/>
                         <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3826" id="3824">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="message"/>
                             <menu key="menu" title="OtherViews" id="3825">
                                 <items>
                                     <menuItem title="Item 1" state="on" id="3826"/>
@@ -2189,8 +2187,8 @@
                             </menu>
                         </popUpButtonCell>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3822">
-                        <rect key="frame" x="46" y="78" width="29" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3822">
+                        <rect key="frame" x="46" y="81" width="29" height="16"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="RTP" id="3823">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -2198,10 +2196,10 @@
                         </textFieldCell>
                     </textField>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3829">
-                        <rect key="frame" x="322" y="124" width="130" height="25"/>
+                        <rect key="frame" x="321" y="125" width="132" height="25"/>
                         <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3836" id="3832">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="message"/>
                             <menu key="menu" title="OtherViews" id="3833">
                                 <items>
                                     <menuItem title="Item 1" state="on" id="3836"/>
@@ -2211,8 +2209,8 @@
                             </menu>
                         </popUpButtonCell>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3830">
-                        <rect key="frame" x="284" y="130" width="36" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3830">
+                        <rect key="frame" x="284" y="131" width="36" height="16"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="SFTP" id="3831">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -2220,10 +2218,10 @@
                         </textFieldCell>
                     </textField>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3837">
-                        <rect key="frame" x="322" y="98" width="130" height="25"/>
+                        <rect key="frame" x="321" y="100" width="132" height="25"/>
                         <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3842" id="3840">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="message"/>
                             <menu key="menu" title="OtherViews" id="3841">
                                 <items>
                                     <menuItem title="Item 1" state="on" id="3842"/>
@@ -2233,8 +2231,8 @@
                             </menu>
                         </popUpButtonCell>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3838">
-                        <rect key="frame" x="288" y="104" width="32" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3838">
+                        <rect key="frame" x="288" y="106" width="32" height="16"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="SMB" id="3839">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -2242,10 +2240,10 @@
                         </textFieldCell>
                     </textField>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3845">
-                        <rect key="frame" x="322" y="72" width="130" height="25"/>
+                        <rect key="frame" x="321" y="75" width="132" height="25"/>
                         <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3852" id="3848">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="message"/>
                             <menu key="menu" title="OtherViews" id="3849">
                                 <items>
                                     <menuItem title="Item 1" state="on" id="3852"/>
@@ -2255,8 +2253,8 @@
                             </menu>
                         </popUpButtonCell>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3846">
-                        <rect key="frame" x="288" y="78" width="32" height="16"/>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3846">
+                        <rect key="frame" x="288" y="81" width="32" height="16"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="UDP" id="3847">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -2324,10 +2322,10 @@
             <rect key="frame" x="0.0" y="0.0" width="611" height="426"/>
             <subviews>
                 <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gbE-0a-hRm">
-                    <rect key="frame" x="20" y="55" width="571" height="311"/>
+                    <rect key="frame" x="20" y="54" width="571" height="312"/>
                     <clipView key="contentView" id="2Qm-UL-Q5r">
-                        <rect key="frame" x="1" y="0.0" width="569" height="310"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <rect key="frame" x="1" y="1" width="569" height="310"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="ZJl-qT-3EL" id="uR2-Au-IEe">
                                 <rect key="frame" x="0.0" y="0.0" width="569" height="285"/>
@@ -2338,7 +2336,6 @@
                                 <tableColumns>
                                     <tableColumn editable="NO" width="116" minWidth="40" maxWidth="1000" id="wAS-Qh-rAS">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -2351,7 +2348,6 @@
                                     </tableColumn>
                                     <tableColumn editable="NO" width="116" minWidth="40" maxWidth="1000" id="kVl-Wj-9vm">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -2364,7 +2360,6 @@
                                     </tableColumn>
                                     <tableColumn editable="NO" width="116" minWidth="40" maxWidth="1000" id="bjG-Ru-jiX">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -2375,9 +2370,8 @@
                                         </textFieldCell>
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                     </tableColumn>
-                                    <tableColumn editable="NO" width="209" minWidth="40" maxWidth="1000" id="QBg-HT-Vvb">
+                                    <tableColumn editable="NO" width="200" minWidth="40" maxWidth="1000" id="QBg-HT-Vvb">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -2409,21 +2403,21 @@
                     </tableHeaderView>
                 </scrollView>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AsR-G7-aHo">
-                    <rect key="frame" x="14" y="13" width="117" height="32"/>
+                    <rect key="frame" x="13" y="13" width="111" height="32"/>
                     <buttonCell key="cell" type="push" title="Add Folder..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="TE0-DV-iku">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WnC-lv-27l">
-                    <rect key="frame" x="131" y="13" width="131" height="32"/>
+                    <rect key="frame" x="122" y="13" width="125" height="32"/>
                     <buttonCell key="cell" type="push" title="Remove Folder" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="5lO-dg-v02">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Yvu-g1-fLU">
-                    <rect key="frame" x="262" y="13" width="105" height="32"/>
+                    <rect key="frame" x="245" y="13" width="99" height="32"/>
                     <buttonCell key="cell" type="push" title="Ban Folder" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ga6-ZJ-oef">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCDetachedAudioWindow.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCDetachedAudioWindow.xib Changed

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,11 +16,11 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/>
             <rect key="contentRect" x="91" y="467" width="500" height="500"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1050"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <value key="minSize" type="size" width="239" height="239"/>
             <view key="contentView" id="4" customClass="VLCTrackingView">
                 <rect key="frame" x="0.0" y="0.0" width="500" height="500"/>
-                <autoresizingMask key="autoresizingMask"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <customView wantsLayer="YES" translatesAutoresizingMaskIntoConstraints="NO" id="s7h-2z-AKB" customClass="VLCMainVideoViewOverlayView">
                         <rect key="frame" x="0.0" y="0.0" width="500" height="500"/>
@@ -31,7 +31,7 @@
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="65" customClass="VLCDragDropView">
                                         <rect key="frame" x="0.0" y="0.0" width="500" height="115"/>
                                         <subviews>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hHQ-ue-m9C" customClass="VLCWrappableTextField">
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="hHQ-ue-m9C">
                                                 <rect key="frame" x="8" y="63" width="484" height="19"/>
                                                 <shadow key="shadow" blurRadius="5">
                                                     <color key="color" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -42,7 +42,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zpq-en-EAi" customClass="VLCWrappableTextField">
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="zpq-en-EAi">
                                                 <rect key="frame" x="8" y="82" width="484" height="28"/>
                                                 <shadow key="shadow" blurRadius="5">
                                                     <color key="color" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -54,10 +54,24 @@
                                                 </textFieldCell>
                                             </textField>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Vae-cT-EEI" userLabel="Play controls group">
-                                                <rect key="frame" x="202" y="10" width="96" height="32"/>
+                                                <rect key="frame" x="185" y="10" width="131" height="32"/>
                                                 <subviews>
+                                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="gAM-N6-20z" userLabel="Jump Back Button">
+                                                        <rect key="frame" x="0.0" y="3" width="20.5" height="28"/>
+                                                        <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="arrow.trianglehead.counterclockwise" catalog="system" imagePosition="only" alignment="center" alternateImage="backward.fill" controlSize="large" continuous="YES" imageScaling="proportionallyUpOrDown" id="ZMf-Wu-LAx">
+                                                            <behavior key="behavior" lightByContents="YES"/>
+                                                            <font key="font" metaFont="system"/>
+                                                        </buttonCell>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" secondItem="gAM-N6-20z" secondAttribute="height" multiplier="1:1" id="Zi6-SL-IgL"/>
+                                                            <constraint firstAttribute="width" secondItem="gAM-N6-20z" secondAttribute="height" multiplier="1:1" id="xMw-di-Drm"/>
+                                                        </constraints>
+                                                        <connections>
+                                                            <action selector="jumpBackward:" target="3" id="WYX-uq-hwV"/>
+                                                        </connections>
+                                                    </button>
                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="11">
-                                                        <rect key="frame" x="0.0" y="-1" width="32" height="35"/>
+                                                        <rect key="frame" x="20" y="-1.5" width="32.5" height="35"/>
                                                         <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="backward.fill" catalog="system" imagePosition="only" alignment="center" alternateImage="backward.fill" controlSize="large" continuous="YES" enabled="NO" imageScaling="proportionallyUpOrDown" id="14">
                                                             <behavior key="behavior" lightByContents="YES"/>
                                                             <font key="font" metaFont="system"/>
@@ -70,7 +84,7 @@
                                                         </connections>
                                                     </button>
                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="10">
-                                                        <rect key="frame" x="32" y="-3" width="32" height="38"/>
+                                                        <rect key="frame" x="52" y="-3" width="32" height="38"/>
                                                         <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="play.circle.fill" catalog="system" imagePosition="only" alignment="center" alternateImage="play.circle.fill" controlSize="large" imageScaling="proportionallyUpOrDown" id="15">
                                                             <behavior key="behavior" lightByContents="YES"/>
                                                             <font key="font" metaFont="system"/>
@@ -83,7 +97,7 @@
                                                         </connections>
                                                     </button>
                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="12">
-                                                        <rect key="frame" x="64" y="-1" width="32" height="35"/>
+                                                        <rect key="frame" x="84" y="-1.5" width="32.5" height="35"/>
                                                         <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="forward.fill" catalog="system" imagePosition="only" alignment="center" alternateImage="forward.fill" controlSize="large" continuous="YES" enabled="NO" imageScaling="proportionallyUpOrDown" id="13">
                                                             <behavior key="behavior" lightByContents="YES"/>
                                                             <font key="font" metaFont="system"/>
@@ -95,19 +109,37 @@
                                                             <action selector="fwd:" target="3" id="51"/>
                                                         </connections>
                                                     </button>
+                                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="gzL-f3-Atd" userLabel="Jump Forwards Buttoin">
+                                                        <rect key="frame" x="116" y="6" width="15" height="23"/>
+                                                        <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="arrow.trianglehead.clockwise" catalog="system" imagePosition="only" alignment="center" alternateImage="arrow.trianglehead.clockwise" controlSize="large" continuous="YES" imageScaling="proportionallyUpOrDown" id="81E-pP-1hO">
+                                                            <behavior key="behavior" lightByContents="YES"/>
+                                                            <font key="font" metaFont="system"/>
+                                                        </buttonCell>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" secondItem="gzL-f3-Atd" secondAttribute="height" multiplier="1:1" id="Hl0-jN-lyU"/>
+                                                            <constraint firstAttribute="width" secondItem="gzL-f3-Atd" secondAttribute="height" multiplier="1:1" id="sv0-Qp-GHf"/>
+                                                        </constraints>
+                                                        <connections>
+                                                            <action selector="jumpForward:" target="3" id="m6y-ed-Fwc"/>
+                                                        </connections>
+                                                    </button>
                                                 </subviews>
                                                 <constraints>
                                                     <constraint firstItem="11" firstAttribute="top" secondItem="Vae-cT-EEI" secondAttribute="top" id="11i-jS-o5W"/>
+                                                    <constraint firstItem="gzL-f3-Atd" firstAttribute="centerY" secondItem="Vae-cT-EEI" secondAttribute="centerY" id="3NJ-z2-sVu"/>
                                                     <constraint firstItem="10" firstAttribute="left" secondItem="11" secondAttribute="right" id="496-Ip-nTd"/>
                                                     <constraint firstItem="10" firstAttribute="top" secondItem="Vae-cT-EEI" secondAttribute="top" id="9Kr-xx-Ssf"/>
-                                                    <constraint firstAttribute="right" secondItem="12" secondAttribute="right" id="KOc-oW-4iH"/>
+                                                    <constraint firstAttribute="trailing" secondItem="gzL-f3-Atd" secondAttribute="trailing" id="IQ0-ae-v5p"/>
+                                                    <constraint firstItem="gzL-f3-Atd" firstAttribute="left" secondItem="12" secondAttribute="right" id="KOc-oW-4iH"/>
+                                                    <constraint firstItem="gAM-N6-20z" firstAttribute="centerY" secondItem="Vae-cT-EEI" secondAttribute="centerY" id="QiN-nb-d8b"/>
                                                     <constraint firstAttribute="height" constant="32" id="bN7-k9-7Iy"/>
                                                     <constraint firstAttribute="bottom" secondItem="11" secondAttribute="bottom" id="fFe-7J-ver"/>
                                                     <constraint firstItem="12" firstAttribute="top" secondItem="Vae-cT-EEI" secondAttribute="top" id="gwB-yN-SK0"/>
                                                     <constraint firstAttribute="bottom" secondItem="12" secondAttribute="bottom" id="l2h-EI-MAG"/>
                                                     <constraint firstItem="12" firstAttribute="left" secondItem="10" secondAttribute="right" id="mOu-KM-Uo8"/>
-                                                    <constraint firstItem="11" firstAttribute="left" secondItem="Vae-cT-EEI" secondAttribute="left" id="rI6-bN-oCM"/>
+                                                    <constraint firstItem="11" firstAttribute="left" secondItem="gAM-N6-20z" secondAttribute="right" id="rI6-bN-oCM"/>
                                                     <constraint firstAttribute="bottom" secondItem="10" secondAttribute="bottom" id="yGM-Jx-9fD"/>
+                                                    <constraint firstItem="gAM-N6-20z" firstAttribute="leading" secondItem="Vae-cT-EEI" secondAttribute="leading" id="yhq-h9-lgm"/>
                                                 </constraints>
                                             </customView>
                                             <slider hidden="YES" horizontalHuggingPriority="200" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="20" customClass="VLCPlaybackProgressSlider">
@@ -154,6 +186,9 @@
                                                             <constraint firstAttribute="width" constant="80" id="Z0g-An-VZe"/>
                                                         </constraints>
                                                         <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="512" doubleValue="50" tickMarkPosition="above" sliderType="linear" id="KnE-u5-aI1" customClass="VLCVolumeSliderCell"/>
+                                                        <connections>
+                                                            <action selector="volumeAction:" target="3" id="5IU-vg-f8h"/>
+                                                        </connections>
                                                     </slider>
                                                 </subviews>
                                                 <visibilityPriorities>
@@ -224,14 +259,19 @@
                 <outlet property="detailLabel" destination="hHQ-ue-m9C" id="YOa-QZ-nmx"/>
                 <outlet property="dropView" destination="65" id="9kL-XQ-Akn"/>
                 <outlet property="forwardButton" destination="12" id="f7L-YR-p1H"/>
+                <outlet property="jumpBackwardButton" destination="gAM-N6-20z" id="pjA-Rp-szy"/>
+                <outlet property="jumpForwardButton" destination="gzL-f3-Atd" id="g5i-TP-TrD"/>
                 <outlet property="playButton" destination="10" id="Gsq-tx-qf3"/>
                 <outlet property="playingItemDisplayField" destination="zpq-en-EAi" id="9js-uK-Dgf"/>
                 <outlet property="timeField" destination="9" id="uzI-2c-bs3"/>
                 <outlet property="timeSlider" destination="20" id="AFS-sq-vuw"/>
+                <outlet property="volumeSlider" destination="z4Z-7V-IQk" id="njj-Ji-PGF"/>
             </connections>
         </customObject>
     </objects>
     <resources>
+        <image name="arrow.trianglehead.clockwise" catalog="system" width="15" height="17"/>
+        <image name="arrow.trianglehead.counterclockwise" catalog="system" width="15" height="17"/>
         <image name="backward.fill" catalog="system" width="20" height="12"/>
         <image name="forward.fill" catalog="system" width="20" height="12"/>
         <image name="play.circle.fill" catalog="system" width="15" height="15"/>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCInformationWindow.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCInformationWindow.xib Changed

@@ -89,7 +89,7 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Media Information" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="mediainfo" animationBehavior="default" id="2" userLabel="Media Information" customClass="NSPanel">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" utility="YES" HUD="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" utility="YES" HUD="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="34" width="506" height="476"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
@@ -599,14 +599,14 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="510" height="440"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <subviews>
-                                                    <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="521" id="519" customClass="VLCHUDOutlineView">
-                                                        <rect key="frame" x="0.0" y="0.0" width="510" height="440"/>
+                                                    <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" indentationMarkerFollowsCell="NO" autoresizesOutlineColumn="YES" outlineTableColumn="521" id="519">
+                                                        <rect key="frame" x="0.0" y="0.0" width="494" height="440"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <size key="intercellSpacing" width="3" height="2"/>
                                                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                         <tableColumns>
-                                                            <tableColumn identifier="0" editable="NO" width="241.91015625" minWidth="16" maxWidth="1000" id="521">
+                                                            <tableColumn identifier="0" editable="NO" width="242" minWidth="16" maxWidth="1000" id="521">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -617,8 +617,28 @@
                                                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
                                                                 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                                <prototypeCellViews>
+                                                                    <tableCellView id="sWh-xo-F0z">
+                                                                        <rect key="frame" x="11" y="1" width="254" height="17"/>
+                                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                                        <subviews>
+                                                                            <textField identifier="VLCInformationWindowPropertyNameCell" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aQy-jV-OVS">
+                                                                                <rect key="frame" x="0.0" y="1" width="254" height="16"/>
+                                                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="S8v-2v-4vD">
+                                                                                    <font key="font" usesAppearanceFont="YES"/>
+                                                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                                </textFieldCell>
+                                                                            </textField>
+                                                                        </subviews>
+                                                                        <connections>
+                                                                            <outlet property="textField" destination="aQy-jV-OVS" id="hPV-Nv-lEm"/>
+                                                                        </connections>
+                                                                    </tableCellView>
+                                                                </prototypeCellViews>
                                                             </tableColumn>
-                                                            <tableColumn identifier="1" editable="NO" width="233" minWidth="10" maxWidth="3.4028234663852886e+38" id="644">
+                                                            <tableColumn identifier="1" editable="NO" width="217" minWidth="16" maxWidth="3.4028234663852886e+38" id="644">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -629,6 +649,26 @@
                                                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
                                                                 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                                <prototypeCellViews>
+                                                                    <tableCellView id="AiZ-f9-liR">
+                                                                        <rect key="frame" x="261" y="1" width="227" height="17"/>
+                                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                                        <subviews>
+                                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oPm-Le-K3W">
+                                                                                <rect key="frame" x="0.0" y="1" width="227" height="16"/>
+                                                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="F2n-nI-GbZ">
+                                                                                    <font key="font" usesAppearanceFont="YES"/>
+                                                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                                </textFieldCell>
+                                                                            </textField>
+                                                                        </subviews>
+                                                                        <connections>
+                                                                            <outlet property="textField" destination="oPm-Le-K3W" id="WSP-1y-2Ac"/>
+                                                                        </connections>
+                                                                    </tableCellView>
+                                                                </prototypeCellViews>
                                                             </tableColumn>
                                                         </tableColumns>
                                                     </outlineView>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryAlbumTableCellView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryAlbumTableCellView.xib Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryCollectionViewItem.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryCollectionViewItem.xib Changed

@@ -8,7 +8,7 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="VLCLibraryCollectionViewItem">
             <connections>
-                <outlet property="addToPlaylistButton" destination="Ubz-8I-W2F" id="k0q-b1-PZi"/>
+                <outlet property="addToPlayQueueButton" destination="Ubz-8I-W2F" id="k0q-b1-PZi"/>
                 <outlet property="annotationTextField" destination="tm2-NW-WsZ" id="Miy-RS-Rol"/>
                 <outlet property="highlightBox" destination="Vwd-1n-Sbd" id="h1g-hL-1gh"/>
                 <outlet property="imageViewAspectRatioConstraint" destination="f7c-vp-30m" id="2As-9A-WOn"/>
@@ -101,7 +101,7 @@
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                     <connections>
-                        <action selector="addToPlaylist:" target="-2" id="2C9-Rn-VAb"/>
+                        <action selector="addToPlayQueue:" target="-2" id="2C9-Rn-VAb"/>
                     </connections>
                 </button>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VAn-gF-QiZ">

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.xib Changed

@@ -22,7 +22,7 @@
                                 <imageView translatesAutoresizingMaskIntoConstraints="NO" id="xZd-Hk-h2M" customClass="VLCImageView">
                                     <rect key="frame" x="0.0" y="35" width="237" height="237"/>
                                     <constraints>
-                                        <constraint firstAttribute="width" secondItem="xZd-Hk-h2M" secondAttribute="height" multiplier="1:1" id="TIK-Ez-QbE"/>
+                                        <constraint firstAttribute="width" secondItem="xZd-Hk-h2M" secondAttribute="height" multiplier="1:1" priority="750" id="TIK-Ez-QbE"/>
                                     </constraints>
                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="no-art" id="6X6-Og-u8A"/>
                                 </imageView>
@@ -175,6 +175,9 @@
                                         </subviews>
                                         <nil key="backgroundColor"/>
                                     </clipView>
+                                    <constraints>
+                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="Hpe-5w-QJh"/>
+                                    </constraints>
                                     <edgeInsets key="contentInsets" left="0.0" right="0.0" top="0.0" bottom="10"/>
                                     <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="ZBY-pE-E7T">
                                         <rect key="frame" x="-100" y="-100" width="701" height="15"/>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.xib Changed

@@ -10,27 +10,27 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <view id="HAc-or-XD8" customClass="VLCLibraryCollectionViewMediaItemSupplementaryDetailView">
-            <rect key="frame" x="0.0" y="0.0" width="1097" height="255"/>
+            <rect key="frame" x="0.0" y="0.0" width="801" height="300"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
             <subviews>
                 <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FWp-yd-2Pm">
-                    <rect key="frame" x="10" y="0.0" width="1077" height="225"/>
+                    <rect key="frame" x="10" y="10" width="781" height="260"/>
                     <subviews>
                         <stackView distribution="equalCentering" orientation="vertical" alignment="leading" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TOx-1e-6D9">
-                            <rect key="frame" x="0.0" y="10" width="180" height="215"/>
+                            <rect key="frame" x="0.0" y="0.0" width="225" height="260"/>
                             <subviews>
                                 <imageView horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="xZd-Hk-h2M" customClass="VLCImageView">
-                                    <rect key="frame" x="0.0" y="35" width="180" height="180"/>
+                                    <rect key="frame" x="0.0" y="35" width="225" height="225"/>
                                     <constraints>
                                         <constraint firstAttribute="width" secondItem="xZd-Hk-h2M" secondAttribute="height" multiplier="1:1" id="6yq-tW-e4k"/>
                                     </constraints>
                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="no-art" id="6X6-Og-u8A"/>
                                 </imageView>
                                 <stackView distribution="fillEqually" orientation="horizontal" alignment="top" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Nc-Mb-wDa">
-                                    <rect key="frame" x="0.0" y="0.0" width="180" height="30"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="225" height="30"/>
                                     <subviews>
                                         <button imageHugsTitle="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ntd-VT-2KS">
-                                            <rect key="frame" x="-6" y="-4" width="94" height="40"/>
+                                            <rect key="frame" x="-6" y="-4" width="122" height="40"/>
                                             <buttonCell key="cell" type="push" title=" Play" bezelStyle="rounded" image="play.fill" catalog="system" imagePosition="left" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Rgc-Uk-A3h">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -41,7 +41,7 @@
                                             </connections>
                                         </button>
                                         <button imageHugsTitle="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="idL-3a-QaA">
-                                            <rect key="frame" x="81" y="-4" width="105" height="40"/>
+                                            <rect key="frame" x="109" y="-4" width="122" height="40"/>
                                             <buttonCell key="cell" type="push" title=" Enqueue" bezelStyle="rounded" image="plus" catalog="system" imagePosition="left" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="igY-iu-P0N">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -80,20 +80,20 @@
                             </customSpacing>
                         </stackView>
                         <stackView distribution="fillEqually" orientation="vertical" alignment="leading" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" horizontalCompressionResistancePriority="250" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bw7-QB-Ssc">
-                            <rect key="frame" x="200" y="94" width="877" height="131"/>
+                            <rect key="frame" x="245" y="0.0" width="536" height="260"/>
                             <subviews>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nCe-dY-YMM">
-                                    <rect key="frame" x="-2" y="105" width="167" height="26"/>
+                                    <rect key="frame" x="-2" y="234" width="167" height="26"/>
                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Media item name" id="6RM-x8-Y4y">
                                         <font key="font" textStyle="title1" name=".SFNS-Regular"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JzZ-K9-xaP">
-                                    <rect key="frame" x="0.0" y="84" width="417" height="16"/>
+                                <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JzZ-K9-xaP">
+                                    <rect key="frame" x="0.0" y="213" width="536" height="16"/>
                                     <subviews>
-                                        <button verticalHuggingPriority="750" horizontalCompressionResistancePriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="S5i-gd-zkt">
+                                        <button horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="S5i-gd-zkt">
                                             <rect key="frame" x="0.0" y="0.0" width="196" height="16"/>
                                             <buttonCell key="cell" type="bevel" title="Media item primary detail string" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" imageScaling="proportionallyDown" inset="2" id="zkC-9p-xFn">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -108,7 +108,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="9CH-03-Iu3">
-                                            <rect key="frame" x="204" y="0.0" width="213" height="16"/>
+                                            <rect key="frame" x="201" y="0.0" width="314" height="16"/>
                                             <buttonCell key="cell" type="bevel" title="Media item secondary detail string" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" imageScaling="proportionallyDown" inset="2" id="wPH-tu-Uw1">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -121,140 +121,366 @@
                                                 <action selector="secondaryDetailAction:" target="HAc-or-XD8" id="IAX-VG-Kpd"/>
                                             </connections>
                                         </button>
+                                        <button horizontalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="5Ul-IA-Mco">
+                                            <rect key="frame" x="520" y="-2.5" width="16" height="21"/>
+                                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="heart" catalog="system" imagePosition="only" alignment="center" alternateImage="heart.fill" imageScaling="proportionallyUpOrDown" inset="2" id="Gzu-E8-QAA">
+                                                <behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <color key="contentTintColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
+                                            <connections>
+                                                <action selector="favoriteAction:" target="HAc-or-XD8" id="bPB-XU-9uc"/>
+                                            </connections>
+                                        </button>
                                     </subviews>
+                                    <constraints>
+                                        <constraint firstItem="5Ul-IA-Mco" firstAttribute="centerY" secondItem="JzZ-K9-xaP" secondAttribute="centerY" id="7R4-k6-KYR"/>
+                                        <constraint firstAttribute="height" constant="16" id="Xhb-lh-AxX"/>
+                                    </constraints>
                                     <visibilityPriorities>
                                         <integer value="1000"/>
                                         <integer value="1000"/>
+                                        <integer value="1000"/>
                                     </visibilityPriorities>
                                     <customSpacing>
                                         <real value="3.4028234663852886e+38"/>
                                         <real value="3.4028234663852886e+38"/>
+                                        <real value="3.4028234663852886e+38"/>
                                     </customSpacing>
                                 </stackView>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QuO-3G-BMT">
-                                    <rect key="frame" x="-2" y="63" width="94" height="16"/>
-                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Year · Duration" id="JBg-wo-ZeE">
+                                    <rect key="frame" x="-2" y="192" width="196" height="16"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="16" id="8hg-2f-fip"/>
+                                    </constraints>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Year · Duration · Type · Subtype" id="JBg-wo-ZeE">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fiJ-9f-ecF">
-                                    <rect key="frame" x="0.0" y="42" width="106" height="16"/>
-                                    <subviews>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="NZk-WW-Uay">
-                                            <rect key="frame" x="-2" y="0.0" width="72" height="16"/>
-                                            <textFieldCell key="cell" lineBreakMode="clipping" title="File Name:" id="CyQ-Ao-mup">
-                                                <font key="font" metaFont="systemBold"/>
-                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            </textFieldCell>
-                                        </textField>
-                                        <textField focusRingType="none" verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="VxL-BW-3eh">
-                                            <rect key="frame" x="71" y="0.0" width="37" height="16"/>
-                                            <textFieldCell key="cell" title="Label" id="Pzf-s3-rHC">
-                                                <font key="font" usesAppearanceFont="YES"/>
-                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            </textFieldCell>
-                                        </textField>
-                                    </subviews>
-                                    <visibilityPriorities>
-                                        <integer value="1000"/>
-                                        <integer value="1000"/>
-                                    </visibilityPriorities>
-                                    <customSpacing>
-                                        <real value="3.4028234663852886e+38"/>
-                                        <real value="3.4028234663852886e+38"/>
-                                    </customSpacing>
-                                </stackView>
-                                <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ebw-bB-VfF">
-                                    <rect key="frame" x="0.0" y="21" width="85" height="16"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="536" height="187"/>
                                     <subviews>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="uhm-9P-6qk">
-                                            <rect key="frame" x="-2" y="0.0" width="51" height="16"/>
-                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Labels:" id="FCe-hT-5o4">
-                                                <font key="font" metaFont="systemBold"/>
-                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            </textFieldCell>
-                                        </textField>
-                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HyO-9K-R7L">
-                                            <rect key="frame" x="50" y="0.0" width="37" height="16"/>
-                                            <textFieldCell key="cell" title="Label" id="eIz-b2-2PE">
-                                                <font key="font" usesAppearanceFont="YES"/>
-                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            </textFieldCell>
-                                        </textField>
+                                        <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fRH-zv-BlF">
+                                            <rect key="frame" x="0.0" y="3" width="79" height="184"/>
+                                            <subviews>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="jeT-l1-TZw">
+                                                    <rect key="frame" x="-2" y="168" width="83" height="16"/>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Rating:" id="vin-X5-wQH">
+                                                        <font key="font" metaFont="systemBold"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="uhm-9P-6qk">
+                                                    <rect key="frame" x="-2" y="147" width="83" height="16"/>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Labels:" id="FCe-hT-5o4">
+                                                        <font key="font" metaFont="systemBold"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="oO9-wF-WH8">
+                                                    <rect key="frame" x="-2" y="126" width="83" height="16"/>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Director:" id="BBS-7L-2Av">
+                                                        <font key="font" metaFont="systemBold"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="kQq-KE-Eg7">
+                                                    <rect key="frame" x="-2" y="105" width="83" height="16"/>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Actors:" id="a1D-I2-1oI">
+                                                        <font key="font" metaFont="systemBold"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="HYi-e3-j6K">
+                                                    <rect key="frame" x="-2" y="84" width="83" height="16"/>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Copyright:" id="FTb-8c-Kqq">
+                                                        <font key="font" metaFont="systemBold"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="F6B-1v-Bg2">
+                                                    <rect key="frame" x="-2" y="63" width="83" height="16"/>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Last played:" id="LfQ-yR-UiL">
+                                                        <font key="font" metaFont="systemBold"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="O20-fr-lHb">
+                                                    <rect key="frame" x="-2" y="42" width="83" height="16"/>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Content:" id="LdZ-IF-3FI">
+                                                        <font key="font" metaFont="systemBold"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="NZk-WW-Uay">
+                                                    <rect key="frame" x="-2" y="21" width="83" height="16"/>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="File name:" id="CyQ-Ao-mup">
+                                                        <font key="font" metaFont="systemBold"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <button imageHugsTitle="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DPs-b2-1We">
+                                                    <rect key="frame" x="23" y="0.0" width="56" height="16"/>
+                                                    <buttonCell key="cell" type="inline" title="Path:" bezelStyle="inline" image="arrow.up.right.circle.fill" catalog="system" imagePosition="leading" alignment="right" state="on" imageScaling="proportionallyDown" inset="2" id="L32-8T-032">
+                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                        <font key="font" metaFont="systemBold"/>
+                                                    </buttonCell>
+                                                    <color key="contentTintColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                    <connections>
+                                                        <action selector="openPathAction:" target="HAc-or-XD8" id="4qa-Cp-3z6"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="oO9-wF-WH8" secondAttribute="trailing" id="4lG-eg-Jph"/>
+                                                <constraint firstAttribute="trailing" secondItem="O20-fr-lHb" secondAttribute="trailing" id="Avk-mZ-kvV"/>
+                                                <constraint firstAttribute="trailing" secondItem="HYi-e3-j6K" secondAttribute="trailing" id="B2m-08-6Of"/>
+                                                <constraint firstAttribute="trailing" secondItem="jeT-l1-TZw" secondAttribute="trailing" id="Bn3-s2-Uym"/>
+                                                <constraint firstAttribute="trailing" secondItem="F6B-1v-Bg2" secondAttribute="trailing" id="HeU-cb-dP6"/>
+                                                <constraint firstAttribute="trailing" secondItem="kQq-KE-Eg7" secondAttribute="trailing" id="Qck-Zs-gY3"/>
+                                                <constraint firstAttribute="trailing" secondItem="uhm-9P-6qk" secondAttribute="trailing" id="qug-q4-wUc"/>
+                                                <constraint firstAttribute="trailing" secondItem="NZk-WW-Uay" secondAttribute="trailing" id="r3e-pC-d3V"/>
+                                                <constraint firstAttribute="trailing" secondItem="DPs-b2-1We" secondAttribute="trailing" id="sne-CC-z6F"/>
+                                            </constraints>
+                                            <visibilityPriorities>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                            </visibilityPriorities>
+                                            <customSpacing>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                            </customSpacing>
+                                        </stackView>
+                                        <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="B2d-Zo-xAO">
+                                            <rect key="frame" x="84" y="3" width="173" height="184"/>
+                                            <subviews>
+                                                <levelIndicator verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="lYc-WP-hlc">
+                                                    <rect key="frame" x="0.0" y="168" width="60" height="16"/>
+                                                    <levelIndicatorCell key="cell" editable="YES" alignment="left" doubleValue="5" maxValue="5" levelIndicatorStyle="rating" id="bi9-yf-v6w"/>
+                                                    <color key="fillColor" name="systemYellowColor" catalog="System" colorSpace="catalog"/>
+                                                    <connections>
+                                                        <action selector="ratingAction:" target="HAc-or-XD8" id="K0H-Ga-hji"/>
+                                                    </connections>
+                                                </levelIndicator>
+                                                <textField focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="HyO-9K-R7L">
+                                                    <rect key="frame" x="-2" y="147" width="177" height="16"/>
+                                                    <textFieldCell key="cell" truncatesLastVisibleLine="YES" title="Label" id="eIz-b2-2PE">
+                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="aRP-nR-Yap">
+                                                    <rect key="frame" x="-2" y="126" width="177" height="16"/>
+                                                    <textFieldCell key="cell" truncatesLastVisibleLine="YES" title="Label" id="TjH-ih-cf4">
+                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="obm-oY-7sg">
+                                                    <rect key="frame" x="-2" y="105" width="177" height="16"/>
+                                                    <textFieldCell key="cell" truncatesLastVisibleLine="YES" title="Label" id="Ol9-wS-pWn">
+                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="ebt-AQ-LWK">
+                                                    <rect key="frame" x="-2" y="84" width="37" height="16"/>
+                                                    <textFieldCell key="cell" truncatesLastVisibleLine="YES" title="Label" id="e2M-0W-dC5">
+                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="YBs-Jb-5di">
+                                                    <rect key="frame" x="-2" y="63" width="37" height="16"/>
+                                                    <textFieldCell key="cell" truncatesLastVisibleLine="YES" title="Label" id="LfQ-cN-QlF">
+                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="2wD-n8-ITx">
+                                                    <rect key="frame" x="-2" y="42" width="37" height="16"/>
+                                                    <textFieldCell key="cell" truncatesLastVisibleLine="YES" title="Label" id="d5Z-Y4-LbO">
+                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="VxL-BW-3eh">
+                                                    <rect key="frame" x="-2" y="21" width="177" height="16"/>
+                                                    <textFieldCell key="cell" truncatesLastVisibleLine="YES" title="Label" id="Pzf-s3-rHC">
+                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="7gY-3s-Kay">
+                                                    <rect key="frame" x="-2" y="0.0" width="177" height="16"/>
+                                                    <textFieldCell key="cell" truncatesLastVisibleLine="YES" selectable="YES" title="Label" id="3XB-SJ-5ia">
+                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="aRP-nR-Yap" secondAttribute="trailing" id="9Ha-iP-xDS"/>
+                                                <constraint firstAttribute="trailing" secondItem="HyO-9K-R7L" secondAttribute="trailing" id="cCG-L1-mXP"/>
+                                                <constraint firstAttribute="trailing" secondItem="VxL-BW-3eh" secondAttribute="trailing" id="pfn-eL-Fht"/>
+                                                <constraint firstAttribute="trailing" secondItem="7gY-3s-Kay" secondAttribute="trailing" id="r8P-vM-Um5"/>
+                                                <constraint firstAttribute="trailing" secondItem="obm-oY-7sg" secondAttribute="trailing" id="zNW-b8-VGa"/>
+                                            </constraints>
+                                            <visibilityPriorities>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                            </visibilityPriorities>
+                                            <customSpacing>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                            </customSpacing>
+                                        </stackView>
+                                        <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="nte-55-oZ5">
+                                            <rect key="frame" x="260" y="0.0" width="5" height="187"/>
+                                        </box>
+                                        <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gGl-6E-i7b">
+                                            <rect key="frame" x="268" y="0.0" width="268" height="187"/>
+                                            <subviews>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="iEb-aU-icd">
+                                                    <rect key="frame" x="-2" y="171" width="272" height="16"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="16" id="wIS-sR-h60"/>
+                                                    </constraints>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Summary" id="Uk4-V4-xX7">
+                                                        <font key="font" metaFont="systemBold"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="QnU-w3-Go4">
+                                                    <rect key="frame" x="-2" y="0.0" width="272" height="166"/>
+                                                    <textFieldCell key="cell" truncatesLastVisibleLine="YES" alignment="left" id="dhP-XZ-0Nn">
+                                                        <font key="font" metaFont="system"/>
+                                                        <mutableString key="title">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin tristique tortor vitae enim pretium tempus. Vestibulum molestie elit justo, vitae ultrices felis eleifend in. Maecenas ligula lorem, porta eget purus in, lacinia molestie ex. Pellentesque condimentum sollicitudin elit, ut faucibus velit hendrerit vel. Mauris vitae est non mauris efficitur ornare. Mauris sit amet tempor diam, sed efficitur elit. Nunc euismod sagittis ex, ac vulputate nisi placerat et. Nullam et ipsum et turpis lobortis feugiat. Suspendisse hendrerit nibh quis est egestas, a accumsan erat posuere. Suspendisse volutpat sagittis laoreet. Curabitur sed ante volutpat justo feugiat vestibulum et ultrices massa.</mutableString>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="iEb-aU-icd" secondAttribute="trailing" id="RM7-fC-3va"/>
+                                                <constraint firstAttribute="trailing" secondItem="QnU-w3-Go4" secondAttribute="trailing" id="ZgP-9x-Jbe"/>
+                                            </constraints>
+                                            <visibilityPriorities>
+                                                <integer value="1000"/>
+                                                <integer value="1000"/>
+                                            </visibilityPriorities>
+                                            <customSpacing>
+                                                <real value="3.4028234663852886e+38"/>
+                                                <real value="3.4028234663852886e+38"/>
+                                            </customSpacing>
+                                        </stackView>
                                     </subviews>
                                     <constraints>
-                                        <constraint firstAttribute="height" secondItem="HyO-9K-R7L" secondAttribute="height" id="a6R-zu-2jO"/>
+                                        <constraint firstItem="uhm-9P-6qk" firstAttribute="bottom" secondItem="HyO-9K-R7L" secondAttribute="bottom" id="0vs-gO-P5e"/>
+                                        <constraint firstItem="nte-55-oZ5" firstAttribute="top" secondItem="fiJ-9f-ecF" secondAttribute="top" id="2qN-VG-JuO"/>
+                                        <constraint firstItem="uhm-9P-6qk" firstAttribute="top" secondItem="HyO-9K-R7L" secondAttribute="top" id="3dP-TU-v2E"/>
+                                        <constraint firstItem="jeT-l1-TZw" firstAttribute="top" secondItem="lYc-WP-hlc" secondAttribute="top" id="Ffu-Mn-19g"/>
+                                        <constraint firstItem="O20-fr-lHb" firstAttribute="bottom" secondItem="2wD-n8-ITx" secondAttribute="bottom" id="G7j-y4-CwL"/>
+                                        <constraint firstItem="obm-oY-7sg" firstAttribute="bottom" secondItem="kQq-KE-Eg7" secondAttribute="bottom" id="NHr-q0-RPl"/>
+                                        <constraint firstItem="NZk-WW-Uay" firstAttribute="top" secondItem="VxL-BW-3eh" secondAttribute="top" id="QOE-m7-Pdx"/>
+                                        <constraint firstItem="HYi-e3-j6K" firstAttribute="top" secondItem="ebt-AQ-LWK" secondAttribute="top" id="TiH-vu-J5J"/>
+                                        <constraint firstItem="HYi-e3-j6K" firstAttribute="bottom" secondItem="ebt-AQ-LWK" secondAttribute="bottom" id="XCf-hC-7Hi"/>
+                                        <constraint firstItem="aRP-nR-Yap" firstAttribute="top" secondItem="oO9-wF-WH8" secondAttribute="top" id="XUo-cz-WT2"/>
+                                        <constraint firstItem="F6B-1v-Bg2" firstAttribute="top" secondItem="YBs-Jb-5di" secondAttribute="top" id="cza-bY-cLb"/>
+                                        <constraint firstItem="obm-oY-7sg" firstAttribute="top" secondItem="kQq-KE-Eg7" secondAttribute="top" id="fB7-27-aVv"/>
+                                        <constraint firstItem="F6B-1v-Bg2" firstAttribute="bottom" secondItem="YBs-Jb-5di" secondAttribute="bottom" id="hJz-J5-u8P"/>
+                                        <constraint firstItem="aRP-nR-Yap" firstAttribute="bottom" secondItem="oO9-wF-WH8" secondAttribute="bottom" id="hW1-4U-bjt"/>
+                                        <constraint firstItem="gGl-6E-i7b" firstAttribute="width" secondItem="fiJ-9f-ecF" secondAttribute="width" multiplier="0.5" id="p7F-3O-kNE"/>
+                                        <constraint firstAttribute="bottom" secondItem="nte-55-oZ5" secondAttribute="bottom" id="tRf-Wy-VCr"/>
+                                        <constraint firstItem="NZk-WW-Uay" firstAttribute="bottom" secondItem="VxL-BW-3eh" secondAttribute="bottom" id="uLS-za-6mQ"/>
+                                        <constraint firstItem="jeT-l1-TZw" firstAttribute="bottom" secondItem="lYc-WP-hlc" secondAttribute="bottom" id="wPe-Gj-Utf"/>
+                                        <constraint firstItem="gGl-6E-i7b" firstAttribute="top" secondItem="fiJ-9f-ecF" secondAttribute="top" id="ws3-XE-Ula"/>
+                                        <constraint firstItem="DPs-b2-1We" firstAttribute="top" secondItem="7gY-3s-Kay" secondAttribute="top" id="yYq-Ae-K3M"/>
+                                        <constraint firstItem="O20-fr-lHb" firstAttribute="top" secondItem="2wD-n8-ITx" secondAttribute="top" id="ysc-b4-DWV"/>
                                     </constraints>
                                     <visibilityPriorities>
                                         <integer value="1000"/>
                                         <integer value="1000"/>
-                                    </visibilityPriorities>
-                                    <customSpacing>
-                                        <real value="3.4028234663852886e+38"/>
-                                        <real value="3.4028234663852886e+38"/>
-                                    </customSpacing>
-                                </stackView>
-                                <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="B2d-Zo-xAO">
-                                    <rect key="frame" x="0.0" y="0.0" width="72" height="16"/>
-                                    <subviews>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="hEf-79-49a">
-                                            <rect key="frame" x="-2" y="0.0" width="38" height="16"/>
-                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Path:" id="a9t-Zw-74U">
-                                                <font key="font" metaFont="systemBold"/>
-                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            </textFieldCell>
-                                        </textField>
-                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7gY-3s-Kay">
-                                            <rect key="frame" x="37" y="0.0" width="37" height="16"/>
-                                            <textFieldCell key="cell" title="Label" id="3XB-SJ-5ia">
-                                                <font key="font" usesAppearanceFont="YES"/>
-                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            </textFieldCell>
-                                        </textField>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstAttribute="height" secondItem="7gY-3s-Kay" secondAttribute="height" id="IFE-XB-miB"/>
-                                    </constraints>
-                                    <visibilityPriorities>
                                         <integer value="1000"/>
                                         <integer value="1000"/>
                                     </visibilityPriorities>
                                     <customSpacing>
                                         <real value="3.4028234663852886e+38"/>
                                         <real value="3.4028234663852886e+38"/>
+                                        <real value="3.4028234663852886e+38"/>
+                                        <real value="3.4028234663852886e+38"/>
                                     </customSpacing>
                                 </stackView>
                             </subviews>
+                            <constraints>
+                                <constraint firstAttribute="trailing" secondItem="fiJ-9f-ecF" secondAttribute="trailing" id="EBV-Hj-CYR"/>
+                                <constraint firstAttribute="trailing" secondItem="JzZ-K9-xaP" secondAttribute="trailing" id="sIb-Sq-XfX"/>
+                            </constraints>
                             <visibilityPriorities>
                                 <integer value="1000"/>
                                 <integer value="1000"/>
                                 <integer value="1000"/>
                                 <integer value="1000"/>
-                                <integer value="1000"/>
-                                <integer value="1000"/>
                             </visibilityPriorities>
                             <customSpacing>
                                 <real value="3.4028234663852886e+38"/>
                                 <real value="3.4028234663852886e+38"/>
                                 <real value="3.4028234663852886e+38"/>
                                 <real value="3.4028234663852886e+38"/>
-                                <real value="3.4028234663852886e+38"/>
-                                <real value="3.4028234663852886e+38"/>
                             </customSpacing>
                         </stackView>
                     </subviews>
                     <constraints>
                         <constraint firstItem="TOx-1e-6D9" firstAttribute="top" secondItem="FWp-yd-2Pm" secondAttribute="top" id="7hM-jR-3N3"/>
-                        <constraint firstAttribute="bottom" secondItem="TOx-1e-6D9" secondAttribute="bottom" constant="10" id="bdR-rj-nKk"/>
-                        <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="bw7-QB-Ssc" secondAttribute="bottom" id="elF-5e-5LQ"/>
+                        <constraint firstAttribute="bottom" secondItem="TOx-1e-6D9" secondAttribute="bottom" id="bdR-rj-nKk"/>
+                        <constraint firstAttribute="bottom" secondItem="bw7-QB-Ssc" secondAttribute="bottom" id="elF-5e-5LQ"/>
                         <constraint firstAttribute="trailing" secondItem="bw7-QB-Ssc" secondAttribute="trailing" id="uvg-NE-l4m"/>
                         <constraint firstItem="TOx-1e-6D9" firstAttribute="leading" secondItem="FWp-yd-2Pm" secondAttribute="leading" id="vAN-Ww-VKA"/>
                         <constraint firstItem="bw7-QB-Ssc" firstAttribute="top" secondItem="FWp-yd-2Pm" secondAttribute="top" id="xYi-0p-Tii"/>
@@ -272,7 +498,7 @@
             <constraints>
                 <constraint firstItem="FWp-yd-2Pm" firstAttribute="leading" secondItem="HAc-or-XD8" secondAttribute="leading" constant="10" id="D62-3E-aDO"/>
                 <constraint firstItem="FWp-yd-2Pm" firstAttribute="top" secondItem="HAc-or-XD8" secondAttribute="top" constant="30" id="Mr1-w0-CQK"/>
-                <constraint firstAttribute="bottom" secondItem="FWp-yd-2Pm" secondAttribute="bottom" id="bUH-jE-TQQ"/>
+                <constraint firstAttribute="bottom" secondItem="FWp-yd-2Pm" secondAttribute="bottom" constant="10" id="bUH-jE-TQQ"/>
                 <constraint firstAttribute="trailing" secondItem="FWp-yd-2Pm" secondAttribute="trailing" constant="10" id="cPm-6m-umY"/>
             </constraints>
             <connections>
@@ -280,21 +506,40 @@
                 <outlet property="contentViewLeftConstraint" destination="D62-3E-aDO" id="T0p-C1-a8j"/>
                 <outlet property="contentViewRightConstraint" destination="cPm-6m-umY" id="T0p-C1-a7l"/>
                 <outlet property="contentViewTopConstraint" destination="Mr1-w0-CQK" id="T0p-C1-1nv"/>
+                <outlet property="mediaItemActorsTextField" destination="obm-oY-7sg" id="iaO-Xh-rMU"/>
+                <outlet property="mediaItemActorsTitleTextField" destination="kQq-KE-Eg7" id="BCb-gk-QuY"/>
                 <outlet property="mediaItemArtworkImageView" destination="xZd-Hk-h2M" id="J8l-V9-P06"/>
+                <outlet property="mediaItemContentDescriptionTextField" destination="2wD-n8-ITx" id="TJC-Gc-enx"/>
+                <outlet property="mediaItemContentDescriptionTitleTextField" destination="O20-fr-lHb" id="S8d-Tr-M60"/>
+                <outlet property="mediaItemCopyrightTextField" destination="ebt-AQ-LWK" id="W6S-an-ehZ"/>
+                <outlet property="mediaItemCopyrightTitleTextField" destination="HYi-e3-j6K" id="D0s-mZ-NaH"/>
+                <outlet property="mediaItemDirectorTextField" destination="aRP-nR-Yap" id="rWh-cJ-HbU"/>
+                <outlet property="mediaItemDirectorTitleTextField" destination="oO9-wF-WH8" id="sm0-ce-oDZ"/>
+                <outlet property="mediaItemFavoriteButton" destination="5Ul-IA-Mco" id="akl-sV-Fon"/>
                 <outlet property="mediaItemFileNameTextField" destination="VxL-BW-3eh" id="fiL-3N-m3P"/>
-                <outlet property="mediaItemLabelsStackView" destination="ebw-bB-VfF" id="nNJ-gF-ib6"/>
                 <outlet property="mediaItemLabelsTextField" destination="HyO-9K-R7L" id="5V0-iU-KA0"/>
+                <outlet property="mediaItemLabelsTitleTextField" destination="uhm-9P-6qk" id="9bz-MW-v1p"/>
+                <outlet property="mediaItemLastPlayedTextField" destination="YBs-Jb-5di" id="K2d-OZ-i3h"/>
+                <outlet property="mediaItemLastPlayedTitleTextField" destination="F6B-1v-Bg2" id="Pla-nv-R8R"/>
                 <outlet property="mediaItemPathTextField" destination="7gY-3s-Kay" id="P4t-h1-m3P"/>
+                <outlet property="mediaItemPathTitleButton" destination="DPs-b2-1We" id="Hg4-9T-B4B"/>
                 <outlet property="mediaItemPrimaryDetailButton" destination="S5i-gd-zkt" id="ssB-Jg-jcf"/>
+                <outlet property="mediaItemRatingIndicator" destination="lYc-WP-hlc" id="PHd-Ka-eS7"/>
                 <outlet property="mediaItemSecondaryDetailButton" destination="9CH-03-Iu3" id="J8O-hB-tHb"/>
+                <outlet property="mediaItemSummarySeparator" destination="nte-55-oZ5" id="5EH-6g-f4t"/>
+                <outlet property="mediaItemSummaryStackView" destination="gGl-6E-i7b" id="TvJ-b9-w7J"/>
+                <outlet property="mediaItemSummaryTextField" destination="QnU-w3-Go4" id="r2m-3G-WRK"/>
                 <outlet property="mediaItemTitleTextField" destination="nCe-dY-YMM" id="h3l-p0-w3e"/>
-                <outlet property="mediaItemYearAndDurationTextField" destination="QuO-3G-BMT" id="y34-rD-uR"/>
+                <outlet property="mediaItemYearAndDurationAndTypeTextField" destination="QuO-3G-BMT" id="y34-rD-uR"/>
                 <outlet property="playMediaItemButton" destination="ntd-VT-2KS" id="LJV-KL-cK4"/>
             </connections>
             <point key="canvasLocation" x="-237.5" y="-284"/>
         </view>
     </objects>
     <resources>
+        <image name="arrow.up.right.circle.fill" catalog="system" width="15" height="15"/>
+        <image name="heart" catalog="system" width="16" height="14"/>
+        <image name="heart.fill" catalog="system" width="16" height="14"/>
         <image name="no-art" width="128" height="128"/>
         <image name="play.fill" catalog="system" width="12" height="13"/>
         <image name="plus" catalog="system" width="14" height="13"/>

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryHomeViewActionsView.xib Added

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
+        <capability name="Image references" minToolsVersion="12.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <stackView distribution="fillEqually" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="250" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3qj-hs-qA9" customClass="VLCLibraryHomeViewActionsView">
+            <rect key="frame" x="0.0" y="0.0" width="801" height="128"/>
+            <subviews>
+                <button verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="z8M-pF-aNN">
+                    <rect key="frame" x="0.0" y="0.0" width="152" height="128"/>
+                    <buttonCell key="cell" type="inline" title="Open file" bezelStyle="inline" image="internaldrive.fill" catalog="system" imagePosition="above" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="BaI-vV-jQU" customClass="VLCLibraryHomeViewActionButtonCell">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="smallSystemBold"/>
+                    </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="128" id="8rS-SD-guH"/>
+                    </constraints>
+                    <connections>
+                        <action selector="openFileAction:" target="3qj-hs-qA9" id="WNK-Gq-vbI"/>
+                    </connections>
+                </button>
+                <button verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cJy-ck-xd6">
+                    <rect key="frame" x="162" y="0.0" width="152" height="128"/>
+                    <buttonCell key="cell" type="inline" title="Open disc" bezelStyle="inline" imagePosition="above" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="92c-b8-kwg" customClass="VLCLibraryHomeViewActionButtonCell">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="smallSystemBold"/>
+                        <imageReference key="image" image="opticaldisc.fill" catalog="system" symbolScale="default"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="openDiscAction:" target="3qj-hs-qA9" id="J6M-0U-hKB"/>
+                    </connections>
+                </button>
+                <button verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="j8l-xq-Zuw">
+                    <rect key="frame" x="324" y="0.0" width="153" height="128"/>
+                    <buttonCell key="cell" type="inline" title="Open Stream" bezelStyle="inline" image="network" catalog="system" imagePosition="above" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="2Vn-hv-Uao" customClass="VLCLibraryHomeViewActionButtonCell">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="smallSystemBold"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="openUrlAction:" target="3qj-hs-qA9" id="hON-OU-Kvy"/>
+                    </connections>
+                </button>
+                <button verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="y5B-QJ-eG5">
+                    <rect key="frame" x="487" y="0.0" width="152" height="128"/>
+                    <buttonCell key="cell" type="inline" title="Open capture device" bezelStyle="inline" image="camera.fill" catalog="system" imagePosition="above" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="6uQ-ex-ony" customClass="VLCLibraryHomeViewActionButtonCell">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="smallSystemBold"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="openCaptureDeviceAction:" target="3qj-hs-qA9" id="wNJ-8K-1tJ"/>
+                    </connections>
+                </button>
+                <button verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="g9j-oN-Lyd">
+                    <rect key="frame" x="649" y="0.0" width="152" height="128"/>
+                    <buttonCell key="cell" type="inline" title="Browse" bezelStyle="inline" image="folder.fill" catalog="system" imagePosition="above" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="0K4-If-7Qb" customClass="VLCLibraryHomeViewActionButtonCell">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="smallSystem"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="openBrowseAction:" target="3qj-hs-qA9" id="T8n-Bm-2ni"/>
+                    </connections>
+                </button>
+            </subviews>
+            <constraints>
+                <constraint firstItem="cJy-ck-xd6" firstAttribute="height" secondItem="z8M-pF-aNN" secondAttribute="height" id="Aji-3k-gXf"/>
+                <constraint firstItem="g9j-oN-Lyd" firstAttribute="height" secondItem="z8M-pF-aNN" secondAttribute="height" id="CzX-vh-F4u"/>
+                <constraint firstItem="y5B-QJ-eG5" firstAttribute="height" secondItem="z8M-pF-aNN" secondAttribute="height" id="HAT-ug-Hw2"/>
+                <constraint firstItem="j8l-xq-Zuw" firstAttribute="height" secondItem="z8M-pF-aNN" secondAttribute="height" id="LhC-o6-IfS"/>
+                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="50" id="q8R-0R-ebR"/>
+            </constraints>
+            <visibilityPriorities>
+                <integer value="1000"/>
+                <integer value="1000"/>
+                <integer value="1000"/>
+                <integer value="1000"/>
+                <integer value="1000"/>
+            </visibilityPriorities>
+            <customSpacing>
+                <real value="3.4028234663852886e+38"/>
+                <real value="3.4028234663852886e+38"/>
+                <real value="3.4028234663852886e+38"/>
+                <real value="3.4028234663852886e+38"/>
+                <real value="3.4028234663852886e+38"/>
+            </customSpacing>
+            <connections>
+                <outlet property="openBrowseButton" destination="g9j-oN-Lyd" id="hRd-gf-7ar"/>
+                <outlet property="openCaptureDeviceButton" destination="y5B-QJ-eG5" id="sYh-WY-Hr0"/>
+                <outlet property="openDiscButton" destination="cJy-ck-xd6" id="5Kg-qb-mAA"/>
+                <outlet property="openFileButton" destination="z8M-pF-aNN" id="B3d-7J-NQ3"/>
+                <outlet property="openUrlButton" destination="j8l-xq-Zuw" id="Hw0-VI-0vH"/>
+            </connections>
+            <point key="canvasLocation" x="28.5" y="-120"/>
+        </stackView>
+    </objects>
+    <resources>
+        <image name="camera.fill" catalog="system" width="19" height="15"/>
+        <image name="folder.fill" catalog="system" width="18" height="14"/>
+        <image name="internaldrive.fill" catalog="system" width="18" height="13"/>
+        <image name="network" catalog="system" width="15" height="15"/>
+        <image name="opticaldisc.fill" catalog="system" width="15" height="15"/>
+    </resources>
+</document>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibrarySongTableCellView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibrarySongTableCellView.xib Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryTableCellView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryTableCellView.xib Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryWindow.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryWindow.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="Search Toolbar Item" minToolsVersion="12.0" minSystemVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,7 +18,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="896" height="456"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1050"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <view key="contentView" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="896" height="456"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -36,10 +36,24 @@
                                 <rect key="frame" x="0.0" y="0.0" width="896" height="48"/>
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="YAj-e7-KCU" userLabel="New play controls group ">
-                                        <rect key="frame" x="16" y="4" width="108" height="40"/>
+                                        <rect key="frame" x="16" y="4" width="188" height="40"/>
                                         <subviews>
+                                            <button translatesAutoresizingMaskIntoConstraints="NO" id="72A-6S-lpR" userLabel="Jump Back Button">
+                                                <rect key="frame" x="0.0" y="5" width="24" height="32"/>
+                                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="arrow.trianglehead.counterclockwise" catalog="system" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="SuP-ZN-d5p">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="24" id="1Et-Uf-MYi"/>
+                                                    <constraint firstAttribute="width" constant="24" id="q77-Gr-cho"/>
+                                                </constraints>
+                                                <connections>
+                                                    <action selector="jumpBackward:" target="Uzf-Tf-H8x" id="woD-5F-KO1"/>
+                                                </connections>
+                                            </button>
                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="jGc-Xw-GYI" userLabel="Prev Button">
-                                                <rect key="frame" x="0.0" y="8" width="24" height="24"/>
+                                                <rect key="frame" x="40" y="8" width="24" height="24"/>
                                                 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="VLCBackwardTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="wXL-JO-q9Q">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="system"/>
@@ -53,7 +67,7 @@
                                                 </connections>
                                             </button>
                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="WgO-zh-k4s" userLabel="Play Button">
-                                                <rect key="frame" x="40" y="6" width="28" height="28"/>
+                                                <rect key="frame" x="80" y="6" width="28" height="28"/>
                                                 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="libraryPlay" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="UjH-mQ-ywb">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="system"/>
@@ -67,7 +81,7 @@
                                                 </connections>
                                             </button>
                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="dPD-MZ-5oT" userLabel="Next Button">
-                                                <rect key="frame" x="84" y="8" width="24" height="24"/>
+                                                <rect key="frame" x="124" y="8" width="24" height="24"/>
                                                 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="VLCForwardTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="DYw-1X-kJ4">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="system"/>
@@ -80,25 +94,42 @@
                                                     <action selector="fwd:" target="Uzf-Tf-H8x" id="cnd-1b-e3l"/>
                                                 </connections>
                                             </button>
+                                            <button translatesAutoresizingMaskIntoConstraints="NO" id="pAd-ve-EeL" userLabel="Jump Forwards Button">
+                                                <rect key="frame" x="164" y="5" width="24" height="32"/>
+                                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="arrow.trianglehead.clockwise" catalog="system" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="Y4X-jC-iMt">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="24" id="ASs-Ko-yKD"/>
+                                                    <constraint firstAttribute="height" constant="24" id="nTr-cv-5Jb"/>
+                                                </constraints>
+                                                <connections>
+                                                    <action selector="jumpForward:" target="Uzf-Tf-H8x" id="fDv-So-2zv"/>
+                                                </connections>
+                                            </button>
                                         </subviews>
                                         <constraints>
                                             <constraint firstItem="WgO-zh-k4s" firstAttribute="leading" secondItem="jGc-Xw-GYI" secondAttribute="trailing" constant="16" id="7Jh-Rk-goR"/>
+                                            <constraint firstItem="pAd-ve-EeL" firstAttribute="centerY" secondItem="YAj-e7-KCU" secondAttribute="centerY" id="GBP-di-Jyg"/>
+                                            <constraint firstAttribute="trailing" secondItem="pAd-ve-EeL" secondAttribute="trailing" id="IQw-HC-7vD"/>
+                                            <constraint firstItem="72A-6S-lpR" firstAttribute="leading" secondItem="YAj-e7-KCU" secondAttribute="leading" id="K2F-fX-XSp"/>
                                             <constraint firstItem="dPD-MZ-5oT" firstAttribute="leading" secondItem="WgO-zh-k4s" secondAttribute="trailing" constant="16" id="L7k-XW-mNm"/>
+                                            <constraint firstItem="72A-6S-lpR" firstAttribute="centerY" secondItem="YAj-e7-KCU" secondAttribute="centerY" id="OfN-mp-fEF"/>
+                                            <constraint firstItem="pAd-ve-EeL" firstAttribute="leading" secondItem="dPD-MZ-5oT" secondAttribute="trailing" constant="16" id="S8H-lo-eeW"/>
                                             <constraint firstItem="jGc-Xw-GYI" firstAttribute="centerY" secondItem="YAj-e7-KCU" secondAttribute="centerY" id="XTJ-tG-WAb"/>
-                                            <constraint firstItem="WgO-zh-k4s" firstAttribute="centerX" secondItem="YAj-e7-KCU" secondAttribute="centerX" id="dj3-Cx-RLd"/>
                                             <constraint firstItem="WgO-zh-k4s" firstAttribute="centerY" secondItem="YAj-e7-KCU" secondAttribute="centerY" id="g2R-aO-KbT"/>
-                                            <constraint firstAttribute="trailing" secondItem="dPD-MZ-5oT" secondAttribute="trailing" id="oOi-7M-aLf"/>
                                             <constraint firstItem="dPD-MZ-5oT" firstAttribute="centerY" secondItem="YAj-e7-KCU" secondAttribute="centerY" id="rCy-3x-EJD"/>
-                                            <constraint firstItem="jGc-Xw-GYI" firstAttribute="leading" secondItem="YAj-e7-KCU" secondAttribute="leading" id="xeh-Bo-f7P"/>
+                                            <constraint firstItem="jGc-Xw-GYI" firstAttribute="leading" secondItem="72A-6S-lpR" secondAttribute="trailing" constant="16" id="wzB-TW-knV"/>
                                         </constraints>
                                     </customView>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ktr-qT-1fr" customClass="VLCTrackingView">
-                                        <rect key="frame" x="140" y="4" width="616" height="40"/>
+                                        <rect key="frame" x="220" y="4" width="456" height="40"/>
                                         <subviews>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" horizontalCompressionResistancePriority="250" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jlv-jC-dQB">
-                                                <rect key="frame" x="250" y="24" width="153" height="16"/>
+                                                <rect key="frame" x="170" y="24" width="153" height="16"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="d0e-29-yNq" userLabel="Song Name" customClass="VLCWrappableTextField">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="d0e-29-yNq" userLabel="Song Name">
                                                         <rect key="frame" x="-2" y="0.0" width="157" height="16"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="16" id="aQy-pz-H7F"/>
@@ -121,7 +152,7 @@
                                                     <real value="3.4028234663852886e+38"/>
                                                 </customSpacing>
                                             </stackView>
-                                            <textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zOB-QJ-TUy" customClass="VLCTimeField">
+                                            <textField wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zOB-QJ-TUy" customClass="VLCTimeField">
                                                 <rect key="frame" x="42" y="3" width="44" height="11"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="40" id="Rox-Cf-MSz"/>
@@ -191,14 +222,14 @@
                                                 </constraints>
                                             </customView>
                                             <slider hidden="YES" horizontalHuggingPriority="200" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" mirrorLayoutDirectionWhenInternationalizing="never" translatesAutoresizingMaskIntoConstraints="NO" id="9Hg-t2-K5z" customClass="VLCPlaybackProgressSlider">
-                                                <rect key="frame" x="86" y="-2" width="480" height="20"/>
+                                                <rect key="frame" x="86" y="-2" width="320" height="20"/>
                                                 <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="1" doubleValue="0.32600000000000001" tickMarkPosition="above" sliderType="linear" id="YMg-uo-8nX" customClass="VLCPlaybackProgressSliderCell"/>
                                                 <connections>
                                                     <action selector="timeSliderAction:" target="Uzf-Tf-H8x" id="eDh-39-Ej1"/>
                                                 </connections>
                                             </slider>
-                                            <textField wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oGd-mG-cFw" customClass="VLCTimeField">
-                                                <rect key="frame" x="566" y="3" width="52" height="11"/>
+                                            <textField wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oGd-mG-cFw" customClass="VLCTimeField">
+                                                <rect key="frame" x="406" y="3" width="52" height="11"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="48" id="mAg-xF-yHo"/>
                                                 </constraints>
@@ -228,13 +259,13 @@
                                         </constraints>
                                     </customView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="S1K-Lp-DVO">
-                                        <rect key="frame" x="772" y="4" width="108" height="40"/>
+                                        <rect key="frame" x="692" y="4" width="188" height="40"/>
                                         <subviews>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="i42-vp-ih7">
-                                                <rect key="frame" x="0.0" y="0.0" width="84" height="40"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="164" height="40"/>
                                                 <subviews>
                                                     <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="noz-yJ-oH4" customClass="VLCVolumeSlider">
-                                                        <rect key="frame" x="16" y="12" width="52" height="17"/>
+                                                        <rect key="frame" x="56" y="12" width="52" height="17"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="48" id="EM2-Hh-lqK"/>
                                                         </constraints>
@@ -244,7 +275,7 @@
                                                         </connections>
                                                     </slider>
                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="75c-FF-mgb">
-                                                        <rect key="frame" x="70" y="14" width="12" height="12"/>
+                                                        <rect key="frame" x="110" y="14" width="12" height="12"/>
                                                         <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="VLCVolumeOnTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" id="a9Z-7I-lXJ">
                                                             <behavior key="behavior" lightByContents="YES"/>
                                                             <font key="font" metaFont="system" size="10"/>
@@ -258,7 +289,7 @@
                                                         </connections>
                                                     </button>
                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="IAy-58-UPp">
-                                                        <rect key="frame" x="2" y="14" width="12" height="12"/>
+                                                        <rect key="frame" x="42" y="14" width="12" height="12"/>
                                                         <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="VLCVolumeOffTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" id="qTN-dX-Oj5">
                                                             <behavior key="behavior" lightByContents="YES"/>
                                                             <font key="font" metaFont="system" size="10"/>
@@ -282,7 +313,7 @@
                                                 </constraints>
                                             </customView>
                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="dwM-Uz-pAw" userLabel="Full Screen Button">
-                                                <rect key="frame" x="92" y="12" width="16" height="16"/>
+                                                <rect key="frame" x="172" y="12" width="16" height="16"/>
                                                 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="fullscreen-one-button" imagePosition="only" alignment="center" alternateImage="fullscreen-one-button-pressed" imageScaling="proportionallyUpOrDown" id="fMb-sg-sZ1">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="system"/>
@@ -345,7 +376,7 @@
                     <constraint firstAttribute="bottom" secondItem="vUy-jt-gjY" secondAttribute="bottom" id="vMr-VQ-r4P"/>
                 </constraints>
             </view>
-            <toolbar key="toolbar" implicitIdentifier="CAE4F278-DC20-4A58-B07E-1580E7B14C87" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="pr3-TD-J2z">
+            <toolbar key="toolbar" implicitIdentifier="CAE4F278-DC20-4A58-B07E-1580E7B14C87" autosavesConfiguration="NO" allowsUserCustomization="NO" showsBaselineSeparator="NO" displayMode="iconOnly" sizeMode="regular" id="pr3-TD-J2z">
                 <allowedToolbarItems>
                     <toolbarItem implicitItemIdentifier="71EED6C9-B0A2-4964-8846-16159F10619E" label="Sort Order" paletteLabel="Sort Order" image="arrow.up.arrow.down" catalog="system" sizingBehavior="auto" id="Tbc-Ik-FaO">
                         <nil key="toolTip"/>
@@ -361,7 +392,7 @@
                             </connections>
                         </button>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="0F5C2845-FFED-400C-8869-4785561D4CE3" label="Toggle Playlist" paletteLabel="Toggle Playlist" image="list.triangle" catalog="system" sizingBehavior="auto" id="Lf2-ec-tHh">
+                    <toolbarItem implicitItemIdentifier="0F5C2845-FFED-400C-8869-4785561D4CE3" label="Toggle Play Queue" paletteLabel="Toggle Play Queue" image="list.triangle" catalog="system" sizingBehavior="auto" id="Lf2-ec-tHh">
                         <nil key="toolTip"/>
                         <button key="view" wantsLayer="YES" verticalHuggingPriority="750" id="IaO-se-D0g">
                             <rect key="frame" x="29" y="14" width="26" height="19"/>
@@ -415,7 +446,7 @@
                     </toolbarItem>
                     <searchToolbarItem implicitItemIdentifier="A132890F-6B3D-4523-A71B-B00F095057C4" label="Search" paletteLabel="Search" visibilityPriority="1001" id="dv4-Il-y8X">
                         <nil key="toolTip"/>
-                        <searchField key="view" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ab6-kR-8Io">
+                        <searchField key="view" focusRingType="none" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ab6-kR-8Io">
                             <rect key="frame" x="0.0" y="0.0" width="100" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="width" relation="lessThanOrEqual" constant="200" id="hhF-2O-Qx7"/>
@@ -472,8 +503,22 @@
                             </connections>
                         </button>
                     </toolbarItem>
+                    <toolbarItem implicitItemIdentifier="068A0B88-812C-44BE-8997-704367CF5226" label="VLC" paletteLabel="VLC" image="VLC" title="VLC" id="XND-sc-TDa">
+                        <nil key="toolTip"/>
+                        <size key="minSize" width="28" height="28"/>
+                        <size key="maxSize" width="28" height="28"/>
+                        <imageView key="view" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="KR4-pI-siG">
+                            <rect key="frame" x="0.0" y="0.0" width="28" height="28"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="28" id="Vst-mC-big"/>
+                                <constraint firstAttribute="width" secondItem="KR4-pI-siG" secondAttribute="height" multiplier="1:1" id="Y7q-Mz-W5J"/>
+                            </constraints>
+                            <imageCell key="cell" controlSize="small" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="VLC" id="AiE-o7-B5v"/>
+                        </imageView>
+                    </toolbarItem>
                 </allowedToolbarItems>
                 <defaultToolbarItems>
+                    <toolbarItem reference="XND-sc-TDa"/>
                     <toolbarItem reference="5oK-0W-JJh"/>
                     <toolbarItem reference="6Ie-eu-GDn"/>
                     <toolbarItem reference="g2e-7o-Qet"/>
@@ -488,6 +533,7 @@
                 </connections>
             </toolbar>
             <connections>
+                <outlet property="artworkButton" destination="f5c-zt-tHy" id="ugl-0g-F9f"/>
                 <outlet property="audioCollectionSelectionTableView" destination="LNt-ot-2wU" id="aim-ER-CpD"/>
                 <outlet property="audioCollectionSelectionTableViewScrollView" destination="HrP-Dz-Uh0" id="Sh0-oP-3Ad"/>
                 <outlet property="audioCollectionViewScrollView" destination="AYf-gS-P66" id="Jmt-vH-Vgq"/>
@@ -517,22 +563,17 @@
                 <outlet property="mainSplitView" destination="u8g-jy-S4e" id="lI5-wR-kef"/>
                 <outlet property="mediaSourceCollectionView" destination="r7v-GI-W1U" id="3JJ-GU-o5o"/>
                 <outlet property="mediaSourceCollectionViewScrollView" destination="cFG-c9-cI9" id="QQq-Ql-uQ7"/>
-                <outlet property="mediaSourceCollectionViewScrollViewTopConstraint" destination="1h2-ln-GVY" id="orE-bG-zt4"/>
                 <outlet property="mediaSourceHomeButton" destination="jfA-Vr-sQc" id="oLM-NF-rqe"/>
                 <outlet property="mediaSourcePathControl" destination="Rjk-Q6-FYy" id="G63-NM-Ekn"/>
                 <outlet property="mediaSourcePathControlVisualEffectView" destination="LIN-LZ-lhm" id="gZZ-ov-qfP"/>
                 <outlet property="mediaSourceTableView" destination="vpJ-Oz-Ebz" id="Hbo-Qw-JQd"/>
                 <outlet property="mediaSourceTableViewScrollView" destination="7WD-fy-WtJ" id="8As-1W-Af8"/>
-                <outlet property="mediaSourceTableViewScrollViewTopConstraint" destination="y4h-EN-rn0" id="8f7-8Y-Zeb"/>
                 <outlet property="mediaSourceView" destination="eHd-Q9-F8D" id="gfU-Jp-eFr"/>
                 <outlet property="mediaToolBar" destination="pr3-TD-J2z" id="Chi-03-Fgd"/>
                 <outlet property="placeholderGoToBrowseButton" destination="V2G-WY-Ewc" id="oeg-Uf-wwE"/>
                 <outlet property="placeholderImageView" destination="fgK-fZ-95P" id="WwE-eN-rSA"/>
                 <outlet property="placeholderLabel" destination="adK-Pc-tnU" id="6Zw-IF-czx"/>
                 <outlet property="playQueueToggle" destination="IaO-se-D0g" id="tqY-YM-KQC"/>
-                <outlet property="renderersButton" destination="ffS-QP-Om3" id="rOM-No-rd0"/>
-                <outlet property="splitViewBottomConstraintToBottomBar" destination="QH8-mU-6ZP" id="b0t-C0-N5t"/>
-                <outlet property="splitViewBottomConstraintToSuperView" destination="DQQ-ji-YSy" id="b0t-C0-5uP"/>
                 <outlet property="splitViewController" destination="Kkr-kI-gpb" id="9aZ-xw-zrl"/>
                 <outlet property="toolbarDelegate" destination="xXj-E8-b8X" id="VsJ-ky-NJg"/>
                 <outlet property="videoLibraryCollectionView" destination="neh-e5-MUa" id="bmc-HF-k9s"/>
@@ -554,6 +595,8 @@
                 <outlet property="dropView" destination="MQH-bI-Zdh" id="Wz9-NB-wtE"/>
                 <outlet property="forwardButton" destination="dPD-MZ-5oT" id="btH-v5-s7F"/>
                 <outlet property="fullscreenButton" destination="dwM-Uz-pAw" id="gXA-WS-Gig"/>
+                <outlet property="jumpBackwardButton" destination="72A-6S-lpR" id="YRk-DB-K28"/>
+                <outlet property="jumpForwardButton" destination="pAd-ve-EeL" id="iBO-a8-WA6"/>
                 <outlet property="muteVolumeButton" destination="IAy-58-UPp" id="dDN-pE-Vmj"/>
                 <outlet property="openMainVideoViewButtonOverlay" destination="CzG-0S-Kke" id="6BY-BQ-72f"/>
                 <outlet property="playButton" destination="WgO-zh-k4s" id="0yC-Yh-H4V"/>
@@ -574,14 +617,14 @@
                 <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HXH-MZ-tkf">
                     <rect key="frame" x="0.0" y="0.0" width="869" height="808"/>
                     <clipView key="contentView" id="EeU-rT-tSP">
-                        <rect key="frame" x="1" y="1" width="867" height="806"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <rect key="frame" x="0.0" y="0.0" width="869" height="808"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <view translatesAutoresizingMaskIntoConstraints="NO" id="OxL-Q0-VBh">
-                                <rect key="frame" x="0.0" y="806" width="849" height="0.0"/>
+                                <rect key="frame" x="0.0" y="808" width="851" height="0.0"/>
                                 <subviews>
                                     <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="p8n-RC-fWF">
-                                        <rect key="frame" x="0.0" y="0.0" width="849" height="0.0"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="851" height="0.0"/>
                                     </stackView>
                                 </subviews>
                                 <constraints>
@@ -623,11 +666,11 @@
                 <scrollView wantsLayer="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9bN-bM-RVu">
                     <rect key="frame" x="0.0" y="0.0" width="869" height="808"/>
                     <clipView key="contentView" id="SLw-ag-klW">
-                        <rect key="frame" x="1" y="1" width="867" height="806"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <rect key="frame" x="0.0" y="0.0" width="869" height="808"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <collectionView selectable="YES" allowsMultipleSelection="YES" id="neh-e5-MUa">
-                                <rect key="frame" x="0.0" y="0.0" width="871" height="158"/>
+                            <collectionView selectable="YES" allowsMultipleSelection="YES" id="neh-e5-MUa" customClass="VLCLibraryCollectionView">
+                                <rect key="frame" x="0.0" y="0.0" width="875" height="158"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="0sw-3B-cXl">
                                     <size key="itemSize" width="50" height="50"/>
@@ -653,7 +696,7 @@
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <clipView key="contentView" id="OqR-YY-weT">
                                 <rect key="frame" x="0.0" y="0.0" width="230" height="808"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <autoresizingMask key="autoresizingMask"/>
                                 <subviews>
                                     <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" viewBased="YES" id="ceR-Vd-9ss">
                                         <rect key="frame" x="0.0" y="0.0" width="230" height="808"/>
@@ -678,7 +721,7 @@
                                                         <rect key="frame" x="11" y="1" width="207" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="slR-cz-G24">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="slR-cz-G24">
                                                                 <rect key="frame" x="0.0" y="0.0" width="207" height="17"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="R8G-B2-6aL">
@@ -712,7 +755,7 @@
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <clipView key="contentView" id="0td-vX-CFl">
                                 <rect key="frame" x="0.0" y="0.0" width="638" height="808"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <autoresizingMask key="autoresizingMask"/>
                                 <subviews>
                                     <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" columnReordering="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="8M4-Y1-r6Z" customClass="VLCLibraryTableView">
                                         <rect key="frame" x="0.0" y="0.0" width="638" height="808"/>
@@ -736,7 +779,7 @@
                                                         <rect key="frame" x="0.0" y="0.0" width="638" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KJi-8r-ShG">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KJi-8r-ShG">
                                                                 <rect key="frame" x="0.0" y="0.0" width="638" height="17"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Nwj-mx-58a">
@@ -792,7 +835,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="528" height="411"/>
                     <clipView key="contentView" id="5co-vI-cEn">
                         <rect key="frame" x="0.0" y="0.0" width="528" height="411"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" viewBased="YES" id="vpJ-Oz-Ebz" customClass="VLCLibraryTableView">
                                 <rect key="frame" x="0.0" y="0.0" width="528" height="411"/>
@@ -817,7 +860,7 @@
                                                 <rect key="frame" x="11" y="1" width="505" height="0.0"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TVO-GX-uf2">
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TVO-GX-uf2">
                                                         <rect key="frame" x="0.0" y="-17" width="505" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="LYl-7r-eAr">
@@ -850,9 +893,9 @@
                     <rect key="frame" x="0.0" y="0.0" width="528" height="411"/>
                     <clipView key="contentView" id="tI4-x3-55j">
                         <rect key="frame" x="0.0" y="0.0" width="528" height="411"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <collectionView selectable="YES" allowsMultipleSelection="YES" id="r7v-GI-W1U">
+                            <collectionView selectable="YES" allowsMultipleSelection="YES" id="r7v-GI-W1U" customClass="VLCLibraryCollectionView">
                                 <rect key="frame" x="0.0" y="0.0" width="528" height="411"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="v0C-1b-7Ss">
@@ -927,12 +970,12 @@
                 <splitView arrangesAllSubviews="NO" dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YHF-re-hif">
                     <rect key="frame" x="0.0" y="0.0" width="714" height="390"/>
                     <subviews>
-                        <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="24" horizontalPageScroll="10" verticalLineScroll="24" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="KW4-fp-jy1">
+                        <scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="24" horizontalPageScroll="10" verticalLineScroll="24" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="KW4-fp-jy1">
                             <rect key="frame" x="0.0" y="0.0" width="298" height="390"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <clipView key="contentView" id="4uw-9H-2bN">
                                 <rect key="frame" x="0.0" y="0.0" width="298" height="390"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <autoresizingMask key="autoresizingMask"/>
                                 <subviews>
                                     <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="automatic" viewBased="YES" id="hvV-yD-5Kd" customClass="VLCLibraryTableView">
                                         <rect key="frame" x="0.0" y="0.0" width="298" height="390"/>
@@ -957,7 +1000,7 @@
                                                         <rect key="frame" x="18" y="0.0" width="261" height="24"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jsn-kJ-CVZ">
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jsn-kJ-CVZ">
                                                                 <rect key="frame" x="0.0" y="4" width="261" height="16"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="UD3-mZ-qPY">
@@ -991,9 +1034,9 @@
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <clipView key="contentView" id="Zmo-lc-CDL">
                                 <rect key="frame" x="0.0" y="0.0" width="415" height="390"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <autoresizingMask key="autoresizingMask"/>
                                 <subviews>
-                                    <collectionView selectable="YES" allowsMultipleSelection="YES" id="ZGR-PZ-7h5">
+                                    <collectionView selectable="YES" allowsMultipleSelection="YES" id="ZGR-PZ-7h5" customClass="VLCLibraryCollectionView">
                                         <rect key="frame" x="0.0" y="0.0" width="415" height="390"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                         <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="od3-Iu-ch8">
@@ -1026,7 +1069,7 @@
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <clipView key="contentView" id="qva-RZ-DvL">
                                 <rect key="frame" x="0.0" y="0.0" width="312" height="390"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <autoresizingMask key="autoresizingMask"/>
                                 <subviews>
                                     <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" emptySelection="NO" autosaveColumns="NO" viewBased="YES" id="LNt-ot-2wU" customClass="VLCLibraryTableView">
                                         <rect key="frame" x="0.0" y="0.0" width="312" height="390"/>
@@ -1051,7 +1094,7 @@
                                                         <rect key="frame" x="11" y="1" width="289" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xaz-WB-iQI">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xaz-WB-iQI">
                                                                 <rect key="frame" x="0.0" y="0.0" width="289" height="17"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="zRF-hR-42C">
@@ -1085,7 +1128,7 @@
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <clipView key="contentView" id="xCC-h9-931">
                                 <rect key="frame" x="0.0" y="0.0" width="401" height="390"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <autoresizingMask key="autoresizingMask"/>
                                 <subviews>
                                     <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="4ll-T2-J16" customClass="VLCLibraryTableView">
                                         <rect key="frame" x="0.0" y="0.0" width="401" height="390"/>
@@ -1109,7 +1152,7 @@
                                                         <rect key="frame" x="0.0" y="0.0" width="401" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6ht-Tg-XJ9">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6ht-Tg-XJ9">
                                                                 <rect key="frame" x="0.0" y="0.0" width="401" height="17"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="dbf-tg-Ss3">
@@ -1148,9 +1191,9 @@
                     <rect key="frame" x="0.0" y="0.0" width="714" height="390"/>
                     <clipView key="contentView" id="2oa-WL-dxA">
                         <rect key="frame" x="0.0" y="0.0" width="714" height="390"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <collectionView selectable="YES" allowsMultipleSelection="YES" id="QAt-jP-zE7">
+                            <collectionView selectable="YES" allowsMultipleSelection="YES" id="QAt-jP-zE7" customClass="VLCLibraryCollectionView">
                                 <rect key="frame" x="0.0" y="0.0" width="714" height="390"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="oKT-Ic-UdV">
@@ -1172,11 +1215,11 @@
                 <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QqV-hX-sZw">
                     <rect key="frame" x="0.0" y="0.0" width="714" height="390"/>
                     <clipView key="contentView" id="D1c-vg-zeA">
-                        <rect key="frame" x="1" y="1" width="712" height="388"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <rect key="frame" x="0.0" y="0.0" width="714" height="390"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <tableView identifier="VLCLibrarySongsTableViewIdentifier" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" rowSizeStyle="automatic" headerView="LR0-xA-UlZ" viewBased="YES" id="Xck-iv-pH4" customClass="VLCLibraryTableView">
-                                <rect key="frame" x="0.0" y="0.0" width="1125" height="360"/>
+                                <rect key="frame" x="0.0" y="0.0" width="1145" height="362"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <size key="intercellSpacing" width="17" height="5"/>
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1195,10 +1238,10 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="VLCLibrarySongsTableViewSongPlayingTableCellViewIdentifier" id="IOs-it-7Fy" customClass="VLCLibrarySongsTableViewSongPlayingTableCellView">
-                                                <rect key="frame" x="8" y="2" width="18" height="17"/>
+                                                <rect key="frame" x="18" y="2" width="18" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MSe-hS-04C">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MSe-hS-04C">
                                                         <rect key="frame" x="0.0" y="0.0" width="18" height="16"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" id="UxF-FI-1cA">
@@ -1227,10 +1270,10 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="VLCLibrarySongsTableViewTitleTableCellViewIdentifier" id="SZw-Fr-2EA">
-                                                <rect key="frame" x="43" y="2" width="300" height="26"/>
+                                                <rect key="frame" x="53" y="2" width="300" height="26"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zai-EE-AIZ">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zai-EE-AIZ">
                                                         <rect key="frame" x="0.0" y="5" width="300" height="18"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="y7s-2M-iio">
@@ -1259,10 +1302,10 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="VLCLibrarySongsTableViewDurationTableCellViewIdentifier" id="w9x-WQ-1Zs">
-                                                <rect key="frame" x="360" y="2" width="60" height="24"/>
+                                                <rect key="frame" x="370" y="2" width="60" height="24"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wYt-1l-VHr">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wYt-1l-VHr">
                                                         <rect key="frame" x="0.0" y="4" width="60" height="18"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="0z5-xP-p2I">
@@ -1291,10 +1334,10 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="VLCLibrarySongsTableViewArtistTableCellViewIdentifier" id="ecm-4Q-BHD">
-                                                <rect key="frame" x="437" y="2" width="150" height="17"/>
+                                                <rect key="frame" x="447" y="2" width="150" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LpX-Ty-dhy">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LpX-Ty-dhy">
                                                         <rect key="frame" x="0.0" y="0.0" width="150" height="18"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Sox-k5-8GV">
@@ -1323,10 +1366,10 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="VLCLibrarySongsTableViewAlbumTableCellViewIdentifier" id="aMg-rT-0RL">
-                                                <rect key="frame" x="604" y="2" width="200" height="17"/>
+                                                <rect key="frame" x="614" y="2" width="200" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PbF-Bm-f34">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PbF-Bm-f34">
                                                         <rect key="frame" x="0.0" y="0.0" width="200" height="18"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="as7-Ec-3tU">
@@ -1355,10 +1398,10 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="VLCLibrarySongsTableViewGenreTableCellViewIdentifier" id="RpF-ZZ-VVR">
-                                                <rect key="frame" x="821" y="2" width="150" height="17"/>
+                                                <rect key="frame" x="831" y="2" width="150" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="faR-Tr-m5n">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="faR-Tr-m5n">
                                                         <rect key="frame" x="0.0" y="0.0" width="150" height="18"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="mYg-CM-jff">
@@ -1387,10 +1430,10 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="VLCLibrarySongsTableViewPlayCountTableCellViewIdentifier" id="yc4-Vp-4hr">
-                                                <rect key="frame" x="988" y="2" width="64" height="17"/>
+                                                <rect key="frame" x="998" y="2" width="64" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4VQ-fV-w9a">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4VQ-fV-w9a">
                                                         <rect key="frame" x="0.0" y="0.0" width="64" height="18"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="h8S-0f-C5S">
@@ -1419,10 +1462,10 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="VLCLibrarySongsTableViewYearTableCellViewIdentifier" id="I8Z-L8-hBM">
-                                                <rect key="frame" x="1069" y="2" width="47" height="17"/>
+                                                <rect key="frame" x="1079" y="2" width="47" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9Er-xE-Jz7">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9Er-xE-Jz7">
                                                         <rect key="frame" x="0.0" y="0.0" width="47" height="18"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="5bJ-rm-CUk">
@@ -1443,7 +1486,7 @@
                         </subviews>
                     </clipView>
                     <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="2VX-c2-fRL">
-                        <rect key="frame" x="1" y="373" width="712" height="16"/>
+                        <rect key="frame" x="0.0" y="374" width="714" height="16"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="NFb-XZ-MAv">
@@ -1451,7 +1494,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" wantsLayer="YES" id="LR0-xA-UlZ">
-                        <rect key="frame" x="0.0" y="0.0" width="1125" height="28"/>
+                        <rect key="frame" x="0.0" y="0.0" width="1145" height="28"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
@@ -1498,7 +1541,7 @@
                         <action selector="goToBrowseSection:" target="QvC-M9-y7g" id="Ebf-mJ-co1"/>
                     </connections>
                 </button>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="adK-Pc-tnU" userLabel="Placeholder Label">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="adK-Pc-tnU" userLabel="Placeholder Label">
                     <rect key="frame" x="167" y="181" width="361" height="38"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Your favorite video will appear here. Go to the Browse section to add videos you love." id="s7N-1n-0Jt">
                         <font key="font" metaFont="system" size="16"/>
@@ -1528,8 +1571,9 @@
                 <outlet property="renderersToolbarItem" destination="YEO-08-Qzi" id="pXm-Aj-4Qg"/>
                 <outlet property="sortOrderToolbarItem" destination="Tbc-Ik-FaO" id="MFb-EI-Dsa"/>
                 <outlet property="toggleNavSidebarToolbarItem" destination="5oK-0W-JJh" id="xoK-Zo-nwh"/>
-                <outlet property="togglePlaylistToolbarItem" destination="Lf2-ec-tHh" id="PX9-gs-T5Z"/>
+                <outlet property="togglePlayQueueToolbarItem" destination="Lf2-ec-tHh" id="PX9-gs-T5Z"/>
                 <outlet property="toolbar" destination="pr3-TD-J2z" id="0bl-3Z-WiA"/>
+                <outlet property="vlcIconToolbarItem" destination="XND-sc-TDa" id="bFb-Nx-LRb"/>
             </connections>
         </customObject>
         <viewController id="Kkr-kI-gpb" customClass="VLCLibraryWindowSplitViewController">
@@ -1553,6 +1597,8 @@
         <image name="VLCVolumeOffTemplate" width="128" height="128"/>
         <image name="VLCVolumeOnTemplate" width="128" height="128"/>
         <image name="antenna.radiowaves.left.and.right" catalog="system" width="16" height="14"/>
+        <image name="arrow.trianglehead.clockwise" catalog="system" width="15" height="17"/>
+        <image name="arrow.trianglehead.counterclockwise" catalog="system" width="15" height="17"/>
         <image name="arrow.up.arrow.down" catalog="system" width="18" height="15"/>
         <image name="fullscreen-one-button" width="29" height="23"/>
         <image name="fullscreen-one-button-pressed" width="29" height="23"/>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryWindowChaptersView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryWindowChaptersView.xib Changed

@@ -27,7 +27,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="835" height="245"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowSizeStyle="automatic" viewBased="YES" id="5mv-Qc-JwM" customClass="VLCPlaylistTableView">
+                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowSizeStyle="automatic" viewBased="YES" id="5mv-Qc-JwM" customClass="VLCPlayQueueTableView">
                                 <rect key="frame" x="0.0" y="0.0" width="835" height="245"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <size key="intercellSpacing" width="3" height="2"/>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryWindowNavigationSidebarView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryWindowNavigationSidebarView.xib Changed

@@ -1,108 +1,169 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="VLCLibraryWindowNavigationSidebarViewController">
             <connections>
                 <outlet property="outlineView" destination="7u8-Zm-gnd" id="8i3-ld-a1v"/>
-                <outlet property="view" destination="gLW-4d-ery" id="lAX-ki-W5E"/>
+                <outlet property="outlineViewScrollView" destination="gLW-4d-ery" id="JQw-Jv-XP4"/>
+                <outlet property="statusNotifierView" destination="ktP-pW-HNz" id="uQE-6w-4Z6"/>
+                <outlet property="view" destination="1Xo-OM-LAE" id="SlX-HR-4N2"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <scrollView identifier="VLCLibraryWindowNavigationSidebarIdentifier" borderType="none" autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="gLW-4d-ery">
-            <rect key="frame" x="0.0" y="0.0" width="52" height="408"/>
+        <customView id="1Xo-OM-LAE">
+            <rect key="frame" x="0.0" y="0.0" width="163" height="408"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <clipView key="contentView" drawsBackground="NO" id="ENU-zz-PNN">
-                <rect key="frame" x="0.0" y="0.0" width="52" height="408"/>
-                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                <subviews>
-                    <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="13" outlineTableColumn="0BA-rc-l73" id="7u8-Zm-gnd" customClass="VLCLibraryWindowNavigationSidebarOutlineView">
-                        <rect key="frame" x="0.0" y="0.0" width="52" height="408"/>
+            <subviews>
+                <scrollView identifier="VLCLibraryWindowNavigationSidebarIdentifier" borderType="none" autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gLW-4d-ery">
+                    <rect key="frame" x="0.0" y="0.0" width="163" height="408"/>
+                    <clipView key="contentView" drawsBackground="NO" id="ENU-zz-PNN">
+                        <rect key="frame" x="0.0" y="0.0" width="163" height="408"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <size key="intercellSpacing" width="3" height="0.0"/>
-                        <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
-                        <tableColumns>
-                            <tableColumn identifier="AutomaticTableColumnIdentifier.0" width="20" minWidth="16" maxWidth="1000" id="0BA-rc-l73">
-                                <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                    <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                </tableHeaderCell>
-                                <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="LOi-U5-mry">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                                <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                <prototypeCellViews>
-                                    <tableCellView identifier="HeaderCell" id="kOq-UZ-niu">
-                                        <rect key="frame" x="11" y="0.0" width="29" height="0.0"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <subviews>
-                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BZj-wQ-l4Y">
-                                                <rect key="frame" x="0.0" y="-16" width="29" height="14"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Header Cell" id="raJ-4P-D2Y">
-                                                    <font key="font" metaFont="systemMedium" size="11"/>
-                                                    <color key="textColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                        </subviews>
-                                        <connections>
-                                            <outlet property="textField" destination="BZj-wQ-l4Y" id="LPR-2S-f7O"/>
-                                        </connections>
-                                    </tableCellView>
-                                    <tableCellView identifier="VLCLibrarySegmentCellIdentifier" id="FOz-uD-GU6">
-                                        <rect key="frame" x="11" y="0.0" width="29" height="0.0"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <subviews>
-                                            <imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="g5f-nN-6XM">
-                                                <rect key="frame" x="3" y="-17" width="17" height="17"/>
-                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                <imageCell key="cell" refusesFirstResponder="YES" imageScaling="proportionallyDown" image="NSActionTemplate" id="iLQ-Rx-S8F"/>
-                                            </imageView>
-                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9Av-FK-YYz">
-                                                <rect key="frame" x="25" y="-17" width="4" height="17"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="maG-3E-S0m">
-                                                    <font key="font" metaFont="system"/>
-                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                        </subviews>
-                                        <connections>
-                                            <outlet property="imageView" destination="g5f-nN-6XM" id="R33-R1-9wo"/>
-                                            <outlet property="textField" destination="9Av-FK-YYz" id="sWz-d6-9rY"/>
-                                        </connections>
-                                    </tableCellView>
-                                </prototypeCellViews>
-                            </tableColumn>
-                        </tableColumns>
-                        <connections>
-                            <outlet property="delegate" destination="-2" id="3zv-hj-C4v"/>
-                        </connections>
-                    </outlineView>
-                </subviews>
-                <nil key="backgroundColor"/>
-            </clipView>
-            <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="JPx-dd-Chs">
-                <rect key="frame" x="0.0" y="392" width="52" height="16"/>
-                <autoresizingMask key="autoresizingMask"/>
-            </scroller>
-            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="7pD-oe-Gtt">
-                <rect key="frame" x="224" y="17" width="15" height="102"/>
-                <autoresizingMask key="autoresizingMask"/>
-            </scroller>
-            <point key="canvasLocation" x="-148" y="-17"/>
-        </scrollView>
+                        <subviews>
+                            <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="13" outlineTableColumn="0BA-rc-l73" id="7u8-Zm-gnd" customClass="VLCLibraryWindowNavigationSidebarOutlineView">
+                                <rect key="frame" x="0.0" y="0.0" width="163" height="408"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <size key="intercellSpacing" width="3" height="0.0"/>
+                                <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                <tableColumns>
+                                    <tableColumn identifier="AutomaticTableColumnIdentifier.0" width="131" minWidth="16" maxWidth="1000" id="0BA-rc-l73">
+                                        <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
+                                            <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                        </tableHeaderCell>
+                                        <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="LOi-U5-mry">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                        <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                        <prototypeCellViews>
+                                            <tableCellView identifier="VLCLibrarySegmentHeaderCellIdentifier" id="kOq-UZ-niu">
+                                                <rect key="frame" x="11" y="0.0" width="140" height="0.0"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <subviews>
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BZj-wQ-l4Y">
+                                                        <rect key="frame" x="0.0" y="-16" width="140" height="14"/>
+                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                        <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Header Cell" id="raJ-4P-D2Y">
+                                                            <font key="font" metaFont="systemMedium" size="11"/>
+                                                            <color key="textColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                </subviews>
+                                                <connections>
+                                                    <outlet property="textField" destination="BZj-wQ-l4Y" id="LPR-2S-f7O"/>
+                                                </connections>
+                                            </tableCellView>
+                                            <tableCellView identifier="VLCLibrarySegmentCellIdentifier" id="FOz-uD-GU6">
+                                                <rect key="frame" x="11" y="0.0" width="140" height="0.0"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <subviews>
+                                                    <imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="g5f-nN-6XM">
+                                                        <rect key="frame" x="3" y="-17" width="17" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                        <imageCell key="cell" refusesFirstResponder="YES" imageScaling="proportionallyDown" image="NSActionTemplate" id="iLQ-Rx-S8F"/>
+                                                    </imageView>
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9Av-FK-YYz">
+                                                        <rect key="frame" x="25" y="-17" width="115" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                        <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="maG-3E-S0m">
+                                                            <font key="font" metaFont="system"/>
+                                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                </subviews>
+                                                <connections>
+                                                    <outlet property="imageView" destination="g5f-nN-6XM" id="R33-R1-9wo"/>
+                                                    <outlet property="textField" destination="9Av-FK-YYz" id="sWz-d6-9rY"/>
+                                                </connections>
+                                            </tableCellView>
+                                        </prototypeCellViews>
+                                    </tableColumn>
+                                </tableColumns>
+                                <connections>
+                                    <outlet property="delegate" destination="-2" id="3zv-hj-C4v"/>
+                                </connections>
+                            </outlineView>
+                        </subviews>
+                        <nil key="backgroundColor"/>
+                    </clipView>
+                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="JPx-dd-Chs">
+                        <rect key="frame" x="0.0" y="392" width="52" height="16"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </scroller>
+                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="7pD-oe-Gtt">
+                        <rect key="frame" x="224" y="17" width="15" height="102"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </scroller>
+                </scrollView>
+                <visualEffectView blendingMode="behindWindow" material="sidebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="ktP-pW-HNz" customClass="VLCStatusNotifierView">
+                    <rect key="frame" x="0.0" y="0.0" width="163" height="26"/>
+                    <subviews>
+                        <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Y8P-v6-LbG">
+                            <rect key="frame" x="0.0" y="23" width="163" height="5"/>
+                        </box>
+                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="bT3-Rj-1sP">
+                            <rect key="frame" x="24" y="5" width="136" height="16"/>
+                            <textFieldCell key="cell" selectable="YES" title="State changed…" id="7Bd-PT-Muh">
+                                <font key="font" usesAppearanceFont="YES"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                        <progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" maxValue="100" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="uvb-DL-v2Y">
+                            <rect key="frame" x="5" y="5" width="16" height="16"/>
+                        </progressIndicator>
+                        <imageView wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Teh-MM-hCO">
+                            <rect key="frame" x="5" y="2" width="16" height="22"/>
+                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="info.circle.fill" catalog="system" id="IHH-jG-V9R"/>
+                        </imageView>
+                    </subviews>
+                    <constraints>
+                        <constraint firstItem="Teh-MM-hCO" firstAttribute="bottom" secondItem="uvb-DL-v2Y" secondAttribute="bottom" id="0Nc-6c-urZ"/>
+                        <constraint firstAttribute="bottom" secondItem="bT3-Rj-1sP" secondAttribute="bottom" constant="5" id="0Oa-ae-42L"/>
+                        <constraint firstItem="Y8P-v6-LbG" firstAttribute="top" secondItem="ktP-pW-HNz" secondAttribute="top" id="55Y-cA-vSR"/>
+                        <constraint firstAttribute="trailing" secondItem="bT3-Rj-1sP" secondAttribute="trailing" constant="5" id="89E-uL-PDh"/>
+                        <constraint firstItem="uvb-DL-v2Y" firstAttribute="leading" secondItem="ktP-pW-HNz" secondAttribute="leading" constant="5" id="8fh-AX-6Yy"/>
+                        <constraint firstItem="Y8P-v6-LbG" firstAttribute="leading" secondItem="ktP-pW-HNz" secondAttribute="leading" id="EKo-34-VRz"/>
+                        <constraint firstItem="Teh-MM-hCO" firstAttribute="top" secondItem="uvb-DL-v2Y" secondAttribute="top" id="Hjv-2U-78c"/>
+                        <constraint firstItem="bT3-Rj-1sP" firstAttribute="top" secondItem="ktP-pW-HNz" secondAttribute="top" constant="5" id="Ywb-cy-Ftx"/>
+                        <constraint firstItem="uvb-DL-v2Y" firstAttribute="top" secondItem="ktP-pW-HNz" secondAttribute="top" constant="5" id="akG-qb-5B7"/>
+                        <constraint firstAttribute="trailing" secondItem="Y8P-v6-LbG" secondAttribute="trailing" id="cE4-8g-Jxj"/>
+                        <constraint firstItem="Teh-MM-hCO" firstAttribute="trailing" secondItem="uvb-DL-v2Y" secondAttribute="trailing" id="cdy-jb-RyP"/>
+                        <constraint firstItem="Teh-MM-hCO" firstAttribute="leading" secondItem="uvb-DL-v2Y" secondAttribute="leading" id="l8B-34-eN9"/>
+                        <constraint firstItem="bT3-Rj-1sP" firstAttribute="leading" secondItem="uvb-DL-v2Y" secondAttribute="trailing" constant="5" id="oAa-Vo-uGC"/>
+                        <constraint firstAttribute="bottom" secondItem="uvb-DL-v2Y" secondAttribute="bottom" constant="5" id="wqe-yn-z5G"/>
+                    </constraints>
+                    <connections>
+                        <outlet property="infoImageView" destination="Teh-MM-hCO" id="DaC-qt-REr"/>
+                        <outlet property="label" destination="bT3-Rj-1sP" id="1VQ-rK-Dc5"/>
+                        <outlet property="progressIndicator" destination="uvb-DL-v2Y" id="TmU-8b-Gqf"/>
+                    </connections>
+                </visualEffectView>
+            </subviews>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="ktP-pW-HNz" secondAttribute="trailing" id="8dk-br-RRR"/>
+                <constraint firstItem="gLW-4d-ery" firstAttribute="top" secondItem="1Xo-OM-LAE" secondAttribute="top" id="Be0-YZ-eO8"/>
+                <constraint firstAttribute="bottom" secondItem="gLW-4d-ery" secondAttribute="bottom" id="Vzj-Cg-x22"/>
+                <constraint firstAttribute="trailing" secondItem="gLW-4d-ery" secondAttribute="trailing" id="YZ5-5U-g5o"/>
+                <constraint firstAttribute="bottom" secondItem="ktP-pW-HNz" secondAttribute="bottom" id="htA-jD-bR8"/>
+                <constraint firstItem="ktP-pW-HNz" firstAttribute="leading" secondItem="1Xo-OM-LAE" secondAttribute="leading" id="sCi-Dr-FZw"/>
+                <constraint firstItem="gLW-4d-ery" firstAttribute="leading" secondItem="1Xo-OM-LAE" secondAttribute="leading" id="yWF-0n-RPp"/>
+            </constraints>
+            <point key="canvasLocation" x="-256" y="-334"/>
+        </customView>
     </objects>
     <resources>
         <image name="NSActionTemplate" width="20" height="20"/>
+        <image name="info.circle.fill" catalog="system" width="15" height="15"/>
     </resources>
 </document>

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryWindowPlayQueueView.xib Added

@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
+        <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="VLCLibraryWindowPlayQueueSidebarViewController">
+            <connections>
+                <outlet property="bottomButtonsSeparator" destination="ew3-Pn-diG" id="N5L-cw-953"/>
+                <outlet property="dragDropImageBackgroundBox" destination="aUB-Ld-N2o" id="9xc-5h-uRF"/>
+                <outlet property="dragDropView" destination="grx-kk-1X1" id="b1W-Zw-a7Z"/>
+                <outlet property="openMediaButton" destination="ghp-DI-YmZ" id="30J-m7-gLb"/>
+                <outlet property="repeatButton" destination="9xU-Ba-Hys" id="myS-5X-rgK"/>
+                <outlet property="shuffleButton" destination="bdZ-N9-Noa" id="bJz-sR-lGW"/>
+                <outlet property="tableView" destination="Ubg-RS-LWE" id="ZiJ-ca-sOj"/>
+                <outlet property="titleSeparator" destination="ik5-L4-VLw" id="qht-tq-0rB"/>
+                <outlet property="view" destination="NJR-gf-yTs" id="P3C-tn-4va"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView identifier="VLCLibraryWindowPlayQueueSidebarIdentifier" id="NJR-gf-yTs">
+            <rect key="frame" x="0.0" y="0.0" width="510" height="266"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <box verticalHuggingPriority="751" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="ik5-L4-VLw">
+                    <rect key="frame" x="20" y="263" width="470" height="5"/>
+                </box>
+                <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EIb-Is-vco">
+                    <rect key="frame" x="0.0" y="55" width="510" height="210"/>
+                    <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="20t-S6-IYS">
+                        <rect key="frame" x="0.0" y="0.0" width="510" height="210"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" autosaveColumns="NO" rowHeight="16" rowSizeStyle="automatic" viewBased="YES" id="Ubg-RS-LWE" customClass="VLCPlayQueueTableView">
+                                <rect key="frame" x="0.0" y="0.0" width="510" height="210"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <size key="intercellSpacing" width="3" height="2"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                <tableColumns>
+                                    <tableColumn width="478" minWidth="40" maxWidth="1000" id="vsk-lo-Poz">
+                                        <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
+                                            <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                        </tableHeaderCell>
+                                        <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="hd9-0h-vDz">
+                                            <font key="font" metaFont="message"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                        <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                        <prototypeCellViews>
+                                            <tableCellView id="16d-Sp-wg1">
+                                                <rect key="frame" x="11" y="1" width="487" height="16"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <subviews>
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="UNu-bV-KHW">
+                                                        <rect key="frame" x="0.0" y="0.0" width="487" height="16"/>
+                                                        <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="cHf-3e-UVA">
+                                                            <font key="font" metaFont="message"/>
+                                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="UNu-bV-KHW" firstAttribute="centerX" secondItem="16d-Sp-wg1" secondAttribute="centerX" id="3lH-fF-e4z"/>
+                                                    <constraint firstItem="UNu-bV-KHW" firstAttribute="leading" secondItem="16d-Sp-wg1" secondAttribute="leading" constant="2" id="daN-fU-MF2"/>
+                                                    <constraint firstItem="UNu-bV-KHW" firstAttribute="centerY" secondItem="16d-Sp-wg1" secondAttribute="centerY" id="gxh-uO-KDR"/>
+                                                </constraints>
+                                                <connections>
+                                                    <outlet property="textField" destination="UNu-bV-KHW" id="M8y-bv-h0J"/>
+                                                </connections>
+                                            </tableCellView>
+                                        </prototypeCellViews>
+                                    </tableColumn>
+                                </tableColumns>
+                                <connections>
+                                    <action trigger="doubleAction" selector="tableDoubleClickAction:" target="-2" id="dA1-82-uPF"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <nil key="backgroundColor"/>
+                    </clipView>
+                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="d8X-HO-km5">
+                        <rect key="frame" x="-100" y="-100" width="0.0" height="16"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </scroller>
+                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="pGF-gC-QOo">
+                        <rect key="frame" x="494" y="0.0" width="16" height="27"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </scroller>
+                </scrollView>
+                <box verticalHuggingPriority="751" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="ew3-Pn-diG">
+                    <rect key="frame" x="20" y="52" width="470" height="5"/>
+                </box>
+                <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="grx-kk-1X1" customClass="VLCDragDropView">
+                    <rect key="frame" x="0.0" y="55" width="510" height="210"/>
+                    <subviews>
+                        <box boxType="custom" borderType="line" borderWidth="0.0" cornerRadius="10" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="aUB-Ld-N2o">
+                            <rect key="frame" x="188" y="38" width="134" height="134"/>
+                            <view key="contentView" id="9Ay-rU-2bA">
+                                <rect key="frame" x="0.0" y="0.0" width="134" height="134"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            </view>
+                            <color key="borderColor" name="separatorColor" catalog="System" colorSpace="catalog"/>
+                        </box>
+                        <imageView translatesAutoresizingMaskIntoConstraints="NO" id="qv6-Mn-ifA" customClass="VLCDropDisabledImageView">
+                            <rect key="frame" x="199" y="49" width="112" height="112"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="112" id="CUl-4Z-0sw"/>
+                                <constraint firstAttribute="width" constant="112" id="MpG-av-aGj"/>
+                            </constraints>
+                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="dropzone" id="AZ2-8e-Rrz"/>
+                        </imageView>
+                        <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ghp-DI-YmZ">
+                            <rect key="frame" x="196" y="1" width="119" height="32"/>
+                            <buttonCell key="cell" type="push" title="Open media..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="07D-yu-JVI">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <connections>
+                                <action selector="openMedia:" target="-2" id="bNF-Oh-7mm"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <constraints>
+                        <constraint firstItem="qv6-Mn-ifA" firstAttribute="centerY" secondItem="grx-kk-1X1" secondAttribute="centerY" id="AO4-Hd-L52"/>
+                        <constraint firstItem="aUB-Ld-N2o" firstAttribute="centerX" secondItem="qv6-Mn-ifA" secondAttribute="centerX" id="DKc-9E-HYo"/>
+                        <constraint firstItem="aUB-Ld-N2o" firstAttribute="width" secondItem="qv6-Mn-ifA" secondAttribute="width" multiplier="1.2" id="Jkb-0O-auX"/>
+                        <constraint firstItem="ghp-DI-YmZ" firstAttribute="top" secondItem="aUB-Ld-N2o" secondAttribute="bottom" constant="10" id="XFC-9r-Q8L"/>
+                        <constraint firstItem="aUB-Ld-N2o" firstAttribute="height" secondItem="qv6-Mn-ifA" secondAttribute="height" multiplier="1.2" id="eJ2-wz-BJL"/>
+                        <constraint firstItem="ghp-DI-YmZ" firstAttribute="centerX" secondItem="qv6-Mn-ifA" secondAttribute="centerX" id="gL5-uR-Smy"/>
+                        <constraint firstItem="aUB-Ld-N2o" firstAttribute="centerY" secondItem="qv6-Mn-ifA" secondAttribute="centerY" id="yfU-xa-zSE"/>
+                        <constraint firstItem="qv6-Mn-ifA" firstAttribute="centerX" secondItem="grx-kk-1X1" secondAttribute="centerX" id="z8g-fU-cRw"/>
+                    </constraints>
+                </customView>
+                <stackView distribution="equalCentering" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hc5-GJ-yJe">
+                    <rect key="frame" x="20" y="16" width="470" height="22"/>
+                    <subviews>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bdZ-N9-Noa">
+                            <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="shuffleOn" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="fpN-XQ-XkJ">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="24" id="Dt6-9r-UXZ"/>
+                                <constraint firstAttribute="height" constant="24" id="MPF-8Q-Oge"/>
+                            </constraints>
+                            <connections>
+                                <action selector="shuffleAction:" target="-2" id="yht-Rc-8kq"/>
+                            </connections>
+                        </button>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9xU-Ba-Hys">
+                            <rect key="frame" x="149" y="0.0" width="24" height="24"/>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="repeatOff" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="CWu-CE-2fG">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="24" id="LwI-Gs-9Ll"/>
+                                <constraint firstAttribute="height" constant="24" id="oy4-Ke-bx1"/>
+                            </constraints>
+                            <connections>
+                                <action selector="repeatAction:" target="-2" id="SNk-vw-LSL"/>
+                            </connections>
+                        </button>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="C02-6a-1Uw">
+                            <rect key="frame" x="297" y="0.0" width="24" height="25"/>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="line.horizontal.3.decrease" catalog="system" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Qsi-6S-0bG">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="24" id="3rz-oE-rhS"/>
+                                <constraint firstAttribute="width" constant="24" id="uLL-RT-XeW"/>
+                            </constraints>
+                            <connections>
+                                <action selector="sortPlayQueue:" target="-2" id="BAl-CA-um5"/>
+                            </connections>
+                        </button>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aKS-lw-hfk">
+                            <rect key="frame" x="446" y="-3" width="24.5" height="32"/>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="trash" catalog="system" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="DEr-Gg-n7Z">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="24" id="TWi-ow-aoD"/>
+                                <constraint firstAttribute="width" constant="24" id="bgh-Lr-Mae"/>
+                            </constraints>
+                            <connections>
+                                <action selector="clearPlayQueue:" target="-2" id="DEh-0j-CpD"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <visibilityPriorities>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                    </visibilityPriorities>
+                    <customSpacing>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                    </customSpacing>
+                </stackView>
+            </subviews>
+            <constraints>
+                <constraint firstItem="ik5-L4-VLw" firstAttribute="top" secondItem="NJR-gf-yTs" secondAttribute="top" id="1za-9j-6sD"/>
+                <constraint firstAttribute="trailing" secondItem="grx-kk-1X1" secondAttribute="trailing" id="4CB-HB-Om0"/>
+                <constraint firstItem="grx-kk-1X1" firstAttribute="top" secondItem="ik5-L4-VLw" secondAttribute="bottom" id="AoR-Q7-XYJ"/>
+                <constraint firstItem="ik5-L4-VLw" firstAttribute="leading" secondItem="NJR-gf-yTs" secondAttribute="leading" constant="20" id="CW2-KK-Z5t"/>
+                <constraint firstItem="EIb-Is-vco" firstAttribute="top" secondItem="ik5-L4-VLw" secondAttribute="bottom" id="Cyw-MK-W8n"/>
+                <constraint firstAttribute="trailing" secondItem="ew3-Pn-diG" secondAttribute="trailing" constant="20" id="Hwc-K8-2WQ"/>
+                <constraint firstAttribute="trailing" secondItem="EIb-Is-vco" secondAttribute="trailing" id="UAJ-gH-fWy"/>
+                <constraint firstItem="hc5-GJ-yJe" firstAttribute="leading" secondItem="NJR-gf-yTs" secondAttribute="leading" constant="20" id="Ums-3j-iWc"/>
+                <constraint firstAttribute="bottom" secondItem="hc5-GJ-yJe" secondAttribute="bottom" constant="16" id="XfY-Lh-mBE"/>
+                <constraint firstAttribute="trailing" secondItem="hc5-GJ-yJe" secondAttribute="trailing" constant="20" id="chv-hJ-pjk"/>
+                <constraint firstAttribute="trailing" secondItem="ik5-L4-VLw" secondAttribute="trailing" constant="20" id="ef5-v1-Rm6"/>
+                <constraint firstItem="hc5-GJ-yJe" firstAttribute="top" secondItem="ew3-Pn-diG" secondAttribute="bottom" constant="16" id="fcg-kI-gzS"/>
+                <constraint firstItem="ew3-Pn-diG" firstAttribute="top" secondItem="grx-kk-1X1" secondAttribute="bottom" id="haK-Qu-HJv"/>
+                <constraint firstItem="EIb-Is-vco" firstAttribute="leading" secondItem="NJR-gf-yTs" secondAttribute="leading" id="kEZ-5n-pxq"/>
+                <constraint firstItem="grx-kk-1X1" firstAttribute="leading" secondItem="NJR-gf-yTs" secondAttribute="leading" id="mCw-UE-mS0"/>
+                <constraint firstItem="ew3-Pn-diG" firstAttribute="leading" secondItem="NJR-gf-yTs" secondAttribute="leading" constant="20" id="qow-FG-3aN"/>
+                <constraint firstItem="EIb-Is-vco" firstAttribute="bottom" secondItem="ew3-Pn-diG" secondAttribute="top" id="y82-Wx-neg"/>
+            </constraints>
+            <point key="canvasLocation" x="-148" y="45"/>
+        </customView>
+    </objects>
+    <resources>
+        <image name="dropzone" width="112" height="112"/>
+        <image name="line.horizontal.3.decrease" catalog="system" width="16" height="10"/>
+        <image name="repeatOff" width="24" height="24"/>
+        <image name="shuffleOn" width="24" height="24"/>
+        <image name="trash" catalog="system" width="15" height="17"/>
+    </resources>
+</document>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryWindowSidebarRootView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryWindowSidebarRootView.xib Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCLibraryWindowTitlesView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCLibraryWindowTitlesView.xib Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCMainVideoView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCMainVideoView.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment version="101000" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -10,6 +10,7 @@
         <customObject id="-2" userLabel="File's Owner" customClass="VLCMainVideoViewController">
             <connections>
                 <outlet property="bottomBarView" destination="1GA-GG-Sdx" id="0UY-5o-eVD"/>
+                <outlet property="centerButtonStackInViewConstraint" destination="l2Y-IR-aus" id="kLb-Ev-BuY"/>
                 <outlet property="centralControlsStackView" destination="CvV-yX-Nbh" id="zyI-Rb-bem"/>
                 <outlet property="controlsBar" destination="3" id="Mfq-2w-2uR"/>
                 <outlet property="fakeTitleBar" destination="jnw-gL-nrF" id="7lZ-al-c3d"/>
@@ -17,10 +18,13 @@
                 <outlet property="floatOnTopIndicatorImageView" destination="CrW-mq-gge" id="hqR-4Z-a18"/>
                 <outlet property="loadingIndicator" destination="xOQ-YR-iAc" id="CtX-Yo-UX2"/>
                 <outlet property="mainControlsView" destination="D4V-Zd-qvB" id="KwM-ya-ETn"/>
+                <outlet property="nextButtonSizeConstraint" destination="M5n-CD-fd3" id="WIM-QF-IMG"/>
                 <outlet property="overlayView" destination="FGS-tq-54S" id="RSC-7m-N0y"/>
-                <outlet property="playlistButton" destination="Drq-if-dw4" id="BZe-Cr-mzZ"/>
-                <outlet property="playlistButtonTopConstraint" destination="VyM-t4-y6F" id="V94-GS-KcS"/>
-                <outlet property="playlistButtonTrailingConstraint" destination="rWa-NJ-Aju" id="tzU-Iz-CXl"/>
+                <outlet property="playButtonSizeConstraint" destination="OHb-xJ-sqM" id="7Ve-Gd-rEz"/>
+                <outlet property="playQueueButton" destination="Drq-if-dw4" id="BZe-Cr-mzZ"/>
+                <outlet property="playQueueButtonTopConstraint" destination="VyM-t4-y6F" id="V94-GS-KcS"/>
+                <outlet property="playQueueButtonTrailingConstraint" destination="rWa-NJ-Aju" id="tzU-Iz-CXl"/>
+                <outlet property="prevButtonSizeConstraint" destination="XBm-GM-29d" id="8x6-WZ-ydw"/>
                 <outlet property="returnButton" destination="UoQ-34-Pox" id="nyY-OF-9zj"/>
                 <outlet property="returnButtonLeadingConstraint" destination="BkP-RA-uxn" id="CsI-gH-SYp"/>
                 <outlet property="returnButtonTopConstraint" destination="0l2-eC-67c" id="78K-sz-kmV"/>
@@ -41,10 +45,13 @@
                 <outlet property="forwardButton" destination="sF5-Z0-bef" id="H6w-Le-NAK"/>
                 <outlet property="fullscreenButton" destination="dYZ-ri-Kra" id="Cw2-BS-QG9"/>
                 <outlet property="fullscreenButtonWidthConstraint" destination="quS-fD-Od7" id="6hT-nR-yQI"/>
+                <outlet property="jumpBackwardButton" destination="AXA-01-AU8" id="gfa-Yt-ezI"/>
+                <outlet property="jumpForwardButton" destination="aAq-uE-mLW" id="M7n-mW-tNe"/>
                 <outlet property="muteVolumeButton" destination="afi-4d-rQk" id="y6R-6o-2OM"/>
                 <outlet property="pipButton" destination="yEi-SZ-SIS" id="vFi-Ln-9lT"/>
                 <outlet property="pipButtonWidthConstraint" destination="dxa-Jx-T4p" id="a5S-ec-2xD"/>
                 <outlet property="playButton" destination="PCC-8a-sVF" id="ddT-ZM-Jhz"/>
+                <outlet property="playbackRateButton" destination="GHq-pt-nIe" id="k0k-fd-Vz5"/>
                 <outlet property="playingItemDisplayField" destination="lEW-MN-FFU" id="hKa-df-8UB"/>
                 <outlet property="subtitlesButton" destination="YTl-LZ-WDe" id="893-XB-eDY"/>
                 <outlet property="timeField" destination="3ri-8b-8mw" id="f0i-Gh-R8V"/>
@@ -54,7 +61,7 @@
                 <outlet property="volumeSlider" destination="fKc-2d-Uu6" id="2pU-fH-Afo"/>
             </connections>
         </customObject>
-        <customView id="WRu-Ic-lQK">
+        <customView appearanceType="darkAqua" id="WRu-Ic-lQK">
             <rect key="frame" x="0.0" y="0.0" width="720" height="480"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -86,21 +93,6 @@
                             </visualEffectView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="FGS-tq-54S" customClass="VLCMainVideoViewOverlayView">
                                 <rect key="frame" x="0.0" y="0.0" width="720" height="480"/>
-                                <subviews>
-                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CrW-mq-gge">
-                                        <rect key="frame" x="344" y="285.5" width="32.5" height="45"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="32" id="wyi-7y-I1n"/>
-                                            <constraint firstAttribute="height" constant="32" id="yeS-Wi-3sX"/>
-                                        </constraints>
-                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" id="OcH-tO-P80">
-                                            <imageReference key="image" image="pin.fill" catalog="system" symbolScale="large"/>
-                                        </imageCell>
-                                    </imageView>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="CrW-mq-gge" firstAttribute="centerX" secondItem="FGS-tq-54S" secondAttribute="centerX" id="rPJ-ci-c4T"/>
-                                </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="1GA-GG-Sdx">
                                 <rect key="frame" x="0.0" y="0.0" width="720" height="132"/>
@@ -117,17 +109,17 @@
                                         </textFieldCell>
                                     </textField>
                                     <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="San-L7-ZvB">
-                                        <rect key="frame" x="20" y="59" width="279" height="53"/>
+                                        <rect key="frame" x="20" y="59" width="234" height="53"/>
                                         <subviews>
-                                            <textField wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="lEW-MN-FFU" customClass="VLCWrappableTextField">
-                                                <rect key="frame" x="-2" y="25" width="283" height="28"/>
+                                            <textField wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="lEW-MN-FFU">
+                                                <rect key="frame" x="-2" y="25" width="238" height="28"/>
                                                 <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" placeholderString="Nothing Playing" usesSingleLineMode="YES" id="8l0-zS-fOa">
                                                     <font key="font" metaFont="systemBold" size="24"/>
                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5ii-yU-6Zp" customClass="VLCWrappableTextField">
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5ii-yU-6Zp">
                                                 <rect key="frame" x="-2" y="0.0" width="145" height="21"/>
                                                 <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" placeholderString="No details to show" usesSingleLineMode="YES" id="k9I-DK-CEe">
                                                     <font key="font" textStyle="title2" name=".SFNS-Regular"/>
@@ -160,13 +152,26 @@
                                         </connections>
                                     </slider>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sJu-ZK-5QH">
-                                        <rect key="frame" x="319" y="59" width="381" height="32"/>
+                                        <rect key="frame" x="274" y="59" width="426" height="32"/>
                                         <subviews>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y8F-hr-iaW">
-                                                <rect key="frame" x="0.0" y="0.0" width="254" height="32"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="299" height="32"/>
                                                 <subviews>
+                                                    <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GHq-pt-nIe" customClass="VLCImageButton">
+                                                        <rect key="frame" x="0.0" y="1" width="40" height="29"/>
+                                                        <buttonCell key="cell" type="recessed" title="1.0x" bezelStyle="recessed" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="pUr-pW-j5a">
+                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                                                            <font key="font" metaFont="smallSystem"/>
+                                                        </buttonCell>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="40" id="Nvo-dk-KyW"/>
+                                                        </constraints>
+                                                        <connections>
+                                                            <action selector="openPlaybackRate:" target="3" id="tLQ-DO-783"/>
+                                                        </connections>
+                                                    </button>
                                                     <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="95O-Oc-zrQ" customClass="VLCImageButton">
-                                                        <rect key="frame" x="0.0" y="-1" width="32" height="33"/>
+                                                        <rect key="frame" x="45" y="-1" width="32" height="33"/>
                                                         <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="photo.tv" catalog="system" imagePosition="only" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="dnH-S4-sBc">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                                             <font key="font" metaFont="system"/>
@@ -181,7 +186,7 @@
                                                         </connections>
                                                     </button>
                                                     <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cja-ZG-8LF" customClass="VLCImageButton">
-                                                        <rect key="frame" x="37" y="-1" width="32" height="33"/>
+                                                        <rect key="frame" x="82" y="-1" width="32" height="33"/>
                                                         <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="waveform.circle" catalog="system" imagePosition="only" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="5em-Cm-yoF">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                                             <font key="font" metaFont="system"/>
@@ -195,7 +200,7 @@
                                                         </connections>
                                                     </button>
                                                     <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YTl-LZ-WDe" customClass="VLCImageButton">
-                                                        <rect key="frame" x="74" y="-1" width="32" height="33"/>
+                                                        <rect key="frame" x="119" y="-1" width="32" height="33"/>
                                                         <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="text.bubble" catalog="system" imagePosition="only" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="1qF-LY-LkO">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                                             <font key="font" metaFont="system"/>
@@ -210,7 +215,7 @@
                                                         </connections>
                                                     </button>
                                                     <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4tZ-52-1q9" customClass="VLCImageButton">
-                                                        <rect key="frame" x="111" y="-1" width="32" height="33"/>
+                                                        <rect key="frame" x="156" y="-1" width="32" height="33"/>
                                                         <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="bookmark.circle" catalog="system" imagePosition="only" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="bGc-fn-jgQ">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                                             <font key="font" metaFont="system"/>
@@ -225,7 +230,7 @@
                                                         </connections>
                                                     </button>
                                                     <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8jZ-hd-YVq" customClass="VLCImageButton">
-                                                        <rect key="frame" x="148" y="-1" width="32" height="33"/>
+                                                        <rect key="frame" x="193" y="-1" width="32" height="33"/>
                                                         <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="play.rectangle.on.rectangle.fill" catalog="system" imagePosition="only" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="fyV-F5-ogO">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                                             <font key="font" metaFont="system"/>
@@ -239,7 +244,7 @@
                                                         </connections>
                                                     </button>
                                                     <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dYZ-ri-Kra" customClass="VLCImageButton">
-                                                        <rect key="frame" x="185" y="-1" width="32" height="33"/>
+                                                        <rect key="frame" x="230" y="-1" width="32" height="33"/>
                                                         <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="arrow.up.left.and.arrow.down.right" catalog="system" imagePosition="only" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="Z8g-js-0W6">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                                             <font key="font" metaFont="system"/>
@@ -253,7 +258,7 @@
                                                         </connections>
                                                     </button>
                                                     <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yEi-SZ-SIS" customClass="VLCImageButton">
-                                                        <rect key="frame" x="222" y="-1" width="32" height="33"/>
+                                                        <rect key="frame" x="267" y="-1" width="32" height="33"/>
                                                         <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="pip.enter" catalog="system" imagePosition="only" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="Q7p-GS-7p0">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                                             <font key="font" metaFont="system"/>
@@ -275,6 +280,7 @@
                                                     <integer value="1000"/>
                                                     <integer value="1000"/>
                                                     <integer value="1000"/>
+                                                    <integer value="1000"/>
                                                 </visibilityPriorities>
                                                 <customSpacing>
                                                     <real value="3.4028234663852886e+38"/>
@@ -284,10 +290,11 @@
                                                     <real value="3.4028234663852886e+38"/>
                                                     <real value="3.4028234663852886e+38"/>
                                                     <real value="3.4028234663852886e+38"/>
+                                                    <real value="3.4028234663852886e+38"/>
                                                 </customSpacing>
                                             </stackView>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zyp-45-IgR">
-                                                <rect key="frame" x="264" y="0.0" width="117" height="32"/>
+                                                <rect key="frame" x="309" y="0.0" width="117" height="32"/>
                                                 <subviews>
                                                     <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="afi-4d-rQk" customClass="VLCImageButton">
                                                         <rect key="frame" x="0.0" y="-1" width="32" height="33"/>
@@ -366,10 +373,29 @@
                                 </shadow>
                             </customView>
                             <stackView wantsLayer="YES" distribution="fill" orientation="horizontal" alignment="centerY" spacing="20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CvV-yX-Nbh">
-                                <rect key="frame" x="260" y="208" width="200" height="64"/>
+                                <rect key="frame" x="208" y="208" width="304" height="64"/>
                                 <subviews>
+                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="AXA-01-AU8" customClass="VLCImageButton">
+                                        <rect key="frame" x="0.0" y="13" width="32" height="40"/>
+                                        <shadow key="shadow" blurRadius="20">
+                                            <color key="color" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        </shadow>
+                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="arrow.trianglehead.counterclockwise" catalog="system" imagePosition="only" alignment="center" continuous="YES" imageScaling="proportionallyUpOrDown" inset="2" id="BGU-Ew-pvq">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <color key="contentTintColor" red="0.99999600649999998" green="1" blue="1" alpha="0.85338267140000001" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="32" id="Xh5-1i-dxH"/>
+                                            <constraint firstAttribute="width" secondItem="AXA-01-AU8" secondAttribute="height" multiplier="1:1" id="lgn-JT-8Qk"/>
+                                            <constraint firstAttribute="width" secondItem="AXA-01-AU8" secondAttribute="height" multiplier="1:1" id="tkp-uc-bfs"/>
+                                        </constraints>
+                                        <connections>
+                                            <action selector="jumpBackward:" target="3" id="Kkq-12-jbm"/>
+                                        </connections>
+                                    </button>
                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="V9d-hX-iyg" customClass="VLCImageButton">
-                                        <rect key="frame" x="0.0" y="6.5" width="48" height="51"/>
+                                        <rect key="frame" x="52" y="6.5" width="48.5" height="51"/>
                                         <shadow key="shadow" blurRadius="20">
                                             <color key="color" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </shadow>
@@ -387,7 +413,7 @@
                                         </connections>
                                     </button>
                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="PCC-8a-sVF" customClass="VLCImageButton">
-                                        <rect key="frame" x="68" y="-2" width="64.5" height="68"/>
+                                        <rect key="frame" x="120" y="-1.5" width="64.5" height="68"/>
                                         <shadow key="shadow" blurRadius="30">
                                             <color key="color" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </shadow>
@@ -408,7 +434,7 @@
                                         </connections>
                                     </button>
                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="sF5-Z0-bef" customClass="VLCImageButton">
-                                        <rect key="frame" x="152" y="6.5" width="48" height="51"/>
+                                        <rect key="frame" x="204" y="6.5" width="48.5" height="51"/>
                                         <shadow key="shadow" blurRadius="20">
                                             <color key="color" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </shadow>
@@ -425,16 +451,39 @@
                                             <action selector="fwd:" target="3" id="uPX-Xa-CwO"/>
                                         </connections>
                                     </button>
+                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="aAq-uE-mLW" customClass="VLCImageButton">
+                                        <rect key="frame" x="272" y="13" width="32" height="40"/>
+                                        <shadow key="shadow" blurRadius="20">
+                                            <color key="color" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        </shadow>
+                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="arrow.trianglehead.clockwise" catalog="system" imagePosition="only" alignment="center" continuous="YES" imageScaling="proportionallyUpOrDown" inset="2" id="V5z-Pf-hj2">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <color key="contentTintColor" red="0.99999600649999998" green="1" blue="1" alpha="0.85338267140000001" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="32" id="OBA-WG-jaz"/>
+                                            <constraint firstAttribute="width" secondItem="aAq-uE-mLW" secondAttribute="height" multiplier="1:1" id="eMl-LK-UdE"/>
+                                            <constraint firstAttribute="width" secondItem="aAq-uE-mLW" secondAttribute="height" multiplier="1:1" id="g5c-kh-jsZ"/>
+                                        </constraints>
+                                        <connections>
+                                            <action selector="jumpForward:" target="3" id="5yg-na-tAR"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
                                 <visibilityPriorities>
                                     <integer value="1000"/>
                                     <integer value="1000"/>
                                     <integer value="1000"/>
+                                    <integer value="1000"/>
+                                    <integer value="1000"/>
                                 </visibilityPriorities>
                                 <customSpacing>
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
                                 </customSpacing>
                             </stackView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UoQ-34-Pox">
@@ -464,7 +513,7 @@
                                 </buttonCell>
                                 <color key="contentTintColor" red="0.99999600649999998" green="1" blue="1" alpha="0.85338267140000001" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
-                                    <action selector="togglePlaylist:" target="-2" id="WrP-vg-etw"/>
+                                    <action selector="togglePlayQueue:" target="-2" id="WrP-vg-etw"/>
                                 </connections>
                             </button>
                         </subviews>
@@ -480,7 +529,6 @@
                             <constraint firstItem="jnw-gL-nrF" firstAttribute="leading" secondItem="1tI-8K-e3c" secondAttribute="leading" id="Z37-TJ-B2D"/>
                             <constraint firstAttribute="trailing" secondItem="1GA-GG-Sdx" secondAttribute="trailing" id="dWk-NI-ekN"/>
                             <constraint firstItem="CvV-yX-Nbh" firstAttribute="centerY" secondItem="1tI-8K-e3c" secondAttribute="centerY" id="l2Y-IR-aus"/>
-                            <constraint firstItem="CrW-mq-gge" firstAttribute="bottom" secondItem="CvV-yX-Nbh" secondAttribute="top" constant="-20" id="mik-2t-Inh"/>
                             <constraint firstAttribute="bottom" secondItem="FGS-tq-54S" secondAttribute="bottom" id="ps4-nL-1Xc"/>
                             <constraint firstItem="FGS-tq-54S" firstAttribute="leading" secondItem="1tI-8K-e3c" secondAttribute="leading" id="qfd-OD-CHv"/>
                             <constraint firstAttribute="trailing" secondItem="Drq-if-dw4" secondAttribute="trailing" constant="20" id="rWa-NJ-Aju"/>
@@ -490,22 +538,44 @@
                     </view>
                     <color key="fillColor" red="0.0" green="0.0" blue="0.0" alpha="0.35060533940397354" colorSpace="custom" customColorSpace="sRGB"/>
                 </box>
-                <progressIndicator maxValue="100" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="xOQ-YR-iAc">
-                    <rect key="frame" x="344" y="156" width="32" height="32"/>
-                </progressIndicator>
+                <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CjJ-z0-ITu">
+                    <rect key="frame" x="324" y="292" width="72" height="32"/>
+                    <subviews>
+                        <progressIndicator maxValue="100" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="xOQ-YR-iAc">
+                            <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                        </progressIndicator>
+                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CrW-mq-gge">
+                            <rect key="frame" x="40" y="-6.5" width="32.5" height="45"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="32" id="wyi-7y-I1n"/>
+                                <constraint firstAttribute="height" constant="32" id="yeS-Wi-3sX"/>
+                            </constraints>
+                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" id="OcH-tO-P80">
+                                <imageReference key="image" image="pin.fill" catalog="system" symbolScale="large"/>
+                            </imageCell>
+                        </imageView>
+                    </subviews>
+                    <visibilityPriorities>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                    </visibilityPriorities>
+                    <customSpacing>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                    </customSpacing>
+                </stackView>
             </subviews>
             <constraints>
+                <constraint firstItem="D4V-Zd-qvB" firstAttribute="leading" secondItem="WRu-Ic-lQK" secondAttribute="leading" id="0vg-TG-O1c"/>
                 <constraint firstItem="MTR-ds-I8o" firstAttribute="top" secondItem="WRu-Ic-lQK" secondAttribute="top" id="2cq-kJ-XAR"/>
+                <constraint firstAttribute="bottom" secondItem="D4V-Zd-qvB" secondAttribute="bottom" id="D7Y-ck-iZE"/>
                 <constraint firstAttribute="trailing" secondItem="MTR-ds-I8o" secondAttribute="trailing" id="E2t-0S-hdB"/>
-                <constraint firstItem="D4V-Zd-qvB" firstAttribute="leading" secondItem="MTR-ds-I8o" secondAttribute="leading" id="LJf-4H-NXB"/>
-                <constraint firstItem="D4V-Zd-qvB" firstAttribute="top" secondItem="MTR-ds-I8o" secondAttribute="top" id="M6r-Gq-UVy"/>
-                <constraint firstItem="xOQ-YR-iAc" firstAttribute="top" secondItem="CvV-yX-Nbh" secondAttribute="bottom" constant="20" id="S0Y-3b-Ibd"/>
+                <constraint firstItem="CvV-yX-Nbh" firstAttribute="top" secondItem="CjJ-z0-ITu" secondAttribute="bottom" constant="20" id="R49-bc-DdH"/>
                 <constraint firstItem="MTR-ds-I8o" firstAttribute="leading" secondItem="WRu-Ic-lQK" secondAttribute="leading" id="TJ3-v0-eiw"/>
-                <constraint firstItem="D4V-Zd-qvB" firstAttribute="bottom" secondItem="MTR-ds-I8o" secondAttribute="bottom" id="cC2-Et-2M0"/>
-                <constraint firstItem="xOQ-YR-iAc" firstAttribute="centerX" secondItem="WRu-Ic-lQK" secondAttribute="centerX" id="enR-Xo-ume"/>
-                <constraint firstItem="1GA-GG-Sdx" firstAttribute="top" relation="greaterThanOrEqual" secondItem="xOQ-YR-iAc" secondAttribute="bottom" constant="20" id="jM9-dz-8jm"/>
+                <constraint firstAttribute="trailing" secondItem="D4V-Zd-qvB" secondAttribute="trailing" id="XP7-9K-6UE"/>
+                <constraint firstItem="CjJ-z0-ITu" firstAttribute="centerX" secondItem="CvV-yX-Nbh" secondAttribute="centerX" id="i8u-sK-BUl"/>
                 <constraint firstAttribute="bottom" secondItem="MTR-ds-I8o" secondAttribute="bottom" id="mbp-Lj-iuX"/>
-                <constraint firstItem="D4V-Zd-qvB" firstAttribute="trailing" secondItem="MTR-ds-I8o" secondAttribute="trailing" id="uy6-SD-44y"/>
+                <constraint firstItem="D4V-Zd-qvB" firstAttribute="top" secondItem="WRu-Ic-lQK" secondAttribute="top" id="n1X-TQ-EW3"/>
             </constraints>
             <point key="canvasLocation" x="66" y="-232"/>
         </customView>
@@ -514,10 +584,12 @@
         <image name="NSLeftFacingTriangleTemplate" width="12" height="17"/>
         <image name="NSListViewTemplate" width="21" height="15"/>
         <image name="VLCPauseTemplate" width="128" height="128"/>
+        <image name="arrow.trianglehead.clockwise" catalog="system" width="15" height="17"/>
+        <image name="arrow.trianglehead.counterclockwise" catalog="system" width="15" height="17"/>
         <image name="arrow.up.left.and.arrow.down.right" catalog="system" width="16" height="15"/>
-        <image name="backward.fill" catalog="system" width="19" height="12"/>
+        <image name="backward.fill" catalog="system" width="20" height="12"/>
         <image name="bookmark.circle" catalog="system" width="15" height="15"/>
-        <image name="forward.fill" catalog="system" width="19" height="12"/>
+        <image name="forward.fill" catalog="system" width="20" height="12"/>
         <image name="photo.tv" catalog="system" width="19" height="15"/>
         <image name="pin.fill" catalog="system" width="19" height="22"/>
         <image name="pip.enter" catalog="system" width="20" height="16"/>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCMainVideoViewAudioMediaDecorativeView.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCMainVideoViewAudioMediaDecorativeView.xib Changed

@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment version="101000" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="WRu-Ic-lQK" customClass="VLCMainVideoViewAudioMediaDecorativeView">
-            <rect key="frame" x="0.0" y="0.0" width="720" height="480"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+        <customView horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="WRu-Ic-lQK" customClass="VLCMainVideoViewAudioMediaDecorativeView">
+            <rect key="frame" x="0.0" y="0.0" width="316" height="336"/>
             <subviews>
-                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cDv-dn-65H">
-                    <rect key="frame" x="0.0" y="0.0" width="720" height="480"/>
+                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="cDv-dn-65H">
+                    <rect key="frame" x="0.0" y="0.0" width="316" height="336"/>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="noart" id="3lz-lJ-nIL"/>
                 </imageView>
-                <visualEffectView blendingMode="withinWindow" material="HUDWindow" state="active" translatesAutoresizingMaskIntoConstraints="NO" id="D1e-fS-bwO">
-                    <rect key="frame" x="0.0" y="0.0" width="720" height="480"/>
+                <visualEffectView horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" blendingMode="withinWindow" material="HUDWindow" state="active" translatesAutoresizingMaskIntoConstraints="NO" id="D1e-fS-bwO">
+                    <rect key="frame" x="0.0" y="0.0" width="316" height="336"/>
                 </visualEffectView>
-                <imageView wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="40P-sL-Mzq">
-                    <rect key="frame" x="232" y="112" width="256" height="256"/>
+                <imageView wantsLayer="YES" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="40P-sL-Mzq">
+                    <rect key="frame" x="95" y="105" width="126" height="126"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="256" id="PdS-Zh-d9T"/>
                         <constraint firstAttribute="width" secondItem="40P-sL-Mzq" secondAttribute="height" multiplier="1:1" id="dje-mE-ZfL"/>
+                        <constraint firstAttribute="height" relation="lessThanOrEqual" constant="256" id="m0P-G9-9hZ"/>
                     </constraints>
                     <shadow key="shadow" blurRadius="20">
                         <color key="color" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -34,20 +33,24 @@
             </subviews>
             <constraints>
                 <constraint firstItem="40P-sL-Mzq" firstAttribute="centerX" secondItem="WRu-Ic-lQK" secondAttribute="centerX" id="4Ib-c0-egD"/>
+                <constraint firstItem="40P-sL-Mzq" firstAttribute="bottom" relation="lessThanOrEqual" secondItem="D1e-fS-bwO" secondAttribute="bottom" constant="-20" id="DHs-x0-cB0"/>
                 <constraint firstAttribute="trailing" secondItem="D1e-fS-bwO" secondAttribute="trailing" id="J68-x2-cY5"/>
                 <constraint firstItem="D1e-fS-bwO" firstAttribute="leading" secondItem="WRu-Ic-lQK" secondAttribute="leading" id="KBI-Gr-tTT"/>
+                <constraint firstItem="40P-sL-Mzq" firstAttribute="width" relation="lessThanOrEqual" secondItem="D1e-fS-bwO" secondAttribute="width" multiplier="0.4" id="Kuw-Nx-ZmH"/>
                 <constraint firstAttribute="bottom" secondItem="cDv-dn-65H" secondAttribute="bottom" id="Sv1-Hf-eCe"/>
+                <constraint firstItem="40P-sL-Mzq" firstAttribute="top" relation="greaterThanOrEqual" secondItem="D1e-fS-bwO" secondAttribute="top" constant="20" id="TVt-Xt-aoo"/>
                 <constraint firstItem="cDv-dn-65H" firstAttribute="leading" secondItem="WRu-Ic-lQK" secondAttribute="leading" id="bZL-GN-AAt"/>
                 <constraint firstItem="cDv-dn-65H" firstAttribute="top" secondItem="WRu-Ic-lQK" secondAttribute="top" id="dvc-kq-jk8"/>
                 <constraint firstItem="D1e-fS-bwO" firstAttribute="top" secondItem="WRu-Ic-lQK" secondAttribute="top" id="eDP-U6-Qt6"/>
                 <constraint firstAttribute="bottom" secondItem="D1e-fS-bwO" secondAttribute="bottom" id="toU-5j-lin"/>
                 <constraint firstAttribute="trailing" secondItem="cDv-dn-65H" secondAttribute="trailing" id="vEl-zP-vj9"/>
-                <constraint firstItem="40P-sL-Mzq" firstAttribute="centerY" secondItem="WRu-Ic-lQK" secondAttribute="centerY" id="yFl-gc-ITT"/>
+                <constraint firstItem="40P-sL-Mzq" firstAttribute="centerY" secondItem="WRu-Ic-lQK" secondAttribute="centerY" priority="250" id="yFl-gc-ITT"/>
             </constraints>
             <connections>
                 <outlet property="backgroundCoverArtView" destination="cDv-dn-65H" id="bw2-8i-Xg6"/>
                 <outlet property="backgroundVisualEffectView" destination="D1e-fS-bwO" id="Jkh-ep-Wyn"/>
                 <outlet property="foregroundCoverArtView" destination="40P-sL-Mzq" id="nVl-ga-BoM"/>
+                <outlet property="foregroundViewTopConstraint" destination="TVt-Xt-aoo" id="OFh-5C-XZF"/>
             </connections>
             <point key="canvasLocation" x="66" y="-232"/>
         </customView>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/UI/VLCMediaSourceCollectionViewItem.xib -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCMediaSourceCollectionViewItem.xib Changed

@@ -7,8 +7,9 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="VLCMediaSourceCollectionViewItem">
             <connections>
-                <outlet property="addToPlaylistButton" destination="Ubz-8I-W2F" id="ywN-PH-QZt"/>
+                <outlet property="addToPlayQueueButton" destination="Ubz-8I-W2F" id="ywN-PH-QZt"/>
                 <outlet property="annotationTextField" destination="kHQ-HZ-YIi" id="XX9-Sc-oam"/>
+                <outlet property="highlightBox" destination="5Hg-64-CCp" id="Gc2-5h-Gj9"/>
                 <outlet property="mediaImageView" destination="2aB-sB-hfY" id="Sv0-G1-KNm"/>
                 <outlet property="mediaTitleTextField" destination="OBS-Eh-1mT" id="h1n-PU-IAx"/>
                 <outlet property="playInstantlyButton" destination="S3I-5Z-qgS" id="VV4-Lu-IMq"/>
@@ -51,7 +52,15 @@
                         <constraint firstItem="kHQ-HZ-YIi" firstAttribute="leading" secondItem="2aB-sB-hfY" secondAttribute="leading" constant="7" id="s9g-G1-oCF"/>
                     </constraints>
                 </customView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OBS-Eh-1mT">
+                <box boxType="custom" borderType="line" borderWidth="5" cornerRadius="4" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="5Hg-64-CCp">
+                    <rect key="frame" x="0.0" y="32" width="207" height="207"/>
+                    <view key="contentView" id="POR-eM-ISr">
+                        <rect key="frame" x="5" y="5" width="197" height="197"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    </view>
+                    <color key="borderColor" red="1" green="0.38123786450000002" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                </box>
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OBS-Eh-1mT">
                     <rect key="frame" x="-2" y="4" width="37" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="24" id="wMC-00-Vuv"/>
@@ -73,16 +82,20 @@
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                     <connections>
-                        <action selector="addToPlaylist:" target="-2" id="Lxc-A8-UMA"/>
+                        <action selector="addToPlayQueue:" target="-2" id="Lxc-A8-UMA"/>
                     </connections>
                 </button>
             </subviews>
             <constraints>
                 <constraint firstItem="2aB-sB-hfY" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="3Ah-0T-rA9"/>
                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="OBS-Eh-1mT" secondAttribute="trailing" id="457-oy-EbD"/>
+                <constraint firstItem="5Hg-64-CCp" firstAttribute="leading" secondItem="2aB-sB-hfY" secondAttribute="leading" id="5Ac-bl-b4l"/>
                 <constraint firstItem="Ubz-8I-W2F" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="7" id="8Qf-Un-Gdl"/>
                 <constraint firstAttribute="trailing" secondItem="Ubz-8I-W2F" secondAttribute="trailing" constant="14" id="ZVz-SL-rxZ"/>
                 <constraint firstAttribute="bottom" secondItem="OBS-Eh-1mT" secondAttribute="bottom" constant="4" id="d6E-7J-S2d"/>
+                <constraint firstItem="5Hg-64-CCp" firstAttribute="bottom" secondItem="2aB-sB-hfY" secondAttribute="bottom" id="eRq-Jx-FiY"/>
+                <constraint firstItem="5Hg-64-CCp" firstAttribute="trailing" secondItem="2aB-sB-hfY" secondAttribute="trailing" id="ffy-WV-Vlh"/>
+                <constraint firstItem="5Hg-64-CCp" firstAttribute="top" secondItem="2aB-sB-hfY" secondAttribute="top" id="kUZ-iy-kzW"/>
                 <constraint firstAttribute="trailing" secondItem="2aB-sB-hfY" secondAttribute="trailing" id="oZw-Ab-83p"/>
                 <constraint firstItem="2aB-sB-hfY" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="t9g-tX-AQX"/>
                 <constraint firstItem="OBS-Eh-1mT" firstAttribute="top" secondItem="2aB-sB-hfY" secondAttribute="bottom" constant="4" id="vJy-Kf-4Jh"/>

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/UI/VLCPlayQueueTableCellView.xib Added

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="VLCPlayQueueTableCellView"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView wantsLayer="YES" id="c22-O7-iKe" customClass="VLCPlayQueueTableCellView">
+            <rect key="frame" x="0.0" y="0.0" width="398" height="58"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0Ge-7z-bq6">
+                    <rect key="frame" x="97" y="1" width="245" height="56"/>
+                    <subviews>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ohB-P0-nCv">
+                            <rect key="frame" x="-2" y="40" width="249" height="16"/>
+                            <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="ZPw-XO-XD1">
+                                <font key="font" usesAppearanceFont="YES"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xJW-ps-ycn">
+                            <rect key="frame" x="-2" y="19" width="249" height="16"/>
+                            <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="aCe-ia-0Ww">
+                                <font key="font" usesAppearanceFont="YES"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TPv-k2-6XS">
+                            <rect key="frame" x="-2" y="0.0" width="249" height="14"/>
+                            <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="jZ4-pa-K3T">
+                                <font key="font" metaFont="smallSystem"/>
+                                <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                    </subviews>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="TPv-k2-6XS" secondAttribute="trailing" id="Bdm-3y-L6Y"/>
+                        <constraint firstAttribute="trailing" secondItem="xJW-ps-ycn" secondAttribute="trailing" id="Te0-Yn-6Bc"/>
+                        <constraint firstAttribute="trailing" secondItem="ohB-P0-nCv" secondAttribute="trailing" id="weY-Nx-VPO"/>
+                    </constraints>
+                    <visibilityPriorities>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                    </visibilityPriorities>
+                    <customSpacing>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                    </customSpacing>
+                </stackView>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ydb-7n-5Cd" customClass="VLCImageView">
+                    <rect key="frame" x="10" y="5" width="77" height="48"/>
+                    <constraints>
+                        <constraint firstAttribute="width" secondItem="Ydb-7n-5Cd" secondAttribute="height" multiplier="16:10" id="4aB-rs-m22"/>
+                    </constraints>
+                </customView>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mk2-5A-q4g">
+                    <rect key="frame" x="8" y="13" width="22" height="31"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="♪" id="mdz-SA-hCl">
+                        <font key="font" textStyle="largeTitle" name=".SFNS-Regular"/>
+                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="97z-d7-S3D" customClass="VLCImageView">
+                    <rect key="frame" x="39" y="5" width="48" height="48"/>
+                    <constraints>
+                        <constraint firstAttribute="width" secondItem="97z-d7-S3D" secondAttribute="height" multiplier="1:1" id="YBL-j9-anm"/>
+                    </constraints>
+                </customView>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Ha-ZH-fa9">
+                    <rect key="frame" x="350" y="21" width="40" height="16"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="36" id="0cB-ga-0Uw"/>
+                    </constraints>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Label" id="N0j-xB-3t9">
+                        <font key="font" usesAppearanceFont="YES"/>
+                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+            </subviews>
+            <constraints>
+                <constraint firstItem="Mk2-5A-q4g" firstAttribute="centerY" secondItem="Ydb-7n-5Cd" secondAttribute="centerY" id="7oz-36-KPx"/>
+                <constraint firstItem="Ydb-7n-5Cd" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="10" id="8hv-Qt-uAI"/>
+                <constraint firstItem="0Ge-7z-bq6" firstAttribute="centerY" secondItem="3Ha-ZH-fa9" secondAttribute="centerY" id="DpI-8u-rFu"/>
+                <constraint firstItem="0Ge-7z-bq6" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="EXo-Wn-Jh5"/>
+                <constraint firstItem="97z-d7-S3D" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="5" id="FbP-R4-bAA"/>
+                <constraint firstItem="Mk2-5A-q4g" firstAttribute="leading" secondItem="Ydb-7n-5Cd" secondAttribute="leading" id="S9m-bB-HBd"/>
+                <constraint firstAttribute="trailing" secondItem="3Ha-ZH-fa9" secondAttribute="trailing" constant="10" id="SVJ-UL-O5m"/>
+                <constraint firstAttribute="bottom" secondItem="97z-d7-S3D" secondAttribute="bottom" constant="5" id="XfR-Fd-n6o"/>
+                <constraint firstAttribute="bottom" secondItem="Ydb-7n-5Cd" secondAttribute="bottom" constant="5" id="aVd-Ld-lUH"/>
+                <constraint firstItem="0Ge-7z-bq6" firstAttribute="leading" secondItem="97z-d7-S3D" secondAttribute="trailing" constant="10" id="adC-9f-And"/>
+                <constraint firstItem="97z-d7-S3D" firstAttribute="trailing" secondItem="Ydb-7n-5Cd" secondAttribute="trailing" id="bzC-Km-KOo"/>
+                <constraint firstItem="0Ge-7z-bq6" firstAttribute="trailing" secondItem="3Ha-ZH-fa9" secondAttribute="leading" constant="-10" id="dSC-Pq-ml2"/>
+                <constraint firstItem="Ydb-7n-5Cd" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="5" id="iPZ-zR-jTv"/>
+            </constraints>
+            <connections>
+                <outlet property="artistTextField" destination="TPv-k2-6XS" id="jJV-4C-USY"/>
+                <outlet property="audioArtworkImageView" destination="97z-d7-S3D" id="ZDl-d6-j29"/>
+                <outlet property="audioMediaTypeIndicator" destination="Mk2-5A-q4g" id="wal-6y-aRv"/>
+                <outlet property="durationTextField" destination="3Ha-ZH-fa9" id="vbh-oE-Afj"/>
+                <outlet property="mediaImageView" destination="Ydb-7n-5Cd" id="MlE-WQ-VB9"/>
+                <outlet property="mediaTitleTextField" destination="ohB-P0-nCv" id="iS6-q4-h8I"/>
+                <outlet property="secondaryMediaTitleTextField" destination="xJW-ps-ycn" id="KpP-ao-QlW"/>
+            </connections>
+            <point key="canvasLocation" x="98" y="50"/>
+        </customView>
+    </objects>
+</document>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/coreinteraction/VLCHotkeysController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/coreinteraction/VLCHotkeysController.m Changed

@@ -26,8 +26,8 @@
 
 #import "main/VLCMain.h"
 #import "extensions/NSString+Helpers.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 
 #import <vlc_configuration.h>
 #import <vlc_actions.h>
@@ -79,7 +79,7 @@
 
 - (BOOL)handleVideoOutputKeyDown:(id)anEvent forVideoOutput:(vout_thread_t *)p_vout
 {
-    VLCPlayerController * const playerController = VLCMain.sharedInstance.playlistController.playerController;
+    VLCPlayerController * const playerController = VLCMain.sharedInstance.playQueueController.playerController;
     unichar key = 0;
     vlc_value_t val;
     NSEventModifierFlags i_pressed_modifiers = 0;
@@ -173,7 +173,7 @@
         unichar key = characters characterAtIndex: 0;
 
         if (key) {
-            VLCPlayerController * const playerController = VLCMain.sharedInstance.playlistController.playerController;
+            VLCPlayerController * const playerController = VLCMain.sharedInstance.playQueueController.playerController;
             vout_thread_t * const p_vout = playerController.mainVideoOutputThread;
             if (p_vout != NULL) {
                 /* Escape */
@@ -221,7 +221,7 @@
 
         /* handle Lion's default key combo for fullscreen-toggle in addition to our own hotkeys */
         if (key == 'f' && i_pressed_modifiers & NSControlKeyMask && i_pressed_modifiers & NSCommandKeyMask) {
-            VLCMain.sharedInstance.playlistController.playerController toggleFullscreen;
+            VLCMain.sharedInstance.playQueueController.playerController toggleFullscreen;
             return YES;
         }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/coreinteraction/VLCVideoFilterHelper.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/coreinteraction/VLCVideoFilterHelper.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/extensions/NSColor+VLCAdditions.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/extensions/NSColor+VLCAdditions.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/extensions/NSColor+VLCAdditions.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/extensions/NSColor+VLCAdditions.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/extensions/NSString+Helpers.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/extensions/NSString+Helpers.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/extensions/NSString+Helpers.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/extensions/NSString+Helpers.m Changed

@@ -198,6 +198,38 @@
     return NSString stringWithString:wrapped_string;
 }
 
+- (NSString *)stringWithIncrementedTrailingNumber
+{
+    // Regular expression pattern to match a number in parentheses at the end of the string.
+    //   \$    - matches '('
+    //   (\\d+) - matches one or more digits
+    //   \$    - matches ')'
+    //   $      - position at the end of the string
+    NSError *error = nil;
+    NSRegularExpression * const regex =
+        NSRegularExpression regularExpressionWithPattern:@"\$(\\d+)\$$" options:0 error:&error;
+    if (error) {
+        NSLog(@"Regex creation error: %@", error);
+        return self;
+    }
+
+    const NSRange fullRange = NSMakeRange(0, self.length);
+    NSTextCheckingResult * const match = regex firstMatchInString:self options:0 range:fullRange;
+
+    if (match == nil) {
+        return self stringByAppendingString:@" (2)";
+    }
+    // Extract the captured digits.
+    const NSRange numberRange = match rangeAtIndex:1;
+    NSString * const numberString = self substringWithRange:numberRange;
+    const NSInteger number = numberString.integerValue + 1;
+
+    // Replace the old number with the incremented number.
+    NSMutableString * const result = self.mutableCopy;
+    result replaceCharactersInRange:numberRange withString:NSString stringWithFormat:@"%ld", number;
+    return result.copy;
+}
+
 @end
 
 #pragma mark -

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/extensions/NSView+VLCAdditions.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/extensions/NSView+VLCAdditions.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/extensions/NSView+VLCAdditions.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/extensions/NSView+VLCAdditions.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCInputItem.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCInputItem.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCInputItem.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCInputItem.m Changed

@@ -635,6 +635,22 @@
     NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs:@pathUrl;
 }
 
+- (nullable NSArray<NSString *> *)options
+{
+    if (_vlcInputItem == NULL) {
+        return nil;
+    }
+
+    const int i_options = _vlcInputItem->i_options;
+    NSMutableArray * const options = NSMutableArray arrayWithCapacity:i_options;
+    for (NSUInteger i = 0; i < i_options; ++i) {
+        const char * const psz_option = _vlcInputItem->ppsz_optionsi;
+        NSString * const option = NSTR(psz_option);
+        options addObject:option;
+    }
+    return options.copy;
+}
+
 @end
 
 
@@ -736,7 +752,7 @@
 - (NSString *)description
 {
     NSString *inputItemName;
-    if (_vlcInputItemNode->p_item)
+    if (_vlcInputItemNode && _vlcInputItemNode->p_item)
         inputItemName = toNSStr(_vlcInputItemNode->p_item->psz_name);
     else
         inputItemName = @"p_item == nil";
@@ -745,11 +761,14 @@
 
 - (int)numberOfChildren
 {
-    return _vlcInputItemNode->i_children;
+    return _vlcInputItemNode ? _vlcInputItemNode->i_children : 0;
 }
 
-- (NSArray<VLCInputNode *> *)children
+- (nullable NSArray<VLCInputNode *> *)children
 {
+    if (_vlcInputItemNode == NULL) {
+        return nil;
+    }
     NSMutableArray *mutableArray = NSMutableArray alloc initWithCapacity:_vlcInputItemNode->i_children;
     for (int i = 0; i < _vlcInputItemNode->i_children; i++) {
         VLCInputNode *inputNode = VLCInputNode alloc initWithInputNode:_vlcInputItemNode->pp_childreni;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryAbstractGroupingDataSource.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryAbstractGroupingDataSource.m Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryAbstractMediaLibrarySegmentViewController.h Added

@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * VLCLibraryAbstractMediaLibrarySegmentViewController.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCLibraryAbstractSegmentViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol VLCLibraryDataSource;
+
+@interface VLCLibraryAbstractMediaLibrarySegmentViewController : VLCLibraryAbstractSegmentViewController
+
+@property (readonly) BOOL connected; // Meaning to library model notifications
+
+// Implement getters for these properties in subclass
+@property (readonly) NSArray<NSLayoutConstraint *> *placeholderImageViewSizeConstraints;
+@property (readonly) id<VLCLibraryDataSource> currentDataSource;
+
+- (void)connect;
+- (void)disconnect;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryAbstractMediaLibrarySegmentViewController.m Added

@@ -0,0 +1,53 @@
+/*****************************************************************************
+ * VLCLibraryAbstractMediaLibrarySegmentViewController.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCLibraryAbstractMediaLibrarySegmentViewController.h"
+
+#import "library/VLCLibraryDataSource.h"
+
+@implementation VLCLibraryAbstractMediaLibrarySegmentViewController
+
+- (id<VLCLibraryDataSource>)currentDataSource
+{
+    return nil;
+}
+
+// A note on the connected property.
+// This does not necessarily reflect the connection state of the data sources themselves.
+// We may disconnect the data sources via the view controllers when we detect that long loads are
+// taking place. However, keeping the connection state in the view controller allows us to
+// reconnect the data sources once the long loads are over (or not reconnect them, if the view
+// controller was originally disconnected, for example if the embedded video view is open)
+
+- (void)connect
+{
+    self.currentDataSource connect;
+    _connected = YES;
+}
+
+- (void)disconnect
+{
+    self.currentDataSource disconnect;
+    _connected = NO;
+}
+
+@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryAbstractSegmentViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryAbstractSegmentViewController.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryAbstractSegmentViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryAbstractSegmentViewController.m Changed

@@ -22,7 +22,6 @@
 
 #import "VLCLibraryAbstractSegmentViewController.h"
 
-#import "library/VLCLibraryDataSource.h"
 #import "library/VLCLibraryWindow.h"
 
 @implementation VLCLibraryAbstractSegmentViewController
@@ -41,29 +40,4 @@
     return self;
 }
 
-- (id<VLCLibraryDataSource>)currentDataSource
-{
-    self doesNotRecognizeSelector:_cmd;
-    return nil;
-}
-
-// A note on the connected property.
-// This does not necessarily reflect the connection state of the data sources themselves.
-// We may disconnect the data sources via the view controllers when we detect that long loads are
-// taking place. However, keeping the connection state in the view controller allows us to
-// reconnect the data sources once the long loads are over (or not reconnect them, if the view
-// controller was originally disconnected, for example if the embedded video view is open)
-
-- (void)connect
-{
-    self.currentDataSource connect;
-    _connected = YES;
-}
-
-- (void)disconnect
-{
-    self.currentDataSource disconnect;
-    _connected = NO;
-}
-
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryCarouselViewItemView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCarouselViewItemView.m Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCollectionView.h Added

@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * VLCLibraryCollectionView.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString * const VLCLibraryCollectionViewItemAdjustmentBigger;
+extern NSString * const VLCLibraryCollectionViewItemAdjustmentSmaller;
+
+@interface VLCLibraryCollectionView : NSCollectionView
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCollectionView.m Added

@@ -0,0 +1,112 @@
+/*****************************************************************************
+ * VLCLibraryCollectionView.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCLibraryCollectionView.h"
+
+#import "library/VLCLibraryCollectionViewDelegate.h"
+#import "library/VLCLibraryCollectionViewFlowLayout.h"
+#import "library/VLCLibraryUIUnits.h"
+
+NSString * const VLCLibraryCollectionViewItemAdjustmentBigger = @"VLCLibraryCollectionViewItemAdjustmentBigger";
+NSString * const VLCLibraryCollectionViewItemAdjustmentSmaller = @"VLCLibraryCollectionViewItemAdjustmentSmaller";
+
+@implementation VLCLibraryCollectionView
+
+- (void)layout
+{
+    // Manually invalidate the collection view layout when we are going to layout the view; this
+    // fixes issues with the collection view item size calculations not always being updated when
+    // they should be
+    self.collectionViewLayout invalidateLayout;
+    super layout;
+}
+
+- (void)keyDown:(NSEvent *)event
+{
+    if (!self.collectionViewLayout isKindOfClass:VLCLibraryCollectionViewFlowLayout.class ||
+        !self.delegate isKindOfClass:VLCLibraryCollectionViewDelegate.class ||
+        !(event.modifierFlags & NSCommandKeyMask)) {
+        return;
+    }
+
+    const unichar key = event.charactersIgnoringModifiers.lowercaseString characterAtIndex:0;
+    if (key != '+' && key != '-') {
+        return;
+    }
+
+    VLCLibraryCollectionViewFlowLayout * const layout =
+        (VLCLibraryCollectionViewFlowLayout *)self.collectionViewLayout;
+    VLCLibraryCollectionViewDelegate * const delegate =
+        (VLCLibraryCollectionViewDelegate *)self.delegate;
+    VLCCollectionViewItemSizing * const currentRowItemSizing =
+        VLCLibraryUIUnits adjustedItemSizingForCollectionView:self
+                                                    withLayout:layout
+                                          withItemsAspectRatio:delegate.itemsAspectRatio;
+    if (currentRowItemSizing.rowItemCount <= VLCLibraryUIUnits.collectionViewMinItemsInRow && key == '+') {
+        return;
+    } else if (currentRowItemSizing.itemSize.width <= VLCLibraryUIUnits.collectionViewItemMinimumWidth && key == '-') {
+        return;
+    }
+
+    NSUserDefaults * const defaults = NSUserDefaults.standardUserDefaults;
+    NSInteger collectionViewAdjustment =
+        defaults integerForKey:VLCLibraryCollectionViewItemAdjustmentKey;
+    NSNotification *notification;
+    if (key == '+') {
+        collectionViewAdjustment--;
+        notification =
+            NSNotification notificationWithName:VLCLibraryCollectionViewItemAdjustmentBigger
+                                          object:self;
+    } else if (key == '-') {
+        if (currentRowItemSizing.rowItemCount == VLCLibraryUIUnits.collectionViewMinItemsInRow && currentRowItemSizing.unclampedRowItemCount <= VLCLibraryUIUnits.collectionViewMinItemsInRow) {
+            // The adjustment works independently of the size of the collection view, which can lead
+            // to situations where the adjustment is very negative and is being clamped to ensure we
+            // do not go below the minimum items in row value. However, that means that when trying
+            // to make collection view items smaller via a larger adjustment value, the user could
+            // press CMD - multiple times before any change is visible to them (this can happen when
+            // the collection view size has shrunk, for instance).
+            //
+            // To work around this we make a big adjustment that immediately provides visual
+            // feedback. To do this we calculate what the adjustment must be to get the row item
+            // count to be the minimum row item count value + 1.
+            //
+            // The unclampedRowItemCount is the number of items in row post-adjustment, so we need
+            // to retrieve the original, unclamped, unadjusted row item count. We then work out the
+            // difference between the unclamped&unadjusted row item count and the minimum row item
+            // count:
+            //   <adjustment> = <min items in row> - (<unclamped row item count> - <old adjustment>)
+            //
+            // To finish, we add 1 to visually change the row item count and show more items.
+            collectionViewAdjustment = VLCLibraryUIUnits.collectionViewMinItemsInRow - (currentRowItemSizing.unclampedRowItemCount - collectionViewAdjustment) + 1;
+        } else {
+            ++collectionViewAdjustment;
+        }
+        notification =
+            NSNotification notificationWithName:VLCLibraryCollectionViewItemAdjustmentSmaller
+                                          object:self;
+    }
+    defaults setInteger:collectionViewAdjustment forKey:VLCLibraryCollectionViewItemAdjustmentKey;
+    NSNotificationCenter.defaultCenter postNotification:notification;
+    self.collectionViewLayout invalidateLayout;
+}
+
+@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewDelegate.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewDelegate.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewFlowLayout.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewFlowLayout.m Changed

@@ -153,6 +153,21 @@
     return _prevProvidedAnimationStep;
 }
 
+- (CGFloat)finalExpandedHeight
+{
+    switch(_animationType) {
+        case VLCExpandAnimationTypeHorizontalMedium:
+            return VLCLibraryUIUnits.mediumDetailSupplementaryViewCollectionViewWidth;
+        case VLCExpandAnimationTypeHorizontalLarge:
+            return VLCLibraryUIUnits.largeDetailSupplementaryViewCollectionViewWidth;
+        case VLCExpandAnimationTypeVerticalLarge:
+            return VLCLibraryUIUnits.largeDetailSupplementaryViewCollectionViewHeight;
+        case VLCExpandAnimationTypeVerticalMedium:
+        default:
+            return VLCLibraryUIUnits.mediumDetailSupplementaryViewCollectionViewHeight;
+    }
+}
+
 #pragma mark - Public methods
 - (void)expandDetailSectionAtIndex:(NSIndexPath *)indexPath
 {
@@ -172,6 +187,10 @@
 
     if (!newItemOnSameRow) {
         self animateDetailViewWithAnimation:VLCDetailViewAnimationTypeExpand;
+
+        NSRect frame = self.collectionView layoutAttributesForItemAtIndexPath:indexPath.frame;
+        frame.size.height += self finalExpandedHeight + VLCLibraryUIUnits.largeSpacing;
+        self.collectionView.animator scrollRectToVisible:frame;
     } else {
         _animationIsCollapse = NO;
     }
@@ -433,6 +452,10 @@
                                             CVOptionFlags *flagsOut,
                                             void *displayLinkContext)
 {
+    if (displayLinkContext == nil) {
+        return kCVReturnError;
+    }
+
     VLCLibraryCollectionViewFlowLayout *bridgedSelf = (__bridge VLCLibraryCollectionViewFlowLayout *)displayLinkContext;
     BOOL animationFinished = NO;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewItem.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewItem.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewItem.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewItem.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewMediaItemListSupplementaryDetailView.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.h Changed

@@ -21,6 +21,7 @@
  *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
+
 #import "VLCLibraryCollectionViewSupplementaryDetailView.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -35,13 +36,29 @@
 @property (readwrite, weak) IBOutlet NSTextField *mediaItemTitleTextField;
 @property (readwrite, weak) IBOutlet NSButton *mediaItemPrimaryDetailButton;
 @property (readwrite, weak) IBOutlet NSButton *mediaItemSecondaryDetailButton;
-@property (readwrite, weak) IBOutlet NSTextField *mediaItemYearAndDurationTextField;
+@property (readwrite, weak) IBOutlet NSButton *mediaItemFavoriteButton;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemYearAndDurationAndTypeTextField;
+@property (readwrite, weak) IBOutlet NSLevelIndicator *mediaItemRatingIndicator;
 @property (readwrite, weak) IBOutlet NSTextField *mediaItemFileNameTextField;
 @property (readwrite, weak) IBOutlet NSTextField *mediaItemPathTextField;
-@property (readwrite, weak) IBOutlet NSStackView *mediaItemLabelsStackView;
+@property (readwrite, weak) IBOutlet NSButton *mediaItemPathTitleButton;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemLabelsTitleTextField;
 @property (readwrite, weak) IBOutlet NSTextField *mediaItemLabelsTextField;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemLastPlayedTextField;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemLastPlayedTitleTextField;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemCopyrightTextField;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemCopyrightTitleTextField;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemContentDescriptionTextField;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemContentDescriptionTitleTextField;
 @property (readwrite, weak) IBOutlet VLCImageView *mediaItemArtworkImageView;
 @property (readwrite, weak) IBOutlet NSButton *playMediaItemButton;
+@property (readwrite, weak) IBOutlet NSBox *mediaItemSummarySeparator;
+@property (readwrite, weak) IBOutlet NSStackView *mediaItemSummaryStackView;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemSummaryTextField;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemDirectorTextField;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemDirectorTitleTextField;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemActorsTextField;
+@property (readwrite, weak) IBOutlet NSTextField *mediaItemActorsTitleTextField;
 
 - (IBAction)playAction:(id)sender;
 - (IBAction)enqueueAction:(id)sender;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m Changed

@@ -61,28 +61,42 @@
     }
 }
 
-- (NSString *)formattedYearAndDurationString
+- (NSString *)formattedYearAndDurationAndTypeString
 {
     if (self.representedItem == nil) {
         return @"";
     }
 
     const VLCMediaLibraryMediaItem * const actualItem = self.representedItem.item;
+    NSMutableArray<NSString *> * const strings = NSMutableArray.array;
 
     if (actualItem.year > 0) {
-        return NSString stringWithFormat:@"%u · %@", actualItem.year, actualItem.durationString;
+        strings addObject:NSString stringWithFormat:@"%u", actualItem.year;
     } else if (actualItem.files.count > 0) {
         VLCMediaLibraryFile * const firstFile = actualItem.files.firstObject;
         const time_t fileLastModTime = firstFile.lastModificationDate;
 
         if (fileLastModTime > 0) {
             NSDate * const lastModDate = NSDate dateWithTimeIntervalSince1970:fileLastModTime;
-            NSDateComponents * const components = NSCalendar currentCalendar components:NSCalendarUnitYear fromDate:lastModDate;
-            return NSString stringWithFormat:@"%ld · %@", components.year, actualItem.durationString;
+            NSDateComponents * const components =
+                NSCalendar currentCalendar components:NSCalendarUnitYear fromDate:lastModDate;
+            strings addObject:NSString stringWithFormat:@"%ld", components.year;
         }
     }
 
-    return actualItem.durationString;
+    if (!actualItem.primaryDetailString isEqualToString:actualItem.durationString) {
+        strings addObject:actualItem.durationString;
+    }
+
+    strings addObjectsFromArray:@actualItem.readableMediaType, actualItem.readableMediaSubType;
+
+    VLCInputItem * const inputItem = actualItem.inputItem;
+    NSString * const discNumber = inputItem.discNumber;
+    if (!discNumber isEqualToString:@"") {
+        strings addObject:NSString stringWithFormat:@"%@ %@", _NS("Disc"), discNumber;
+    }
+
+    return strings componentsJoinedByString:@" · ";
 }
 
 - (void)updateRepresentation
@@ -94,7 +108,7 @@
     _mediaItemTitleTextField.stringValue = actualItem.displayString;
     _mediaItemPrimaryDetailButton.title = actualItem.primaryDetailString;
     _mediaItemSecondaryDetailButton.title = actualItem.secondaryDetailString;
-    _mediaItemYearAndDurationTextField.stringValue = self formattedYearAndDurationString;
+    _mediaItemYearAndDurationAndTypeTextField.stringValue = self formattedYearAndDurationAndTypeString;
     _mediaItemFileNameTextField.stringValue = actualItem.inputItem.name;
     _mediaItemPathTextField.stringValue = actualItem.inputItem.decodedMRL;
 
@@ -110,17 +124,75 @@
         self.mediaItemPrimaryDetailButton.contentTintColor = primaryDetailButtonColor;
         self.mediaItemSecondaryDetailButton.contentTintColor = secondaryDetailButtonColor;
     }
+    self.mediaItemFavoriteButton.state = actualItem.favorited ? NSOnState : NSOffState;
+
+    self.mediaItemPrimaryDetailButton.target = self;
+    self.mediaItemSecondaryDetailButton.target = self;
+    self.mediaItemFavoriteButton.target = self;
+
     self.mediaItemPrimaryDetailButton.action = @selector(primaryDetailAction:);
     self.mediaItemSecondaryDetailButton.action = @selector(secondaryDetailAction:);
+    self.mediaItemFavoriteButton.action = @selector(favoriteAction:);
+
+    const double ratingControlMax = self.mediaItemRatingIndicator.maxValue;
+    const double proportionOfMaxRating = 100 / ratingControlMax;
+    self.mediaItemRatingIndicator.doubleValue = (double)actualItem.rating / proportionOfMaxRating;
 
-    NSArray<NSString *> * const mediaItemLabels = self.representedItem.item.labels;
-    self.mediaItemLabelsStackView.hidden = mediaItemLabels.count == 0;
-    if (!self.mediaItemLabelsStackView.hidden) {
+    NSArray<NSString *> * const mediaItemLabels = actualItem.labels;
+    self.mediaItemLabelsTextField.hidden = mediaItemLabels.count == 0;
+    self.mediaItemLabelsTitleTextField.hidden = self.mediaItemLabelsTextField.hidden;
+    if (!self.mediaItemLabelsTextField.hidden) {
         self.mediaItemLabelsTextField.stringValue = mediaItemLabels componentsJoinedByString:@", ";
     }
 
+    self.mediaItemLastPlayedTextField.hidden = actualItem.lastPlayedDate == 0;
+    self.mediaItemLastPlayedTitleTextField.hidden = self.mediaItemLastPlayedTextField.hidden;
+    if (actualItem.lastPlayedDate > 0) {
+        NSDate * const lastPlayedDate =
+            NSDate dateWithTimeIntervalSince1970:actualItem.lastPlayedDate;
+        NSDateFormatter * const formatter = NSDateFormatter alloc init;
+        formatter.dateStyle = NSDateFormatterFullStyle;
+        formatter.timeStyle = NSDateFormatterFullStyle;
+        NSString * const lastPlayedString = formatter stringFromDate:lastPlayedDate;
+        self.mediaItemLastPlayedTextField.stringValue = lastPlayedString;
+    }
+
+    NSString * const summary = actualItem.movie != nil
+        ? actualItem.movie.summary : actualItem.showEpisode != nil
+            ? actualItem.showEpisode.summary : @"";
+    self.mediaItemSummaryStackView.hidden = summary == nil || summary isEqualToString:@"";
+    self.mediaItemSummarySeparator.hidden = self.mediaItemSummaryStackView.hidden;
+    self.mediaItemSummaryTextField.stringValue = summary;
+
+    VLCInputItem * const inputItem = actualItem.inputItem;
+
+    NSString * const copyright = inputItem.copyright;
+    self.mediaItemCopyrightTextField.hidden = copyright isEqualToString:@"";
+    self.mediaItemCopyrightTitleTextField.hidden = self.mediaItemCopyrightTextField.hidden;
+    self.mediaItemCopyrightTextField.stringValue = copyright;
+
+    NSString * const contentDescription = inputItem.contentDescription;
+    self.mediaItemContentDescriptionTextField.hidden = contentDescription isEqualToString:@"";
+    self.mediaItemContentDescriptionTitleTextField.hidden = self.mediaItemContentDescriptionTextField.hidden;
+    self.mediaItemContentDescriptionTextField.stringValue = contentDescription;
+
+    NSString * const director = inputItem.director;
+    self.mediaItemDirectorTextField.hidden = inputItem.director isEqualToString:@"";
+    self.mediaItemDirectorTitleTextField.hidden = self.mediaItemDirectorTextField.hidden;
+    self.mediaItemDirectorTextField.stringValue = director;
+
+    NSString * const actors = inputItem.actors;
+    self.mediaItemActorsTextField.hidden = inputItem.actors isEqualToString:@"";
+    self.mediaItemActorsTitleTextField.hidden = self.mediaItemActorsTextField.hidden;
+    self.mediaItemActorsTextField.stringValue = actors;
+
+    __weak typeof(self) weakSelf = self;
     VLCLibraryImageCache thumbnailForLibraryItem:actualItem withCompletion:^(NSImage * const thumbnail) {
-        self->_mediaItemArtworkImageView.image = thumbnail;
+        if (!weakSelf || weakSelf.representedItem.item != actualItem) {
+            return;
+        }
+        VLCLibraryCollectionViewMediaItemSupplementaryDetailView * const strongSelf = weakSelf;
+        strongSelf->_mediaItemArtworkImageView.image = thumbnail;
     };
 }
 
@@ -158,4 +230,41 @@
     libraryWindow presentLibraryItem:libraryItem;
 }
 
+- (IBAction)favoriteAction:(id)sender
+{
+    VLCMediaLibraryMediaItem * const mediaItem = self.representedItem.item;
+    const int64_t mediaItemId = mediaItem.libraryID;
+    const bool b_favorite = mediaItem.favorited;
+    vlc_medialibrary_t * const p_ml = vlc_ml_instance_get(getIntf());
+    const int result = vlc_ml_media_set_favorite(p_ml, mediaItemId, !b_favorite);
+
+    if (result == VLC_SUCCESS) {
+        VLCMediaLibraryMediaItem * const updatedItem =
+            VLCMediaLibraryMediaItem mediaItemForLibraryID:mediaItemId;
+        self.representedItem =
+            VLCLibraryRepresentedItem alloc initWithItem:updatedItem
+                                                 parentType:self.representedItem.parentType;
+
+    } else {
+        NSLog(@"Unable to set favorite status of media item: %lli", mediaItemId);
+    }
+}
+
+- (IBAction)ratingAction:(id)sender
+{
+    NSLevelIndicator * const control = (NSLevelIndicator *)sender;
+    if (control == nil) {
+        return;
+    }
+
+    const double proportion = 100 / control.maxValue;
+    const double rating = control.doubleValue * proportion;
+    ((VLCMediaLibraryMediaItem *)self.representedItem.item).rating = (int)rating;
+}
+
+- (IBAction)openPathAction:(id)sender
+{
+    self.representedItem revealInFinder;
+}
+
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewSupplementaryElementView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryCollectionViewSupplementaryElementView.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryController.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryController.m Changed

@@ -24,12 +24,13 @@
 
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 
 #import "library/VLCInputItem.h"
 #import "library/VLCLibraryModel.h"
 #import "library/VLCLibraryDataTypes.h"
+#import "library/VLCMediaLibraryFolderObserver.h"
 
 #import <vlc_media_library.h>
 
@@ -60,6 +61,10 @@
                                       selector:@selector(playbackStateChanged:)
                                           name:VLCPlayerStateChanged
                                         object:nil;
+        defaultNotificationCenter addObserver:self
+                                      selector:@selector(monitoredFolderChanged:)
+                                          name:VLCMediaLibraryFolderFSEvent
+                                        object:nil;
     }
     return self;
 }
@@ -87,7 +92,13 @@
     }
 }
 
-- (int)appendItemToPlaylist:(VLCMediaLibraryMediaItem *)mediaItem playImmediately:(BOOL)playImmediately
+- (void)monitoredFolderChanged:(NSNotification *)notification
+{
+    NSURL * const folderURL = (NSURL *)notification.object;
+    self reloadFolderWithFileURL:folderURL;
+}
+
+- (int)appendItemToPlayQueue:(VLCMediaLibraryMediaItem *)mediaItem playImmediately:(BOOL)playImmediately
 {
     if (!_p_libraryInstance) {
         return VLC_EACCES;
@@ -97,12 +108,12 @@
         msg_Err(getIntf(), "No input item found for media id %lli", mediaItem.libraryID);
         return VLC_ENOENT;
     }
-    int ret = VLCMain.sharedInstance.playlistController addInputItem:p_inputItem atPosition:-1 startPlayback:playImmediately;
+    int ret = VLCMain.sharedInstance.playQueueController addInputItem:p_inputItem atPosition:-1 startPlayback:playImmediately;
     input_item_Release(p_inputItem);
     return ret;
 }
 
-- (int)appendItemsToPlaylist:(NSArray <VLCMediaLibraryMediaItem *> *)mediaItemArray playFirstItemImmediately:(BOOL)playFirstItemImmediately
+- (int)appendItemsToPlayQueue:(NSArray <VLCMediaLibraryMediaItem *> *)mediaItemArray playFirstItemImmediately:(BOOL)playFirstItemImmediately
 {
     if (!_p_libraryInstance) {
         return VLC_EACCES;
@@ -112,9 +123,9 @@
     int ret = VLC_SUCCESS;
     for (NSUInteger x = 0; x < itemCount; x++) {
         if (unlikely(x == 0 && playFirstItemImmediately)) {
-            ret = self appendItemToPlaylist:mediaItemArrayx playImmediately:YES;
+            ret = self appendItemToPlayQueue:mediaItemArrayx playImmediately:YES;
         } else {
-            ret = self appendItemToPlaylist:mediaItemArrayx playImmediately:NO;
+            ret = self appendItemToPlayQueue:mediaItemArrayx playImmediately:NO;
         }
         if (unlikely(ret != VLC_SUCCESS)) {
             break;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryDataTypes.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryDataTypes.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryHeroView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryHeroView.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryImageCache.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryImageCache.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryImageCache.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryImageCache.m Changed

@@ -29,7 +29,7 @@
 
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistItem.h"
+#import "playqueue/VLCPlayQueueItem.h"
 
 NSUInteger kVLCMaximumLibraryImageCacheSize = 50;
 uint32_t kVLCDesiredThumbnailWidth = 512;
@@ -162,10 +162,10 @@
     }
 }
 
-+ (void)thumbnailForPlaylistItem:(VLCPlaylistItem *)playlistItem 
++ (void)thumbnailForPlayQueueItem:(VLCPlayQueueItem *)playQueueItem
                   withCompletion:(nonnull void (^)(const NSImage * _Nonnull))completionHandler
 {
-    return VLCLibraryImageCache.sharedImageCache imageForInputItem:playlistItem.inputItem 
+    return VLCLibraryImageCache.sharedImageCache imageForInputItem:playQueueItem.inputItem
                                                      withCompletion:completionHandler;
 }
 
@@ -176,7 +176,7 @@
         !libraryItem isKindOfClass:VLCMediaLibraryMediaItem.class) {
 
         dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INTERACTIVE, 0), ^{
-            NSMutableSet<NSImage *> * const itemImages = NSMutableArray.array;
+            NSMutableSet<NSImage *> * const itemImages = NSMutableSet.set;
 
             libraryItem iterateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item) {
                 NSImage * const itemImage = VLCLibraryImageCache thumbnailForLibraryItem:item;
@@ -187,10 +187,11 @@
             };
 
             const NSSize size = NSMakeSize(kVLCDesiredThumbnailWidth, kVLCDesiredThumbnailHeight);
+            NSArray<NSImage *> * const itemImagesArray = itemImages.allObjects;
             NSArray<NSValue *> * const frames =
-                NSImage framesForCompositeImageSquareGridWithImages:itemImages size:size gridItemCount:kVLCCompositeImageDefaultCompositedGridItemCount;
+                NSImage framesForCompositeImageSquareGridWithImages:itemImagesArray size:size gridItemCount:kVLCCompositeImageDefaultCompositedGridItemCount;
             NSImage * const compositeImage =
-                NSImage compositeImageWithImages:itemImages frames:frames size:size;
+                NSImage compositeImageWithImages:itemImagesArray frames:frames size:size;
 
             dispatch_async(dispatch_get_main_queue(), ^{
                 completionHandler(compositeImage);

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryItemPresentingCapable.h Added

@@ -0,0 +1,35 @@
+/*****************************************************************************
+ * VLCLibraryItemPresentingCapable.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol VLCMediaLibraryItemProtocol;
+
+@protocol VLCLibraryItemPresentingCapable
+
+- (void)presentLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryMenuController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryMenuController.m Changed

@@ -34,7 +34,7 @@
 
 #import "panels/VLCInformationWindowController.h"
 
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 #import <vlc_input.h>
 #import <vlc_url.h>
@@ -66,7 +66,7 @@
     NSMenuItem *playItem = NSMenuItem alloc initWithTitle:_NS("Play") action:@selector(play:) keyEquivalent:@"";
     playItem.target = self;
 
-    NSMenuItem *appendItem = NSMenuItem alloc initWithTitle:_NS("Append to Playlist") action:@selector(appendToPlaylist:) keyEquivalent:@"";
+    NSMenuItem *appendItem = NSMenuItem alloc initWithTitle:_NS("Append to Play Queue") action:@selector(appendToPlayQueue:) keyEquivalent:@"";
     appendItem.target = self;
 
     NSMenuItem *addItem = NSMenuItem alloc initWithTitle:_NS("Add Media Folder...") action:@selector(addMedia:) keyEquivalent:@"";
@@ -160,11 +160,11 @@
 
 #pragma mark - actions
 
-- (void)addInputItemToPlaylist:(VLCInputItem*)inputItem
-               playImmediately:(BOOL)playImmediately
+- (void)addInputItemToPlayQueue:(VLCInputItem*)inputItem
+                playImmediately:(BOOL)playImmediately
 {
     NSParameterAssert(inputItem);
-    VLCMain.sharedInstance.playlistController addInputItem:_representedInputItems.firstObject.vlcInputItem
+    VLCMain.sharedInstance.playQueueController addInputItem:inputItem.vlcInputItem
                                                  atPosition:-1
                                               startPlayback:playImmediately;
 }
@@ -181,19 +181,19 @@
         }
 
     } else if (self.representedInputItems != nil && self.representedInputItems.count > 0) {
-        self addInputItemToPlaylist:self.representedInputItems.firstObject
-                     playImmediately:YES;
+        self addInputItemToPlayQueue:self.representedInputItems.firstObject
+                      playImmediately:YES;
 
         if (self.representedInputItems.count > 1) {
             for (NSUInteger i = 1; i < self.representedInputItems.count; i++) {
-                self addInputItemToPlaylist:self.representedInputItemsi
-                             playImmediately:NO;
+                self addInputItemToPlayQueue:self.representedInputItemsi
+                              playImmediately:NO;
             }
         }
     }
 }
 
-- (void)appendToPlaylist:(id)sender
+- (void)appendToPlayQueue:(id)sender
 {
     if (self.representedItems != nil && self.representedItems.count > 0) {
         for (VLCLibraryRepresentedItem * const item in self.representedItems) {
@@ -201,7 +201,7 @@
         }
     } else if (self.representedInputItems != nil && self.representedInputItems.count > 0) {
         for (VLCInputItem * const inputItem in self.representedInputItems) {
-            self addInputItemToPlaylist:inputItem playImmediately:NO;
+            self addInputItemToPlayQueue:inputItem playImmediately:NO;
         }
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryModel.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryModel.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryModel.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryModel.m Changed

@@ -22,6 +22,8 @@
 
 #import "VLCLibraryModel.h"
 
+#import "VLCMediaLibraryFolderObserver.h"
+
 #import "extensions/NSArray+VLCAdditions.h"
 #import "extensions/NSString+Helpers.h"
 
@@ -62,6 +64,11 @@
 NSString * const VLCLibraryModelGroupUpdated = @"VLCLibraryModelGroupUpdated";
 NSString * const VLCLibraryModelPlaylistUpdated = @"VLCLibraryModelPlaylistUpdated";
 
+NSString * const VLCLibraryModelDiscoveryStarted = @"VLCLibraryModelDiscoveryStarted";
+NSString * const VLCLibraryModelDiscoveryProgress = @"VLCLibraryModelDiscoveryProgress";
+NSString * const VLCLibraryModelDiscoveryCompleted = @"VLCLibraryModelDiscoveryCompleted";
+NSString * const VLCLibraryModelDiscoveryFailed = @"VLCLibraryModelDiscoveryFailed";
+
 @interface VLCLibraryModel ()
 {
     vlc_medialibrary_t *_p_mediaLibrary;
@@ -89,6 +96,8 @@
     dispatch_queue_t _groupCacheModificationQueue;
 }
 
+@property (readwrite) NSArray<VLCMediaLibraryFolderObserver *> *folderObservers;
+
 @property (readwrite, atomic) NSArray *cachedAudioMedia;
 @property (readwrite, atomic) NSArray *cachedArtists;
 @property (readwrite, atomic) NSArray *cachedAlbums;
@@ -209,6 +218,38 @@
             libraryModel resetCachedListOfRecentMedia;
             libraryModel resetCachedListOfRecentAudioMedia;
             break;
+        case VLC_ML_EVENT_DISCOVERY_STARTED:
+            dispatch_async(dispatch_get_main_queue(), ^{
+                NSNotificationCenter * const defaultCenter = NSNotificationCenter.defaultCenter;
+                defaultCenter postNotificationName:VLCLibraryModelDiscoveryStarted object:nil;
+            });
+            break;
+        case VLC_ML_EVENT_DISCOVERY_PROGRESS:
+        {
+            NSString * const entryPoint = toNSStr(p_event->discovery_progress.psz_entry_point);
+            dispatch_async(dispatch_get_main_queue(), ^{
+                NSDictionary<NSString *, NSString *> * const info = entryPoint == nil
+                    ? nil
+                    : @{@"entryPoint": entryPoint};
+                NSNotificationCenter * const defaultCenter = NSNotificationCenter.defaultCenter;
+                defaultCenter postNotificationName:VLCLibraryModelDiscoveryProgress
+                                             object:nil
+                                           userInfo:info;
+            });
+            break;
+        }
+        case VLC_ML_EVENT_DISCOVERY_COMPLETED:
+            dispatch_async(dispatch_get_main_queue(), ^{
+                NSNotificationCenter * const defaultCenter = NSNotificationCenter.defaultCenter;
+                defaultCenter postNotificationName:VLCLibraryModelDiscoveryCompleted object:nil;
+            });
+            break;
+        case VLC_ML_EVENT_DISCOVERY_FAILED:
+            dispatch_async(dispatch_get_main_queue(), ^{
+                NSNotificationCenter * const defaultCenter = NSNotificationCenter.defaultCenter;
+                defaultCenter postNotificationName:VLCLibraryModelDiscoveryFailed object:nil;
+            });
+            break;
         default:
             break;
     }
@@ -270,6 +311,8 @@
             self->_initialRecentsCount = vlc_ml_count_video_history(self->_p_mediaLibrary, &queryParameters);
             self->_initialRecentAudioCount = vlc_ml_count_audio_history(self->_p_mediaLibrary, &queryParameters);
         });
+
+        self resetCachedListOfMonitoredFolders;
     }
     return self;
 }
@@ -730,18 +773,29 @@
             return;
         }
 
-        NSMutableArray *mutableArray = NSMutableArray alloc initWithCapacity:pp_entrypoints->i_nb_items;
+        NSMutableArray * const mutableArray =
+            NSMutableArray alloc initWithCapacity:pp_entrypoints->i_nb_items;
+        NSMutableArray * const mutableObservers =
+            NSMutableArray alloc initWithCapacity:pp_entrypoints->i_nb_items;
+
         for (size_t x = 0; x < pp_entrypoints->i_nb_items; x++) {
-            VLCMediaLibraryEntryPoint *entryPoint = VLCMediaLibraryEntryPoint alloc initWithEntryPoint:&pp_entrypoints->p_itemsx;
+            VLCMediaLibraryEntryPoint * const entryPoint =
+                VLCMediaLibraryEntryPoint alloc initWithEntryPoint:&pp_entrypoints->p_itemsx;
             if (entryPoint) {
                 mutableArray addObject:entryPoint;
+
+                NSURL * const url = NSURL URLWithString:entryPoint.MRL;
+                VLCMediaLibraryFolderObserver * const observer =
+                    VLCMediaLibraryFolderObserver alloc initWithURL:url;
+                mutableObservers addObject:observer;
             }
         }
 
         vlc_ml_folder_list_release(pp_entrypoints);
 
         dispatch_async(dispatch_get_main_queue(), ^{
-            self.cachedListOfMonitoredFolders = mutableArray copy;
+            self.cachedListOfMonitoredFolders = mutableArray.copy;
+            self.folderObservers = mutableObservers.copy;
             self.changeDelegate notifyChange:VLCLibraryModelListOfMonitoredFoldersUpdated withObject:self;
         });
     });

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryRepresentedItem.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryRepresentedItem.m Changed

@@ -32,7 +32,7 @@
 
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 @interface VLCLibraryRepresentedItem ()
 {
@@ -113,7 +113,7 @@
 
 - (int64_t)parentItemIdForAudioItem:(const id<VLCMediaLibraryItemProtocol>)item
 {
-    // Decide which other items we are going to be adding to the playlist when playing the item.
+    // Decide which other items we are going to be adding to the play queue when playing the item.
     // Key for playing in library mode, not in individual mode
     int64_t parentItemId = NSNotFound;
 
@@ -222,7 +222,7 @@
     __block BOOL startingPlayImmediately = playImmediately;
 
     self.item iterateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem* mediaItem) {
-        libraryController appendItemToPlaylist:mediaItem playImmediately:startingPlayImmediately;
+        libraryController appendItemToPlayQueue:mediaItem playImmediately:startingPlayImmediately;
 
         if (startingPlayImmediately) {
             startingPlayImmediately = NO;
@@ -232,7 +232,7 @@
 
 - (void)playLibraryModeImmediately:(BOOL)playImmediately
 {
-    VLCPlaylistController * const playlistController = VLCMain.sharedInstance.playlistController;
+    VLCPlayQueueController * const playQueueController = VLCMain.sharedInstance.playQueueController;
     VLCLibraryController * const libraryController = VLCMain.sharedInstance.libraryController;
 
     // If play immediately, play first item, queue following items
@@ -252,25 +252,25 @@
 
     for (NSUInteger i = startingIndex; i < parentItemCount; i++) {
         const id<VLCMediaLibraryItemProtocol> mediaItem = parentItems objectAtIndex:i;
-        libraryController appendItemToPlaylist:mediaItem playImmediately:startingPlayImmediately;
+        libraryController appendItemToPlayQueue:mediaItem playImmediately:startingPlayImmediately;
 
         if (startingPlayImmediately) {
             startingPlayImmediately = NO;
         }
     }
 
-    if (playlistController.playbackRepeat != VLC_PLAYLIST_PLAYBACK_REPEAT_NONE) {
+    if (playQueueController.playbackRepeat != VLC_PLAYLIST_PLAYBACK_REPEAT_NONE) {
         for (NSUInteger i = 0; i < startingIndex; i++) {
             const id<VLCMediaLibraryItemProtocol> mediaItem = parentItems objectAtIndex:i;
-            libraryController appendItemToPlaylist:mediaItem playImmediately:NO;
+            libraryController appendItemToPlayQueue:mediaItem playImmediately:NO;
         }
     }
 }
 
 - (void)playImmediately:(BOOL)playImmediately
 {
-    VLCPlaylistController * const playlistController = VLCMain.sharedInstance.playlistController;
-    if (playlistController.libraryPlaylistMode || self.parentType != VLCMediaLibraryParentGroupTypeUnknown) {
+    VLCPlayQueueController * const playQueueController = VLCMain.sharedInstance.playQueueController;
+    if (playQueueController.libraryPlayQueueMode && self.parentType != VLCMediaLibraryParentGroupTypeUnknown) {
         self playLibraryModeImmediately:playImmediately;
     } else {
         self playIndividualModeImmediately:playImmediately;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibrarySegment.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibrarySegment.h Changed

@@ -24,29 +24,31 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@class VLCLibraryAbstractSegmentViewController;
+@protocol VLCMediaLibraryItemProtocol;
+
 extern NSString * const VLCLibraryBookmarkedLocationsKey;
 extern NSString * const VLCLibraryBookmarkedLocationsChanged;
 
 typedef NS_ENUM(NSInteger, VLCLibrarySegmentType) {
     VLCLibraryLowSentinelSegment = -1,
-    VLCLibraryVLCTitleSegment,
-    VLCLibraryHeaderSegment,
-    VLCLibraryHomeSegment,
-    VLCLibraryVideoSegment,
-    VLCLibraryShowsVideoSubSegment,
-    VLCLibraryMusicSegment,
-    VLCLibraryArtistsMusicSubSegment,
-    VLCLibraryAlbumsMusicSubSegment,
-    VLCLibrarySongsMusicSubSegment,
-    VLCLibraryGenresMusicSubSegment,
-    VLCLibraryPlaylistsSegment,
-    VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegment,
-    VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegment,
-    VLCLibraryBrowseSegment,
-    VLCLibraryBrowseBookmarkedLocationSubSegment,
-    VLCLibraryStreamsSegment,
-    VLCLibraryGroupsSegment,
-    VLCLibraryGroupsGroupSubSegment,
+    VLCLibraryHomeSegmentType,
+    VLCLibraryHeaderSegmentType,
+    VLCLibraryVideoSegmentType,
+    VLCLibraryShowsVideoSubSegmentType,
+    VLCLibraryMusicSegmentType,
+    VLCLibraryArtistsMusicSubSegmentType,
+    VLCLibraryAlbumsMusicSubSegmentType,
+    VLCLibrarySongsMusicSubSegmentType,
+    VLCLibraryGenresMusicSubSegmentType,
+    VLCLibraryPlaylistsSegmentType,
+    VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegmentType,
+    VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegmentType,
+    VLCLibraryGroupsSegmentType,
+    VLCLibraryGroupsGroupSubSegmentType,
+    VLCLibraryBrowseSegmentType,
+    VLCLibraryBrowseBookmarkedLocationSubSegmentType,
+    VLCLibraryStreamsSegmentType,
     VLCLibraryHighSentinelSegment,
 };
 
@@ -57,9 +59,14 @@
 @property (readonly) NSString *displayString;
 @property (readonly) NSImage *displayImage;
 @property (readonly) NSInteger childCount;
+@property (readonly, nullable) Class libraryViewControllerClass;
+@property (readwrite) NSInteger viewMode;
+@property (readonly) NSUInteger toolbarDisplayFlags;
 
 + (instancetype)segmentWithSegmentType:(VLCLibrarySegmentType)segmentType;
-- (instancetype)initWithSegmentType:(VLCLibrarySegmentType)segmentType;
++ (instancetype)segmentForLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem;
+- (nullable VLCLibraryAbstractSegmentViewController *)newLibraryViewController;
+- (void)presentLibraryViewUsingController:(VLCLibraryAbstractSegmentViewController *)controller;
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibrarySegment.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibrarySegment.m Changed

@@ -26,151 +26,899 @@
 
 #import "library/VLCInputItem.h"
 #import "library/VLCLibraryController.h"
+#import "library/VLCLibraryDataTypes.h"
 #import "library/VLCLibraryModel.h"
 #import "library/VLCLibrarySegmentBookmarkedLocation.h"
+#import "library/VLCLibraryWindow.h"
+#import "library/VLCLibraryWindowPersistentPreferences.h"
+#import "library/VLCLibraryWindowToolbarDelegate.h"
 
+#import "library/audio-library/VLCLibraryAudioViewController.h"
+
+#import "library/groups-library/VLCLibraryGroupsViewController.h"
+
+#import "library/home-library/VLCLibraryHomeViewController.h"
+
+#import "library/media-source/VLCLibraryMediaSourceViewController.h"
 #import "library/media-source/VLCMediaSource.h"
 #import "library/media-source/VLCMediaSourceProvider.h"
 
+#import "library/playlist-library/VLCLibraryPlaylistViewController.h"
+
+#import "library/video-library/VLCLibraryVideoViewController.h"
+
 #import "main/VLCMain.h"
 
 NSString * const VLCLibraryBookmarkedLocationsKey = @"VLCLibraryBookmarkedLocations";
 NSString * const VLCLibraryBookmarkedLocationsChanged = @"VLCLibraryBookmarkedLocationsChanged";
 
-@implementation VLCLibrarySegment
+static const VLCLibraryWindowToolbarDisplayFlags standardLibraryViewToolbarDisplayFlags =
+    VLCLibraryWindowToolbarDisplayFlagSortOrderButton |
+    VLCLibraryWindowToolbarDisplayFlagLibrarySearchBar |
+    VLCLibraryWindowToolbarDisplayFlagToggleViewModeSegmentButton;
 
-+ (NSArray<VLCLibrarySegment *> *)librarySegments
+static const VLCLibraryWindowToolbarDisplayFlags mediaSourceViewToolbarDisplayFlags =
+    VLCLibraryWindowToolbarDisplayFlagNavigationButtons |
+    VLCLibraryWindowToolbarDisplayFlagToggleViewModeSegmentButton;
+
+NSArray<NSString *> *defaultBookmarkedLocations()
 {
-    return @
-        VLCLibrarySegment segmentWithSegmentType:VLCLibraryVLCTitleSegment,
-        VLCLibrarySegment segmentWithSegmentType:VLCLibraryHeaderSegment,
-        VLCLibrarySegment segmentWithSegmentType:VLCLibraryHomeSegment,
-        VLCLibrarySegment segmentWithSegmentType:VLCLibraryVideoSegment,
-        VLCLibrarySegment segmentWithSegmentType:VLCLibraryMusicSegment,
-        VLCLibrarySegment segmentWithSegmentType:VLCLibraryPlaylistsSegment,
-        VLCLibrarySegment segmentWithSegmentType:VLCLibraryBrowseSegment,
-        VLCLibrarySegment segmentWithSegmentType:VLCLibraryStreamsSegment,
-        VLCLibrarySegment segmentWithSegmentType:VLCLibraryGroupsSegment
-    ;
+    NSMutableArray<NSString *> * const locationMrls = NSMutableArray.array;
+    NSArray<VLCMediaSource *> * const localMediaSources =
+        VLCMediaSourceProvider.listOfLocalMediaSources;
+
+    for (VLCMediaSource * const mediaSource in localMediaSources) {
+        VLCInputNode * const rootNode = mediaSource.rootNode;
+        mediaSource preparseInputNodeWithinTree:rootNode;
+
+        if (rootNode.children != nil) {
+            for (VLCInputNode * const node in rootNode.children) {
+                locationMrls addObject:node.inputItem.MRL;
+            }
+        }
+    }
+
+    return locationMrls.copy;
 }
 
-+ (instancetype)segmentWithSegmentType:(VLCLibrarySegmentType)segmentType
+
+// MARK: - Properties used by public VLCLibrarySegment methods internally and set by subclasses
+
+@interface VLCLibrarySegment ()
+
+@property NSString *internalDisplayString;
+@property NSImage *internalDisplayImage;
+@property (nullable) Class internalLibraryViewControllerClass;
+@property (nullable) NSArray<NSTreeNode *> *internalChildNodes;
+@property (nullable) VLCLibraryAbstractSegmentViewController *(^internalLibraryViewControllerCreator)(void);
+@property (nullable) void (^internalLibraryViewPresenter)(VLCLibraryAbstractSegmentViewController *);
+@property (nullable) void (^internalSaveViewModePreference)(NSInteger);
+@property (nullable) NSInteger (^internalGetViewModePreference)(void);
+@property VLCLibraryWindowToolbarDisplayFlags internalToolbarDisplayFlags;
+
+- (instancetype)initWithSegmentType:(VLCLibrarySegmentType)segmentType;
+
+@end
+
+
+// MARK: - VLCLibraryHeaderSegment
+
+@interface VLCLibraryHeaderSegment : VLCLibrarySegment
+
+- (instancetype)initWithDisplayString:(NSString *)displayString;
+
+@end
+
+@implementation VLCLibraryHeaderSegment
+
+- (instancetype)initWithDisplayString:(NSString *)displayString{
+    self = super initWithSegmentType:VLCLibraryHeaderSegmentType;
+    if (self) {
+        self.internalDisplayString = displayString;
+    }
+    return self;
+}
+
+@end
+
+
+// MARK: - VLCLibraryHomeSegment
+
+@interface VLCLibraryHomeSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryHomeSegment
+
+- (instancetype)init
 {
-    return VLCLibrarySegment alloc initWithSegmentType:segmentType;
+    self = super initWithSegmentType:VLCLibraryHomeSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Home");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"house"
+                                                  accessibilityDescription:@"Home icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"bw-home";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryHomeViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryHomeViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryHomeViewController *)controller presentHomeView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.homeLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.homeLibraryViewMode;
+        };
+    }
+    return self;
 }
 
-- (instancetype)initWithSegmentType:(VLCLibrarySegmentType)segmentType
+@end
+
+
+// MARK: - Video library view segments
+
+@interface VLCLibraryVideoShowsSubSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryVideoShowsSubSegment
+
+- (instancetype)init
 {
-    return VLCLibrarySegment treeNodeWithRepresentedObject:@(segmentType);
+    self = super initWithSegmentType:VLCLibraryShowsVideoSubSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Shows");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"tv"
+                                                  accessibilityDescription:@"Shows icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"sidebar-movie";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryVideoViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryVideoViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryVideoViewController *)controller presentShowsView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.showsLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.showsLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
+    }
+    return self;
 }
 
-- (instancetype)initWithRepresentedObject:(id)modelObject
+@end
+
+
+@interface VLCLibraryVideoSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryVideoSegment
+
+- (instancetype)init
 {
-    NSInteger segmentValue = VLCLibraryLowSentinelSegment;
+    self = super initWithSegmentType:VLCLibraryVideoSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Videos");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"film.stack"
+                                                  accessibilityDescription:@"Video icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"sidebar-movie";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryVideoViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryVideoViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryVideoViewController *)controller presentVideoView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.videoLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.videoLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
+        self.internalChildNodes = @VLCLibraryVideoShowsSubSegment alloc init;
+    }
+    return self;
+}
 
-    if (modelObject isKindOfClass:NSNumber.class) {
-        NSNumber * const segmentNumber = (NSNumber *)modelObject;
-        segmentValue = segmentNumber.integerValue;
-    } else if (modelObject isKindOfClass:VLCLibrarySegmentBookmarkedLocation.class) {
-        VLCLibrarySegmentBookmarkedLocation * const descriptor =
-            (VLCLibrarySegmentBookmarkedLocation *)modelObject;
-        segmentValue = descriptor.segmentType;
-    } else if (modelObject isKindOfClass:VLCMediaLibraryGroup.class) {
-        segmentValue = VLCLibraryGroupsGroupSubSegment;
+@end
+
+
+// MARK: - Audio library view segments
+
+@interface VLCLibraryMusicArtistSubSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryMusicArtistSubSegment
+
+- (instancetype)init
+{
+    self = super initWithSegmentType:VLCLibraryArtistsMusicSubSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Artists");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"music.mic"
+                                                  accessibilityDescription:@"Music artists icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"sidebar-music";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryAudioViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryAudioViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryAudioViewController *)controller presentAudioView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.artistLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.artistLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
     }
+    return self;
+}
 
-    NSAssert(segmentValue > VLCLibraryLowSentinelSegment &&
-             segmentValue < VLCLibraryHighSentinelSegment,
-             @"VLCLibrarySegment represented object must be a library segment type value!");
+@end
 
-    self = super initWithRepresentedObject:modelObject;
+
+@interface VLCLibraryMusicAlbumSubSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryMusicAlbumSubSegment
+
+- (instancetype)init
+{
+    self = super initWithSegmentType:VLCLibraryAlbumsMusicSubSegmentType;
     if (self) {
-        _segmentType = segmentValue;
-        self updateSegmentTypeRepresentation;
+        self.internalDisplayString = _NS("Albums");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"square.stack"
+                                                  accessibilityDescription:@"Music albums icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"sidebar-music";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryAudioViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryAudioViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryAudioViewController *)controller presentAudioView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.albumLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.albumLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
     }
     return self;
 }
 
-- (NSArray<NSTreeNode *> *)childNodes
+@end
+
+
+@interface VLCLibraryMusicSongSubSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryMusicSongSubSegment
+
+- (instancetype)init
+{
+    self = super initWithSegmentType:VLCLibrarySongsMusicSubSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Songs");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"music.note"
+                                                  accessibilityDescription:@"Music songs icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"sidebar-music";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryAudioViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryAudioViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryAudioViewController *)controller presentAudioView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.songsLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.songsLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
+    }
+    return self;
+}
+
+@end
+
+
+@interface VLCLibraryMusicGenreSubSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryMusicGenreSubSegment
+
+- (instancetype)init
+{
+    self = super initWithSegmentType:VLCLibraryGenresMusicSubSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Genres");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"guitars"
+                                                  accessibilityDescription:@"Music genres icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"sidebar-music";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryAudioViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryAudioViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryAudioViewController *)controller presentAudioView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.genreLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.genreLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
+    }
+    return self;
+}
+
+@end
+
+
+@interface VLCLibraryMusicSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryMusicSegment
+
+- (instancetype)init
 {
-    if (self.segmentType == VLCLibraryVideoSegment) {
-        return @VLCLibrarySegment segmentWithSegmentType:VLCLibraryShowsVideoSubSegment;
-    } else if (self.segmentType == VLCLibraryMusicSegment) {
-        return @
-            VLCLibrarySegment segmentWithSegmentType:VLCLibraryArtistsMusicSubSegment,
-            VLCLibrarySegment segmentWithSegmentType:VLCLibraryAlbumsMusicSubSegment,
-            VLCLibrarySegment segmentWithSegmentType:VLCLibrarySongsMusicSubSegment,
-            VLCLibrarySegment segmentWithSegmentType:VLCLibraryGenresMusicSubSegment,
+    self = super initWithSegmentType:VLCLibraryMusicSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Music");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"music.note"
+                                                  accessibilityDescription:@"Music icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"sidebar-music";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryAudioViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryAudioViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryAudioViewController *)controller presentAudioView;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
+        self.internalChildNodes = @
+            VLCLibraryMusicArtistSubSegment alloc init,
+            VLCLibraryMusicAlbumSubSegment alloc init,
+            VLCLibraryMusicSongSubSegment alloc init,
+            VLCLibraryMusicGenreSubSegment alloc init,
         ;
-    } else if (self.segmentType == VLCLibraryPlaylistsSegment) {
-        return @
-            VLCLibrarySegment segmentWithSegmentType:VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegment,
-            VLCLibrarySegment segmentWithSegmentType:VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegment
+    }
+    return self;
+}
+
+@end
+
+
+// MARK: - Playlist library view segments
+
+@interface VLCLibraryPlaylistMusicPlaylistSubSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryPlaylistMusicPlaylistSubSegment
+
+- (instancetype)init
+{
+    self = super initWithSegmentType:VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Music playlists");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"music.note.list"
+                                                  accessibilityDescription:@"Music playlists icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"sidebar-music";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryPlaylistViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryPlaylistViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryPlaylistViewController *)controller presentPlaylistsViewForPlaylistType:VLC_ML_PLAYLIST_TYPE_AUDIO_ONLY;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.musicOnlyPlaylistLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.musicOnlyPlaylistLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
+    }
+    return self;
+}
+
+@end
+
+
+@interface VLCLibraryPlaylistVideoPlaylistSubSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryPlaylistVideoPlaylistSubSegment
+
+- (instancetype)init
+{
+    self = super initWithSegmentType:VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Video playlists");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"list.and.film"
+                                                  accessibilityDescription:@"Video playlists icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"sidebar-movie";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryPlaylistViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryPlaylistViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryPlaylistViewController *)controller presentPlaylistsViewForPlaylistType:VLC_ML_PLAYLIST_TYPE_VIDEO_ONLY;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.videoOnlyPlaylistLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.videoOnlyPlaylistLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
+    }
+    return self;
+}
+
+@end
+
+
+@interface VLCLibraryPlaylistSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryPlaylistSegment
+
+- (instancetype)init
+{
+    self = super initWithSegmentType:VLCLibraryPlaylistsSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Playlists");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"list.triangle"
+                                                  accessibilityDescription:@"Playlists icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"NSListViewTemplate";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryPlaylistViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryPlaylistViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryPlaylistViewController *)controller presentPlaylistsViewForPlaylistType:VLC_ML_PLAYLIST_TYPE_ALL;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.playlistLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.playlistLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
+        self.internalChildNodes = @
+            VLCLibraryPlaylistMusicPlaylistSubSegment alloc init,
+            VLCLibraryPlaylistVideoPlaylistSubSegment alloc init
         ;
-    } else if (self.segmentType == VLCLibraryBrowseSegment) {
+    }
+    return self;
+}
+
+@end
+
+
+// MARK: - Group library view segments
+
+@interface VLCLibraryGroupSubSegment : VLCLibrarySegment
+
+- (instancetype)initWithGroup:(VLCMediaLibraryGroup *)group;
+
+@end
+
+@implementation VLCLibraryGroupSubSegment
+
+- (instancetype)initWithGroup:(VLCMediaLibraryGroup *)group
+{
+    self = super initWithRepresentedObject:group;
+    if (self) {
+        self.internalDisplayString = group.displayString;
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"play.rectangle"
+                                                  accessibilityDescription:@"Group icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"NSTouchBarTagIcon";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryGroupsViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryGroupsViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryGroupsViewController *)controller presentGroupsView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.groupsLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.groupsLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
+    }
+    return self;
+}
+
+@end
+
+
+@interface VLCLibraryGroupSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryGroupSegment
+
+- (instancetype)init
+{
+    self = super initWithSegmentType:VLCLibraryGroupsSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Groups");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"rectangle.3.group"
+                                                  accessibilityDescription:@"Groups icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"NSTouchBarTagIcon";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryGroupsViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryGroupsViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryGroupsViewController *)controller presentGroupsView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.groupsLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.groupsLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = standardLibraryViewToolbarDisplayFlags;
+
+        VLCLibraryModel * const libraryModel =
+            VLCMain.sharedInstance.libraryController.libraryModel;
+        const NSUInteger groupCount = libraryModel.numberOfGroups;
+
+        if (groupCount > 0) {
+            NSArray<VLCMediaLibraryGroup *> * const groups = libraryModel.listOfGroups;
+            NSMutableArray<VLCLibrarySegment *> * const groupNodes =
+                NSMutableArray arrayWithCapacity:groupCount;
+
+            for (VLCMediaLibraryGroup * const group in groups) {
+                groupNodes addObject:VLCLibraryGroupSubSegment alloc initWithGroup:group;
+            }
+
+            self.internalChildNodes = groupNodes.copy;
+        }
+    }
+    return self;
+}
+
+@end
+
+
+// MARK: - Media source-based library view segments
+
+@interface VLCLibraryBrowseBookmarkedLocationSubSegment : VLCLibrarySegment
+
+- (instancetype)initWithBookmarkedLocation:(VLCLibrarySegmentBookmarkedLocation *)descriptor;
+
+@end
+
+@implementation VLCLibraryBrowseBookmarkedLocationSubSegment
+
+- (instancetype)initWithBookmarkedLocation:(VLCLibrarySegmentBookmarkedLocation *)descriptor
+{
+    self = super initWithRepresentedObject:descriptor;
+    if (self) {
+        self.internalDisplayString = descriptor.name;
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage =
+                NSImage imageWithSystemSymbolName:@"folder"
+                          accessibilityDescription:@"Bookmarked location icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"NSFolder";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryGroupsViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryMediaSourceViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryMediaSourceViewController *)controller presentBrowseView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.browseLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.browseLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = mediaSourceViewToolbarDisplayFlags;
+    }
+    return self;
+}
+
+@end
+
+
+@interface VLCLibraryBrowseSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryBrowseSegment
+
+- (instancetype)init
+{
+    self = super initWithSegmentType:VLCLibraryBrowseSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Browse");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage = NSImage imageWithSystemSymbolName:@"folder"
+                                                  accessibilityDescription:@"Browse icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"NSFolder";
+            self.internalDisplayImage.template = YES;
+        }
+        self.internalLibraryViewControllerClass = VLCLibraryMediaSourceViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryMediaSourceViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryMediaSourceViewController *)controller presentBrowseView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.browseLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.browseLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = mediaSourceViewToolbarDisplayFlags;
+
         NSUserDefaults * const defaults = NSUserDefaults.standardUserDefaults;
         NSArray<NSString *> *bookmarkedLocations =
             defaults stringArrayForKey:VLCLibraryBookmarkedLocationsKey;
         if (bookmarkedLocations == nil) {
-            bookmarkedLocations = self.defaultBookmarkedLocations;
+            bookmarkedLocations = defaultBookmarkedLocations();
             defaults setObject:bookmarkedLocations forKey:VLCLibraryBookmarkedLocationsKey;
         }
 
-        const VLCLibrarySegmentType segmentType = VLCLibraryBrowseBookmarkedLocationSubSegment;
+        const VLCLibrarySegmentType segmentType = VLCLibraryBrowseBookmarkedLocationSubSegmentType;
         NSMutableArray<NSTreeNode *> * const bookmarkedLocationNodes = NSMutableArray.array;
+        NSMutableArray<NSString *> * const remainingBookmarkedLocations = bookmarkedLocations.mutableCopy;
 
         for (NSString * const locationMrl in bookmarkedLocations) {
+            if (!NSFileManager.defaultManager fileExistsAtPath:NSURL URLWithString:locationMrl.path) {
+                remainingBookmarkedLocations removeObject:locationMrl;
+                continue;
+            }
             NSString * const locationName = locationMrl.lastPathComponent;
             VLCLibrarySegmentBookmarkedLocation * const descriptor =
                 VLCLibrarySegmentBookmarkedLocation alloc initWithSegmentType:segmentType
                                                                             name:locationName
                                                                              mrl:locationMrl;
-            VLCLibrarySegment * const node = 
-                VLCLibrarySegment treeNodeWithRepresentedObject:descriptor;
+            VLCLibraryBrowseBookmarkedLocationSubSegment * const node =
+                VLCLibraryBrowseBookmarkedLocationSubSegment alloc initWithBookmarkedLocation:descriptor;
             bookmarkedLocationNodes addObject:node;
         }
 
-        return bookmarkedLocationNodes.copy;
-    } else if (self.segmentType == VLCLibraryGroupsSegment) {
-        VLCLibraryModel * const libraryModel =
-            VLCMain.sharedInstance.libraryController.libraryModel;
-        const NSUInteger groupCount = libraryModel.numberOfGroups;
-        if (groupCount == 0) {
-            return nil;
+        self.internalChildNodes = bookmarkedLocationNodes.copy;
+
+        if (bookmarkedLocations.count != remainingBookmarkedLocations.count) {
+            defaults setObject:remainingBookmarkedLocations forKey:VLCLibraryBookmarkedLocationsKey;
         }
+    }
+    return self;
+}
+
+@end
+
 
-        NSArray<VLCMediaLibraryGroup *> * const groups = libraryModel.listOfGroups;
-        NSMutableArray<VLCLibrarySegment *> * const groupNodes =
-            NSMutableArray arrayWithCapacity:groupCount;
+@interface VLCLibraryStreamsSegment : VLCLibrarySegment
+@end
+
+@implementation VLCLibraryStreamsSegment
 
-        for (VLCMediaLibraryGroup * const group in groups) {
-            VLCLibrarySegment * const node =
-                VLCLibrarySegment treeNodeWithRepresentedObject:group;
-            groupNodes addObject:node;
+- (instancetype)init
+{
+    self = super initWithSegmentType:VLCLibraryStreamsSegmentType;
+    if (self) {
+        self.internalDisplayString = _NS("Streams");
+        if (@available(macOS 11.0, *)) {
+            self.internalDisplayImage =
+                NSImage imageWithSystemSymbolName:@"antenna.radiowaves.left.and.right"
+                          accessibilityDescription:@"Streams icon";
+        } else {
+            self.internalDisplayImage = NSImage imageNamed:@"NSActionTemplate";
+            self.internalDisplayImage.template = YES;
         }
+        self.internalLibraryViewControllerClass = VLCLibraryMediaSourceViewController.class;
+        self.internalLibraryViewControllerCreator = ^{
+            return VLCLibraryMediaSourceViewController alloc initWithLibraryWindow:VLCMain.sharedInstance.libraryWindow;
+        };
+        self.internalLibraryViewPresenter = ^(VLCLibraryAbstractSegmentViewController * const controller) {
+            (VLCLibraryMediaSourceViewController *)controller presentStreamsView;
+        };
+        self.internalSaveViewModePreference = ^(const NSInteger viewMode) {
+            VLCLibraryWindowPersistentPreferences.sharedInstance.streamLibraryViewMode = viewMode;
+        };
+        self.internalGetViewModePreference = ^{
+            return VLCLibraryWindowPersistentPreferences.sharedInstance.streamLibraryViewMode;
+        };
+        self.internalToolbarDisplayFlags = mediaSourceViewToolbarDisplayFlags;
+    }
+    return self;
+}
+
+@end
+
+
+// MARK: - VLCLibrarySegment
+
+@implementation VLCLibrarySegment
+
++ (NSArray<VLCLibrarySegment *> *)librarySegments
+{
+    return @
+        VLCLibraryHomeSegment alloc init,
+        VLCLibraryHeaderSegment alloc initWithDisplayString:_NS("Library"),
+        VLCLibraryVideoSegment alloc init,
+        VLCLibraryMusicSegment alloc init,
+        VLCLibraryPlaylistSegment alloc init,
+        VLCLibraryGroupSegment alloc init,
+        VLCLibraryHeaderSegment alloc initWithDisplayString:_NS("Explore"),
+        VLCLibraryBrowseSegment alloc init,
+        VLCLibraryStreamsSegment alloc init,
+    ;
+}
+
++ (instancetype)segmentWithSegmentType:(VLCLibrarySegmentType)segmentType
+{
+    switch (segmentType) {
+        case VLCLibraryHomeSegmentType:
+            return VLCLibraryHomeSegment alloc init;
+        case VLCLibraryVideoSegmentType:
+            return VLCLibraryVideoSegment alloc init;
+        case VLCLibraryShowsVideoSubSegmentType:
+            return VLCLibraryVideoShowsSubSegment alloc init;
+        case VLCLibraryMusicSegmentType:
+            return VLCLibraryMusicSegment alloc init;
+        case VLCLibraryArtistsMusicSubSegmentType:
+            return VLCLibraryMusicArtistSubSegment alloc init;
+        case VLCLibraryAlbumsMusicSubSegmentType:
+            return VLCLibraryMusicAlbumSubSegment alloc init;
+        case VLCLibrarySongsMusicSubSegmentType:
+            return VLCLibraryMusicSongSubSegment alloc init;
+        case VLCLibraryGenresMusicSubSegmentType:
+            return VLCLibraryMusicGenreSubSegment alloc init;
+        case VLCLibraryPlaylistsSegmentType:
+            return VLCLibraryPlaylistSegment alloc init;
+        case VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegmentType:
+            return VLCLibraryPlaylistMusicPlaylistSubSegment alloc init;
+        case VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegmentType:
+            return VLCLibraryPlaylistVideoPlaylistSubSegment alloc init;
+        case VLCLibraryGroupsSegmentType:
+            return VLCLibraryGroupSegment alloc init;
+        case VLCLibraryBrowseSegmentType:
+            return VLCLibraryBrowseSegment alloc init;
+        case VLCLibraryStreamsSegmentType:
+            return VLCLibraryStreamsSegment alloc init;
+        default:
+            return nil;
+    }
+}
 
-        return groupNodes.copy;
++ (instancetype)segmentForLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem
+{
+    if (libraryItem isKindOfClass:VLCMediaLibraryAlbum.class) {
+        return VLCLibrarySegment segmentWithSegmentType:VLCLibraryAlbumsMusicSubSegmentType;
+    } else if (libraryItem isKindOfClass:VLCMediaLibraryArtist.class) {
+        return VLCLibrarySegment segmentWithSegmentType:VLCLibraryArtistsMusicSubSegmentType;
+    } else if (libraryItem isKindOfClass:VLCMediaLibraryGenre.class) {
+        return VLCLibrarySegment segmentWithSegmentType:VLCLibraryGenresMusicSubSegmentType;
+    } else if (libraryItem isKindOfClass:VLCMediaLibraryGroup.class) {
+        return VLCLibrarySegment segmentWithSegmentType:VLCLibraryGroupsSegmentType;
     }
 
+    VLCMediaLibraryMediaItem * const mediaItem = (VLCMediaLibraryMediaItem *)libraryItem;
+    const BOOL validMediaItem = mediaItem != nil;
+    if (validMediaItem && mediaItem.mediaType == VLC_ML_MEDIA_TYPE_AUDIO) {
+        return VLCLibrarySegment segmentWithSegmentType:VLCLibraryMusicSegmentType;
+    } else if (validMediaItem && mediaItem.mediaType == VLC_ML_MEDIA_TYPE_VIDEO) {
+        if (mediaItem.mediaSubType == VLC_ML_MEDIA_SUBTYPE_SHOW_EPISODE) {
+            return VLCLibrarySegment segmentWithSegmentType:VLCLibraryShowsVideoSubSegmentType;
+        }
+        return VLCLibrarySegment segmentWithSegmentType:VLCLibraryVideoSegmentType;
+    }
+
+    NSLog(@"Unknown library item type provided, cannot find segment for it: %@", libraryItem.displayString);
     return nil;
 }
 
-- (NSArray<NSString *> *)defaultBookmarkedLocations
+- (instancetype)initWithSegmentType:(VLCLibrarySegmentType)segmentType
 {
-    NSMutableArray<NSString *> * const locationMrls = NSMutableArray.array;
-    NSArray<VLCMediaSource *> * const localMediaSources =
-        VLCMediaSourceProvider.listOfLocalMediaSources;
+    return VLCLibrarySegment treeNodeWithRepresentedObject:@(segmentType);
+}
 
-    for (VLCMediaSource * const mediaSource in localMediaSources) {
-        VLCInputNode * const rootNode = mediaSource.rootNode;
-        mediaSource preparseInputNodeWithinTree:rootNode;
+- (instancetype)initWithRepresentedObject:(id)modelObject
+{
+    NSInteger segmentValue = VLCLibraryLowSentinelSegment;
 
-        for (VLCInputNode * const node in rootNode.children) {
-            locationMrls addObject:node.inputItem.MRL;
-        }
+    if (modelObject isKindOfClass:NSNumber.class) {
+        NSNumber * const segmentNumber = (NSNumber *)modelObject;
+        segmentValue = segmentNumber.integerValue;
+    } else if (modelObject isKindOfClass:VLCLibrarySegmentBookmarkedLocation.class) {
+        VLCLibrarySegmentBookmarkedLocation * const descriptor =
+            (VLCLibrarySegmentBookmarkedLocation *)modelObject;
+        segmentValue = descriptor.segmentType;
+    } else if (modelObject isKindOfClass:VLCMediaLibraryGroup.class) {
+        segmentValue = VLCLibraryGroupsGroupSubSegmentType;
     }
 
-    return locationMrls.copy;
+    NSAssert(segmentValue > VLCLibraryLowSentinelSegment &&
+             segmentValue < VLCLibraryHighSentinelSegment,
+             @"VLCLibrarySegment represented object must be a library segment type value!");
+
+    self = super initWithRepresentedObject:modelObject;
+    if (self) {
+        _segmentType = segmentValue;
+    }
+    return self;
+}
+
+- (NSArray<NSTreeNode *> *)childNodes
+{
+    return self.internalChildNodes;
 }
 
 - (NSInteger)childCount
@@ -178,185 +926,44 @@
     return self childNodes.count;
 }
 
-- (NSString *)displayStringForType:(VLCLibrarySegmentType)segmentType
+- (NSString *)displayString
 {
-    switch (segmentType) {
-        case VLCLibraryVLCTitleSegment:
-            return _NS("VLC");
-        case VLCLibraryHeaderSegment:
-            return _NS("Library");
-        case VLCLibraryHomeSegment:
-            return _NS("Home");
-        case VLCLibraryMusicSegment:
-            return _NS("Music");
-        case VLCLibraryArtistsMusicSubSegment:
-            return _NS("Artists");
-        case VLCLibraryAlbumsMusicSubSegment:
-            return _NS("Albums");
-        case VLCLibrarySongsMusicSubSegment:
-            return _NS("Songs");
-        case VLCLibraryGenresMusicSubSegment:
-            return _NS("Genres");
-        case VLCLibraryVideoSegment:
-            return _NS("Videos");
-        case VLCLibraryShowsVideoSubSegment:
-            return _NS("Shows");
-        case VLCLibraryPlaylistsSegment:
-            return _NS("Playlists");
-        case VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegment:
-            return _NS("Music playlists");
-        case VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegment:
-            return _NS("Video playlists");
-        case VLCLibraryBrowseSegment:
-            return _NS("Browse");
-        case VLCLibraryBrowseBookmarkedLocationSubSegment:
-            NSAssert(NO, @"displayStringForType should not be called for this segment type");
-        case VLCLibraryStreamsSegment:
-            return _NS("Streams");
-        case VLCLibraryGroupsSegment:
-            return _NS("Groups");
-        case VLCLibraryGroupsGroupSubSegment:
-            NSAssert(NO, @"displayStringForType should not be called for this segment type");
-        case VLCLibraryLowSentinelSegment:
-        case VLCLibraryHighSentinelSegment:
-            NSAssert(NO, @"Invalid segment value");
-    }
-    return nil;
+    return self.internalDisplayString;
 }
 
-- (NSImage *)oldIconImageForType:(VLCLibrarySegmentType)segmentType
+- (NSImage *)displayImage
 {
-    switch (segmentType) {
-        case VLCLibraryVLCTitleSegment:
-            return NSApp.applicationIconImage;
-        case VLCLibraryHeaderSegment:
-            return nil;
-        case VLCLibraryHomeSegment:
-            return NSImage imageNamed:@"bw-home";
-        case VLCLibraryMusicSegment:
-        case VLCLibraryArtistsMusicSubSegment:
-        case VLCLibraryAlbumsMusicSubSegment:
-        case VLCLibrarySongsMusicSubSegment:
-        case VLCLibraryGenresMusicSubSegment:
-            return NSImage imageNamed:@"sidebar-music";
-        case VLCLibraryVideoSegment:
-        case VLCLibraryShowsVideoSubSegment:
-            return NSImage imageNamed:@"sidebar-movie";
-        case VLCLibraryPlaylistsSegment:
-            return NSImage imageNamed:@"NSListViewTemplate";
-        case VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegment:
-            return NSImage imageNamed:@"sidebar-music";
-        case VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegment:
-            return NSImage imageNamed:@"sidebar-movie";
-        case VLCLibraryBrowseSegment:
-        case VLCLibraryBrowseBookmarkedLocationSubSegment:
-            return NSImage imageNamed:@"NSFolder";
-        case VLCLibraryStreamsSegment:
-            return NSImage imageNamed:@"NSActionTemplate";
-        case VLCLibraryGroupsSegment:
-        case VLCLibraryGroupsGroupSubSegment:
-            return NSImage imageNamed:@"NSTouchBarTagIcon";
-        case VLCLibraryLowSentinelSegment:
-        case VLCLibraryHighSentinelSegment:
-            NSAssert(NO, @"Invalid segment value");
-            return nil;
-    }
+    return self.internalDisplayImage;
+}
 
-    return nil;
+- (nullable Class)libraryViewControllerClass
+{
+    return self.internalLibraryViewControllerClass;
 }
 
-- (NSImage *)newIconImageForType:(VLCLibrarySegmentType)segmentType
-{
-    if (@available(macOS 11.0, *)) {
-        switch (segmentType) {
-        case VLCLibraryVLCTitleSegment:
-            return NSApp.applicationIconImage;
-        case VLCLibraryHeaderSegment:
-            return NSImage imageWithSystemSymbolName:@"books.vertical.fill"
-                             accessibilityDescription:@"Library icon";
-        case VLCLibraryHomeSegment:
-            return NSImage imageWithSystemSymbolName:@"house"
-                             accessibilityDescription:@"Home icon";
-        case VLCLibraryMusicSegment:
-            return NSImage imageWithSystemSymbolName:@"music.note"
-                              accessibilityDescription:@"Music icon";
-        case VLCLibraryArtistsMusicSubSegment:
-            return NSImage imageWithSystemSymbolName:@"music.mic"
-                             accessibilityDescription:@"Music artists icon";
-        case VLCLibraryAlbumsMusicSubSegment:
-            return NSImage imageWithSystemSymbolName:@"square.stack"
-                             accessibilityDescription:@"Music albums icon";
-        case VLCLibrarySongsMusicSubSegment:
-            return NSImage imageWithSystemSymbolName:@"music.note"
-                             accessibilityDescription:@"Music songs icon";
-        case VLCLibraryGenresMusicSubSegment:
-                return NSImage imageWithSystemSymbolName:@"guitars"
-                                 accessibilityDescription:@"Music genres icon";
-        case VLCLibraryVideoSegment:
-            return NSImage imageWithSystemSymbolName:@"film.stack"
-                             accessibilityDescription:@"Video icon";
-        case VLCLibraryShowsVideoSubSegment:
-            return NSImage imageWithSystemSymbolName:@"tv"
-                             accessibilityDescription:@"Shows icon";
-        case VLCLibraryPlaylistsSegment:
-            return NSImage imageWithSystemSymbolName:@"list.triangle"
-                             accessibilityDescription:@"Playlists icon";
-        case VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegment:
-            return NSImage imageWithSystemSymbolName:@"music.note.list"
-                             accessibilityDescription:@"Music playlists icon";
-        case VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegment:
-            return NSImage imageWithSystemSymbolName:@"list.and.film"
-                             accessibilityDescription:@"Video playlists icon";
-        case VLCLibraryBrowseSegment:
-            return NSImage imageWithSystemSymbolName:@"folder"
-                             accessibilityDescription:@"Browse icon";
-        case VLCLibraryBrowseBookmarkedLocationSubSegment:
-            return NSImage imageWithSystemSymbolName:@"folder"
-                             accessibilityDescription:@"Bookmarked location icon";
-        case VLCLibraryStreamsSegment:
-            return NSImage imageWithSystemSymbolName:@"antenna.radiowaves.left.and.right"
-                             accessibilityDescription:@"Streams icon";
-        case VLCLibraryGroupsSegment:
-            return NSImage imageWithSystemSymbolName:@"rectangle.3.group"
-                             accessibilityDescription:@"Groups icon";
-        case VLCLibraryGroupsGroupSubSegment:
-            return NSImage imageWithSystemSymbolName:@"play.rectangle"
-                             accessibilityDescription:@"Group icon";
-        case VLCLibraryLowSentinelSegment:
-        case VLCLibraryHighSentinelSegment:
-            NSAssert(NO, @"Invalid segment value");
-            return nil;
-        }
-    }
-    return nil;
+- (nullable VLCLibraryAbstractSegmentViewController *)newLibraryViewController
+{
+    return self.internalLibraryViewControllerCreator();
 }
 
-- (NSImage *)iconForType:(VLCLibrarySegmentType)segmentType
+- (void)presentLibraryViewUsingController:(VLCLibraryAbstractSegmentViewController *)controller
 {
-    NSImage *iconImage;
-    if (@available(macOS 11.0, *)) {
-        iconImage = self newIconImageForType:segmentType;
-    } else {
-        iconImage = self oldIconImageForType:segmentType;
-        iconImage.template = YES;
-    }
+    self.internalLibraryViewPresenter(controller);
+}
 
-    return iconImage;
+- (NSInteger)viewMode
+{
+    return self.internalGetViewModePreference();
 }
 
-- (void)updateSegmentTypeRepresentation
+- (void)setViewMode:(NSInteger)viewMode
 {
-    if (self.representedObject isKindOfClass:VLCLibrarySegmentBookmarkedLocation.class) {
-        VLCLibrarySegmentBookmarkedLocation * const descriptor =
-            (VLCLibrarySegmentBookmarkedLocation *)self.representedObject;
-        _displayString = descriptor.name;
-    } else if (self.representedObject isKindOfClass:VLCMediaLibraryGroup.class) {
-        VLCMediaLibraryGroup * const group = (VLCMediaLibraryGroup *)self.representedObject;
-        _displayString = group.displayString;
-    } else {
-        _displayString = self displayStringForType:_segmentType;
-    }
-    _displayImage = self iconForType:_segmentType;
+    self.internalSaveViewModePreference(viewMode);
+}
+
+- (NSUInteger)toolbarDisplayFlags
+{
+    return self.internalToolbarDisplayFlags;
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryTableCellView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryTableCellView.m Changed

@@ -37,7 +37,7 @@
 
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 #import "views/VLCImageView.h"
 #import "views/VLCTrackingView.h"
@@ -72,6 +72,8 @@
 - (void)setRepresentedItem:(VLCLibraryRepresentedItem *)representedItem
 {
     _representedItem = representedItem;
+    _representedInputItem = nil; // Reset and ensure the change is obvious
+
     id<VLCMediaLibraryItemProtocol> const actualItem = representedItem.item;
     NSAssert(actualItem != nil, @"Should not update nil represented item!");
 
@@ -79,8 +81,12 @@
     self.playInstantlyButton.action = @selector(playMediaItemInstantly:);
     self.playInstantlyButton.target = self;
 
+    __weak typeof(self) weakSelf = self;
     VLCLibraryImageCache thumbnailForLibraryItem:actualItem withCompletion:^(NSImage * const thumbnail) {
-        self.representedImageView.image = thumbnail;
+        if (!weakSelf || weakSelf.representedItem.item != actualItem) {
+            return;
+        }
+        weakSelf.representedImageView.image = thumbnail;
     };
 
     if(actualItem.primaryDetailString.length > 0) {
@@ -97,12 +103,18 @@
 - (void)setRepresentedInputItem:(VLCInputItem *)representedInputItem
 {
     _representedInputItem = representedInputItem;
+    _representedItem = nil; // Reset and ensure the change is obvious
 
     self.singlePrimaryTitleTextField.hidden = NO;
     self.singlePrimaryTitleTextField.stringValue = _representedInputItem.name;
 
+    __weak typeof(self) weakSelf = self;
     VLCLibraryImageCache thumbnailForInputItem:self->_representedInputItem withCompletion:^(NSImage * const thumbnail) {
-        self->_representedImageView.image = thumbnail;
+        VLCLibraryTableCellView * const strongSelf = weakSelf;
+        if (!strongSelf || representedInputItem != strongSelf->_representedInputItem) {
+            return;
+        }
+        strongSelf->_representedImageView.image = thumbnail;
     };
 
     self.trackingView.viewToHide = self.playInstantlyButton;
@@ -144,7 +156,7 @@
 
 - (void)playInputItemInstantly:(id)sender
 {
-    VLCMain.sharedInstance.playlistController addInputItem:_representedInputItem.vlcInputItem atPosition:-1 startPlayback:YES;
+    VLCMain.sharedInstance.playQueueController addInputItem:_representedInputItem.vlcInputItem atPosition:-1 startPlayback:YES;
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryTwoPaneSplitViewDelegate.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryTwoPaneSplitViewDelegate.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryUIUnits.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryUIUnits.h Changed

@@ -31,6 +31,16 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+extern NSString * const VLCLibraryCollectionViewItemAdjustmentKey;
+
+@interface VLCCollectionViewItemSizing: NSObject
+
+@property (readwrite) NSInteger unclampedRowItemCount;
+@property (readwrite) NSUInteger rowItemCount;
+@property (readwrite) NSSize itemSize;
+
+@end
+
 @interface VLCLibraryUIUnits : NSObject
 
 // Note that these values are not necessarily linked to the layout defined in the .xib files.
@@ -39,6 +49,10 @@
 @property (class, readonly) const CGFloat mediumSpacing;
 @property (class, readonly) const CGFloat smallSpacing;
 
+@property (class, readonly) const CGFloat cornerRadius;
+
+@property (class, readonly) const CGFloat borderThickness;
+
 @property (class, readonly) const CGFloat scrollBarSmallSideSize;
 
 @property (class, readonly) const CGFloat largeTableViewRowHeight;
@@ -52,6 +66,8 @@
 
 @property (class, readonly) const CGFloat dynamicCollectionViewItemMinimumWidth;
 @property (class, readonly) const CGFloat dynamicCollectionViewItemMaximumWidth;
+@property (class, readonly) const CGFloat collectionViewItemMinimumWidth;
+@property (class, readonly) const unsigned short collectionViewMinItemsInRow;
 
 @property (class, readonly) const CGFloat collectionViewItemSpacing;
 @property (class, readonly) const NSEdgeInsets collectionViewSectionInsets;
@@ -68,8 +84,13 @@
 
 @property (class, readonly) const CGFloat librarySplitViewSelectionViewDefaultWidth;
 @property (class, readonly) const CGFloat librarySplitViewMainViewMinimumWidth;
+@property (class, readonly) const CGFloat libraryWindowNavSidebarMinWidth;
 @property (class, readonly) const CGFloat libraryWindowNavSidebarMaxWidth;
-@property (class, readonly) const CGFloat libraryWindowPlaylistSidebarMaxWidth;
+@property (class, readonly) const CGFloat libraryWindowPlayQueueSidebarMaxWidth;
+
+@property (class, readonly) const CGFloat largePlaybackControlButtonSize;
+@property (class, readonly) const CGFloat mediumPlaybackControlButtonSize;
+@property (class, readonly) const CGFloat smallPlaybackControlButtonSize;
 
 @property (class, readonly) const CGFloat sliderTickThickness;
 
@@ -77,6 +98,10 @@
                                                      withLayout:(VLCLibraryCollectionViewFlowLayout *)collectionViewLayout
                                            withItemsAspectRatio:(VLCLibraryCollectionViewItemAspectRatio)itemsAspectRatio;
 
++ (VLCCollectionViewItemSizing *)adjustedItemSizingForCollectionView:(NSCollectionView *)collectionView
+                                                          withLayout:(VLCLibraryCollectionViewFlowLayout *)collectionViewLayout
+                                                withItemsAspectRatio:(VLCLibraryCollectionViewItemAspectRatio)itemsAspectRatio;
+
 @end
 
 NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryUIUnits.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryUIUnits.m Changed

@@ -34,6 +34,11 @@
 
 #import "windows/controlsbar/VLCControlsBarCommon.h"
 
+NSString * const VLCLibraryCollectionViewItemAdjustmentKey = @"VLCLibraryCollectionViewItemAdjustmentKey";
+
+@implementation VLCCollectionViewItemSizing
+@end
+
 @implementation VLCLibraryUIUnits
 
 + (const CGFloat)largeSpacing
@@ -51,6 +56,16 @@
     return 5;
 }
 
++ (const CGFloat)cornerRadius
+{
+    return 5.;
+}
+
++ (const CGFloat)borderThickness
+{
+    return 1.;
+}
+
 + (const CGFloat)scrollBarSmallSideSize
 {
     return 16;
@@ -101,6 +116,16 @@
     return 200;
 }
 
++ (const CGFloat)collectionViewItemMinimumWidth
+{
+    return 40;
+}
+
++ (const unsigned short)collectionViewMinItemsInRow
+{
+    return 2;
+}
+
 + (const CGFloat)collectionViewItemSpacing
 {
     return self largeSpacing;
@@ -116,30 +141,41 @@
                                                      withLayout:(VLCLibraryCollectionViewFlowLayout *)collectionViewLayout
                                            withItemsAspectRatio:(VLCLibraryCollectionViewItemAspectRatio)itemsAspectRatio
 {
-    static uint numItemsInRow = 5;
-    static uint minItemsInRow = 2;
-
-    NSSize itemSize = self itemSizeForCollectionView:collectionView
-                                           withLayout:collectionViewLayout
-                                 withItemsAspectRatio:itemsAspectRatio
-                               withNumberOfItemsInRow:numItemsInRow;
-
-    while (itemSize.width > VLCLibraryUIUnits.dynamicCollectionViewItemMaximumWidth) {
-        ++numItemsInRow;
-        itemSize = self itemSizeForCollectionView:collectionView
-                                        withLayout:collectionViewLayout
-                              withItemsAspectRatio:itemsAspectRatio
-                            withNumberOfItemsInRow:numItemsInRow;
-    }
-    while (itemSize.width < VLCLibraryUIUnits.dynamicCollectionViewItemMinimumWidth && numItemsInRow > minItemsInRow) {
-        --numItemsInRow;
-        itemSize = self itemSizeForCollectionView:collectionView
-                                        withLayout:collectionViewLayout
-                              withItemsAspectRatio:itemsAspectRatio
-                            withNumberOfItemsInRow:numItemsInRow;
-    }
+    return self adjustedItemSizingForCollectionView:collectionView
+                                          withLayout:collectionViewLayout
+                                withItemsAspectRatio:itemsAspectRatio.itemSize;
+}
 
-    return itemSize;
++ (VLCCollectionViewItemSizing *)adjustedItemSizingForCollectionView:(NSCollectionView *)collectionView
+                                                          withLayout:(VLCLibraryCollectionViewFlowLayout *)collectionViewLayout
+                                                withItemsAspectRatio:(VLCLibraryCollectionViewItemAspectRatio)itemsAspectRatio
+{
+    const NSEdgeInsets sectionInsets = collectionViewLayout.sectionInset;
+    const CGFloat interItemSpacing = collectionViewLayout.minimumInteritemSpacing;
+    const CGFloat availableWidth =
+        collectionView.bounds.size.width - (sectionInsets.left + sectionInsets.right);
+    const float maxPossibleNumItemsInRow =
+        floor(availableWidth / (VLCLibraryUIUnits.dynamicCollectionViewItemMinimumWidth + interItemSpacing));
+    const float minPossibleNumItemsInRow =
+        MIN(ceil(availableWidth / (VLCLibraryUIUnits.dynamicCollectionViewItemMaximumWidth + interItemSpacing)), maxPossibleNumItemsInRow);
+
+    const NSInteger adjustment =
+        NSUserDefaults.standardUserDefaults integerForKey:VLCLibraryCollectionViewItemAdjustmentKey;
+    const uint midPossibleNumItemsInRow =
+        round((minPossibleNumItemsInRow + maxPossibleNumItemsInRow) / 2.0);
+
+    const int unclampedNumItemsInRow = midPossibleNumItemsInRow + adjustment;
+    const uint numItemsInRow = MAX(unclampedNumItemsInRow, VLCLibraryUIUnits.collectionViewMinItemsInRow);
+    const NSSize itemSize = self itemSizeForCollectionView:collectionView
+                                                 withLayout:collectionViewLayout
+                                       withItemsAspectRatio:itemsAspectRatio
+                                     withNumberOfItemsInRow:numItemsInRow;
+
+    VLCCollectionViewItemSizing * const itemSizing = VLCCollectionViewItemSizing alloc init;
+    itemSizing.itemSize = itemSize;
+    itemSizing.rowItemCount = numItemsInRow;
+    itemSizing.unclampedRowItemCount = unclampedNumItemsInRow;
+    return itemSizing;
 }
 
 + (const NSSize)itemSizeForCollectionView:(NSCollectionView *)collectionView
@@ -147,9 +183,7 @@
                      withItemsAspectRatio:(VLCLibraryCollectionViewItemAspectRatio)itemsAspectRatio
                    withNumberOfItemsInRow:(uint)numItemsInRow
 {
-    NSParameterAssert(numItemsInRow > 0);
-    NSParameterAssert(collectionView);
-    NSParameterAssert(collectionViewLayout);
+    NSParameterAssert(numItemsInRow > 0 && collectionView && collectionViewLayout);
 
     const NSEdgeInsets sectionInsets = collectionViewLayout.sectionInset;
     const CGFloat interItemSpacing = collectionViewLayout.minimumInteritemSpacing;
@@ -160,7 +194,7 @@
                                      (interItemSpacing * (numItemsInRow - 1)) +
                                      1);
 
-    const CGFloat itemWidth = rowOfItemsWidth / numItemsInRow;
+    const CGFloat itemWidth = MAX(rowOfItemsWidth / numItemsInRow, 1);
     const CGFloat itemHeight = itemsAspectRatio == VLCLibraryCollectionViewItemAspectRatioDefaultItem ?
         itemWidth + VLCLibraryCollectionViewItem.bottomTextViewsHeight :
         (itemWidth * VLCLibraryCollectionViewItem videoHeightAspectRatioMultiplier) + VLCLibraryCollectionViewItem.bottomTextViewsHeight;
@@ -221,16 +255,36 @@
     return 48.;
 }
 
++ (const CGFloat)libraryWindowNavSidebarMinWidth
+{
+    return 180.;
+}
+
 + (const CGFloat)libraryWindowNavSidebarMaxWidth
 {
     return 300.;
 }
 
-+ (const CGFloat)libraryWindowPlaylistSidebarMaxWidth
++ (const CGFloat)libraryWindowPlayQueueSidebarMaxWidth
 {
     return 400.;
 }
 
++ (const CGFloat)largePlaybackControlButtonSize
+{
+    return 64.;
+}
+
++ (const CGFloat)mediumPlaybackControlButtonSize
+{
+    return 48.;
+}
+
++ (const CGFloat)smallPlaybackControlButtonSize
+{
+    return 32.;
+}
+
 + (const CGFloat)sliderTickThickness
 {
     return 1.;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindow.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindow.h Changed

@@ -24,6 +24,8 @@
 
 #import "views/VLCDragDropView.h"
 
+#import "library/VLCLibraryItemPresentingCapable.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class VLCMainWindowControlsBar;
@@ -31,11 +33,10 @@
 @class VLCRoundedCornerTextField;
 @class VLCInputNodePathControl;
 @class VLCLibraryAbstractSegmentViewController;
-@class VLCLibraryMediaSourceViewController;
-@class VLCLibraryNavigationStack;
+@class VLCLibraryCollectionView;
 @class VLCLibrarySortingMenuController;
 @class VLCMediaLibraryGroup;
-@class VLCPlaylistController;
+@class VLCPlayQueueController;
 @class VLCCustomEmptyLibraryBrowseButton;
 @class VLCLibraryWindowSplitViewController;
 @class VLCLibraryWindowToolbarDelegate;
@@ -51,7 +52,7 @@
     VLCLibraryLargestSentinelViewModeSegment
 };
 
-@interface VLCLibraryWindow : VLCFullVideoViewWindow<NSUserInterfaceItemIdentification, VLCDragDropTarget>
+@interface VLCLibraryWindow : VLCFullVideoViewWindow<NSUserInterfaceItemIdentification, VLCDragDropTarget, VLCLibraryItemPresentingCapable>
 
 extern const CGFloat VLCLibraryWindowMinimalWidth;
 extern const CGFloat VLCLibraryWindowMinimalHeight;
@@ -61,22 +62,20 @@
 
 @property (nonatomic, weak) IBOutlet VLCMainWindowControlsBar *controlsBar;
 @property (readwrite, weak) IBOutlet NSLayoutConstraint *controlsBarHeightConstraint;
-@property (readwrite, weak) IBOutlet NSLayoutConstraint *videoViewBottomConstraint;
 @property (readwrite, weak) IBOutlet NSSegmentedControl *gridVsListSegmentedControl;
 @property (readwrite, weak) IBOutlet NSSplitView *mainSplitView;
-@property (readwrite, weak) IBOutlet NSOutlineView *navSidebarOutlineView;
 @property (readwrite, weak) IBOutlet NSView *homeLibraryView;
 @property (readwrite, weak) IBOutlet NSScrollView *homeLibraryStackViewScrollView;
 @property (readwrite, weak) IBOutlet NSStackView *homeLibraryStackView;
 @property (readwrite, weak) IBOutlet NSView *videoLibraryView;
 @property (readwrite, weak) IBOutlet NSSplitView *videoLibrarySplitView;
 @property (readwrite, weak) IBOutlet NSScrollView *videoLibraryCollectionViewScrollView;
-@property (readwrite, weak) IBOutlet NSCollectionView *videoLibraryCollectionView;
+@property (readwrite, weak) IBOutlet VLCLibraryCollectionView *videoLibraryCollectionView;
 @property (readwrite, weak) IBOutlet NSScrollView *videoLibraryGroupSelectionTableViewScrollView;
 @property (readwrite, weak) IBOutlet NSTableView *videoLibraryGroupSelectionTableView;
 @property (readwrite, weak) IBOutlet NSScrollView *videoLibraryGroupsTableViewScrollView;
 @property (readwrite, weak) IBOutlet NSTableView *videoLibraryGroupsTableView;
-@property (readwrite, weak) IBOutlet NSCollectionView *mediaSourceCollectionView;
+@property (readwrite, weak) IBOutlet VLCLibraryCollectionView *mediaSourceCollectionView;
 @property (readwrite, weak) IBOutlet NSView *audioLibraryView;
 @property (readwrite, weak) IBOutlet NSSplitView *audioLibrarySplitView;
 @property (readwrite, weak) IBOutlet NSScrollView *audioCollectionSelectionTableViewScrollView;
@@ -86,12 +85,12 @@
 @property (readwrite, weak) IBOutlet NSScrollView *audioLibrarySongsTableViewScrollView;
 @property (readwrite, weak) IBOutlet NSTableView *audioLibrarySongsTableView;
 @property (readwrite, weak) IBOutlet NSScrollView *audioCollectionViewScrollView;
-@property (readwrite, weak) IBOutlet NSCollectionView *audioLibraryCollectionView;
+@property (readwrite, weak) IBOutlet VLCLibraryCollectionView *audioLibraryCollectionView;
 @property (readwrite, weak) IBOutlet NSSplitView *audioLibraryGridModeSplitView;
 @property (readwrite, weak) IBOutlet NSScrollView *audioLibraryGridModeSplitViewListTableViewScrollView;
 @property (readwrite, weak) IBOutlet NSTableView *audioLibraryGridModeSplitViewListTableView;
 @property (readwrite, weak) IBOutlet NSScrollView *audioLibraryGridModeSplitViewListSelectionCollectionViewScrollView;
-@property (readwrite, weak) IBOutlet NSCollectionView *audioLibraryGridModeSplitViewListSelectionCollectionView;
+@property (readwrite, weak) IBOutlet VLCLibraryCollectionView *audioLibraryGridModeSplitViewListSelectionCollectionView;
 @property (readwrite, weak) IBOutlet NSView *mediaSourceView;
 @property (readwrite, weak) IBOutlet NSButton *mediaSourceHomeButton;
 @property (readwrite, weak) IBOutlet VLCInputNodePathControl *mediaSourcePathControl;
@@ -99,7 +98,6 @@
 @property (readwrite, weak) IBOutlet NSScrollView *mediaSourceTableViewScrollView;
 @property (readwrite, weak) IBOutlet NSTableView *mediaSourceTableView;
 @property (readwrite, weak) IBOutlet NSScrollView *mediaSourceCollectionViewScrollView;
-@property (readwrite, weak) IBOutlet NSView *mediaOptionBar;
 @property (readwrite, weak) IBOutlet NSToolbar *mediaToolBar;
 @property (readwrite, weak) IBOutlet NSButton *librarySortButton;
 @property (readwrite, weak) IBOutlet NSSearchField *librarySearchField;
@@ -108,7 +106,6 @@
 @property (readwrite, weak) IBOutlet NSButton *forwardsNavigationButton;
 @property (readwrite, weak) IBOutlet NSButton *artworkButton;
 @property (readwrite, weak) IBOutlet VLCLibraryWindowToolbarDelegate *toolbarDelegate;
-@property (readwrite, weak) IBOutlet NSLayoutConstraint *splitViewBottomConstraintToBottomBar;
 
 @property (nonatomic, readwrite, strong) IBOutlet NSView *emptyLibraryView;
 @property (nonatomic, readwrite, strong) IBOutlet NSImageView *placeholderImageView;
@@ -116,7 +113,6 @@
 @property (nonatomic, readwrite, strong) IBOutlet VLCCustomEmptyLibraryBrowseButton *placeholderGoToBrowseButton;
 
 @property (readonly) VLCLoadingOverlayView *loadingOverlayView;
-@property (readonly) NSArray<NSLayoutConstraint *> *loadingOverlayViewConstraints;
 @property (readonly) NSArray<NSLayoutConstraint *> *placeholderImageViewConstraints;
 @property (readonly) VLCNoResultsLabel *noResultsLabel;
 
@@ -124,11 +120,9 @@
 @property (readwrite) BOOL nonembedded;
 
 @property (readwrite, weak) IBOutlet VLCLibraryWindowSplitViewController *splitViewController;
-@property (readwrite) VLCLibraryNavigationStack *navigationStack;
-@property (readonly) VLCLibraryMediaSourceViewController *libraryMediaSourceViewController;
 @property (readonly) VLCLibraryAbstractSegmentViewController *librarySegmentViewController;
 @property (readonly) VLCLibrarySortingMenuController *librarySortingMenuController;
-@property (readonly) VLCPlaylistController *playlistController;
+@property (readonly) VLCPlayQueueController *playQueueController;
 
 - (void)enableVideoPlaybackAppearance;
 - (void)disableVideoPlaybackAppearance;
@@ -145,7 +139,6 @@
                               usingConstraints:(NSArray<NSLayoutConstraint *> *)constraints
                              displayingMessage:(NSString *)message;
 - (void)displayNoResultsMessage;
-- (void)presentLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem;
 - (void)goToLocalFolderMrl:(NSString *)mrl;
 
 - (IBAction)goToBrowseSection:(id)sender;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindow.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindow.m Changed

@@ -34,15 +34,15 @@
 #import "main/VLCMain.h"
 #import "menus/VLCMainMenu.h"
 
-#import "playlist/VLCPlayerController.h"
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 #import "library/VLCInputItem.h"
+#import "library/VLCLibraryAbstractMediaLibrarySegmentViewController.h"
 #import "library/VLCLibraryController.h"
 #import "library/VLCLibraryCollectionViewItem.h"
 #import "library/VLCLibraryCollectionViewSupplementaryElementView.h"
 #import "library/VLCLibraryModel.h"
-#import "library/VLCLibraryNavigationStack.h"
 #import "library/VLCLibrarySegment.h"
 #import "library/VLCLibrarySortingMenuController.h"
 #import "library/VLCLibraryUIUnits.h"
@@ -68,6 +68,7 @@
 
 #import "media-source/VLCMediaSourceBaseDataSource.h"
 #import "media-source/VLCLibraryMediaSourceViewController.h"
+#import "media-source/VLCLibraryMediaSourceViewNavigationStack.h"
 
 #import "views/VLCBottomBarView.h"
 #import "views/VLCCustomWindowButton.h"
@@ -144,6 +145,12 @@
     imageView.shadow = buttonShadow;
 }
 
+@interface VLCLibraryWindow ()
+
+@property BOOL presentLoadingOverlayOnVideoPlaybackHide;
+
+@end
+
 @implementation VLCLibraryWindow
 
 - (void)awakeFromNib
@@ -157,7 +164,7 @@
     }
 
     VLCMain *mainInstance = VLCMain.sharedInstance;
-    _playlistController = mainInstance playlistController;
+    _playQueueController = mainInstance playQueueController;
 
     libvlc_int_t *libvlc = vlc_object_instance(getIntf());
     var_AddCallback(libvlc, "intf-toggle-fscontrol", ShowFullscreenController, (__bridge void *)self);
@@ -165,9 +172,6 @@
 
     _libraryTargetView = NSView alloc init;
 
-    self.navigationStack = VLCLibraryNavigationStack alloc init;
-    self.navigationStack.delegate = self;
-
     self.videoViewController.view.frame = self.mainSplitView.frame;
     self.videoViewController.view.hidden = YES;
     self.videoViewController.displayLibraryControls = YES;
@@ -191,8 +195,6 @@
                                name:VLCPlayerTrackSelectionChanged
                              object:nil;
 
-    _libraryMediaSourceViewController = VLCLibraryMediaSourceViewController alloc initWithLibraryWindow:self;
-
     self setViewForSelectedSegment;
     self setupLoadingOverlayView;
 }
@@ -215,132 +217,31 @@
 {
     _loadingOverlayView = VLCLoadingOverlayView alloc init;
     self.loadingOverlayView.translatesAutoresizingMaskIntoConstraints = NO;
-    _loadingOverlayViewConstraints = @
-        NSLayoutConstraint constraintWithItem:self.loadingOverlayView
-                                     attribute:NSLayoutAttributeTop
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.libraryTargetView
-                                     attribute:NSLayoutAttributeTop
-                                    multiplier:1
-                                      constant:0,
-        NSLayoutConstraint constraintWithItem:self.loadingOverlayView
-                                     attribute:NSLayoutAttributeRight
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.libraryTargetView
-                                     attribute:NSLayoutAttributeRight
-                                    multiplier:1
-                                      constant:0,
-        NSLayoutConstraint constraintWithItem:self.loadingOverlayView
-                                     attribute:NSLayoutAttributeBottom
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.libraryTargetView
-                                     attribute:NSLayoutAttributeBottom
-                                    multiplier:1
-                                      constant:0,
-        NSLayoutConstraint constraintWithItem:self.loadingOverlayView
-                                     attribute:NSLayoutAttributeLeft
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.libraryTargetView
-                                     attribute:NSLayoutAttributeLeft
-                                    multiplier:1
-                                      constant:0
-    ;
 }
 
 #pragma mark - misc. user interactions
 
 - (void)updateGridVsListViewModeSegmentedControl
 {
-    VLCLibraryWindowPersistentPreferences * const preferences = VLCLibraryWindowPersistentPreferences.sharedInstance;
-
-    switch (_librarySegmentType) {
-    case VLCLibraryHomeSegment:
-        _currentSelectedViewModeSegment = preferences.homeLibraryViewMode;
-    case VLCLibraryVideoSegment:
-        _currentSelectedViewModeSegment = preferences.videoLibraryViewMode;
-        break;
-    case VLCLibraryShowsVideoSubSegment:
-        _currentSelectedViewModeSegment = preferences.showsLibraryViewMode;
-        break;
-    case VLCLibraryMusicSegment:
-    case VLCLibraryArtistsMusicSubSegment:
-        _currentSelectedViewModeSegment = preferences.artistLibraryViewMode;
-        break;
-    case VLCLibraryGenresMusicSubSegment:
-        _currentSelectedViewModeSegment = preferences.genreLibraryViewMode;
-        break;
-    case VLCLibraryAlbumsMusicSubSegment:
-        _currentSelectedViewModeSegment = preferences.albumLibraryViewMode;
-        break;
-    case VLCLibrarySongsMusicSubSegment:
-        _currentSelectedViewModeSegment = preferences.songsLibraryViewMode;
-        break;
-    case VLCLibraryPlaylistsSegment:
-        _currentSelectedViewModeSegment = preferences.playlistLibraryViewMode;
-        break;
-    case VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegment:
-        _currentSelectedViewModeSegment = preferences.musicOnlyPlaylistLibraryViewMode;
-        break;
-    case VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegment:
-        _currentSelectedViewModeSegment = preferences.videoOnlyPlaylistLibraryViewMode;
-        break;
-    case VLCLibraryBrowseSegment:
-        _currentSelectedViewModeSegment = preferences.browseLibraryViewMode;
-        break;
-    case VLCLibraryStreamsSegment:
-        _currentSelectedViewModeSegment = preferences.streamLibraryViewMode;
-        break;
-    case VLCLibraryGroupsSegment:
-    case VLCLibraryGroupsGroupSubSegment:
-        _currentSelectedViewModeSegment = preferences.groupsLibraryViewMode;
-        break;
-    default:
-        break;
-    }
-
+    _currentSelectedViewModeSegment =
+        VLCLibrarySegment segmentWithSegmentType:self.librarySegmentType.viewMode;
     _gridVsListSegmentedControl.selectedSegment = _currentSelectedViewModeSegment;
 }
 
 - (void)setViewForSelectedSegment
 {
-    switch (_librarySegmentType) {
-    case VLCLibraryHomeSegment:
-        self showHomeLibrary;
-        break;
-    case VLCLibraryVideoSegment:
-        self showVideoLibrary;
-        break;
-    case VLCLibraryShowsVideoSubSegment:
-        self showShowLibrary;
-        break;
-    case VLCLibraryMusicSegment:
-    case VLCLibraryArtistsMusicSubSegment:
-    case VLCLibraryAlbumsMusicSubSegment:
-    case VLCLibrarySongsMusicSubSegment:
-    case VLCLibraryGenresMusicSubSegment:
-        self showAudioLibrary;
-        break;
-    case VLCLibraryPlaylistsSegment:
-        self showPlaylistLibrary:VLC_ML_PLAYLIST_TYPE_ALL;
-        break;
-    case VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegment:
-        self showPlaylistLibrary:VLC_ML_PLAYLIST_TYPE_AUDIO_ONLY;
-        break;
-    case VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegment:
-        self showPlaylistLibrary:VLC_ML_PLAYLIST_TYPE_VIDEO_ONLY;
-        break;
-    case VLCLibraryBrowseSegment:
-    case VLCLibraryBrowseBookmarkedLocationSubSegment:
-    case VLCLibraryStreamsSegment:
-        self showMediaSourceLibrary;
-        break;
-    case VLCLibraryGroupsSegment:
-    case VLCLibraryGroupsGroupSubSegment:
-        self showGroupsLibrary;
-    default:
-        break;
-    }
+    const VLCLibrarySegmentType segmentType = self.librarySegmentType;
+    VLCLibrarySegment * const segment = VLCLibrarySegment segmentWithSegmentType:segmentType;
+    self applySegmentView:segment;
+}
 
+- (void)applySegmentView:(VLCLibrarySegment *)segment
+{
+    self.toolbarDelegate applyVisiblityFlags:segment.toolbarDisplayFlags;
+    if (!self.librarySegmentViewController isKindOfClass:segment.libraryViewControllerClass) {
+        _librarySegmentViewController = segment newLibraryViewController;
+    }
+    segment presentLibraryViewUsingController:self.librarySegmentViewController;
     self invalidateRestorableState;
 }
 
@@ -362,134 +263,10 @@
     }
 
     _currentSelectedViewModeSegment = _gridVsListSegmentedControl.selectedSegment;
-
-    VLCLibraryWindowPersistentPreferences * const preferences = VLCLibraryWindowPersistentPreferences.sharedInstance;
-
-    switch (_librarySegmentType) {
-    case VLCLibraryHomeSegment:
-        preferences.homeLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryVideoSegment:
-        preferences.videoLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryShowsVideoSubSegment:
-        preferences.showsLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryMusicSegment:
-    case VLCLibraryArtistsMusicSubSegment:
-        preferences.artistLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryGenresMusicSubSegment:
-        preferences.genreLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryAlbumsMusicSubSegment:
-        preferences.albumLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibrarySongsMusicSubSegment:
-        preferences.songsLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryPlaylistsSegment:
-        preferences.playlistLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegment:
-        preferences.musicOnlyPlaylistLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegment:
-        preferences.videoOnlyPlaylistLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryBrowseSegment:
-    case VLCLibraryBrowseBookmarkedLocationSubSegment:
-        preferences.browseLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryStreamsSegment:
-        preferences.streamLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    case VLCLibraryGroupsSegment:
-    case VLCLibraryGroupsGroupSubSegment:
-        preferences.groupsLibraryViewMode = _currentSelectedViewModeSegment;
-        break;
-    default:
-        break;
-    }
-
+    VLCLibrarySegment segmentWithSegmentType:self.librarySegmentType.viewMode = _currentSelectedViewModeSegment;
     self setViewForSelectedSegment;
 }
 
-- (void)showHomeLibrary
-{
-    // Only collection view mode
-    self.toolbarDelegate layoutForSegment:VLCLibraryHomeSegment;
-    VLCLibraryHomeViewController * const lvc =
-        VLCLibraryHomeViewController alloc initWithLibraryWindow:self;
-    lvc presentHomeView;
-    _librarySegmentViewController = lvc;
-}
-
-- (void)showVideoLibrary
-{
-    self.toolbarDelegate layoutForSegment:VLCLibraryVideoSegment;
-    VLCLibraryVideoViewController * const lvc =
-        VLCLibraryVideoViewController alloc initWithLibraryWindow:self;
-    lvc presentVideoView;
-    _librarySegmentViewController = lvc;
-}
-
-- (void)showShowLibrary
-{
-    self.toolbarDelegate layoutForSegment:VLCLibraryShowsVideoSubSegment;
-    VLCLibraryVideoViewController * const lvc =
-        VLCLibraryVideoViewController alloc initWithLibraryWindow:self;
-    lvc presentShowsView;
-    _librarySegmentViewController = lvc;
-}
-
-- (void)showAudioLibrary
-{
-    self.toolbarDelegate layoutForSegment:VLCLibraryMusicSegment;
-    VLCLibraryAudioViewController * const lvc =
-        VLCLibraryAudioViewController alloc initWithLibraryWindow:self;
-    lvc presentAudioView;
-    _librarySegmentViewController = lvc;
-}
-
-- (void)showPlaylistLibrary:(enum vlc_ml_playlist_type_t)playlistType
-{
-    if (playlistType == VLC_ML_PLAYLIST_TYPE_AUDIO_ONLY) {
-        self.toolbarDelegate layoutForSegment:VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegment;
-    } else if (playlistType == VLC_ML_PLAYLIST_TYPE_VIDEO_ONLY) {
-        self.toolbarDelegate layoutForSegment:VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegment;
-    } else {
-        self.toolbarDelegate layoutForSegment:VLCLibraryPlaylistsSegment;
-    }
-    VLCLibraryPlaylistViewController * const lvc =
-        VLCLibraryPlaylistViewController alloc initWithLibraryWindow:self;
-    lvc presentPlaylistsViewForPlaylistType:playlistType;
-    _librarySegmentViewController = lvc;
-}
-
-- (void)showMediaSourceLibrary
-{
-    self.navigationStack clear;
-
-    const VLCLibrarySegmentType segmentType = self.librarySegmentType;
-    self.toolbarDelegate layoutForSegment:segmentType;
-
-    if (segmentType == VLCLibraryBrowseSegment) {
-        self.libraryMediaSourceViewController presentBrowseView;
-    } else if (segmentType == VLCLibraryStreamsSegment) {
-        self.libraryMediaSourceViewController presentStreamsView;
-    }
-}
-
-- (void)showGroupsLibrary
-{
-    self.toolbarDelegate layoutForSegment:VLCLibraryGroupsSegment;
-    VLCLibraryGroupsViewController * const lvc =
-        VLCLibraryGroupsViewController alloc initWithLibraryWindow:self;
-    lvc presentGroupsView;
-    _librarySegmentViewController = lvc;
-}
-
 - (void)displayLibraryView:(NSView *)view
 {
     view.translatesAutoresizingMaskIntoConstraints = NO;
@@ -543,55 +320,19 @@
     ;
 }
 
-- (void)presentAudioLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem
-{
-    self showAudioLibrary;
-    (VLCLibraryAudioViewController *)self.librarySegmentViewController presentLibraryItem:libraryItem;
-}
-
-- (void)presentVideoLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem
-{
-    self showVideoLibrary;
-    (VLCLibraryVideoViewController *)self.librarySegmentViewController presentLibraryItem:libraryItem;
-}
-
-- (void)presentGroupLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem
-{
-    self showGroupsLibrary;
-    (VLCLibraryAudioViewController *)self.librarySegmentViewController presentLibraryItem:libraryItem;
-}
-
 - (void)presentLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem
 {
-    const BOOL isAudioGroup = libraryItem isKindOfClass:VLCMediaLibraryAlbum.class ||
-                              libraryItem isKindOfClass:VLCMediaLibraryArtist.class ||
-                              libraryItem isKindOfClass:VLCMediaLibraryGenre.class;
-
-    if (isAudioGroup) {
-        self presentAudioLibraryItem:libraryItem;
-        return;
-    } else if (libraryItem isKindOfClass:VLCMediaLibraryGroup.class) {
-        self presentGroupLibraryItem:libraryItem;
-        return;
-    }
-
-    VLCMediaLibraryMediaItem * const mediaItem = (VLCMediaLibraryMediaItem *)libraryItem;
-    const BOOL validMediaItem = mediaItem != nil;
-    if (validMediaItem && mediaItem.mediaType == VLC_ML_MEDIA_TYPE_AUDIO) {
-        self presentAudioLibraryItem:libraryItem;
-        return;
-    } else if (validMediaItem && mediaItem.mediaType == VLC_ML_MEDIA_TYPE_VIDEO) {
-        self presentVideoLibraryItem:libraryItem;
-        return;
+    VLCLibrarySegment * const segment = VLCLibrarySegment segmentForLibraryItem:libraryItem;
+    self applySegmentView:segment;
+    if (self.librarySegmentViewController conformsToProtocol:@protocol(VLCLibraryItemPresentingCapable)) {
+        (VLCLibraryAbstractSegmentViewController<VLCLibraryItemPresentingCapable> *)self.librarySegmentViewController presentLibraryItem:libraryItem;
     }
-
-    NSLog(@"Unknown kind of library item provided, cannot present library view for it: %@", libraryItem.displayString);
 }
 
 - (void)goToLocalFolderMrl:(NSString *)mrl
 {
     self goToBrowseSection:self;
-    self.libraryMediaSourceViewController presentLocalFolderMrl:mrl;
+    (VLCLibraryMediaSourceViewController *)self.librarySegmentViewController presentLocalFolderMrl:mrl;
 }
 
 - (IBAction)sortLibrary:(id)sender
@@ -632,46 +373,24 @@
 
 - (BOOL)handlePasteBoardFromDragSession:(NSPasteboard *)paste
 {
-    id propertyList = paste propertyListForType:NSFilenamesPboardType;
-    if (propertyList == nil) {
-        return NO;
-    }
-
-    NSArray *values = propertyList sortedArrayUsingSelector:@selector(caseInsensitiveCompare:);
-    NSUInteger valueCount = values count;
-    if (valueCount > 0) {
-        NSMutableArray *metadataArray = NSMutableArray arrayWithCapacity:valueCount;
-
-        for (NSString *filepath in values) {
-            VLCOpenInputMetadata *inputMetadata;
-
-            inputMetadata = VLCOpenInputMetadata inputMetaWithPath:filepath;
-            if (!inputMetadata)
-                continue;
-
-            metadataArray addObject:inputMetadata;
-        }
-        _playlistController addPlaylistItems:metadataArray;
-
-        return YES;
-    }
-
-    return NO;
+    return VLCFileDragRecognisingView handlePasteboardFromDragSessionAsPlayQueueItems:paste;
 }
 
 - (IBAction)goToBrowseSection:(id)sender
 {
-    self.splitViewController.navSidebarViewController selectSegment:VLCLibraryBrowseSegment;
+    self.splitViewController.navSidebarViewController selectSegment:VLCLibraryBrowseSegmentType;
 }
 
 - (IBAction)backwardsNavigationAction:(id)sender
 {
-    self.videoViewController.view.hidden ? _navigationStack backwards : self disableVideoPlaybackAppearance;
+    self.videoViewController.view.hidden
+        ? ((VLCLibraryMediaSourceViewController *)self.librarySegmentViewController).navigationStack backwards
+        : self disableVideoPlaybackAppearance;
 }
 
 - (IBAction)forwardsNavigationAction:(id)sender
 {
-    _navigationStack forwards;
+    ((VLCLibraryMediaSourceViewController *)self.librarySegmentViewController).navigationStack forwards;
 }
 
 #pragma mark - video output controlling
@@ -683,7 +402,7 @@
         self enableVideoPlaybackAppearance;
     } else if (!self.videoViewController.view.hidden) {
         // If we are switching to audio media then keep the active main video view open
-        NSURL * const currentMediaUrl = _playlistController.playerController.URLOfCurrentMediaItem;
+        NSURL * const currentMediaUrl = _playQueueController.playerController.URLOfCurrentMediaItem;
         VLCMediaLibraryMediaItem * const mediaItem = VLCMediaLibraryMediaItem mediaItemForURL:currentMediaUrl;
         const BOOL decorativeViewVisible = mediaItem != nil && mediaItem.mediaType == VLC_ML_MEDIA_TYPE_AUDIO;
 
@@ -697,7 +416,7 @@
 
 - (void)playerStateChanged:(NSNotification *)notification
 {
-    if (_playlistController.playerController.playerState == VLC_PLAYER_STATE_STOPPED) {
+    if (_playQueueController.playerController.playerState == VLC_PLAYER_STATE_STOPPED) {
         self hideControlsBar;
         return;
     }
@@ -709,6 +428,11 @@
 
 - (void)playerTrackSelectionChanged:(NSNotification *)notification
 {
+    self updateArtworkButtonEnabledState;
+}
+
+- (void)updateArtworkButtonEnabledState
+{
     VLCPlayerController * const playerController = self.playerController;
     const BOOL videoTrackDisabled =
         !playerController.videoTracksEnabled || !playerController.selectedVideoTrack.selected;
@@ -716,8 +440,11 @@
         !playerController.audioTracksEnabled || !playerController.selectedAudioTrack.selected;
     const BOOL currentItemIsAudio =
         playerController.videoTracks.count == 0 && playerController.audioTracks.count > 0;
+    const BOOL pipOpen = self.videoViewController.pipIsActive;
     const BOOL artworkButtonDisabled =
-        (videoTrackDisabled && audioTrackDisabled) || (videoTrackDisabled && !currentItemIsAudio);
+        (videoTrackDisabled && audioTrackDisabled) ||
+        (videoTrackDisabled && !currentItemIsAudio) ||
+        pipOpen;
     self.artworkButton.enabled = !artworkButtonDisabled;
     self.artworkButton.hidden = artworkButtonDisabled;
     self.controlsBar.thumbnailTrackingView.enabled = !artworkButtonDisabled;
@@ -778,42 +505,12 @@
 
     NSLog(@"Presenting video view in main library window.");
 
-    NSView *videoView = self.videoViewController.view;
+    NSView * const videoView = self.videoViewController.view;
     videoView.translatesAutoresizingMaskIntoConstraints = NO;
     videoView.hidden = NO;
 
     _libraryTargetView addSubview:videoView;
-    NSDictionary *dict = NSDictionaryOfVariableBindings(videoView);
-    _libraryTargetView addConstraints:@
-        NSLayoutConstraint constraintWithItem:videoView
-                                     attribute:NSLayoutAttributeTop
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:_libraryTargetView
-                                     attribute:NSLayoutAttributeTop
-                                    multiplier:1.
-                                      constant:0.,
-        NSLayoutConstraint constraintWithItem:videoView
-                                     attribute:NSLayoutAttributeBottom
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:_libraryTargetView
-                                     attribute:NSLayoutAttributeBottom
-                                    multiplier:1.
-                                      constant:0.,
-        NSLayoutConstraint constraintWithItem:videoView
-                                     attribute:NSLayoutAttributeLeft
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:_libraryTargetView
-                                     attribute:NSLayoutAttributeLeft
-                                    multiplier:1.
-                                      constant:0.,
-        NSLayoutConstraint constraintWithItem:videoView
-                                     attribute:NSLayoutAttributeRight
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:_libraryTargetView
-                                     attribute:NSLayoutAttributeRight
-                                    multiplier:1.
-                                      constant:0.
-    ;
+    videoView applyConstraintsToFillSuperview;
 }
 
 - (void)enableVideoPlaybackAppearance
@@ -840,9 +537,11 @@
     self hideControlsBarImmediately;
     self.videoViewController showControls;
 
-    self.splitViewController.multifunctionSidebarViewController.mainVideoModeEnabled = YES;
+    self.splitViewController.mainVideoModeEnabled = YES;
 
-    self.librarySegmentViewController disconnect;
+    if (self.librarySegmentViewController isKindOfClass:VLCLibraryAbstractMediaLibrarySegmentViewController.class) {
+        (VLCLibraryAbstractMediaLibrarySegmentViewController *)self.librarySegmentViewController disconnect;
+    }
 }
 
 - (void)disableVideoPlaybackAppearance
@@ -852,17 +551,29 @@
 
     // restore alpha value to 1 for the case that macosx-opaqueness is set to < 1
     self.alphaValue = 1.0;
-    self.videoViewController.view.hidden = YES;
     self setViewForSelectedSegment;
     self disableVideoTitleBarMode;
     self showControlsBarImmediately;
-    self.splitViewController.multifunctionSidebarViewController.mainVideoModeEnabled = NO;
+    self updateArtworkButtonEnabledState;
+
+    self.splitViewController.mainVideoModeEnabled = NO;
+
+    if (self.presentLoadingOverlayOnVideoPlaybackHide) {
+        self showLoadingOverlay;
+    }
+
+    if (self.librarySegmentViewController isKindOfClass:VLCLibraryAbstractMediaLibrarySegmentViewController.class) {
+        (VLCLibraryAbstractMediaLibrarySegmentViewController *)self.librarySegmentViewController connect;
+    }
 }
 
 - (void)showLoadingOverlay
 {
     if (self.libraryTargetView.subviews containsObject:self.loadingOverlayView) {
         return;
+    } else if (self.libraryTargetView.subviews containsObject:self.videoViewController.view) {
+        self.presentLoadingOverlayOnVideoPlaybackHide = YES;
+        return;
     }
 
     self.loadingOverlayView.wantsLayer = YES;
@@ -870,7 +581,7 @@
 
     NSArray * const views = self.libraryTargetView.subviews arrayByAddingObject:self.loadingOverlayView;
     self.libraryTargetView.subviews = views;
-    self.libraryTargetView addConstraints:self.loadingOverlayViewConstraints;
+    self.loadingOverlayView applyConstraintsToFillSuperview;
 
     NSAnimationContext runAnimationGroup:^(NSAnimationContext * const context) {
         context.duration = 0.5;
@@ -882,6 +593,8 @@
 
 - (void)hideLoadingOverlay
 {
+    self.presentLoadingOverlayOnVideoPlaybackHide = NO;
+
     if (!self.libraryTargetView.subviews containsObject:self.loadingOverlayView) {
         return;
     }
@@ -893,7 +606,6 @@
         context.duration = 1.0;
         self.loadingOverlayView.animator.alphaValue = 0.0;
     } completionHandler:^{
-        self.libraryTargetView removeConstraints:self.loadingOverlayViewConstraints;
         NSMutableArray * const views = self.libraryTargetView.subviews.mutableCopy;
         views removeObject:self.loadingOverlayView;
         self.libraryTargetView.subviews = views.copy;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowChaptersSidebarViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowChaptersSidebarViewController.m Changed

@@ -25,9 +25,9 @@
 #import "extensions/NSString+Helpers.h"
 #import "library/VLCLibraryDataTypes.h"
 #import "main/VLCMain.h"
-#import "playlist/VLCPlayerChapter.h"
-#import "playlist/VLCPlayerController.h"
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayerChapter.h"
+#import "playqueue/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 @interface VLCLibraryWindowChaptersSidebarViewController ()
 
@@ -66,12 +66,17 @@
                  options:nil;
 
     self updateChapterList;
+    self updateSelectedChapter;
     
     NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
     notificationCenter addObserver:self
                            selector:@selector(titleListChanged:)
                                name:VLCPlayerTitleListChanged
                              object:nil;
+    notificationCenter addObserver:self
+                           selector:@selector(chapterSelectionChanged:)
+                               name:VLCPlayerChapterSelectionChanged
+                             object:nil;
 }
 
 - (NSString *)title
@@ -98,7 +103,7 @@
 - (void)updateChapterList
 {
     VLCPlayerController * const playerController =
-        VLCMain.sharedInstance.playlistController.playerController;
+        VLCMain.sharedInstance.playQueueController.playerController;
 
     const struct vlc_player_title * const title = playerController.selectedTitle;
     if (title == NULL) {
@@ -127,7 +132,20 @@
         return;
     }
 
-    VLCMain.sharedInstance.playlistController.playerController setTimeFast:selectedChapter.time;
+    VLCMain.sharedInstance.playQueueController.playerController setTimeFast:selectedChapter.time;
+}
+
+- (void)chapterSelectionChanged:(NSNotification *)notification
+{
+    self updateSelectedChapter;
+}
+
+- (void)updateSelectedChapter
+{
+    const NSUInteger selectedChapterIndex =
+        VLCMain.sharedInstance.playQueueController.playerController.selectedChapterIndex;
+    NSIndexSet * const indexSet = NSIndexSet indexSetWithIndex:selectedChapterIndex;
+    self.tableView selectRowIndexes:indexSet byExtendingSelection:NO;
 }
 
 # pragma mark - NSTableView delegation

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowController.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowNavigationSidebarViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowNavigationSidebarViewController.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowNavigationSidebarViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowNavigationSidebarViewController.m Changed

@@ -29,12 +29,24 @@
 #import "library/VLCLibraryWindow.h"
 #import "library/VLCLibraryWindowNavigationSidebarOutlineView.h"
 
+#import "extensions/NSColor+VLCAdditions.h"
+#import "extensions/NSWindow+VLCAdditions.h"
+
+#import "views/VLCStatusNotifierView.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
 // This needs to match whatever identifier has been set in the library window XIB
 static NSString * const VLCLibrarySegmentCellIdentifier = @"VLCLibrarySegmentCellIdentifier";
 
 @interface VLCLibraryWindowNavigationSidebarViewController ()
 
 @property BOOL ignoreSegmentSelectionChanges;
+@property (readonly) NSEdgeInsets scrollViewInsets;
+@property (readonly) NSMutableDictionary<NSString *, dispatch_source_t> *observedPathDispatchSources;
 
 @end
 
@@ -47,6 +59,7 @@
         _libraryWindow = libraryWindow;
         _segments = VLCLibrarySegment.librarySegments;
         _ignoreSegmentSelectionChanges = NO;
+        _observedPathDispatchSources = NSMutableDictionary.dictionary;
     }
     return self;
 }
@@ -54,24 +67,27 @@
 - (void)viewDidLoad
 {
     _treeController = NSTreeController alloc init;
-    _treeController.objectClass = VLCLibrarySegment.class;
-    _treeController.countKeyPath = @"childCount";
-    _treeController.childrenKeyPath = @"childNodes";
-    _treeController.leafKeyPath = @"leaf";
-    _treeController bind:@"contentArray" toObject:self withKeyPath:@"segments" options:nil;
+    self.treeController.objectClass = VLCLibrarySegment.class;
+    self.treeController.countKeyPath = @"childCount";
+    self.treeController.childrenKeyPath = @"childNodes";
+    self.treeController.leafKeyPath = @"leaf";
 
-    _outlineView.rowSizeStyle = NSTableViewRowSizeStyleMedium;
-    _outlineView.allowsMultipleSelection = NO;
-    _outlineView.allowsEmptySelection = NO;
-    _outlineView.allowsColumnSelection = NO;
-    _outlineView.allowsColumnReordering = NO;
+    self.outlineView.rowSizeStyle = NSTableViewRowSizeStyleMedium;
+    self.outlineView.allowsMultipleSelection = NO;
+    self.outlineView.allowsEmptySelection = NO;
+    self.outlineView.allowsColumnSelection = NO;
+    self.outlineView.allowsColumnReordering = NO;
 
-    _outlineView bind:@"content"
-              toObject:_treeController
-           withKeyPath:@"arrangedObjects"
-               options:nil;
+    self internalNodesChanged:nil;
 
-    _outlineView reloadData;
+    const NSEdgeInsets scrollViewInsets = self.outlineViewScrollView.contentInsets;
+    _scrollViewInsets =
+        NSEdgeInsetsMake(scrollViewInsets.top + self.libraryWindow.titlebarHeight,
+                         scrollViewInsets.left,
+                         scrollViewInsets.bottom,
+                         scrollViewInsets.right);
+
+    self.statusNotifierView.postsFrameChangedNotifications = YES;
 
     NSNotificationCenter * const defaultCenter = NSNotificationCenter.defaultCenter;
     defaultCenter addObserver:self
@@ -90,15 +106,40 @@
                       selector:@selector(internalNodesChanged:)
                           name:VLCLibraryModelGroupDeleted
                         object:nil;
+    defaultCenter addObserver:self
+                      selector:@selector(statusViewActivated:)
+                          name:VLCStatusNotifierViewActivated
+                        object:nil;
+    defaultCenter addObserver:self
+                      selector:@selector(statusViewDeactivated:)
+                          name:VLCStatusNotifierViewDeactivated
+                        object:nil;
+    defaultCenter addObserver:self
+                      selector:@selector(statusViewSizeChanged:)
+                          name:NSViewFrameDidChangeNotification
+                        object:nil;
 }
 
 - (void)internalNodesChanged:(NSNotification *)notification
 {
     const VLCLibrarySegmentType currentSegmentType = self.libraryWindow.librarySegmentType;
 
+    NSMutableSet<NSNumber *> * const expandedSegmentTypes = NSMutableSet.set;
+    for (VLCLibrarySegment * const segment in self.treeController.content) {
+        NSTreeNode * const node = self nodeForSegmentType:segment.segmentType;
+        if (self.outlineView isItemExpanded:node) {
+            expandedSegmentTypes addObject:@(segment.segmentType);
+        }
+    }
+
     self.ignoreSegmentSelectionChanges = YES;
-    
-    self.treeController rearrangeObjects;
+
+    _segments = VLCLibrarySegment.librarySegments;
+    self.treeController bind:@"contentArray" toObject:self withKeyPath:@"segments" options:nil;
+    self.outlineView bind:@"content"
+                  toObject:self.treeController
+               withKeyPath:@"arrangedObjects"
+                   options:nil;
     self.outlineView reloadData;
 
     NSTreeNode * const targetNode = self nodeForSegmentType:currentSegmentType;
@@ -108,6 +149,119 @@
                   byExtendingSelection:NO;
 
     self.ignoreSegmentSelectionChanges = NO;
+
+    self updateBookmarkObservation;
+
+    for (VLCLibrarySegment * const segment in self.treeController.content) {
+        if (expandedSegmentTypes containsObject:@(segment.segmentType)) {
+            NSTreeNode * const node = self nodeForSegmentType:segment.segmentType;
+            self.outlineView expandItem:node;
+        }
+    }
+}
+
+- (void)updateBookmarkObservation
+{
+    NSUserDefaults * const defaults = NSUserDefaults.standardUserDefaults;
+    NSArray<NSString *> * const bookmarkedLocations =
+        defaults stringArrayForKey:VLCLibraryBookmarkedLocationsKey;
+    if (bookmarkedLocations.count == 0) {
+        return;
+    }
+
+    NSMutableArray<NSString *> * const deletedLocations = self.observedPathDispatchSources.allKeys.mutableCopy;
+    const __weak typeof(self) weakSelf = self;
+
+    for (NSString * const locationMrl in bookmarkedLocations) {
+        deletedLocations removeObject:locationMrl;
+        if (self.observedPathDispatchSources objectForKey:locationMrl != nil) {
+            continue;
+        }
+        NSURL * const locationUrl = NSURL URLWithString:locationMrl;
+        const uintptr_t descriptor = open(locationUrl.path.UTF8String, O_EVTONLY);
+        if (descriptor == -1) {
+            continue;
+        }
+        struct stat fileStat;
+        const int statResult = fstat(descriptor, &fileStat);
+
+        const dispatch_queue_t globalQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+        const dispatch_source_t fileDispatchSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, descriptor, DISPATCH_VNODE_DELETE | DISPATCH_VNODE_RENAME, globalQueue);
+        dispatch_source_set_event_handler(fileDispatchSource, ^{
+            const unsigned long eventFlags = dispatch_source_get_data(fileDispatchSource);
+            if (eventFlags & DISPATCH_VNODE_RENAME && statResult != -1) {
+                NSURL * const parentLocationUrl = locationUrl.URLByDeletingLastPathComponent;
+                NSString * const parentLocationPath = parentLocationUrl.path;
+                NSArray<NSString *> * const files = NSFileManager.defaultManager contentsOfDirectoryAtPath:parentLocationPath error:nil;
+                NSString *newFileName = nil;
+
+                for (NSString * const file in files) {
+                    NSString * const fullChildPath = parentLocationPath stringByAppendingPathComponent:file;
+                    struct stat currentFileStat;
+                    if (stat(fullChildPath.UTF8String, &currentFileStat) == -1) {
+                        continue;
+                    } else if (currentFileStat.st_ino == fileStat.st_ino) {
+                        newFileName = fullChildPath.lastPathComponent;
+                        break;
+                    }
+                }
+
+                if (newFileName != nil) {
+                    NSMutableArray<NSString *> * const mutableBookmarkedLocations = bookmarkedLocations.mutableCopy;
+                    const NSUInteger locationIndex = mutableBookmarkedLocations indexOfObject:locationMrl;
+                    NSString * const newLocationMrl = parentLocationUrl URLByAppendingPathComponent:newFileName.absoluteString;
+                    mutableBookmarkedLocations replaceObjectAtIndex:locationIndex withObject:newLocationMrl;
+                    defaults setObject:mutableBookmarkedLocations forKey:VLCLibraryBookmarkedLocationsKey;
+                }
+            }
+            dispatch_async(dispatch_get_main_queue(), ^{
+                weakSelf internalNodesChanged:nil;
+            });
+        });
+        dispatch_source_set_cancel_handler(fileDispatchSource, ^{
+            close(descriptor);
+        });
+        dispatch_resume(fileDispatchSource);
+        self.observedPathDispatchSources setObject:fileDispatchSource forKey:locationMrl;
+    }
+
+    self.observedPathDispatchSources removeObjectsForKeys:deletedLocations;
+}
+
+- (void)statusViewActivated:(NSNotification *)notification
+{
+    const CGFloat statusNotifierHeight = self.statusNotifierView.frame.size.height;
+    self.outlineViewScrollView.contentInsets =
+        NSEdgeInsetsMake(self.scrollViewInsets.top,
+                         self.scrollViewInsets.left,
+                         self.scrollViewInsets.bottom + statusNotifierHeight,
+                         self.scrollViewInsets.right);
+    self.statusNotifierView.hidden = NO;
+    self.statusNotifierView.animator.alphaValue = 1.0;
+}
+
+- (void)statusViewDeactivated:(NSNotification *)notification
+{
+    NSAnimationContext runAnimationGroup:^(NSAnimationContext * const context) {
+        self.statusNotifierView.animator.alphaValue = 0.0;
+    } completionHandler:^{
+        self.statusNotifierView.hidden = YES;
+        self.outlineViewScrollView.contentInsets = self.scrollViewInsets;
+    };
+}
+
+- (void)statusViewSizeChanged:(NSNotification *)notification
+{
+    if (self.statusNotifierView.hidden) {
+        return;
+    }
+
+    const CGFloat statusNotifierHeight = self.statusNotifierView.frame.size.height;
+    self.outlineViewScrollView.contentInsets =
+        NSEdgeInsetsMake(self.scrollViewInsets.top,
+                         self.scrollViewInsets.left,
+                         self.scrollViewInsets.bottom + statusNotifierHeight,
+                         self.scrollViewInsets.right);
 }
 
 - (NSTreeNode *)nodeForSegmentType:(VLCLibrarySegmentType)segmentType
@@ -157,15 +311,14 @@
              segmentType < VLCLibraryHighSentinelSegment,
              @"Invalid segment type value provided");
 
-    if (segmentType == VLCLibraryVLCTitleSegment || segmentType == VLCLibraryHeaderSegment) {
+    if (segmentType == VLCLibraryHeaderSegmentType) {
         return;
     }
 
-    VLCLibrarySegment * const segment = VLCLibrarySegment segmentWithSegmentType:segmentType;
-    self.libraryWindow.librarySegmentType = segment.segmentType;
+    self.libraryWindow.librarySegmentType = segmentType;
 
-    if (segmentType == VLCLibraryMusicSegment) {
-        self.outlineView expandItem:self nodeForSegmentType:VLCLibraryMusicSegment;
+    if (segmentType == VLCLibraryMusicSegmentType) {
+        self.outlineView expandItem:self nodeForSegmentType:VLCLibraryMusicSegmentType;
     }
 
     NSTreeNode * const targetNode = self nodeForSegmentType:segmentType;
@@ -183,10 +336,18 @@
 {
     NSAssert(outlineView == _outlineView, @"VLCLibraryWindowNavigationSidebarController should only be a delegate for the libraryWindow nav sidebar outline view!");
 
-    NSTableCellView * const cellView = outlineView makeViewWithIdentifier:@"VLCLibrarySegmentCellIdentifier" owner:self;
+    const BOOL isHeader = self outlineView:outlineView isGroupItem:item;
+    NSTableCellView * const cellView = isHeader
+        ? outlineView makeViewWithIdentifier:@"VLCLibrarySegmentHeaderCellIdentifier" owner:self
+        : outlineView makeViewWithIdentifier:@"VLCLibrarySegmentCellIdentifier" owner:self;
     NSAssert(cellView != nil, @"Provided cell view for navigation outline view should be valid!");
     cellView.textField bind:NSValueBinding toObject:cellView withKeyPath:@"objectValue.displayString" options:nil;
     cellView.imageView bind:NSImageBinding toObject:cellView withKeyPath:@"objectValue.displayImage" options:nil;
+
+    if (@available(macOS 10.14, *)) {
+        cellView.imageView.contentTintColor = NSColor.VLCAccentColor;
+    }
+
     return cellView;
 }
 
@@ -198,12 +359,11 @@
         NSTreeNode * const node = self.outlineView itemAtRow:proposedSelectionIndexes.firstIndex;
         VLCLibrarySegment * const segment = (VLCLibrarySegment *)node.representedObject;
 
-        if (segment.segmentType == VLCLibraryVLCTitleSegment ||
-            segment.segmentType == VLCLibraryHeaderSegment) {
+        if (segment.segmentType == VLCLibraryHeaderSegmentType) {
             return NSIndexSet.indexSet;
-        } else if (segment.segmentType == VLCLibraryMusicSegment) {
-            self.outlineView expandItem:self nodeForSegmentType:VLCLibraryMusicSegment;
-            NSTreeNode * const artistsNode = self nodeForSegmentType:VLCLibraryArtistsMusicSubSegment;
+        } else if (segment.segmentType == VLCLibraryMusicSegmentType) {
+            self.outlineView expandItem:self nodeForSegmentType:VLCLibraryMusicSegmentType;
+            NSTreeNode * const artistsNode = self nodeForSegmentType:VLCLibraryArtistsMusicSubSegmentType;
             const NSInteger artistsIndex = self.outlineView rowForItem:artistsNode;
             return NSIndexSet indexSetWithIndex:artistsIndex;
         }
@@ -240,7 +400,7 @@
 {
     NSTreeNode * const treeNode = (NSTreeNode *)item;
     VLCLibrarySegment * const segment = (VLCLibrarySegment *)treeNode.representedObject;
-    return segment.segmentType == VLCLibraryHeaderSegment;
+    return segment.segmentType == VLCLibraryHeaderSegmentType;
 }
 
 @end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.h Added

@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * VLCLibraryWindowPlayQueueSidebarViewController.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+#import "VLCLibraryWindowAbstractSidebarViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class VLCDragDropView;
+@class VLCPlayQueueController;
+@class VLCPlayQueueDataSource;
+@class VLCPlayQueueSortingMenuController;
+@class VLCRoundedCornerTextField;
+
+@interface VLCLibraryWindowPlayQueueSidebarViewController : VLCLibraryWindowAbstractSidebarViewController
+
+@property (readwrite, weak) IBOutlet NSTableView *tableView;
+@property (readwrite, weak) IBOutlet VLCDragDropView *dragDropView;
+@property (readwrite, weak) IBOutlet NSBox *dragDropImageBackgroundBox;
+@property (readwrite, weak) IBOutlet NSButton *openMediaButton;
+@property (readwrite, weak) IBOutlet NSBox *bottomButtonsSeparator;
+@property (readwrite, weak) IBOutlet NSButton *repeatButton;
+@property (readwrite, weak) IBOutlet NSButton *shuffleButton;
+
+@property (readwrite, nonatomic) NSTextField *counterLabel;
+
+@property (readonly) VLCPlayQueueController *playQueueController;
+@property (readonly) VLCPlayQueueDataSource *dataSource;
+@property (readonly) VLCPlayQueueSortingMenuController *sortingMenuController;
+
+- (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow;
+
+- (IBAction)tableDoubleClickAction:(id)sender;
+- (IBAction)openMedia:(id)sender;
+- (IBAction)shuffleAction:(id)sender;
+- (IBAction)repeatAction:(id)sender;
+- (IBAction)sortPlayQueue:(id)sender;
+- (IBAction)clearPlayQueue:(id)sender;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.m Added

@@ -0,0 +1,242 @@
+/*****************************************************************************
+ * VLCLibraryWindowPlayQueueSidebarViewController.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCLibraryWindowPlayQueueSidebarViewController.h"
+
+#import "extensions/NSColor+VLCAdditions.h"
+#import "extensions/NSFont+VLCAdditions.h"
+#import "extensions/NSImage+VLCAdditions.h"
+#import "extensions/NSString+Helpers.h"
+#import "extensions/NSWindow+VLCAdditions.h"
+#import "library/VLCLibraryUIUnits.h"
+#import "library/VLCLibraryWindow.h"
+#import "main/VLCMain.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueDataSource.h"
+#import "playqueue/VLCPlayQueueSortingMenuController.h"
+#import "views/VLCDragDropView.h"
+#import "views/VLCRoundedCornerTextField.h"
+#import "windows/VLCOpenWindowController.h"
+
+@implementation VLCLibraryWindowPlayQueueSidebarViewController
+
+@synthesize counterLabel = _counterLabel;
+
+- (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow
+{
+    return super initWithLibraryWindow:libraryWindow
+                                nibName:@"VLCLibraryWindowPlayQueueView";
+}
+
+- (void)viewDidLoad
+{
+    super viewDidLoad;
+
+    self.dragDropView.dropTarget = self.libraryWindow;
+
+    _playQueueController = VLCMain.sharedInstance.playQueueController;
+    _dataSource = VLCPlayQueueDataSource alloc init;
+    self.dataSource.playQueueController = self.playQueueController;
+    self.dataSource.tableView = self.tableView;
+    self.dataSource.dragDropView = self.dragDropView;
+    self.dataSource.counterTextField = self.counterLabel;
+    self.dataSource prepareForUse;
+    self.playQueueController.playQueueDataSource = self.dataSource;
+
+    self.tableView.dataSource = self.dataSource;
+    self.tableView.delegate = self.dataSource;
+    self.tableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;
+    self.tableView reloadData;
+
+    self.openMediaButton.title = _NS("Open media...");
+    self.dragDropImageBackgroundBox.fillColor = NSColor.VLClibrarySeparatorLightColor;
+
+    self repeatStateUpdated:nil;
+    self shuffleStateUpdated:nil;
+
+    NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
+    notificationCenter addObserver:self
+                           selector:@selector(shuffleStateUpdated:)
+                               name:VLCPlaybackOrderChanged
+                             object:nil;
+    notificationCenter addObserver:self
+                           selector:@selector(repeatStateUpdated:)
+                               name:VLCPlaybackRepeatChanged
+                             object:nil;
+}
+
+- (NSString *)title
+{
+    return _NS("Play Queue");
+}
+
+- (BOOL)supportsItemCount
+{
+    return YES;
+}
+
+- (void)setCounterLabel:(NSTextField *)counterLabel
+{
+    _counterLabel = counterLabel;
+    self.dataSource.counterTextField = counterLabel;
+}
+
+#pragma mark - appearance setters
+
+- (void)updateColorsBasedOnAppearance:(NSAppearance *)appearance
+{
+    super updateColorsBasedOnAppearance:appearance;
+
+    BOOL isDark = NO;
+    if (@available(macOS 10.14, *)) {
+        isDark = appearance.name isEqualToString:NSAppearanceNameDarkAqua || 
+                 appearance.name isEqualToString:NSAppearanceNameVibrantDark;
+    }
+
+    // If we try to pull the view's effectiveAppearance we are going to get the previous 
+    // appearance's name despite responding to the effectiveAppearance change (???) so it is a
+    // better idea to pull from the general system theme preference, which is always up-to-date
+    if (isDark) {
+        self.bottomButtonsSeparator.borderColor = NSColor.VLClibrarySeparatorDarkColor;
+        self.dragDropImageBackgroundBox.hidden = NO;
+    } else {
+        self.bottomButtonsSeparator.borderColor = NSColor.VLClibrarySeparatorLightColor;
+        self.dragDropImageBackgroundBox.hidden = YES;
+    }
+}
+
+#pragma mark - table view interaction
+
+- (IBAction)tableDoubleClickAction:(id)sender
+{
+    const NSInteger selectedRow = self.tableView.selectedRow;
+    if (selectedRow == -1) {
+        return;
+    }
+    VLCMain.sharedInstance.playQueueController playItemAtIndex:selectedRow;
+}
+
+#pragma mark - open media handling
+
+- (IBAction)openMedia:(id)sender
+{
+    VLCMain.sharedInstance.open openFileGeneric;
+}
+
+#pragma mark - playmode state display and interaction
+
+- (IBAction)shuffleAction:(id)sender
+{
+    if (_playQueueController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL) {
+        _playQueueController.playbackOrder = VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM;
+    } else {
+        _playQueueController.playbackOrder = VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL;
+    }
+}
+
+- (void)shuffleStateUpdated:(NSNotification *)aNotification
+{
+    if (@available(macOS 11.0, *)) {
+        self.shuffleButton.image = NSImage imageWithSystemSymbolName:@"shuffle"
+                                             accessibilityDescription:@"Shuffle";
+        self.shuffleButton.contentTintColor =
+            self.playQueueController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL ?
+                nil : NSColor.VLCAccentColor;
+    } else {
+        self.shuffleButton.image =
+            self.playQueueController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL ?
+                NSImage imageNamed:@"shuffleOff" :
+                NSImage imageNamed:@"shuffleOn" imageTintedWithColor:NSColor.VLCAccentColor;
+    }
+}
+
+- (IBAction)repeatAction:(id)sender
+{
+    const enum vlc_playlist_playback_repeat repeatState = self.playQueueController.playbackRepeat;
+    switch (repeatState) {
+        case VLC_PLAYLIST_PLAYBACK_REPEAT_ALL:
+            self.playQueueController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_NONE;
+            break;
+        case VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT:
+            self.playQueueController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_ALL;
+            break;
+        default:
+            self.playQueueController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT;
+            break;
+    }
+}
+
+- (void)repeatStateUpdated:(NSNotification *)aNotification
+{
+    const enum vlc_playlist_playback_repeat repeatState = self.playQueueController.playbackRepeat;
+
+    if (@available(macOS 11.0, *)) {
+        switch (repeatState) {
+            case VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT:
+                self.repeatButton.image = NSImage imageWithSystemSymbolName:@"repeat.1"
+                                                    accessibilityDescription:@"Repeat current";
+                self.repeatButton.contentTintColor = NSColor.VLCAccentColor;
+                break;
+            case VLC_PLAYLIST_PLAYBACK_REPEAT_ALL:
+                self.repeatButton.image = NSImage imageWithSystemSymbolName:@"repeat"
+                                                    accessibilityDescription:@"Repeat";
+                self.repeatButton.contentTintColor = NSColor.VLCAccentColor;
+                break;
+            default:
+                self.repeatButton.image = NSImage imageWithSystemSymbolName:@"repeat"
+                                                    accessibilityDescription:@"Repeat";
+                self.repeatButton.contentTintColor = nil;
+                break;
+        }
+    } else {
+        switch (repeatState) {
+            case VLC_PLAYLIST_PLAYBACK_REPEAT_ALL:
+                self.repeatButton.image =
+                    NSImage imageNamed:@"repeatAll" imageTintedWithColor:NSColor.VLCAccentColor;
+                break;
+            case VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT:
+                self.repeatButton.image =
+                    NSImage imageNamed:@"repeatOne" imageTintedWithColor:NSColor.VLCAccentColor;
+                break;
+            default:
+                self.repeatButton.image = NSImage imageNamed:@"repeatOff";
+                break;
+        }
+    }
+}
+
+- (IBAction)sortPlayQueue:(id)sender
+{
+    if (!self.sortingMenuController) {
+        _sortingMenuController = VLCPlayQueueSortingMenuController alloc init;
+    }
+    NSMenu popUpContextMenu:self.sortingMenuController.playQueueSortingMenu
+                   withEvent:NSApp.currentEvent
+                     forView:sender;
+}
+
+- (IBAction)clearPlayQueue:(id)sender
+{
+    self.playQueueController clearPlayQueue;
+}
+
+@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowSidebarRootViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowSidebarRootViewController.h Changed

@@ -25,7 +25,7 @@
 @class VLCRoundedCornerTextField;
 @class VLCLibraryWindow;
 @class VLCLibraryWindowChaptersSidebarViewController;
-@class VLCLibraryWindowPlaylistSidebarViewController;
+@class VLCLibraryWindowPlayQueueSidebarViewController;
 @class VLCLibraryWindowTitlesSidebarViewController;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -47,10 +47,10 @@
 @property (readonly) VLCRoundedCornerTextField *counterLabel;
 @property (readonly) NSLayoutConstraint *counterLabelInHeaderConstraint;
 @property (readonly) NSLayoutConstraint *counterLabelInChildViewConstraint;
-@property (readonly) NSLayoutConstraint *playlistHeaderTopConstraint;
-@property (readonly) NSTextField *playlistHeaderLabel;
+@property (readonly) NSLayoutConstraint *playQueueHeaderTopConstraint;
+@property (readonly) NSTextField *playQueueHeaderLabel;
 
-@property (readonly) VLCLibraryWindowPlaylistSidebarViewController *playlistSidebarViewController;
+@property (readonly) VLCLibraryWindowPlayQueueSidebarViewController *playQueueSidebarViewController;
 @property (readonly) VLCLibraryWindowChaptersSidebarViewController *chaptersSidebarViewController;
 @property (readonly) VLCLibraryWindowTitlesSidebarViewController *titlesSidebarViewController;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowSidebarRootViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowSidebarRootViewController.m Changed

@@ -24,6 +24,7 @@
 
 #import "extensions/NSFont+VLCAdditions.h"
 #import "extensions/NSString+Helpers.h"
+#import "extensions/NSView+VLCAdditions.h"
 #import "extensions/NSWindow+VLCAdditions.h"
 
 #import "main/VLCMain.h"
@@ -31,12 +32,12 @@
 #import "library/VLCLibraryUIUnits.h"
 #import "library/VLCLibraryWindow.h"
 #import "library/VLCLibraryWindowChaptersSidebarViewController.h"
-#import "library/VLCLibraryWindowPlaylistSidebarViewController.h"
+#import "library/VLCLibraryWindowPlayQueueSidebarViewController.h"
 #import "library/VLCLibraryWindowSidebarChildViewController.h"
 #import "library/VLCLibraryWindowTitlesSidebarViewController.h"
 
-#import "playlist/VLCPlayerController.h"
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 #include "views/VLCRoundedCornerTextField.h"
 
@@ -60,13 +61,13 @@
 - (void)viewDidLoad
 {
     super viewDidLoad;
-    self setupPlaylistTitle;
+    self setupPlayQueueTitle;
     self setupCounterLabel;
 
     self.mainVideoModeEnabled = NO;
 
-    _playlistSidebarViewController =
-        VLCLibraryWindowPlaylistSidebarViewController alloc initWithLibraryWindow:self.libraryWindow;
+    _playQueueSidebarViewController =
+        VLCLibraryWindowPlayQueueSidebarViewController alloc initWithLibraryWindow:self.libraryWindow;
     _chaptersSidebarViewController =
         VLCLibraryWindowChaptersSidebarViewController alloc initWithLibraryWindow:self.libraryWindow;
     _titlesSidebarViewController =
@@ -89,37 +90,37 @@
                              object:nil;
 }
 
-- (void)setupPlaylistTitle
+- (void)setupPlayQueueTitle
 {
-    _playlistHeaderLabel = NSTextField alloc init;
-    self.playlistHeaderLabel.translatesAutoresizingMaskIntoConstraints = NO;
-    self.playlistHeaderLabel.font = NSFont.VLClibrarySectionHeaderFont;
-    self.playlistHeaderLabel.editable = NO;
-    self.playlistHeaderLabel.bezeled = NO;
-    self.playlistHeaderLabel.drawsBackground = NO;
-    self.playlistHeaderLabel.textColor = NSColor.headerTextColor;
-
-    self.view addSubview:self.playlistHeaderLabel;
-    _playlistHeaderTopConstraint = 
-        self.playlistHeaderLabel.topAnchor constraintEqualToAnchor:self.view.topAnchor
-                                                           constant:VLCLibraryUIUnits.smallSpacing;
+    _playQueueHeaderLabel = NSTextField alloc init;
+    self.playQueueHeaderLabel.translatesAutoresizingMaskIntoConstraints = NO;
+    self.playQueueHeaderLabel.font = NSFont.VLCLibrarySubsectionHeaderFont;
+    self.playQueueHeaderLabel.editable = NO;
+    self.playQueueHeaderLabel.bezeled = NO;
+    self.playQueueHeaderLabel.drawsBackground = NO;
+    self.playQueueHeaderLabel.textColor = NSColor.headerTextColor;
+
+    self.view addSubview:self.playQueueHeaderLabel;
+    _playQueueHeaderTopConstraint = 
+        self.playQueueHeaderLabel.topAnchor constraintEqualToAnchor:self.view.topAnchor
+                                                            constant:VLCLibraryUIUnits.smallSpacing;
     NSLayoutConstraint activateConstraints:@
-        self.playlistHeaderTopConstraint,
-        self.playlistHeaderLabel.bottomAnchor constraintEqualToAnchor:self.targetView.topAnchor
-                                                              constant:-VLCLibraryUIUnits.smallSpacing,
-        self.playlistHeaderLabel.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor
-                                                               constant:VLCLibraryUIUnits.largeSpacing 
+        self.playQueueHeaderTopConstraint,
+        self.playQueueHeaderLabel.bottomAnchor constraintEqualToAnchor:self.targetView.topAnchor
+                                                               constant:-VLCLibraryUIUnits.smallSpacing,
+        self.playQueueHeaderLabel.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor
+                                                                constant:VLCLibraryUIUnits.largeSpacing 
     ;
 }
 
 - (void)setupViewSelectorSegments
 {
     self.viewSelector.segmentCount = 1;
-    self.viewSelector setLabel:self.playlistSidebarViewController.title
-                         forSegment:self.viewSelector.segmentCount - 1;
+    self.viewSelector setLabel:self.playQueueSidebarViewController.title
+                     forSegment:self.viewSelector.segmentCount - 1;
 
-    VLCPlaylistController * const playlistController = VLCMain.sharedInstance.playlistController;
-    VLCPlayerController * const playerController = playlistController.playerController;
+    VLCPlayQueueController * const playQueueController = VLCMain.sharedInstance.playQueueController;
+    VLCPlayerController * const playerController = playQueueController.playerController;
     if (playerController.numberOfTitlesOfCurrentMedia > 0) {
         self.viewSelector.segmentCount++; 
         self.viewSelector setLabel:self.titlesSidebarViewController.title
@@ -145,7 +146,7 @@
     self.view addSubview:self.counterLabel;
 
     _counterLabelInHeaderConstraint = 
-        self.counterLabel.centerYAnchor constraintEqualToAnchor:self.playlistHeaderLabel.centerYAnchor;
+        self.counterLabel.centerYAnchor constraintEqualToAnchor:self.playQueueHeaderLabel.centerYAnchor;
     _counterLabelInChildViewConstraint =
         self.counterLabel.topAnchor constraintEqualToAnchor:self.targetView.topAnchor
                                                     constant:VLCLibraryUIUnits.smallSpacing;
@@ -166,20 +167,20 @@
 {
     self setupViewSelectorSegments;
 
-    VLCPlaylistController * const playlistController = VLCMain.sharedInstance.playlistController;
-    VLCPlayerController * const playerController = playlistController.playerController;
+    VLCPlayQueueController * const playQueueController = VLCMain.sharedInstance.playQueueController;
+    VLCPlayerController * const playerController = playQueueController.playerController;
     const BOOL titlesEnabled = playerController.numberOfTitlesOfCurrentMedia > 0;
     const BOOL chaptersEnabled = playerController.numberOfChaptersForCurrentTitle > 0;
     
     self.viewSelector.hidden = !chaptersEnabled && !titlesEnabled;
     self.topInternalConstraint.active = !self.viewSelector.hidden;
 
-    const NSLayoutPriority playlistCompressionPriority =
+    const NSLayoutPriority playQueueCompressionPriority =
         self.viewSelector.hidden ? NSLayoutPriorityDefaultLow : NSLayoutPriorityRequired;
-    self.playlistHeaderLabel.hidden = chaptersEnabled;
-    self.playlistHeaderLabel setContentCompressionResistancePriority:playlistCompressionPriority
-                                                       forOrientation:NSLayoutConstraintOrientationVertical;
-    self.playlistHeaderTopConstraint.active = !self.playlistHeaderLabel.hidden;
+    self.playQueueHeaderLabel.hidden = chaptersEnabled;
+    self.playQueueHeaderLabel setContentCompressionResistancePriority:playQueueCompressionPriority
+                                                        forOrientation:NSLayoutConstraintOrientationVertical;
+    self.playQueueHeaderTopConstraint.active = !self.playQueueHeaderLabel.hidden;
 
     NSLayoutConstraint * const counterLabelConstraintToActivate = self.viewSelector.hidden
         ? self.counterLabelInHeaderConstraint
@@ -203,8 +204,8 @@
     NSParameterAssert(sender == self.viewSelector);
     const NSInteger selectedSegment = self.viewSelector.selectedSegment;
     NSString * const selectedSegmentLabel = self.viewSelector labelForSegment:selectedSegment;
-    if (selectedSegmentLabel isEqualToString:self.playlistSidebarViewController.title) {
-        self setChildViewController:self.playlistSidebarViewController;
+    if (selectedSegmentLabel isEqualToString:self.playQueueSidebarViewController.title) {
+        self setChildViewController:self.playQueueSidebarViewController;
     } else if (selectedSegmentLabel isEqualToString:self.titlesSidebarViewController.title) {
         self setChildViewController:self.titlesSidebarViewController;
     } else if (selectedSegmentLabel isEqualToString:self.chaptersSidebarViewController.title) {
@@ -224,17 +225,12 @@
         viewController.counterLabel = self.counterLabel;
     }
 
-    self.playlistHeaderLabel.stringValue = viewController.title;
+    self.playQueueHeaderLabel.stringValue = viewController.title;
 
     NSView * const view = viewController.view;
     self.targetView.subviews = @view;
     view.translatesAutoresizingMaskIntoConstraints = NO;
-    NSLayoutConstraint activateConstraints:@
-        view.topAnchor constraintEqualToAnchor:self.targetView.topAnchor,
-        view.bottomAnchor constraintEqualToAnchor:self.targetView.bottomAnchor,
-        view.leadingAnchor constraintEqualToAnchor:self.targetView.leadingAnchor,
-        view.trailingAnchor constraintEqualToAnchor:self.targetView.trailingAnchor
-    ;
+    view applyConstraintsToFillSuperview;
 }
 
 - (void)setMainVideoModeEnabled:(BOOL)mainVideoModeEnabled
@@ -251,7 +247,7 @@
         internalTopConstraintConstant += self.libraryWindow.titlebarHeight;
     }
     self.topInternalConstraint.constant = internalTopConstraintConstant;
-    self.playlistHeaderTopConstraint.constant = internalTopConstraintConstant;
+    self.playQueueHeaderTopConstraint.constant = internalTopConstraintConstant;
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowSplitViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowSplitViewController.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowSplitViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowSplitViewController.m Changed

@@ -31,6 +31,12 @@
 
 #import "windows/video/VLCMainVideoViewController.h"
 
+@interface VLCLibraryWindowSplitViewController ()
+
+@property (readwrite) BOOL priorNavSidebarCollapsedState;
+
+@end
+
 @implementation VLCLibraryWindowSplitViewController
 
 - (void)viewDidLoad
@@ -61,11 +67,12 @@
     }
 
     _navSidebarItem.preferredThicknessFraction = 0.2;
+    _navSidebarItem.minimumThickness = VLCLibraryUIUnits.libraryWindowNavSidebarMinWidth;
     _navSidebarItem.maximumThickness = VLCLibraryUIUnits.libraryWindowNavSidebarMaxWidth;
 
     self.multifunctionSidebarItem.preferredThicknessFraction = 0.2;
     self.multifunctionSidebarItem.maximumThickness =
-        VLCLibraryUIUnits.libraryWindowPlaylistSidebarMaxWidth;
+        VLCLibraryUIUnits.libraryWindowPlayQueueSidebarMaxWidth;
     self.multifunctionSidebarItem.canCollapse = YES;
     self.multifunctionSidebarItem.collapseBehavior =
         NSSplitViewItemCollapseBehaviorPreferResizingSiblingsWithFixedSplitView;
@@ -88,6 +95,9 @@
 
 - (IBAction)toggleNavigationSidebar:(id)sender
 {
+    if (self.mainVideoModeEnabled) {
+        return;
+    }
     const BOOL navigationSidebarCollapsed = self.navSidebarItem.isCollapsed;
     self.navSidebarItem.animator.collapsed = !navigationSidebarCollapsed;
 }
@@ -100,7 +110,27 @@
     const NSControlStateValue controlState =
         self.multifunctionSidebarItem.isCollapsed ? NSControlStateValueOff : NSControlStateValueOn;
     self.libraryWindow.playQueueToggle.state = controlState;
-    self.libraryWindow.videoViewController.playlistButton.state = controlState;
+    self.libraryWindow.videoViewController.playQueueButton.state = controlState;
+}
+
+- (void)setMainVideoModeEnabled:(BOOL)mainVideoModeEnabled
+{
+    if (self.mainVideoModeEnabled == mainVideoModeEnabled) {
+        return;
+    } else if (mainVideoModeEnabled) {
+        self.priorNavSidebarCollapsedState = self.navSidebarItem.isCollapsed;
+        self.navSidebarItem.collapsed = YES;
+    } else {
+        self.navSidebarItem.collapsed = self.priorNavSidebarCollapsedState;
+    }
+
+    _mainVideoModeEnabled = mainVideoModeEnabled;
+    self.multifunctionSidebarViewController.mainVideoModeEnabled = mainVideoModeEnabled;
+}
+
+- (BOOL)splitView:(NSSplitView *)splitView canCollapseSubview:(NSView *)subview
+{
+    return subview != self.navSidebarViewController.view || !self.mainVideoModeEnabled;
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowTitlesSidebarViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowTitlesSidebarViewController.m Changed

@@ -25,9 +25,9 @@
 #import "extensions/NSString+Helpers.h"
 #import "library/VLCLibraryDataTypes.h"
 #import "main/VLCMain.h"
-#import "playlist/VLCPlayerController.h"
-#import "playlist/VLCPlayerTitle.h"
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayerController.h"
+#import "playqueue/VLCPlayerTitle.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 @interface VLCLibraryWindowTitlesSidebarViewController ()
 
@@ -66,12 +66,17 @@
                  options:nil;
 
     self updateTitleList;
+    self updateTitleSelection;
 
     NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
     notificationCenter addObserver:self
                            selector:@selector(titleListChanged:)
                                name:VLCPlayerTitleListChanged
                              object:nil;
+    notificationCenter addObserver:self
+                           selector:@selector(titleSelectionChanged:)
+                               name:VLCPlayerTitleSelectionChanged
+                             object:nil;
 }
 
 - (NSString *)title
@@ -98,7 +103,7 @@
 - (void)updateTitleList
 {
     VLCPlayerController * const playerController =
-        VLCMain.sharedInstance.playlistController.playerController;
+        VLCMain.sharedInstance.playQueueController.playerController;
     const size_t titleCount = playerController.numberOfTitlesOfCurrentMedia;
     self.internalItemCount = titleCount;
     self.titlesArrayController.content = playerController.titlesOfCurrentMedia;
@@ -113,7 +118,21 @@
         return;
     }
 
-    VLCMain.sharedInstance.playlistController.playerController setSelectedTitleIndex:selectedTitle.index;
+    VLCMain.sharedInstance.playQueueController.playerController setSelectedTitleIndex:selectedTitle.index;
+}
+
+- (void)titleSelectionChanged:(NSNotification *)notification
+{
+    self updateTitleSelection;
+}
+
+- (void)updateTitleSelection
+{
+    VLCPlayerController * const playerController =
+        VLCMain.sharedInstance.playQueueController.playerController;
+    const NSUInteger selectedTitleIndex = playerController.selectedTitleIndex;
+    NSIndexSet * const indexSet = NSIndexSet indexSetWithIndex:selectedTitleIndex;
+    self.tableView selectRowIndexes:indexSet byExtendingSelection:NO;
 }
 
 # pragma mark - NSTableView delegation

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowToolbarDelegate.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowToolbarDelegate.h Changed

@@ -26,10 +26,17 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class VLCLibraryWindow;
+typedef NS_OPTIONS(NSUInteger, VLCLibraryWindowToolbarDisplayFlags) {
+    VLCLibraryWindowToolbarDisplayFlagNavigationButtons = 1 << 0,
+    VLCLibraryWindowToolbarDisplayFlagToggleViewModeSegmentButton = 1 << 1,
+    VLCLibraryWindowToolbarDisplayFlagSortOrderButton = 1 << 2,
+    VLCLibraryWindowToolbarDisplayFlagLibrarySearchBar = 1 << 3
+};
 
 extern NSString * const VLCLibraryWindowTrackingSeparatorToolbarItemIdentifier;
 
+@class VLCLibraryWindow;
+
 @interface VLCLibraryWindowToolbarDelegate : NSObject<NSToolbarDelegate>
 
 @property (readwrite, weak) IBOutlet VLCLibraryWindow *libraryWindow;
@@ -37,6 +44,7 @@
 
 @property (readonly, strong) NSToolbarItem *trackingSeparatorToolbarItem;
 
+@property (readwrite, weak) IBOutlet NSToolbarItem *vlcIconToolbarItem;
 @property (readwrite, weak) IBOutlet NSToolbarItem *toggleNavSidebarToolbarItem;
 @property (readwrite, weak) IBOutlet NSToolbarItem *backwardsToolbarItem;
 @property (readwrite, weak) IBOutlet NSToolbarItem *forwardsToolbarItem;
@@ -44,12 +52,11 @@
 @property (readwrite, weak) IBOutlet NSToolbarItem *sortOrderToolbarItem;
 @property (readwrite, weak) IBOutlet NSToolbarItem *flexibleSpaceToolbarItem;
 @property (readwrite, weak) IBOutlet NSToolbarItem *librarySearchToolbarItem;
-@property (readwrite, weak) IBOutlet NSToolbarItem *togglePlaylistToolbarItem;
+@property (readwrite, weak) IBOutlet NSToolbarItem *togglePlayQueueToolbarItem;
 @property (readwrite, weak) IBOutlet NSToolbarItem *renderersToolbarItem;
 
 - (IBAction)rendererControlAction:(id)sender;
-
-- (void)layoutForSegment:(VLCLibrarySegmentType)segment;
+- (void)applyVisiblityFlags:(VLCLibraryWindowToolbarDisplayFlags)flags;
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/VLCLibraryWindowToolbarDelegate.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCLibraryWindowToolbarDelegate.m Changed

@@ -71,7 +71,14 @@
 
     self.libraryViewModeToolbarItem.toolTip = _NS("Grid View or List View");
     self.sortOrderToolbarItem.toolTip = _NS("Select Sorting Mode");
-    self.togglePlaylistToolbarItem.toolTip = _NS("Toggle Playqueue");
+    self.togglePlayQueueToolbarItem.toolTip = _NS("Toggle Play Queue");
+
+    self.vlcIconToolbarItem.minSize = NSMakeSize(18, 18);
+    self.vlcIconToolbarItem.maxSize = NSMakeSize(18, 18);
+
+    NSImageView * const vlcIconImageView = NSImageView alloc initWithFrame:NSZeroRect;
+    vlcIconImageView.image = NSApp.applicationIconImage;
+    self.vlcIconToolbarItem.view = vlcIconImageView;;
 
     // Hide renderers toolbar item at first. Start discoveries and wait for notifications about
     // renderers being added or removed to keep hidden or show depending on outcome
@@ -130,57 +137,14 @@
 
 - (void)updatePlayqueueToggleState
 {
-    NSView * const playlistView =
+    NSView * const multifunctionSidebar =
         self.libraryWindow.splitViewController.multifunctionSidebarViewController.view;
     NSSplitView * const sv = self.libraryWindow.mainSplitView;
     self.libraryWindow.playQueueToggle.state =
-        !sv.arrangedSubviews containsObject:playlistView || sv isSubviewCollapsed:playlistView ?
-                NSControlStateValueOff : NSControlStateValueOn;
-}
-
-#pragma mark - convenience method for configuration of toolbar items layout
-
-- (void)layoutForSegment:(VLCLibrarySegmentType)segment
-{
-    switch(segment) {
-        case VLCLibraryLowSentinelSegment:
-        case VLCLibraryVLCTitleSegment:
-        case VLCLibraryHeaderSegment:
-            vlc_assert_unreachable();
-        case VLCLibraryHomeSegment:
-            self setForwardsBackwardsToolbarItemsVisible:NO;
-            self setSortOrderToolbarItemVisible:NO;
-            self setLibrarySearchToolbarItemVisible:NO;
-            self setViewModeToolbarItemVisible:NO;
-            break;
-        case VLCLibraryVideoSegment:
-        case VLCLibraryShowsVideoSubSegment:
-        case VLCLibraryMusicSegment:
-        case VLCLibraryArtistsMusicSubSegment:
-        case VLCLibraryAlbumsMusicSubSegment:
-        case VLCLibrarySongsMusicSubSegment:
-        case VLCLibraryGenresMusicSubSegment:
-        case VLCLibraryGroupsSegment:
-        case VLCLibraryGroupsGroupSubSegment:
-        case VLCLibraryPlaylistsSegment:
-        case VLCLibraryPlaylistsMusicOnlyPlaylistsSubSegment:
-        case VLCLibraryPlaylistsVideoOnlyPlaylistsSubSegment:
-            self setForwardsBackwardsToolbarItemsVisible:NO;
-            self setSortOrderToolbarItemVisible:YES;
-            self setLibrarySearchToolbarItemVisible:YES;
-            self setViewModeToolbarItemVisible:YES;
-            break;
-        case VLCLibraryBrowseSegment:
-        case VLCLibraryStreamsSegment:
-        case VLCLibraryBrowseBookmarkedLocationSubSegment:
-            self setForwardsBackwardsToolbarItemsVisible:YES;
-            self setSortOrderToolbarItemVisible:NO;
-            self setLibrarySearchToolbarItemVisible:NO;
-            self setViewModeToolbarItemVisible:YES;
-            break;
-        case VLCLibraryHighSentinelSegment:
-            vlc_assert_unreachable();
-    }
+        !sv.arrangedSubviews containsObject:multifunctionSidebar ||
+        sv isSubviewCollapsed:multifunctionSidebar
+            ? NSControlStateValueOff
+            : NSControlStateValueOn;
 }
 
 #pragma mark - item visibility handling
@@ -240,12 +204,14 @@
 
     self insertToolbarItem:self.backwardsToolbarItem 
                   inFrontOf:@self.trackingSeparatorToolbarItem,
-                              self.toggleNavSidebarToolbarItem;
+                              self.toggleNavSidebarToolbarItem,
+                              self.vlcIconToolbarItem;
 
     self insertToolbarItem:self.forwardsToolbarItem
                   inFrontOf:@self.backwardsToolbarItem,
                               self.trackingSeparatorToolbarItem,
-                              self.toggleNavSidebarToolbarItem;
+                              self.toggleNavSidebarToolbarItem,
+                              self.vlcIconToolbarItem;
 }
 
 - (void)setSortOrderToolbarItemVisible:(BOOL)visible
@@ -260,7 +226,8 @@
                               self.forwardsToolbarItem,
                               self.backwardsToolbarItem,
                               self.trackingSeparatorToolbarItem,
-                              self.toggleNavSidebarToolbarItem;
+                              self.toggleNavSidebarToolbarItem,
+                              self.vlcIconToolbarItem;
 }
 
 - (void)setLibrarySearchToolbarItemVisible:(BOOL)visible
@@ -271,10 +238,10 @@
         return;
     }
 
-    // Display as far to the right as possible, but not in front of the playlist toggle button
+    // Display as far to the right as possible, but not in front of the multifunc bar toggle button
     NSMutableArray<NSToolbarItem *> * const currentToolbarItems =
         NSMutableArray arrayWithArray:self.toolbar.items;
-    if (currentToolbarItems.lastObject == self.togglePlaylistToolbarItem) {
+    if (currentToolbarItems.lastObject == self.togglePlayQueueToolbarItem) {
         currentToolbarItems removeLastObject;
     }
 
@@ -295,7 +262,16 @@
                   inFrontOf:@self.forwardsToolbarItem,
                               self.backwardsToolbarItem,
                               self.trackingSeparatorToolbarItem,
-                              self.toggleNavSidebarToolbarItem;
+                              self.toggleNavSidebarToolbarItem,
+                              self.vlcIconToolbarItem;
+}
+
+- (void)applyVisiblityFlags:(VLCLibraryWindowToolbarDisplayFlags)flags
+{
+    self setForwardsBackwardsToolbarItemsVisible:flags & VLCLibraryWindowToolbarDisplayFlagNavigationButtons;
+    self setSortOrderToolbarItemVisible:flags & VLCLibraryWindowToolbarDisplayFlagSortOrderButton;
+    self setLibrarySearchToolbarItemVisible:flags & VLCLibraryWindowToolbarDisplayFlagLibrarySearchBar;
+    self setViewModeToolbarItemVisible:flags & VLCLibraryWindowToolbarDisplayFlagToggleViewModeSegmentButton;
 }
 
 @end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCMediaLibraryFolderObserver.h Added

@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * VLCMediaLibraryFolderObserver.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString * const VLCMediaLibraryFolderFSEvent;
+
+@interface VLCMediaLibraryFolderObserver : NSObject
+
+@property (readonly) NSURL *url;
+
+- (instancetype)initWithURL:(NSURL *)url;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/VLCMediaLibraryFolderObserver.m Added

@@ -0,0 +1,102 @@
+/*****************************************************************************
+ * VLCMediaLibraryFolderObserver.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCMediaLibraryFolderObserver.h"
+
+NSString * const VLCMediaLibraryFolderFSEvent = @"VLCMediaLibraryFolderFSEvent";
+NSString * const VLCMediaLibraryFolderFSLastEventIdPrefix = @"VLCMediaLibraryFolderFSLastEventId_";
+
+@interface VLCMediaLibraryFolderObserver ()
+
+@property (readonly) FSEventStreamRef stream;
+@property (readonly) CFStringRef urlPathRef;
+@property (readonly) CFArrayRef pathsToWatch;
+@property (readonly) NSString *defaultsKey;
+
+@end
+
+void fsEventCallback(ConstFSEventStreamRef streamRef,
+                     void *clientCallBackInfo,
+                     size_t numEvents,
+                     void *eventPaths,
+                     const FSEventStreamEventFlags eventFlags,
+                     const FSEventStreamEventId eventIds)
+{
+    if (numEvents == 0) {
+        return;
+    }
+    
+    VLCMediaLibraryFolderObserver * const observer =
+        (__bridge VLCMediaLibraryFolderObserver *)clientCallBackInfo;
+    NSNumber * const eventId = @(eventIds0);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSUserDefaults.standardUserDefaults setObject:eventId forKey:observer.defaultsKey;
+        NSNotificationCenter.defaultCenter postNotificationName:VLCMediaLibraryFolderFSEvent
+                                                          object:observer.url;
+    });
+}
+
+@implementation VLCMediaLibraryFolderObserver
+
+- (instancetype)initWithURL:(NSURL *)url
+{
+    self = super init;
+    if (self) {
+        _url = url;
+        _urlPathRef = (__bridge_retained CFStringRef)url.path;
+        _pathsToWatch = CFArrayCreate(NULL, (const void **)&_urlPathRef, 1, NULL);
+        _defaultsKey =
+            NSString stringWithFormat:@"%@%@", VLCMediaLibraryFolderFSLastEventIdPrefix, url.path;
+
+        FSEventStreamContext context = { 0, (__bridge void *)self, NULL, NULL, NULL };
+        const FSEventStreamCreateFlags createFlags =
+            kFSEventStreamCreateFlagUseCFTypes | kFSEventStreamCreateFlagIgnoreSelf;
+
+        NSNumber * const lastEventIdDefaults =
+            (NSNumber *)NSUserDefaults.standardUserDefaults objectForKey:self.defaultsKey;
+        const FSEventStreamEventId lastEventId = lastEventIdDefaults == nil
+            ? kFSEventStreamEventIdSinceNow
+            : lastEventIdDefaults.unsignedLongLongValue;
+
+        _stream = FSEventStreamCreate(kCFAllocatorDefault,
+                                      &fsEventCallback,
+                                      &context,
+                                      _pathsToWatch,
+                                      lastEventId,
+                                      3.0,
+                                      createFlags);
+
+        FSEventStreamSetDispatchQueue(_stream, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0));
+        NSAssert(FSEventStreamStart(_stream), @"FSEvent stream should be started for %@", url.path);
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    FSEventStreamStop(_stream);
+    FSEventStreamRelease(_stream);
+    CFRelease(_urlPathRef);
+    CFRelease(_pathsToWatch);
+}
+
+@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAlbumTableCellView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAlbumTableCellView.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAudioDataSource.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAudioDataSource.m Changed

@@ -48,10 +48,10 @@
 #import "extensions/NSString+Helpers.h"
 #import "extensions/NSPasteboardItem+VLCAdditions.h"
 
-#import "playlist/VLCPlayerController.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlaylistItem.h"
-#import "playlist/VLCPlaylistModel.h"
+#import "playqueue/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueItem.h"
+#import "playqueue/VLCPlayQueueModel.h"
 
 #import "views/VLCImageView.h"
 #import "views/VLCSubScrollView.h"
@@ -98,7 +98,7 @@
 
 - (void)currentlyPlayingItemChanged:(NSNotification *)aNotification
 {
-    VLCPlayerController * const playerController = VLCMain.sharedInstance.playlistController.playerController;
+    VLCPlayerController * const playerController = VLCMain.sharedInstance.playQueueController.playerController;
     VLCInputItem * const currentInputItem = playerController.currentMedia;
     if (!currentInputItem) {
         return;
@@ -769,7 +769,7 @@
     NSParameterAssert(tableView != nil);
 
     const NSInteger clickedRow = tableView.clickedRow;
-    const id<VLCMediaLibraryItemProtocol> libraryItem = self.displayedCollectionclickedRow - 1;
+    const id<VLCMediaLibraryItemProtocol> libraryItem = self.displayedCollectionclickedRow;
     VLCLibraryRepresentedItem * const representedItem = VLCLibraryRepresentedItem alloc initWithItem:libraryItem parentType:self.currentParentType;
 
     representedItem play;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupHeaderView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupHeaderView.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAudioTableViewDelegate.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAudioTableViewDelegate.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.h Changed

@@ -23,17 +23,19 @@
 #import <Cocoa/Cocoa.h>
 
 #import "library/VLCLibrarySegment.h"
-#import "library/VLCLibraryAbstractSegmentViewController.h"
+#import "library/VLCLibraryAbstractMediaLibrarySegmentViewController.h"
+#import "library/VLCLibraryItemPresentingCapable.h"
 
 @class VLCLibraryAudioDataSource;
 @class VLCLibraryAudioGroupDataSource;
+@class VLCLibraryCollectionView;
 @class VLCLibraryWindow;
 
 @protocol VLCMediaLibraryItemProtocol;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface VLCLibraryAudioViewController : VLCLibraryAbstractSegmentViewController
+@interface VLCLibraryAudioViewController : VLCLibraryAbstractMediaLibrarySegmentViewController<VLCLibraryItemPresentingCapable>
 
 @property (readonly, weak) NSView *audioLibraryView;
 @property (readonly, weak) NSSplitView *audioLibrarySplitView;
@@ -44,12 +46,12 @@
 @property (readonly, weak) NSScrollView *audioSongTableViewScrollView;
 @property (readonly, weak) NSTableView *audioSongTableView;
 @property (readonly, weak) NSScrollView *audioCollectionViewScrollView;
-@property (readonly, weak) NSCollectionView *audioLibraryCollectionView;
+@property (readonly, weak) VLCLibraryCollectionView *audioLibraryCollectionView;
 @property (readonly, weak) NSSplitView *audioLibraryGridModeSplitView;
 @property (readonly, weak) NSScrollView *audioLibraryGridModeSplitViewListTableViewScrollView;
 @property (readonly, weak) NSTableView *audioLibraryGridModeSplitViewListTableView;
 @property (readonly, weak) NSScrollView *audioLibraryGridModeSplitViewListSelectionCollectionViewScrollView;
-@property (readonly, weak) NSCollectionView *audioLibraryGridModeSplitViewListSelectionCollectionView;
+@property (readonly, weak) VLCLibraryCollectionView *audioLibraryGridModeSplitViewListSelectionCollectionView;
 
 @property (readonly) VLCLibraryAudioDataSource *audioDataSource;
 @property (readonly) VLCLibraryAudioGroupDataSource *audioGroupDataSource;
@@ -58,7 +60,6 @@
 
 - (void)presentAudioView;
 - (void)reloadData;
-- (void)presentLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem;
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m Changed

@@ -25,12 +25,12 @@
 #import "extensions/NSString+Helpers.h"
 #import "extensions/NSWindow+VLCAdditions.h"
 
+#import "library/VLCLibraryCollectionView.h"
 #import "library/VLCLibraryCollectionViewDelegate.h"
 #import "library/VLCLibraryCollectionViewFlowLayout.h"
 #import "library/VLCLibraryController.h"
 #import "library/VLCLibraryDataTypes.h"
 #import "library/VLCLibraryModel.h"
-#import "library/VLCLibraryNavigationStack.h"
 #import "library/VLCLibrarySegment.h"
 #import "library/VLCLibraryWindowNavigationSidebarViewController.h"
 #import "library/VLCLibraryWindowSplitViewController.h"
@@ -322,8 +322,8 @@
 - (void)presentAudioGridModeView
 {
     const VLCLibrarySegmentType selectedSegment = self.libraryWindow.librarySegmentType;
-    if (selectedSegment == VLCLibrarySongsMusicSubSegment ||
-        selectedSegment == VLCLibraryAlbumsMusicSubSegment) {
+    if (selectedSegment == VLCLibrarySongsMusicSubSegmentType ||
+        selectedSegment == VLCLibraryAlbumsMusicSubSegmentType) {
 
         _audioLibraryCollectionView deselectAll:self;
         (VLCLibraryCollectionViewFlowLayout *)_audioLibraryCollectionView.collectionViewLayout resetLayout;
@@ -336,7 +336,7 @@
 
 - (void)presentAudioTableView
 {
-    if (self.libraryWindow.librarySegmentType == VLCLibrarySongsMusicSubSegment) {
+    if (self.libraryWindow.librarySegmentType == VLCLibrarySongsMusicSubSegmentType) {
         _audioSongTableViewScrollView.hidden = NO;
     } else {
         _audioLibrarySplitView.hidden = NO;
@@ -348,13 +348,13 @@
     VLCLibraryWindowPersistentPreferences * const libraryWindowPrefs = VLCLibraryWindowPersistentPreferences.sharedInstance;
 
     switch (self.libraryWindow.librarySegmentType) {
-        case VLCLibraryArtistsMusicSubSegment:
+        case VLCLibraryArtistsMusicSubSegmentType:
             return libraryWindowPrefs.artistLibraryViewMode;
-        case VLCLibraryGenresMusicSubSegment:
+        case VLCLibraryGenresMusicSubSegmentType:
             return libraryWindowPrefs.genreLibraryViewMode;
-        case VLCLibrarySongsMusicSubSegment:
+        case VLCLibrarySongsMusicSubSegmentType:
             return libraryWindowPrefs.songsLibraryViewMode;
-        case VLCLibraryAlbumsMusicSubSegment:
+        case VLCLibraryAlbumsMusicSubSegmentType:
             return libraryWindowPrefs.albumLibraryViewMode;
         default:
             return VLCLibraryGridViewModeSegment;
@@ -364,14 +364,14 @@
 - (VLCAudioLibrarySegment)currentLibrarySegmentToAudioLibrarySegment
 {
     switch (self.libraryWindow.librarySegmentType) {
-        case VLCLibraryMusicSegment:
-        case VLCLibraryArtistsMusicSubSegment:
+        case VLCLibraryMusicSegmentType:
+        case VLCLibraryArtistsMusicSubSegmentType:
             return VLCAudioLibraryArtistsSegment;
-        case VLCLibraryAlbumsMusicSubSegment:
+        case VLCLibraryAlbumsMusicSubSegmentType:
             return VLCAudioLibraryAlbumsSegment;
-        case VLCLibrarySongsMusicSubSegment:
+        case VLCLibrarySongsMusicSubSegmentType:
             return VLCAudioLibrarySongsSegment;
-        case VLCLibraryGenresMusicSubSegment:
+        case VLCLibraryGenresMusicSubSegmentType:
             return VLCAudioLibraryGenresSegment;
         default:
             NSAssert(false, @"Non-audio or unknown library subsegment received");
@@ -494,13 +494,13 @@
     // in the segmented control. We then need to update the presented view.
     VLCLibrarySegmentType segmentType;
     if (libraryItem isKindOfClass:VLCMediaLibraryAlbum.class) {
-        segmentType = VLCLibraryAlbumsMusicSubSegment;
+        segmentType = VLCLibraryAlbumsMusicSubSegmentType;
     } else if (libraryItem isKindOfClass:VLCMediaLibraryArtist.class) {
-        segmentType = VLCLibraryArtistsMusicSubSegment;
+        segmentType = VLCLibraryArtistsMusicSubSegmentType;
     } else if (libraryItem isKindOfClass:VLCMediaLibraryGenre.class) {
-        segmentType = VLCLibraryGenresMusicSubSegment;
+        segmentType = VLCLibraryGenresMusicSubSegmentType;
     } else {
-        segmentType = VLCLibrarySongsMusicSubSegment;
+        segmentType = VLCLibrarySongsMusicSubSegmentType;
     }
 
     NSNotificationCenter.defaultCenter addObserver:self
@@ -511,7 +511,6 @@
     VLCLibraryWindow * const libraryWindow = self.libraryWindow;
     libraryWindow.librarySegmentType = segmentType;
     libraryWindow.splitViewController.navSidebarViewController selectSegment:segmentType;
-    self updatePresentedView;
 }
 
 - (void)libraryModelUpdated:(NSNotification *)aNotification
@@ -519,11 +518,11 @@
     VLCLibraryModel * const model = VLCMain.sharedInstance.libraryController.libraryModel;
     const NSUInteger audioCount = model.numberOfAudioMedia;
 
-    if ((self.libraryWindow.librarySegmentType == VLCLibraryMusicSegment ||
-         self.libraryWindow.librarySegmentType == VLCLibrarySongsMusicSubSegment ||
-         self.libraryWindow.librarySegmentType == VLCLibraryArtistsMusicSubSegment ||
-         self.libraryWindow.librarySegmentType == VLCLibraryAlbumsMusicSubSegment ||
-         self.libraryWindow.librarySegmentType == VLCLibraryGenresMusicSubSegment) &&
+    if ((self.libraryWindow.librarySegmentType == VLCLibraryMusicSegmentType ||
+         self.libraryWindow.librarySegmentType == VLCLibrarySongsMusicSubSegmentType ||
+         self.libraryWindow.librarySegmentType == VLCLibraryArtistsMusicSubSegmentType ||
+         self.libraryWindow.librarySegmentType == VLCLibraryAlbumsMusicSubSegmentType ||
+         self.libraryWindow.librarySegmentType == VLCLibraryGenresMusicSubSegmentType) &&
         ((audioCount == 0 && !self.libraryTargetView.subviews containsObject:self.emptyLibraryView) ||
          (audioCount > 0 && !self.libraryTargetView.subviews containsObject:_audioLibraryView)) &&
         self.libraryWindow.videoViewController.view.hidden) {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/audio-library/VLCLibrarySongTableCellView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/audio-library/VLCLibrarySongTableCellView.m Changed

@@ -34,10 +34,14 @@
 
 #import "library/VLCLibraryController.h"
 #import "library/VLCLibraryDataTypes.h"
+#import "library/VLCInputItem.h"
 #import "library/VLCLibraryItemInternalMediaItemsDataSource.h"
 #import "library/VLCLibraryTableCellView.h"
 #import "library/VLCLibraryRepresentedItem.h"
 
+#import "playqueue/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+
 NSString *VLCAudioLibrarySongCellIdentifier = @"VLCAudioLibrarySongCellIdentifier";
 
 @interface VLCLibrarySongTableCellView ()
@@ -67,9 +71,31 @@
         self.playInstantlyButton.contentTintColor = NSColor.VLCAccentColor;
     }
 
+    NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
+    notificationCenter addObserver:self
+                           selector:@selector(playStateOrItemChanged:)
+                               name:VLCPlayerCurrentMediaItemChanged
+                             object:nil;
+    notificationCenter addObserver:self
+                           selector:@selector(playStateOrItemChanged:)
+                               name:VLCPlayerStateChanged
+                             object:nil;
+
     self prepareForReuse;
 }
 
+- (void)playStateOrItemChanged:(NSNotification *)notification
+{
+    const BOOL isCurrentItemAndIsPlaying =
+        self.representedItem.item.firstMediaItem.inputItem.MRL isEqualToString:VLCMain.sharedInstance.playQueueController.currentlyPlayingInputItem.MRL;
+    NSFont * const fontToUse = isCurrentItemAndIsPlaying
+        ? NSFont boldSystemFontOfSize:NSFont.systemFontSize
+        : NSFont systemFontOfSize:NSFont.systemFontSize;
+    self.songNameTextField.font = fontToUse;
+    self.durationTextField.font = fontToUse;
+    self.trackNumberTextField.font = fontToUse;
+}
+
 - (void)prepareForReuse
 {
     super prepareForReuse;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/audio-library/VLCLibrarySongsTableViewSongPlayingTableCellView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/audio-library/VLCLibrarySongsTableViewSongPlayingTableCellView.m Changed

@@ -25,8 +25,8 @@
 #import "library/VLCInputItem.h"
 #import "library/VLCLibraryDataTypes.h"
 #import "main/VLCMain.h"
-#import "playlist/VLCPlayerController.h"
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 @implementation VLCLibrarySongsTableViewSongPlayingTableCellView
 
@@ -65,13 +65,13 @@
     if (!_representedMediaItem ||
         !_representedMediaItem.inputItem ||
         !VLCMain.sharedInstance ||
-        !VLCMain.sharedInstance.playlistController ||
-        !VLCMain.sharedInstance.playlistController.currentlyPlayingInputItem) {
+        !VLCMain.sharedInstance.playQueueController ||
+        !VLCMain.sharedInstance.playQueueController.currentlyPlayingInputItem) {
 
         return false;
     }
 
-    return _representedMediaItem.inputItem.MRL isEqualToString:VLCMain.sharedInstance.playlistController.currentlyPlayingInputItem.MRL;
+    return _representedMediaItem.inputItem.MRL isEqualToString:VLCMain.sharedInstance.playQueueController.currentlyPlayingInputItem.MRL;
 }
 
 - (void)updatePlayState
@@ -83,7 +83,7 @@
 
     NSString *text = @"";
 
-    switch(VLCMain.sharedInstance.playlistController.playerController.playerState) {
+    switch(VLCMain.sharedInstance.playQueueController.playerController.playerState) {
         case VLC_PLAYER_STATE_PAUSED:
             text = @"⏸︎";
             break;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/groups-library/VLCLibraryGroupsDataSource.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/groups-library/VLCLibraryGroupsDataSource.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/groups-library/VLCLibraryGroupsViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/groups-library/VLCLibraryGroupsViewController.h Changed

@@ -22,10 +22,12 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "library/VLCLibraryAbstractSegmentViewController.h"
+#import "library/VLCLibraryAbstractMediaLibrarySegmentViewController.h"
+#import "library/VLCLibraryItemPresentingCapable.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
+@class VLCLibraryCollectionView;
 @class VLCLibraryCollectionViewDelegate;
 @class VLCLibraryGroupsDataSource;
 @class VLCLibraryMasterDetailViewTableViewDelegate;
@@ -33,10 +35,10 @@
 @class VLCLibraryWindow;
 @class VLCMediaLibraryGroup;
 
-@interface VLCLibraryGroupsViewController : VLCLibraryAbstractSegmentViewController<NSSplitViewDelegate>
+@interface VLCLibraryGroupsViewController : VLCLibraryAbstractMediaLibrarySegmentViewController<NSSplitViewDelegate, VLCLibraryItemPresentingCapable>
 
 @property (readonly) NSScrollView *collectionViewScrollView;
-@property (readonly) NSCollectionView *collectionView;
+@property (readonly) VLCLibraryCollectionView *collectionView;
 @property (readonly) NSSplitView *listViewSplitView;
 @property (readonly) NSScrollView *groupsTableViewScrollView;
 @property (readonly) VLCLibraryTableView *groupsTableView;
@@ -50,7 +52,6 @@
 - (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow;
 
 - (void)presentGroupsView;
-- (void)presentGroup:(VLCMediaLibraryGroup *)group;
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/groups-library/VLCLibraryGroupsViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/groups-library/VLCLibraryGroupsViewController.m Changed

@@ -24,6 +24,7 @@
 
 #import "extensions/NSString+Helpers.h"
 
+#import "library/VLCLibraryCollectionView.h"
 #import "library/VLCLibraryCollectionViewDelegate.h"
 #import "library/VLCLibraryCollectionViewFlowLayout.h"
 #import "library/VLCLibraryCollectionViewItem.h"
@@ -71,7 +72,7 @@
 - (void)setupGridViewModeViews
 {
     _collectionViewScrollView = NSScrollView alloc init;
-    _collectionView = NSCollectionView alloc init;
+    _collectionView = VLCLibraryCollectionView alloc init;
 
     self.collectionViewScrollView.translatesAutoresizingMaskIntoConstraints = NO;
     self.collectionView.translatesAutoresizingMaskIntoConstraints = NO;
@@ -253,19 +254,19 @@
     }
 }
 
-- (void)presentGroup:(VLCMediaLibraryGroup *)group
+- (void)presentLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem
 {
     self presentGroupsView;
     
     const VLCLibraryViewModeSegment viewModeSegment =
         VLCLibraryWindowPersistentPreferences.sharedInstance.groupsLibraryViewMode;
     if (viewModeSegment == VLCLibraryGridViewModeSegment) {
-        NSIndexPath * const groupIndexPath = self.dataSource indexPathForLibraryItem:group;
+        NSIndexPath * const groupIndexPath = self.dataSource indexPathForLibraryItem:libraryItem;
         NSSet<NSIndexPath *> * const groupIndexPathSet = NSSet setWithObject:groupIndexPath;
         self.collectionView scrollToItemsAtIndexPaths:groupIndexPathSet
                                         scrollPosition:NSCollectionViewScrollPositionTop;
     } else {
-        const NSInteger groupRow = self.dataSource rowForLibraryItem:group;
+        const NSInteger groupRow = self.dataSource rowForLibraryItem:libraryItem;
         self.groupsTableView selectRowIndexes:NSIndexSet indexSetWithIndex:groupRow
                           byExtendingSelection:NO;
         self.groupsTableView scrollRowToVisible:groupRow;

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewActionButtonCell.h Added

@@ -0,0 +1,31 @@
+/*****************************************************************************
+ * VLCLibraryHomeViewActionButtonCell.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VLCLibraryHomeViewActionButtonCell : NSButtonCell
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewActionButtonCell.m Added

@@ -0,0 +1,122 @@
+/*****************************************************************************
+ * VLCLibraryHomeViewActionButtonCell.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCLibraryHomeViewActionButtonCell.h"
+
+#import "extensions/NSColor+VLCAdditions.h"
+#import "extensions/NSFont+VLCAdditions.h"
+#import "library/VLCLibraryUIUnits.h"
+
+@interface VLCLibraryHomeViewActionButtonCell ()
+
+@property NSImage *cachedImage;
+@property BOOL prevIsHighlighted;
+@property NSRect prevFrame;
+
+@end
+
+@implementation VLCLibraryHomeViewActionButtonCell
+
+- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+{
+    NSColor.VLCSubtleBorderColor setStroke;
+    NSColor.windowBackgroundColor setFill;
+
+    const CGFloat cellMinX = NSMinX(cellFrame);
+    const CGFloat cellMinY = NSMinY(cellFrame);
+    const CGFloat cellMaxX = NSMaxX(cellFrame);
+    const CGFloat cellMaxY = NSMaxY(cellFrame);
+
+    NSBezierPath * const separatorPath =
+        NSBezierPath bezierPathWithRoundedRect:cellFrame
+                                        xRadius:VLCLibraryUIUnits.cornerRadius
+                                        yRadius:VLCLibraryUIUnits.cornerRadius;
+    separatorPath.lineWidth = VLCLibraryUIUnits.borderThickness;
+    separatorPath stroke;
+    separatorPath fill;
+
+    const CGSize cellSize = cellFrame.size;
+    const CGFloat cellWidth = cellSize.width;
+    const CGFloat cellHeight = cellSize.height;
+
+    NSMutableParagraphStyle * const titleParagraphStyle = NSMutableParagraphStyle alloc init;
+    titleParagraphStyle.alignment = NSTextAlignmentCenter;
+    NSDictionary<NSAttributedStringKey, id> * const titleAttributes = @{
+        NSForegroundColorAttributeName: NSColor.controlTextColor,
+        NSFontAttributeName: NSFont.VLCLibrarySubsectionSubheaderFont,
+        NSParagraphStyleAttributeName: titleParagraphStyle
+    };
+    const NSSize titleSize = self.title sizeWithAttributes:titleAttributes;
+    const CGFloat titleHeight = titleSize.height + VLCLibraryUIUnits.smallSpacing;
+    self.title drawInRect:CGRectMake(cellMinX + VLCLibraryUIUnits.smallSpacing,
+                                      cellMaxY - titleHeight,
+                                      cellWidth - VLCLibraryUIUnits.smallSpacing * 2,
+                                      titleHeight)
+            withAttributes:titleAttributes;
+
+    const CGSize imageSize = self.image.size;
+
+    if (self.cachedImage != self.image ||
+        self.prevIsHighlighted != self.isHighlighted ||
+        !NSEqualRects(self.prevFrame, cellFrame)) {
+
+        self.cachedImage = NSImage imageWithSize:imageSize
+                                          flipped:NO
+                                   drawingHandler:^BOOL(NSRect dstRect) {
+            if (self.isHighlighted) {
+                NSColor.VLCSubtleBorderColor set;
+            } else {
+                NSColor.VLCSubtlerAccentColor set;
+            }
+            const NSRect imageRect = {NSZeroPoint, imageSize};
+            self.image drawInRect:imageRect;
+            NSRectFillUsingOperation(imageRect, NSCompositingOperationSourceIn);
+            return YES;
+        };
+
+        self.prevIsHighlighted = self.isHighlighted;
+        self.prevFrame = cellFrame;
+    } 
+
+    const CGFloat originalImageAspectRatio = imageSize.width / imageSize.height;
+    const CGFloat imageAvailableVerticalSpace =
+        cellHeight - titleHeight - VLCLibraryUIUnits.largeSpacing * 2;
+    CGFloat imageWidth, imageHeight;
+
+    // Try to scale focusing on width first, if this yields a height that is too large, switch
+    if (cellWidth / originalImageAspectRatio > imageAvailableVerticalSpace) {
+        imageHeight = imageAvailableVerticalSpace;
+        imageWidth = imageHeight * originalImageAspectRatio;
+    } else {
+        imageWidth = cellWidth;
+        imageHeight = imageWidth / originalImageAspectRatio;
+    }
+
+    const CGPoint cellOrigin = cellFrame.origin;
+    const NSRect imageRect = NSMakeRect(cellOrigin.x + (cellWidth - imageWidth) / 2,
+                                        cellOrigin.y + (cellHeight - imageHeight) / 2,
+                                        imageWidth,
+                                        imageHeight);
+    self.cachedImage drawInRect:imageRect;
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewActionsView.h Added

@@ -0,0 +1,45 @@
+/*****************************************************************************
+ * VLCLibraryHomeViewActionsViewController.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VLCLibraryHomeViewActionsView : NSStackView
+
+@property (readwrite, weak) IBOutlet NSButton *openFileButton;
+@property (readwrite, weak) IBOutlet NSButton *openDiscButton;
+@property (readwrite, weak) IBOutlet NSButton *openUrlButton;
+@property (readwrite, weak) IBOutlet NSButton *openCaptureDeviceButton;
+@property (readwrite, weak) IBOutlet NSButton *openBrowseButton;
+
++ (instancetype)fromNibWithOwner:(id)owner;
+
+- (IBAction)openFileAction:(id)sender;
+- (IBAction)openDiscAction:(id)sender;
+- (IBAction)openUrlAction:(id)sender;
+- (IBAction)openCaptureDeviceAction:(id)sender;
+- (IBAction)openBrowseAction:(id)sender;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewActionsView.m Added

@@ -0,0 +1,77 @@
+/*****************************************************************************
+ * VLCLibraryHomeViewActionsViewController.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCLibraryHomeViewActionsView.h"
+
+#import "extensions/NSString+Helpers.h"
+#import "extensions/NSView+VLCAdditions.h"
+#import "library/VLCLibraryWindow.h"
+#import "main/VLCMain.h"
+#import "menus/VLCMainMenu.h"
+
+@implementation VLCLibraryHomeViewActionsView
+
++ (instancetype)fromNibWithOwner:(id)owner
+{
+    return (VLCLibraryHomeViewActionsView*)NSView fromNibNamed:@"VLCLibraryHomeViewActionsView"
+                                                      withClass:VLCLibraryHomeViewActionsView.class
+                                                      withOwner:owner;
+}
+
+
+- (void)awakeFromNib
+{
+    super awakeFromNib;
+
+    self.openFileButton.title = _NS("Open file");
+    self.openDiscButton.title = _NS("Open disc");
+    self.openUrlButton.title = _NS("Open stream");
+    self.openCaptureDeviceButton.title = _NS("Open capture device");
+    self.openBrowseButton.title = _NS("Browse");
+}
+
+- (IBAction)openFileAction:(id)sender
+{
+    VLCMain.sharedInstance.mainMenu intfOpenFile:self;
+}
+
+- (IBAction)openDiscAction:(id)sender
+{
+    VLCMain.sharedInstance.mainMenu intfOpenDisc:self;
+}
+
+- (IBAction)openUrlAction:(id)sender
+{
+    VLCMain.sharedInstance.mainMenu intfOpenNet:self;
+}
+
+- (IBAction)openCaptureDeviceAction:(id)sender
+{
+    VLCMain.sharedInstance.mainMenu intfOpenCapture:self;
+}
+
+- (IBAction)openBrowseAction:(id)sender
+{
+    VLCMain.sharedInstance.libraryWindow goToBrowseSection:self;
+}
+
+@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewController.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewController.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewStackViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewStackViewController.h Changed

@@ -22,14 +22,17 @@
 
 #import <Cocoa/Cocoa.h>
 
+#import "library/VLCLibraryItemPresentingCapable.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class VLCLibraryHeroView;
+@class VLCLibraryHomeViewActionsView;
 @class VLCLibraryHomeViewAudioCarouselContainerView;
 @class VLCLibraryHomeViewVideoCarouselContainerView;
 @protocol VLCMediaLibraryItemProtocol;
 
-@interface VLCLibraryHomeViewStackViewController : NSObject
+@interface VLCLibraryHomeViewStackViewController : NSObject<VLCLibraryItemPresentingCapable>
 
 @property (readwrite, assign, nonatomic) NSSize collectionViewItemSize;
 @property (readwrite, assign, nonatomic) CGFloat collectionViewMinimumLineSpacing;
@@ -39,6 +42,7 @@
 @property (readwrite, weak, nonatomic) NSStackView *collectionsStackView;
 @property (readwrite, weak, nonatomic) NSScrollView *collectionsStackViewScrollView;
 
+@property (readonly) VLCLibraryHomeViewActionsView *actionsView;
 @property (readonly) VLCLibraryHeroView *heroView;
 @property (readonly) VLCLibraryHomeViewVideoCarouselContainerView *recentsView;
 @property (readonly) VLCLibraryHomeViewAudioCarouselContainerView *audioRecentsView;
@@ -46,7 +50,6 @@
 - (void)reloadData;
 - (void)connectContainers;
 - (void)disconnectContainers;
-- (void)presentLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem;
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewStackViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewStackViewController.m Changed

@@ -30,6 +30,7 @@
 #import "library/VLCLibraryModel.h"
 #import "library/VLCLibraryUIUnits.h"
 
+#import "library/home-library/VLCLibraryHomeViewActionsView.h"
 #import "library/home-library/VLCLibraryHomeViewAudioCarouselContainerView.h"
 #import "library/home-library/VLCLibraryHomeViewContainerView.h"
 #import "library/home-library/VLCLibraryHomeViewVideoCarouselContainerView.h"
@@ -61,6 +62,11 @@
     return self;
 }
 
+- (void)dealloc
+{
+    self.collectionsStackView.subviews = @;
+}
+
 - (void)setup
 {
     NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
@@ -89,15 +95,22 @@
 
 - (void)generateCustomContainers
 {
+    _actionsView = VLCLibraryHomeViewActionsView fromNibWithOwner:self;
     _heroView = VLCLibraryHeroView fromNibWithOwner:self;
-    _leadingContainerCount += 1;
-    self addView:self.heroView toStackView:self.collectionsStackView;
-    self.heroView setOptimalRepresentedItem;
+    _leadingContainerCount += 2;
 
+    self addCustomContainerViews;
     self audioRecentsChanged:nil;
     self recentsChanged:nil;
 }
 
+- (void)addCustomContainerViews
+{
+    self addView:self.actionsView toStackView:self.collectionsStackView;
+    self addView:self.heroView toStackView:self.collectionsStackView;
+    self.heroView setOptimalRepresentedItem;
+}
+
 - (BOOL)recentMediaPresent
 {
     VLCLibraryModel * const model = VLCMain.sharedInstance.libraryController.libraryModel;
@@ -180,9 +193,9 @@
 - (void)reloadData
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        for (NSView<VLCLibraryHomeViewContainerView> * const containerView in self->_containers) {
-            self.heroView setOptimalRepresentedItem;
+        self.heroView setOptimalRepresentedItem;
 
+        for (NSView<VLCLibraryHomeViewContainerView> * const containerView in self->_containers) {
             if (containerView isKindOfClass:VLCLibraryHomeViewBaseCarouselContainerView.class) {
                 VLCLibraryHomeViewBaseCarouselContainerView * const baseContainerView = (VLCLibraryHomeViewBaseCarouselContainerView *)containerView;
                 baseContainerView.dataSource reloadData;
@@ -290,9 +303,7 @@
     _collectionsStackView setHuggingPriority:NSLayoutPriorityDefaultHigh
                                forOrientation:NSLayoutConstraintOrientationVertical;
 
-
-    self addView:self.heroView toStackView:_collectionsStackView;
-    self.heroView setOptimalRepresentedItem;
+    self addCustomContainerViews;
 
     for (NSView<VLCLibraryHomeViewContainerView> * const containerView in _containers) {
         self addContainerView:containerView toStackView:_collectionsStackView;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewVideoContainerView.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewVideoContainerView.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewVideoContainerViewDataSource.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewVideoContainerViewDataSource.m Changed

@@ -296,9 +296,7 @@
 {
     VLCLibraryCollectionViewItem * const viewItem = collectionView makeItemWithIdentifier:VLCLibraryCellIdentifier forIndexPath:indexPath;
     const id<VLCMediaLibraryItemProtocol> item = self.collectionArrayindexPath.item;
-    // TODO: Find a more elegant way to do this
-    VLCLibraryHomeViewVideoGridContainerView * const containerView = (VLCLibraryHomeViewVideoGridContainerView *)collectionView.superview.superview.superview;
-    VLCLibraryRepresentedItem * const representedItem = VLCLibraryRepresentedItem alloc initWithItem:item parentType:containerView.videoGroup;
+    VLCLibraryRepresentedItem * const representedItem = VLCLibraryRepresentedItem alloc initWithItem:item parentType:self.groupDescriptor.group;
 
     viewItem.representedItem = representedItem;
     return viewItem;
@@ -320,9 +318,7 @@
         VLCLibraryCollectionViewMediaItemSupplementaryDetailView * const mediaItemSupplementaryDetailView = collectionView makeSupplementaryViewOfKind:kind withIdentifier:VLCLibraryCollectionViewMediaItemSupplementaryDetailViewKind forIndexPath:indexPath;
 
         const id<VLCMediaLibraryItemProtocol> item = self.collectionArrayindexPath.item;
-        // TODO: Find a more elegant way to do this
-        VLCLibraryHomeViewVideoGridContainerView * const containerView = (VLCLibraryHomeViewVideoGridContainerView *)collectionView.superview.superview.superview;
-        VLCLibraryRepresentedItem * const representedItem = VLCLibraryRepresentedItem alloc initWithItem:item parentType:containerView.videoGroup;
+        VLCLibraryRepresentedItem * const representedItem = VLCLibraryRepresentedItem alloc initWithItem:item parentType:self.groupDescriptor.group;
 
         mediaItemSupplementaryDetailView.representedItem = representedItem;
         mediaItemSupplementaryDetailView.selectedItem = collectionView itemAtIndexPath:indexPath;
@@ -373,13 +369,9 @@
     for (NSIndexPath * const indexPath in indexPaths) {
         const id<VLCMediaLibraryItemProtocol> libraryItem = 
             self libraryItemAtIndexPath:indexPath forCollectionView:collectionView;
-        // TODO: Find a more elegant way to do this
-        VLCLibraryHomeViewVideoGridContainerView * const containerView = 
-            (VLCLibraryHomeViewVideoGridContainerView *)collectionView.superview.superview.superview;
-        NSAssert(containerView != nil, @"The collection view's container view should not be nil!");
         VLCLibraryRepresentedItem * const representedItem = 
             VLCLibraryRepresentedItem alloc initWithItem:libraryItem 
-                                                 parentType:containerView.videoGroup;
+                                                 parentType:self.groupDescriptor.group;
         representedItems addObject:representedItem;
     }
 
@@ -409,12 +401,10 @@
         carouselItemView.frame = itemFrame;
     }
 
-    // TODO: Find a more elegant way to do this
-    VLCLibraryHomeViewVideoCarouselContainerView * const containerView = (VLCLibraryHomeViewVideoCarouselContainerView *)carousel.superview;
-
     const id<VLCMediaLibraryItemProtocol> libraryItem = self.collectionArrayindex;
-    VLCLibraryRepresentedItem * const representedItem = VLCLibraryRepresentedItem alloc initWithItem:libraryItem
-                                                                                             parentType:containerView.videoGroup;
+    VLCLibraryRepresentedItem * const representedItem =
+        VLCLibraryRepresentedItem alloc initWithItem:libraryItem
+                                             parentType:self.groupDescriptor.group;
     carouselItemView.representedItem = representedItem;
     return carouselItemView;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewVideoGridContainerView.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewVideoGridContainerView.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewVideoGridContainerView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/home-library/VLCLibraryHomeViewVideoGridContainerView.m Changed

@@ -22,6 +22,9 @@
 
 #import "VLCLibraryHomeViewVideoGridContainerView.h"
 
+#import "extensions/NSView+VLCAdditions.h"
+
+#import "library/VLCLibraryCollectionView.h"
 #import "library/VLCLibraryCollectionViewDelegate.h"
 #import "library/VLCLibraryCollectionViewFlowLayout.h"
 #import "library/VLCLibraryCollectionViewItem.h"
@@ -62,40 +65,7 @@
     self setupScrollView;
 
     self addSubview:_scrollView;
-    self addConstraints:@
-        NSLayoutConstraint constraintWithItem:_scrollView
-                                     attribute:NSLayoutAttributeTop
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self
-                                     attribute:NSLayoutAttributeTop
-                                    multiplier:1
-                                      constant:0
-        ,
-        NSLayoutConstraint constraintWithItem:_scrollView
-                                     attribute:NSLayoutAttributeBottom
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self
-                                     attribute:NSLayoutAttributeBottom
-                                    multiplier:1
-                                      constant:0
-        ,
-        NSLayoutConstraint constraintWithItem:_scrollView
-                                     attribute:NSLayoutAttributeLeft
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self
-                                     attribute:NSLayoutAttributeLeft
-                                    multiplier:1
-                                      constant:0
-        ,
-        NSLayoutConstraint constraintWithItem:_scrollView
-                                     attribute:NSLayoutAttributeRight
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self
-                                     attribute:NSLayoutAttributeRight
-                                    multiplier:1
-                                      constant:0
-        ,
-    ;
+    self.scrollView applyConstraintsToFillSuperview;
 
     self setContentHuggingPriority:NSLayoutPriorityDefaultLow
                      forOrientation:NSLayoutConstraintOrientationHorizontal;
@@ -113,7 +83,7 @@
     _collectionViewLayout = VLCLibraryCollectionViewFlowLayout.standardLayout;
     _collectionViewLayout.headerReferenceSize = VLCLibraryCollectionViewSupplementaryElementView.defaultHeaderSize;
 
-    _collectionView = NSCollectionView alloc initWithFrame:NSZeroRect;
+    _collectionView = VLCLibraryCollectionView alloc initWithFrame:NSZeroRect;
     _collectionView.postsFrameChangedNotifications = YES;
     _collectionView.collectionViewLayout = _collectionViewLayout;
     _collectionView.selectable = YES;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.h Changed

@@ -27,6 +27,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @class VLCInputNodePathControl;
+@class VLCLibraryCollectionView;
+@class VLCLibraryMediaSourceViewNavigationStack;
 @class VLCLibraryWindow;
 @class VLCMediaSourceBaseDataSource;
 
@@ -34,7 +36,7 @@
 
 @property (readonly, weak) NSView *mediaSourceView;
 @property (readonly, weak) NSTableView *mediaSourceTableView;
-@property (readonly, weak) NSCollectionView *collectionView;
+@property (readonly, weak) VLCLibraryCollectionView *collectionView;
 @property (readonly, weak) NSScrollView *collectionViewScrollView;
 @property (readonly, weak) NSTableView *tableView;
 @property (readonly, weak) NSScrollView *tableViewScrollView;
@@ -46,6 +48,7 @@
 @property (readonly, weak) NSLayoutConstraint *pathControlViewTopConstraintToSuperview;
 
 @property (readonly) VLCMediaSourceBaseDataSource *baseDataSource;
+@property (readonly) VLCLibraryMediaSourceViewNavigationStack *navigationStack;
 
 - (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.m Changed

@@ -22,6 +22,7 @@
 
 #import "VLCLibraryMediaSourceViewController.h"
 
+#import "VLCLibraryMediaSourceViewNavigationStack.h"
 #import "VLCMediaSourceBaseDataSource.h"
 #import "VLCMediaSourceDataSource.h"
 
@@ -29,6 +30,7 @@
 #import "extensions/NSString+Helpers.h"
 #import "extensions/NSWindow+VLCAdditions.h"
 
+#import "library/VLCLibraryCollectionView.h"
 #import "library/VLCLibraryCollectionViewFlowLayout.h"
 #import "library/VLCLibraryCollectionViewItem.h"
 #import "library/VLCLibraryController.h"
@@ -90,12 +92,20 @@
     _baseDataSource.tableView = _tableView;
     _baseDataSource.tableViewScrollView = _tableViewScrollView;
     _baseDataSource setupViews;
+
+    _navigationStack = VLCLibraryMediaSourceViewNavigationStack alloc init;
+    self.navigationStack.libraryWindow = self.libraryWindow;
+    self.navigationStack.baseDataSource = self.baseDataSource;
+
+    self.baseDataSource.navigationStack = self.navigationStack;
 }
 
 - (void)setupCollectionView
 {
+    self.collectionView.allowsMultipleSelection = YES;
+
     VLCLibraryCollectionViewFlowLayout * const mediaSourceCollectionViewLayout = VLCLibraryCollectionViewFlowLayout.standardLayout;
-    _collectionView.collectionViewLayout = mediaSourceCollectionViewLayout;
+    self.collectionView.collectionViewLayout = mediaSourceCollectionViewLayout;
     mediaSourceCollectionViewLayout.itemSize = VLCLibraryCollectionViewItem.defaultSize;
 }
 
@@ -158,18 +168,18 @@
 
 - (void)presentBrowseView
 {
-    self presentMediaSourceView:VLCLibraryBrowseSegment;
+    self presentMediaSourceView:VLCLibraryBrowseSegmentType;
 }
 
 - (void)presentStreamsView
 {
-    self presentMediaSourceView:VLCLibraryStreamsSegment;
+    self presentMediaSourceView:VLCLibraryStreamsSegmentType;
 }
 
 - (void)presentMediaSourceView:(VLCLibrarySegmentType)viewSegment
 {
     self.libraryWindow displayLibraryView:self.mediaSourceView;
-    _baseDataSource.mediaSourceMode = viewSegment == VLCLibraryBrowseSegment ? VLCMediaSourceModeLAN : VLCMediaSourceModeInternet;
+    _baseDataSource.mediaSourceMode = viewSegment == VLCLibraryBrowseSegmentType ? VLCMediaSourceModeLAN : VLCMediaSourceModeInternet;
     _baseDataSource reloadViews;
 }

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewNavigationStack.h Added

@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * VLCLibraryMediaSourceViewNavigationStack.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2022 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <claudio.cambra@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class VLCLibraryWindow;
+@class VLCMediaSource;
+@class VLCMediaSourceBaseDataSource;
+@class VLCLibraryMediaSourceViewNavigationState;
+
+typedef struct input_item_node_t input_item_node_t;
+
+@interface VLCLibraryMediaSourceViewNavigationStack : NSObject
+
+@property (readwrite, nonatomic, weak) VLCLibraryWindow *libraryWindow;
+@property (readwrite, weak) VLCMediaSourceBaseDataSource *baseDataSource;
+@property (readonly) BOOL forwardsAvailable;
+@property (readonly) BOOL backwardsAvailable;
+
+- (void)backwards;
+- (void)forwards;
+
+- (void)appendCurrentLibraryState;
+- (void)clear;
+
+- (void)installHandlersOnMediaSource:(VLCMediaSource *)mediaSource;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewNavigationStack.m Added

@@ -0,0 +1,253 @@
+/*****************************************************************************
+ * VLCLibraryMediaSourceViewNavigationStack.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2022 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <claudio.cambra@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCLibraryMediaSourceViewNavigationStack.h"
+
+#import "extensions/NSString+Helpers.h"
+
+#import "library/VLCInputItem.h"
+#import "library/VLCInputNodePathControl.h"
+#import "library/VLCInputNodePathControlItem.h"
+#import "library/VLCLibraryWindow.h"
+
+#import "library/audio-library/VLCLibraryAudioViewController.h"
+
+#import "VLCLibraryMediaSourceViewController.h"
+#import "VLCLibraryMediaSourceViewNavigationState.h"
+#import "VLCMediaSource.h"
+#import "VLCMediaSourceBaseDataSource.h"
+#import "VLCMediaSourceDataSource.h"
+
+@interface VLCLibraryMediaSourceViewNavigationCurrentStackPosition : NSObject
+
+@property (readonly) NSUInteger navigationStackIndex;
+@property (readonly) VLCLibraryMediaSourceViewNavigationState *navigationState;
+
+- (instancetype)initWithStackIndex:(NSUInteger)index andState:(VLCLibraryMediaSourceViewNavigationState *)state;
+
+@end
+
+@implementation VLCLibraryMediaSourceViewNavigationCurrentStackPosition
+
+- (instancetype)initWithStackIndex:(NSUInteger)index andState:(VLCLibraryMediaSourceViewNavigationState *)state
+{
+    self = super init;
+
+    if(self) {
+        _navigationStackIndex = index;
+        _navigationState = state;
+    }
+
+    return self;
+}
+
+@end
+
+
+@interface VLCLibraryMediaSourceViewNavigationStack ()
+{
+    NSMutableArray<VLCLibraryMediaSourceViewNavigationState *> *_navigationStates;
+    VLCLibraryMediaSourceViewNavigationCurrentStackPosition *_currentPosition;
+}
+
+@property (readwrite) NSMutableDictionary<NSURL *, VLCLibraryMediaSourceViewNavigationState *> *affectedPathControlStates;
+
+@end
+
+@implementation VLCLibraryMediaSourceViewNavigationStack
+
+- (instancetype)init
+{
+    self = super init;
+    if (self) {
+        _navigationStates = NSMutableArray alloc init;
+        _affectedPathControlStates = NSMutableDictionary.dictionary;
+    }
+    return self;
+}
+
+- (void)installHandlersOnMediaSource:(VLCMediaSource *)mediaSource
+{
+    mediaSource.willStartGeneratingChildNodesForNodeHandler = ^(input_item_node_t * const node) {
+        const NSInteger rootMostAffectedState = _navigationStates indexOfObjectPassingTest:^BOOL(VLCLibraryMediaSourceViewNavigationState * const _Nonnull obj, const NSUInteger idx, BOOL * const _Nonnull stop) {
+            return obj.currentNodeDisplayed.vlcInputItemNode == node;
+        };
+
+        if (rootMostAffectedState != NSNotFound) {
+            for (NSUInteger i = rootMostAffectedState + 1; i < _navigationStates.count; i++) {
+                VLCLibraryMediaSourceViewNavigationState * const state = _navigationStatesi;
+                NSURL * const url = NSURL URLWithString:state.currentNodeDisplayed.inputItem.MRL;
+                self.affectedPathControlStates setObject:state forKey:url;
+            }
+        }
+    };
+
+    mediaSource.didFinishGeneratingChildNodesForNodeHandler = ^(input_item_node_t * const node) {
+        for (size_t i = 0; i < node->i_children; i++) {
+            input_item_node_t * const childNode = node->pp_childreni;
+            NSURL * const url = NSURL URLWithString:toNSStr(childNode->p_item->psz_uri);
+            VLCLibraryMediaSourceViewNavigationState * const affectedState = self.affectedPathControlStates objectForKey:url;
+            if (affectedState != nil) {
+                affectedState.currentNodeDisplayed = VLCInputNode alloc initWithInputNode:childNode;
+                self.affectedPathControlStates removeObjectForKey:url;
+            }
+        }
+
+        // Give orphan input nodes for remaining affected path control nodes
+        for (VLCLibraryMediaSourceViewNavigationState * const state in self.affectedPathControlStates.allValues) {
+            input_item_t * const urlInputItem = input_item_NewExt(state.currentNodeDisplayed.inputItem.MRL.UTF8String,
+                                                                state.currentNodeDisplayed.inputItem.name.UTF8String,
+                                                                0,
+                                                                ITEM_TYPE_DIRECTORY,
+                                                                ITEM_LOCAL);
+            if (urlInputItem != NULL) {
+                input_item_node_t * const urlNode = input_item_node_Create(urlInputItem);
+                if (urlNode) {
+                    state.currentNodeDisplayed = VLCInputNode alloc initWithInputNode:urlNode;
+                }
+                input_item_Release(urlInputItem);
+            }
+        }
+
+        self.affectedPathControlStates removeAllObjects;
+    };
+}
+
+- (void)setLibraryWindow:(VLCLibraryWindow *)delegate
+{
+    _libraryWindow = delegate;
+    self updateDelegateNavigationButtons;
+}
+
+- (BOOL)forwardsAvailable
+{
+    NSUInteger numNavigationStates = _navigationStates.count;
+
+    return _currentPosition != nil && 
+        _currentPosition.navigationStackIndex < numNavigationStates - 1 && 
+        numNavigationStates > 1;
+}
+
+- (BOOL)backwardsAvailable
+{
+    return _currentPosition != nil && 
+        _currentPosition.navigationStackIndex > 0 && 
+        _navigationStates.count > 1;
+}
+
+- (void)forwards
+{
+    if (self.libraryWindow == nil || !self.forwardsAvailable) {
+        return;
+    }
+
+    NSUInteger newPositionIndex = _currentPosition.navigationStackIndex + 1;
+    _currentPosition =
+        VLCLibraryMediaSourceViewNavigationCurrentStackPosition alloc initWithStackIndex:newPositionIndex andState:_navigationStatesnewPositionIndex;
+
+    VLCInputNode *node = _currentPosition.navigationState.currentNodeDisplayed;
+    VLCInputNodePathControlItem *nodePathItem = VLCInputNodePathControlItem alloc initWithInputNode:node;
+    self.libraryWindow.mediaSourcePathControl appendInputNodePathControlItem:nodePathItem;
+
+    self setMediaSourceViewToState:_currentPosition.navigationState;
+}
+
+- (void)backwards
+{
+    if (self.libraryWindow == nil || !self.backwardsAvailable) {
+        return;
+    }
+
+    NSUInteger newPositionIndex = _currentPosition.navigationStackIndex - 1;
+    _currentPosition =
+        VLCLibraryMediaSourceViewNavigationCurrentStackPosition alloc initWithStackIndex:newPositionIndex andState:_navigationStatesnewPositionIndex;
+
+    self.libraryWindow.mediaSourcePathControl removeLastInputNodePathControlItem;
+
+    self setMediaSourceViewToState:_currentPosition.navigationState;
+}
+
+- (void)appendCurrentLibraryState
+{
+    if (self.libraryWindow == nil) {
+        return;
+    }
+
+    if (self.forwardsAvailable) {
+        NSUInteger firstIndexToRemove = _currentPosition.navigationStackIndex + 1;
+        // -1 to account for the array count
+        NSRange rangeToRemove = NSMakeRange(firstIndexToRemove, (_navigationStates.count - 1) - _currentPosition.navigationStackIndex);
+        self removeAndCleanUpStatesInRange:rangeToRemove;
+        _navigationStates removeObjectsInRange:rangeToRemove;
+    }
+
+    VLCLibraryMediaSourceViewNavigationState * const navigationState =
+        VLCLibraryMediaSourceViewNavigationState alloc initFromMediaSourceDataSource:self.baseDataSource.childDataSource;
+    _currentPosition =
+        VLCLibraryMediaSourceViewNavigationCurrentStackPosition alloc initWithStackIndex:_navigationStates.count andState:navigationState;
+    _navigationStates addObject:navigationState;
+
+    self updateDelegateNavigationButtons;
+}
+
+- (void)removeAndCleanUpStatesInRange:(NSRange)range
+{
+    NSAssert(range.location + range.length - 1 < _navigationStates.count, @"Invalid range for state removal and cleanup, out of bounds.");
+    
+    for (NSUInteger i = range.location; i < range.length; ++i) {
+        VLCLibraryMediaSourceViewNavigationState *state = _navigationStates objectAtIndex:i;
+        VLCInputNode *stateNode = state.currentNodeDisplayed;
+        
+        if (stateNode) {
+            state.currentMediaSource.displayedMediaSource clearChildNodesForNode:stateNode.vlcInputItemNode;
+        }
+        
+        _navigationStates removeObjectAtIndex:i;
+    }
+}
+
+- (void)updateDelegateNavigationButtons
+{
+    if (self.libraryWindow == nil) {
+        return;
+    }
+
+    self.libraryWindow.forwardsNavigationButton.enabled = self.forwardsAvailable;
+    self.libraryWindow.backwardsNavigationButton.enabled = self.backwardsAvailable;
+}
+
+- (void)setMediaSourceViewToState:(VLCLibraryMediaSourceViewNavigationState *)state
+{
+    self.baseDataSource setChildDataSource:state.currentMediaSource;
+    self.baseDataSource.childDataSource setNodeToDisplay:state.currentNodeDisplayed;
+
+    self updateDelegateNavigationButtons;
+}
+
+- (void)clear
+{
+    _navigationStates = NSMutableArray array;
+    _currentPosition = nil;
+    self updateDelegateNavigationButtons;
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewNavigationState.h Added

@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * VLCLibraryMediaSourceViewNavigationState.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2022 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class VLCMediaSourceDataSource;
+@class VLCInputNode;
+
+@interface VLCLibraryMediaSourceViewNavigationState : NSObject
+
+@property (readonly) VLCMediaSourceDataSource *currentMediaSource;
+@property (readwrite) VLCInputNode *currentNodeDisplayed;
+
+- (instancetype)initFromMediaSourceDataSource:(VLCMediaSourceDataSource *)mediaSourceDataSource;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewNavigationState.m Added

@@ -0,0 +1,40 @@
+/*****************************************************************************
+ * VLCLibraryMediaSourceViewNavigationState.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2022 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <claudio.cambra@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCLibraryMediaSourceViewNavigationState.h"
+
+#import "VLCMediaSourceDataSource.h"
+#import "library/VLCLibraryWindow.h"
+
+@implementation VLCLibraryMediaSourceViewNavigationState
+
+- (instancetype)initFromMediaSourceDataSource:(VLCMediaSourceDataSource *)mediaSourceDataSource
+{
+    self = super init;
+    if (self) {
+        _currentMediaSource = mediaSourceDataSource;
+        _currentNodeDisplayed = mediaSourceDataSource.nodeToDisplay;
+    }
+    return self;
+}
+
+@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/media-source/VLCMediaSource.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCMediaSource.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/media-source/VLCMediaSource.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCMediaSource.m Changed

@@ -23,7 +23,6 @@
 #import "VLCMediaSource.h"
 
 #import "extensions/NSString+Helpers.h"
-
 #import "library/VLCInputItem.h"
 
 @interface VLCMediaSource ()
@@ -311,7 +310,6 @@
         input_item_node_t *vlcInputNode = inputNode.vlcInputItemNode;
         NSURL *dirUrl = NSURL URLWithString:inputNode.inputItem.MRL;
 
-        self clearChildNodesForNode:vlcInputNode; // Clear existing nodes, refresh
         self generateChildNodesForDirectoryNode:vlcInputNode withUrl:dirUrl;
         return;
     }
@@ -411,23 +409,56 @@
     });
 }
 
-- (void)generateChildNodesForDirectoryNode:(input_item_node_t*)directoryNode withUrl:(NSURL*)directoryUrl
+- (void)generateChildNodesForDirectoryNode:(input_item_node_t *)directoryNode
+                                   withUrl:(NSURL *)directoryUrl
 {
-    if(directoryNode == NULL || directoryUrl == nil) {
+    if (directoryNode == NULL || directoryUrl == nil) {
         return;
     }
 
+    if (self.willStartGeneratingChildNodesForNodeHandler) {
+        self.willStartGeneratingChildNodesForNodeHandler(directoryNode);
+    }
+
+    // Clear pre-existing child nodes
+    while (directoryNode->i_children > 0) {
+        input_item_node_t * const childNode = directoryNode->pp_children0;
+        input_item_node_RemoveNode(directoryNode, childNode);
+        input_item_node_Delete(childNode);
+    }
+
     NSError *error;
-    NSArray<NSURL *> *subDirectories = NSFileManager defaultManager contentsOfDirectoryAtURL:directoryUrl
-                                                                     includingPropertiesForKeys:@NSURLIsDirectoryKey
-                                                                                        options:NSDirectoryEnumerationSkipsHiddenFiles | NSDirectoryEnumerationSkipsSubdirectoryDescendants
-                                                                                          error:&error;
-    if (subDirectories == nil || subDirectories.count == 0 || error) {
+    const NSDirectoryEnumerationOptions options =
+        NSDirectoryEnumerationSkipsHiddenFiles | NSDirectoryEnumerationSkipsSubdirectoryDescendants;
+    NSArray<NSURLResourceKey> * const keys = @NSURLIsDirectoryKey;
+    NSArray<NSURL *> *children =
+        NSFileManager.defaultManager contentsOfDirectoryAtURL:directoryUrl
+                                    includingPropertiesForKeys:keys
+                                                       options:options
+                                                         error:&error;
+
+    if (children == nil || children.count == 0 || error) {
         NSLog(@"Failed to get directories: %@.", error);
         return;
     }
 
-    for (NSURL * const url in subDirectories) {
+    children = children sortedArrayUsingComparator:^NSComparisonResult(NSURL *url1, NSURL *url2) {
+        NSNumber *isDirectory1 = nil;
+        NSNumber *isDirectory2 = nil;
+        url1 getResourceValue:&isDirectory1 forKey:NSURLIsDirectoryKey error:NULL;
+        url2 getResourceValue:&isDirectory2 forKey:NSURLIsDirectoryKey error:NULL;
+
+        if (isDirectory1.boolValue && !isDirectory2.boolValue) {
+            return NSOrderedAscending;
+        } else if (!isDirectory1.boolValue && isDirectory2.boolValue) {
+            return NSOrderedDescending;
+        }
+
+        return url1.lastPathComponent compare:url2.lastPathComponent
+                                       options:NSCaseInsensitiveSearch;
+    };
+
+    for (NSURL * const url in children) {
         NSNumber *isDirectory;
         NSNumber *isVolume;
         NSNumber *isEjectable;
@@ -456,6 +487,10 @@
             urlInputItem = NULL;
         }
     }
+
+    if (self.didFinishGeneratingChildNodesForNodeHandler) {
+        self.didFinishGeneratingChildNodesForNodeHandler(directoryNode);
+    }
 }
 
 - (NSString *)mediaSourceDescription

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceBaseDataSource.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceBaseDataSource.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceBaseDataSource.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceBaseDataSource.m Changed

@@ -22,6 +22,7 @@
 
 #import "VLCMediaSourceBaseDataSource.h"
 
+#import "VLCLibraryMediaSourceViewNavigationStack.h"
 #import "VLCMediaSourceProvider.h"
 #import "VLCMediaSource.h"
 #import "VLCMediaSourceDeviceCollectionViewItem.h"
@@ -33,7 +34,6 @@
 #import "library/VLCLibraryWindow.h"
 #import "library/VLCInputNodePathControl.h"
 #import "library/VLCInputNodePathControlItem.h"
-#import "library/VLCLibraryNavigationStack.h"
 #import "library/VLCInputItem.h"
 #import "library/VLCLibraryCollectionViewSupplementaryElementView.h"
 #import "library/VLCLibraryTableCellView.h"
@@ -78,6 +78,8 @@
                                selector:@selector(mediaSourcePreparingEnded:)
                                    name:VLCMediaSourcePreparsingEnded
                                  object:nil;
+        self loadMediaSources;
+        self returnHome;
     }
     return self;
 }
@@ -160,6 +162,7 @@
     for (VLCMediaSource * const mediaSource in mediaSources) {
         VLCInputNode * const rootNode = mediaSource rootNode;
         mediaSource preparseInputNodeWithinTree:rootNode;
+        self.navigationStack installHandlersOnMediaSource:mediaSource;
     }
 
     _mediaSources = mediaSources;
@@ -168,9 +171,12 @@
 
 - (void)setMediaSourceMode:(VLCMediaSourceMode)mediaSourceMode
 {
+    if (mediaSourceMode == self.mediaSourceMode) {
+        return;
+    }
     _mediaSourceMode = mediaSourceMode;
     self loadMediaSources;
-    self homeButtonAction:self;
+    self returnHome;
 }
 
 #pragma mark - collection view data source
@@ -205,6 +211,10 @@
     if (_mediaSourceMode == VLCMediaSourceModeLAN) {
         VLCInputNode * const rootNode = mediaSource.rootNode;
         NSArray * const nodeChildren = rootNode.children;
+        if (nodeChildren == nil) {
+            NSLog(@"No children found for media source root node: %@ cannot provide viewItem correctly", rootNode);
+            return viewItem;
+        }
         VLCInputNode * const childNode = nodeChildrenindexPath.item;
         VLCInputItem * const childRootInput = childNode.inputItem;
         viewItem.titleTextField.stringValue = childRootInput.name;
@@ -268,6 +278,10 @@
         mediaSource = _mediaSourcesindexPath.section;
         VLCInputNode * const rootNode = mediaSource.rootNode;
         NSArray * const nodeChildren = rootNode.children;
+        if (nodeChildren == nil) {
+            NSLog(@"No children found for media source root node: %@ cannot access item correctly", rootNode);
+            return;
+        }
         childNode = nodeChildrenindexPath.item;
     } else {
         mediaSource = _mediaSourcesindexPath.item;
@@ -419,9 +433,11 @@
     newChildDataSource.collectionView = self.collectionView;
     newChildDataSource.pathControl = self.pathControl;
     newChildDataSource.tableView = self.tableView;
-    
+    newChildDataSource.navigationStack = self.navigationStack;
+    newChildDataSource.parentBaseDataSource = self;
+
     self setChildDataSource:newChildDataSource;
-    VLCMain.sharedInstance.libraryWindow.navigationStack appendCurrentLibraryState;
+    self.navigationStack appendCurrentLibraryState;
 
     self togglePathControlVisibility:YES;
 }
@@ -488,6 +504,7 @@
 
     _childDataSource = nil;
     self.pathControl clearInputNodePathControlItems;
+    self.navigationStack clear;
 
     self reloadData;
 
@@ -497,8 +514,6 @@
 - (void)homeButtonAction:(id)sender
 {
     self returnHome;
-    VLCLibraryNavigationStack * const mainNavStack = VLCMain.sharedInstance.libraryWindow.navigationStack;
-    mainNavStack clear;
 }
 
 - (void)pathControlAction:(id)sender

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceCollectionViewItem.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceCollectionViewItem.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceCollectionViewItem.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceCollectionViewItem.m Changed

@@ -31,9 +31,11 @@
 #import "library/VLCLibraryMenuController.h"
 #import "library/VLCLibraryImageCache.h"
 
+#import "library/media-source/VLCMediaSourceDataSource.h"
+
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 #import "views/VLCImageView.h"
 #import "views/VLCTrackingView.h"
@@ -64,6 +66,7 @@
     self.annotationTextField.font = NSFont systemFontOfSize:NSFont.systemFontSize weight:NSFontWeightBold;
     self.annotationTextField.textColor = NSColor.VLClibraryAnnotationColor;
     self.annotationTextField.backgroundColor = NSColor.VLClibraryAnnotationBackgroundColor;
+    self.highlightBox.borderColor = NSColor.VLCAccentColor;
 
     if (@available(macOS 10.14, *)) {
         NSApplication.sharedApplication addObserver:self
@@ -109,7 +112,8 @@
     _mediaTitleTextField.stringValue = @"";
     _annotationTextField.hidden = YES;
     _mediaImageView.image = nil;
-    _addToPlaylistButton.hidden = NO;
+    _addToPlayQueueButton.hidden = NO;
+    _highlightBox.hidden = YES;
 }
 
 - (void)setRepresentedInputItem:(VLCInputItem *)representedInputItem
@@ -118,6 +122,12 @@
     self updateRepresentation;
 }
 
+- (void)setSelected:(BOOL)selected
+{
+    super.selected = selected;
+    _highlightBox.hidden = !selected;
+}
+
 - (void)updateRepresentation
 {
     if (_representedInputItem == nil) {
@@ -125,9 +135,17 @@
         return;
     }
 
-    _mediaTitleTextField.stringValue = _representedInputItem.name;
-    VLCLibraryImageCache thumbnailForInputItem:self->_representedInputItem withCompletion:^(NSImage * const thumbnail) {
-        self->_mediaImageView.image = thumbnail;
+    VLCInputItem * const inputItem = _representedInputItem;
+    _mediaTitleTextField.stringValue = inputItem.name;
+
+    __weak typeof(self) weakSelf = self;
+    VLCLibraryImageCache thumbnailForInputItem:inputItem
+                                 withCompletion:^(NSImage * const thumbnail) {
+        VLCMediaSourceCollectionViewItem * const strongSelf = weakSelf;
+        if (!strongSelf || strongSelf->_representedInputItem != inputItem) {
+            return;
+        }
+        strongSelf->_mediaImageView.image = thumbnail;
     };
 
 
@@ -156,38 +174,59 @@
 
 - (IBAction)playInstantly:(id)sender
 {
-    VLCMain.sharedInstance.playlistController addInputItem:_representedInputItem.vlcInputItem atPosition:-1 startPlayback:YES;
+    VLCMain.sharedInstance.playQueueController addInputItem:_representedInputItem.vlcInputItem atPosition:-1 startPlayback:YES;
 }
 
-- (IBAction)addToPlaylist:(id)sender
+- (IBAction)addToPlayQueue:(id)sender
 {
-    VLCMain.sharedInstance.playlistController addInputItem:_representedInputItem.vlcInputItem atPosition:-1 startPlayback:NO;
+    VLCMain.sharedInstance.playQueueController addInputItem:_representedInputItem.vlcInputItem atPosition:-1 startPlayback:NO;
 }
 
--(void)mouseDown:(NSEvent *)theEvent
+- (void)openContextMenu:(NSEvent *)event
 {
-    if (theEvent.modifierFlags & NSControlKeyMask) {
-        if (!_menuController) {
-            _menuController = VLCLibraryMenuController alloc init;
-        }
+    if (!_menuController) {
+        _menuController = VLCLibraryMenuController alloc init;
+    }
+
+    NSCollectionView * const collectionView = self.collectionView;
+    VLCMediaSourceDataSource * const dataSource =
+        (VLCMediaSourceDataSource *)collectionView.dataSource;
+    NSParameterAssert(dataSource != nil);
+    NSSet<NSIndexPath *> * const indexPaths = collectionView.selectionIndexPaths;
+    NSArray<VLCInputItem *> * const selectedInputItems =
+        dataSource mediaSourceInputItemsAtIndexPaths:indexPaths;
+    const NSInteger mediaSourceItemIndex = selectedInputItems indexOfObjectPassingTest:^BOOL(
+        VLCInputItem * const inputItem, const NSUInteger idx, BOOL * const stop
+    ) {
+        return inputItem.MRL isEqualToString:_representedInputItem.MRL;
+    };
+    NSArray<VLCInputItem *> *items = nil;
 
-        _menuController setRepresentedInputItems:@_representedInputItem;
-        _menuController popupMenuWithEvent:theEvent forView:self.view;
+    if (mediaSourceItemIndex == NSNotFound) {
+        items = @_representedInputItem;
+    } else {
+        items = selectedInputItems;
     }
 
-    super mouseDown:theEvent;
+    _menuController.representedInputItems = items;
+    _menuController popupMenuWithEvent:event forView:self.view;
 }
 
-- (void)rightMouseDown:(NSEvent *)theEvent
+- (void)mouseDown:(NSEvent *)event
 {
-    if (!_menuController) {
-        _menuController = VLCLibraryMenuController alloc init;
+    if (event.modifierFlags & NSControlKeyMask) {
+        self openContextMenu:event;
+    } else if (event.modifierFlags & (NSShiftKeyMask | NSCommandKeyMask)) {
+        self.selected = !self.selected;
+    } else {
+        super mouseDown:event;
     }
+}
 
-    _menuController setRepresentedInputItems:@_representedInputItem;
-    _menuController popupMenuWithEvent:theEvent forView:self.view;
-
-    super rightMouseDown:theEvent;
+- (void)rightMouseDown:(NSEvent *)event
+{
+    self openContextMenu:event;
+    super rightMouseDown:event;
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceDataSource.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceDataSource.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceDataSource.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/media-source/VLCMediaSourceDataSource.m Changed

@@ -22,6 +22,13 @@
 
 #import "VLCMediaSourceDataSource.h"
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#import "VLCLibraryMediaSourceViewNavigationStack.h"
+#import "VLCMediaSourceBaseDataSource.h"
 #import "VLCMediaSourceCollectionViewItem.h"
 #import "VLCMediaSource.h"
 
@@ -30,14 +37,13 @@
 #import "library/VLCInputItem.h"
 #import "library/VLCInputNodePathControl.h"
 #import "library/VLCInputNodePathControlItem.h"
-#import "library/VLCLibraryNavigationStack.h"
 #import "library/VLCLibraryTableCellView.h"
 #import "library/VLCLibraryUIUnits.h"
 #import "library/VLCLibraryWindow.h"
 
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 #import "views/VLCImageView.h"
 
@@ -47,15 +53,65 @@
 {
     VLCInputItem *_childRootInput;
 }
+
+@property (readwrite) dispatch_source_t observedPathDispatchSource;
+
 @end
 
 @implementation VLCMediaSourceDataSource
 
+- (dispatch_source_t)observeLocalUrl:(NSURL *)url
+                      forVnodeEvents:(dispatch_source_vnode_flags_t)eventsFlags
+                    withEventHandler:(dispatch_block_t)eventHandlerBlock
+{
+    const uintptr_t descriptor = open(url.path.UTF8String, O_EVTONLY);
+    if (descriptor == -1) {
+        return nil;
+    }
+    struct stat fileStat;
+    const int statResult = fstat(descriptor, &fileStat);
+
+    const dispatch_queue_t globalQueue =
+        dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+    const dispatch_source_t fileDispatchSource =
+        dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, descriptor, eventsFlags, globalQueue);
+    dispatch_source_set_event_handler(fileDispatchSource, eventHandlerBlock);
+    dispatch_source_set_cancel_handler(fileDispatchSource, ^{
+        close(descriptor);
+    });
+    dispatch_resume(fileDispatchSource);
+    return fileDispatchSource;
+}
+
 - (void)setNodeToDisplay:(nonnull VLCInputNode*)nodeToDisplay
 {
     NSAssert(nodeToDisplay, @"Nil node to display, will not set");
     _nodeToDisplay = nodeToDisplay;
+
+    input_item_node_t * const inputNode = nodeToDisplay.vlcInputItemNode;
+    NSURL * const nodeUrl = NSURL URLWithString:nodeToDisplay.inputItem.MRL;
+    self.displayedMediaSource generateChildNodesForDirectoryNode:inputNode withUrl:nodeUrl;
+
     self reloadData;
+
+    const __weak typeof(self) weakSelf = self;
+
+    self.observedPathDispatchSource = self observeLocalUrl:nodeUrl
+                                             forVnodeEvents:DISPATCH_VNODE_WRITE | DISPATCH_VNODE_DELETE | DISPATCH_VNODE_RENAME
+                                           withEventHandler:^{
+        const uintptr_t eventFlags = dispatch_source_get_data(weakSelf.observedPathDispatchSource);
+        if (eventFlags & DISPATCH_VNODE_DELETE || eventFlags & DISPATCH_VNODE_RENAME) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                weakSelf.parentBaseDataSource homeButtonAction:weakSelf;
+            });
+        } else {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                weakSelf.displayedMediaSource generateChildNodesForDirectoryNode:inputNode
+                                                                          withUrl:nodeUrl;
+                weakSelf reloadData;
+            });
+        }
+    };
 }
 
 - (void)setupViews
@@ -64,6 +120,30 @@
     self.tableView setTarget:self;
 }
 
+- (nullable VLCInputNode *)inputNodeForIndexPath:(NSIndexPath *)indexPath
+{
+    VLCInputNode * const rootNode = self.nodeToDisplay;
+    NSArray * const nodeChildren = rootNode.children;
+    return nodeChildren ? nodeChildrenindexPath.item : nil;
+}
+
+- (NSArray<VLCInputItem *> *)mediaSourceInputItemsAtIndexPaths:(NSSet<NSIndexPath *> *const)indexPaths
+{
+    NSMutableArray<VLCInputItem *> * const inputItems =
+        NSMutableArray arrayWithCapacity:indexPaths.count;
+
+    for (NSIndexPath * const indexPath in indexPaths) {
+        VLCInputNode * const inputNode = self inputNodeForIndexPath:indexPath;
+        if (!inputNode) {
+            continue;
+        }
+        VLCInputItem * const inputItem = inputNode.inputItem;
+        inputItems addObject:inputItem;
+    }
+
+    return inputItems.copy;
+}
+
 #pragma mark - collection view data source and delegation
 
 - (NSInteger)numberOfSectionsInCollectionView:(NSCollectionView *)collectionView
@@ -88,6 +168,10 @@
 
     VLCInputNode *rootNode = _nodeToDisplay;
     NSArray *nodeChildren = rootNode.children;
+    if (nodeChildren == nil) {
+        NSLog(@"No children for node %@, cannot provide correctly setup viewItem", rootNode);
+        return viewItem;
+    }
     VLCInputNode *childNode = nodeChildrenindexPath.item;
     VLCInputItem *childRootInput = childNode.inputItem;
 
@@ -98,15 +182,18 @@
 
 - (void)collectionView:(NSCollectionView *)collectionView didSelectItemsAtIndexPaths:(NSSet<NSIndexPath *> *)indexPaths
 {
-    NSIndexPath *indexPath = indexPaths.anyObject;
-    if (!indexPath) {
+    if (indexPaths.count != 1) {
         return;
     }
-    VLCInputNode *rootNode = self.nodeToDisplay;
-    NSArray *nodeChildren = rootNode.children;
-    VLCInputNode *childNode = nodeChildrenindexPath.item;
 
-    self performActionForNode:childNode allowPlayback:YES;
+    NSIndexPath * const indexPath = indexPaths.anyObject;
+    if (!indexPath) {
+        return;
+    }
+    VLCInputNode * const childNode = self inputNodeForIndexPath:indexPath;
+    if (childNode) {
+        self performActionForNode:childNode allowPlayback:YES;
+    }
 }
 
 - (NSSize)collectionView:(NSCollectionView *)collectionView
@@ -146,7 +233,9 @@
     }
 
     VLCInputNode *childNode = self mediaSourceInputNodeAtRow:selectedIndex;
-    self performActionForNode:childNode allowPlayback:NO;
+    if (childNode) {
+        self performActionForNode:childNode allowPlayback:NO;
+    }
 }
 
 - (void)tableViewAction:(id)sender
@@ -157,10 +246,12 @@
     }
 
     VLCInputNode *childNode = self mediaSourceInputNodeAtRow:selectedIndex;
-    self performActionForNode:childNode allowPlayback:YES;
+    if (childNode) {
+        self performActionForNode:childNode allowPlayback:YES;
+    }
 }
 
-- (VLCInputNode*)mediaSourceInputNodeAtRow:(NSInteger)tableViewRow
+- (nullable VLCInputNode *)mediaSourceInputNodeAtRow:(NSInteger)tableViewRow
 {
     if (_nodeToDisplay == nil) {
         return nil;
@@ -204,9 +295,9 @@
         self.displayedMediaSource preparseInputNodeWithinTree:node;
         self.nodeToDisplay = node;
 
-        VLCMain.sharedInstance.libraryWindow.navigationStack appendCurrentLibraryState;
+        self.navigationStack appendCurrentLibraryState;
     } else if (childRootInput.inputType == ITEM_TYPE_FILE && allowPlayback) {
-        VLCMain.sharedInstance.playlistController addInputItem:childRootInput.vlcInputItem atPosition:-1 startPlayback:YES;
+        VLCMain.sharedInstance.playQueueController addInputItem:childRootInput.vlcInputItem atPosition:-1 startPlayback:YES;
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistDataSource.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistDataSource.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistViewController.h Changed

@@ -22,19 +22,20 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "library/VLCLibraryAbstractSegmentViewController.h"
+#import "library/VLCLibraryAbstractMediaLibrarySegmentViewController.h"
 
 #include <vlc_media_library.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+@class VLCLibraryCollectionView;
 @class VLCLibraryCollectionViewDelegate;
 @class VLCLibraryMasterDetailViewTableViewDelegate;
 @class VLCLibraryPlaylistDataSource;
 @class VLCLibraryTableView;
 @class VLCLibraryWindow;
 
-@interface VLCLibraryPlaylistViewController : VLCLibraryAbstractSegmentViewController<NSSplitViewDelegate>
+@interface VLCLibraryPlaylistViewController : VLCLibraryAbstractMediaLibrarySegmentViewController<NSSplitViewDelegate>
 
 @property (readonly) NSSplitView *listViewSplitView;
 @property (readonly) NSScrollView *masterTableViewScrollView;
@@ -42,7 +43,7 @@
 @property (readonly) NSScrollView *detailTableViewScrollView;
 @property (readonly) VLCLibraryTableView *detailTableView;
 @property (readonly) NSScrollView *collectionViewScrollView;
-@property (readonly) NSCollectionView *collectionView;
+@property (readonly) VLCLibraryCollectionView *collectionView;
 
 @property (readonly) VLCLibraryPlaylistDataSource *dataSource;
 @property (readonly) VLCLibraryCollectionViewDelegate *collectionViewDelegate;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistViewController.m Changed

@@ -24,6 +24,7 @@
 
 #import "extensions/NSString+Helpers.h"
 
+#import "library/VLCLibraryCollectionView.h"
 #import "library/VLCLibraryCollectionViewDelegate.h"
 #import "library/VLCLibraryCollectionViewFlowLayout.h"
 #import "library/VLCLibraryController.h"
@@ -106,7 +107,7 @@
     _collectionViewScrollView = 
         NSScrollView alloc initWithFrame:self.libraryWindow.libraryTargetView.frame;
     _collectionViewDelegate = VLCLibraryCollectionViewDelegate alloc init;
-    _collectionView = NSCollectionView alloc init;
+    _collectionView = VLCLibraryCollectionView alloc init;
 
     _collectionViewScrollView.documentView = _collectionView;
     _collectionViewScrollView.translatesAutoresizingMaskIntoConstraints = NO;
@@ -299,7 +300,7 @@
     const vlc_ml_playlist_type_t playlistType = self.dataSource.playlistType;
     const size_t numberOfPlaylists = model numberOfPlaylistsOfType:playlistType;
 
-    if (self.libraryWindow.librarySegmentType == VLCLibraryPlaylistsSegment &&
+    if (self.libraryWindow.librarySegmentType == VLCLibraryPlaylistsSegmentType &&
         ((numberOfPlaylists == 0 && !self.libraryWindow.libraryTargetView.subviews containsObject:self.libraryWindow.emptyLibraryView) ||
          (numberOfPlaylists > 0 && !self.libraryWindow.libraryTargetView.subviews containsObject:_collectionViewScrollView)) &&
         self.libraryWindow.videoViewController.view.hidden) {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.h Changed

@@ -22,8 +22,10 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "library/VLCLibraryAbstractSegmentViewController.h"
+#import "library/VLCLibraryAbstractMediaLibrarySegmentViewController.h"
+#import "library/VLCLibraryItemPresentingCapable.h"
 
+@class VLCLibraryCollectionView;
 @class VLCLibraryWindow;
 @class VLCLibraryVideoDataSource;
 @class VLCLibraryShowsDataSource;
@@ -33,13 +35,12 @@
 NS_ASSUME_NONNULL_BEGIN
 
 // Controller for the video library views
-
-@interface VLCLibraryVideoViewController : VLCLibraryAbstractSegmentViewController
+@interface VLCLibraryVideoViewController : VLCLibraryAbstractMediaLibrarySegmentViewController<VLCLibraryItemPresentingCapable>
 
 @property (readonly, weak) NSView *videoLibraryView;
 @property (readonly, weak) NSSplitView *videoLibrarySplitView;
 @property (readonly, weak) NSScrollView *videoLibraryCollectionViewScrollView;
-@property (readonly, weak) NSCollectionView *videoLibraryCollectionView;
+@property (readonly, weak) VLCLibraryCollectionView *videoLibraryCollectionView;
 @property (readonly, weak) NSScrollView *videoLibraryGroupSelectionTableViewScrollView;
 @property (readonly, weak) NSTableView *videoLibraryGroupSelectionTableView;
 @property (readonly, weak) NSScrollView *videoLibraryGroupsTableViewScrollView;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.m Changed

@@ -24,6 +24,7 @@
 
 #import "extensions/NSString+Helpers.h"
 
+#import "library/VLCLibraryCollectionView.h"
 #import "library/VLCLibraryCollectionViewDelegate.h"
 #import "library/VLCLibraryCollectionViewFlowLayout.h"
 #import "library/VLCLibraryCollectionViewItem.h"
@@ -251,9 +252,9 @@
 - (id<VLCLibraryDataSource>)currentDataSource
 {
     const NSInteger librarySegmentType = self.libraryWindow.librarySegmentType;
-    if (librarySegmentType == VLCLibraryVideoSegment) {
+    if (librarySegmentType == VLCLibraryVideoSegmentType) {
         return self.libraryVideoDataSource;
-    } else if (librarySegmentType == VLCLibraryShowsVideoSubSegment) {
+    } else if (librarySegmentType == VLCLibraryShowsVideoSubSegmentType) {
         return self.libraryShowsDataSource;
     } else {
         return nil;
@@ -352,13 +353,13 @@
     const NSUInteger videoCount = model.numberOfVideoMedia;
     const NSUInteger showsCount = model.numberOfShows;
 
-    if (self.libraryWindow.librarySegmentType == VLCLibraryVideoSegment &&
+    if (self.libraryWindow.librarySegmentType == VLCLibraryVideoSegmentType &&
         ((videoCount == 0 && !self.libraryTargetView.subviews containsObject:self.emptyLibraryView) ||
          (videoCount > 0 && !self.libraryTargetView.subviews containsObject:_videoLibraryView)) &&
         self.libraryWindow.videoViewController.view.hidden) {
 
         self updatePresentedVideoLibraryView;
-    } else if (self.libraryWindow.librarySegmentType == VLCLibraryShowsVideoSubSegment &&
+    } else if (self.libraryWindow.librarySegmentType == VLCLibraryShowsVideoSubSegmentType &&
          ((showsCount == 0 && !self.libraryTargetView.subviews containsObject:self.emptyLibraryView) ||
           (showsCount > 0 && !self.libraryTargetView.subviews containsObject:_videoLibraryView)) &&
          self.libraryWindow.videoViewController.view.hidden) {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/main/VLCMain.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/main/VLCMain.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/main/VLCMain.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/main/VLCMain.m Changed

@@ -65,10 +65,10 @@
 #import "panels/VLCVideoEffectsWindowController.h"
 #import "panels/VLCTrackSynchronizationWindowController.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
-#import "playlist/VLCPlaylistModel.h"
-#import "playlist/VLCPlaybackContinuityController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueModel.h"
+#import "playqueue/VLCPlaybackContinuityController.h"
 
 #import "preferences/prefs.h"
 #import "preferences/VLCSimplePrefsController.h"
@@ -155,8 +155,12 @@
             intf_thread_t *p_intf = (intf_thread_t*) p_this;
             p_interface_thread = p_intf;
 
-            p_network_preparser = vlc_preparser_New(p_this, 1, 0,
-                                                    META_REQUEST_OPTION_PARSE);
+            const struct vlc_preparser_cfg cfg = {
+                .types = VLC_PREPARSER_TYPE_PARSE,
+                .max_parser_threads = 1,
+                .timeout = 0,
+            };
+            p_network_preparser = vlc_preparser_New(p_this, &cfg);
             if (p_network_preparser == nil)
             {
                 retcode = VLC_ENOMEM;
@@ -253,7 +257,7 @@
 
         VLCApplication.sharedApplication.delegate = self;
 
-        _playlistController = VLCPlaylistController alloc initWithPlaylist:vlc_intf_GetMainPlaylist(_p_intf);
+        _playQueueController = VLCPlayQueueController alloc initWithPlaylist:vlc_intf_GetMainPlaylist(_p_intf);
         _libraryController = VLCLibraryController alloc init;
         _continuityController = VLCPlaybackContinuityController alloc init;
 
@@ -270,7 +274,7 @@
         _audioEffectsPanel = VLCAudioEffectsWindowController alloc init;
 
         if (NSApp currentSystemPresentationOptions & NSApplicationPresentationFullScreen)
-            _playlistController.playerController setFullscreen:YES;
+            _playQueueController.playerController setFullscreen:YES;
     }
 
     return self;
@@ -365,13 +369,13 @@
 - (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
 {
     NSApp activateIgnoringOtherApps:YES;
-    _playlistController stopPlayback;
+    _playQueueController stopPlayback;
 }
 
 /* don't be enthusiastic about an update if we currently play a video */
 - (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle
 {
-    if (_playlistController.playerController activeVideoPlayback)
+    if (_playQueueController.playerController activeVideoPlayback)
         return NO;
 
     return YES;
@@ -444,7 +448,7 @@
         o_result addObject:inputMetadata;
     }
 
-    _playlistController addPlaylistItems:o_result;
+    _playQueueController addPlayQueueItems:o_result;
 }
 
 /* When user click in the Dock icon our double click in the finder */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/main/macosx.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/main/macosx.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/menus/VLCMainMenu.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/menus/VLCMainMenu.h Changed

@@ -27,7 +27,7 @@
 
 @class VLCRendererMenuController;
 
-@interface VLCMainMenu : NSObject
+@interface VLCMainMenu : NSObject<NSUserInterfaceValidations>
 
 /* main menu */
 @property (readwrite, weak) IBOutlet NSMenuItem *about;
@@ -87,8 +87,8 @@
 @property (readwrite, weak) IBOutlet NSMenuItem *random;
 @property (readwrite, weak) IBOutlet NSMenuItem *repeat;
 @property (readwrite, weak) IBOutlet NSMenuItem *AtoBloop;
-@property (readwrite, weak) IBOutlet NSMenuItem *libraryPlaylistMode;
-@property (readwrite, weak) IBOutlet NSMenuItem *sortPlaylist;
+@property (readwrite, weak) IBOutlet NSMenuItem *libraryPlayQueueMode;
+@property (readwrite, weak) IBOutlet NSMenuItem *sortPlayQueue;
 @property (readwrite, weak) IBOutlet NSMenuItem *quitAfterPB;
 @property (readwrite, weak) IBOutlet NSMenuItem *fwd;
 @property (readwrite, weak) IBOutlet NSMenuItem *bwd;
@@ -179,7 +179,7 @@
 @property (readwrite, weak) IBOutlet NSMenuItem *audioeffects;
 @property (readwrite, weak) IBOutlet NSMenuItem *videoeffects;
 @property (readwrite, weak) IBOutlet NSMenuItem *bookmarks;
-@property (readwrite, weak) IBOutlet NSMenuItem *playlist;
+@property (readwrite, weak) IBOutlet NSMenuItem *playQueue;
 @property (readwrite, weak) IBOutlet NSMenuItem *detachedAudioWindow;
 @property (readwrite, weak) IBOutlet NSMenuItem *info;
 @property (readwrite, weak) IBOutlet NSMenuItem *errorsAndWarnings;
@@ -259,7 +259,7 @@
 - (IBAction)toggleRecord:(id)sender;
 - (IBAction)setPlaybackRate:(id)sender;
 - (IBAction)toggleAtoBloop:(id)sender;
-- (IBAction)toggleLibraryPlaylistMode:(id)sender;
+- (IBAction)toggleLibraryPlayQueueMode:(id)sender;
 - (IBAction)selectRenderer:(id)sender;
 
 - (IBAction)toggleFullscreen:(id)sender;
@@ -291,6 +291,6 @@
 - (IBAction)showErrorsAndWarnings:(id)sender;
 - (IBAction)showMessagesPanel:(id)showMessagesPanel;
 - (IBAction)showMainWindow:(id)sender;
-- (IBAction)showPlaylist:(id)sender;
+- (IBAction)showPlayQueue:(id)sender;
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/menus/VLCMainMenu.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/menus/VLCMainMenu.m Changed

@@ -44,9 +44,10 @@
 #import "panels/VLCInformationWindowController.h"
 #import "panels/VLCTimeSelectionPanelController.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
-#import "playlist/VLCPlaylistSortingMenuController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueModel.h"
+#import "playqueue/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueSortingMenuController.h"
 #import "preferences/VLCSimplePrefsController.h"
 
 #import "windows/VLCAboutWindowController.h"
@@ -102,9 +103,9 @@
     VLCAboutWindowController *_aboutWindowController;
     VLCHelpWindowController  *_helpWindowController;
     VLCAddonsWindowController *_addonsController;
-    VLCPlaylistController *_playlistController;
+    VLCPlayQueueController *_playQueueController;
     VLCPlayerController *_playerController;
-    VLCPlaylistSortingMenuController *_playlistSortingController;
+    VLCPlayQueueSortingMenuController *_playQueueSortingController;
     VLCInformationWindowController *_infoWindowController;
 
     __strong VLCTimeSelectionPanelController *_timeSelectionPanel;
@@ -126,8 +127,8 @@
 
 - (void)awakeFromNib
 {
-    _playlistController = VLCMain.sharedInstance.playlistController;
-    _playerController = _playlistController.playerController;
+    _playQueueController = VLCMain.sharedInstance.playQueueController;
+    _playerController = _playQueueController.playerController;
 
     /* check whether the user runs OSX with a RTL language */
     NSArray *languages = NSLocale preferredLanguages;
@@ -138,9 +139,6 @@
         _rateTextField setAlignment:NSLeftTextAlignment;
     }
 
-    self setRateControlsEnabled:NO;
-    self setSubtitleSizeControlsEnabled:NO;
-
 #ifdef HAVE_SPARKLE
     _checkForUpdate setAction:@selector(checkForUpdates:);
     _checkForUpdate setTarget:SUUpdater sharedUpdater;
@@ -158,13 +156,14 @@
     _rendererMenuController = VLCRendererMenuController alloc init;
     _rendererMenuController.rendererNoneItem = _rendererNoneItem;
     _rendererMenuController.rendererMenu = _rendererMenu;
-    _playlistSortingController = VLCPlaylistSortingMenuController alloc init;
-    _sortPlaylist.submenu = _playlistSortingController.playlistSortingMenu;
+    _playQueueSortingController = VLCPlayQueueSortingMenuController alloc init;
+    _sortPlayQueue.submenu = _playQueueSortingController.playQueueSortingMenu;
 
     self mediaItemChanged:nil;
+    self playbackStateChanged:nil;
     self updateTitleAndChapterMenus:nil;
     self updateProgramMenu:nil;
-    self updateLibraryPlaylistMode;
+    self updateLibraryPlayQueueMode;
 
     NSNotificationCenter *notificationCenter = NSNotificationCenter.defaultCenter;
     notificationCenter addObserver:self
@@ -225,7 +224,12 @@
                              object:nil;
     notificationCenter addObserver:self
                            selector:@selector(voutListChanged:)
-                               name:VLCPlayerListOfVideoOutputThreadsChanged object:nil;
+                               name:VLCPlayerListOfVideoOutputThreadsChanged
+                             object:nil;
+    notificationCenter addObserver:self
+                           selector:@selector(updateRateControls:)
+                               name:VLCPlayerCapabilitiesChanged
+                             object:nil;
 
     self setupVarMenuItem:_add_intf
                     target:VLC_OBJECT(getIntf())
@@ -274,21 +278,11 @@
 
     self refreshAudioDeviceList;
 
-#if 0
-#warning fix advanced subtitles styles (see #22095)
     /* setup subtitles menu */
-    // Persist those variables on the playlist
-    playlist_t *p_playlist = pl_Get(getIntf());
-    var_Create(p_playlist, "freetype-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-    var_Create(p_playlist, "freetype-background-opacity", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-    var_Create(p_playlist, "freetype-background-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-    var_Create(p_playlist, "freetype-outline-thickness", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-
     self setupMenu: _subtitle_textcolorMenu withIntList:"freetype-color" andSelector:@selector(switchSubtitleOption:);
     _subtitle_bgopacity_sld setIntegerValue: config_GetInt("freetype-background-opacity");
     self setupMenu: _subtitle_bgcolorMenu withIntList:"freetype-background-color" andSelector:@selector(switchSubtitleOption:);
     self setupMenu: _subtitle_outlinethicknessMenu withIntList:"freetype-outline-thickness" andSelector:@selector(switchSubtitleOption:);
-#endif
 
     _voutMenuplay matchKeyEquivalentsOfMenuItem:_play;
     _voutMenustop matchKeyEquivalentsOfMenuItem:_stop;
@@ -360,7 +354,7 @@
     _open_generic setTitle: _NS("Advanced Open File...");
     _open_file setTitle: _NS("Open File...");
     _open_disc setTitle: _NS("Open Disc...");
-    _open_net setTitle: _NS("Open Network...");
+    _open_net setTitle: _NS("Open Stream...");
     _open_capture setTitle: _NS("Open Capture Device...");
     _open_recent setTitle: _NS("Open Recent");
     _close_window setTitle: _NS("Close Window");
@@ -394,8 +388,8 @@
     _random setTitle: _NS("Random");
     _repeat setTitle: _NS("Repeat");
     _AtoBloop setTitle: _NS("A→B Loop");
-    _libraryPlaylistMode setTitle: _NS("Library Playlist Mode");
-    _sortPlaylist setTitle: _NS("Sort Playlist");
+    _libraryPlayQueueMode setTitle: _NS("Library Play Queue Mode");
+    _sortPlayQueue setTitle: _NS("Sort Play Queue");
     _quitAfterPB setTitle: _NS("Quit after Playback");
     _fwd setTitle: _NS("Step Forward");
     _bwd setTitle: _NS("Step Backward");
@@ -480,7 +474,7 @@
     _audioeffects setTitle: _NS("Audio Effects...");
     _videoeffects setTitle: _NS("Video Effects...");
     _bookmarks setTitle: _NS("Bookmarks...");
-    _playlist setTitle: _NS("Playlist...");
+    _playQueue setTitle: _NS("Play Queue...");
     _detachedAudioWindow setTitle: _NS("Detached Audio Window...");
     _info setTitle: _NS("Media Information...");
     _messages setTitle: _NS("Messages...");
@@ -626,27 +620,16 @@
 
 #pragma mark - Interface update
 
-- (void)mediaItemChanged:(NSNotification *)aNotification
+- (void)mediaItemChanged:(NSNotification *)notification
 {
-    self updateTrackHandlingMenus:aNotification;
+    self updateTrackHandlingMenus:notification;
+    self updateRateControls:notification;
 
-    VLCInputItem * const inputItem = _playerController.currentMedia;
-
-    if (inputItem != nil) {
+    if (_playerController.currentMedia != nil) {
         self rebuildAoutMenu;
         self rebuildVoutMenu;
-        self setRateControlsEnabled:_playerController.rateChangable;
-        self setSubtitleSizeControlsEnabled:YES;
-        self.info.enabled = YES;
     } else {
-        _postprocessing setEnabled:NO;
-        self setAudioSubMenusEnabled:NO;
-        self setVideoMenuActiveVideo:NO;
-        self setRateControlsEnabled:NO;
-        self setSubtitleSizeControlsEnabled:NO;
-
         self.windowMenu.autoenablesItems = NO;
-        self.info.enabled = NO;
     }
 }
 
@@ -668,7 +651,6 @@
                        var:"visual"
                   selector:@selector(toggleVar:);
     aout_Release(p_aout);
-    self setAudioSubMenusEnabled:YES;
 }
 
 - (void)voutListChanged:(NSNotification *)aNotification
@@ -712,9 +694,6 @@
     vout_Release(p_vout);
 
     self refreshVoutDeviceMenu:nil;
-
-    const BOOL activeVideoPlayback = _playerController.activeVideoPlayback;
-    self setVideoMenuActiveVideo:activeVideoPlayback;
 }
 
 - (void)refreshVoutDeviceMenu:(NSNotification *)notification
@@ -745,73 +724,43 @@
     submenu itemWithTag: var_InheritInteger(getIntf(), "macosx-vdev") setState: NSOnState;
 }
 
-- (void)setAudioSubMenusEnabled:(BOOL)enabled
+- (void)updateSubtitlesMenu:(NSNotification *)notification
 {
-    _visual setEnabled: enabled;
-    _channels setEnabled: enabled;
-}
+    const BOOL enabled = self validateUserInterfaceItem:self.openSubtitleFile;
+    self.subtitleSizeSlider.enabled = enabled;
 
-- (void)setVideoMenuActiveVideo:(BOOL)activeVideo
-{
-    if (_videoMenu.autoenablesItems) {
-        _videoMenu.autoenablesItems = NO;
-    }
-
-    _snapshot.enabled = activeVideo;
-    self setVideoSubmenusEnabled:activeVideo;
-}
+    const unsigned int scaleFactor = _playerController.subtitleTextScalingFactor;
+    self.subtitleSizeSlider.intValue = scaleFactor;
+    self.subtitleSizeTextField.stringValue =
+        NSString stringWithFormat:@"%.2fx", scaleFactor / 100.;
 
-- (void)setVideoSubmenusEnabled:(BOOL)enabled
-{
-    _deinterlace setEnabled: enabled;
-    _deinterlace_mode setEnabled: enabled;
-    _screen setEnabled: enabled;
-    _aspect_ratio setEnabled: enabled;
-    _crop setEnabled: enabled;
-    _postprocessing setEnabled: enabled;
-    self setSubtitleMenuEnabled: enabled;
-}
+    NSColor * const color = enabled
+        ? NSColor.controlTextColor
+        : NSColor.disabledControlTextColor;
+    self.subtitleSizeLabel.textColor = color;
+    self.subtitleSizeSmallerLabel.textColor = color;
+    self.subtitleSizeLargerLabel.textColor = color;
+    self.subtitleSizeTextField.textColor = color;
 
-- (void)setSubtitleMenuEnabled:(BOOL)b_enabled
-{
-    _openSubtitleFile setEnabled: b_enabled;
-    _voutMenuOpenSubtitleFile setEnabled: b_enabled;
-    if (b_enabled) {
-        _subtitle_bgopacityLabel_gray setHidden: YES;
-        _subtitle_bgopacityLabel setHidden: NO;
-    } else {
-        _subtitle_bgopacityLabel_gray setHidden: NO;
-        _subtitle_bgopacityLabel setHidden: YES;
-    }
-    _subtitle_bgopacity_sld setEnabled: b_enabled;
-    _teletext setEnabled:_playerController.teletextMenuAvailable;
+    self.subtitle_bgopacityLabel_gray.hidden = enabled;
+    self.subtitle_bgopacityLabel.hidden = !enabled;
+    self.subtitle_bgopacity_sld.enabled = enabled;
 }
 
-- (void)setRateControlsEnabled:(BOOL)b_enabled
+- (void)updateRateControls:(NSNotification *)notification
 {
-    _rate_sld setEnabled: b_enabled;
-    self updatePlaybackRate;
-
-    NSColor *color = b_enabled ? NSColor controlTextColor : NSColor disabledControlTextColor;
-    _rateLabel setTextColor:color;
-    _rate_slowerLabel setTextColor:color;
-    _rate_normalLabel setTextColor:color;
-    _rate_fasterLabel setTextColor:color;
-    _rateTextField setTextColor:color;
-}
+    const BOOL enabled = self validateUserInterfaceItem:self.rate;
+    self.rate_sld.enabled = enabled;
 
-- (void)setSubtitleSizeControlsEnabled:(BOOL)b_enabled
-{
-    _subtitleSizeSlider setEnabled: b_enabled;
-    unsigned int scaleFactor = _playerController.subtitleTextScalingFactor;
-    _subtitleSizeSlider setIntValue:scaleFactor;
-    _subtitleSizeTextField setStringValue: NSString stringWithFormat:@"%.2fx", scaleFactor / 100.;
+    NSColor * const color = enabled
+        ? NSColor.controlTextColor
+        : NSColor.disabledControlTextColor;
 
-    NSColor *color = b_enabled ? NSColor controlTextColor : NSColor disabledControlTextColor;
-    _subtitleSizeLabel setTextColor:color;
-    _subtitleSizeSmallerLabel setTextColor:color;
-    _subtitleSizeLargerLabel setTextColor:color;
-    _subtitleSizeTextField setTextColor:color;
+    self.rateLabel.textColor = color;
+    self.rate_slowerLabel.textColor = color;
+    self.rate_normalLabel.textColor = color;
+    self.rate_fasterLabel.textColor = color;
+    self.rateTextField.textColor = color;
 }
 
 #pragma mark - View
@@ -830,31 +779,31 @@
 
 - (IBAction)prev:(id)sender
 {
-    _playlistController playPreviousItem;
+    _playQueueController playPreviousItem;
 }
 
 - (IBAction)next:(id)sender
 {
-    _playlistController playNextItem;
+    _playQueueController playNextItem;
 }
 
 - (IBAction)random:(id)sender
 {
-    if (_playlistController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM) {
-        _playlistController.playbackOrder = VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL;
+    if (_playQueueController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM) {
+        _playQueueController.playbackOrder = VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL;
     } else {
-        _playlistController.playbackOrder = VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM;
+        _playQueueController.playbackOrder = VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM;
     }
 }
 
 - (IBAction)repeat:(id)sender
 {
-    if (_playlistController.playbackRepeat == VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT) {
-        _playlistController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_ALL;
-    } else if (_playlistController.playbackRepeat == VLC_PLAYLIST_PLAYBACK_REPEAT_ALL) {
-        _playlistController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_NONE;
+    if (_playQueueController.playbackRepeat == VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT) {
+        _playQueueController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_ALL;
+    } else if (_playQueueController.playbackRepeat == VLC_PLAYLIST_PLAYBACK_REPEAT_ALL) {
+        _playQueueController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_NONE;
     } else {
-        _playlistController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT;
+        _playQueueController.playbackRepeat = VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT;
     }
 }
 
@@ -891,10 +840,10 @@
 
 - (IBAction)quitAfterPlayback:(id)sender
 {
-    if (_playlistController.actionAfterStop != VLC_PLAYLIST_MEDIA_STOPPED_EXIT) {
-        _playlistController.actionAfterStop = VLC_PLAYLIST_MEDIA_STOPPED_EXIT;
+    if (_playQueueController.actionAfterStop != VLC_PLAYLIST_MEDIA_STOPPED_EXIT) {
+        _playQueueController.actionAfterStop = VLC_PLAYLIST_MEDIA_STOPPED_EXIT;
     } else {
-        _playlistController.actionAfterStop = VLC_PLAYLIST_MEDIA_STOPPED_CONTINUE;
+        _playQueueController.actionAfterStop = VLC_PLAYLIST_MEDIA_STOPPED_CONTINUE;
     }
 }
 
@@ -937,16 +886,16 @@
     _playerController setABLoop;
 }
 
-- (IBAction)toggleLibraryPlaylistMode:(id)sender
+- (IBAction)toggleLibraryPlayQueueMode:(id)sender
 {
-    _playlistController.libraryPlaylistMode = !_playlistController.libraryPlaylistMode;
-    self updateLibraryPlaylistMode;
+    _playQueueController.libraryPlayQueueMode = !_playQueueController.libraryPlayQueueMode;
+    self updateLibraryPlayQueueMode;
 }
 
-- (void)updateLibraryPlaylistMode
+- (void)updateLibraryPlayQueueMode
 {
-    const BOOL libraryPlaylistMode = _playlistController.libraryPlaylistMode;
-    _libraryPlaylistMode.state = libraryPlaylistMode ? NSOnState : NSOffState;
+    const BOOL libraryPlayQueueMode = _playQueueController.libraryPlayQueueMode;
+    _libraryPlayQueueMode.state = libraryPlayQueueMode ? NSOnState : NSOffState;
 }
 
 - (IBAction)goToSpecificTime:(id)sender
@@ -972,25 +921,42 @@
 }
 
 #pragma mark - track handling
-- (void)updateTrackHandlingMenus:(NSNotification *)aNotification
-{
-    NSArray *tracks = _playerController.audioTracks;
-    NSUInteger numberOfTracks = tracks.count;
-    self rebuildTracksMenu:_audiotrackMenu withMetadata:tracks count:numberOfTracks category:AUDIO_ES;
-    self rebuildTracksMenu:_voutMenuAudiotrackMenu withMetadata:tracks count:numberOfTracks category:AUDIO_ES;
-    _voutMenuAudiotrack.enabled = _audiotrack.enabled = numberOfTracks > 0 ? YES : NO;
-
-    tracks = _playerController.videoTracks;
-    numberOfTracks = tracks.count;
-    self rebuildTracksMenu:_videotrackMenu withMetadata:tracks count:numberOfTracks category:VIDEO_ES;
-    self rebuildTracksMenu:_voutMenuVideotrackMenu withMetadata:tracks count:numberOfTracks category:VIDEO_ES;
-    _voutMenuVideotrack.enabled = _videotrack.enabled = numberOfTracks > 0 ? YES : NO;
-
-    tracks = _playerController.subtitleTracks;
-    numberOfTracks = tracks.count;
-    self rebuildTracksMenu:_subtitle_tracksMenu withMetadata:tracks count:numberOfTracks category:SPU_ES;
-    self rebuildTracksMenu:_voutMenuSubtitlestrackMenu withMetadata:tracks count:numberOfTracks category:SPU_ES;
-    _voutMenuSubtitlestrack.enabled = _subtitle_track.enabled = numberOfTracks > 0 ? YES : NO;
+- (void)updateTrackHandlingMenus:(NSNotification *)notification
+{
+    NSArray * const audioTracks = _playerController.audioTracks;
+    const NSUInteger numberOfAudioTracks = audioTracks.count;
+    self rebuildTracksMenu:self.audiotrackMenu
+               withMetadata:audioTracks
+                      count:numberOfAudioTracks
+                   category:AUDIO_ES;
+    self rebuildTracksMenu:self.voutMenuAudiotrackMenu
+               withMetadata:audioTracks
+                      count:numberOfAudioTracks
+                   category:AUDIO_ES;
+
+    NSArray * const videoTracks = _playerController.videoTracks;
+    const NSUInteger numberOfVideoTracks = videoTracks.count;
+    self rebuildTracksMenu:self.videotrackMenu
+               withMetadata:videoTracks
+                      count:numberOfVideoTracks
+                   category:VIDEO_ES;
+    self rebuildTracksMenu:self.voutMenuVideotrackMenu
+               withMetadata:videoTracks
+                      count:numberOfVideoTracks
+                   category:VIDEO_ES;
+
+    NSArray * const subtitleTracks = _playerController.subtitleTracks;
+    const NSUInteger numberOfSubtitleTracks = subtitleTracks.count;
+    self rebuildTracksMenu:self.subtitle_tracksMenu
+               withMetadata:subtitleTracks
+                      count:numberOfSubtitleTracks
+                   category:SPU_ES;
+    self rebuildTracksMenu:self.voutMenuSubtitlestrackMenu
+               withMetadata:subtitleTracks
+                      count:numberOfSubtitleTracks
+                   category:SPU_ES;
+
+    self updateSubtitlesMenu:notification;
 }
 
 - (void)rebuildTracksMenu:(NSMenu *)menu
@@ -1303,21 +1269,27 @@
 
 - (void)switchSubtitleOption:(id)sender
 {
-    NSInteger intValue = sender tag;
-    NSString *representedObject = sender representedObject;
+    NSMenuItem * const menuItem = (NSMenuItem *)sender;
+    if (menuItem == nil) {
+        return;
+    }
 
-    var_SetInteger(VLC_OBJECT(getIntf()), representedObject UTF8String, intValue);
+    const NSInteger intValue = menuItem.tag;
+    NSString * const representedObject = menuItem.representedObject;
 
-    NSMenu *menu = sender menu;
-    NSUInteger count = (NSUInteger) menu numberOfItems;
-    for (NSUInteger x = 0; x < count; x++)
-        menu itemAtIndex:x setState:NSOffState;
-    menu itemWithTag:intValue setState:NSOnState;
+    config_PutInt(representedObject.UTF8String, intValue);
+
+    NSMenu * const menu = menuItem.menu;
+    const NSUInteger count = (NSUInteger)menu.numberOfItems;
+    for (NSUInteger x = 0; x < count; x++) {
+        menu itemAtIndex:x.state = NSOffState;
+    }
+    menu itemWithTag:intValue.state = NSOnState;
 }
 
 - (IBAction)switchSubtitleBackgroundOpacity:(id)sender
 {
-    var_SetInteger(VLC_OBJECT(getIntf()), "freetype-background-opacity", sender intValue);
+    config_PutInt("freetype-background-opacity", sender intValue);
 }
 
 - (IBAction)telxTransparent:(id)sender
@@ -1348,7 +1320,7 @@
 - (IBAction)intfOpenFile:(id)sender
 {
     VLCMain.sharedInstance open openFileWithAction:^(NSArray *files) {
-        self->_playlistController addPlaylistItems:files;
+        self->_playQueueController addPlayQueueItems:files;
     };
 }
 
@@ -1382,7 +1354,7 @@
     _playlistSaveAccessoryText setStringValue: _NS("File Format:");
     _playlistSaveAccessoryPopup removeAllItems;
 
-    NSArray *availableExportModules = _playlistController.availablePlaylistExportModules;
+    NSArray *availableExportModules = _playQueueController.availablePlaylistExportModules;
     NSUInteger count = availableExportModules.count;
     NSMutableArray *allowedFileTypes = NSMutableArray arrayWithCapacity:count;
     for (NSUInteger x = 0; x < count; x++) {
@@ -1407,7 +1379,7 @@
             filename = filename stringByAppendingPathExtension:exportModule.fileExtension;
         }
 
-        _playlistController exportPlaylistToPath:filename exportModule:exportModule;
+        _playQueueController exportPlaylistToPath:filename exportModule:exportModule;
     }
 }
 
@@ -1466,7 +1438,7 @@
     VLCMain.sharedInstance.libraryWindow makeKeyAndOrderFront:sender;
 }
 
-- (IBAction)showPlaylist:(id)sender
+- (IBAction)showPlayQueue:(id)sender
 {
     VLCMain.sharedInstance.libraryWindowController.window makeKeyAndOrderFront:sender;
     VLCMain.sharedInstance.libraryWindow.splitViewController toggleMultifunctionSidebar:self;
@@ -1538,7 +1510,7 @@
         _infoWindowController.mainMenuInstance = YES;
     }
 
-    _infoWindowController.representedInputItems = @_playlistController.currentlyPlayingInputItem;
+    _infoWindowController.representedInputItems = @_playQueueController.currentlyPlayingInputItem;
     _infoWindowController toggleWindow:sender;
 }
 
@@ -1546,17 +1518,10 @@
 
 - (void)playbackStateChanged:(NSNotification *)aNotification
 {
-    enum vlc_player_state playerState = _playlistController playerController.playerState;
-
-    switch (playerState) {
+    switch (_playerController.playerState) {
         case VLC_PLAYER_STATE_PLAYING:
             self setPause;
             break;
-
-        case VLC_PLAYER_STATE_STOPPED:
-            self setVideoMenuActiveVideo:NO;
-            self setAudioSubMenusEnabled:NO;
-
         default:
             self setPlay;
             break;
@@ -1565,7 +1530,7 @@
 
 - (void)playModeChanged:(NSNotification *)aNotification
 {
-    enum vlc_playlist_playback_repeat repeatState = _playlistController.playbackRepeat;
+    enum vlc_playlist_playback_repeat repeatState = _playQueueController.playbackRepeat;
     switch (repeatState) {
         case VLC_PLAYLIST_PLAYBACK_REPEAT_ALL:
             self setRepeatAll;
@@ -1583,7 +1548,7 @@
 
 - (void)playOrderChanged:(NSNotification *)aNotification
 {
-    _random setState:_playlistController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM;
+    _random setState:_playQueueController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM;
 }
 
 - (void)setPlay
@@ -1923,81 +1888,97 @@
     }
 }
 
-@end
-
-@implementation VLCMainMenu (NSMenuValidation)
-
-- (BOOL)validateMenuItem:(NSMenuItem *)mi
-{
-    BOOL enabled = YES;
-    VLCInputItem *inputItem = _playlistController.currentlyPlayingInputItem;
-
-    if (mi == _stop || mi == _voutMenustop || mi == _dockMenustop) {
-        if (!inputItem)
-            enabled = NO;
-    } else if (mi == _previous          ||
-               mi == _voutMenuprev      ||
-               mi == _dockMenuprevious) {
-        enabled = _playlistController.hasPreviousPlaylistItem;
-    } else if (
-               mi == _next              ||
-               mi == _voutMenunext      ||
-               mi == _dockMenunext) {
-        enabled = _playlistController.hasNextPlaylistItem;
-    } else if (mi == _record || mi == _voutMenuRecord) {
-        enabled = _playerController.recordable;
-    } else if (mi == _random) {
-        enum vlc_playlist_playback_order playbackOrder = _playlistController playbackOrder;
-        mi setState: playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM ? NSOnState : NSOffState;
-    } else if (mi == _quitAfterPB) {
-        BOOL state = _playlistController.actionAfterStop == VLC_PLAYLIST_MEDIA_STOPPED_EXIT;
-        mi setState: state ? NSOnState : NSOffState;
-    } else if (mi == _fwd || mi == _bwd || mi == _jumpToTime) {
-        enabled = _playerController.seekable;
-    } else if (mi == _mute || mi == _dockMenumute || mi == _voutMenumute) {
-        mi setState: _playerController.mute ? NSOnState : NSOffState;
+- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item
+{
+    NSMenuItem * const mi = (NSMenuItem *)item;
+
+    if (mi == nil) {
+        return YES;
+    } else if (mi == self.play) {
+        return _playerController.playerState == VLC_PLAYER_STATE_PLAYING
+            ? _playerController.currentMedia != nil && _playerController.pausable
+            : _playQueueController.playQueueModel.numberOfPlayQueueItems > 0;
+    } else if (mi == self.stop ||
+               mi == self.voutMenustop ||
+               mi == self.dockMenustop ||
+               mi == self.visual ||
+               mi == self.channels) {
+        return _playerController.currentMedia &&
+               _playerController.playerState != VLC_PLAYER_STATE_STOPPED;
+    } else if (mi == self.previous || mi == self.voutMenuprev || mi == self.dockMenuprevious) {
+        return _playQueueController.hasPreviousPlayQueueItem;
+    } else if (mi == self.next || mi == self.voutMenunext || mi == self.dockMenunext) {
+        return _playQueueController.hasNextPlayQueueItem;
+    } else if (mi == self.record || mi == self.voutMenuRecord) {
+        return _playerController.currentMedia != nil && _playerController.recordable;
+    } else if (mi == self.random) {
+        const enum vlc_playlist_playback_order playbackOrder = _playQueueController.playbackOrder;
+        mi.state = playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM ? NSOnState : NSOffState;
+    } else if (mi == self.quitAfterPB) {
+        const BOOL state = _playQueueController.actionAfterStop == VLC_PLAYLIST_MEDIA_STOPPED_EXIT;
+        mi.state = state ? NSOnState : NSOffState;
+    } else if (mi == self.fwd || mi == self.bwd || mi == self.jumpToTime) {
+        return _playerController.currentMedia != nil && _playerController.seekable;
+    } else if (mi == self.mute || mi == self.dockMenumute || mi == self.voutMenumute) {
+        mi.state = _playerController.mute ? NSOnState : NSOffState;
         self refreshAudioDeviceList;
-    } else if (mi == _half_window           ||
-               mi == _normal_window         ||
-               mi == _double_window         ||
-               mi == _fittoscreen           ||
-               mi == _snapshot              ||
-               mi == _voutMenusnapshot      ||
-               mi == _fullscreenItem        ||
-               mi == _voutMenufullscreen    ||
-               mi == _floatontop
-               ) {
-
-        vout_thread_t *p_vout = _playerController videoOutputThreadForKeyWindow;
+    } else if (mi == self.half_window               ||
+               mi == self.normal_window             ||
+               mi == self.double_window             ||
+               mi == self.fittoscreen               ||
+               mi == self.snapshot                  ||
+               mi == self.voutMenusnapshot          ||
+               mi == self.deinterlace               ||
+               mi == self.deinterlace_mode          ||
+               mi == self.screen                    ||
+               mi == self.aspect_ratio              ||
+               mi == self.crop                      ||
+               mi == self.postprocessing            ||
+               mi == self.fullscreenItem            ||
+               mi == self.voutMenufullscreen        ||
+               mi == self.floatontop) {
+        vout_thread_t * const p_vout = _playerController.videoOutputThreadForKeyWindow;
         if (p_vout != NULL) {
-            if (mi == _floatontop)
-                mi setState: var_GetBool(p_vout, "video-on-top");
-
-            if (mi == _fullscreenItem || mi == _voutMenufullscreen)
-                mi setState: _playerController.fullscreen;
-
-            enabled = YES;
+            if (mi == self.floatontop) {
+                mi.state = var_GetBool(p_vout, "video-on-top") ? NSOnState : NSOffState;
+            } else if (mi == self.fullscreenItem || mi == self.voutMenufullscreen) {
+                mi.state = _playerController.fullscreen ? NSOnState : NSOffState;
+            }
             vout_Release(p_vout);
         }
-
-    } else if (mi == _openSubtitleFile || mi == _voutMenuOpenSubtitleFile) {
-        enabled = YES;
+        return p_vout != NULL &&
+               _playerController.currentMedia != nil &&
+               _playerController.activeVideoPlayback;
+    } else if (mi == self.rate) {
+        return _playerController.currentMedia && _playerController.rateChangable;
+    } else if (mi == self.info) {
+        return _playerController.currentMedia != nil;
+    } else if (mi == self.openSubtitleFile          ||
+               mi == self.voutMenuOpenSubtitleFile  ||
+               mi == self.subtitleSize) {
+        return _playerController.currentMedia != nil && _playerController.activeVideoPlayback;
+    } else if (mi == self.teletext) {
+        return _playerController.currentMedia != nil && _playerController.teletextMenuAvailable;
+    } else if (mi == self.voutMenuAudiotrack) {
+        return _playerController.audioTracks.count > 0;
+    } else if (mi == self.voutMenuVideotrack) {
+        return _playerController.videoTracks.count > 0;
+    } else if (mi == self.voutMenuSubtitlestrack) {
+        return _playerController.subtitleTracks.count > 0;
     } else {
-        NSMenuItem *_parent = mi parentItem;
-        if (_parent == _subtitle_textcolor || mi == _subtitle_textcolor ||
-            _parent == _subtitle_bgcolor || mi == _subtitle_bgcolor     ||
-            _parent == _subtitle_bgopacity || mi == _subtitle_bgopacity ||
-            _parent == _subtitle_outlinethickness || mi == _subtitle_outlinethickness
-            ) {
-            enabled = _openSubtitleFile.isEnabled;
-        } else if (_parent == _teletext || mi == _teletext) {
-            enabled = _playerController.teletextMenuAvailable;
+        NSMenuItem * const parent = mi.parentItem;
+        if (parent == self.subtitle_textcolor || mi == self.subtitle_textcolor ||
+            parent == self.subtitle_bgcolor || mi == self.subtitle_bgcolor     ||
+            parent == self.subtitle_bgopacity || mi == self.subtitle_bgopacity ||
+            parent == self.subtitle_outlinethickness || mi == self.subtitle_outlinethickness) {
+
+            return self validateUserInterfaceItem:self.openSubtitleFile;
+        } else if (parent == self.teletext || mi == self.teletext) {
+            return _playerController.teletextMenuAvailable;
         }
     }
 
-    inputItem = nil;
-
-    return enabled;
+    return YES;
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/menus/VLCStatusBarIcon.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/menus/VLCStatusBarIcon.m Changed

@@ -25,8 +25,8 @@
 
 #import "extensions/NSString+Helpers.h"
 #import "main/VLCMain.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 #import "library/VLCInputItem.h"
 #import "windows/VLCDetachedAudioWindow.h"
 
@@ -279,12 +279,12 @@
 
 - (void)hasPreviousChanged:(NSNotification *)aNotification
 {
-    backwardsButton.enabled = VLCMain.sharedInstance.playlistController.hasPreviousPlaylistItem;
+    backwardsButton.enabled = VLCMain.sharedInstance.playQueueController.hasPreviousPlayQueueItem;
 }
 
 - (void)hasNextChanged:(NSNotification *)aNotification
 {
-    forwardButton.enabled = VLCMain.sharedInstance.playlistController.hasNextPlaylistItem;
+    forwardButton.enabled = VLCMain.sharedInstance.playQueueController.hasNextPlayQueueItem;
 }
 
 /* Updates the Metadata for the currently
@@ -373,7 +373,7 @@
 - (void)updateMenuItemRandom
 {
     // Get current random status
-    randomButton setState:VLCMain.sharedInstance.playlistController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM ? NSOnState : NSOffState;
+    randomButton setState:VLCMain.sharedInstance.playQueueController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM ? NSOnState : NSOffState;
 }
 
 #pragma mark -
@@ -449,35 +449,35 @@
 // Action: Toggle Play / Pause
 - (IBAction)statusBarIconTogglePlayPause:(id)sender
 {
-    VLCPlaylistController *playlistController = VLCMain.sharedInstance.playlistController;
-    VLCPlayerController *playerController = playlistController.playerController;
+    VLCPlayQueueController * const playQueueController = VLCMain.sharedInstance.playQueueController;
+    VLCPlayerController * const playerController = playQueueController.playerController;
     enum vlc_player_state playerState = playerController.playerState;
     if (playerState != VLC_PLAYER_STATE_PAUSED) {
         playerController pause;
     } else if (playerState == VLC_PLAYER_STATE_PAUSED) {
         playerController resume;
     } else {
-        playlistController startPlaylist;
+        playQueueController startPlayQueue;
     }
 }
 
 // Action: Go to next track
 - (IBAction)statusBarIconNext:(id)sender
 {
-    VLCMain.sharedInstance.playlistController playNextItem;
+    VLCMain.sharedInstance.playQueueController playNextItem;
 }
 
 // Action: Go to previous track
 - (IBAction)statusBarIconPrevious:(id)sender
 {
-    VLCMain.sharedInstance.playlistController playPreviousItem;
+    VLCMain.sharedInstance.playQueueController playPreviousItem;
 }
 
 // Action: Toggle random playback (shuffle)
 - (IBAction)statusBarIconToggleRandom:(id)sender
 {
-    VLCPlaylistController *playlistController = VLCMain.sharedInstance.playlistController;
-    playlistController.playbackOrder = (playlistController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM) ? VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL : VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM;
+    VLCPlayQueueController * const playQueueController = VLCMain.sharedInstance.playQueueController;
+    playQueueController.playbackOrder = (playQueueController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM) ? VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL : VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM;
 }
 
 // Action: Toggle between elapsed and remaining time

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/menus/renderers/VLCRendererItem.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/menus/renderers/VLCRendererItem.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/menus/renderers/VLCRendererMenuController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/menus/renderers/VLCRendererMenuController.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/os-integration/VLCClickerManager.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/os-integration/VLCClickerManager.m Changed

@@ -25,16 +25,16 @@
 #import "imported/SPMediaKeyTap/SPMediaKeyTap.h"
 #import "imported/AppleRemote/AppleRemote.h"
 #import "main/VLCMain.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlaylistModel.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueModel.h"
+#import "playqueue/VLCPlayerController.h"
 #import "os-integration/VLCSystemVolume.h"
 
 #import <vlc_configuration.h>
 
 @interface VLCClickerManager()
 {
-    VLCPlaylistController *_playlistController;
+    VLCPlayQueueController *_playQueueController;
     VLCPlayerController *_playerController;
 
     /* media key support */
@@ -54,8 +54,8 @@
 {
     self = super init;
     if (self) {
-        _playlistController = VLCMain.sharedInstance.playlistController;
-        _playerController = _playlistController playerController;
+        _playQueueController = VLCMain.sharedInstance.playQueueController;
+        _playerController = _playQueueController playerController;
         NSNotificationCenter *notificationCenter = NSNotificationCenter.defaultCenter;
 
         /* init media key support */
@@ -68,12 +68,12 @@
                                    name:VLCConfigurationChangedNotification
                                  object:nil;
         notificationCenter addObserver:self
-                               selector:@selector(playlistUpdated:)
-                                   name:VLCPlaylistItemsAdded
+                               selector:@selector(playQueueUpdated:)
+                                   name:VLCPlayQueueItemsAdded
                                  object:nil;
         notificationCenter addObserver:self
-                               selector:@selector(playlistUpdated:)
-                                   name:VLCPlaylistItemsRemoved
+                               selector:@selector(playQueueUpdated:)
+                                   name:VLCPlayQueueItemsRemoved
                                  object:nil;
 
         /* init Apple Remote support */
@@ -118,7 +118,7 @@
         _mediaKeyController = SPMediaKeyTap alloc initWithDelegate:self;
 
     VLCMain * const main = VLCMain.sharedInstance;
-    if (b_mediaKeySupport && (main.playlistController.playlistModel.numberOfPlaylistItems > 0)) {
+    if (b_mediaKeySupport && (main.playQueueController.playQueueModel.numberOfPlayQueueItems > 0)) {
         if (!b_mediaKeyTrapEnabled) {
             self enableMediaKeySupport;
         }
@@ -149,13 +149,13 @@
     _mediaKeyController stopWatchingMediaKeys;
 }
 
-- (void)playlistUpdated:(NSNotification *)aNotification
+- (void)playQueueUpdated:(NSNotification *)aNotification
 {
     if (!_mediaKeyController) {
         return;
     }
 
-    BOOL numberOfMediaLargerThanZero = VLCMain.sharedInstance.playlistController playlistModel numberOfPlaylistItems > 0;
+    BOOL numberOfMediaLargerThanZero = VLCMain.sharedInstance.playQueueController.playQueueModel.numberOfPlayQueueItems > 0;
 
     if (b_mediaKeyTrapEnabled && !numberOfMediaLargerThanZero) {
         self disableMediaKeySupport;
@@ -180,7 +180,7 @@
 
         if ((keyCode == NX_KEYTYPE_FAST || keyCode == NX_KEYTYPE_NEXT) && !b_mediakeyJustJumped) {
             if (keyState == 0 && keyRepeat == 0) {
-                _playlistController playNextItem;
+                _playQueueController playNextItem;
             } else if (keyRepeat == 1) {
                 _playerController jumpForwardShort;
                 b_mediakeyJustJumped = YES;
@@ -192,7 +192,7 @@
 
         if ((keyCode == NX_KEYTYPE_REWIND || keyCode == NX_KEYTYPE_PREVIOUS) && !b_mediakeyJustJumped) {
             if (keyState == 0 && keyRepeat == 0) {
-                _playlistController playPreviousItem;
+                _playQueueController playPreviousItem;
             } else if (keyRepeat == 1) {
                 _playerController jumpBackwardShort;
                 b_mediakeyJustJumped = YES;
@@ -282,13 +282,13 @@
             if (config_GetInt("macosx-appleremote-prevnext"))
                 _playerController jumpForwardShort;
             else
-                _playlistController playNextItem;
+                _playQueueController playNextItem;
             break;
         case kRemoteButtonLeft:
             if (config_GetInt("macosx-appleremote-prevnext"))
                 _playerController jumpBackwardShort;
             else
-                _playlistController playPreviousItem;
+                _playQueueController playPreviousItem;
             break;
         case kRemoteButtonRight_Hold:
         case kRemoteButtonLeft_Hold:

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/os-integration/VLCRemoteControlService.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/os-integration/VLCRemoteControlService.m Changed

@@ -26,8 +26,8 @@
 #import "VLCRemoteControlService.h"
 #import "main/VLCMain.h"
 #import "main/CompatibilityFixes.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 #import "library/VLCInputItem.h"
 #import "extensions/NSString+Helpers.h"
 
@@ -39,7 +39,7 @@
 
 @interface VLCRemoteControlService()
 {
-    VLCPlaylistController *_playlistController;
+    VLCPlayQueueController *_playQueueController;
     VLCPlayerController *_playerController;
 }
 @end
@@ -67,8 +67,8 @@
 {
     self = super init;
     if (self) {
-        _playlistController = VLCMain.sharedInstance.playlistController;
-        _playerController = _playlistController playerController;
+        _playQueueController = VLCMain.sharedInstance.playQueueController;
+        _playerController = _playQueueController playerController;
 
         NSNotificationCenter *notificationCenter = NSNotificationCenter.defaultCenter;
         notificationCenter addObserver:self
@@ -227,14 +227,14 @@
     MPRemoteCommandCenter *cc = MPRemoteCommandCenter sharedCommandCenter;
 
     if (event.command == cc.playCommand) {
-        return _playlistController startPlaylist ? MPRemoteCommandHandlerStatusSuccess : MPRemoteCommandHandlerStatusNoActionableNowPlayingItem;
+        return _playQueueController startPlayQueue ? MPRemoteCommandHandlerStatusSuccess : MPRemoteCommandHandlerStatusNoActionableNowPlayingItem;
     }
     if (event.command == cc.pauseCommand) {
-        _playlistController pausePlayback;
+        _playQueueController pausePlayback;
         return MPRemoteCommandHandlerStatusSuccess;
     }
     if (event.command == cc.stopCommand) {
-        _playlistController stopPlayback;
+        _playQueueController stopPlayback;
         return MPRemoteCommandHandlerStatusSuccess;
     }
     if (event.command == cc.togglePlayPauseCommand) {
@@ -242,10 +242,10 @@
         return MPRemoteCommandHandlerStatusSuccess;
     }
     if (event.command == cc.nextTrackCommand) {
-        return _playlistController playNextItem ? MPRemoteCommandHandlerStatusSuccess : MPRemoteCommandHandlerStatusCommandFailed;
+        return _playQueueController playNextItem ? MPRemoteCommandHandlerStatusSuccess : MPRemoteCommandHandlerStatusCommandFailed;
     }
     if (event.command == cc.previousTrackCommand) {
-        return _playlistController playPreviousItem ? MPRemoteCommandHandlerStatusSuccess : MPRemoteCommandHandlerStatusCommandFailed;
+        return _playQueueController playPreviousItem ? MPRemoteCommandHandlerStatusSuccess : MPRemoteCommandHandlerStatusCommandFailed;
     }
     if (event.command == cc.skipForwardCommand) {
         _playerController jumpForwardMedium;
@@ -265,21 +265,21 @@
         MPRepeatType repeatType = repeatEvent.repeatType;
         switch (repeatType) {
             case MPRepeatTypeAll:
-                _playlistController setPlaybackRepeat:VLC_PLAYLIST_PLAYBACK_REPEAT_ALL;
+                _playQueueController setPlaybackRepeat:VLC_PLAYLIST_PLAYBACK_REPEAT_ALL;
                  break;
 
             case MPRepeatTypeOne:
-                _playlistController setPlaybackRepeat:VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT;
+                _playQueueController setPlaybackRepeat:VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT;
                 break;
 
             default:
-                _playlistController setPlaybackRepeat:VLC_PLAYLIST_PLAYBACK_REPEAT_NONE;;
+                _playQueueController setPlaybackRepeat:VLC_PLAYLIST_PLAYBACK_REPEAT_NONE;;
                 break;
         }
         return MPRemoteCommandHandlerStatusSuccess;
     }
     if (event.command == cc.changeShuffleModeCommand) {
-        _playlistController setPlaybackOrder:_playlistController playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL ? VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM : VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL;
+        _playQueueController setPlaybackOrder:_playQueueController playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL ? VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM : VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL;
         return MPRemoteCommandHandlerStatusSuccess;
     }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/os-integration/applescript.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/os-integration/applescript.m Changed

@@ -31,8 +31,8 @@
 #import <vlc_url.h>
 
 #import "main/VLCMain.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 #import "windows/VLCOpenInputMetadata.h"
 
 /*****************************************************************************
@@ -50,7 +50,7 @@
             VLCOpenInputMetadata *inputMetadata = VLCOpenInputMetadata alloc init;
             inputMetadata.MRLString = parameterString;
 
-            VLCMain.sharedInstance.playlistController addPlaylistItems:@inputMetadata;
+            VLCMain.sharedInstance.playQueueController addPlayQueueItems:@inputMetadata;
         }
     }
     return nil;
@@ -70,11 +70,11 @@
 
 - (id)performDefaultImplementation
 {
-    VLCPlaylistController *playlistController = VLCMain.sharedInstance.playlistController;
-    VLCPlayerController *playerController = playlistController playerController;
+    VLCPlayQueueController * const playQueueController = VLCMain.sharedInstance.playQueueController;
+    VLCPlayerController * const playerController = playQueueController playerController;
 
-    NSString *commandString = self commandDescription commandName;
-    NSString *parameterString = self directParameter;
+    NSString * const commandString = self commandDescription commandName;
+    NSString * const parameterString = self directParameter;
 
     if (commandString == nil || commandString.length == 0) {
         return nil;
@@ -85,9 +85,9 @@
     } else if (commandString isEqualToString:@"stop") {
         playerController stop;
     } else if (commandString isEqualToString:@"previous") {
-        playlistController playPreviousItem;
+        playQueueController playPreviousItem;
     } else if (commandString isEqualToString:@"next") {
-        playlistController playNextItem;
+        playQueueController playNextItem;
     } else if (commandString isEqualToString:@"fullscreen") {
         playerController toggleFullscreen;
     } else if (commandString isEqualToString:@"mute") {
@@ -152,9 +152,9 @@
         } else
             playerController jumpBackwardShort;
     } else if (commandString isEqualToString:@"incrementPlaybackRate") {
-        VLCMain.sharedInstance.playlistController.playerController incrementPlaybackRate;
+        VLCMain.sharedInstance.playQueueController.playerController incrementPlaybackRate;
     } else if (commandString isEqualToString:@"decrementPlaybackRate") {
-        VLCMain.sharedInstance.playlistController.playerController decrementPlaybackRate;
+        VLCMain.sharedInstance.playQueueController.playerController decrementPlaybackRate;
     } else {
         msg_Err(getIntf(), "Unhandled AppleScript command '%s'", commandString UTF8String);
     }
@@ -171,22 +171,22 @@
 
 - (BOOL)scriptFullscreenMode
 {
-    return VLCMain.sharedInstance.playlistController.playerController fullscreen;
+    return VLCMain.sharedInstance.playQueueController.playerController fullscreen;
 }
 
 - (void)setScriptFullscreenMode:(BOOL)mode
 {
-    VLCMain.sharedInstance.playlistController.playerController setFullscreen:mode;
+    VLCMain.sharedInstance.playQueueController.playerController setFullscreen:mode;
 }
 
 - (BOOL)muted
 {
-    return VLCMain.sharedInstance.playlistController.playerController mute;
+    return VLCMain.sharedInstance.playQueueController.playerController mute;
 }
 
 - (BOOL)playing
 {
-    enum vlc_player_state playerState = VLCMain.sharedInstance.playlistController.playerController playerState;
+    enum vlc_player_state playerState = VLCMain.sharedInstance.playQueueController.playerController playerState;
 
     if (playerState == VLC_PLAYER_STATE_STARTED || playerState == VLC_PLAYER_STATE_PLAYING) {
         return YES;
@@ -197,62 +197,62 @@
 
 - (float)audioVolume
 {
-    return VLCMain.sharedInstance.playlistController.playerController volume;
+    return VLCMain.sharedInstance.playQueueController.playerController volume;
 }
 
 - (void)setAudioVolume:(float)volume
 {
-    VLCMain.sharedInstance.playlistController.playerController setVolume:volume;
+    VLCMain.sharedInstance.playQueueController.playerController setVolume:volume;
 }
 
 - (long long)audioDesync
 {
-    return MS_FROM_VLC_TICK(VLCMain.sharedInstance.playlistController.playerController audioDelay);
+    return MS_FROM_VLC_TICK(VLCMain.sharedInstance.playQueueController.playerController audioDelay);
 }
 
 - (void)setAudioDesync:(long long)audioDelay
 {
-    VLCMain.sharedInstance.playlistController.playerController setAudioDelay: VLC_TICK_FROM_MS(audioDelay);
+    VLCMain.sharedInstance.playQueueController.playerController setAudioDelay: VLC_TICK_FROM_MS(audioDelay);
 }
 
 - (int)currentTime
 {
-    return (int)SEC_FROM_VLC_TICK(VLCMain.sharedInstance.playlistController.playerController time);
+    return (int)SEC_FROM_VLC_TICK(VLCMain.sharedInstance.playQueueController.playerController time);
 }
 
 - (void)setCurrentTime:(int)currentTime
 {
-    VLCMain.sharedInstance.playlistController.playerController setTimeFast: VLC_TICK_FROM_SEC(currentTime);
+    VLCMain.sharedInstance.playQueueController.playerController setTimeFast: VLC_TICK_FROM_SEC(currentTime);
 }
 
 - (float)playbackRate
 {
-    return VLCMain.sharedInstance.playlistController.playerController.playbackRate;
+    return VLCMain.sharedInstance.playQueueController.playerController.playbackRate;
 }
 
 - (void)setPlaybackRate:(float)playbackRate
 {
-    VLCMain.sharedInstance.playlistController.playerController setPlaybackRate:playbackRate;
+    VLCMain.sharedInstance.playQueueController.playerController setPlaybackRate:playbackRate;
 }
 
 - (NSInteger)durationOfCurrentItem
 {
-    return SEC_FROM_VLC_TICK(VLCMain.sharedInstance.playlistController.playerController.durationOfCurrentMediaItem);
+    return SEC_FROM_VLC_TICK(VLCMain.sharedInstance.playQueueController.playerController.durationOfCurrentMediaItem);
 }
 
 - (NSString *)pathOfCurrentItem
 {
-    return VLCMain.sharedInstance.playlistController.playerController.URLOfCurrentMediaItem.path;
+    return VLCMain.sharedInstance.playQueueController.playerController.URLOfCurrentMediaItem.path;
 }
 
 - (NSString *)nameOfCurrentItem
 {
-    return VLCMain.sharedInstance.playlistController.playerController.nameOfCurrentMediaItem;
+    return VLCMain.sharedInstance.playQueueController.playerController.nameOfCurrentMediaItem;
 }
 
 - (BOOL)playbackShowsMenu
 {
-    const struct vlc_player_title * const currentTitle = VLCMain.sharedInstance.playlistController.playerController.selectedTitle;
+    const struct vlc_player_title * const currentTitle = VLCMain.sharedInstance.playQueueController.playerController.selectedTitle;
     if (currentTitle == NULL) {
         return NO;
     }
@@ -266,50 +266,50 @@
 
 - (BOOL)recordable
 {
-    return VLCMain.sharedInstance.playlistController.playerController.recordable;
+    return VLCMain.sharedInstance.playQueueController.playerController.recordable;
 }
 
 - (BOOL)recordingEnabled
 {
-    return VLCMain.sharedInstance.playlistController.playerController.enableRecording;
+    return VLCMain.sharedInstance.playQueueController.playerController.enableRecording;
 }
 
 - (void)setRecordingEnabled:(BOOL)recordingEnabled
 {
-    VLCMain.sharedInstance.playlistController.playerController setEnableRecording:recordingEnabled;
+    VLCMain.sharedInstance.playQueueController.playerController setEnableRecording:recordingEnabled;
 }
 
 - (BOOL)shuffledPlayback
 {
-    const enum vlc_playlist_playback_order playbackOrder = VLCMain.sharedInstance.playlistController.playbackOrder;
+    const enum vlc_playlist_playback_order playbackOrder = VLCMain.sharedInstance.playQueueController.playbackOrder;
     return playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM ? YES : NO;
 }
 
 - (void)setShuffledPlayback:(BOOL)shuffledPlayback
 {
-    VLCMain.sharedInstance.playlistController setPlaybackOrder: shuffledPlayback ? VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM : VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL;
+    VLCMain.sharedInstance.playQueueController setPlaybackOrder: shuffledPlayback ? VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM : VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL;
 }
 
 - (BOOL)repeatOne
 {
-    const enum vlc_playlist_playback_repeat repeatMode = VLCMain.sharedInstance.playlistController.playbackRepeat;
+    const enum vlc_playlist_playback_repeat repeatMode = VLCMain.sharedInstance.playQueueController.playbackRepeat;
     return repeatMode == VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT ? YES : NO;
 }
 
 - (void)setRepeatOne:(BOOL)repeatOne
 {
-    VLCMain.sharedInstance.playlistController setPlaybackRepeat: repeatOne == YES ? VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT : VLC_PLAYLIST_PLAYBACK_REPEAT_NONE;
+    VLCMain.sharedInstance.playQueueController setPlaybackRepeat: repeatOne == YES ? VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT : VLC_PLAYLIST_PLAYBACK_REPEAT_NONE;
 }
 
 - (BOOL)repeatAll
 {
-    const enum vlc_playlist_playback_repeat repeatMode = VLCMain.sharedInstance.playlistController.playbackRepeat;
+    const enum vlc_playlist_playback_repeat repeatMode = VLCMain.sharedInstance.playQueueController.playbackRepeat;
     return repeatMode == VLC_PLAYLIST_PLAYBACK_REPEAT_ALL ? YES : NO;
 }
 
 - (void)setRepeatAll:(BOOL)repeatAll
 {
-    VLCMain.sharedInstance.playlistController setPlaybackRepeat: repeatAll == YES ? VLC_PLAYLIST_PLAYBACK_REPEAT_ALL : VLC_PLAYLIST_PLAYBACK_REPEAT_NONE;
+    VLCMain.sharedInstance.playQueueController setPlaybackRepeat: repeatAll == YES ? VLC_PLAYLIST_PLAYBACK_REPEAT_ALL : VLC_PLAYLIST_PLAYBACK_REPEAT_NONE;
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/panels/VLCAudioEffectsWindowController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/panels/VLCAudioEffectsWindowController.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/panels/VLCBookmarksWindowController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/panels/VLCBookmarksWindowController.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/panels/VLCInformationWindowController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/panels/VLCInformationWindowController.m Changed

@@ -34,8 +34,8 @@
 
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 
 #import "views/VLCImageView.h"
 #import "views/VLCSettingTextField.h"
@@ -88,7 +88,7 @@
 
 #pragma mark - window controller
 
-@interface VLCInformationWindowController () <NSOutlineViewDataSource>
+@interface VLCInformationWindowController () <NSOutlineViewDataSource, NSOutlineViewDelegate>
 {
     VLCCodecInformationTreeItem *_rootCodecInformationItem;
     NSImage *_artwork;
@@ -119,6 +119,8 @@
     self.window setInitialFirstResponder: _decodedMRLLabel;
 
     self.outlineView.dataSource = self;
+    self.outlineView.delegate = self;
+    self.outlineView.tableColumns.lastObject.resizingMask = NSTableColumnAutoresizingMask;
 
     NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
     if (_mainMenuInstance && _statisticsEnabled) {
@@ -301,10 +303,12 @@
     }
 
     NSParameterAssert(inputItems.count > 0);
-    _representedInputItems = inputItems.copy;
+    NSArray<VLCInputItem *> * const nonMutableInputItems = inputItems.copy;
+    _representedInputItems = nonMutableInputItems;
 
     NSMutableSet * const artworkMrlSet = NSMutableSet.set;
 
+    __weak typeof(self) weakSelf = self;
     const dispatch_queue_t queue = dispatch_queue_create("vlc_infowindow_libraryitemimg_queue", 0);
     dispatch_async(queue, ^{
         NSMutableArray<NSImage *> * const artworkImages = NSMutableArray.array;
@@ -326,6 +330,10 @@
                     dispatch_group_enter(group);
                     VLCLibraryImageCache thumbnailForLibraryItem:mediaItem
                                                    withCompletion:^(NSImage * const image) {
+                        if (!weakSelf || nonMutableInputItems != weakSelf.representedInputItems) {
+                            dispatch_group_leave(group);
+                            return;
+                        }
                         if (image) {
                             artworkImages addObject:image;
                         }
@@ -338,8 +346,10 @@
         dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
 
         if (artworkImages.count == 0) {
-            _artwork = NSImage imageNamed:@"noart.png";
-            self updateRepresentation;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                _artwork = NSImage imageNamed:@"noart.png";
+                self updateRepresentation;
+            });
             return;
         }
 
@@ -351,11 +361,14 @@
             NSImage framesForCompositeImageSquareGridWithImages:artworkImages
                                                             size:artworkSize
                                                    gridItemCount:artworkImages.count;
-        _artwork = NSImage compositeImageWithImages:artworkImages
-                                              frames:frames
-                                                size:artworkSize;
 
-        self updateRepresentation;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            _artwork = NSImage compositeImageWithImages:artworkImages
+                                                frames:frames
+                                                    size:artworkSize;
+
+            self updateRepresentation;
+        });
     });
 }
 
@@ -368,6 +381,7 @@
     NSParameterAssert(representedInputItems.count > 0);
     _representedInputItems = representedInputItems;
 
+    __weak typeof(self) weakSelf = self;
     const dispatch_queue_t queue = dispatch_queue_create("vlc_infowindow_inputitemimg_queue", 0);
     dispatch_async(queue, ^{
         NSMutableArray<NSImage *> * const artworkImages = NSMutableArray.array;
@@ -378,6 +392,10 @@
                 dispatch_group_enter(group);
                 VLCLibraryImageCache thumbnailForInputItem:item
                                              withCompletion:^(NSImage * const image) {
+                    if (!weakSelf || representedInputItems != weakSelf.representedInputItems) {
+                        dispatch_group_leave(group);
+                        return;
+                    }
                     if (image) {
                         artworkImages addObject:image;
                     }
@@ -389,8 +407,10 @@
         dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
 
         if (artworkImages.count == 0) {
-            _artwork = NSImage imageNamed:@"noart.png";
-            self updateRepresentation;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                _artwork = NSImage imageNamed:@"noart.png";
+                self updateRepresentation;
+            });
             return;
         }
 
@@ -402,11 +422,13 @@
             NSImage framesForCompositeImageSquareGridWithImages:artworkImages
                                                             size:artworkSize
                                                    gridItemCount:artworkImages.count;
-        _artwork = NSImage compositeImageWithImages:artworkImages
-                                              frames:frames
-                                                size:artworkSize;
 
-        self updateRepresentation;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            _artwork = NSImage compositeImageWithImages:artworkImages
+                                                frames:frames
+                                                    size:artworkSize;
+            self updateRepresentation;
+        });
     });
 }
 
@@ -419,11 +441,14 @@
 {
     NSAssert(self.representedInputItems.count == 1, @"Should not be updating stats for many items");
     VLCPlayerController * const playerController =
-        VLCMain.sharedInstance.playlistController.playerController;
+        VLCMain.sharedInstance.playQueueController.playerController;
     VLCInputItem * const currentPlayingItem = playerController.currentMedia;
     VLCInputItem * const firstItem = self.representedInputItems.firstObject;
-    NSAssert(currentPlayingItem.MRL isEqualToString:firstItem.MRL,
-             @"Should not update statistics when items are different!");
+    
+    if (self.mainMenuInstance && !currentPlayingItem.MRL isEqualToString:firstItem.MRL) {
+        self.representedInputItems = @currentPlayingItem;
+    }
+
     NSAssert(_statisticsEnabled, @"Statistics should not be updated when they are disabled!");
     VLCInputStats * const inputStats = aNotification.userInfoVLCPlayerInputStats;
     NSAssert(inputStats != nil, @"inputStats received for statistics update should not be nil!");
@@ -461,15 +486,8 @@
         inputItem parseInputItem;
     }
 
-#define FILL_FIELD_FROM_INPUTITEM(field)                            \
-    {                                                               \
-    NSString * const inputItemString = inputItem.field;             \
-    if (inputItemString != nil) {                                   \
-        _##field##TextField.originalStateString = inputItemString;  \
-    } else {                                                        \
-        _##field##TextField.originalStateString = @"";              \
-    }                                                               \
-}
+#define FILL_FIELD_FROM_INPUTITEM(field)                                                    \
+_##field##TextField.originalStateString = inputItem.field == nil ? @"" : inputItem.field;
 
     PERFORM_ACTION_ALL_TEXTFIELDS(FILL_FIELD_FROM_INPUTITEM);
 
@@ -478,9 +496,7 @@
     _artworkImageButton.image = _artwork;
 
     if (!_mainMenuInstance) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            self.window.title = inputItem.title;
-        });
+        self.window.title = inputItem.title;
     }
 }
 
@@ -591,8 +607,9 @@
         self updateStreamsForInputItems:_representedInputItems;
     }
 
-    _outlineView reloadData;
-    _outlineView expandItem:nil expandChildren:YES;
+    self.outlineView reloadData;
+    self.outlineView expandItem:nil expandChildren:YES;
+    self.outlineView sizeLastColumnToFit;
 }
 
 - (void)controlTextDidChange:(NSNotification *)notification
@@ -697,25 +714,25 @@
 
 @end
 
-@implementation VLCInformationWindowController (NSTableDataSource)
+@implementation VLCInformationWindowController (NSOutlineViewDataSource)
 
 - (NSInteger)outlineView:(NSOutlineView *)outlineView
   numberOfChildrenOfItem:(id)item
 {
-    return (item == nil) ? _rootCodecInformationItem children.count : item children.count;
+    return (item == nil) ? _rootCodecInformationItem.children.count : item children.count;
 }
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView
    isItemExpandable:(id)item
 {
-    return (item children.count > 0);
+    return item children.count > 0;
 }
 
 - (id)outlineView:(NSOutlineView *)outlineView
             child:(NSInteger)index
            ofItem:(id)item
 {
-    return (item == nil) ? _rootCodecInformationItem childrenindex : item childrenindex;
+    return (item == nil) ? _rootCodecInformationItem.childrenindex : item childrenindex;
 }
 
 - (id)outlineView:(NSOutlineView *)outlineView
@@ -733,3 +750,20 @@
 }
 
 @end
+
+@implementation VLCInformationWindowController (NSOutlineViewDelegate)
+
+- (NSView *)outlineView:(NSTableView *)outlineView
+     viewForTableColumn:(nullable NSTableColumn *)tableColumn
+                   item:(nonnull id)item
+{
+    NSTextField * const cellView = NSTextField alloc initWithFrame:NSZeroRect;
+    cellView.objectValue =
+        self outlineView:self.outlineView objectValueForTableColumn:tableColumn byItem:item;
+    cellView.editable = NO;
+    cellView.bordered = NO;
+    cellView.drawsBackground = NO;
+    return cellView;
+}
+
+@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/panels/VLCTrackSynchronizationWindowController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/panels/VLCTrackSynchronizationWindowController.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/panels/VLCVideoEffectsWindowController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/panels/VLCVideoEffectsWindowController.m Changed

@@ -29,8 +29,8 @@
 #import "main/VLCMain.h"
 #import "panels/dialogs/VLCPopupPanelController.h"
 #import "panels/dialogs/VLCTextfieldPanelController.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 #import "windows/video/VLCVideoOutputProvider.h"
 
 #import <vlc_configuration.h>
@@ -130,7 +130,7 @@
 
     /* filter handling */
     NSString *tempString = B64DecNSStr(items firstObject);
-    VLCPlayerController *playerController = VLCMain.sharedInstance.playlistController.playerController;
+    VLCPlayerController *playerController = VLCMain.sharedInstance.playQueueController.playerController;
     vout_thread_t *vout = playerController mainVideoOutputThread;
 
     /* enable the new filters */
@@ -433,7 +433,7 @@
         return;
     }
 
-    VLCPlayerController *playerController = VLCMain.sharedInstance.playlistController.playerController;
+    VLCPlayerController *playerController = VLCMain.sharedInstance.playQueueController.playerController;
     vout_thread_t *vout = playerController mainVideoOutputThread;
     if (!vout)
         return;
@@ -492,7 +492,7 @@
 /// Sets widget values based on variables
 - (void)resetValues
 {
-    VLCPlayerController *playerController = VLCMain.sharedInstance.playlistController.playerController;
+    VLCPlayerController *playerController = VLCMain.sharedInstance.playQueueController.playerController;
     vout_thread_t *vout = playerController mainVideoOutputThread;
     if (!vout)
         return;
@@ -666,7 +666,7 @@
 
 - (NSString *)generateProfileString
 {
-    VLCPlayerController *playerController = VLCMain.sharedInstance.playlistController.playerController;
+    VLCPlayerController *playerController = VLCMain.sharedInstance.playQueueController.playerController;
     vout_thread_t *vout = playerController mainVideoOutputThread;
     if (!vout)
         return nil;
@@ -1027,7 +1027,7 @@
             self setCropRightValue: self cropLeftValue;
     }
 
-    VLCPlayerController *playerController = VLCMain.sharedInstance.playlistController.playerController;
+    VLCPlayerController *playerController = VLCMain.sharedInstance.playQueueController.playerController;
     vout_thread_t *p_vout = playerController mainVideoOutputThread;
     if (p_vout) {
         var_SetInteger(p_vout, "crop-top", _cropTopTextField intValue);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/panels/bookmarks/VLCBookmarksTableViewDataSource.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/panels/bookmarks/VLCBookmarksTableViewDataSource.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/panels/dialogs/VLCResumeDialogController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/panels/dialogs/VLCResumeDialogController.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/panels/dialogs/VLCResumeDialogController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/panels/dialogs/VLCResumeDialogController.m Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueController.h Added

@@ -0,0 +1,250 @@
+/*****************************************************************************
+ * VLCPlayQueueController.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Foundation/Foundation.h>
+#import <vlc_playlist.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class VLCPlayQueueModel;
+@class VLCPlayQueueDataSource;
+@class VLCPlayerController;
+@class VLCPlaylistExportModuleDescription;
+@class VLCOpenInputMetadata;
+@class VLCInputItem;
+
+extern NSString * const VLCPlaybackOrderChanged;
+extern NSString * const VLCPlaybackRepeatChanged;
+extern NSString * const VLCPlaybackHasPreviousChanged;
+extern NSString * const VLCPlaybackHasNextChanged;
+extern NSString * const VLCPlayQueueCurrentItemIndexChanged;
+extern NSString * const VLCPlayQueueItemsAdded;
+extern NSString * const VLCPlayQueueItemsRemoved;
+
+@interface VLCPlayQueueController : NSObject
+
+- (instancetype)initWithPlaylist:(vlc_playlist_t *)playlist;
+
+/**
+ * The vlc core playlist controlled by the instance of this class
+ * @note You DO SOMETHING WRONG if you need to access this!
+ */
+@property (readonly) vlc_playlist_t *p_playlist;
+
+/**
+ * The playlist model caching the contents of the playlist controlled by
+ * the instance of this class.
+ */
+@property (readonly) VLCPlayQueueModel *playQueueModel;
+
+/**
+ * The datasource instance used to actually display the playlist.
+ */
+@property (readwrite, assign) VLCPlayQueueDataSource *playQueueDataSource;
+
+/**
+ * The player instance associated with the playlist
+ */
+@property (readonly) VLCPlayerController *playerController;
+
+/**
+ * Index of the current playlist item
+ @return index of the current playlist index or -1 if none
+ @warning just because the current index is valid does not imply that it is playing!
+ */
+@property (readonly) size_t currentPlayQueueIndex;
+
+/**
+ * input of the currently playing item
+ @return returns the input item for the currently playing playlist item
+ @note the receiver is responsible for releasing the input item
+ */
+@property (readonly, nullable) VLCInputItem *currentlyPlayingInputItem;
+
+/**
+ * indicates whether there is a previous item in the list the user could go back to
+ * @note Subscribe to the VLCPlaybackHasPreviousChanged notification to be notified about changes
+ */
+@property (readonly) BOOL hasPreviousPlayQueueItem;
+
+/**
+ * indicates whether there is a next item in the list the user could move on to
+ * @note Subscribe to the VLCPlaybackHasNextChanged notification to be notified about changes
+ */
+@property (readonly) BOOL hasNextPlayQueueItem;
+
+/**
+ * sets and gets the playback repeat mode according to the enum defined in the core
+ * @note Subscribe to the VLCPlaybackRepeatChanged notification to be notified about changes
+ */
+@property (readwrite, nonatomic) enum vlc_playlist_playback_repeat playbackRepeat;
+
+/**
+ * sets and gets the playback order according to the enum defined in the core
+ * @note Subscribe to the VLCPlaybackOrderChanged notification to be notified about changes
+ */
+@property (readwrite, nonatomic) enum vlc_playlist_playback_order playbackOrder;
+
+@property (readwrite, nonatomic) BOOL libraryPlayQueueMode;
+
+/**
+ * Define the action to perform after playback of the current media stopped (for any reason)
+ * Options are: continue with next time, pause on last frame, stop even if there is a next item and quit VLC
+ * @see the vlc_playlist_media_stopped_action enum for details
+ */
+@property (readwrite, nonatomic) enum vlc_playlist_media_stopped_action actionAfterStop;
+
+
+/**
+ * Simplified version to add new items to the end of the current playlist
+ * @param array array of items. Each item is an instance of VLCOpenInputMetadata.
+ */
+- (void)addPlayQueueItems:(NSArray <VLCOpenInputMetadata *> *)array;
+
+/**
+ * Add new items to the playlist, at specified index.
+ * @param itemArray array of items. Each item is an instance of VLCOpenInputMetadata.
+ * @param insertionIndex index for new items, -1 for appending at end
+ * @param startPlayback starts playback of first item if true
+ */
+- (void)addPlayQueueItems:(NSArray <VLCOpenInputMetadata *> *)itemArray
+               atPosition:(size_t)insertionIndex
+            startPlayback:(BOOL)startPlayback;
+
+/**
+ * Add new item to the playlist if you already have an input item
+ * @param p_inputItem the input item you already from somewhere
+ * @param insertionIndex index for new item, -1 for appending at end
+ * @param startPlayback starts playback of the item if true
+ * @return returns VLC_SUCCESS or an error
+ */
+- (int)addInputItem:(input_item_t *)p_inputItem
+         atPosition:(size_t)insertionIndex
+      startPlayback:(BOOL)startPlayback;
+
+/**
+ * Move an item with a given unique ID to a new position
+ * @param uniqueID the ID of the playlist item to move
+ * @param target the target index of where to move the item
+ * @return returns VLC_SUCCESS or an error
+ */
+- (int)moveItemWithID:(int64_t)uniqueID toPosition:(size_t)target;
+
+/**
+ * Remove all items at the given index set
+ * @param indexes Set of indexes to remove
+ */
+- (void)removeItemsAtIndexes:(NSIndexSet *)indexes;
+
+/**
+ * Clear the entire playlist
+ */
+- (void)clearPlayQueue;
+
+/**
+ * Sort the entire playlist listen based on:
+ * @param sortKey the key used for sorting
+ * @param sortOrder sort ascending or descending..
+ * @return Returns VLC_SUCCESS on success.
+ */
+- (int)sortByKey:(enum vlc_playlist_sort_key)sortKey andOrder:(enum vlc_playlist_sort_order)sortOrder;
+
+/**
+ * Initially, the playlist is unsorted until the user decides to do so
+ * Until then, the unsorted state is retained.
+ */
+@property (readonly) BOOL unsorted;
+
+/**
+ * The last key used for sorting
+ */
+@property (readonly) enum vlc_playlist_sort_key lastSortKey;
+
+/**
+ * The last order used for sorting
+ */
+@property (readonly) enum vlc_playlist_sort_order lastSortOrder;
+
+/**
+ * Start the playlist
+ * @return Returns VLC_SUCCESS on success.
+ */
+- (int)startPlayQueue;
+
+/**
+ * Play the previous item in the list (if any)
+ * @return Returns VLC_SUCCESS on success.
+ */
+- (int)playPreviousItem;
+
+/**
+ * Play the item at the given index (if any)
+ * @param index the index to play
+ * @return Returns VLC_SUCCESS on success.
+ */
+- (int)playItemAtIndex:(size_t)index;
+
+/**
+ * Play the previous item in the list (if any)
+ * @return Returns VLC_SUCCESS on success.
+ */
+- (int)playNextItem;
+
+/**
+ * Stop playback of the playlist and destroy all facilities
+ */
+- (void)stopPlayback;
+
+/**
+ * Pause playback of the playlist while keeping all facilities
+ */
+- (void)pausePlayback;
+
+/**
+ * Resume playback of the playlist if it was paused
+ */
+- (void)resumePlayback;
+
+/**
+ * returns an array of module descriptions available for export a playlist. Content may vary
+ */
+@property (readonly) NSArray <VLCPlaylistExportModuleDescription *> *availablePlaylistExportModules;
+
+/**
+ * exports the playlist owned by the controller to a given file using the provided module
+ * @param path the file path to store the file in
+ * @param exportModule the VLCPlaylistExportModuleDescription for the respective export module
+ * @return VLC_SUCCESS or an error
+ */
+- (int)exportPlaylistToPath:(NSString *)path exportModule:(VLCPlaylistExportModuleDescription *)exportModule;
+
+@end
+
+@interface VLCPlaylistExportModuleDescription : NSObject
+
+@property (readwrite, retain) NSString *humanReadableName;
+@property (readwrite, retain) NSString *fileExtension;
+@property (readwrite, retain) NSString *moduleName;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueController.m Added

@@ -0,0 +1,733 @@
+/*****************************************************************************
+ * VLCPlayQueueController.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlayQueueController.h"
+
+#import <vlc_interface.h>
+#import <vlc_player.h>
+
+#import "extensions/NSString+Helpers.h"
+#import "main/VLCMain.h"
+#import "playqueue/VLCPlayQueueModel.h"
+#import "playqueue/VLCPlayQueueItem.h"
+#import "playqueue/VLCPlayQueueDataSource.h"
+#import "playqueue/VLCPlayerController.h"
+#import "windows/VLCOpenInputMetadata.h"
+#import "library/VLCInputItem.h"
+
+NSString * const VLCPlaybackOrderChanged = @"VLCPlaybackOrderChanged";
+NSString * const VLCPlaybackRepeatChanged = @"VLCPlaybackRepeatChanged";
+NSString * const VLCPlaybackHasPreviousChanged = @"VLCPlaybackHasPreviousChanged";
+NSString * const VLCPlaybackHasNextChanged = @"VLCPlaybackHasNextChanged";
+NSString * const VLCPlayQueueCurrentItemIndexChanged = @"VLCPlayQueueCurrentItemIndexChanged";
+NSString * const VLCPlayQueueItemsAdded = @"VLCPlayQueueItemsAdded";
+NSString * const VLCPlayQueueItemsRemoved = @"VLCPlayQueueItemsRemoved";
+
+NSString * const VLCLibraryPlayQueueModeDefaultsKey = @"VLCLibraryPlayQueueMode";
+
+@interface VLCPlayQueueController ()
+{
+    NSNotificationCenter *_defaultNotificationCenter;
+
+    vlc_playlist_t *_p_playlist;
+    vlc_playlist_listener_id *_playlistListenerID;
+}
+
+- (void)playQueueResetWithItems:(NSArray *)items;
+- (void)playQueueAdded:(NSArray *)items atIndex:(size_t)insertionIndex count:(size_t)numberOfItems;
+- (void)playQueueMovedIndex:(size_t)index toTarget:(size_t)target numberOfItems:(size_t)count;
+- (void)playQueueRemovedItemsAtIndex:(size_t)index count:(size_t)numberOfItems;
+- (void)playQueueUpdatedForIndex:(size_t)firstUpdatedIndex items:(vlc_playlist_item_t *const *)items count:(size_t)numberOfItems;
+- (void)playQueuePlaybackRepeatUpdated:(enum vlc_playlist_playback_repeat)currentRepeatMode;
+- (void)playQueuePlaybackOrderUpdated:(enum vlc_playlist_playback_order)currentOrder;
+- (void)currentPlayQueueItemIndexChanged:(size_t)index;
+- (void)playQueueHasPreviousItem:(BOOL)hasPrevious;
+- (void)playQueueHasNextItem:(BOOL)hasNext;
+- (void)stopActionChanged:(enum vlc_playlist_media_stopped_action)stoppedAction;
+
+@end
+
+#pragma mark -
+#pragma mark core callbacks
+
+static void
+cb_playlist_items_reset(vlc_playlist_t *playlist,
+                        vlc_playlist_item_t *const items,
+                        size_t numberOfItems,
+                        void *p_data)
+{
+    NSMutableArray * const array = NSMutableArray arrayWithCapacity:numberOfItems;
+    for (size_t i = 0; i < numberOfItems; i++) {
+        VLCPlayQueueItem * const item = VLCPlayQueueItem alloc initWithPlaylistItem:itemsi;
+        array addObject:item;
+    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController playQueueResetWithItems:array;
+    });
+}
+
+static void
+cb_playlist_items_added(vlc_playlist_t *playlist,
+                        size_t insertionIndex,
+                        vlc_playlist_item_t *const items,
+                        size_t numberOfAddedItems,
+                        void *p_data)
+{
+    NSMutableArray * const array = NSMutableArray arrayWithCapacity:numberOfAddedItems;
+    for (size_t i = 0; i < numberOfAddedItems; i++) {
+        VLCPlayQueueItem * const item = VLCPlayQueueItem alloc initWithPlaylistItem:itemsi;
+        array addObject:item;
+    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController playQueueAdded:array atIndex:insertionIndex count:numberOfAddedItems;
+    });
+}
+
+static void
+cb_playlist_items_moved(vlc_playlist_t *playlist,
+                        size_t index,
+                        size_t numberOfMovedItems,
+                        size_t target,
+                        void *p_data)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController playQueueMovedIndex:index toTarget:target numberOfItems:numberOfMovedItems;
+    });
+}
+
+static void
+cb_playlist_items_removed(vlc_playlist_t *playlist,
+                          size_t index,
+                          size_t count,
+                          void *p_data)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController playQueueRemovedItemsAtIndex:index count:count;
+    });
+}
+
+static void
+cb_playlist_items_updated(vlc_playlist_t *playlist,
+                          size_t firstUpdatedIndex,
+                          vlc_playlist_item_t *const items,
+                          size_t numberOfUpdatedItems,
+                          void *p_data)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController playQueueUpdatedForIndex:firstUpdatedIndex items:items count:numberOfUpdatedItems;
+    });
+}
+
+static void
+cb_playlist_playback_repeat_changed(vlc_playlist_t *playlist,
+                                    enum vlc_playlist_playback_repeat repeat,
+                                    void *p_data)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController playQueuePlaybackRepeatUpdated:repeat;
+    });
+}
+
+static void
+cb_playlist_playback_order_changed(vlc_playlist_t *playlist,
+                                   enum vlc_playlist_playback_order order,
+                                   void *p_data)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController playQueuePlaybackOrderUpdated:order;
+    });
+}
+
+static void
+cb_playlist_current_item_index_changed(vlc_playlist_t *playlist,
+                                 ssize_t index,
+                                 void *p_data)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController currentPlayQueueItemIndexChanged:index;
+    });
+}
+
+static void
+cb_playlist_has_prev_changed(vlc_playlist_t *playlist,
+                             bool has_prev,
+                             void *p_data)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController playQueueHasPreviousItem:has_prev;
+    });
+}
+
+static void
+cb_playlist_has_next_changed(vlc_playlist_t *playlist,
+                             bool has_next,
+                             void *p_data)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController playQueueHasNextItem:has_next;
+    });
+}
+
+static void
+cb_playlist_media_stopped_action_changed(vlc_playlist_t *p_playlist,
+                                         enum vlc_playlist_media_stopped_action newAction,
+                                         void *p_data)
+{
+    VLC_UNUSED(p_playlist);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayQueueController * const playQueueController = (__bridge VLCPlayQueueController *)p_data;
+        playQueueController stopActionChanged:newAction;
+    });
+}
+
+static const struct vlc_playlist_callbacks playlist_callbacks = {
+    cb_playlist_items_reset,
+    cb_playlist_items_added,
+    cb_playlist_items_moved,
+    cb_playlist_items_removed,
+    cb_playlist_items_updated,
+    cb_playlist_playback_repeat_changed,
+    cb_playlist_playback_order_changed,
+    cb_playlist_current_item_index_changed,
+    cb_playlist_has_prev_changed,
+    cb_playlist_has_next_changed,
+    cb_playlist_media_stopped_action_changed,
+};
+
+#pragma mark -
+#pragma mark class initialization
+
+@implementation VLCPlayQueueController
+
+- (instancetype)initWithPlaylist:(vlc_playlist_t *)playlist
+{
+    self = super init;
+    if (self) {
+        _defaultNotificationCenter = NSNotificationCenter.defaultCenter;
+        _defaultNotificationCenter addObserver:self
+                                       selector:@selector(applicationWillTerminate:)
+                                           name:NSApplicationWillTerminateNotification
+                                         object:nil;
+        _defaultNotificationCenter addObserver:self
+                                       selector:@selector(applicationDidFinishLaunching:)
+                                           name:NSApplicationDidFinishLaunchingNotification
+                                         object:nil;
+        _p_playlist = playlist;
+
+        /* set initial values, further updates through callbacks */
+        vlc_playlist_Lock(_p_playlist);
+        _unsorted = YES;
+        _libraryPlayQueueMode =
+            NSUserDefaults.standardUserDefaults boolForKey:VLCLibraryPlayQueueModeDefaultsKey;
+        _playbackOrder = vlc_playlist_GetPlaybackOrder(_p_playlist);
+        _playbackRepeat = vlc_playlist_GetPlaybackRepeat(_p_playlist);
+        _playlistListenerID = vlc_playlist_AddListener(_p_playlist,
+                                                       &playlist_callbacks,
+                                                       (__bridge void *)self,
+                                                       YES);
+        vlc_playlist_Unlock(_p_playlist);
+        _playQueueModel = VLCPlayQueueModel alloc init;
+        _playQueueModel.playQueueController = self;
+        _playerController = VLCPlayerController alloc initWithPlayer:vlc_playlist_GetPlayer(_p_playlist);
+    }
+    return self;
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+    /* Handle sleep notification */
+    NSWorkspace.sharedWorkspace.notificationCenter addObserver:self
+                                                           selector:@selector(computerWillSleep:)
+                                                               name:NSWorkspaceWillSleepNotification
+                                                             object:nil;
+
+    // respect playlist-autostart
+    if (var_GetBool(getIntf(), "playlist-autostart")) {
+        if (self.playQueueModel numberOfPlayQueueItems > 0) {
+            self startPlayQueue;
+        }
+    }
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification
+{
+    if (_p_playlist) {
+        if (_playlistListenerID) {
+            vlc_playlist_Lock(_p_playlist);
+            vlc_playlist_RemoveListener(_p_playlist, _playlistListenerID);
+            vlc_playlist_Unlock(_p_playlist);
+        }
+    }
+}
+
+- (void)computerWillSleep:(NSNotification *)notification
+{
+    self pausePlayback;
+}
+
+- (void)dealloc
+{
+    NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self;
+    _defaultNotificationCenter removeObserver:self;
+}
+
+#pragma mark - callback forwarders
+
+- (void)playQueueResetWithItems:(NSArray *)items
+{
+    // Clear all items (reset)
+    _playQueueModel dropExistingData;
+
+    _playQueueModel addItems:items;
+
+    _playQueueDataSource playQueueUpdated;
+}
+
+- (void)playQueueAdded:(NSArray *)items atIndex:(size_t)insertionIndex count:(size_t)numberOfItems
+{
+    _playQueueModel addItems:items atIndex:insertionIndex count:numberOfItems;
+
+    _playQueueDataSource playQueueUpdated;
+    _defaultNotificationCenter postNotificationName:VLCPlayQueueItemsAdded object:self;
+}
+
+- (void)playQueueMovedIndex:(size_t)index toTarget:(size_t)target numberOfItems:(size_t)count
+{
+    _playQueueModel moveItemAtIndex:index toTarget:target;
+    _playQueueDataSource playQueueUpdated;
+}
+
+- (void)playQueueRemovedItemsAtIndex:(size_t)index count:(size_t)numberOfItems
+{
+    NSRange range = NSMakeRange(index, numberOfItems);
+    _playQueueModel removeItemsInRange:range;
+
+    _playQueueDataSource playQueueUpdated;
+    _defaultNotificationCenter postNotificationName:VLCPlayQueueItemsRemoved object:self;
+}
+
+- (void)playQueueUpdatedForIndex:(size_t)firstUpdatedIndex items:(vlc_playlist_item_t *const *)items count:(size_t)numberOfItems
+{
+    VLC_UNUSED(items);
+    for (size_t i = firstUpdatedIndex; i < firstUpdatedIndex + numberOfItems; i++) {
+        _playQueueModel updateItemAtIndex:i;
+    }
+    _playQueueDataSource playQueueUpdated;
+}
+
+- (void)playQueuePlaybackRepeatUpdated:(enum vlc_playlist_playback_repeat)currentRepeatMode
+{
+    _playbackRepeat = currentRepeatMode;
+    _defaultNotificationCenter postNotificationName:VLCPlaybackRepeatChanged object:self;
+}
+
+- (void)playQueuePlaybackOrderUpdated:(enum vlc_playlist_playback_order)currentOrder
+{
+    _playbackOrder = currentOrder;
+    _defaultNotificationCenter postNotificationName:VLCPlaybackOrderChanged object:self;
+}
+
+- (void)currentPlayQueueItemIndexChanged:(size_t)index
+{
+    _currentPlayQueueIndex = index;
+    _playQueueDataSource scrollToCurrentPlayQueueItem;
+    _defaultNotificationCenter postNotificationName:VLCPlayQueueCurrentItemIndexChanged object:self;
+}
+
+- (void)playQueueHasPreviousItem:(BOOL)hasPrevious
+{
+    _hasPreviousPlayQueueItem = hasPrevious;
+    _defaultNotificationCenter postNotificationName:VLCPlaybackHasPreviousChanged object:self;
+}
+
+- (void)playQueueHasNextItem:(BOOL)hasNext
+{
+    _hasNextPlayQueueItem = hasNext;
+    _defaultNotificationCenter postNotificationName:VLCPlaybackHasNextChanged object:self;
+}
+
+#pragma mark - controller functions for use within the UI
+
+- (void)addPlayQueueItems:(NSArray <VLCOpenInputMetadata *> *)array
+{
+    BOOL b_autoplay = var_InheritBool(getIntf(), "macosx-autoplay");
+    self addPlayQueueItems:array atPosition:-1 startPlayback:b_autoplay;
+}
+
+- (void)addPlayQueueItems:(NSArray <VLCOpenInputMetadata *> *)itemArray
+              atPosition:(size_t)insertionIndex
+           startPlayback:(BOOL)startPlayback;
+{
+    /* note: we don't add the item as cached data to the model here
+     * because this will be done asynchronously through the callback */
+
+    intf_thread_t *p_intf = getIntf();
+    NSUInteger numberOfItems = itemArray count;
+
+    for (NSUInteger i = 0; i < numberOfItems; i++) {
+        VLCOpenInputMetadata *itemMetadata = itemArrayi;
+        input_item_t *p_input = self createInputItemBasedOnMetadata:itemMetadata;
+        NSString *itemURLString = itemMetadata.MRLString;
+
+        if (!p_input) {
+            if (itemURLString) {
+                msg_Warn(p_intf, "failed to create input for %s", itemURLString UTF8String);
+            } else {
+                msg_Warn(p_intf, "failed to create input because no URL was provided");
+            }
+            continue;
+        }
+
+        vlc_playlist_Lock(_p_playlist);
+
+        int ret = 0;
+        size_t actualInsertionIndex = insertionIndex;
+        if (insertionIndex == -1) {
+            actualInsertionIndex = vlc_playlist_Count(_p_playlist);
+        }
+        ret = vlc_playlist_Insert(_p_playlist,
+                                  actualInsertionIndex,
+                                  &p_input,
+                                  1);
+
+        if (ret != VLC_SUCCESS) {
+            msg_Err(p_intf, "failed to insert input item at insertion index: %zu", insertionIndex);
+        } else {
+            msg_Dbg(p_intf, "Added item %s at insertion index: %zu", itemURLString UTF8String, insertionIndex);
+        }
+
+        if (i == 0 && startPlayback) {
+            vlc_playlist_PlayAt(_p_playlist, actualInsertionIndex);
+        }
+
+        vlc_playlist_Unlock(_p_playlist);
+        input_item_Release(p_input);
+
+        if (insertionIndex != -1) {
+            insertionIndex++;
+        }
+    }
+}
+
+- (int)addInputItem:(input_item_t *)p_inputItem atPosition:(size_t)insertionIndex startPlayback:(BOOL)startPlayback
+{
+    if (p_inputItem == NULL) {
+        return VLC_EINVAL;
+    }
+    int ret = 0;
+
+    vlc_playlist_Lock(_p_playlist);
+    if (insertionIndex == -1) {
+        insertionIndex = vlc_playlist_Count(_p_playlist);
+    }
+    ret = vlc_playlist_InsertOne(_p_playlist, insertionIndex, p_inputItem);
+    if (ret != VLC_SUCCESS) {
+        vlc_playlist_Unlock(_p_playlist);
+        return ret;
+    }
+    if (startPlayback) {
+        ret = vlc_playlist_PlayAt(_p_playlist, insertionIndex);
+    }
+    vlc_playlist_Unlock(_p_playlist);
+    return ret;
+}
+
+- (int)moveItemWithID:(int64_t)uniqueID toPosition:(size_t)target
+{
+    vlc_playlist_item_t **items = calloc(1, sizeof(vlc_playlist_item_t *));
+    vlc_playlist_Lock(_p_playlist);
+    ssize_t itemIndex = vlc_playlist_IndexOfId(_p_playlist, uniqueID);
+    vlc_playlist_item_t *p_item = vlc_playlist_Get(_p_playlist, itemIndex);
+    items0 = p_item;
+    int ret = vlc_playlist_RequestMove(_p_playlist, items, 1, target, itemIndex);
+    vlc_playlist_Unlock(_p_playlist);
+    free(items);
+    return ret;
+}
+
+- (void)removeItemsAtIndexes:(NSIndexSet *)indexes
+{
+    if (indexes.count == 0)
+        return;
+
+    __block vlc_playlist_item_t **items = calloc(indexes.count, sizeof(vlc_playlist_item_t *));
+    __block NSUInteger pos = 0;
+    indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
+        VLCPlayQueueItem *item = self->_playQueueModel playQueueItemAtIndex:idx;
+        itemspos++ = item.playlistItem;
+    };
+
+    /* note: we don't remove the cached data from the model here
+     * because this will be done asynchronously through the callback */
+
+    vlc_playlist_Lock(_p_playlist);
+    vlc_playlist_RequestRemove(_p_playlist, items, pos, indexes.firstIndex);
+    vlc_playlist_Unlock(_p_playlist);
+
+    free(items);
+}
+
+- (void)clearPlayQueue
+{
+    vlc_playlist_Lock(_p_playlist);
+    vlc_playlist_Clear(_p_playlist);
+    vlc_playlist_Unlock(_p_playlist);
+}
+
+- (int)sortByKey:(enum vlc_playlist_sort_key)sortKey andOrder:(enum vlc_playlist_sort_order)sortOrder
+{
+    struct vlc_playlist_sort_criterion sortCriterion = { sortKey, sortOrder };
+    int returnValue = VLC_SUCCESS;
+    vlc_playlist_Lock(_p_playlist);
+    returnValue = vlc_playlist_Sort(_p_playlist, &sortCriterion, 1);
+    vlc_playlist_Unlock(_p_playlist);
+    if (returnValue == VLC_SUCCESS) {
+        _lastSortKey = sortKey;
+        _lastSortOrder = sortOrder;
+        _unsorted = NO;
+    }
+    return returnValue;
+}
+
+- (int)startPlayQueue
+{
+    const NSInteger selectedIndex = _playQueueDataSource.tableView selectedRow;
+    return self playItemAtIndex:selectedIndex;
+}
+
+- (int)playPreviousItem
+{
+    vlc_playlist_Lock(_p_playlist);
+    int ret = vlc_playlist_Prev(_p_playlist);
+    vlc_playlist_Unlock(_p_playlist);
+    return ret;
+}
+
+- (int)playItemAtIndex:(size_t)index
+{
+    vlc_playlist_Lock(_p_playlist);
+    size_t playlistLength = vlc_playlist_Count(_p_playlist);
+    int ret = 0;
+    if (index >= playlistLength) {
+        ret = VLC_EGENERIC;
+    } else {
+        ret = vlc_playlist_PlayAt(_p_playlist, index);
+    }
+    vlc_playlist_Unlock(_p_playlist);
+    return ret;
+}
+
+- (int)playNextItem
+{
+    vlc_playlist_Lock(_p_playlist);
+    int ret = vlc_playlist_Next(_p_playlist);
+    vlc_playlist_Unlock(_p_playlist);
+    return ret;
+}
+
+- (void)stopPlayback
+{
+    vlc_playlist_Lock(_p_playlist);
+    vlc_playlist_Stop(_p_playlist);
+    vlc_playlist_Unlock(_p_playlist);
+}
+
+- (void)pausePlayback
+{
+    vlc_playlist_Lock(_p_playlist);
+    vlc_playlist_Pause(_p_playlist);
+    vlc_playlist_Unlock(_p_playlist);
+}
+
+- (void)resumePlayback
+{
+    vlc_playlist_Lock(_p_playlist);
+    vlc_playlist_Resume(_p_playlist);
+    vlc_playlist_Unlock(_p_playlist);
+}
+
+- (void)setPlaybackOrder:(enum vlc_playlist_playback_order)playbackOrder
+{
+    vlc_playlist_Lock(_p_playlist);
+    vlc_playlist_SetPlaybackOrder(_p_playlist, playbackOrder);
+    vlc_playlist_Unlock(_p_playlist);
+}
+
+- (void)setPlaybackRepeat:(enum vlc_playlist_playback_repeat)playbackRepeat
+{
+    vlc_playlist_Lock(_p_playlist);
+    vlc_playlist_SetPlaybackRepeat(_p_playlist, playbackRepeat);
+    vlc_playlist_Unlock(_p_playlist);
+}
+
+- (void)setLibraryPlayQueueMode:(BOOL)libraryPlayQueueMode
+{
+    _libraryPlayQueueMode = libraryPlayQueueMode;
+    NSUserDefaults.standardUserDefaults setBool:libraryPlayQueueMode
+                                          forKey:VLCLibraryPlayQueueModeDefaultsKey;
+}
+
+#pragma mark - properties
+
+- (VLCInputItem *)currentlyPlayingInputItem
+{
+    vlc_player_t *player = vlc_playlist_GetPlayer(_p_playlist);
+    VLCInputItem *inputItem;
+    vlc_player_Lock(player);
+    input_item_t *vlcInputItem = vlc_player_GetCurrentMedia(player);
+    if (vlcInputItem) {
+        inputItem = VLCInputItem alloc initWithInputItem:vlcInputItem;
+    }
+    vlc_player_Unlock(player);
+    return inputItem;
+}
+
+#pragma mark - helper methods
+
+- (input_item_t *)createInputItemBasedOnMetadata:(VLCOpenInputMetadata *)itemMetadata
+{
+    intf_thread_t *p_intf = getIntf();
+
+    input_item_t *p_input;
+    BOOL b_rem = FALSE, b_dir = FALSE, b_writable = FALSE;
+    NSString *uri, *name, *path;
+    NSURL * url;
+    NSArray *optionsArray;
+
+    /* Get the item */
+    uri = itemMetadata.MRLString;
+    url = NSURL URLWithString: uri;
+    path = url path;
+    name = itemMetadata.itemName;
+    optionsArray = itemMetadata.playbackOptions;
+
+    if (NSFileManager defaultManager fileExistsAtPath:path isDirectory:&b_dir
+        && b_dir &&
+        NSWorkspace.sharedWorkspace getFileSystemInfoForPath:path
+                                                    isRemovable:&b_rem
+                                                     isWritable:&b_writable
+                                                  isUnmountable:NULL
+                                                    description:NULL
+                                                           type:NULL
+        && b_rem && !b_writable && url isFileURL) {
+
+        NSString *diskType = getVolumeTypeFromMountPath(path);
+        msg_Dbg(p_intf, "detected optical media of type %s in the file input", diskType UTF8String);
+
+        if (diskType isEqualToString: kVLCMediaDVD)
+            uri = NSString stringWithFormat: @"dvdnav://%@", getBSDNodeFromMountPath(path);
+        else if (diskType isEqualToString: kVLCMediaVideoTSFolder)
+            uri = NSString stringWithFormat: @"dvdnav://%@", path;
+        else if (diskType isEqualToString: kVLCMediaAudioCD)
+            uri = NSString stringWithFormat: @"cdda://%@", getBSDNodeFromMountPath(path);
+        else if (diskType isEqualToString: kVLCMediaVCD)
+            uri = NSString stringWithFormat: @"vcd://%@#0:0", getBSDNodeFromMountPath(path);
+        else if (diskType isEqualToString: kVLCMediaSVCD)
+            uri = NSString stringWithFormat: @"vcd://%@@0:0", getBSDNodeFromMountPath(path);
+        else if (diskType isEqualToString: kVLCMediaBD || diskType isEqualToString: kVLCMediaBDMVFolder)
+            uri = NSString stringWithFormat: @"bluray://%@", path;
+        else
+            msg_Warn(getIntf(), "unknown disk type, treating %s as regular input", path UTF8String);
+
+        p_input = input_item_New(uri UTF8String, NSFileManager defaultManager displayNameAtPath:path UTF8String);
+    } else {
+        p_input = input_item_New(uri fileSystemRepresentation, name ? name UTF8String : NULL);
+    }
+
+    if (!p_input)
+        return NULL;
+
+    if (optionsArray) {
+        NSUInteger count = optionsArray count;
+        for (NSUInteger i = 0; i < count; i++)
+            input_item_AddOption(p_input, optionsArray objectAtIndex:i UTF8String, VLC_INPUT_OPTION_TRUSTED);
+    }
+
+    /* Recent documents menu */
+    if (url != nil && var_InheritBool(getIntf(), "macosx-recentitems"))
+        NSDocumentController sharedDocumentController noteNewRecentDocumentURL:url;
+
+    return p_input;
+}
+
+- (NSArray<VLCPlaylistExportModuleDescription *> *)availablePlaylistExportModules
+{
+    VLCPlaylistExportModuleDescription *xspf = VLCPlaylistExportModuleDescription alloc init;
+    xspf.humanReadableName = _NS("XSPF playlist");
+    xspf.fileExtension = @"xspf";
+    xspf.moduleName = @"export-xspf";
+
+    VLCPlaylistExportModuleDescription *m3u = VLCPlaylistExportModuleDescription alloc init;
+    m3u.humanReadableName = _NS("M3U playlist");
+    m3u.fileExtension = @"m3u";
+    m3u.moduleName = @"export-m3u";
+
+    VLCPlaylistExportModuleDescription *m3u8 = VLCPlaylistExportModuleDescription alloc init;
+    m3u8.humanReadableName = _NS("M3U8 playlist");
+    m3u8.fileExtension = @"m3u8";
+    m3u8.moduleName = @"export-m3u8";
+
+    VLCPlaylistExportModuleDescription *html = VLCPlaylistExportModuleDescription alloc init;
+    html.humanReadableName = _NS("HTML playlist");
+    html.fileExtension = @"html";
+    html.moduleName = @"export-html";
+
+    return @xspf, m3u, m3u8, html;
+}
+
+- (int)exportPlaylistToPath:(NSString *)path exportModule:(VLCPlaylistExportModuleDescription *)exportModule
+{
+    vlc_playlist_Lock(_p_playlist);
+    int ret = vlc_playlist_Export(_p_playlist,
+                                  path.fileSystemRepresentation,
+                                  exportModule.moduleName.UTF8String);
+    vlc_playlist_Unlock(_p_playlist);
+    return ret;
+}
+
+- (void)stopActionChanged:(enum vlc_playlist_media_stopped_action)stoppedAction
+{
+    _actionAfterStop = stoppedAction;
+}
+
+- (void)setActionAfterStop:(enum vlc_playlist_media_stopped_action)actionAfterStop
+{
+    vlc_playlist_Lock(_p_playlist);
+    vlc_playlist_SetMediaStoppedAction(_p_playlist, actionAfterStop);
+    vlc_playlist_Unlock(_p_playlist);
+}
+
+@end
+
+@implementation VLCPlaylistExportModuleDescription
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueDataSource.h Added

@@ -0,0 +1,43 @@
+/*****************************************************************************
+ * VLCPlayQueueDataSource.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+@class VLCPlayQueueController;
+@class VLCDragDropView;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VLCPlayQueueDataSource : NSObject <NSTableViewDataSource, NSTableViewDelegate>
+
+@property (readwrite, assign, nonatomic) VLCPlayQueueController *playQueueController;
+@property (readwrite, assign) NSTableView *tableView;
+@property (readwrite, assign) VLCDragDropView *dragDropView;
+@property (readwrite, nonatomic) NSTextField *counterTextField;
+
+- (void)prepareForUse;
+- (void)playQueueUpdated;
+- (void)scrollToCurrentPlayQueueItem;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueDataSource.m Added

@@ -0,0 +1,198 @@
+/*****************************************************************************
+ * VLCPlayQueueDataSource.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlayQueueDataSource.h"
+
+#import "main/VLCMain.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueTableCellView.h"
+#import "playqueue/VLCPlayQueueItem.h"
+#import "playqueue/VLCPlayQueueModel.h"
+#import "views/VLCDragDropView.h"
+#import "library/VLCLibraryDataTypes.h"
+#import "library/VLCInputItem.h"
+#import "windows/VLCOpenInputMetadata.h"
+
+static NSString *VLCPlayQueueCellIdentifier = @"VLCPlayQueueCellIdentifier";
+
+@interface VLCPlayQueueDataSource ()
+{
+    VLCPlayQueueModel *_playQueueModel;
+}
+@end
+
+@implementation VLCPlayQueueDataSource
+
+- (void)setPlayQueueController:(VLCPlayQueueController *)playQueueController
+{
+    _playQueueController = playQueueController;
+    _playQueueModel = _playQueueController.playQueueModel;
+}
+
+- (void)setCounterTextField:(NSTextField *)counterTextField
+{
+    _counterTextField = counterTextField;
+    self.counterTextField.stringValue =
+        NSString stringWithFormat:@"%lu", _playQueueModel.numberOfPlayQueueItems;
+}
+
+- (void)prepareForUse
+{
+    _tableView registerForDraggedTypes:@VLCMediaLibraryMediaItemPasteboardType, VLCMediaLibraryMediaItemUTI, VLCPlaylistItemPasteboardType, NSFilenamesPboardType;
+}
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
+{
+    return _playQueueModel.numberOfPlayQueueItems;
+}
+
+- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+{
+    VLCPlayQueueTableCellView *cellView =
+        tableView makeViewWithIdentifier:VLCPlayQueueCellIdentifier owner:self;
+
+    if (cellView == nil) {
+        /* the following code saves us an instance of NSViewController which we don't need */
+        NSNib *nib = NSNib alloc initWithNibNamed:@"VLCPlayQueueTableCellView" bundle:nil;
+        NSArray *topLevelObjects;
+        if (!nib instantiateWithOwner:self topLevelObjects:&topLevelObjects) {
+            msg_Err(getIntf(), "Failed to load nib file to show playlist items");
+            return nil;
+        }
+
+        for (id topLevelObject in topLevelObjects) {
+            if (topLevelObject isKindOfClass:VLCPlayQueueTableCellView class) {
+                cellView = topLevelObject;
+                break;
+            }
+        }
+        cellView.identifier = VLCPlayQueueCellIdentifier;
+    }
+
+    VLCPlayQueueItem * const item = _playQueueModel playQueueItemAtIndex:row;
+    if (!item) {
+        msg_Err(getIntf(), "playlist model did not return an item for representation");
+        return cellView;
+    }
+
+    cellView.representedPlayQueueItem = item;
+    cellView.representsCurrentPlayQueueItem = _playQueueController.currentPlayQueueIndex == row;
+
+    return cellView;
+}
+
+- (void)playQueueUpdated
+{
+    const NSUInteger numberOfPlayQueueItems = _playQueueModel.numberOfPlayQueueItems;
+    self.dragDropView.hidden = numberOfPlayQueueItems > 0 ? YES : NO;
+    self.counterTextField.stringValue = NSString stringWithFormat:@"%lu", numberOfPlayQueueItems;
+    _tableView reloadData;
+}
+
+- (id<NSPasteboardWriting>)tableView:(NSTableView *)tableView pasteboardWriterForRow:(NSInteger)row
+{
+    NSPasteboardItem * const pboardItem = NSPasteboardItem alloc init;
+    VLCPlayQueueItem * const playlistItem = _playQueueModel playQueueItemAtIndex:row;
+    pboardItem setString:@(playlistItem.uniqueID) stringValue forType:VLCPlaylistItemPasteboardType;
+    return pboardItem;
+}
+
+- (NSDragOperation)tableView:(NSTableView *)tableView
+                validateDrop:(id<NSDraggingInfo>)info
+                 proposedRow:(NSInteger)row
+       proposedDropOperation:(NSTableViewDropOperation)dropOperation
+{
+    return NSDragOperationCopy;
+}
+
+- (BOOL)tableView:(NSTableView *)tableView
+       acceptDrop:(id<NSDraggingInfo>)info
+              row:(NSInteger)row
+    dropOperation:(NSTableViewDropOperation)dropOperation
+{
+    NSString *encodedIDtoMove = info.draggingPasteboard stringForType:VLCPlaylistItemPasteboardType;
+    if (encodedIDtoMove != nil) {
+        int64_t uniqueID = encodedIDtoMove integerValue;
+        _playQueueController moveItemWithID:uniqueID toPosition:row;
+        return YES;
+    }
+
+    /* check whether the receive data is a library item from the left-hand side */
+    NSData *data = info.draggingPasteboard dataForType:VLCMediaLibraryMediaItemPasteboardType;
+    if (!data) {
+        data = info.draggingPasteboard dataForType:VLCMediaLibraryMediaItemUTI;
+    }
+
+    if (!data) {
+        /* it's not, so check if it is a file handle from the Finder */
+        id propertyList = info.draggingPasteboard propertyListForType:NSFilenamesPboardType;
+        if (propertyList == nil) {
+            return NO;
+        }
+
+        NSArray *mediaPaths = propertyList sortedArrayUsingSelector:@selector(caseInsensitiveCompare:);
+        NSUInteger mediaCount = mediaPaths count;
+        if (mediaCount > 0) {
+            NSMutableArray *metadataArray = NSMutableArray arrayWithCapacity:mediaCount;
+            for (NSString *mediaPath in mediaPaths) {
+                VLCOpenInputMetadata *inputMetadata;
+                NSURL *url = NSURL fileURLWithPath:mediaPath isDirectory:NO;
+                if (!url) {
+                    continue;
+                }
+                inputMetadata = VLCOpenInputMetadata alloc init;
+                inputMetadata.MRLString = url.absoluteString;
+                metadataArray addObject:inputMetadata;
+            }
+            _playQueueController addPlayQueueItems:metadataArray;
+
+            return YES;
+        }
+        return NO;
+    }
+
+    /* it is a media library item, so unarchive it and add it to the playlist */
+    NSArray *array = nil;
+    @try {
+        array = NSKeyedUnarchiver unarchiveObjectWithData:data;
+    } @catch (NSException *exception) {
+        if (exception.name isEqualToString:NSInvalidArgumentException) {
+            msg_Err(getIntf(), "Failed to unarchive MediaLibrary Item: %s",
+                    exception reason UTF8String);
+            return NO;
+        }
+        @throw;
+    }
+
+    for (VLCMediaLibraryMediaItem *mediaItem in array) {
+        _playQueueController addInputItem:mediaItem.inputItem.vlcInputItem atPosition:row startPlayback:NO;
+    }
+
+    return YES;
+}
+
+- (void)scrollToCurrentPlayQueueItem
+{
+    _tableView scrollRowToVisible:_playQueueController.currentPlayQueueIndex;
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueItem.h Added

@@ -0,0 +1,54 @@
+/*****************************************************************************
+ * VLCPlayQueueItem.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Foundation/Foundation.h>
+#import <vlc_playlist.h>
+#import <vlc_tick.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class VLCInputItem;
+@class VLCMediaLibraryMediaItem;
+
+extern NSString *VLCPlaylistItemPasteboardType;
+
+@interface VLCPlayQueueItem : NSObject
+
+@property (readonly) vlc_playlist_item_t *playlistItem;
+@property (readonly) uint64_t uniqueID;
+@property (readwrite, retain) NSString *title;
+@property (readonly, copy, nullable) NSURL *url;
+@property (readonly, copy, nullable) NSString *path;
+@property (readwrite, assign) vlc_tick_t duration;
+@property (readonly, nullable) VLCInputItem *inputItem;
+@property (readonly, nullable) VLCMediaLibraryMediaItem *mediaLibraryItem;
+
+@property (readwrite, retain, nullable) NSString *artistName;
+@property (readwrite, retain, nullable) NSString *albumName;
+@property (readonly) NSURL *artworkURL;
+
+- (instancetype)initWithPlaylistItem:(vlc_playlist_item_t *)p_item;
+- (void)updateRepresentation;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueItem.m Added

@@ -0,0 +1,138 @@
+/*****************************************************************************
+ * VLCPlayQueueItem.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlayQueueItem.h"
+
+#import <vlc_input.h>
+#import <vlc_url.h>
+
+#import "extensions/NSString+Helpers.h"
+#import "library/VLCInputItem.h"
+#import "library/VLCLibraryDataTypes.h"
+
+NSString *VLCPlaylistItemPasteboardType = @"org.videolan.vlc.playlistitemtype";
+
+@implementation VLCPlayQueueItem
+
+- (instancetype)initWithPlaylistItem:(vlc_playlist_item_t *)p_item
+{
+    self = super init;
+    if (self) {
+        _playlistItem = p_item;
+        vlc_playlist_item_Hold(_playlistItem);
+        self updateRepresentation;
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    vlc_playlist_item_Release(_playlistItem);
+}
+
+- (NSString *)description
+{
+    return NSString stringWithFormat:@"item %p, title: %@ duration %lli", &_playlistItem, _title, _duration;
+}
+
+- (uint64_t)uniqueID
+{
+    return vlc_playlist_item_GetId(_playlistItem);
+}
+
+- (VLCInputItem *)inputItem
+{
+    if (!_playlistItem) {
+        return nil;
+    }
+    input_item_t *p_input = vlc_playlist_item_GetMedia(_playlistItem);
+    if (!p_input) {
+        return nil;
+    }
+    VLCInputItem *inputItem = VLCInputItem alloc initWithInputItem:p_input;
+    return inputItem;
+}
+
+- (VLCMediaLibraryMediaItem *)mediaLibraryItem
+{
+    return VLCMediaLibraryMediaItem mediaItemForURL:self.url;
+}
+
+- (void)updateRepresentation
+{
+    input_item_t *p_media = vlc_playlist_item_GetMedia(_playlistItem);
+    vlc_mutex_lock(&p_media->lock);
+    _title = toNSStr(p_media->psz_name);
+    _duration = p_media->i_duration;
+
+    if (p_media->p_meta) {
+        _artistName = toNSStr(vlc_meta_Get(p_media->p_meta, vlc_meta_Artist));
+        _albumName = toNSStr(vlc_meta_Get(p_media->p_meta, vlc_meta_Album));
+
+        NSString *artworkURLString = toNSStr(vlc_meta_Get(p_media->p_meta, vlc_meta_ArtworkURL));
+        if (artworkURLString.length > 1) {
+            _artworkURL = NSURL URLWithString:artworkURLString;
+        }
+    }
+    vlc_mutex_unlock(&p_media->lock);
+}
+
+- (NSURL *)url
+{
+    if (_playlistItem) {
+        return nil;
+    }
+
+    input_item_t *p_media = vlc_playlist_item_GetMedia(_playlistItem);
+    if (!p_media) {
+        return nil;
+    }
+    char *psz_url = input_item_GetURI(p_media);
+    if (!psz_url)
+        return nil;
+
+    NSURL *url = NSURL URLWithString:toNSStr(psz_url);
+    free(psz_url);
+    return url;
+}
+
+- (NSString *)path
+{
+    if (!_playlistItem) {
+        return nil;
+    }
+    input_item_t *p_media = vlc_playlist_item_GetMedia(_playlistItem);
+    if (!p_media) {
+        return nil;
+    }
+    char *psz_url = input_item_GetURI(p_media);
+    if (!psz_url)
+        return nil;
+
+    char *psz_path = vlc_uri2path(psz_url);
+    NSString *path = toNSStr(psz_path);
+    free(psz_url);
+    free(psz_path);
+    return path;
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueMenuController.h Added

@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * VLCPlayQueueMenuController.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2002-2019 VLC authors and VideoLAN
+ *
+ * Authors: Benjamin Pracht <bigben at videolan dot org>
+ *          Felix Paul Kühne <fkuehne at videolan dot org>
+ *          David Fuhrmann <dfuhrmann # videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VLCPlayQueueMenuController : NSObject
+
+@property (readwrite, weak, nonatomic) NSTableView *playQueueTableView;
+@property (readonly) NSMenu *playQueueMenu;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueMenuController.m Added

@@ -0,0 +1,237 @@
+/*****************************************************************************
+ * VLCPlayQueueMenuController.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2002-2019 VLC authors and VideoLAN
+ *
+ * Authors: Benjamin Pracht <bigben at videolan dot org>
+ *          Felix Paul Kühne <fkuehne at videolan dot org>
+ *          David Fuhrmann <dfuhrmann # videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlayQueueMenuController.h"
+
+#import "extensions/NSString+Helpers.h"
+#import "extensions/NSMenu+VLCAdditions.h"
+#import "main/VLCMain.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueModel.h"
+#import "playqueue/VLCPlayQueueItem.h"
+#import "playqueue/VLCPlayQueueSortingMenuController.h"
+#import "windows/VLCOpenWindowController.h"
+#import "panels/VLCInformationWindowController.h"
+
+@interface VLCPlayQueueMenuController ()
+{
+    VLCPlayQueueController *_playQueueController;
+    VLCPlayQueueSortingMenuController *_playQueueSortingMenuController;
+    VLCInformationWindowController *_informationWindowController;
+
+    NSMenuItem *_playMenuItem;
+    NSMenuItem *_removeMenuItem;
+    NSMenuItem *_informationMenuItem;
+    NSMenuItem *_revealInFinderMenuItem;
+    NSMenuItem *_addFilesToPlayQueueMenuItem;
+    NSMenuItem *_clearPlayQueueMenuItem;
+    NSMenuItem *_sortMenuItem;
+}
+
+@property (readwrite, atomic) NSArray<NSMenuItem *> *items;
+@property (readwrite, atomic) NSArray<NSMenuItem *> *multipleSelectionItems;
+
+@end
+
+@implementation VLCPlayQueueMenuController
+
+- (instancetype)init
+{
+    self = super init;
+    if (self) {
+        self createMenu;
+        _playQueueController = VLCMain.sharedInstance.playQueueController;
+    }
+    return self;
+}
+
+- (void)createMenu
+{
+    _playMenuItem = NSMenuItem alloc initWithTitle:_NS("Play") action:@selector(play:) keyEquivalent:@"";
+    _playMenuItem.target = self;
+
+    _removeMenuItem = NSMenuItem alloc initWithTitle:_NS("Delete") action:@selector(remove:) keyEquivalent:@"";
+    _removeMenuItem.target = self;
+
+    _revealInFinderMenuItem = NSMenuItem alloc initWithTitle:_NS("Reveal in Finder") action:@selector(revealInFinder:) keyEquivalent:@"";
+    _revealInFinderMenuItem.target = self;
+
+    _informationMenuItem = NSMenuItem alloc initWithTitle:_NS("Information...") action:@selector(showInformationPanel:) keyEquivalent:@"";
+    _informationMenuItem.target = self;
+
+    _addFilesToPlayQueueMenuItem = NSMenuItem alloc initWithTitle:_NS("Add File...") action:@selector(addFilesToPlayQueue:) keyEquivalent:@"";
+    _addFilesToPlayQueueMenuItem.target = self;
+
+    _clearPlayQueueMenuItem = NSMenuItem alloc initWithTitle:_NS("Clear the play queue") action:@selector(clearPlayQueue:) keyEquivalent:@"";
+    _clearPlayQueueMenuItem.target = self;
+
+    _playQueueSortingMenuController = VLCPlayQueueSortingMenuController alloc init;
+    _sortMenuItem = NSMenuItem alloc initWithTitle:_NS("Sort") action:nil keyEquivalent:@"";
+    _sortMenuItem setSubmenu:_playQueueSortingMenuController.playQueueSortingMenu;
+
+    self.items = @
+        _playMenuItem,
+        _removeMenuItem,
+        _revealInFinderMenuItem,
+        _informationMenuItem,
+        NSMenuItem.separatorItem,
+        _addFilesToPlayQueueMenuItem,
+        _clearPlayQueueMenuItem,
+        _sortMenuItem
+    ;
+
+    self.multipleSelectionItems = @
+        _removeMenuItem,
+        NSMenuItem.separatorItem,
+        _addFilesToPlayQueueMenuItem,
+        _clearPlayQueueMenuItem,
+        _sortMenuItem
+    ;
+
+    _playQueueMenu = NSMenu alloc init;
+    _playQueueMenu.itemArray = self.items;
+}
+
+- (void)setPlayQueueTableView:(NSTableView *)playQueueTableView
+{
+    NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
+    if (self.playQueueTableView != nil) {
+        notificationCenter removeObserver:self
+                                      name:NSTableViewSelectionDidChangeNotification
+                                    object:self.playQueueTableView;
+    }
+
+    _playQueueTableView = playQueueTableView;
+    notificationCenter addObserver:self
+                           selector:@selector(tableViewSelectionDidChange:)
+                               name:NSTableViewSelectionDidChangeNotification
+                             object:self.playQueueTableView;
+
+}
+
+- (void)play:(id)sender
+{
+    NSInteger selectedRow = self.playQueueTableView.selectedRow;
+
+    if (selectedRow != -1) {
+        _playQueueController playItemAtIndex:selectedRow;
+    } else {
+        _playQueueController startPlayQueue;
+    }
+}
+
+- (void)remove:(id)sender
+{
+    _playQueueController removeItemsAtIndexes:self.playQueueTableView.selectedRowIndexes;
+}
+
+- (void)showInformationPanel:(id)sender
+{
+    if (!_informationWindowController) {
+        _informationWindowController = VLCInformationWindowController alloc init;
+    }
+
+    NSMutableArray * const inputItems = NSMutableArray.array;
+    NSIndexSet * const selectedIndices = self.playQueueTableView.selectedRowIndexes;
+
+    selectedIndices enumerateIndexesUsingBlock:^(const NSUInteger idx, BOOL * const stop) {
+        VLCPlayQueueItem * const item =
+            self->_playQueueController.playQueueModel playQueueItemAtIndex:idx;
+        if (item == nil) {
+            return;
+        }
+        inputItems addObject:item.inputItem;
+    };
+
+    _informationWindowController.representedInputItems = inputItems.copy;
+    _informationWindowController toggleWindow:sender;
+}
+
+- (void)revealInFinder:(id)sender
+{
+    NSInteger selectedRow = self.playQueueTableView.selectedRow;
+
+    if (selectedRow == -1)
+        return;
+
+    VLCPlayQueueItem *item = _playQueueController.playQueueModel playQueueItemAtIndex:selectedRow;
+    if (item == nil)
+        return;
+
+    NSString *path = item.path;
+    NSWorkspace.sharedWorkspace selectFile:path inFileViewerRootedAtPath:path;
+}
+
+- (void)addFilesToPlayQueue:(id)sender
+{
+    NSInteger selectedRow = self.playQueueTableView.selectedRow;
+
+    VLCMain.sharedInstance open openFileWithAction:^(NSArray *files) {
+        self->_playQueueController addPlayQueueItems:files
+                                           atPosition:selectedRow
+                                        startPlayback:NO;
+    };
+}
+
+- (void)clearPlayQueue:(id)sender
+{
+    _playQueueController clearPlayQueue;
+}
+
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+    if (menuItem == _addFilesToPlayQueueMenuItem) {
+        return YES;
+
+    } else if (menuItem == _clearPlayQueueMenuItem) {
+        return (self.playQueueTableView.numberOfRows > 0);
+
+    } else if (menuItem == _removeMenuItem ||
+               menuItem == _playMenuItem ||
+               menuItem == _informationMenuItem) {
+        return (self.playQueueTableView.numberOfSelectedRows > 0);
+
+    } else if (menuItem == _revealInFinderMenuItem) {
+        return (self.playQueueTableView.numberOfSelectedRows == 1);
+    }
+
+    return NO;
+}
+
+- (void)tableViewSelectionDidChange:(NSNotification *)notification
+{
+    NSTableView * const tableView = notification.object;
+    if (tableView != self.playQueueTableView) {
+        return;
+    }
+
+    const BOOL multipleSelection = tableView.selectedRowIndexes.count > 1;
+    if (multipleSelection) {
+        self.playQueueMenu.itemArray = self.multipleSelectionItems;
+    } else {
+        self.playQueueMenu.itemArray = self.items;
+    }
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueModel.h Added

@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * VLCPlayQueueModel.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Foundation/Foundation.h>
+#import <vlc_playlist.h>
+
+@class VLCPlayQueueController;
+@class VLCPlayQueueItem;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VLCPlayQueueModel : NSObject
+
+@property (readwrite, assign) VLCPlayQueueController *playQueueController;
+@property (readonly) NSUInteger numberOfPlayQueueItems;
+
+- (void)dropExistingData;
+- (VLCPlayQueueItem *)playQueueItemAtIndex:(NSInteger)index;
+- (void)addItems:(NSArray *)array;
+- (void)addItems:(NSArray *)array atIndex:(size_t)index count:(size_t)count;
+- (void)moveItemAtIndex:(size_t)index toTarget:(size_t)target;
+- (void)removeItemsInRange:(NSRange)range;
+- (void)updateItemAtIndex:(size_t)index;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueModel.m Added

@@ -0,0 +1,94 @@
+/*****************************************************************************
+ * VLCPlayQueueModel.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlayQueueModel.h"
+
+#import <vlc_common.h>
+
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueItem.h"
+
+@interface VLCPlayQueueModel ()
+{
+    NSMutableArray *_playQueueArray;
+}
+@end
+
+@implementation VLCPlayQueueModel
+
+- (instancetype)init
+{
+    self = super init;
+    if (self) {
+        _playQueueArray = NSMutableArray alloc init;
+    }
+    return self;
+}
+
+- (NSUInteger)numberOfPlayQueueItems
+{
+    return _playQueueArray.count;
+}
+
+- (void)dropExistingData
+{
+    _playQueueArray removeAllObjects;
+}
+
+- (VLCPlayQueueItem *)playQueueItemAtIndex:(NSInteger)index
+{
+    if (index < 0 || index > _playQueueArray.count) {
+        return nil;
+    }
+    
+    return _playQueueArrayindex;
+}
+
+- (void)addItems:(NSArray *)array
+{
+    _playQueueArray addObjectsFromArray:array;
+}
+
+- (void)addItems:(NSArray *)array atIndex:(size_t)index count:(size_t)count
+{
+    _playQueueArray insertObjects:array atIndexes:NSIndexSet indexSetWithIndexesInRange:NSMakeRange(index, count);
+}
+
+- (void)moveItemAtIndex:(size_t)index toTarget:(size_t)target
+{
+    VLCPlayQueueItem * const item = _playQueueArray objectAtIndex:index;
+    _playQueueArray removeObjectAtIndex:index;
+    _playQueueArray insertObject:item atIndex:target;
+}
+
+- (void)removeItemsInRange:(NSRange)range
+{
+    _playQueueArray removeObjectsInRange:range;
+}
+
+- (void)updateItemAtIndex:(size_t)index
+{
+    VLCPlayQueueItem * const item = _playQueueArrayindex;
+    item updateRepresentation;
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueSortingMenuController.h Added

@@ -0,0 +1,33 @@
+/*****************************************************************************
+ * VLCPlayQueueSortingMenuController.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2002-2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan dot org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VLCPlayQueueSortingMenuController : NSObject
+
+@property (readonly) NSMenu *playQueueSortingMenu;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueSortingMenuController.m Added

@@ -0,0 +1,131 @@
+/*****************************************************************************
+ * VLCPlayQueueSortingMenuController.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2002-2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan dot org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlayQueueSortingMenuController.h"
+
+#import "extensions/NSString+Helpers.h"
+#import "main/VLCMain.h"
+#import "playqueue/VLCPlayQueueController.h"
+
+@interface VLCPlayQueueSortingMenuController () <NSMenuDelegate>
+{
+    VLCPlayQueueController *_playQueueController;
+}
+@end
+
+@implementation VLCPlayQueueSortingMenuController
+
+- (instancetype)init
+{
+    self = super init;
+    if (self) {
+        self createMenu;
+        _playQueueController = VLCMain.sharedInstance.playQueueController;
+    }
+    return self;
+}
+
+- (void)createMenu
+{
+    _playQueueSortingMenu = NSMenu alloc init;
+
+    NSArray *titles = @_NS("Title"),
+                        _NS("Duration"),
+                        _NS("Artist"),
+                        _NS("Album"),
+                        _NS("Album Artist"),
+                        _NS("Genre"),
+                        _NS("Date"),
+                        _NS("Track Number"),
+                        _NS("Disc Number"),
+                        _NS("URL"),
+                        _NS("Rating");
+    NSUInteger count = titles.count;
+    for (NSUInteger x = 0; x < count; x++) {
+        NSMenuItem *menuItem = NSMenuItem alloc initWithTitle:titlesx action:@selector(selectSortKey:) keyEquivalent:@"";
+        menuItem.target = self;
+        menuItem.tag = x;
+        _playQueueSortingMenu addItem:menuItem;
+    }
+
+    _playQueueSortingMenu addItem:NSMenuItem separatorItem;
+
+    titles = @_NS("Ascending"),
+               _NS("Descending");
+    count = titles.count;
+    for (NSUInteger x = 0; x < count; x++) {
+        NSMenuItem *menuItem = NSMenuItem alloc initWithTitle:titlesx action:@selector(selectSortOrder:) keyEquivalent:@"";
+        menuItem.target = self;
+        menuItem.tag = x + 100;
+        _playQueueSortingMenu addItem:menuItem;
+    }
+
+    _playQueueSortingMenu.delegate = self;
+}
+
+- (void)menuNeedsUpdate:(NSMenu *)menu
+{
+    if (_playQueueController.unsorted) {
+        return;
+    }
+    NSInteger count = _playQueueSortingMenu.numberOfItems;
+    for (NSInteger x = 0; x < count; x++) {
+        NSMenuItem *menuItem = _playQueueSortingMenu itemAtIndex:x;
+        menuItem.state = NSOffState;
+    }
+
+    NSMenuItem *menuItem = _playQueueSortingMenu itemWithTag:_playQueueController.lastSortKey;
+    menuItem.state = NSOnState;
+
+    menuItem = _playQueueSortingMenu itemWithTag:_playQueueController.lastSortOrder + 100;
+    menuItem.state = NSOnState;
+}
+
+- (void)selectSortKey:(id)sender
+{
+    enum vlc_playlist_sort_key sortKey = (enum vlc_playlist_sort_key)sender tag;
+    enum vlc_playlist_sort_order sortOrder;
+    if (_playQueueController.unsorted) {
+        /* we don't have an order and the user can only do a single selection - pick the most popular */
+        sortOrder = VLC_PLAYLIST_SORT_ORDER_ASCENDING;
+    } else {
+        sortOrder = _playQueueController.lastSortOrder;
+    }
+
+    _playQueueController sortByKey:sortKey andOrder:sortOrder;
+}
+
+- (void)selectSortOrder:(id)sender
+{
+    enum vlc_playlist_sort_key sortKey;
+    enum vlc_playlist_sort_order sortOrder = (enum vlc_playlist_sort_order)(sender tag - 100);
+    if (_playQueueController.unsorted) {
+        /* we don't have a key and the user can only do a single selection - pick the most popular */
+        sortKey = VLC_PLAYLIST_SORT_KEY_TITLE;
+    } else {
+        sortKey = _playQueueController.lastSortKey;
+    }
+
+    _playQueueController sortByKey:sortKey andOrder:sortOrder;
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueTableCellView.h Added

@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * VLCPlayQueueTableViewCell.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+@class VLCImageView;
+@class VLCPlayQueueItem;
+
+NS_ASSUME_NONNULL_BEGIN
+
+
+@interface VLCPlayQueueTableCellView : NSTableCellView
+
+@property (readwrite, assign, nonatomic) VLCPlayQueueItem *representedPlayQueueItem;
+@property (readwrite, nonatomic) BOOL representsCurrentPlayQueueItem;
+
+@property (readwrite, assign) IBOutlet NSTextField *artistTextField;
+@property (readwrite, assign) IBOutlet NSTextField *secondaryMediaTitleTextField;
+@property (readwrite, assign) IBOutlet NSTextField *mediaTitleTextField;
+@property (readwrite, assign) IBOutlet NSTextField *durationTextField;
+@property (readwrite, assign) IBOutlet VLCImageView *mediaImageView;
+@property (readwrite, assign) IBOutlet NSTextField *audioMediaTypeIndicator;
+@property (readwrite, assign) IBOutlet VLCImageView *audioArtworkImageView;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueTableCellView.m Added

@@ -0,0 +1,127 @@
+/*****************************************************************************
+ * VLCPlayQueueTableViewCell.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlayQueueTableCellView.h"
+
+#import "extensions/NSColor+VLCAdditions.h"
+#import "extensions/NSFont+VLCAdditions.h"
+#import "extensions/NSImage+VLCAdditions.h"
+#import "extensions/NSString+Helpers.h"
+
+#import "library/VLCLibraryImageCache.h"
+
+#import "main/VLCMain.h"
+
+#import "playqueue/VLCPlayQueueItem.h"
+
+#import "views/VLCImageView.h"
+
+#import <vlc_configuration.h>
+
+@implementation VLCPlayQueueTableCellView
+
+- (void)dealloc
+{
+    NSNotificationCenter.defaultCenter removeObserver:self;
+}
+
+- (void)setRepresentsCurrentPlayQueueItem:(BOOL)representsCurrentPlayQueueItem
+{
+    _representsCurrentPlayQueueItem = representsCurrentPlayQueueItem;
+
+    self updateFonts;
+    self updateColouredElements;
+}
+
+- (void)updateFonts
+{
+    NSFont * const displayedFont = _representsCurrentPlayQueueItem ?
+        NSFont boldSystemFontOfSize:NSFont.systemFontSize :
+        NSFont systemFontOfSize:NSFont.systemFontSize;
+
+    NSFont * const sublineDisplayedFont = _representsCurrentPlayQueueItem ?
+        NSFont boldSystemFontOfSize:NSFont.smallSystemFontSize :
+        NSFont systemFontOfSize:NSFont.smallSystemFontSize;
+
+    self.mediaTitleTextField.font = displayedFont;
+    self.secondaryMediaTitleTextField.font = displayedFont;
+    self.durationTextField.font = displayedFont;
+    self.artistTextField.font = sublineDisplayedFont;
+}
+
+- (void)updateColouredElements
+{
+
+    self.audioMediaTypeIndicator.textColor = _representsCurrentPlayQueueItem ?
+        NSColor.labelColor :
+        NSColor.secondaryLabelColor;
+}
+
+- (void)setRepresentedPlayQueueItem:(VLCPlayQueueItem *)item
+{
+    _representedPlayQueueItem = item;
+
+    __weak typeof(self) weakSelf = self;
+    VLCLibraryImageCache thumbnailForPlayQueueItem:item withCompletion:^(NSImage * const thumbnail) {
+        if (!weakSelf || item != weakSelf.representedPlayQueueItem) {
+            return;
+        }
+        weakSelf.audioArtworkImageView.image = thumbnail;
+        weakSelf.mediaImageView.image = thumbnail;
+    };
+
+    const BOOL validArtistString = item.artistName && item.artistName.length > 0;
+    const BOOL validAlbumString = item.albumName && item.albumName.length > 0;
+
+    NSString *songDetailString = @"";
+
+    if (validArtistString && validAlbumString) {
+        songDetailString = NSString stringWithFormat:@"%@ · %@", item.artistName, item.albumName;
+    } else if (validArtistString) {
+        songDetailString = item.artistName;
+    }
+
+    if (songDetailString && !songDetailString isEqualToString:@"") {
+        self.mediaTitleTextField.hidden = YES;
+        self.secondaryMediaTitleTextField.hidden = NO;
+        self.artistTextField.hidden = NO;
+        self.secondaryMediaTitleTextField.stringValue = item.title;
+        self.artistTextField.stringValue = songDetailString;
+        self.audioMediaTypeIndicator.hidden = NO;
+
+        self.audioArtworkImageView.hidden = NO;
+        self.mediaImageView.hidden = YES;
+    } else {
+        self.mediaTitleTextField.hidden = NO;
+        self.secondaryMediaTitleTextField.hidden = YES;
+        self.artistTextField.hidden = YES;
+        self.mediaTitleTextField.stringValue = item.title;
+        self.audioMediaTypeIndicator.hidden = YES;
+
+        self.audioArtworkImageView.hidden = YES;
+        self.mediaImageView.hidden = NO;
+    }
+
+    self.durationTextField.stringValue = NSString stringWithTimeFromTicks:item.duration;
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueTableView.h Added

@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * VLCPlayQueueTableView.h: table view subclass for the play queue
+ *****************************************************************************
+ * Copyright (C) 2003-2019 VLC authors and VideoLAN
+ *
+ * Authors: Derk-Jan Hartman <hartman at videola/n dot org>
+ *          Benjamin Pracht <bigben at videolab dot org>
+ *          Felix Paul Kühne <fkuehne at videolan dot org>
+ *          David Fuhrmann <dfuhrmann # videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VLCPlayQueueTableView : NSTableView
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayQueueTableView.m Added

@@ -0,0 +1,106 @@
+/*****************************************************************************
+ * VLCPlayQueueTableView.m: table view subclass for the play queue
+ *****************************************************************************
+ * Copyright (C) 2003-2019 VLC authors and VideoLAN
+ *
+ * Authors: Derk-Jan Hartman <hartman at videola/n dot org>
+ *          Benjamin Pracht <bigben at videolab dot org>
+ *          Felix Paul Kühne <fkuehne at videolan dot org>
+ *          David Fuhrmann <dfuhrmann # videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlayQueueTableView.h"
+
+#import "main/VLCMain.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueMenuController.h"
+
+@interface VLCPlayQueueTableView ()
+
+@property (readonly, atomic) VLCPlayQueueMenuController *menuController;
+
+@end
+
+@implementation VLCPlayQueueTableView
+
+- (NSMenu *)menuForEvent:(NSEvent *)event
+{
+    if (self.menuController == nil) {
+        _menuController = VLCPlayQueueMenuController alloc init;
+        self.menuController.playQueueTableView = self;
+    }
+
+    const NSPoint pt = self convertPoint: event locationInWindow fromView: nil;
+    const NSInteger row = self rowAtPoint:pt;
+    if (row != -1 && !self selectedRowIndexes containsIndex: row)
+        self selectRowIndexes:NSIndexSet indexSetWithIndex:row byExtendingSelection:NO;
+
+    return self.menuController.playQueueMenu;
+}
+
+- (void)keyDown:(NSEvent *)event
+{
+    unichar key = 0;
+
+    if (event characters length) {
+        /* we evaluate the first key only */
+        key = event characters characterAtIndex: 0;
+    }
+
+    size_t indexOfSelectedItem = self.selectedRow;
+    NSIndexSet *selectedIndexes = self selectedRowIndexes;
+
+    switch(key) {
+        case NSDeleteCharacter:
+        case NSDeleteFunctionKey:
+        case NSDeleteCharFunctionKey:
+        case NSBackspaceCharacter:
+        {
+            VLCPlayQueueController *playQueueController = VLCMain.sharedInstance.playQueueController;
+            playQueueController removeItemsAtIndexes:selectedIndexes;
+            break;
+        }
+
+        case NSEnterCharacter:
+        case NSCarriageReturnCharacter:
+            VLCMain.sharedInstance.playQueueController playItemAtIndex:indexOfSelectedItem;
+            break;
+
+        default:
+            super keyDown: event;
+            break;
+    }
+}
+
+- (BOOL)acceptsFirstResponder
+{
+    return YES;
+}
+
+- (BOOL)becomeFirstResponder
+{
+    self setNeedsDisplay:YES;
+    return YES;
+}
+
+- (BOOL)resignFirstResponder
+{
+    self setNeedsDisplay:YES;
+    return YES;
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlaybackContinuityController.h Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlaybackContinuityController.m Added

@@ -0,0 +1,343 @@
+/*****************************************************************************
+ * VLCPlaybackContinuityController.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2015-2020 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan.org>
+ *          David Fuhrmann <dfuhrmann # videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlaybackContinuityController.h"
+
+#import "extensions/NSString+Helpers.h"
+#import "main/VLCMain.h"
+#import "panels/dialogs/VLCResumeDialogController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
+#import "library/VLCInputItem.h"
+#import "library/VLCLibraryDataTypes.h"
+
+#import <vlc_configuration.h>
+
+static const int64_t SecInMillisecs = 1000;
+static const int64_t MinInMillisecs = SecInMillisecs * 60;
+static const int64_t MinimumDuration = 3 * MinInMillisecs;
+static const float MinimumStorePercent = 0.05;
+static const float MaximumStorePercent = 0.95;
+static const int64_t MinimumStoreTime = MinInMillisecs;
+static const int64_t MinimumStoreRemainingTime = MinInMillisecs;
+static NSString *VLCRecentlyPlayedMediaKey = @"recentlyPlayedMedia";
+static NSString *VLCRecentlyPlayedMediaListKey = @"recentlyPlayedMediaList";
+
+@interface VLCPlaybackContinuityController()
+{
+    VLCInputItem *_currentInput;
+    VLCResumeDialogController *_resumeDialogController;
+}
+@end
+
+@implementation VLCPlaybackContinuityController
+
++ (void)initialize
+{
+    NSUserDefaults *defaults = NSUserDefaults standardUserDefaults;
+    NSDictionary *appDefaults = NSDictionary dictionaryWithObjectsAndKeys:
+                                 NSArray array, VLCRecentlyPlayedMediaListKey,
+                                 NSDictionary dictionary, VLCRecentlyPlayedMediaKey, nil;
+
+    defaults registerDefaults:appDefaults;
+}
+
+- (id)init
+{
+    self = super init;
+    if (self) {
+        NSNotificationCenter *notificationCenter = NSNotificationCenter.defaultCenter;
+        notificationCenter addObserver:self
+                               selector:@selector(inputItemChanged:)
+                                   name:VLCPlayerCurrentMediaItemChanged
+                                 object:nil;
+        notificationCenter addObserver:self
+                               selector:@selector(playbackStatusUpdated:)
+                                   name:VLCPlayerStateChanged
+                                 object:nil;
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    msg_Dbg(getIntf(), "Deinitializing input manager");
+
+    NSNotificationCenter.defaultCenter removeObserver:self;
+
+    if (_currentInput) {
+        /* continue playback where you left off */
+        self storePlaybackPositionForItem:_currentInput player:VLCMain.sharedInstance.playQueueController.playerController;
+    }
+}
+
+- (void)inputItemChanged:(NSNotification *)aNotification
+{
+    VLCPlayerController * const playerController = VLCMain.sharedInstance.playQueueController.playerController;
+
+    // Cancel pending resume dialogs
+    _resumeDialogController cancel;
+
+    // object is hold here and released then it is dead
+    _currentInput = playerController.currentMedia;
+    if (_currentInput) {
+        self continuePlaybackWhereYouLeftOff:_currentInput
+                                       player:playerController;
+    }
+}
+
+- (void)playbackStatusUpdated:(NSNotification *)aNotification
+{
+    // On shutdown, input might not be dead yet. Cleanup actions like itunes playback
+    // and playback positon are done in different code paths (dealloc and appWillTerminate:).
+    if (VLCMain.sharedInstance isTerminating) {
+        return;
+    }
+
+    VLCPlayerController *playerController = aNotification.object;
+    enum vlc_player_state playerState = playerController playerState;
+
+    if (playerState == VLC_PLAYER_STATE_STOPPED || playerState == VLC_PLAYER_STATE_STOPPING) {
+        /* continue playback where you left off */
+        if (_currentInput)
+            self storePlaybackPositionForItem:_currentInput player:playerController;
+    }
+}
+
+- (BOOL)isValidResumeItem:(VLCInputItem *)inputItem
+{
+    NSString *urlString = inputItem.MRL;
+
+    if (urlString isEqualToString:@"")
+        return NO;
+
+    NSURL *url = NSURL URLWithString:urlString;
+
+    if (!url isFileURL)
+        return NO;
+
+    BOOL isDir = false;
+    if (!NSFileManager defaultManager fileExistsAtPath:url path isDirectory:&isDir)
+        return NO;
+
+    if (isDir)
+        return NO;
+
+    return YES;
+}
+
+- (void)continuePlaybackWhereYouLeftOff:(VLCInputItem *)inputItem player:(VLCPlayerController *)playerController
+{
+    int settingValue = (int)config_GetInt("macosx-continue-playback");
+    if (settingValue == 2) // never resume
+        return;
+
+    if (!inputItem)
+        return;
+
+    /* allow the user to over-write the start/stop/run-time */
+    NSArray<NSString *> * const options = inputItem.options;
+    if (options == nil) {
+        return;
+    }
+
+    const NSUInteger runtimeOption = options indexOfObjectPassingTest:^BOOL(NSString * const obj, NSUInteger, BOOL *){
+        return obj hasPrefix:@"start-time" || obj hasPrefix:@"stop-time";
+    };
+
+    if (runtimeOption != NSNotFound) {
+        return;
+    }
+
+    /* check for file existence before resuming */
+    if (!self isValidResumeItem:inputItem)
+        return;
+
+    NSURL *url = NSURL URLWithString:inputItem.MRL;
+    if (!url)
+        return;
+
+    VLCMediaLibraryMediaItem * const libraryMediaItem = VLCMediaLibraryMediaItem mediaItemForURL:url;
+    if (!libraryMediaItem) {
+        // input item isn't part of the library
+        self resumeLegacyPlaybackPositionForInputItem:inputItem
+                                                   ask:(settingValue == 0)
+                                                player:playerController;
+        return;
+    }
+
+    self resumePlaybackPositionForLibraryMediaItem:libraryMediaItem
+                                                ask:(settingValue == 0)
+                                             player:playerController;
+}
+
+- (void)resumePlaybackPositionForLibraryMediaItem:(VLCMediaLibraryMediaItem *)libraryMediaItem
+                                              ask:(BOOL)ask
+                                           player:(VLCPlayerController *)playerController
+{
+    NSParameterAssert(libraryMediaItem != nil);
+
+    const float lastPlaybackPosition = libraryMediaItem.progress;
+    const int64_t duration = playerController.durationOfCurrentMediaItem;
+    const BOOL isAlbumTrack = libraryMediaItem.mediaSubType == VLC_ML_MEDIA_SUBTYPE_ALBUMTRACK;
+
+    if (lastPlaybackPosition < MinimumStorePercent || duration < MinimumDuration || isAlbumTrack) {
+        return;
+    }
+
+    CompletionBlock completionBlock = ^(enum ResumeResult result) {
+        if (result == RESUME_RESTART)
+            return;
+
+        msg_Dbg(getIntf(), "continuing playback at %0.2f", lastPlaybackPosition);
+        playerController setPositionPrecise:lastPlaybackPosition;
+    };
+
+    if (!ask) { // always
+        completionBlock(RESUME_NOW);
+        return;
+    }
+
+    if (!_resumeDialogController) {
+        _resumeDialogController = VLCResumeDialogController alloc init;
+    }
+
+    _resumeDialogController showWindowWithItem:libraryMediaItem.inputItem
+                               withLastPosition:(lastPlaybackPosition * duration) / 1000
+                                completionBlock:completionBlock;
+}
+
+- (void)resumeLegacyPlaybackPositionForInputItem:(VLCInputItem *)inputItem
+                                             ask:(BOOL)ask
+                                          player:(VLCPlayerController *)playerController
+{
+    NSDictionary *recentlyPlayedFiles = NSUserDefaults standardUserDefaults objectForKey:VLCRecentlyPlayedMediaKey;
+    if (!recentlyPlayedFiles)
+        return;
+
+    NSNumber *lastPosition = recentlyPlayedFiles objectForKey:inputItem.MRL;
+    if (!lastPosition || lastPosition.intValue <= 0)
+        return;
+
+    CompletionBlock completionBlock = ^(enum ResumeResult result) {
+        if (result == RESUME_RESTART)
+            return;
+
+        vlc_tick_t lastPos = vlc_tick_from_sec( lastPosition.intValue );
+        msg_Dbg(getIntf(), "continuing playback at %lld", lastPos);
+
+        playerController setTimePrecise: lastPos;
+    };
+
+    if (!ask) { // always
+        completionBlock(RESUME_NOW);
+        return;
+    }
+
+    if (!_resumeDialogController) {
+        _resumeDialogController = VLCResumeDialogController alloc init;
+    }
+
+    _resumeDialogController showWindowWithItem:inputItem
+                               withLastPosition:lastPosition.intValue
+                                completionBlock:completionBlock;
+}
+
+BOOL ShouldStorePlaybackPosition(float position, int64_t duration)
+{
+    int64_t positionTime = position * duration;
+    int64_t remainingTime = duration - positionTime;
+
+    if (duration < MinimumDuration) {
+        return NO;
+    }
+
+    if (position < MinimumStorePercent && positionTime < MinimumStoreTime) {
+        return NO;
+    }
+
+    if (position > MaximumStorePercent && remainingTime < MinimumStoreRemainingTime) {
+        return NO;
+    }
+
+    return YES;
+}
+
+- (void)storePlaybackPositionForItem:(VLCInputItem *)inputItem
+                              player:(VLCPlayerController *)playerController
+{
+    if (!var_InheritBool(getIntf(), "macosx-recentitems"))
+        return;
+
+    if (!inputItem)
+        return;
+
+    if (!self isValidResumeItem:inputItem)
+        return;
+
+    NSURL *url = NSURL URLWithString:inputItem.MRL;
+    if (!url)
+        return;
+
+    VLCMediaLibraryMediaItem *libraryMediaItem = VLCMediaLibraryMediaItem mediaItemForURL:url;
+    if (!libraryMediaItem) {
+        // input item isn't part of the library
+        self storeLegacyPlaybackPositionForInputItem:inputItem withPlayer:playerController;
+    }
+}
+
+- (void)storeLegacyPlaybackPositionForInputItem:(VLCInputItem *)inputItem
+                                     withPlayer:(VLCPlayerController *)playerController
+{
+    NSUserDefaults *defaults = NSUserDefaults standardUserDefaults;
+    NSMutableDictionary *mutDict = NSMutableDictionary alloc initWithDictionary:defaults objectForKey:VLCRecentlyPlayedMediaKey;
+
+    float relativePos = playerController.position;
+    long long pos = SEC_FROM_VLC_TICK(playerController.time);
+    long long dur = SEC_FROM_VLC_TICK(inputItem.duration);
+
+    NSMutableArray *mediaList = defaults objectForKey:VLCRecentlyPlayedMediaListKey mutableCopy;
+    NSString *mrl = inputItem.MRL;
+
+    if (ShouldStorePlaybackPosition(relativePos, dur*1000)) {
+        msg_Dbg(getIntf(), "Store current playback position of %f", relativePos);
+        mutDict setObject:NSNumber numberWithInteger:pos forKey:inputItem.MRL;
+
+        mediaList removeObject:mrl;
+        mediaList addObject:mrl;
+        NSUInteger mediaListCount = mediaList.count;
+        if (mediaListCount > 30) {
+            for (NSUInteger x = 0; x < mediaListCount - 30; x++) {
+                mutDict removeObjectForKey:mediaList firstObject;
+                mediaList removeObjectAtIndex:0;
+            }
+        }
+    } else {
+        mutDict removeObjectForKey:mrl;
+        mediaList removeObject:mrl;
+    }
+    defaults setObject:mutDict forKey:VLCRecentlyPlayedMediaKey;
+    defaults setObject:mediaList forKey:VLCRecentlyPlayedMediaListKey;
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayerChapter.h Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayerChapter.m Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayerController.h Added

@@ -0,0 +1,933 @@
+/*****************************************************************************
+ * VLCPlayerController.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Foundation/Foundation.h>
+#import <vlc_player.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class VLCInputStats;
+@class VLCTrackMetaData;
+@class VLCPlayerTitle;
+@class VLCProgramMetaData;
+@class VLCInputItem;
+
+extern NSString *VLCPlayerElementaryStreamID;
+extern NSString *VLCTick;
+
+/**
+ * Listen to VLCPlayerCurrentMediaItemChanged to notified if the current media item changes for the player
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerCurrentMediaItemChanged;
+
+/**
+ * Listen to VLCPlayerMetadataChangedForCurrentMedia to be notified if metadata such as title, artwork, etc change
+ * for the media item currently played
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerMetadataChangedForCurrentMedia;
+
+/**
+ * Listen to VLCPlayerStateChanged to be notified if the player's state changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerStateChanged;
+
+/**
+ * Listen to VLCPlayerErrorChanged to be notified if the player's error expression changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerErrorChanged;
+
+extern NSString *VLCPlayerBufferFill;
+/**
+ * Listen to VLCPlayerBufferChanged to be notified if the player's buffer value changes
+ * @note the affected player object will be the object of the notification
+ * @note the userInfo dictionary will have the float value indicating the fill state as percentage from 0.0 to 1.0
+ * for key VLCPlayerBufferFill */
+extern NSString *VLCPlayerBufferChanged;
+
+/**
+ * Listen to VLCPlayerRateChanged to be notified if the player's playback rate changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerRateChanged;
+
+/**
+ * Listen to VLCPlayerCapabilitiesChanged to be notified if the player's capabilities change
+ * Those are: seekable, rewindable, pausable, recordable, rateChangable
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerCapabilitiesChanged;
+
+/**
+ * Listen to VLCPlayerTimeAndPositionChanged to be notified if playback position and/or time change
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerTimeAndPositionChanged;
+
+/**
+ * Listen to VLCPlayerLengthChanged to be notified if the length of the current media changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerLengthChanged;
+
+/**
+ * Listen to VLCPlayerTitleSelectionChanged to be notified if the selected title of the current media changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerTitleSelectionChanged;
+
+/**
+ * Listen to VLCPlayerTitleListChanged to be notified if the list of titles of the current media changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerTitleListChanged;
+
+/**
+ * Listen to VLCPlayerChapterSelectionChanged to be notified if the selected chapter of the current title changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerChapterSelectionChanged;
+
+/**
+ * Listen to VLCPlayerProgramSelectionChanged to be notified if the selected program of the current media changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerProgramSelectionChanged;
+
+/**
+ * Listen to VLCPlayerProgramListChanged to be notified if the list of available programs of the current media changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerProgramListChanged;
+
+/**
+ * Listen to VLCPlayerABLoopStateChanged to be notified if the A→B loop state changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerABLoopStateChanged;
+
+/**
+ * Listen to VLCPlayerTeletextMenuAvailable to be notified if a teletext menu becomes (un-)available
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerTeletextMenuAvailable;
+
+/**
+ * Listen to VLCPlayerTeletextEnabled to be notified if teletext becomes enabled or disabled
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerTeletextEnabled;
+
+/**
+ * Listen to VLCPlayerTeletextPageChanged to be notified if the teletext page changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerTeletextPageChanged;
+
+/**
+ * Listen to VLCPlayerTeletextTransparencyChanged to be notified if the teletext transparency changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerTeletextTransparencyChanged;
+
+/**
+ * Listen to VLCPlayerAudioDelayChanged to be notified if the audio delay of the current media changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerAudioDelayChanged;
+
+/**
+ * Listen to VLCPlayerSubtitlesDelayChanged to be notified if the subtitles delay of the current media changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerSubtitlesDelayChanged;
+
+/**
+ * Listen to VLCPlayerDelayChangedForSpecificElementaryStream to be notified if the delay of a specific elementary stream changes
+ * @note the affected player object will be the object of the notification
+ * @return the notification's userInfo dictionary will hold key/value pairs for VLCPlayerElementaryStreamID and VLCTick to describe the changes
+ */
+extern NSString *VLCPlayerDelayChangedForSpecificElementaryStream;
+
+/**
+ * Listen to VLCPlayerSubtitlesFPSChanged to be notified if the subtitles FPS of the current media changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerSubtitlesFPSChanged;
+
+/**
+ * Listen to VLCPlayerRecordingChanged to be notified if the recording state of the current media changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerRecordingChanged;
+
+/**
+ * Listen to VLCPlayerRendererChanged to be notified if the renderer (such as a Chromecast device) changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerRendererChanged;
+
+extern NSString *VLCPlayerInputStats;
+/**
+ * Listen to VLCPlayerStatisticsUpdated to be notified if the playback statistics state of the current media update
+ * @note the affected player object will be the object of the notification
+ * @note the userInfo dictionary will have an instance of VLCInputStats for key VLCPlayerInputStats representing the new state
+ */
+extern NSString *VLCPlayerStatisticsUpdated;
+
+/**
+ * Listen to VLCPlayerTrackListChanged to be notified of the list of audio/video/SPU tracks changes for the current media
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerTrackListChanged;
+
+/**
+ * Listen to VLCPlayerTrackSelectionChanged to be notified if a selected audio/video/SPU track changes for the current media
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerTrackSelectionChanged;
+
+/**
+ * Listen to VLCPlayerFullscreenChanged to be notified whether the fullscreen state of the video output changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerFullscreenChanged;
+
+extern NSString *VLCPlayerPictureInPictureChanged;
+
+/**
+ * Listen to VLCPlayerListOfVideoOutputThreadsChanged to be notified when a video output thread was added or removed
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerListOfVideoOutputThreadsChanged;
+
+/**
+ * Listen to VLCPlayerWallpaperModeChanged to be notified whether the fullscreen state of the video output changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerWallpaperModeChanged;
+
+/**
+ * Listen to VLCPlayerVolumeChanged to be notified whether the audio output volume changes
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerVolumeChanged;
+
+/**
+ * Listen to VLCPlayerMuteChanged to be notified whether the audio output is muted or not
+ * @note the affected player object will be the object of the notification
+ */
+extern NSString *VLCPlayerMuteChanged;
+
+extern const CGFloat VLCVolumeMaximum;
+extern const CGFloat VLCVolumeDefault;
+
+@interface VLCPlayerController : NSObject
+
+- (instancetype)initWithPlayer:(vlc_player_t *)player;
+
+/**
+ * Start playback of the current media
+ * @return VLC_SUCCESS on success, otherwise a VLC error
+ */
+- (int)start;
+
+/**
+ * Request to start playback in paused state
+ * @param yes if you want to start in paused state, no if you want to cancel your previous request
+ */
+- (void)startInPausedState:(BOOL)startPaused;
+
+/**
+ * Pause the current playback
+ */
+- (void)pause;
+
+/**
+ * Resume the current playback
+ */
+- (void)resume;
+
+/**
+ * Convenience method to either start or pause playback
+ */
+- (void)togglePlayPause;
+
+/**
+ * Stop the current playback
+ */
+- (void)stop;
+
+/**
+ * the current status of the A→B loop
+ * It will be A if A is set, B if A _and_ B are set or none if there is none
+ * @note listen to VLCPlayerABLoopStateChanged for changes to this property
+ */
+@property (readonly) enum vlc_player_abloop abLoopState;
+@property (readonly) vlc_tick_t aLoopTime;
+@property (readonly) vlc_tick_t bLoopTime;
+@property (readonly) float aLoopPosition;
+@property (readonly) float bLoopPosition;
+
+/**
+ * set the A→B loop
+ * this function will need to be called twice to set the A and the B point
+ * @note VLC core will automatically pick the current time stamp, so there is no parameter to this method
+ * @return VLC_SUCCESS or a VLC error code
+ */
+- (int)setABLoop;
+
+/**
+ * disable the A→B loop
+ * @return VLC_SUCCESS or a VLC error code
+ */
+- (int)disableABLoop;
+
+/**
+ * Move on to the next video frame and pause
+ * @warning this relies on a gross hack in the core and will work for 20 consecutive frames maximum only
+ */
+- (void)nextVideoFrame;
+
+/**
+ * get the current media item
+ * @return the current media item, NULL if none
+ * @note it is the receiver's obligation to release the input item
+ */
+@property (readonly, nullable) VLCInputItem * currentMedia;
+
+/**
+ * returns the duration of the current media in vlc ticks
+ */
+@property (readonly) vlc_tick_t durationOfCurrentMediaItem;
+
+/**
+ * returns the URL of the current media or NULL if there is none
+ */
+@property (readonly, copy, nullable) NSURL *URLOfCurrentMediaItem;
+
+/**
+ * returns the name of the current media or NULL if there is none
+ */
+@property (readonly, copy, nullable) NSString *nameOfCurrentMediaItem;
+
+/**
+ * the current player state
+ * @return a value according to the vlc_player_state enum
+ * @note listen to VLCPlayerStateChanged to be notified about changes to this property
+ */
+@property (readonly) enum vlc_player_state playerState;
+
+/**
+ * the current error value
+ * @return a value according to the vlc_player_error enum
+ * @note listen to VLCPlayerErrorChanged to be notified about changes to this property
+ */
+@property (readonly) enum vlc_player_error error;
+
+/**
+ * the current buffer state
+ * @return a float ranging from 0.0 to 1.0 indicating the buffer fill state as percentage
+ * @note listen to VLCPlayerBufferChanged to be notified about changes to this property
+ */
+@property (readonly) float bufferFill;
+
+/**
+ * the current playback rate
+ * @return a float larger than 0.0 indicating the playback rate in multiples
+ * @note 1.0 defines playback at the default rate, <1.0 will slow things, >1.0 will be faster
+ */
+@property (readwrite, nonatomic) float playbackRate;
+
+/**
+ * helper function to increment the playback rate
+ */
+- (void)incrementPlaybackRate;
+/**
+ * helper function to decrement the playback rate
+ */
+- (void)decrementPlaybackRate;
+
+/**
+ * is the currently playing input seekable?
+ * @return a BOOL value indicating whether the current input is seekable
+ * @note listen to VLCPlayerCapabilitiesChanged to be notified about changes to this property
+ */
+@property (readonly) BOOL seekable;
+
+/**
+ * is the currently playing input rewindable?
+ * @return a BOOL value indicating whether the current input is rewindable
+ * @note listen to VLCPlayerCapabilitiesChanged to be notified about changes to this property
+ */
+@property (readonly) BOOL rewindable;
+
+/**
+ * is the currently playing input pausable?
+ * @return a BOOL value indicating whether the current input can be paused
+ * @note listen to VLCPlayerCapabilitiesChanged to be notified about changes to this property
+ */
+@property (readonly) BOOL pausable;
+
+/**
+ * is the currently playing input recordable?
+ * @return a BOOL value indicating whether the current input can be recorded
+ * @note listen to VLCPlayerCapabilitiesChanged to be notified about changes to this property
+ */
+@property (readonly) BOOL recordable;
+
+/**
+ * is the currently playing input rateChangable?
+ * @return a BOOL value indicating whether the playback rate can be changed for the current input
+ * @note listen to VLCPlayerCapabilitiesChanged to be notified about changes to this property
+ */
+@property (readonly) BOOL rateChangable;
+
+/**
+ * the time of the currently playing media
+ * @return a valid time or VLC_TICK_INVALID (if no media is set, the media
+ * doesn't have any time, if playback is not yet started or in case of error)
+ * @note A started and playing media doesn't have necessarily a valid time.
+ * @note listen to VLCPlayerTimeAndPositionChanged to be notified about changes to this property
+ */
+@property (readonly) vlc_tick_t time;
+
+/**
+ * set the playback position in time for the currently playing media
+ * @note this methods prefers speed in seeking over precision
+ * @note This method can be called before starting to set a starting position.
+ */
+- (void)setTimeFast:(vlc_tick_t)time;
+
+/**
+ * set the playback position in time for the currently playing media
+ * @note this methods prefers precision in seeking over speed
+ * @note This method can be called before starting to set a starting position.
+ */
+- (void)setTimePrecise:(vlc_tick_t)time;
+
+/**
+ * the time of the currently playing media
+ * @return a valid time or VLC_TICK_INVALID (if no media is set, the media
+ * doesn't have any time, if playback is not yet started or in case of error)
+ * @note A started and playing media doesn't have necessarily a valid time.
+ * @note listen to VLCPlayerTimeAndPositionChanged to be notified about changes to this property
+ */
+@property (readonly) float position;
+
+/**
+ * set the playback position as a percentage (range 0.0 to 1.0) for the currently playing media
+ * @note this methods prefers speed in seeking over precision
+ * @note This method can be called before starting to set a starting position.
+ */
+- (void)setPositionFast:(float)position;
+
+/**
+ * set the playback position as a percentage (range 0.0 to 1.0) for the currently playing media
+ * @note this methods prefers precision in seeking over speed
+ * @note This method can be called before starting to set a starting position.
+ */
+- (void)setPositionPrecise:(float)position;
+
+/**
+ * shows the current position as OSD within the video
+ * does not do anything if you do not have a vout
+ */
+- (void)displayPosition;
+
+/**
+ * helper function to jump forward with the extra short interval (user configurable in preferences)
+ */
+- (void)jumpForwardExtraShort;
+
+/**
+ * helper function to jump backward with the extra short interval (user configurable in preferences)
+ */
+- (void)jumpBackwardExtraShort;
+
+/**
+ * helper function to jump forward with the short interval (user configurable in preferences)
+ */
+- (void)jumpForwardShort;
+
+/**
+ * helper function to jump backward with the extra short interval (user configurable in preferences)
+ */
+- (void)jumpBackwardShort;
+
+/**
+ * helper function to jump forward with the medium interval (user configurable in preferences)
+ */
+- (void)jumpForwardMedium;
+
+/**
+ * helper function to jump backward with the medium interval (user configurable in preferences)
+ */
+- (void)jumpBackwardMedium;
+
+/**
+ * helper function to jump forward with the long interval (user configurable in preferences)
+ */
+- (void)jumpForwardLong;
+
+/**
+ * helper function to jump forward with the long interval (user configurable in preferences)
+ */
+- (void)jumpBackwardLong;
+
+/**
+ * the length of the currently playing media in ticks
+ * @return a valid time or VLC_TICK_INVALID (if no media is set, the media
+ * doesn't have any length, if playback is not yet started or in case of error)
+ * @note A started and playing media doesn't have necessarily a valid length.
+ * @note listen to VLCPlayerLengthChanged to be notified about changes to this property
+ */
+@property (readonly) vlc_tick_t length;
+
+/**
+ * set/get the currently selected title
+ * @note listen to VLCPlayerTitleSelectionChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) size_t selectedTitleIndex;
+
+/**
+ * convenience method to get the current title
+ * @note this may return NULL if there is no title
+ */
+- (const struct vlc_player_title * _Nullable)selectedTitle;
+
+/**
+ * get the number of titles available for the currently playing media item
+ * @note listen to VLCPlayerTitleListChanged to be notified about changes to this property
+ */
+@property (readonly) size_t numberOfTitlesOfCurrentMedia;
+
+@property (readonly) NSArray<VLCPlayerTitle *> *titlesOfCurrentMedia;
+
+/**
+ * get a vlc_player_title by the index
+ * @note listen to VLCPlayerTitleListChanged in case the list changes so previous indexes will no longer be valid anymore
+ */
+- (const struct vlc_player_title *)titleAtIndexForCurrentMedia:(size_t)index;
+
+/**
+ * the index of the currently selected chapter within the current title
+ * @note listen to VLCPlayerChapterSelectionChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) size_t selectedChapterIndex;
+
+/**
+ * select the next chapter of the current title
+ */
+- (void)selectNextChapter;
+
+/**
+ * select the previous chapter of the current title
+ */
+- (void)selectPreviousChapter;
+
+/**
+ * returns the number of chapters for the current title
+ */
+@property (readonly) size_t numberOfChaptersForCurrentTitle;
+
+/**
+ * returns the chapter for the index within the current title
+ */
+- (nullable const struct vlc_player_chapter *)chapterAtIndexForCurrentTitle:(size_t)index;
+
+/**
+ * returns the selected program ID, typically in the range 0 to 32,000
+ * @warning the counter does not necessarily start at 0 nor are programs numbered consecutively
+ * @note listen to VLCPlayerProgramSelectionChanged to be notified about changes to this property
+ */
+@property (readonly) int selectedProgramID;
+
+/**
+ * select the program defined by the provided VLCProgramMetaData instance
+ * @note listen to VLCPlayerProgramSelectionChanged to be notified once the change takes effect
+ */
+- (void)selectProgram:(VLCProgramMetaData *)program;
+
+/**
+ * returns the number of programs available for the current media
+ * @note listen to VLCPlayerProgramListChanged to be notified about changes to this property
+ */
+@property (readonly) size_t numberOfPrograms;
+
+/**
+ * returns an instance of VLCProgramMetaData with details about the program at the specified index
+ */
+- (nullable VLCProgramMetaData *)programAtIndex:(size_t)index;
+
+/**
+ * returns an instance of VLCProgramMetaData with details about the program with the specified ID
+ */
+- (nullable VLCProgramMetaData *)programForID:(int)programID;
+
+/**
+ * exposes whether a teletext menu is available or not
+ * @note listen to VLCPlayerTeletextMenuAvailable to be notified about changes to this property
+ */
+@property (readonly) BOOL teletextMenuAvailable;
+
+/**
+ * enable/disable teletext display
+ * @note listen to VLCPlayerTeletextEnabled to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) BOOL teletextEnabled;
+
+/**
+ * set/get the currently displayed (or looked for) teletext page
+ *
+ * @note Page keys can be the following: @ref VLC_PLAYER_TELETEXT_KEY_RED,
+ * @ref VLC_PLAYER_TELETEXT_KEY_GREEN, @ref VLC_PLAYER_TELETEXT_KEY_YELLOW,
+ * @ref VLC_PLAYER_TELETEXT_KEY_BLUE or @ref VLC_PLAYER_TELETEXT_KEY_INDEX.
+ *
+ * @param page a page in the range 0 to 888 or a valid key
+ * @note listen to VLCPlayerTeletextPageChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) unsigned int teletextPage;
+
+/**
+ * is the teletext background transparent or not?
+ * @return a BOOL value indicating the current state
+ * @note listen to VLCPlayerTeletextTransparencyChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) BOOL teletextTransparent;
+
+/**
+ * the audio delay for the current media
+ * @warning this property expects you to provide an absolute delay time
+ * @return the audio delay in vlc ticks
+ * @note listed to VLCPlayerAudioDelayChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) vlc_tick_t audioDelay;
+
+/**
+ * the subtitles delay for the current media
+ * @warning this property expects you to provide an absolute delay time
+ * @return the subtitles delay in vlc ticks
+ * @note listen to VLCPlayerSubtitlesDelayChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) vlc_tick_t subtitlesDelay;
+
+/**
+ * fetch the delay for a specific track identified through its elementary stream ID
+ * @return the delay for the track or VLC_TICK_MAX if none is set
+ */
+- (vlc_tick_t)delayForElementaryStreamID:(vlc_es_id_t *)esID;
+
+/**
+ * set the delay of a specific track identified through its elementary stream ID
+ * @warning Setting the delay of one specific track will override previous and future changes of delay made through generic calls
+ * @param delay the delay as a valid time or VLC_TICK_MAX to reset to the default for the ES category
+ * @param esID the ID for the elementary stream
+ * @param relative use an absolute or relative whence to describe the time
+ * @return VLC_SUCCESS on success
+ */
+- (int)setDelay:(vlc_tick_t)delay forElementaryStreamID:(vlc_es_id_t *)esID relativeWhence:(BOOL)relative;
+
+/**
+ * the subtitles fps to correct mismatch between video and text
+ * the default value shall be 1.0
+ * @note listen to VLCPlayerSubtitlesFPSChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) float subtitlesFPS;
+
+/**
+ * a scale factor for text based subtitles, range 10 - 500, default 100
+ * @warning this does not have any effect on bitmapped subtitles
+ */
+@property (readwrite, nonatomic) unsigned int subtitleTextScalingFactor;
+
+/**
+ * enable recording of the current media or check if it is being done
+ * @note listen to VLCPlayerRecordingChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) BOOL enableRecording;
+
+/**
+ * helper function to inverse the current recording state
+ */
+- (void)toggleRecord;
+
+/**
+ * allows to add associated media to the currently playing one (previously known as input slaves)
+ * @param the URL for the media
+ * @param the media category (SPU or audio)
+ * @param defines whether the added track shall be immediately selected
+ * @param defines whether a OSD notification shall be displayed after adding the track
+ * @param defines whether the core shall verify the file extension before trying the addition
+ * @return VLC_SUCCESS or an error
+ */
+- (int)addAssociatedMediaToCurrentFromURL:(NSURL *)URL
+                               ofCategory:(enum es_format_category_e)category
+                         shallSelectTrack:(BOOL)selectTrack
+                          shallDisplayOSD:(BOOL)showOSD
+                     shallVerifyExtension:(BOOL)verifyExtension;
+
+/**
+ * set / get the renderer for the current player
+ * @warning the returned vlc_renderer_item_t * must be released with vlc_renderer_item_release().
+ * @note listen to VLCPlayerRendererChanged to be notified about changes
+ */
+@property (readwrite, nonatomic, nullable) vlc_renderer_item_t *rendererItem;
+
+/**
+ * navigate in interactive content such as DVD or BR menus
+ */
+- (void)navigateInInteractiveContent:(enum vlc_player_nav)navigationAction;
+
+/**
+ * the latest available playback statistics
+ * @return an instance of VLCInputStats holding the data
+ * @note listen to VLCPlayerStatisticsUpdated to be notified about changes to this property
+ */
+@property (readonly) VLCInputStats *statistics;
+
+#pragma mark - track selection
+
+/**
+ * select a track
+ * @param the track to select
+ * @param indicate whether multiple tracks may be played (video and SPU only)
+ * @note since tracks are unique, you do not need to specify the type
+ * @note listen to VLCTrackSelectionChanged to be notified once the change occurred
+ */
+- (void)selectTrack:(VLCTrackMetaData *)track exclusively:(BOOL)exclusiveSelection;
+
+/**
+ * unselect a track
+ * @note since tracks are unique, you do not need to specify the type
+ * @note listen to VLCTrackSelectionChanged to be notified once the change occurred
+ */
+- (void)unselectTrack:(VLCTrackMetaData *)track;
+
+/**
+ * unselect any track of a certain category
+ * @param the es_format_category_e category to unselect
+ * @note listen to VLCTrackSelectionChanged to be notified once the change occurred
+ */
+- (void)unselectTracksFromCategory:(enum es_format_category_e)category;
+
+/**
+ * cycle to the previous track of a certain category
+ * @param the category, @see es_format_category_e
+ * @note listen to VLCTrackSelectionChanged to be notified once the change occurred
+ */
+- (void)selectPreviousTrackForCategory:(enum es_format_category_e)category;
+
+/**
+ * cycle to the next track of a certain category
+ * @param the category, @see es_format_category_e
+ * @note listen to VLCTrackSelectionChanged to be notified once the change occurred
+ */
+- (void)selectNextTrackForCategory:(enum es_format_category_e)category;
+
+/**
+ * an array holding instances of VLCTrackMetaData describing the available audio tracks for the current media
+ * @note listen to VLCPlayerTrackListChanged to be notified of changes to the list
+ */
+@property (readonly, nullable) NSArray<VLCTrackMetaData *>* audioTracks;
+
+/**
+ * an array holding instances of VLCTrackMetaData describing the available video tracks for the current media
+ * @note listen to VLCPlayerTrackListChanged to be notified of changes to the list
+ */
+@property (readonly, nullable) NSArray<VLCTrackMetaData *>* videoTracks;
+
+/**
+ * an array holding instances of VLCTrackMetaData describing the available subtitle tracks for the current media
+ * @note listen to VLCPlayerTrackListChanged to be notified of changes to the list
+ */
+@property (readonly, nullable) NSArray<VLCTrackMetaData *>* subtitleTracks;
+
+@property (readonly) BOOL videoTracksEnabled;
+
+@property (readonly) VLCTrackMetaData *selectedVideoTrack;
+
+@property (readonly) BOOL audioTracksEnabled;
+
+@property (readonly) VLCTrackMetaData *selectedAudioTrack;
+
+#pragma mark - video output properties
+
+/**
+ * the main video output thread
+ * @warning the returned vout_thread_t * must be released with vout_Release().
+ * @note listen to VLCPlayerListOfVideoOutputThreadsChanged to be notified about changes
+ * @return the current video output thread or NULL if there is none
+ */
+@property (readonly, nullable) vout_thread_t *mainVideoOutputThread;
+
+/**
+ * the video output embedded in the current key window
+ * @warning the returned vout_thread_t * must be released with vout_Release().
+ * @return the current video output thread for the key window or the main video output thread or NULL if there is none
+ */
+@property (readonly, nullable) vout_thread_t *videoOutputThreadForKeyWindow;
+
+/**
+ * an array holding all current video output threads
+ * @warning the returned vout_thread_t * instances must be individually released with vout_Release().
+ * @note listen to VLCPlayerListOfVideoOutputThreadsChanged to be notified about changes
+ */
+@property (readonly, nullable, copy) NSArray<NSValue *> *allVideoOutputThreads;
+
+/**
+ * indicates whether video is displayed in fullscreen or shall to
+ * @note listen to VLCPlayerFullscreenChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) BOOL fullscreen;
+
+/**
+ * indicates whether we currently have an active video playback session
+ */
+@property (readwrite) BOOL activeVideoPlayback;
+
+/**
+ * helper function to inverse the current fullscreen state
+ */
+- (void)toggleFullscreen;
+
+
+- (void)togglePictureInPicture;
+
+/**
+ * indicates whether video is displaed in wallpaper mode or shall to
+ * @note listen to VLCPlayerWallpaperModeChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) BOOL wallpaperMode;
+
+/**
+ * Take a snapshot of all vouts
+ */
+- (void)takeSnapshot;
+
+/**
+ * displays a OSD message format string
+ */
+- (void)displayOSDMessage:(NSString *)message;
+
+/**
+ * defines whether the vout windows lock on the video's AR or can be resized arbitrarily
+ */
+@property (nonatomic, readwrite) BOOL aspectRatioIsLocked;
+
+#pragma mark - audio output properties
+
+/**
+ * reveals or sets the audio output volume
+ * range is 0.0 to 2.0 in percentage, whereas 100% is the unamplified maximum
+ * @note listen to VLCPlayerVolumeChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) float volume;
+
+/**
+ * helper function to increase volume by 5%
+ */
+- (void)incrementVolume;
+
+/**
+ * helper function to decrease volume by 5%
+ */
+- (void)decrementVolume;
+
+/**
+ * reveals or sets whether audio output is set to mute or not
+ * @note listen to VLCPlayerMuteChanged to be notified about changes to this property
+ */
+@property (readwrite, nonatomic) BOOL mute;
+
+/**
+ * helper function to inverse the current mute state
+ */
+- (void)toggleMute;
+
+/**
+ * the main audio output thread
+ * @warning the returned vout_thread_t * must be released with aout_Release().
+ * @return the current audio output instance or NULL if there is none
+ */
+@property (readonly, nullable) audio_output_t *mainAudioOutput;
+
+- (int)enableAudioFilterWithName:(NSString *)name state:(BOOL)state;
+
+@end
+
+@interface VLCInputStats : NSObject
+
+- (instancetype)initWithStatsStructure:(const struct input_stats_t *)stats;
+
+/* Input */
+@property (readonly) int64_t inputReadPackets;
+@property (readonly) int64_t inputReadBytes;
+@property (readonly) float inputBitrate;
+
+/* Demux */
+@property (readonly) int64_t demuxReadPackets;
+@property (readonly) int64_t demuxReadBytes;
+@property (readonly) float demuxBitrate;
+@property (readonly) int64_t demuxCorrupted;
+@property (readonly) int64_t demuxDiscontinuity;
+
+/* Decoders */
+@property (readonly) int64_t decodedAudio;
+@property (readonly) int64_t decodedVideo;
+
+/* Vout */
+@property (readonly) int64_t displayedPictures;
+@property (readonly) int64_t latePictures;
+@property (readonly) int64_t lostPictures;
+
+/* Aout */
+@property (readonly) int64_t playedAudioBuffers;
+@property (readonly) int64_t lostAudioBuffers;
+
+@end
+
+@interface VLCTrackMetaData : NSObject
+
+- (instancetype)initWithTrackStructure:(const struct vlc_player_track *)track;
+
+@property (readonly) vlc_es_id_t *esID;
+@property (readonly) NSString *name;
+@property (readonly) BOOL selected;
+
+@end
+
+@interface VLCProgramMetaData : NSObject
+
+- (instancetype)initWithProgramStructure:(const struct vlc_player_program *)structure;
+
+@property (readonly) int group_id;
+@property (readonly) NSString *name;
+@property (readonly) BOOL selected;
+@property (readonly) BOOL scrambled;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayerController.m Added

@@ -0,0 +1,1879 @@
+/*****************************************************************************
+ * VLCPlayerController.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlayerController.h"
+#include "vlc_player.h"
+
+#import <vlc_configuration.h>
+#import <vlc_url.h>
+
+#import "extensions/NSString+Helpers.h"
+
+#import "library/VLCInputItem.h"
+
+#import "main/VLCMain.h"
+
+#import "os-integration/VLCRemoteControlService.h"
+#import "os-integration/iTunes.h"
+#import "os-integration/Spotify.h"
+
+#import "playqueue/VLCPlayerTitle.h"
+
+#import "windows/video/VLCVoutView.h"
+#import "windows/video/VLCMainVideoViewController.h"
+#import "windows/video/VLCVideoWindowCommon.h"
+
+NSString *VLCPlayerElementaryStreamID = @"VLCPlayerElementaryStreamID";
+NSString *VLCTick = @"VLCTick";
+NSString *VLCPlayerCurrentMediaItemChanged = @"VLCPlayerCurrentMediaItemChanged";
+NSString *VLCPlayerMetadataChangedForCurrentMedia = @"VLCPlayerMetadataChangedForCurrentMedia";
+NSString *VLCPlayerStateChanged = @"VLCPlayerStateChanged";
+NSString *VLCPlayerErrorChanged = @"VLCPlayerErrorChanged";
+NSString *VLCPlayerBufferFill = @"VLCPlayerBufferFill";
+NSString *VLCPlayerBufferChanged = @"VLCPlayerBufferChanged";
+NSString *VLCPlayerRateChanged = @"VLCPlayerRateChanged";
+NSString *VLCPlayerCapabilitiesChanged = @"VLCPlayerCapabilitiesChanged";
+NSString *VLCPlayerTimeAndPositionChanged = @"VLCPlayerTimeAndPositionChanged";
+NSString *VLCPlayerLengthChanged = @"VLCPlayerLengthChanged";
+NSString *VLCPlayerTitleSelectionChanged = @"VLCPlayerTitleSelectionChanged";
+NSString *VLCPlayerTitleListChanged = @"VLCPlayerTitleListChanged";
+NSString *VLCPlayerChapterSelectionChanged = @"VLCPlayerChapterSelectionChanged";
+NSString *VLCPlayerProgramSelectionChanged = @"VLCPlayerProgramSelectionChanged";
+NSString *VLCPlayerProgramListChanged = @"VLCPlayerProgramListChanged";
+NSString *VLCPlayerABLoopStateChanged = @"VLCPlayerABLoopStateChanged";
+NSString *VLCPlayerTeletextMenuAvailable = @"VLCPlayerTeletextMenuAvailable";
+NSString *VLCPlayerTeletextEnabled = @"VLCPlayerTeletextEnabled";
+NSString *VLCPlayerTeletextPageChanged = @"VLCPlayerTeletextPageChanged";
+NSString *VLCPlayerTeletextTransparencyChanged = @"VLCPlayerTeletextTransparencyChanged";
+NSString *VLCPlayerAudioDelayChanged = @"VLCPlayerAudioDelayChanged";
+NSString *VLCPlayerSubtitlesDelayChanged = @"VLCPlayerSubtitlesDelayChanged";
+NSString *VLCPlayerDelayChangedForSpecificElementaryStream = @"VLCPlayerDelayChangedForSpecificElementaryStream";
+NSString *VLCPlayerSubtitlesFPSChanged = @"VLCPlayerSubtitlesFPSChanged";
+NSString *VLCPlayerSubtitleTextScalingFactorChanged = @"VLCPlayerSubtitleTextScalingFactorChanged";
+NSString *VLCPlayerRecordingChanged = @"VLCPlayerRecordingChanged";
+NSString *VLCPlayerRendererChanged = @"VLCPlayerRendererChanged";
+NSString *VLCPlayerInputStats = @"VLCPlayerInputStats";
+NSString *VLCPlayerStatisticsUpdated = @"VLCPlayerStatisticsUpdated";
+NSString *VLCPlayerTrackListChanged = @"VLCPlayerTrackListChanged";
+NSString *VLCPlayerTrackSelectionChanged = @"VLCPlayerTrackSelectionChanged";
+NSString *VLCPlayerFullscreenChanged = @"VLCPlayerFullscreenChanged";
+NSString *VLCPlayerPictureInPictureChanged = @"VLCPlayerPictureInPictureChanged";
+NSString *VLCPlayerWallpaperModeChanged = @"VLCPlayerWallpaperModeChanged";
+NSString *VLCPlayerListOfVideoOutputThreadsChanged = @"VLCPlayerListOfVideoOutputThreadsChanged";
+NSString *VLCPlayerVolumeChanged = @"VLCPlayerVolumeChanged";
+NSString *VLCPlayerMuteChanged = @"VLCPlayerMuteChanged";
+
+const CGFloat VLCVolumeMaximum = 2.;
+const CGFloat VLCVolumeDefault = 1.;
+
+@interface VLCPlayerController ()
+{
+    vlc_player_t *_p_player;
+    vlc_player_listener_id *_playerListenerID;
+    vlc_player_aout_listener_id *_playerAoutListenerID;
+    vlc_player_vout_listener_id *_playerVoutListenerID;
+    vlc_player_title_list *_currentTitleList;
+    NSNotificationCenter *_defaultNotificationCenter;
+
+    /* remote control support */
+    VLCRemoteControlService *_remoteControlService;
+
+    /* iTunes/Apple Music/Spotify play/pause support */
+    BOOL _iTunesPlaybackWasPaused;
+    BOOL _appleMusicPlaybackWasPaused;
+    BOOL _spotifyPlaybackWasPaused;
+
+    NSTimer *_playbackHasTruelyEndedTimer;
+    VLCInputItem *_currentMedia;
+}
+
+@property (readwrite, atomic) iTunesApplication *appleMusicApp;
+@property (readwrite, atomic) iTunesApplication *iTunesApp;
+@property (readwrite, atomic) SpotifyApplication *spotifyApp;
+
+- (void)currentMediaItemChanged:(input_item_t *)newMediaItem;
+- (void)stateChanged:(enum vlc_player_state)state;
+- (void)errorChanged:(enum vlc_player_error)error;
+- (void)newBufferingValue:(float)bufferValue;
+- (void)newRateValue:(float)rateValue;
+- (void)capabilitiesChanged:(int)newCapabilities;
+- (void)position:(float)position andTimeChanged:(vlc_tick_t)time;
+- (void)lengthChanged:(vlc_tick_t)length;
+- (void)titleListChanged:(vlc_player_title_list *)p_titles;
+- (void)selectedTitleChanged:(size_t)selectedTitle;
+- (void)selectedChapterChanged:(size_t)chapterIndex;
+- (void)teletextAvailibilityChanged:(BOOL)hasTeletextMenu;
+- (void)teletextEnabledChanged:(BOOL)teletextOn;
+- (void)teletextPageChanged:(unsigned int)page;
+- (void)teletextTransparencyChanged:(BOOL)isTransparent;
+- (void)audioDelayChanged:(vlc_tick_t)audioDelay;
+- (void)rendererChanged:(vlc_renderer_item_t *)newRendererItem;
+- (void)subtitlesDelayChanged:(vlc_tick_t)subtitlesDelay;
+- (void)delayChanged:(vlc_tick_t)trackDelay forTrack:(vlc_es_id_t *)esID;
+- (void)subtitlesFPSChanged:(float)subtitlesFPS;
+- (void)recordingChanged:(BOOL)recording;
+- (void)inputStatsUpdated:(VLCInputStats *)inputStats;
+- (void)trackSelectionChanged;
+- (void)trackListChanged;
+- (void)programListChanged;
+- (void)programSelectionChanged:(int)selectedID;
+- (void)ABLoopStateChanged:(enum vlc_player_abloop)abLoopState;
+- (void)metaDataChangedForInput:(input_item_t *)inputItem;
+- (void)voutListUpdated;
+
+/* video */
+- (void)fullscreenChanged:(BOOL)isFullscreen;
+- (void)wallpaperModeChanged:(BOOL)wallpaperModeValue;
+
+/* audio */
+- (void)volumeChanged:(float)volume;
+- (void)muteChanged:(BOOL)mute;
+@end
+
+#pragma mark - player callback implementations
+
+static void cb_player_current_media_changed(vlc_player_t *p_player, input_item_t *p_newMediaItem, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController currentMediaItemChanged:p_newMediaItem;
+    });
+}
+
+static void cb_player_state_changed(vlc_player_t *p_player, enum vlc_player_state state, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController stateChanged:state;
+    });
+}
+
+static void cb_player_error_changed(vlc_player_t *p_player, enum vlc_player_error error, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController errorChanged:error;
+    });
+}
+
+static void cb_player_buffering(vlc_player_t *p_player, float newBufferValue, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController newBufferingValue:newBufferValue;
+    });
+}
+
+static void cb_player_rate_changed(vlc_player_t *p_player, float newRateValue, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController newRateValue:newRateValue;
+    });
+}
+
+static void cb_player_capabilities_changed(vlc_player_t *p_player, int oldCapabilities, int newCapabilities, void *p_data)
+{
+    VLC_UNUSED(p_player); VLC_UNUSED(oldCapabilities);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController capabilitiesChanged:newCapabilities;
+    });
+}
+
+static void cb_player_position_changed(vlc_player_t *p_player, vlc_tick_t time, double position, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController position:position andTimeChanged:time;
+    });
+}
+
+static void cb_player_length_changed(vlc_player_t *p_player, vlc_tick_t newLength, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController lengthChanged:newLength;
+    });
+}
+
+static void cb_player_titles_changed(vlc_player_t *p_player,
+                                     vlc_player_title_list *p_titles,
+                                     void *p_data)
+{
+    VLC_UNUSED(p_player);
+    if (p_titles)
+        vlc_player_title_list_Hold(p_titles);
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController titleListChanged:p_titles;
+    });
+}
+
+static void cb_player_title_selection_changed(vlc_player_t *p_player,
+                                              const struct vlc_player_title *p_new_title,
+                                              size_t selectedIndex,
+                                              void *p_data)
+{
+    VLC_UNUSED(p_player);
+    VLC_UNUSED(p_new_title);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController selectedTitleChanged:selectedIndex;
+    });
+}
+
+static void cb_player_chapter_selection_changed(vlc_player_t *p_player,
+                                                const struct vlc_player_title *p_title, size_t title_idx,
+                                                const struct vlc_player_chapter *p_new_chapter, size_t new_chapter_idx,
+                                                void *p_data)
+{
+    VLC_UNUSED(p_player);
+    VLC_UNUSED(p_title);
+    VLC_UNUSED(title_idx);
+    VLC_UNUSED(p_new_chapter);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController selectedChapterChanged:new_chapter_idx;
+    });
+}
+
+static void cb_player_teletext_menu_availability_changed(vlc_player_t *p_player, bool hasTeletextMenu, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController teletextAvailibilityChanged:hasTeletextMenu;
+    });
+}
+
+static void cb_player_teletext_enabled_changed(vlc_player_t *p_player, bool teletextEnabled, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController teletextEnabledChanged:teletextEnabled;
+    });
+}
+
+static void cb_player_teletext_page_changed(vlc_player_t *p_player, unsigned page, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController teletextPageChanged:page;
+    });
+}
+
+static void cb_player_teletext_transparency_changed(vlc_player_t *p_player, bool isTransparent, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController teletextTransparencyChanged:isTransparent;
+    });
+}
+
+static void cb_player_category_delay_changed(vlc_player_t *p_player, enum es_format_category_e cat,
+                                             vlc_tick_t newDelay, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        switch (cat)
+        {
+            case AUDIO_ES:
+                playerController audioDelayChanged:newDelay;
+                break;
+            case SPU_ES:
+                playerController subtitlesDelayChanged:newDelay;
+                break;
+            default:
+                vlc_assert_unreachable();
+        }
+    });
+}
+
+static void cb_player_associated_subs_fps_changed(vlc_player_t *p_player, float subs_fps, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController subtitlesFPSChanged:subs_fps;
+    });
+}
+
+static void cb_player_renderer_changed(vlc_player_t *p_player,
+                                       vlc_renderer_item_t *p_new_renderer,
+                                       void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController rendererChanged:p_new_renderer;
+    });
+}
+
+static void cb_player_record_changed(vlc_player_t *p_player, bool recording, void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController recordingChanged:recording;
+    });
+}
+
+static void cb_player_stats_changed(vlc_player_t *p_player,
+                                    const struct input_stats_t *p_stats,
+                                    void *p_data)
+{
+    VLC_UNUSED(p_player);
+
+    /* the provided structure is valid in this context only, so copy all data to our own */
+    VLCInputStats *inputStats = VLCInputStats alloc initWithStatsStructure:p_stats;
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController inputStatsUpdated:inputStats;
+    });
+}
+
+static void cb_player_track_list_changed(vlc_player_t *p_player,
+                                         enum vlc_player_list_action action,
+                                         const struct vlc_player_track *track,
+                                         void *p_data)
+{
+    VLC_UNUSED(p_player); VLC_UNUSED(action); VLC_UNUSED(track);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController trackListChanged;
+    });
+}
+
+static void cb_player_track_selection_changed(vlc_player_t *p_player,
+                                              vlc_es_id_t *unselected_id,
+                                              vlc_es_id_t *selected_id,
+                                              void *p_data)
+{
+    VLC_UNUSED(p_player); VLC_UNUSED(unselected_id); VLC_UNUSED(selected_id);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController trackSelectionChanged;
+    });
+}
+
+static void cb_player_track_delay_changed(vlc_player_t *p_player,
+                                          vlc_es_id_t *es_id,
+                                          vlc_tick_t delay,
+                                          void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController delayChanged:delay forTrack:es_id;
+    });
+}
+
+static void cb_player_program_list_changed(vlc_player_t *p_player,
+                                           enum vlc_player_list_action action,
+                                           const struct vlc_player_program *prgm,
+                                           void *p_data)
+{
+    VLC_UNUSED(p_player); VLC_UNUSED(action); VLC_UNUSED(prgm);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController programListChanged;
+    });
+}
+
+static void cb_player_program_selection_changed(vlc_player_t *p_player,
+                                                int unselected_id,
+                                                int selected_id,
+                                                void *p_data)
+{
+    VLC_UNUSED(p_player); VLC_UNUSED(unselected_id);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController programSelectionChanged:selected_id;
+    });
+}
+
+static void cb_player_atobloop_changed(vlc_player_t *p_player,
+                                       enum vlc_player_abloop new_state,
+                                       vlc_tick_t time, double pos,
+                                       void *p_data)
+{
+    VLC_UNUSED(p_player);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController ABLoopStateChanged:new_state;
+    });
+}
+
+static void cb_player_item_meta_changed(vlc_player_t *p_player,
+                                        input_item_t *p_mediaItem,
+                                        void *p_data)
+{
+    VLC_UNUSED(p_player);
+    input_item_Hold(p_mediaItem);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController metaDataChangedForInput:p_mediaItem;
+    });
+}
+
+static void cb_player_vout_changed(vlc_player_t *p_player,
+                                   enum vlc_player_vout_action action,
+                                   vout_thread_t *p_vout,
+                                   enum vlc_vout_order order,
+                                   vlc_es_id_t *es_id,
+                                   void *p_data)
+{
+    VLC_UNUSED(p_player);
+    VLC_UNUSED(p_vout);
+    VLC_UNUSED(order);
+
+    if (vlc_es_id_GetCat(es_id) != VIDEO_ES)
+        return;
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController voutListUpdated;
+    });
+}
+
+static const struct vlc_player_cbs player_callbacks = {
+    .on_current_media_changed = cb_player_current_media_changed,
+    .on_state_changed = cb_player_state_changed,
+    .on_error_changed = cb_player_error_changed,
+    .on_buffering_changed = cb_player_buffering,
+    .on_rate_changed = cb_player_rate_changed,
+    .on_capabilities_changed = cb_player_capabilities_changed,
+    .on_position_changed = cb_player_position_changed,
+    .on_length_changed = cb_player_length_changed,
+    .on_track_list_changed = cb_player_track_list_changed,
+    .on_track_selection_changed = cb_player_track_selection_changed,
+    .on_track_delay_changed = cb_player_track_delay_changed,
+    .on_program_list_changed = cb_player_program_list_changed,
+    .on_program_selection_changed = cb_player_program_selection_changed,
+    .on_titles_changed = cb_player_titles_changed,
+    .on_title_selection_changed = cb_player_title_selection_changed,
+    .on_chapter_selection_changed = cb_player_chapter_selection_changed,
+    .on_teletext_menu_changed = cb_player_teletext_menu_availability_changed,
+    .on_teletext_enabled_changed = cb_player_teletext_enabled_changed,
+    .on_teletext_page_changed = cb_player_teletext_page_changed,
+    .on_teletext_transparency_changed = cb_player_teletext_transparency_changed,
+    .on_category_delay_changed = cb_player_category_delay_changed,
+    .on_associated_subs_fps_changed = cb_player_associated_subs_fps_changed,
+    .on_renderer_changed = cb_player_renderer_changed,
+    .on_recording_changed = cb_player_record_changed,
+    .on_signal_changed = NULL,
+    .on_statistics_changed = cb_player_stats_changed,
+    .on_atobloop_changed = cb_player_atobloop_changed,
+    .on_media_meta_changed = cb_player_item_meta_changed,
+    .on_media_epg_changed = NULL,
+    .on_media_subitems_changed = NULL,
+    .on_vout_changed = cb_player_vout_changed,
+    .on_cork_changed = NULL,
+};
+
+#pragma mark - video specific callback implementations
+
+static void cb_player_vout_fullscreen_changed(vout_thread_t *p_vout, bool isFullscreen, void *p_data)
+{
+    VLC_UNUSED(p_vout);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController fullscreenChanged:isFullscreen;
+    });
+}
+
+static void cb_player_vout_wallpaper_mode_changed(vout_thread_t *p_vout,  bool wallpaperModeEnabled, void *p_data)
+{
+    VLC_UNUSED(p_vout);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController wallpaperModeChanged:wallpaperModeEnabled;
+    });
+}
+
+static const struct vlc_player_vout_cbs player_vout_callbacks = {
+    cb_player_vout_fullscreen_changed,
+    cb_player_vout_wallpaper_mode_changed,
+};
+
+#pragma mark - video specific callback implementations
+
+static void cb_player_aout_volume_changed(audio_output_t *aout, float volume, void *p_data)
+{
+    VLC_UNUSED(aout);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController volumeChanged:volume;
+    });
+}
+
+static void cb_player_aout_mute_changed(audio_output_t *aout, bool muted, void *p_data)
+{
+    VLC_UNUSED(aout);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+        playerController muteChanged:muted;
+    });
+}
+
+static const struct vlc_player_aout_cbs player_aout_callbacks = {
+    cb_player_aout_volume_changed,
+    cb_player_aout_mute_changed,
+    NULL,
+};
+
+static int BossCallback(vlc_object_t *p_this,
+                        const char *psz_var,
+                        vlc_value_t oldval,
+                        vlc_value_t new_val,
+                        void *p_data)
+{
+    VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval); VLC_UNUSED(new_val);
+    @autoreleasepool {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            VLCPlayerController *playerController = (__bridge VLCPlayerController *)p_data;
+            playerController pause;
+            NSApplication.sharedApplication hide:nil;
+        });
+        return VLC_SUCCESS;
+    }
+}
+
+#pragma mark - controller initialization
+
+@implementation VLCPlayerController
+
+- (instancetype)initWithPlayer:(vlc_player_t *)player
+{
+    self = super init;
+    if (self) {
+        _defaultNotificationCenter = NSNotificationCenter.defaultCenter;
+        _defaultNotificationCenter addObserver:self
+                                       selector:@selector(applicationWillTerminate:)
+                                           name:NSApplicationWillTerminateNotification
+                                         object:nil;
+        _defaultNotificationCenter addObserver:self
+                                       selector:@selector(applicationDidFinishLaunching:)
+                                           name:NSApplicationDidFinishLaunchingNotification
+                                         object:nil;
+        _position = -1.f;
+        _time = VLC_TICK_INVALID;
+        _p_player = player;
+        vlc_player_Lock(_p_player);
+        // FIXME: initialize state machine here
+        _playerListenerID = vlc_player_AddListener(_p_player,
+                               &player_callbacks,
+                               (__bridge void *)self);
+        vlc_player_Unlock(_p_player);
+        _playerAoutListenerID = vlc_player_aout_AddListener(_p_player,
+                                                            &player_aout_callbacks,
+                                                            (__bridge void *)self);
+        _playerVoutListenerID = vlc_player_vout_AddListener(_p_player,
+                                                            &player_vout_callbacks,
+                                                            (__bridge void *)self);
+
+        const float aoutVolume = vlc_player_aout_GetVolume(_p_player);
+        _volume = aoutVolume >= 0.f ? aoutVolume : VLCVolumeDefault;
+
+        const int aoutMute = vlc_player_aout_IsMuted(_p_player);
+        _mute = aoutMute == -1 ? NO : aoutMute;
+
+        _aLoopTime = -1;
+        _bLoopTime = -1;
+        _aLoopPosition = -1;
+        _bLoopPosition = -1;
+
+        _playbackRate = 1.0;
+
+        libvlc_int_t *libvlc = vlc_object_instance(getIntf());
+        var_AddCallback(libvlc, "intf-boss", BossCallback, (__bridge void *)self);
+    }
+
+    return self;
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+    if (@available(macOS 10.12.2, *)) {
+        _remoteControlService = VLCRemoteControlService alloc init;
+        _remoteControlService subscribeToRemoteCommands;
+    }
+
+    dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
+        if (@available(macOS 10.15, *)) {
+            self.appleMusicApp = (iTunesApplication *) SBApplication applicationWithBundleIdentifier:@"com.apple.Music";
+        } else {
+            self.iTunesApp = (iTunesApplication *) SBApplication applicationWithBundleIdentifier:@"com.apple.iTunes";
+        }
+
+        self.spotifyApp = (SpotifyApplication *) SBApplication applicationWithBundleIdentifier:@"com.spotify.client";
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (self->_playerState == VLC_PLAYER_STATE_PLAYING || self->_playerState == VLC_PLAYER_STATE_STARTED) {
+                self stopOtherAudioPlaybackApps;
+            }
+        });
+    });
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification
+{
+    libvlc_int_t *libvlc = vlc_object_instance(getIntf());
+    var_DelCallback(libvlc, "intf-boss", BossCallback, (__bridge void *)self);
+
+    self onPlaybackHasTruelyEnded:nil;
+    if (@available(macOS 10.12.2, *)) {
+        _remoteControlService unsubscribeFromRemoteCommands;
+    }
+    if (_currentTitleList) {
+        vlc_player_title_list_Release(_currentTitleList);
+    }
+    if (_p_player) {
+        if (_playerListenerID) {
+            vlc_player_Lock(_p_player);
+            vlc_player_RemoveListener(_p_player, _playerListenerID);
+            vlc_player_Unlock(_p_player);
+        }
+        if (_playerAoutListenerID) {
+            vlc_player_aout_RemoveListener(_p_player, _playerAoutListenerID);
+        }
+        if (_playerVoutListenerID) {
+            vlc_player_vout_RemoveListener(_p_player, _playerVoutListenerID);
+        }
+    }
+}
+
+- (void)dealloc
+{
+    _defaultNotificationCenter removeObserver:self;
+}
+
+- (VLCInputItem *)currentMedia {
+    if (_currentMedia)
+        return _currentMedia;
+    vlc_player_Lock(_p_player);
+    input_item_t *vlcInputItem = vlc_player_GetCurrentMedia(_p_player);
+    if (vlcInputItem) {
+        _currentMedia = VLCInputItem alloc initWithInputItem:vlcInputItem;
+    }
+    vlc_player_Unlock(_p_player);
+    return _currentMedia;
+}
+
+#pragma mark - playback control methods
+
+- (int)start
+{
+    vlc_player_Lock(_p_player);
+    int ret = vlc_player_Start(_p_player);
+    vlc_player_Unlock(_p_player);
+    return ret;
+}
+
+- (void)startInPausedState:(BOOL)startPaused
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SetStartPaused(_p_player, startPaused);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)pause
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_Pause(_p_player);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)resume
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_Resume(_p_player);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)togglePlayPause
+{
+    vlc_player_Lock(_p_player);
+    if (_playerState == VLC_PLAYER_STATE_PLAYING) {
+        vlc_player_Pause(_p_player);
+    } else if (_playerState == VLC_PLAYER_STATE_PAUSED) {
+        vlc_player_Resume(_p_player);
+    } else
+        vlc_player_Start(_p_player);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)stop
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_Stop(_p_player);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)metaDataChangedForInput:(input_item_t *)inputItem
+{
+    _defaultNotificationCenter postNotificationName:VLCPlayerMetadataChangedForCurrentMedia
+                                              object:self;
+}
+
+- (void)nextVideoFrame
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_NextVideoFrame(_p_player);
+    vlc_player_Unlock(_p_player);
+}
+
+#pragma mark - player callback delegations
+
+- (void)currentMediaItemChanged:(input_item_t *)newMediaItem
+{
+    _currentMedia = VLCInputItem alloc initWithInputItem:newMediaItem;
+    _defaultNotificationCenter postNotificationName:VLCPlayerCurrentMediaItemChanged object:self;
+}
+
+- (vlc_tick_t)durationOfCurrentMediaItem
+{
+    if (!self.currentMedia) {
+        return -1;
+    }
+
+    return self.currentMedia.duration;
+}
+
+- (NSURL *)URLOfCurrentMediaItem;
+{
+    if (!self.currentMedia) {
+        return nil;
+    }
+
+    return NSURL URLWithString:self.currentMedia.MRL;
+}
+
+- (NSString*)nameOfCurrentMediaItem;
+{
+    if (!self.currentMedia) {
+        return nil;
+    }
+
+    NSString *name = self.currentMedia.name;
+    if (!name) {
+        NSURL *url = NSURL URLWithString:self.currentMedia.MRL;
+        if (url isFileURL)
+            name = NSFileManager defaultManager displayNameAtPath:url path;
+        else
+            name = url absoluteString;
+    }
+
+    return name;
+}
+
+- (void)stateChanged:(enum vlc_player_state)state
+{
+    /* instead of using vlc_player_GetState, we cache the state and provide it through a synthesized getter
+     * as the direct call might not reflect the actual state due the asynchronous API nature */
+    _playerState = state;
+
+    /* we seem to start (over), don't start other players */
+    if (_playerState != VLC_PLAYER_STATE_STOPPED) {
+        if (_playbackHasTruelyEndedTimer) {
+            _playbackHasTruelyEndedTimer invalidate;
+            _playbackHasTruelyEndedTimer = nil;
+        }
+    }
+
+    _defaultNotificationCenter postNotificationName:VLCPlayerStateChanged
+                                              object:self;
+
+    /* notify third party apps through an informal protocol that our state changed */
+    NSDistributedNotificationCenter defaultCenter postNotificationName:@"VLCPlayerStateDidChange"
+                                                                   object:nil
+                                                                 userInfo:nil
+                                                       deliverImmediately:YES;
+
+    /* schedule a timer to restart iTunes / Spotify because we are done here */
+    if (_playerState == VLC_PLAYER_STATE_STOPPED) {
+        if (_playbackHasTruelyEndedTimer) {
+            _playbackHasTruelyEndedTimer invalidate;
+        }
+        _playbackHasTruelyEndedTimer = NSTimer scheduledTimerWithTimeInterval:0.5
+                                                                        target:self
+                                                                      selector:@selector(onPlaybackHasTruelyEnded:)
+                                                                      userInfo:nil
+                                                                       repeats:NO;
+    }
+
+    /* pause external players */
+    if (_playerState == VLC_PLAYER_STATE_PLAYING || _playerState == VLC_PLAYER_STATE_STARTED) {
+        self stopOtherAudioPlaybackApps;
+    }
+}
+
+// Called when playback has truly ended and likely no subsequent media will start playing
+- (void)onPlaybackHasTruelyEnded:(id)sender
+{
+    msg_Dbg(getIntf(), "Playback has been ended");
+
+    self resumeOtherAudioPlaybackApps;
+    _playbackHasTruelyEndedTimer = nil;
+    _currentMedia = nil;
+}
+
+- (void)stopOtherAudioPlaybackApps
+{
+    intf_thread_t *p_intf = getIntf();
+    int64_t controlOtherPlayers = var_InheritInteger(p_intf, "macosx-control-itunes");
+    if (controlOtherPlayers <= 0)
+        return;
+
+    // Don't bother looking for Apple Music on macOS below 10.15, and conversely
+    // don't bother looking for iTunes on macOS above 10.15
+    if (@available(macOS 10.15, *)) {
+        // Pause Apple Music playback
+        iTunesApplication *appleMusic = self.appleMusicApp;
+        if (appleMusic != nil &&
+            !_appleMusicPlaybackWasPaused &&
+            appleMusic isRunning &&
+            appleMusic playerState == iTunesEPlSPlaying) {
+
+            msg_Dbg(p_intf, "pausing Apple Music");
+            appleMusic pause;
+            _appleMusicPlaybackWasPaused = YES;
+        }
+    } else {
+        iTunesApplication *iTunes = self.iTunesApp;
+        if (iTunes != nil &&
+            !_iTunesPlaybackWasPaused &&
+            iTunes isRunning &&
+            iTunes playerState == iTunesEPlSPlaying) {
+            // Pause iTunes playback
+            msg_Dbg(p_intf, "pausing iTunes");
+            iTunes pause;
+            _iTunesPlaybackWasPaused = YES;
+        }
+    }
+
+    // Pause Spotify
+    SpotifyApplication *spotify = self.spotifyApp;
+    if (spotify != nil &&
+        !_spotifyPlaybackWasPaused &&
+        spotify respondsToSelector:@selector(isRunning) &&
+        spotify respondsToSelector:@selector(playerState) &&
+        spotify isRunning &&
+        spotify playerState == kSpotifyPlayerStatePlaying) {
+
+        msg_Dbg(p_intf, "pausing Spotify");
+        spotify pause;
+        _spotifyPlaybackWasPaused = YES;
+    }
+}
+
+- (void)resumeOtherAudioPlaybackApps
+{
+    intf_thread_t *p_intf = getIntf();
+    if (var_InheritInteger(p_intf, "macosx-control-itunes") > 1) {
+        if (@available(macOS 10.15, *)) {
+            iTunesApplication *appleMusic = self.appleMusicApp;
+            if (appleMusic != nil &&
+                _appleMusicPlaybackWasPaused &&
+                appleMusic isRunning &&
+                appleMusic playerState == iTunesEPlSPaused) {
+
+                msg_Dbg(p_intf, "unpausing Apple Music");
+                appleMusic playpause;
+            }
+        } else {
+            iTunesApplication *iTunes = self.iTunesApp;
+            if (iTunes != nil &&
+                _iTunesPlaybackWasPaused &&
+                iTunes isRunning &&
+                iTunes playerState == iTunesEPlSPaused) {
+
+                msg_Dbg(p_intf, "unpausing iTunes");
+                iTunes playpause;
+            }
+        }
+
+        SpotifyApplication *spotify = self.spotifyApp;
+        if (spotify != nil &&
+            _spotifyPlaybackWasPaused &&
+            spotify respondsToSelector:@selector(isRunning) &&
+            spotify respondsToSelector:@selector(playerState) &&
+            spotify isRunning &&
+            spotify playerState == kSpotifyPlayerStatePaused) {
+
+            msg_Dbg(p_intf, "unpausing Spotify");
+            spotify play;
+        }
+    }
+
+    _iTunesPlaybackWasPaused = NO;
+    _appleMusicPlaybackWasPaused = NO;
+    _spotifyPlaybackWasPaused = NO;
+}
+
+- (void)errorChanged:(enum vlc_player_error)error
+{
+    /* instead of using vlc_player_GetError, we cache the error and provide it through a synthesized getter
+     * as the direct call might not reflect the actual error due the asynchronous API nature */
+    _error = error;
+    _defaultNotificationCenter postNotificationName:VLCPlayerErrorChanged
+                                              object:self;
+}
+
+- (void)newBufferingValue:(float)bufferValue
+{
+    _bufferFill = bufferValue;
+    _defaultNotificationCenter postNotificationName:VLCPlayerBufferChanged
+                                              object:self
+                                            userInfo:@{VLCPlayerBufferFill : @(bufferValue)};
+}
+
+- (void)newRateValue:(float)rateValue
+{
+    _playbackRate = rateValue;
+    _defaultNotificationCenter postNotificationName:VLCPlayerRateChanged
+                                              object:self;
+}
+
+- (void)setPlaybackRate:(float)playbackRate
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_ChangeRate(_p_player, playbackRate);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)incrementPlaybackRate
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_IncrementRate(_p_player);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)decrementPlaybackRate
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_DecrementRate(_p_player);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)capabilitiesChanged:(int)newCapabilities
+{
+    _seekable = newCapabilities & VLC_PLAYER_CAP_SEEK ? YES : NO;
+    _rewindable = newCapabilities & VLC_PLAYER_CAP_REWIND ? YES : NO;
+    _pausable = newCapabilities & VLC_PLAYER_CAP_PAUSE ? YES : NO;
+    _recordable = YES;
+    _rateChangable = newCapabilities & VLC_PLAYER_CAP_CHANGE_RATE ? YES : NO;
+    _defaultNotificationCenter postNotificationName:VLCPlayerCapabilitiesChanged
+                                              object:self;
+}
+
+- (void)position:(float)position andTimeChanged:(vlc_tick_t)time
+{
+    _position = position;
+    _time = time;
+    _defaultNotificationCenter postNotificationName:VLCPlayerTimeAndPositionChanged
+                                              object:self;
+}
+
+- (void)setTimeFast:(vlc_tick_t)time
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SeekByTime(_p_player, time, VLC_PLAYER_SEEK_FAST, VLC_PLAYER_WHENCE_ABSOLUTE);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)setTimePrecise:(vlc_tick_t)time
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SeekByTime(_p_player, time, VLC_PLAYER_SEEK_PRECISE, VLC_PLAYER_WHENCE_ABSOLUTE);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)setPositionFast:(float)position
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SeekByPos(_p_player, position, VLC_PLAYER_SEEK_FAST, VLC_PLAYER_WHENCE_ABSOLUTE);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)setPositionPrecise:(float)position
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SeekByPos(_p_player, position, VLC_PLAYER_SEEK_PRECISE, VLC_PLAYER_WHENCE_ABSOLUTE);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)displayPosition
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_DisplayPosition(_p_player);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)jumpWithValue:(char *)p_userDefinedJumpSize forward:(BOOL)shallJumpForward
+{
+    int64_t interval = var_InheritInteger(getIntf(), p_userDefinedJumpSize);
+    if (interval <= 0)
+        return;
+
+    vlc_tick_t jumptime = vlc_tick_from_sec(interval);
+    if (!shallJumpForward)
+        jumptime = jumptime * -1;
+
+    vlc_player_Lock(_p_player);
+    /* No fask seek for jumps. Indeed, jumps can seek to the current position
+     * if not precise enough or if the jump value is too small. */
+    vlc_player_SeekByTime(_p_player,
+                          jumptime,
+                          VLC_PLAYER_SEEK_PRECISE,
+                          VLC_PLAYER_WHENCE_RELATIVE);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)jumpForwardExtraShort
+{
+    self jumpWithValue:"extrashort-jump-size" forward:YES;
+}
+
+- (void)jumpBackwardExtraShort
+{
+    self jumpWithValue:"extrashort-jump-size" forward:NO;
+}
+
+- (void)jumpForwardShort
+{
+    self jumpWithValue:"short-jump-size" forward:YES;
+}
+
+- (void)jumpBackwardShort
+{
+    self jumpWithValue:"short-jump-size" forward:NO;
+}
+
+- (void)jumpForwardMedium
+{
+    self jumpWithValue:"medium-jump-size" forward:YES;
+}
+
+- (void)jumpBackwardMedium
+{
+    self jumpWithValue:"medium-jump-size" forward:NO;
+}
+
+- (void)jumpForwardLong
+{
+    self jumpWithValue:"long-jump-size" forward:YES;
+}
+
+- (void)jumpBackwardLong
+{
+    self jumpWithValue:"long-jump-size" forward:NO;
+}
+
+- (void)lengthChanged:(vlc_tick_t)length
+{
+    _length = length;
+    _defaultNotificationCenter postNotificationName:VLCPlayerLengthChanged
+                                              object:self;
+}
+
+- (void)titleListChanged:(vlc_player_title_list *)p_titles
+{
+    if (_currentTitleList) {
+        vlc_player_title_list_Release(_currentTitleList);
+    }
+    /* the new list was already hold earlier */
+    _currentTitleList = p_titles;
+    _defaultNotificationCenter postNotificationName:VLCPlayerTitleListChanged
+                                              object:self;
+}
+
+- (void)selectedTitleChanged:(size_t)selectedTitle
+{
+    _selectedTitleIndex = selectedTitle;
+    _defaultNotificationCenter postNotificationName:VLCPlayerTitleSelectionChanged
+                                              object:self;
+}
+
+- (const struct vlc_player_title *)selectedTitle
+{
+    if (_selectedTitleIndex >= 0 && _selectedTitleIndex < self numberOfTitlesOfCurrentMedia) {
+        return vlc_player_title_list_GetAt(_currentTitleList, _selectedTitleIndex);
+    }
+    return NULL;
+}
+
+- (void)setSelectedTitleIndex:(size_t)selectedTitleIndex
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SelectTitleIdx(_p_player, selectedTitleIndex);
+    vlc_player_Unlock(_p_player);
+}
+
+- (const struct vlc_player_title *)titleAtIndexForCurrentMedia:(size_t)index
+{
+    return vlc_player_title_list_GetAt(_currentTitleList, index);
+}
+
+- (size_t)numberOfTitlesOfCurrentMedia
+{
+    if (!_currentTitleList) {
+        return 0;
+    }
+    return vlc_player_title_list_GetCount(_currentTitleList);
+}
+
+- (NSArray<VLCPlayerTitle *> *)titlesOfCurrentMedia
+{
+    const size_t count = self numberOfTitlesOfCurrentMedia;
+    NSMutableArray<VLCPlayerTitle *> * const titles = NSMutableArray.array;
+    for (size_t i = 0; i < count; i++) {
+        const struct vlc_player_title * const p_title = self titleAtIndexForCurrentMedia:i;
+        VLCPlayerTitle * const title = VLCPlayerTitle alloc initWithTitle:p_title atIndex:i;
+        titles addObject:title;
+    }
+    return titles.copy;
+}
+
+- (void)selectedChapterChanged:(size_t)chapterIndex
+{
+    _selectedChapterIndex = chapterIndex;
+    _defaultNotificationCenter postNotificationName:VLCPlayerChapterSelectionChanged
+                                              object:self;
+}
+
+- (void)setSelectedChapterIndex:(size_t)selectedChapterIndex
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SelectChapterIdx(_p_player, selectedChapterIndex);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)selectNextChapter
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SelectNextChapter(_p_player);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)selectPreviousChapter
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SelectPrevChapter(_p_player);
+    vlc_player_Unlock(_p_player);
+}
+
+- (size_t)numberOfChaptersForCurrentTitle
+{
+    const struct vlc_player_title *p_current_title = self selectedTitle;
+    if (p_current_title == NULL) {
+        return 0;
+    }
+
+    return p_current_title->chapter_count;
+}
+
+- (const struct vlc_player_chapter *)chapterAtIndexForCurrentTitle:(size_t)index
+{
+    const struct vlc_player_title *p_current_title = self selectedTitle;
+    if (p_current_title == NULL || !p_current_title->chapter_count) {
+        return NULL;
+    }
+
+    return &p_current_title->chaptersindex;
+}
+
+- (void)teletextAvailibilityChanged:(BOOL)hasTeletextMenu
+{
+    _teletextMenuAvailable = hasTeletextMenu;
+    _defaultNotificationCenter postNotificationName:VLCPlayerTeletextTransparencyChanged
+                                              object:self;
+}
+
+- (void)teletextEnabledChanged:(BOOL)teletextOn
+{
+    _teletextEnabled = teletextOn;
+    _defaultNotificationCenter postNotificationName:VLCPlayerTeletextEnabled
+                                              object:self;
+}
+
+- (void)setTeletextEnabled:(BOOL)teletextEnabled
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SetTeletextEnabled(_p_player, teletextEnabled);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)teletextPageChanged:(unsigned int)page
+{
+    _teletextPage = page;
+    _defaultNotificationCenter postNotificationName:VLCPlayerTeletextPageChanged
+                                              object:self;
+}
+
+- (void)setTeletextPage:(unsigned int)teletextPage
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SelectTeletextPage(_p_player, teletextPage);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)teletextTransparencyChanged:(BOOL)isTransparent
+{
+    _teletextTransparent = isTransparent;
+    _defaultNotificationCenter postNotificationName:VLCPlayerTeletextTransparencyChanged
+                                              object:self;
+}
+
+- (void)setTeletextTransparent:(BOOL)teletextTransparent
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SetTeletextTransparency(_p_player, teletextTransparent);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)audioDelayChanged:(vlc_tick_t)audioDelay
+{
+    _audioDelay = audioDelay;
+    _defaultNotificationCenter postNotificationName:VLCPlayerAudioDelayChanged
+                                              object:self;
+}
+
+- (void)setAudioDelay:(vlc_tick_t)audioDelay
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SetAudioDelay(_p_player, audioDelay, VLC_PLAYER_WHENCE_ABSOLUTE);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)subtitlesDelayChanged:(vlc_tick_t)subtitlesDelay
+{
+    _subtitlesDelay = subtitlesDelay;
+    _defaultNotificationCenter postNotificationName:VLCPlayerSubtitlesDelayChanged
+                                              object:self;
+}
+
+- (void)setSubtitlesDelay:(vlc_tick_t)subtitlesDelay
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SetSubtitleDelay(_p_player, subtitlesDelay, VLC_PLAYER_WHENCE_ABSOLUTE);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)delayChanged:(vlc_tick_t)trackDelay forTrack:(vlc_es_id_t *)esID
+{
+    _defaultNotificationCenter postNotificationName:VLCPlayerDelayChangedForSpecificElementaryStream
+                                              object:self
+                                            userInfo:@{ VLCPlayerElementaryStreamID : NSValue valueWithPointer:esID,
+                                                        VLCTick : NSNumber numberWithLongLong:trackDelay };
+
+}
+
+- (vlc_tick_t)delayForElementaryStreamID:(vlc_es_id_t *)esID
+{
+    vlc_player_Lock(_p_player);
+    vlc_tick_t delay = vlc_player_GetEsIdDelay(_p_player, esID);
+    vlc_player_Unlock(_p_player);
+    return delay;
+}
+
+- (int)setDelay:(vlc_tick_t)delay forElementaryStreamID:(vlc_es_id_t *)esID relativeWhence:(BOOL)relative
+{
+    vlc_player_Lock(_p_player);
+    int returnValue = vlc_player_SetEsIdDelay(_p_player, esID, delay, relative ? VLC_PLAYER_WHENCE_RELATIVE : VLC_PLAYER_WHENCE_ABSOLUTE);
+    vlc_player_Unlock(_p_player);
+    return returnValue;
+}
+
+- (void)subtitlesFPSChanged:(float)subtitlesFPS
+{
+    _subtitlesFPS = subtitlesFPS;
+    _defaultNotificationCenter postNotificationName:VLCPlayerSubtitlesFPSChanged
+                                              object:self;
+}
+
+- (void)setSubtitlesFPS:(float)subtitlesFPS
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SetAssociatedSubsFPS(_p_player, subtitlesFPS);
+    vlc_player_Unlock(_p_player);
+}
+
+- (unsigned int)subtitleTextScalingFactor
+{
+    unsigned int ret = 100;
+    vlc_player_Lock(_p_player);
+    ret = vlc_player_GetSubtitleTextScale(_p_player);
+    vlc_player_Unlock(_p_player);
+    return ret;
+}
+
+- (void)setSubtitleTextScalingFactor:(unsigned int)subtitleTextScalingFactor
+{
+    if (subtitleTextScalingFactor < 10)
+        subtitleTextScalingFactor = 10;
+    if (subtitleTextScalingFactor > 500)
+        subtitleTextScalingFactor = 500;
+
+    vlc_player_Lock(_p_player);
+    vlc_player_SetSubtitleTextScale(_p_player, subtitleTextScalingFactor);
+    vlc_player_Unlock(_p_player);
+}
+
+- (int)addAssociatedMediaToCurrentFromURL:(NSURL *)URL
+                               ofCategory:(enum es_format_category_e)category
+                         shallSelectTrack:(BOOL)selectTrack
+                          shallDisplayOSD:(BOOL)showOSD
+                     shallVerifyExtension:(BOOL)verifyExtension
+{
+    int ret;
+    vlc_player_Lock(_p_player);
+    ret = vlc_player_AddAssociatedMedia(_p_player, category, URL absoluteString UTF8String, selectTrack, showOSD, verifyExtension);
+    vlc_player_Unlock(_p_player);
+    return ret;
+}
+
+- (void)rendererChanged:(vlc_renderer_item_t *)newRenderer
+{
+    _rendererItem = newRenderer;
+    _defaultNotificationCenter postNotificationName:VLCPlayerRendererChanged
+                                              object:self;
+}
+
+- (void)setRendererItem:(vlc_renderer_item_t *)rendererItem
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SetRenderer(_p_player, rendererItem);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)navigateInInteractiveContent:(enum vlc_player_nav)navigationAction
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_Navigate(_p_player, navigationAction);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)recordingChanged:(BOOL)recording
+{
+    _enableRecording = recording;
+    _defaultNotificationCenter postNotificationName:VLCPlayerRecordingChanged
+                                              object:self;
+}
+
+- (void)inputStatsUpdated:(VLCInputStats *)inputStats
+{
+    _statistics = inputStats;
+    _defaultNotificationCenter postNotificationName:VLCPlayerStatisticsUpdated
+                                              object:self
+                                            userInfo:@{VLCPlayerInputStats : inputStats};
+}
+
+#pragma mark - track selection
+- (void)trackSelectionChanged
+{
+    _defaultNotificationCenter postNotificationName:VLCPlayerTrackSelectionChanged object:self;
+}
+
+- (void)trackListChanged
+{
+    _defaultNotificationCenter postNotificationName:VLCPlayerTrackListChanged object:self;
+}
+
+- (void)selectTrack:(VLCTrackMetaData *)track exclusively:(BOOL)exclusiveSelection
+{
+    vlc_player_Lock(_p_player);
+    const enum es_format_category_e formatCategory = vlc_es_id_GetCat(track.esID);
+    vlc_player_SelectEsId(_p_player, track.esID, (formatCategory == AUDIO_ES || exclusiveSelection) ? VLC_PLAYER_SELECT_EXCLUSIVE : VLC_PLAYER_SELECT_SIMULTANEOUS);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)unselectTrack:(VLCTrackMetaData *)track
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_UnselectEsId(_p_player, track.esID);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)unselectTracksFromCategory:(enum es_format_category_e)category
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_UnselectTrackCategory(_p_player, category);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)selectPreviousTrackForCategory:(enum es_format_category_e)category
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SelectPrevTrack(_p_player, category, VLC_VOUT_ORDER_PRIMARY);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)selectNextTrackForCategory:(enum es_format_category_e)category
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SelectNextTrack(_p_player, category, VLC_VOUT_ORDER_PRIMARY);
+    vlc_player_Unlock(_p_player);
+}
+
+- (NSArray<VLCTrackMetaData *> *)tracksForCategory:(enum es_format_category_e)category
+{
+    size_t numberOfTracks = 0;
+    NSMutableArray *tracks;
+
+    vlc_player_Lock(_p_player);
+    numberOfTracks = vlc_player_GetTrackCount(_p_player, category);
+    if (numberOfTracks == 0) {
+        vlc_player_Unlock(_p_player);
+        return nil;
+    }
+
+    tracks = NSMutableArray alloc initWithCapacity:numberOfTracks;
+    for (size_t x = 0; x < numberOfTracks; x++) {
+        const struct vlc_player_track *p_track = vlc_player_GetTrackAt(_p_player, category, x);
+        VLCTrackMetaData *trackMetadata = VLCTrackMetaData alloc initWithTrackStructure:p_track;
+        tracks addObject:trackMetadata;
+    }
+    vlc_player_Unlock(_p_player);
+
+    return tracks copy;
+}
+
+- (NSArray<VLCTrackMetaData *> *)audioTracks
+{
+    return self tracksForCategory:AUDIO_ES;
+}
+
+- (NSArray<VLCTrackMetaData *> *)videoTracks
+{
+    return self tracksForCategory:VIDEO_ES;
+}
+
+- (NSArray<VLCTrackMetaData *> *)subtitleTracks
+{
+    return self tracksForCategory:SPU_ES;
+}
+
+- (VLCTrackMetaData *)selectedTrackMetadataOfCategory:(enum es_format_category_e)category
+{
+    vlc_player_Lock(_p_player);
+    const struct vlc_player_track * const p_track =
+        vlc_player_GetSelectedTrack(_p_player, category);
+    vlc_player_Unlock(_p_player);
+    return VLCTrackMetaData alloc initWithTrackStructure:p_track;
+}
+
+- (BOOL)videoTracksEnabled
+{
+    vlc_player_Lock(_p_player);
+    const BOOL enabled = vlc_player_IsVideoEnabled(_p_player);
+    vlc_player_Unlock(_p_player);
+    return enabled;
+}
+
+- (VLCTrackMetaData *)selectedVideoTrack
+{
+    return self selectedTrackMetadataOfCategory:VIDEO_ES;
+}
+
+- (BOOL)audioTracksEnabled
+{
+    vlc_player_Lock(_p_player);
+    const BOOL enabled = vlc_player_IsAudioEnabled(_p_player);
+    vlc_player_Unlock(_p_player);
+    return enabled;
+}
+
+- (VLCTrackMetaData *)selectedAudioTrack
+{
+    return self selectedTrackMetadataOfCategory:AUDIO_ES;
+}
+
+- (void)programListChanged
+{
+    _defaultNotificationCenter postNotificationName:VLCPlayerProgramListChanged
+                                              object:self;
+}
+
+- (void)programSelectionChanged:(int)selectedID
+{
+    _selectedProgramID = selectedID;
+    _defaultNotificationCenter postNotificationName:VLCPlayerProgramSelectionChanged
+                                              object:self;
+}
+
+- (void)selectProgram:(VLCProgramMetaData *)program
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SelectProgram(_p_player, program.group_id);
+    vlc_player_Unlock(_p_player);
+}
+
+- (size_t)numberOfPrograms
+{
+    size_t ret = 0;
+    vlc_player_Lock(_p_player);
+    ret = vlc_player_GetProgramCount(_p_player);
+    vlc_player_Unlock(_p_player);
+    return ret;
+}
+
+- (nullable VLCProgramMetaData *)programAtIndex:(size_t)index
+{
+    VLCProgramMetaData *programMetaData = nil;
+    vlc_player_Lock(_p_player);
+    const struct vlc_player_program *p_program = vlc_player_GetProgramAt(_p_player, index);
+    if (p_program != NULL) {
+        programMetaData = VLCProgramMetaData alloc initWithProgramStructure:p_program;
+    }
+    vlc_player_Unlock(_p_player);
+    return programMetaData;
+}
+
+- (nullable VLCProgramMetaData *)programForID:(int)programID
+{
+    VLCProgramMetaData *programMetaData = nil;
+    vlc_player_Lock(_p_player);
+    const struct vlc_player_program *p_program = vlc_player_GetProgram(_p_player, programID);
+    if (p_program != NULL) {
+        programMetaData = VLCProgramMetaData alloc initWithProgramStructure:p_program;
+    }
+    vlc_player_Unlock(_p_player);
+    return programMetaData;
+}
+
+- (void)ABLoopStateChanged:(enum vlc_player_abloop)abLoopState
+{
+    _abLoopState = abLoopState;
+
+    vlc_tick_t a_time = -1;
+    vlc_tick_t b_time = -1;
+    double a_pos = -1;
+    double b_pos = -1;
+    
+    vlc_player_Lock(_p_player);
+    const enum vlc_player_abloop state = vlc_player_GetAtoBLoop(_p_player, &a_time, &a_pos, &b_time, &b_pos);
+    vlc_player_Unlock(_p_player);
+
+    _aLoopTime = a_time;
+    _bLoopTime = b_time;
+    _aLoopPosition = a_pos;
+    _bLoopPosition = b_pos;
+
+    _defaultNotificationCenter postNotificationName:VLCPlayerABLoopStateChanged
+                                              object:self;
+}
+
+- (int)setABLoop
+{
+    int ret = 0;
+
+    vlc_player_Lock(_p_player);
+    switch (_abLoopState) {
+        case VLC_PLAYER_ABLOOP_A:
+            ret = vlc_player_SetAtoBLoop(_p_player, VLC_PLAYER_ABLOOP_B);
+            break;
+
+        case VLC_PLAYER_ABLOOP_B:
+            ret = vlc_player_SetAtoBLoop(_p_player, VLC_PLAYER_ABLOOP_NONE);
+            break;
+
+        default:
+            ret = vlc_player_SetAtoBLoop(_p_player, VLC_PLAYER_ABLOOP_A);
+            break;
+    }
+    vlc_player_Unlock(_p_player);
+
+    return ret;
+}
+
+- (int)disableABLoop
+{
+    vlc_player_Lock(_p_player);
+    int ret = vlc_player_SetAtoBLoop(_p_player, VLC_PLAYER_ABLOOP_NONE);
+    vlc_player_Unlock(_p_player);
+    return ret;
+}
+
+- (void)setEnableRecording:(BOOL)enableRecording
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SetRecordingEnabled(_p_player, enableRecording, NULL);
+    vlc_player_Unlock(_p_player);
+}
+
+- (void)toggleRecord
+{
+    vlc_player_Lock(_p_player);
+    vlc_player_SetRecordingEnabled(_p_player, !_enableRecording, NULL);
+    vlc_player_Unlock(_p_player);
+}
+
+#pragma mark - video specific delegation
+
+- (void)fullscreenChanged:(BOOL)isFullscreen
+{
+    _fullscreen = isFullscreen;
+    _defaultNotificationCenter postNotificationName:VLCPlayerFullscreenChanged
+                                              object:self;
+}
+
+- (void)setFullscreen:(BOOL)fullscreen
+{
+    vlc_player_vout_SetFullscreen(_p_player, fullscreen);
+}
+
+- (void)toggleFullscreen
+{
+    vlc_player_vout_SetFullscreen(_p_player, !_fullscreen);
+}
+
+- (void)togglePictureInPicture
+{
+    _defaultNotificationCenter postNotificationName:VLCPlayerPictureInPictureChanged
+                                              object:self;
+}
+
+- (void)wallpaperModeChanged:(BOOL)wallpaperModeValue
+{
+    _wallpaperMode = wallpaperModeValue;
+    _defaultNotificationCenter postNotificationName:VLCPlayerWallpaperModeChanged
+                                              object:self;
+}
+
+- (void)setWallpaperMode:(BOOL)wallpaperMode
+{
+    vlc_player_vout_SetWallpaperModeEnabled(_p_player, wallpaperMode);
+}
+
+- (void)takeSnapshot
+{
+    vlc_player_vout_Snapshot(_p_player);
+}
+
+- (void)voutListUpdated
+{
+    _defaultNotificationCenter postNotificationName:VLCPlayerListOfVideoOutputThreadsChanged
+                                              object:self;
+}
+
+- (vout_thread_t *)mainVideoOutputThread
+{
+    return vlc_player_vout_Hold(_p_player);
+}
+
+- (vout_thread_t *)videoOutputThreadForKeyWindow
+{
+    vout_thread_t *p_vout = nil;
+
+    id currentWindow = NSApp keyWindow;
+    if (currentWindow respondsToSelector:@selector(videoView)) {
+        VLCVideoWindowCommon *videoWindow = (VLCVideoWindowCommon *)currentWindow;
+        VLCVoutView *videoView = videoWindow.videoViewController.voutView;
+        if (videoView) {
+            p_vout = videoView voutThread;
+        }
+    }
+
+    if (!p_vout)
+        p_vout = self mainVideoOutputThread;
+
+    return p_vout;
+}
+
+- (NSArray<NSValue *> *)allVideoOutputThreads
+{
+    size_t numberOfVoutThreads = 0;
+    vout_thread_t **pp_vouts = vlc_player_vout_HoldAll(_p_player, &numberOfVoutThreads);
+    if (numberOfVoutThreads == 0) {
+        return nil;
+    }
+
+    NSMutableArray<NSValue *> *vouts = NSMutableArray arrayWithCapacity:numberOfVoutThreads;
+
+    for (size_t i = 0; i < numberOfVoutThreads; ++i)
+    {
+        assert(pp_voutsi);
+        vouts addObject:NSValue valueWithPointer:pp_voutsi;
+    }
+
+    free(pp_vouts);
+    return vouts;
+}
+
+- (void)displayOSDMessage:(NSString *)message
+{
+    vlc_player_osd_Message(_p_player, message UTF8String);
+}
+
+- (void)setAspectRatioIsLocked:(BOOL)b_value
+{
+    config_PutInt("macosx-lock-aspect-ratio", b_value);
+}
+
+- (BOOL)aspectRatioIsLocked
+{
+    return config_GetInt("macosx-lock-aspect-ratio");
+}
+
+#pragma mark - audio specific delegation
+
+- (void)volumeChanged:(float)volume
+{
+    _volume = volume;
+    _defaultNotificationCenter postNotificationName:VLCPlayerVolumeChanged
+                                              object:self;
+}
+
+- (void)setVolume:(float)volume
+{
+    vlc_player_aout_SetVolume(_p_player, volume);
+}
+
+- (void)incrementVolume
+{
+    vlc_player_aout_IncrementVolume(_p_player, 1, NULL);
+}
+
+- (void)decrementVolume
+{
+    vlc_player_aout_DecrementVolume(_p_player, 1, NULL);
+}
+
+- (void)muteChanged:(BOOL)mute
+{
+    _mute = mute;
+    _defaultNotificationCenter postNotificationName:VLCPlayerMuteChanged
+                                              object:self;
+}
+
+- (void)setMute:(BOOL)mute
+{
+    vlc_player_aout_Mute(_p_player, mute);
+}
+
+- (void)toggleMute
+{
+    vlc_player_aout_ToggleMute(_p_player);
+}
+
+- (audio_output_t *)mainAudioOutput
+{
+    return vlc_player_aout_Hold(_p_player);
+}
+
+- (int)enableAudioFilterWithName:(NSString *)name state:(BOOL)state
+{
+    if (name == nil || name.length == 0) {
+        return VLC_EINVAL;
+    }
+
+    return vlc_player_aout_EnableFilter(_p_player, name UTF8String, state);
+}
+
+@end
+
+@implementation VLCInputStats
+
+- (instancetype)initWithStatsStructure:(const struct input_stats_t *)p_stats
+{
+    self = super init;
+    if (self && p_stats != NULL) {
+        _inputReadPackets = p_stats->i_read_packets;
+        _inputReadBytes = p_stats->i_read_bytes;
+        _inputBitrate = p_stats->f_input_bitrate;
+
+        _demuxReadPackets = p_stats->i_demux_read_packets;
+        _demuxReadBytes = p_stats->i_demux_read_bytes;
+        _demuxBitrate = p_stats->f_demux_bitrate;
+        _demuxCorrupted = p_stats->i_demux_corrupted;
+        _demuxDiscontinuity = p_stats->i_demux_discontinuity;
+
+        _decodedAudio = p_stats->i_decoded_audio;
+        _decodedVideo = p_stats->i_decoded_video;
+
+        _displayedPictures = p_stats->i_displayed_pictures;
+        _latePictures = p_stats->i_late_pictures;
+        _lostPictures = p_stats->i_lost_pictures;
+
+        _playedAudioBuffers = p_stats->i_played_abuffers;
+        _lostAudioBuffers = p_stats->i_lost_abuffers;
+    }
+    return self;
+}
+
+@end
+
+@implementation VLCTrackMetaData
+
+- (instancetype)initWithTrackStructure:(const struct vlc_player_track *)p_track
+{
+    self = super init;
+    if (self && p_track != NULL) {
+        _esID = p_track->es_id;
+        _name = toNSStr(p_track->name);
+        _selected = p_track->selected;
+    }
+    return self;
+}
+
+- (NSString *)description
+{
+    return NSString stringWithFormat:@"%@: name: %@, selected: %i", VLCTrackMetaData className, self.name, self.selected;
+}
+
+@end
+
+@implementation VLCProgramMetaData
+
+- (instancetype)initWithProgramStructure:(const struct vlc_player_program *)p_program
+{
+    self = super init;
+    if (self && p_program != NULL) {
+        _group_id = p_program->group_id;
+        _name = toNSStr(p_program->name);
+        _selected = p_program->selected;
+        _scrambled = p_program->scrambled;
+    }
+    return self;
+}
+
+- (NSString *)description
+{
+    return NSString stringWithFormat:@"%@: name: %@", VLCProgramMetaData className, self.name;
+}
+
+@end

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayerTitle.h Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/playqueue/VLCPlayerTitle.m Added

@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * VLCPlayerTitle.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCPlayerTitle.h"
+
+#import "extensions/NSString+Helpers.h"
+#import "playqueue/VLCPlayerChapter.h"
+
+@implementation VLCPlayerTitle
+
+- (instancetype)initWithTitle:(const struct vlc_player_title *)p_title atIndex:(size_t)index
+{
+    self = super init;
+    if (self) {
+        _index = index;
+        _name = toNSStr(p_title->name);
+        _length = p_title->length;
+        _lengthString = NSString stringWithTimeFromTicks:_length;
+        _flags = p_title->flags;
+        _chapterCount = p_title->chapter_count;
+
+        NSMutableArray * const chapters = NSMutableArray arrayWithCapacity:self.chapterCount;
+        for (int i = 0; i < self.chapterCount; i++) {
+            VLCPlayerChapter * const chapter =
+                VLCPlayerChapter alloc initWithChapter:&p_title->chaptersi;
+            chapters addObject:chapter;
+        }
+        _chapters = chapters.copy;
+    }
+    return self;
+}
+
+@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/preferences/VLCSimplePrefsController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/preferences/VLCSimplePrefsController.m Changed

@@ -404,7 +404,7 @@
     _intf_largeFontInListsCheckbox setTitle: _NS("Use large text for list views");
 
     _intf_playbackBehaviourBox setTitle:_NS("Playback behaviour");
-    _intf_enableNotificationsCheckbox setTitle: _NS("Enable notifications on playlist item change");
+    _intf_enableNotificationsCheckbox setTitle: _NS("Enable notifications on play queue item change");
     _intf_pauseitunesLabel setStringValue:_NS("Control external music players");
 
     _intf_networkBox setTitle: _NS("Privacy / Network Interaction");
@@ -475,28 +475,6 @@
     self.window setTitle: _NS("Preferences");
 }
 
-/* TODO: move this part to core */
-#define config_GetLabel(a,b) __config_GetLabel(VLC_OBJECT(a),b)
-static inline const char * __config_GetLabel(vlc_object_t *p_this, const char *psz_name)
-{
-    module_config_t *p_config = config_FindConfig(psz_name);
-
-    /* sanity checks */
-    if (!p_config) {
-        msg_Err(p_this, "option %s does not exist", psz_name);
-        return NULL;
-    }
-
-    if (p_config->psz_longtext)
-        return p_config->psz_longtext;
-    else if (p_config->psz_text)
-        return p_config->psz_text;
-    else
-        msg_Warn(p_this, "option %s does not include any help", psz_name);
-
-    return NULL;
-}
-
 #pragma mark -
 #pragma mark Setup controls
 
@@ -579,14 +557,14 @@
 - (void)setupButton: (NSButton *)object forBoolValue: (const char *)name
 {
     object setState: config_GetInt(name);
-    object setToolTip: NSTR(config_GetLabel(p_intf, name));
+    object setToolTip: NSTR(config_GetLabel(name));
 }
 
 - (void)setupField:(NSTextField *)object forOption:(const char *)psz_option
 {
     char *psz_tmp = config_GetPsz(psz_option);
     object setStringValue: toNSStr(psz_tmp);
-    object setToolTip: NSTR(config_GetLabel(p_intf, psz_option));
+    object setToolTip: NSTR(config_GetLabel(psz_option));
     free(psz_tmp);
 }
 
@@ -816,7 +794,7 @@
     i = config_GetInt("freetype-opacity") * 100.0 / 255.0 + 0.5;
     _osd_opacityTextField setIntValue: i;
     _osd_opacitySlider setIntValue: i;
-    _osd_opacitySlider setToolTip: NSTR(config_GetLabel(p_intf, "freetype-opacity"));
+    _osd_opacitySlider setToolTip: NSTR(config_GetLabel("freetype-opacity"));
     _osd_opacityTextField setToolTip: _osd_opacitySlider toolTip;
     self setupButton:_osd_forceboldCheckbox forBoolValue: "freetype-bold";
     self setupButton:_osd_outline_colorPopup forIntList: "freetype-outline-color";
@@ -905,7 +883,7 @@
     alert setMessageText:_NS("Reset Preferences");
     alert setInformativeText:_NS("This will reset VLC media player's preferences.\n\n"
                                   "Note that VLC will restart during the process, so your current "
-                                  "playlist will be emptied and eventual playback, streaming or "
+                                  "play queue will be emptied and eventual playback, streaming or "
                                   "transcoding activities will stop immediately.\n\n"
                                   "The Media Library will not be affected.\n\n"
                                   "Are you sure you want to continue?");

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/preferences/prefs_widgets.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/preferences/prefs_widgets.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/preferences/prefs_widgets.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/preferences/prefs_widgets.m Changed

@@ -56,188 +56,6 @@
 #define UP_ARROWHEAD                        "\xE2\x8C\x83"
 #define PLACE_OF_INTEREST_SIGN              "\xE2\x8C\x98"
 
-#define POPULATE_A_KEY(o_menu, string, value)                               \
-{                                                                           \
-    NSMenuItem *o_mi;                                                       \
-/*  Normal */                                                               \
-    o_mi = NSMenuItem alloc initWithTitle:string                         \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        0;                                                                 \
-    o_mi setAlternate: NO;                                                \
-    o_mi setTag:                                                           \
-        (value);                                                           \
-    o_menu addItem: o_mi;                                                 \
-/*  Ctrl */                                                                 \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(UP_ARROWHEAD)                                              \
-          stringByAppendingString: string                                  \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask;                                                  \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        KEY_MODIFIER_CTRL | (value);                                       \
-    o_menu addItem: o_mi;                                                 \
-/* Ctrl+Alt */                                                              \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(UP_ARROWHEAD OPTION_KEY)                                   \
-          stringByAppendingString: string                                  \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSAlternateKeyMask;                             \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT) | (value);                  \
-    o_menu addItem: o_mi;                                                 \
-/* Ctrl+Shift */                                                            \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(UP_ARROWHEAD UPWARDS_WHITE_ARROW)                          \
-          stringByAppendingString: string                                  \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-       NSControlKeyMask | NSShiftKeyMask;                                  \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_SHIFT) | (value);                \
-    o_menu addItem: o_mi;                                                 \
-/* Ctrl+Apple */                                                            \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(UP_ARROWHEAD PLACE_OF_INTEREST_SIGN)                       \
-          stringByAppendingString: string                                  \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSCommandKeyMask;                               \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_COMMAND) | (value);              \
-    o_menu addItem: o_mi;                                                 \
-/* Ctrl+Alt+Shift */                                                        \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(UP_ARROWHEAD OPTION_KEY UPWARDS_WHITE_ARROW)               \
-          stringByAppendingString: string                                  \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSAlternateKeyMask | NSShiftKeyMask;            \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT) |       \
-             (value);                                                      \
-    o_menu addItem: o_mi;                                                 \
-/* Ctrl+Alt+Apple */                                                        \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(UP_ARROWHEAD OPTION_KEY PLACE_OF_INTEREST_SIGN)            \
-          stringByAppendingString: string                                  \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask;          \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_COMMAND) |     \
-            (value);                                                       \
-    o_menu addItem: o_mi;                                                 \
-/* Ctrl+Shift+Apple */                                                      \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(UP_ARROWHEAD UPWARDS_WHITE_ARROW PLACE_OF_INTEREST_SIGN)   \
-          stringByAppendingString: string                                  \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSShiftKeyMask | NSCommandKeyMask;              \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) |   \
-            (value);                                                       \
-    o_menu addItem: o_mi;                                                 \
-/* Ctrl+Alt+Shift+Apple */                                                  \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(UP_ARROWHEAD OPTION_KEY UPWARDS_WHITE_ARROW PLACE_OF_INTEREST_SIGN) \
-         stringByAppendingString: string                                   \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSAlternateKeyMask | NSShiftKeyMask |            \
-            NSCommandKeyMask;                                              \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT |        \
-            KEY_MODIFIER_COMMAND) | (value);                               \
-    o_menu addItem: o_mi;                                                 \
-/* Alt */                                                                   \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(OPTION_KEY) stringByAppendingString: string               \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSAlternateKeyMask;                                                \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        KEY_MODIFIER_ALT | (value);                                        \
-    o_menu addItem: o_mi;                                                 \
-/* Alt+Shift */                                                             \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(OPTION_KEY UPWARDS_WHITE_ARROW) stringByAppendingString: string \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSAlternateKeyMask | NSShiftKeyMask;                               \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT) | (value);                 \
-    o_menu addItem: o_mi;                                                 \
-/* Alt+Apple */                                                             \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(OPTION_KEY PLACE_OF_INTEREST_SIGN)                         \
-         stringByAppendingString: string action:nil keyEquivalent:@"";    \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSAlternateKeyMask | NSCommandKeyMask;                             \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_ALT | KEY_MODIFIER_COMMAND) | (value);               \
-    o_menu addItem: o_mi;                                                 \
-/* Alt+Shift+Apple */                                                       \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(OPTION_KEY UPWARDS_WHITE_ARROW PLACE_OF_INTEREST_SIGN)     \
-          stringByAppendingString: string                                  \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSAlternateKeyMask | NSShiftKeyMask | NSCommandKeyMask;            \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) |    \
-            (value);                                                       \
-    o_menu addItem: o_mi;                                                 \
-/* Shift */                                                                 \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(UPWARDS_WHITE_ARROW)                                       \
-          stringByAppendingString: string                                  \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSShiftKeyMask;                                                    \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        KEY_MODIFIER_SHIFT | (value);                                      \
-    o_menu addItem: o_mi;                                                 \
-/* Shift+Apple */                                                           \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(UPWARDS_WHITE_ARROW PLACE_OF_INTEREST_SIGN)                \
-         stringByAppendingString: string                                   \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSShiftKeyMask | NSCommandKeyMask;                                 \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        (KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) | (value);             \
-    o_menu addItem: o_mi;                                                 \
-/* Apple */                                                                 \
-    o_mi = NSMenuItem alloc initWithTitle:                               \
-        toNSStr(PLACE_OF_INTEREST_SIGN)                                    \
-          stringByAppendingString: string                                  \
-        action:nil keyEquivalent:@"";                                      \
-    o_mi setKeyEquivalentModifierMask:                                     \
-        NSCommandKeyMask;                                                  \
-    o_mi setAlternate: YES;                                               \
-    o_mi setTag:                                                           \
-        KEY_MODIFIER_COMMAND | (value);                                    \
-    o_menu addItem: o_mi;                                                 \
-}
-
 #define ADD_LABEL(o_label, superFrame, x_offset, my_y_offset, label,        \
     tooltip)                                                                \
 {                                                                           \
@@ -819,14 +637,13 @@
             else
                 control = FloatConfigControl alloc initWithItem: _p_item withView: parentView;
             break;
-            /* don't display keys in the advanced settings, since the current controls
-             are broken by design. The user is required to change hotkeys in the sprefs
-             and can only change really advanced stuff here..
-             case CONFIG_ITEM_KEY:
-             control = KeyConfigControl alloc
-             initWithItem: _p_item
-             withView: parentView;
-             break; */
+        /* don't display keys in the advanced settings, since the current controls
+         are broken by design. The user is required to change hotkeys in the sprefs
+         and can only change really advanced stuff here..
+
+        case CONFIG_ITEM_KEY:
+            break;
+         */
         case CONFIG_ITEM_MODULE_LIST:
         case CONFIG_ITEM_MODULE_LIST_CAT:
             control = ModuleListConfigControl alloc initWithItem: _p_item withView: parentView;
@@ -1873,87 +1690,6 @@
 }
 @end
 
-@interface KeyConfigControl()
-{
-    NSPopUpButton   *o_popup;
-}
-@end
-
-@implementation KeyConfigControl
-- (id)initWithItem:(module_config_t *)p_item
-          withView:(NSView *)parentView
-{
-    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
-    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;
-
-    NSRect mainFrame = parentView frame;
-    NSString *labelString, *toolTip;
-    mainFrame.size.height = 22;
-    mainFrame.size.width = mainFrame.size.width - leftMargin - rightMargin + 1;
-    mainFrame.origin.x = leftMargin;
-    mainFrame.origin.y = 0;
-
-    if (self = super initWithFrame:mainFrame item:p_item) {
-        self.viewType = CONFIG_ITEM_KEY;
-
-        toolTip = NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP;
-
-        /* add the label */
-        labelString = NSTR(p_item->psz_text);
-        ADD_LABEL(self.label, mainFrame, 0, -1, labelString, toolTip)
-        self.label setAutoresizingMask:NSViewNotSizable ;
-        self addSubview: self.label;
-
-        /* build the popup */
-        ADD_POPUP(o_popup, mainFrame, self.label frame.origin.x +
-                  self.label frame.size.width + 3,
-                  -2, 0, toolTip)
-        o_popup setAutoresizingMask:NSViewWidthSizable ;
-
-        if (o_keys_menu == nil) {
-            o_keys_menu = NSMenu alloc initWithTitle: @"Keys Menu";
-#warning This does not work anymore. FIXME.
-#if 0
-            for (unsigned int i = 0; i < sizeof(vlc_key) / sizeof(key_descriptor_t); i++)
-                if (vlc_keyi.psz_key_string)
-                    POPULATE_A_KEY(o_keys_menu,toNSStr(vlc_keyi.psz_key_string),
-                                   vlc_keyi.i_key_code)
-#endif
-                    }
-        o_popup setMenu:o_keys_menu copyWithZone:nil;
-        o_popup selectItem:o_popup menu itemWithTag:p_item->value.i;
-        self addSubview: o_popup;
-
-    }
-    return self;
-}
-
-- (void) alignWithXPosition:(int)i_xPos
-{
-    NSRect frame;
-    NSRect superFrame = self frame;
-    frame = self.label frame;
-    frame.origin.x = i_xPos - frame.size.width - 3;
-    self.label setFrame:frame;
-
-    frame = o_popup frame;
-    frame.origin.x = i_xPos - 1;
-    frame.size.width = superFrame.size.width - frame.origin.x + 2;
-    o_popup setFrame:frame;
-}
-
-- (int)intValue
-{
-    return (int)o_popup selectedTag;
-}
-
-- (void)resetValues
-{
-    o_popup selectItem:o_popup menu itemWithTag:config_GetInt(self.p_item->psz_name);
-    super resetValues;
-}
-@end
-
 @interface ModuleListConfigControl() <NSTextFieldDelegate, NSTableViewDataSource>
 {
     NSTextField     *o_textfield;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCCustomWindowButton.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCCustomWindowButton.m Changed

@@ -265,7 +265,7 @@
 
 @implementation VLCCustomEmptyLibraryBrowseButton
 
--(void)awakeFromNib
+- (void)awakeFromNib
 {
     self.wantsLayer = YES;
     self.layer.backgroundColor = NSColor.VLCAccentColor.CGColor;
@@ -273,19 +273,6 @@
     
     self.bezelStyle = NSBezelStyleRecessed;
     self.bordered = NO;
-    
-    NSMutableAttributedString *title = NSMutableAttributedString alloc initWithAttributedString:self.attributedTitle;
-    NSRange const titleRange = NSMakeRange(0, title length);
-    
-    // Normal
-    title addAttribute:NSForegroundColorAttributeName value:NSColor whiteColor range:titleRange;
-    self setAttributedTitle:title;
-    
-    // Highlighted
-    title removeAttribute:NSForegroundColorAttributeName range:titleRange;
-    title addAttribute:NSForegroundColorAttributeName value:NSColor.VLClibraryLightTitleColor range:titleRange;
-    
-    self setAttributedAlternateTitle:title;
         
     if (self.cell isKindOfClass:NSButtonCell class) {
         NSButtonCell *cell = (NSButtonCell *)self.cell;
@@ -293,13 +280,26 @@
         cell.highlightsBy = NSContentsCellMask;
         cell.imagePosition = NSImageLeft;
     }
-    
-#if 0
-    // FIXME: Add the @"wifi" system symbol for macOS 11
+
     if (@available(macOS 11.0, *)) {
-        NSImage imageWithSystemSymbolName:@"wifi" accessibilityDescription:nil;
+        self.image = NSImage imageWithSystemSymbolName:@"folder" accessibilityDescription:nil;
+        self.image.template = YES;
+        self.imageHugsTitle = YES;
+        self.contentTintColor = NSColor.whiteColor;
+    } else {
+        NSMutableAttributedString *title = NSMutableAttributedString alloc initWithAttributedString:self.attributedTitle;
+        NSRange const titleRange = NSMakeRange(0, title length);
+
+        // Normal
+        title addAttribute:NSForegroundColorAttributeName value:NSColor whiteColor range:titleRange;
+        self setAttributedTitle:title;
+
+        // Highlighted
+        title removeAttribute:NSForegroundColorAttributeName range:titleRange;
+        title addAttribute:NSForegroundColorAttributeName value:NSColor.VLClibraryLightTitleColor range:titleRange;
+
+        self setAttributedAlternateTitle:title;
     }
-#endif
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCDragDropView.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCDragDropView.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCDragDropView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCDragDropView.m Changed

@@ -45,9 +45,9 @@
     return self;
 }
 
-- (void)enablePlaylistItems
+- (void)enablePlayQueueItems
 {
-    self registerForDraggedTypes:NSArray arrayWithObjects:NSFilenamesPboardType, nil;
+    self setupDragRecognition;
 }
 
 - (BOOL)mouseDownCanMoveWindow
@@ -55,14 +55,9 @@
     return YES;
 }
 
-- (void)dealloc
-{
-    self unregisterDraggedTypes;
-}
-
 - (void)awakeFromNib
 {
-    self registerForDraggedTypes:NSArray arrayWithObject:NSFilenamesPboardType;
+    super awakeFromNib;
     self.wantsLayer = YES;
     self.layer.cornerRadius = 5.;
     self updateBorderColor;
@@ -75,14 +70,11 @@
 
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
 {
-    if ((NSDragOperationGeneric & sender draggingSourceOperationMask) == NSDragOperationGeneric) {
-        if (self.drawBorder) {
-            self.layer.borderWidth = 5.;
-        }
-        return NSDragOperationCopy;
+    const NSDragOperation operation = super draggingEntered:sender;
+    if (operation != NSDragOperationNone && self.drawBorder) {
+        self.layer.borderWidth = 5.;
     }
-
-    return NSDragOperationNone;
+    return operation;
 }
 
 - (void)draggingEnded:(id <NSDraggingInfo>)sender
@@ -95,27 +87,6 @@
     self.layer.borderWidth = 0.;
 }
 
-- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
-{
-    return YES;
-}
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-{
-    BOOL returnValue = NO;
-    NSPasteboard *pasteBoard = sender draggingPasteboard;
-    if (!pasteBoard) {
-        return NO;
-    }
-
-    if (_dropTarget) {
-        returnValue = _dropTarget handlePasteBoardFromDragSession:pasteBoard;
-    }
-
-    self setNeedsDisplay:YES;
-    return returnValue;
-}
-
 - (void)concludeDragOperation:(id <NSDraggingInfo>)sender
 {
     self.layer.borderWidth = 0.;

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCFileDragRecognisingView.h Added

@@ -0,0 +1,43 @@
+/*****************************************************************************
+ * VLCFileDragRecognisingView.h
+ *****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol VLCDragDropTarget
+
+@required
+- (BOOL)handlePasteBoardFromDragSession:(NSPasteboard *)pasteboard;
+
+@end
+
+@interface VLCFileDragRecognisingView : NSView
+
+@property (nonatomic, assign) id<VLCDragDropTarget> dropTarget;
+
++ (BOOL)handlePasteboardFromDragSessionAsPlayQueueItems:(NSPasteboard *)pasteboard;
+- (void)setupDragRecognition;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCFileDragRecognisingView.m Added

@@ -0,0 +1,126 @@
+/*****************************************************************************
+ * VLCFileDragRecognisingView.m
+ *****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCFileDragRecognisingView.h"
+
+#import "main/VLCMain.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "windows/VLCOpenInputMetadata.h"
+
+@implementation VLCFileDragRecognisingView
+
++ (BOOL)handlePasteboardFromDragSessionAsPlayQueueItems:(NSPasteboard *)pasteboard
+{
+    const id propertyList = pasteboard propertyListForType:NSFilenamesPboardType;
+    if (propertyList == nil) {
+        return NO;
+    }
+
+    NSArray * const values = propertyList sortedArrayUsingSelector:@selector(caseInsensitiveCompare:);
+    const NSUInteger valueCount = values.count;
+    if (valueCount <= 0) {
+        return NO;
+    }
+
+    NSMutableArray * const metadataArray = NSMutableArray arrayWithCapacity:valueCount;
+
+    for (NSString * const filepath in values) {
+        VLCOpenInputMetadata * const inputMetadata = VLCOpenInputMetadata inputMetaWithPath:filepath;
+        if (inputMetadata != nil) {
+            metadataArray addObject:inputMetadata;
+        }
+    }
+
+    VLCMain.sharedInstance.playQueueController addPlayQueueItems:metadataArray;
+    return YES;
+}
+
+- (instancetype)init
+{
+    self = super init;
+    if (self) {
+        self setupDragRecognition;
+    }
+    return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+    self = super initWithCoder:coder;
+    if (self) {
+        self setupDragRecognition;
+    }
+    return self;
+}
+
+- (instancetype)initWithFrame:(NSRect)frameRect
+{
+    self = super initWithFrame:frameRect;
+    if (self) {
+        self setupDragRecognition;
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    self unregisterDraggedTypes;
+}
+
+- (void)awakeFromNib
+{
+    self setupDragRecognition;
+}
+
+- (void)setupDragRecognition
+{
+    self registerForDraggedTypes:@NSFilenamesPboardType;
+}
+
+- (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender
+{
+    if ((NSDragOperationGeneric & sender draggingSourceOperationMask) == NSDragOperationGeneric) {
+        return NSDragOperationCopy;
+    }
+    return NSDragOperationNone;
+}
+
+- (BOOL)prepareForDragOperation:(id<NSDraggingInfo>)sender
+{
+    return YES;
+}
+
+- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender
+{
+    NSPasteboard * const pasteboard = sender draggingPasteboard;
+    if (pasteboard == nil) {
+        return NO;
+    }
+
+    self setNeedsDisplay:YES;
+    if (self.dropTarget) {
+        return self.dropTarget handlePasteBoardFromDragSession:pasteboard;
+    }
+    return NO;
+}
+
+@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCImageView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCImageView.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCPlaybackProgressSliderCell.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCPlaybackProgressSliderCell.m Changed

@@ -32,8 +32,8 @@
 #import "main/CompatibilityFixes.h"
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlayerController.h"
-#import "playlist/VLCPlaylistController.h"
+#import "playqueue/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
 
 @interface VLCPlaybackProgressSliderCell ()
 {
@@ -98,10 +98,7 @@
 - (void)initDisplayLink
 {
     const CVReturn ret = CVDisplayLinkCreateWithActiveCGDisplays(&_displayLink);
-    if (ret != kCVReturnSuccess) {
-        // TODO: Handle error
-        return;
-    }
+    NSAssert(ret == kCVReturnSuccess && _displayLink != NULL, @"Could not init displaylink");
     CVDisplayLinkSetOutputCallback(_displayLink, DisplayLinkCallback, (__bridge void*) self);
 }
 
@@ -123,7 +120,7 @@
 - (void)updateAtoBLoopState
 {
     VLCPlayerController * const playerController =
-        VLCMain.sharedInstance.playlistController.playerController;
+        VLCMain.sharedInstance.playQueueController.playerController;
 
     _abLoopState = playerController.abLoopState;
     _aToBLoopAMarkPosition = playerController.aLoopPosition;
@@ -270,9 +267,7 @@
 - (void)beginAnimating
 {
     const CVReturn err = CVDisplayLinkStart(_displayLink);
-    if (err != kCVReturnSuccess) {
-        // TODO: Handle error
-    }
+    NSAssert(err == kCVReturnSuccess, @"Display link animation start should not return error!");
     _animationPosition = -(_animationWidth);
     self.enabled = NO;
 }

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCStatusNotifierView.h Added

@@ -0,0 +1,38 @@
+/*****************************************************************************
+ * VLCStatusNotifierView.h: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString * const VLCStatusNotifierViewActivated;
+extern NSString * const VLCStatusNotifierViewDeactivated;
+
+@interface VLCStatusNotifierView : NSVisualEffectView
+
+@property (readwrite, weak) IBOutlet NSProgressIndicator *progressIndicator;
+@property (readwrite, weak) IBOutlet NSTextField *label;
+@property (readwrite, weak) IBOutlet NSImageView *infoImageView;
+
+@end
+
+NS_ASSUME_NONNULL_END

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCStatusNotifierView.m Added

@@ -0,0 +1,202 @@
+/*****************************************************************************
+ * VLCStatusNotifierView.m: MacOS X interface module
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Claudio Cambra <developer@claudiocambra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#import "VLCStatusNotifierView.h"
+
+#import "extensions/NSString+Helpers.h"
+#import "library/VLCLibraryCollectionView.h"
+#import "library/VLCLibraryModel.h"
+
+NSString * const VLCStatusNotifierViewActivated = @"VLCStatusNotifierViewActivated";
+NSString * const VLCStatusNotifierViewDeactivated = @"VLCStatusNotifierViewDeactivated";
+NSString * const VLCMessageTimeoutTimerUserInfoMessageKey = @"VLCMessageTimeoutTimerUserInfoMessageKey";
+
+@interface VLCStatusNotifierView ()
+
+@property NSUInteger loadingCount;
+@property BOOL permanentDiscoveryMessageActive;
+@property NSMutableSet<NSString *> *longNotifications;
+@property NSMutableArray<NSString *> *messages;
+@property NSMutableDictionary<NSString *, NSTimer *> *activeTimers;
+
+@property (readonly) NSString *loadingLibraryItemsMessage;
+@property (readonly) NSString *libraryItemsLoadedMessage;
+@property (readonly) NSString *discoveringMediaMessage;
+@property (readonly) NSString *discoveryCompletedMessage;
+@property (readonly) NSString *discoveryFailedMessage;
+
+@end
+
+@implementation VLCStatusNotifierView
+
+- (void)awakeFromNib
+{
+    self.loadingCount = 0;
+    self.permanentDiscoveryMessageActive = NO;
+    self.longNotifications = NSMutableSet.set;
+    self.messages = NSMutableArray.array;
+
+    _loadingLibraryItemsMessage = _NS("Loading library items");
+    _libraryItemsLoadedMessage = _NS("Library items loaded");
+    _discoveringMediaMessage = _NS("Discovering media");
+    _discoveryCompletedMessage = _NS("Media discovery completed");
+    _activeTimers = NSMutableDictionary.dictionary;
+
+    self.label.stringValue = _NS("Idle");
+    self.progressIndicator.hidden = YES;
+    self.infoImageView.hidden = NO;
+
+    NSNotificationCenter * const defaultCenter = NSNotificationCenter.defaultCenter;
+    defaultCenter addObserver:self selector:@selector(updateStatus:) name:nil object:nil;
+}
+
+- (void)displayStartLoad
+{
+    if (self.loadingCount == 0) {
+        self.infoImageView.hidden = YES;
+        self.progressIndicator.hidden = NO;
+        self.progressIndicator startAnimation:self;
+    }
+    self.loadingCount++;
+}
+
+- (void)displayFinishLoad
+{
+    self.loadingCount--;
+    if (self.loadingCount == 0) {
+        self.progressIndicator stopAnimation:self;
+        self.progressIndicator.hidden = YES;
+        self.infoImageView.hidden = NO;
+    }
+}
+
+- (void)addMessage:(NSString *)message
+{
+    if (self.messages.count == 0) {
+        NSNotificationCenter.defaultCenter postNotificationName:VLCStatusNotifierViewActivated object:self;
+    }
+    NSString *finalMessage = message;
+    const NSInteger matchingIndex = self.messages indexOfObjectPassingTest:^BOOL(NSString * const string, NSUInteger, BOOL *){
+        return string hasPrefix:message;
+    };
+    if (matchingIndex != NSNotFound) {
+        finalMessage = self.messages objectAtIndex:matchingIndex stringWithIncrementedTrailingNumber;
+        self.messages removeObjectAtIndex:matchingIndex;
+    }
+    self.messages addObject:finalMessage;
+    self.label.stringValue = self.messages componentsJoinedByString:@"\n";
+}
+
+- (void)removeMessage:(NSString *)message
+{
+    if (message == nil) {
+        return;
+    }
+
+    const NSInteger matchingIndex = self.messages indexOfObjectPassingTest:^BOOL(NSString * const string, NSUInteger, BOOL *){
+        return string hasPrefix:message;
+    };
+    if (matchingIndex != NSNotFound) {
+        self.messages removeObjectAtIndex:matchingIndex;
+    }
+    if (self.messages.count == 0) {
+        NSNotificationCenter.defaultCenter postNotificationName:VLCStatusNotifierViewDeactivated object:self;
+        return;
+    }
+
+    self.label.stringValue = self.messages componentsJoinedByString:@"\n";
+}
+
+- (void)updateStatus:(NSNotification *)notification
+{
+    NSString * const notificationName = notification.name;
+    if (!notificationName hasPrefix:@"VLC") {
+        return;
+    }
+
+    if (notificationName isEqualToString:VLCLibraryModelDiscoveryStarted) {
+        self addMessage:self.discoveringMediaMessage;
+        self removeMessage:self.discoveryCompletedMessage;
+        self removeMessage:self.discoveryFailedMessage;
+        self.permanentDiscoveryMessageActive = YES;
+        self displayStartLoad;
+    } else if (notificationName isEqualToString:VLCLibraryModelDiscoveryCompleted) {
+        self.permanentDiscoveryMessageActive = NO;
+        self displayFinishLoad;
+        self presentTransientMessage:self.discoveryCompletedMessage;
+        self removeMessage:self.discoveringMediaMessage;
+    } else if (notificationName isEqualToString:VLCLibraryModelDiscoveryFailed) {
+        self.permanentDiscoveryMessageActive = NO;
+        self displayFinishLoad;
+        self presentTransientMessage:self.discoveryFailedMessage;
+        self removeMessage:self.discoveringMediaMessage;
+    } else if (notificationName containsString:VLCLongNotificationNameStartSuffix && !self.longNotifications containsObject:notificationName) {
+        if (self.longNotifications.count == 0) {
+            self addMessage:self.loadingLibraryItemsMessage;
+            self removeMessage:self.libraryItemsLoadedMessage;
+            self displayStartLoad;
+        }
+        self.longNotifications addObject:notificationName;
+    } else if (notificationName containsString:VLCLongNotificationNameFinishSuffix) {
+        NSString * const loadingNotification =
+            notificationName stringByReplacingOccurrencesOfString:VLCLongNotificationNameFinishSuffix withString:VLCLongNotificationNameStartSuffix;
+        self.longNotifications removeObject:loadingNotification;
+        if (self.longNotifications.count == 0) {
+            self displayFinishLoad;
+            self presentTransientMessage:self.libraryItemsLoadedMessage;
+            self removeMessage:self.loadingLibraryItemsMessage;
+        }
+    } else if (notificationName isEqualToString:VLCLibraryCollectionViewItemAdjustmentBigger) {
+        self presentTransientMessage:_NS("Increased grid view item size");
+    } else if (notificationName isEqualToString:VLCLibraryCollectionViewItemAdjustmentSmaller) {
+        self presentTransientMessage:_NS("Decreased grid view item size");
+    }
+}
+
+- (void)messageTimeout:(NSTimer *)timer
+{
+    NSString * const message =
+        timer.userInfo objectForKey:VLCMessageTimeoutTimerUserInfoMessageKey;
+    self removeMessage:message;
+    self.activeTimers removeObjectForKey:message;
+}
+
+- (void)presentTransientMessage:(NSString *)message
+{
+    self addMessage:message;
+
+    NSTimer * const existingTimer = self.activeTimers objectForKey:message;
+    if (existingTimer != nil) {
+        existingTimer invalidate;
+        self.activeTimers removeObjectForKey:message;
+    }
+
+    NSTimer * const newTimer =
+        NSTimer scheduledTimerWithTimeInterval:2.0
+                                         target:self
+                                       selector:@selector(messageTimeout:)
+                                       userInfo:@{VLCMessageTimeoutTimerUserInfoMessageKey: message}
+                                        repeats:NO;
+    self.activeTimers setObject:newTimer forKey:message;
+}
+
+@end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCTimeField.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCTimeField.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/views/VLCTimeField.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/views/VLCTimeField.m Changed

@@ -28,12 +28,11 @@
 #import "main/VLCMain.h"
 #import "menus/VLCMainMenu.h"
 
-NSString *VLCTimeFieldDisplayTimeAsElapsed = @"DisplayTimeAsTimeElapsed";
-NSString *VLCTimeFieldDisplayTimeAsRemaining = @"DisplayTimeAsTimeRemaining";
+NSString * const VLCTimeFieldDisplayTimeAsElapsed = @"DisplayTimeAsTimeElapsed";
+NSString * const VLCTimeFieldDisplayTimeAsRemaining = @"DisplayTimeAsTimeRemaining";
 
 @interface VLCTimeField ()
 {
-    NSString *_identifier;
     NSString *_cachedTime;
     NSString *_remainingTime;
 }
@@ -43,42 +42,39 @@
 
 + (void)initialize
 {
-    NSUserDefaults *defaults = NSUserDefaults standardUserDefaults;
-    NSDictionary *appDefaults = NSDictionary dictionaryWithObjectsAndKeys:
-                                 @"NO", VLCTimeFieldDisplayTimeAsRemaining,
-                                 nil;
-
-    defaults registerDefaults:appDefaults;
+    NSDictionary * const appDefaults = @{VLCTimeFieldDisplayTimeAsRemaining : @NO};
+    NSUserDefaults.standardUserDefaults registerDefaults:appDefaults;
 }
 
-
-- (void)setRemainingIdentifier:(NSString *)identifier
+- (void)setPreferencesIdentifier:(NSString *)preferencesIdentifier
 {
-    _identifier = identifier;
-    _isTimeRemaining = NSUserDefaults standardUserDefaults boolForKey:_identifier;
+    _preferencesIdentifier = preferencesIdentifier;
+    self.isTimeRemaining = NSUserDefaults.standardUserDefaults
+                            boolForKey:self.preferencesIdentifier;
 }
 
 - (void)setIsTimeRemaining:(BOOL)isTimeRemaining
 {
     _isTimeRemaining = isTimeRemaining;
 
-    if (_identifier) {
-        NSUserDefaults standardUserDefaults setObject:(_isTimeRemaining ? @"YES" : @"NO") forKey:_identifier;
+    if (self.identifier) {
+        NSUserDefaults.standardUserDefaults setBool:_isTimeRemaining
+                                              forKey:self.preferencesIdentifier;
     }
 
     self updateTimeValue;
 }
 
-- (void)mouseDown: (NSEvent *)ourEvent
+- (void)mouseDown:(NSEvent *)ourEvent
 {
-    if ( ourEvent clickCount > 1 ) {
-        VLCMain.sharedInstance.mainMenu goToSpecificTime: nil;
+    if (ourEvent.clickCount > 1) {
+        VLCMain.sharedInstance.mainMenu goToSpecificTime:nil;
     } else {
         self.isTimeRemaining = !self.isTimeRemaining;
     }
 
     self updateTimeValue;
-    self nextResponder mouseDown:ourEvent;
+    self.nextResponder mouseDown:ourEvent;
 }
 
 - (void)setTime:(NSString *)time withRemainingTime:(NSString *)remainingTime
@@ -91,13 +87,14 @@
 
 - (void)updateTimeValue
 {
-    if (!_cachedTime || !_remainingTime)
+    if (!_cachedTime || !_remainingTime) {
         return;
+    }
 
-    if (self timeRemaining) {
-        super setStringValue:_remainingTime;
+    if (self.timeRemaining) {
+        self.stringValue = _remainingTime;
     } else {
-        super setStringValue:_cachedTime;
+        self.stringValue = _cachedTime;
     }
 }
 
@@ -111,10 +108,11 @@
 
 - (BOOL)timeRemaining
 {
-    if (_identifier)
-        return NSUserDefaults standardUserDefaults boolForKey:_identifier;
-    else
+    if (self.preferencesIdentifier) {
+        return NSUserDefaults.standardUserDefaults boolForKey:self.preferencesIdentifier;
+    } else {
         return _isTimeRemaining;
+    }
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/VLCDetachedAudioWindow.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/VLCDetachedAudioWindow.m Changed

@@ -29,8 +29,8 @@
 
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 
 #import "views/VLCTrackingView.h"
 #import "views/VLCBottomBarView.h"
@@ -55,47 +55,14 @@
     self.contentView addSubview:self.decorativeView 
                       positioned:NSWindowBelow
                       relativeTo:self.overlayView;
-    self.contentView addConstraints:@
-        NSLayoutConstraint constraintWithItem:self.decorativeView
-                                     attribute:NSLayoutAttributeTop
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.contentView
-                                     attribute:NSLayoutAttributeTop
-                                    multiplier:1.
-                                      constant:0.
-        ,
-        NSLayoutConstraint constraintWithItem:self.decorativeView
-                                     attribute:NSLayoutAttributeBottom
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.contentView
-                                     attribute:NSLayoutAttributeBottom
-                                    multiplier:1.
-                                      constant:0.
-        ,
-        NSLayoutConstraint constraintWithItem:self.decorativeView
-                                     attribute:NSLayoutAttributeLeft
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.contentView
-                                     attribute:NSLayoutAttributeLeft
-                                    multiplier:1.
-                                      constant:0.
-        ,
-        NSLayoutConstraint constraintWithItem:self.decorativeView
-                                     attribute:NSLayoutAttributeRight
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.contentView
-                                     attribute:NSLayoutAttributeRight
-                                    multiplier:1.
-                                      constant:0.
-        ,
-    ;
+    self.decorativeView applyConstraintsToFillSuperview;
 }
 
 - (void)awakeFromNib
 {
     self.title = @"";
 
-    _playerController = VLCMain.sharedInstance.playlistController.playerController;
+    _playerController = VLCMain.sharedInstance.playQueueController.playerController;
 
     VLCTrackingView * const trackingView = self.contentView;
     trackingView.viewToHide = self.overlayView;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/VLCHelpWindowController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/VLCHelpWindowController.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/VLCHelpWindowController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/VLCHelpWindowController.m Changed

@@ -37,18 +37,31 @@
 {
     self = super initWithWindowNibName:@"Help";
     if (self) {
-        self setWindowFrameAutosaveName:@"help";
+        self.windowFrameAutosaveName = @"help";
     }
-
     return self;
 }
 
 - (void)windowDidLoad
 {
-    self window setTitle:_NS("VLC media player Help");
-    forwardButton setToolTip:_NS("Next");
-    backButton setToolTip:_NS("Previous");
-    homeButton setToolTip:_NS("Index");
+    self.window.title = _NS("VLC media player Help");
+    if (@available(macOS 10.12, *)) {
+        self.window.tabbingMode = NSWindowTabbingModeDisallowed;
+    }
+    
+    _helpWebView = WKWebView alloc initWithFrame:self.window.contentView.bounds;
+    self.helpWebView.navigationDelegate = self;
+    self.helpWebView.translatesAutoresizingMaskIntoConstraints = NO;
+    self.window.contentView addSubview:self.helpWebView positioned:NSWindowBelow relativeTo:self.visualEffectView;
+
+    self.helpWebView.topAnchor constraintEqualToAnchor:self.window.contentView.topAnchor.active = YES;
+    self.helpWebView.bottomAnchor constraintEqualToAnchor:self.visualEffectView.topAnchor.active = YES;
+    self.helpWebView.leadingAnchor constraintEqualToAnchor:self.window.contentView.leadingAnchor.active = YES;
+    self.helpWebView.trailingAnchor constraintEqualToAnchor:self.window.contentView.trailingAnchor.active = YES;
+
+    self.forwardButton.toolTip = _NS("Next");
+    self.backButton.toolTip = _NS("Previous");
+    self.homeButton.toolTip = _NS("Index");
 }
 
 - (void)showHelp
@@ -59,19 +72,35 @@
 
 - (IBAction)helpGoHome:(id)sender
 {
-    NSString *htmlWithStyle = NSString
-                               stringWithFormat:@"<style>body { font-family: -apple-system, Helvetica Neue; }</style>%@",
-                               NSTR(I_LONGHELP);
+    NSString * const style = @"<style>body { font-family: -apple-system, Helvetica Neue; }</style>";
+    NSString * const htmlWithStyle = style stringByAppendingString:NSTR(I_LONGHELP);
+    NSURL * const baseURL = NSURL URLWithString:@"https://videolan.org";
+    self.helpWebView loadHTMLString:htmlWithStyle baseURL:baseURL;
+}
+
+- (IBAction)helpGoBack:(id)sender
+{
+    self.helpWebView goBack;
+}
 
-    helpWebView mainFrame loadHTMLString:htmlWithStyle
-                                    baseURL:NSURL URLWithString:@"https://videolan.org";
+- (IBAction)helpGoForward:(id)sender
+{
+    self.helpWebView goForward;
 }
 
-- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
 {
     /* Update back/forward button states whenever a new page is loaded */
-    forwardButton setEnabled:helpWebView canGoForward;
-    backButton setEnabled:helpWebView canGoBack;
+    self.forwardButton.enabled = webView.canGoForward;
+    self.backButton.enabled = webView.canGoBack;
+    self.progressIndicator.hidden = YES;
+    self.progressIndicator stopAnimation:nil;
+}
+
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
+{
+    self.progressIndicator.hidden = NO;
+    self.progressIndicator startAnimation:nil;
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/VLCOpenWindowController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/VLCOpenWindowController.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/controlsbar/VLCControlsBarCommon.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/controlsbar/VLCControlsBarCommon.h Changed

@@ -29,7 +29,6 @@
 @class VLCTimeField;
 @class VLCImageView;
 @class VLCBottomBarView;
-@class VLCWrappableTextField;
 
 /*****************************************************************************
  * VLCControlsBarCommon
@@ -45,6 +44,8 @@
 @property (readwrite, strong) IBOutlet NSButton *playButton;
 @property (readwrite, strong) IBOutlet NSButton *backwardButton;
 @property (readwrite, strong) IBOutlet NSButton *forwardButton;
+@property (readwrite, strong) IBOutlet NSButton *jumpBackwardButton;
+@property (readwrite, strong) IBOutlet NSButton *jumpForwardButton;
 
 @property (readwrite, strong) IBOutlet VLCPlaybackProgressSlider *timeSlider;
 @property (readwrite, strong) IBOutlet VLCVolumeSlider *volumeSlider;
@@ -52,8 +53,8 @@
 
 @property (readwrite, strong) IBOutlet VLCImageView *artworkImageView;
 @property (readwrite, strong) IBOutlet NSButton *artworkButton;
-@property (readwrite, strong) IBOutlet VLCWrappableTextField *playingItemDisplayField;
-@property (readwrite, strong) IBOutlet VLCWrappableTextField *detailLabel;
+@property (readwrite, strong) IBOutlet NSTextField *playingItemDisplayField;
+@property (readwrite, strong) IBOutlet NSTextField *detailLabel;
 @property (readwrite, strong) IBOutlet VLCTimeField *timeField;
 @property (readwrite, strong) IBOutlet VLCTimeField *trailingTimeField;
 
@@ -72,6 +73,8 @@
 - (IBAction)play:(id)sender;
 - (IBAction)bwd:(id)sender;
 - (IBAction)fwd:(id)sender;
+- (IBAction)jumpBackward:(id)sender;
+- (IBAction)jumpForward:(id)sender;
 
 - (IBAction)timeSliderAction:(id)sender;
 - (IBAction)volumeAction:(id)sender;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/controlsbar/VLCControlsBarCommon.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/controlsbar/VLCControlsBarCommon.m Changed

@@ -26,10 +26,10 @@
 
 #import "extensions/NSString+Helpers.h"
 #import "main/VLCMain.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlaylistItem.h"
-#import "playlist/VLCPlaylistModel.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueItem.h"
+#import "playqueue/VLCPlayQueueModel.h"
+#import "playqueue/VLCPlayerController.h"
 #import "library/VLCInputItem.h"
 
 #import "views/VLCBottomBarView.h"
@@ -38,7 +38,6 @@
 #import "views/VLCPlaybackProgressSlider.h"
 #import "views/VLCTimeField.h"
 #import "views/VLCVolumeSlider.h"
-#import "views/VLCWrappableTextField.h"
 
 /*****************************************************************************
  * VLCControlsBarCommon
@@ -64,7 +63,7 @@
     BOOL just_triggered_next;
     BOOL just_triggered_previous;
 
-    VLCPlaylistController *_playlistController;
+    VLCPlayQueueController *_playQueueController;
     VLCPlayerController *_playerController;
 }
 @end
@@ -75,8 +74,8 @@
 {
     super awakeFromNib;
 
-    _playlistController = VLCMain.sharedInstance.playlistController;
-    _playerController = _playlistController.playerController;
+    _playQueueController = VLCMain.sharedInstance.playQueueController;
+    _playerController = _playQueueController.playerController;
 
     NSNotificationCenter *notificationCenter = NSNotificationCenter.defaultCenter;
     notificationCenter addObserver:self
@@ -110,24 +109,32 @@
 
     _nativeFullscreenMode = var_InheritBool(getIntf(), "macosx-nativefullscreenmode");
 
-    self.dropView setDrawBorder: NO;
+    self.dropView.drawBorder = NO;
 
-    self.playButton setToolTip: _NS("Play");
+    self.playButton.toolTip = _NS("Play");
     self.playButton.accessibilityLabel = self.playButton.toolTip;
 
-    self.backwardButton setToolTip: _NS("Backward");
+    self.backwardButton.toolTip = _NS("Backward");
     self.backwardButton.accessibilityLabel = _NS("Seek backward");
     self.backwardButton.accessibilityTitle = self.backwardButton.toolTip;
 
-    self.forwardButton setToolTip: _NS("Forward");
+    self.forwardButton.toolTip = _NS("Forward");
     self.forwardButton.accessibilityLabel = _NS("Seek forward");
     self.forwardButton.accessibilityTitle = self.forwardButton.toolTip;
 
-    self.timeSlider setToolTip: _NS("Position");
+    self.jumpBackwardButton.toolTip = _NS("Jump backwards");
+    self.jumpBackwardButton.accessibilityLabel = _NS("Jump backwards in current item");
+    self.jumpBackwardButton.accessibilityTitle = self.jumpBackwardButton.toolTip;
+
+    self.jumpForwardButton.toolTip = _NS("Jump forwards");
+    self.jumpForwardButton.accessibilityLabel = _NS("Jump forwards in current item");
+    self.jumpForwardButton.accessibilityTitle = self.jumpForwardButton.toolTip;
+
+    self.timeSlider.toolTip = _NS("Position");
     self.timeSlider.accessibilityLabel = _NS("Playback position");
     self.timeSlider.accessibilityTitle = self.timeSlider.toolTip;
 
-    self.fullscreenButton setToolTip: _NS("Enter fullscreen");
+    self.fullscreenButton.toolTip = _NS("Enter fullscreen");
     self.fullscreenButton.accessibilityLabel = self.fullscreenButton.toolTip;
 
     if (@available(macOS 11.0, *)) {
@@ -149,6 +156,31 @@
                                       accessibilityDescription:_NS("Muted");
         _unmutedVolumeImage = NSImage imageWithSystemSymbolName:@"speaker.wave.3.fill"
                                         accessibilityDescription:_NS("Unmuted");
+
+        const int64_t shortJumpSize = var_InheritInteger(getIntf(), "short-jump-size");
+        NSString * const shortJumpSizeString = NSString stringWithFormat:@"%lli", shortJumpSize;
+        switch (shortJumpSize) {
+            case 90:
+            case 75:
+            case 60:
+            case 45:
+            case 30:
+            case 15:
+            case 10:
+            case 5:
+            {
+                NSString * const jumpForwardSymbolName =
+                    NSString stringWithFormat:@"%@.arrow.trianglehead.clockwise",shortJumpSizeString;
+                NSString * const jumpBackwardSymbolName =
+                    NSString stringWithFormat:@"%@.arrow.trianglehead.counterclockwise", shortJumpSizeString;
+                self.jumpForwardButton.image =
+                    NSImage imageWithSystemSymbolName:jumpForwardSymbolName
+                              accessibilityDescription:_NS("Jump forward");
+                self.jumpBackwardButton.image =
+                    NSImage imageWithSystemSymbolName:jumpBackwardSymbolName
+                              accessibilityDescription:_NS("Jump backward");
+            }
+        }
     } else {
         _playImage = imageFromRes(@"VLCPlayTemplate");
         _pressedPlayImage = imageFromRes(@"VLCPlayTemplate");
@@ -161,36 +193,35 @@
         _unmutedVolumeImage = imageFromRes(@"VLCVolumeOnTemplate");
     }
 
-    self.backwardButton setImage: _backwardImage;
-    self.backwardButton setAlternateImage: _backwardImage;
-    self.forwardButton setImage: _forwardImage;
-    self.forwardButton setAlternateImage: _forwardImage;
+    self.backwardButton.image = _backwardImage;
+    self.backwardButton.alternateImage = _backwardImage;
+    self.forwardButton.image = _forwardImage;
+    self.forwardButton.alternateImage = _forwardImage;
 
-    self.fullscreenButton setImage: _fullscreenImage;
-    self.fullscreenButton setAlternateImage: _fullscreenImage;
-    self.playButton setImage: _playImage;
-    self.playButton setAlternateImage: _pressedPlayImage;
+    self.fullscreenButton.image = _fullscreenImage;
+    self.fullscreenButton.alternateImage = _fullscreenImage;
+    self.playButton.image = _playImage;
+    self.playButton.alternateImage = _pressedPlayImage;
 
-    self.timeSlider setHidden:NO;
+    self.timeSlider.hidden = NO;
 
-    NSString *volumeTooltip = NSString stringWithFormat:_NS("Volume: %i %%"), 100;
-    self.volumeSlider setToolTip: volumeTooltip;
+    self.volumeSlider.toolTip = NSString stringWithFormat:_NS("Volume: %i %%"), 100;
     self.volumeSlider.accessibilityLabel = _NS("Volume");
 
-    self.volumeSlider setMaxValue: VLCVolumeMaximum;
-    self.volumeSlider setDefaultValue: VLCVolumeDefault;
+    self.volumeSlider.maxValue = VLCVolumeMaximum;
+    self.volumeSlider.defaultValue = VLCVolumeDefault;
 
-    self.muteVolumeButton setToolTip: _NS("Mute");
+    self.muteVolumeButton.toolTip = _NS("Mute");
     self.muteVolumeButton.accessibilityLabel = self.muteVolumeButton.toolTip;
 
-    self.timeField setNeedsDisplay:YES;
-    self.timeField setRemainingIdentifier:VLCTimeFieldDisplayTimeAsElapsed;
+    self.timeField.needsDisplay = YES;
+    self.timeField.preferencesIdentifier = VLCTimeFieldDisplayTimeAsElapsed;
     self.trailingTimeField.isTimeRemaining = NO;
     self.timeField.accessibilityLabel = _NS("Playback time");
 
     self.trailingTimeField.isTimeRemaining = !self.timeField.isTimeRemaining;
-    self.trailingTimeField setNeedsDisplay:YES;
-    self.trailingTimeField setRemainingIdentifier:VLCTimeFieldDisplayTimeAsRemaining;
+    self.trailingTimeField.needsDisplay = YES;
+    self.timeField.preferencesIdentifier = VLCTimeFieldDisplayTimeAsRemaining;
     self.trailingTimeField.isTimeRemaining = YES;
     self.trailingTimeField.accessibilityLabel = _NS("Playback time");
 
@@ -211,10 +242,10 @@
 
     self playerStateUpdated:nil;
 
-    _artworkImageView setCropsImagesToRoundedCorners:YES;
-    _artworkImageView setImage:NSImage imageNamed:@"noart";
-    _artworkImageView setContentGravity:VLCImageViewContentGravityResize;
-    
+    self.artworkImageView.cropsImagesToRoundedCorners = YES;
+    self.artworkImageView.image = NSImage imageNamed:@"noart";
+    self.artworkImageView.contentGravity = VLCImageViewContentGravityResize;
+
     if (!NSClassFromString(@"PIPViewController")) {
         self.pipButtonWidthConstraint.constant = 0;
         self.pipButton.hidden = YES;
@@ -231,7 +262,7 @@
 
 - (CGFloat)height
 {
-    return self.bottomBarView frame.size.height;
+    return self.bottomBarView.frame.size.height;
 }
 
 #pragma mark -
@@ -246,7 +277,7 @@
 {
     if ((NSDate timeIntervalSinceReferenceDate - last_bwd_event) >= 0.35) {
         // seems like no further event occurred, so let's switch the playback item
-        _playlistController playPreviousItem;
+        _playQueueController playPreviousItem;
         just_triggered_previous = NO;
     }
 }
@@ -265,15 +296,13 @@
         self performSelector:@selector(resetPreviousButton)
                    withObject: NULL
                    afterDelay:0.40;
-    } else {
-        if ((NSDate timeIntervalSinceReferenceDate - last_fwd_event) > 0.16) {
-            // we just skipped 4 "continuous" events, otherwise we are too fast
-            _playerController jumpBackwardExtraShort;
-            last_bwd_event = NSDate timeIntervalSinceReferenceDate;
-            self performSelector:@selector(resetBackwardSkip)
-                       withObject: NULL
-                       afterDelay:0.40;
-        }
+    } else if ((NSDate timeIntervalSinceReferenceDate - last_fwd_event) > 0.16) {
+        // we just skipped 4 "continuous" events, otherwise we are too fast
+        _playerController jumpBackwardExtraShort;
+        last_bwd_event = NSDate timeIntervalSinceReferenceDate;
+        self performSelector:@selector(resetBackwardSkip)
+                   withObject: NULL
+                   afterDelay:0.40;
     }
 }
 
@@ -281,7 +310,7 @@
 {
     if ((NSDate timeIntervalSinceReferenceDate - last_fwd_event) >= 0.35) {
         // seems like no further event occurred, so let's switch the playback item
-        _playlistController playNextItem;
+        _playQueueController playNextItem;
         just_triggered_next = NO;
     }
 }
@@ -300,26 +329,34 @@
         self performSelector:@selector(resetNextButton)
                    withObject: NULL
                    afterDelay:0.40;
-    } else {
-        if ((NSDate timeIntervalSinceReferenceDate - last_fwd_event) > 0.16) {
-            // we just skipped 4 "continuous" events, otherwise we are too fast
-            _playerController jumpForwardExtraShort;
-            last_fwd_event = NSDate timeIntervalSinceReferenceDate;
-            self performSelector:@selector(resetForwardSkip)
-                       withObject: NULL
-                       afterDelay:0.40;
-        }
+    } else if ((NSDate timeIntervalSinceReferenceDate - last_fwd_event) > 0.16) {
+        // we just skipped 4 "continuous" events, otherwise we are too fast
+        _playerController jumpForwardExtraShort;
+        last_fwd_event = NSDate timeIntervalSinceReferenceDate;
+        self performSelector:@selector(resetForwardSkip)
+                   withObject: NULL
+                   afterDelay:0.40;
     }
 }
 
+- (IBAction)jumpBackward:(id)sender
+{
+    _playerController jumpBackwardShort;
+}
+
+- (IBAction)jumpForward:(id)sender
+{
+    _playerController jumpForwardShort;
+}
+
 - (IBAction)timeSliderAction:(id)sender
 {
-    float newPosition;
-    NSEvent *theEvent = NSApp currentEvent;
-    NSEventType theEventType = theEvent type;
+    if (!sender respondsToSelector:@selector(floatValue)) {
+        return;
+    }
 
-    switch (theEventType) {
-        case NSLeftMouseUp:
+    switch (NSApp.currentEvent.type) {
+        case NSEventTypeLeftMouseUp:
             /* Ignore mouse up, as this is a continuous slider and
              * when the user does a single click to a position on the slider,
              * the action is called twice, once for the mouse down and once
@@ -328,20 +365,18 @@
              * audio quirks.
              */
             return;
-        case NSLeftMouseDown:
-        case NSLeftMouseDragged:
-            newPosition = sender floatValue;
+        case NSEventTypeLeftMouseDown:
+        case NSEventTypeLeftMouseDragged:
+        case NSEventTypeScrollWheel:
+        {
+            const float newPosition = sender floatValue;
+            _playerController setPositionFast:newPosition;
+            self.timeSlider.floatValue = newPosition;
             break;
-        case NSScrollWheel:
-            newPosition = sender floatValue;
-            break;
-
+        }
         default:
             return;
     }
-
-    _playerController setPositionFast:newPosition;
-    self.timeSlider setFloatValue:newPosition;
 }
 
 - (IBAction)volumeAction:(id)sender
@@ -377,60 +412,34 @@
 
 - (void)updateTimeSlider:(NSNotification *)aNotification;
 {
-    VLCInputItem *inputItem = _playerController.currentMedia;
-
-    if (!inputItem) {
-        // Nothing playing
-        self.timeSlider setKnobHidden:YES;
-        self.timeSlider setFloatValue: 0.0;
-        self.timeField setStringValue: @"00:00";
-        self.timeSlider setIndefinite:NO;
-        self.timeSlider setEnabled:NO;
-        self.timeSlider setHidden:YES;
-        return;
-    }
+    VLCInputItem * const inputItem = _playerController.currentMedia;
 
-    self.timeSlider setHidden:NO;
-    self.timeSlider setKnobHidden:NO;
-    self.timeSlider setFloatValue:_playerController.position;
-
-    vlc_tick_t duration = inputItem.duration;
-    bool buffering = _playerController.playerState == VLC_PLAYER_STATE_STARTED;
-    if (duration == -1) {
-        // No duration, disable slider
-        self.timeSlider setEnabled:NO;
-    } else if (buffering) {
-        self.timeSlider setEnabled:NO;
-        self.timeSlider setIndefinite:buffering;
-    } else {
-        self.timeSlider setEnabled:_playerController.seekable;
-    }
+    const BOOL validInputItem = inputItem != nil;
+    const vlc_tick_t duration = validInputItem ? inputItem.duration : -1;
+    NSString * const timeString =
+        NSString stringWithDuration:duration currentTime:_playerController.time negative:NO;
+    NSString * const remainingTime =
+        NSString stringWithDuration:duration currentTime:_playerController.time negative:YES;
+    const BOOL buffering = _playerController.playerState == VLC_PLAYER_STATE_STARTED;
+
+    self.timeSlider.hidden = !validInputItem;
+    self.timeSlider.enabled = duration >= 0 && !buffering && _playerController.seekable;
+    self.timeSlider.indefinite = buffering;
+    self.timeSlider.floatValue = validInputItem ? _playerController.position : 0.;
 
-    NSString *timeString = NSString stringWithDuration:duration
-                                            currentTime:_playerController.time
-                                               negative:NO;
-    NSString *remainingTime = NSString stringWithDuration:duration
-                                               currentTime:_playerController.time
-                                                  negative:YES;
     self.timeField setTime:timeString withRemainingTime:remainingTime;
-    self.timeField setNeedsDisplay:YES;
     self.trailingTimeField setTime:timeString withRemainingTime:remainingTime;
-    self.trailingTimeField setNeedsDisplay:YES;
 }
 
 - (void)updateVolumeSlider:(NSNotification *)aNotification
 {
-    float f_volume = _playerController.volume;
-    BOOL b_muted = _playerController.mute;
+    const BOOL muted = _playerController.mute;
+    const float volume = muted ? 0. : _playerController.volume;
 
-    if (b_muted)
-        f_volume = 0.f;
-
-    self.volumeSlider setFloatValue: f_volume;
-    NSString *volumeTooltip = NSString stringWithFormat:_NS("Volume: %i %%"), (int)(f_volume * 100.0f);
-    self.volumeSlider setToolTip:volumeTooltip;
-
-    self.volumeSlider setEnabled: !b_muted;
+    self.volumeSlider.enabled = !muted;
+    self.volumeSlider.floatValue = volume;
+    self.volumeSlider.toolTip =
+        NSString stringWithFormat:_NS("Volume: %i %%"), (int)(volume * 100.);
 }
 
 - (void)updateMuteVolumeButton:(NSNotification*)aNotification
@@ -440,73 +449,65 @@
 
 - (void)updateMuteVolumeButtonImage
 {
-    _muteVolumeButton.image = _playerController.mute ?
-        _mutedVolumeImage : _unmutedVolumeImage;
+    _muteVolumeButton.image = _playerController.mute ? _mutedVolumeImage : _unmutedVolumeImage;
 }
 
 - (void)playerStateUpdated:(NSNotification *)aNotification
 {
     if (_playerController.playerState == VLC_PLAYER_STATE_PLAYING) {
-        self setPause;
+        self updatePlayButtonWithPauseState;
     } else {
-        self setPlay;
+        self updatePlayButtonWithPlayState;
     }
 }
 
-- (void)updatePlaybackControls:(NSNotification *)aNotification
+- (void)updatePlaybackControls:(NSNotification *)notification
 {
-    bool b_seekable = _playerController.seekable;
-    bool b_chapters = _playerController numberOfChaptersForCurrentTitle > 0;
+    const BOOL seekable = _playerController.seekable;
+    const BOOL chapters = _playerController.numberOfChaptersForCurrentTitle > 0;
 
-    self.timeSlider setEnabled: b_seekable;
+    self.timeSlider.enabled = seekable;
+    self.forwardButton.enabled = seekable || _playQueueController.hasNextPlayQueueItem || chapters;
+    self.backwardButton.enabled = seekable || _playQueueController.hasPreviousPlayQueueItem || chapters;
 
-    self.forwardButton setEnabled: (b_seekable || _playlistController.hasNextPlaylistItem || b_chapters);
-    self.backwardButton setEnabled: (b_seekable || _playlistController.hasPreviousPlaylistItem || b_chapters);
-    self updateCurrentItemDisplayControls:aNotification;
+    self updateCurrentItemDisplayControls:notification;
 }
 
-- (void)updateCurrentItemDisplayControls:(NSNotification *)aNotification
+- (void)updateCurrentItemDisplayControls:(NSNotification *)notification
 {
     VLCInputItem * const inputItem = _playerController.currentMedia;
-    if (!inputItem) {
-        return;
-    }
-
-    _playingItemDisplayField.stringValue = inputItem.name;
-
     VLCMediaLibraryMediaItem * const mediaItem =
         VLCMediaLibraryMediaItem mediaItemForURL:_playerController.URLOfCurrentMediaItem;
-    if (!mediaItem) {
-        self.detailLabel.hidden = YES;
-    } else {
-        _detailLabel.hidden = 
-            mediaItem.primaryDetailString isEqualToString:@"" ||
-            mediaItem.primaryDetailString isEqualToString:mediaItem.durationString;
-        _detailLabel.stringValue = mediaItem.primaryDetailString;
-    }
 
-    NSURL * const artworkURL = inputItem.artworkURL;
+    self.playingItemDisplayField.stringValue = inputItem.name ?: _NS("No current item");
+    self.detailLabel.hidden =
+        mediaItem == nil ||
+        mediaItem.primaryDetailString isEqualToString:@"" ||
+        mediaItem.primaryDetailString isEqualToString:mediaItem.durationString;
+    self.detailLabel.stringValue = mediaItem.primaryDetailString ?: @"";
 
+    NSURL * const artworkURL = inputItem.artworkURL;
+    NSImage * const placeholderImage = NSImage imageNamed:@"noart";
     if (artworkURL) {
-        _artworkImageView setImageURL:inputItem.artworkURL placeholderImage:NSImage imageNamed:@"noart";
+        self.artworkImageView setImageURL:inputItem.artworkURL placeholderImage:placeholderImage;
     } else {
-        _artworkImageView.image = NSImage imageNamed:@"noart";
+        self.artworkImageView.image = placeholderImage;
     }
 }
 
-- (void)setPause
+- (void)updatePlayButtonWithPauseState
 {
-    self.playButton setImage: _pauseImage;
-    self.playButton setAlternateImage: _pressedPauseImage;
-    self.playButton setToolTip: _NS("Pause");
+    self.playButton.image = _pauseImage;
+    self.playButton.alternateImage = _pressedPauseImage;
+    self.playButton.toolTip = _NS("Pause");
     self.playButton.accessibilityLabel = self.playButton.toolTip;
 }
 
-- (void)setPlay
+- (void)updatePlayButtonWithPlayState
 {
-    self.playButton setImage: _playImage;
-    self.playButton setAlternateImage: _pressedPlayImage;
-    self.playButton setToolTip: _NS("Play");
+    self.playButton.image = _playImage;
+    self.playButton.alternateImage = _pressedPlayImage;
+    self.playButton.toolTip = _NS("Play");
     self.playButton.accessibilityLabel = self.playButton.toolTip;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/controlsbar/VLCMainVideoViewControlsBar.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/controlsbar/VLCMainVideoViewControlsBar.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/controlsbar/VLCMainVideoViewControlsBar.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/controlsbar/VLCMainVideoViewControlsBar.m Changed

@@ -32,10 +32,8 @@
 
 #import "panels/VLCBookmarksWindowController.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
-
-#import "views/VLCWrappableTextField.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 
 #import "windows/video/VLCMainVideoViewController.h"
 #import "windows/video/VLCVideoOutputProvider.h"
@@ -43,7 +41,7 @@
 
 @interface VLCMainVideoViewControlsBar ()
 {
-    VLCPlaylistController *_playlistController;
+    VLCPlayQueueController *_playQueueController;
     VLCPlayerController *_playerController;
 }
 @end
@@ -66,14 +64,25 @@
     self.videoButton.toolTip = _NS("Video settings");
     self.videoButton.accessibilityLabel = self.videoButton.toolTip;
 
-    _playlistController = VLCMain.sharedInstance.playlistController;
-    _playerController = _playlistController.playerController;
+    self.playbackRateButton.toolTip = _NS("Playback rate");
+    self.playbackRateButton.accessibilityLabel = self.playbackRateButton.toolTip;
+
+    _playQueueController = VLCMain.sharedInstance.playQueueController;
+    _playerController = _playQueueController.playerController;
 
     NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
     notificationCenter addObserver:self
                            selector:@selector(floatOnTopChanged:)
                                name:VLCWindowFloatOnTopChangedNotificationName
                              object:nil;
+    notificationCenter addObserver:self
+                           selector:@selector(playbackRateChanged:)
+                               name:VLCPlayerRateChanged
+                             object:nil;
+    notificationCenter addObserver:self
+                           selector:@selector(playbackRateChanged:)
+                               name:VLCPlayerCapabilitiesChanged
+                             object:nil;
 
     self update;
 }
@@ -82,6 +91,7 @@
 {
     super update;
     self updateFloatOnTopButton;
+    self updatePlaybackRateButton;
 }
 
 - (void)floatOnTopChanged:(NSNotification *)notification
@@ -121,6 +131,51 @@
     }
 }
 
+- (void)playbackRateChanged:(NSNotification *)notification
+{
+    self updatePlaybackRateButton;
+}
+
+- (void)updatePlaybackRateButton
+{
+    self.playbackRateButton.title =
+        NSString stringWithFormat:@"%.1fx", _playerController.playbackRate;
+    self.playbackRateButton.enabled = _playerController.rateChangable;
+}
+
+- (IBAction)openPlaybackRate:(id)sender
+{
+    NSSlider * const playbackRateSlider = NSSlider alloc init;
+    playbackRateSlider.frame = NSMakeRect(0, 0, 272, 17);
+    playbackRateSlider.target = self;
+    playbackRateSlider.action = @selector(rateSliderAction:);
+    playbackRateSlider.minValue = -34.;
+    playbackRateSlider.maxValue = 34.;
+    playbackRateSlider.sliderType = NSSliderTypeLinear;
+    playbackRateSlider.numberOfTickMarks = 17;
+    playbackRateSlider.controlSize = NSControlSizeSmall;
+
+    const double value = 17.0 * log(_playerController.playbackRate) / log(2.);
+    const int sliderIntValue = (int)((value > 0) ? value + 0.5 : value - 0.5);
+    playbackRateSlider.intValue = sliderIntValue;
+
+    NSMenuItem * const menuItem = NSMenuItem alloc init;
+    menuItem.title = _NS("Playback rate");
+    menuItem.view = playbackRateSlider;
+
+    NSMenu * const menu = NSMenu alloc initWithTitle:_NS("Playback rate");
+    menu addItem:menuItem;
+    menu popUpMenuPositioningItem:nil
+                        atLocation:self.playbackRateButton.frame.origin
+                            inView:((NSView *)sender).superview;
+}
+
+- (IBAction)rateSliderAction:(id)sender
+{
+    NSSlider * const slider = (NSSlider *)sender;
+    _playerController.playbackRate = pow(2, (double)slider.intValue / 17);
+}
+
 - (IBAction)openBookmarks:(id)sender
 {
     VLCMain.sharedInstance.bookmarks toggleWindow:sender;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/controlsbar/VLCMainWindowControlsBar.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/controlsbar/VLCMainWindowControlsBar.m Changed

@@ -33,15 +33,14 @@
 
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlaylistItem.h"
-#import "playlist/VLCPlaylistModel.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueItem.h"
+#import "playqueue/VLCPlayQueueModel.h"
+#import "playqueue/VLCPlayerController.h"
 
 #import "views/VLCTimeField.h"
 #import "views/VLCTrackingView.h"
 #import "views/VLCVolumeSlider.h"
-#import "views/VLCWrappableTextField.h"
 
 /*****************************************************************************
  * VLCMainWindowControlsBar
@@ -53,7 +52,7 @@
 {
     NSImage *_alwaysMuteImage;
 
-    VLCPlaylistController *_playlistController;
+    VLCPlayQueueController *_playQueueController;
     VLCPlayerController *_playerController;
 }
 @end
@@ -63,8 +62,8 @@
 - (void)awakeFromNib
 {
     super awakeFromNib;
-    _playlistController = VLCMain.sharedInstance.playlistController;
-    _playerController = _playlistController.playerController;
+    _playQueueController = VLCMain.sharedInstance.playQueueController;
+    _playerController = _playQueueController.playerController;
 
     NSNotificationCenter *notificationCenter = NSNotificationCenter.defaultCenter;
     notificationCenter addObserver:self
@@ -114,18 +113,18 @@
 
 - (IBAction)stop:(id)sender
 {
-    _playlistController stopPlayback;
+    _playQueueController stopPlayback;
 }
 
 // dynamically created next / prev buttons
 - (IBAction)prev:(id)sender
 {
-    _playlistController playPreviousItem;
+    _playQueueController playPreviousItem;
 }
 
 - (IBAction)next:(id)sender
 {
-    _playlistController playNextItem;
+    _playQueueController playNextItem;
 }
 
 - (IBAction)volumeAction:(id)sender
@@ -196,15 +195,12 @@
     }
 }
 
-- (void)updatePlaybackControls:(NSNotification *)aNotification
+- (void)updatePlaybackControls:(NSNotification *)notification
 {
-    bool b_seekable = _playerController.seekable;
-    // FIXME: re-add chapter navigation as needed
-    bool b_chapters = false;
-
-    self.prevButton setEnabled: (b_seekable || _playlistController.hasPreviousPlaylistItem || b_chapters);
-    self.nextButton setEnabled: (b_seekable || _playlistController.hasNextPlaylistItem || b_chapters);
-    self updateCurrentItemDisplayControls:aNotification;
+    const BOOL b_seekable = _playerController.seekable;
+    self.prevButton.enabled = b_seekable || _playQueueController.hasPreviousPlayQueueItem;
+    self.nextButton.enabled = b_seekable || _playQueueController.hasNextPlayQueueItem;
+    self updateCurrentItemDisplayControls:notification;
 }
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/convertandsave/VLCConvertAndSaveWindowController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/convertandsave/VLCConvertAndSaveWindowController.m Changed

@@ -27,8 +27,8 @@
 #import "main/VLCMain.h"
 #import "panels/dialogs/VLCPopupPanelController.h"
 #import "panels/dialogs/VLCTextfieldPanelController.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlaylistModel.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayQueueModel.h"
 #import "views/VLCDragDropView.h"
 #import "windows/VLCOpenInputMetadata.h"
 
@@ -166,7 +166,7 @@
     _okButton setEnabled: NO;
 
     // setup drop view
-    _dropBox enablePlaylistItems;
+    _dropBox enablePlayQueueItems;
     _dropBox setDropTarget:self;
 
     self resetCustomizationSheetBasedOnProfile:self.profileValueList firstObject;
@@ -316,9 +316,9 @@
     }
     inputMetaItem.playbackOptions = options;
 
-    VLCPlaylistController *playlistController = VLCMain.sharedInstance.playlistController;
-    playlistController addPlaylistItems:@inputMetaItem;
-    playlistController playItemAtIndex:(playlistController.playlistModel.numberOfPlaylistItems -1);
+    VLCPlayQueueController * const playQueueController = VLCMain.sharedInstance.playQueueController;
+    playQueueController addPlayQueueItems:@inputMetaItem;
+    playQueueController playItemAtIndex:(playQueueController.playQueueModel.numberOfPlayQueueItems -1);
 
     self.window performClose:sender;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCAspectRatioRetainingVideoWindow.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCAspectRatioRetainingVideoWindow.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCFullVideoViewWindow.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCFullVideoViewWindow.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCMainVideoViewAudioMediaDecorativeView.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCMainVideoViewAudioMediaDecorativeView.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCMainVideoViewAudioMediaDecorativeView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCMainVideoViewAudioMediaDecorativeView.m Changed

@@ -29,8 +29,8 @@
 #import "library/VLCLibraryDataTypes.h"
 #import "library/VLCLibraryImageCache.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 
 @implementation VLCMainVideoViewAudioMediaDecorativeView
 
@@ -59,11 +59,16 @@
 - (void)updateCoverArt
 {
     VLCPlayerController * const controller =
-        VLCMain.sharedInstance.playlistController.playerController;
+        VLCMain.sharedInstance.playQueueController.playerController;
+    VLCInputItem * const currentInputItem = controller.currentMedia;
     if (controller.currentMedia) {
-        VLCLibraryImageCache thumbnailForInputItem:controller.currentMedia 
+        __weak typeof(self) weakSelf = self;
+        VLCLibraryImageCache thumbnailForInputItem:currentInputItem
                                      withCompletion:^(NSImage * const thumbnail) {
-            self setCoverArt:thumbnail;
+            if (currentInputItem != controller.currentMedia) {
+                return;
+            }
+            weakSelf setCoverArt:thumbnail;
         };
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCMainVideoViewController.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCMainVideoViewController.h Changed

@@ -31,6 +31,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface VLCMainVideoViewController : NSViewController
+
 @property (readwrite, strong) IBOutlet NSView *voutContainingView;
 
 @property (readwrite, strong) IBOutlet VLCVoutView *voutView;
@@ -40,25 +41,33 @@
 @property (readwrite, strong) IBOutlet NSStackView *centralControlsStackView;
 @property (readwrite, strong) IBOutlet VLCMainVideoViewControlsBar *controlsBar;
 @property (readwrite, strong) IBOutlet NSButton *returnButton;
-@property (readwrite, strong) IBOutlet NSButton *playlistButton;
+@property (readwrite, strong) IBOutlet NSButton *playQueueButton;
 @property (readwrite, strong) IBOutlet NSLayoutConstraint *returnButtonTopConstraint;
 @property (readwrite, strong) IBOutlet NSLayoutConstraint *returnButtonLeadingConstraint;
-@property (readwrite, strong) IBOutlet NSLayoutConstraint *playlistButtonTopConstraint;
-@property (readwrite, strong) IBOutlet NSLayoutConstraint *playlistButtonTrailingConstraint;
+@property (readwrite, strong) IBOutlet NSLayoutConstraint *playQueueButtonTopConstraint;
+@property (readwrite, strong) IBOutlet NSLayoutConstraint *playQueueButtonTrailingConstraint;
 @property (readwrite, strong) IBOutlet NSVisualEffectView *fakeTitleBar;
 @property (readwrite, strong) IBOutlet NSLayoutConstraint *fakeTitleBarHeightConstraint;
 @property (readwrite, strong) IBOutlet NSProgressIndicator *loadingIndicator;
 @property (readwrite, strong) IBOutlet NSImageView *floatOnTopIndicatorImageView;
 
+@property (readwrite, weak) IBOutlet NSLayoutConstraint *playButtonSizeConstraint;
+@property (readwrite, weak) IBOutlet NSLayoutConstraint *prevButtonSizeConstraint;
+@property (readwrite, weak) IBOutlet NSLayoutConstraint *nextButtonSizeConstraint;
+
+@property (readwrite, strong) IBOutlet NSLayoutConstraint *centerButtonStackInViewConstraint;
+@property (readonly) NSLayoutConstraint *bottomButtonStackViewConstraint;
+
 @property (readonly, strong) VLCMainVideoViewAudioMediaDecorativeView *audioDecorativeView;
 @property (readwrite, nonatomic) BOOL autohideControls;
 @property (readwrite, nonatomic) BOOL displayLibraryControls;
 @property (readonly) BOOL mouseOnControls;
+@property (readonly) BOOL pipIsActive;
 
 - (void)showControls;
 - (void)hideControls;
 
-- (IBAction)togglePlaylist:(id)sender;
+- (IBAction)togglePlayQueue:(id)sender;
 - (IBAction)returnToLibrary:(id)sender;
 
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCMainVideoViewController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCMainVideoViewController.m Changed

@@ -23,6 +23,7 @@
 
 #import "VLCMainVideoViewController.h"
 
+#import "extensions/NSView+VLCAdditions.h"
 #import "extensions/NSWindow+VLCAdditions.h"
 
 #import "library/VLCInputItem.h"
@@ -34,8 +35,8 @@
 
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 
 #import "views/VLCBottomBarView.h"
 
@@ -67,10 +68,7 @@
     super viewWillAppear;
 
     if (self.view.superview) {
-        self.view.superview.topAnchor constraintEqualToAnchor:self.view.topAnchor.active = YES;
-        self.view.superview.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor.active = YES;
-        self.view.superview.leftAnchor constraintEqualToAnchor:self.view.leftAnchor.active = YES;
-        self.view.superview.rightAnchor constraintEqualToAnchor:self.view.rightAnchor.active = YES;
+        self.view applyConstraintsToFillSuperview;
     }
 }
 
@@ -83,12 +81,14 @@
 {
     NSTimer *_hideControlsTimer;
     NSLayoutConstraint *_returnButtonBottomConstraint;
-    NSLayoutConstraint *_playlistButtonBottomConstraint;
+    NSLayoutConstraint *_playQueueButtonBottomConstraint;
     PIPViewController *_pipViewController;
     PIPVoutViewController *_voutViewController;
 
     BOOL _isFadingIn;
 }
+
+@property NSWindow *retainedWindow;
 @end
 
 @implementation VLCMainVideoViewController
@@ -137,46 +137,12 @@
 {
     _audioDecorativeView = VLCMainVideoViewAudioMediaDecorativeView fromNibWithOwner:self;
     _audioDecorativeView.translatesAutoresizingMaskIntoConstraints = NO;
-    self.view addConstraints:@
-        NSLayoutConstraint constraintWithItem:_audioDecorativeView
-                                     attribute:NSLayoutAttributeTop
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.view
-                                     attribute:NSLayoutAttributeTop
-                                    multiplier:1.
-                                      constant:0.
-        ,
-        NSLayoutConstraint constraintWithItem:_audioDecorativeView
-                                     attribute:NSLayoutAttributeBottom
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.view
-                                     attribute:NSLayoutAttributeBottom
-                                    multiplier:1.
-                                      constant:0.
-        ,
-        NSLayoutConstraint constraintWithItem:_audioDecorativeView
-                                     attribute:NSLayoutAttributeLeft
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.view
-                                     attribute:NSLayoutAttributeLeft
-                                    multiplier:1.
-                                      constant:0.
-        ,
-        NSLayoutConstraint constraintWithItem:_audioDecorativeView
-                                     attribute:NSLayoutAttributeRight
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:self.view
-                                     attribute:NSLayoutAttributeRight
-                                    multiplier:1.
-                                      constant:0.
-        ,
-    ;
 
-    self.view addSubview:self.audioDecorativeView
-               positioned:NSWindowBelow
-               relativeTo:self.mainControlsView;
+    _bottomButtonStackViewConstraint =
+        self.bottomBarView.topAnchor constraintEqualToAnchor:self.centralControlsStackView.bottomAnchor;
+
     VLCPlayerController * const controller =
-        VLCMain.sharedInstance.playlistController.playerController;
+        VLCMain.sharedInstance.playQueueController.playerController;
     self updateDecorativeViewVisibilityOnControllerChange:controller;
 }
 
@@ -196,7 +162,7 @@
     _autohideControls = YES;
 
     self setDisplayLibraryControls:NO;
-    self updatePlaylistToggleState;
+    self updatePlayQueueToggleState;
     self updateLibraryControls;
 
     _returnButtonBottomConstraint = NSLayoutConstraint constraintWithItem:_returnButton
@@ -206,16 +172,16 @@
                                                                  attribute:NSLayoutAttributeBottom
                                                                 multiplier:1.
                                                                   constant:0;
-    _playlistButtonBottomConstraint = NSLayoutConstraint constraintWithItem:_playlistButton
-                                                                   attribute:NSLayoutAttributeBottom
-                                                                   relatedBy:NSLayoutRelationEqual
-                                                                      toItem:_fakeTitleBar
-                                                                   attribute:NSLayoutAttributeBottom
-                                                                  multiplier:1.
-                                                                    constant:0;
+    _playQueueButtonBottomConstraint = NSLayoutConstraint constraintWithItem:_playQueueButton
+                                                                    attribute:NSLayoutAttributeBottom
+                                                                    relatedBy:NSLayoutRelationEqual
+                                                                       toItem:_fakeTitleBar
+                                                                    attribute:NSLayoutAttributeBottom
+                                                                   multiplier:1.
+                                                                     constant:0;
 
     _returnButtonBottomConstraint.active = NO;
-    _playlistButtonBottomConstraint.active = NO;
+    _playQueueButtonBottomConstraint.active = NO;
 
     self setupAudioDecorativeView;
     self.controlsBar update;
@@ -234,15 +200,42 @@
         VLCInputItem * const inputItem = controller.currentMedia;
         decorativeViewVisible = inputItem != nil && controller.videoTracks.count == 0;
     }
-    _audioDecorativeView.hidden = !decorativeViewVisible;
+
+    NSView * const targetView = decorativeViewVisible ? self.audioDecorativeView : self.voutView;
+    self.voutContainingView.subviews = @targetView;
+    targetView applyConstraintsToFillSuperview;
 
     if (decorativeViewVisible) {
         self setAutohideControls:NO;
+        self.centerButtonStackInViewConstraint.active = NO;
+        self.bottomButtonStackViewConstraint.active = YES;
+        self.prevButtonSizeConstraint.constant = VLCLibraryUIUnits.smallPlaybackControlButtonSize;
+        self.playButtonSizeConstraint.constant = VLCLibraryUIUnits.smallPlaybackControlButtonSize;
+        self.nextButtonSizeConstraint.constant = VLCLibraryUIUnits.smallPlaybackControlButtonSize;
+        self applyAudioDecorativeViewForegroundCoverArtViewConstraints;
     } else {
         self setAutohideControls:YES;
+        self.bottomButtonStackViewConstraint.active = NO;
+        self.centerButtonStackInViewConstraint.active = YES;
+        self.prevButtonSizeConstraint.constant = VLCLibraryUIUnits.mediumPlaybackControlButtonSize;
+        self.playButtonSizeConstraint.constant = VLCLibraryUIUnits.largePlaybackControlButtonSize;
+        self.nextButtonSizeConstraint.constant = VLCLibraryUIUnits.mediumPlaybackControlButtonSize;
     }
 }
 
+- (void)applyAudioDecorativeViewForegroundCoverArtViewConstraints
+{
+    if (!self.voutContainingView.subviews containsObject:self.audioDecorativeView) {
+        return;
+    }
+
+    NSView * const foregroundCoverArtView = self.audioDecorativeView.foregroundCoverArtView;
+    NSLayoutConstraint activateConstraints:@
+        self.centralControlsStackView.topAnchor constraintGreaterThanOrEqualToAnchor:foregroundCoverArtView.bottomAnchor constant:VLCLibraryUIUnits.largeSpacing,
+        self.fakeTitleBar.bottomAnchor constraintLessThanOrEqualToAnchor:foregroundCoverArtView.topAnchor constant:-VLCLibraryUIUnits.largeSpacing
+    ;
+}
+
 - (void)playerCurrentMediaItemChanged:(NSNotification *)notification
 {
     NSParameterAssert(notification);
@@ -309,7 +302,7 @@
     return _centralControlsStackView mouse:mousePos inRect:_centralControlsStackView.frame ||
         _controlsBar.bottomBarView mouse:mousePos inRect: _controlsBar.bottomBarView.frame ||
         _returnButton mouse:mousePos inRect: _returnButton.frame ||
-        _playlistButton mouse:mousePos inRect: _playlistButton.frame;
+        _playQueueButton mouse:mousePos inRect: _playQueueButton.frame;
 }
 
 - (void)stopAutohideTimer
@@ -380,7 +373,7 @@
 - (void)showControls
 {
     self stopAutohideTimer;
-    self updatePlaylistToggleState;
+    self updatePlayQueueToggleState;
     self updateLibraryControls;
 
     if (!_autohideControls) {
@@ -403,17 +396,16 @@
     _displayLibraryControls = displayLibraryControls;
 
     _returnButton.hidden = !displayLibraryControls;
-    _playlistButton.hidden = !displayLibraryControls;
+    _playQueueButton.hidden = !displayLibraryControls;
 }
 
-- (void)updatePlaylistToggleState
+- (void)updatePlayQueueToggleState
 {
-    // TODO: Rename playlist stuff
     VLCLibraryWindow * const libraryWindow = (VLCLibraryWindow*)self.view.window;
     if (libraryWindow != nil && _displayLibraryControls) {
         NSView * const sidebarView =
             libraryWindow.splitViewController.multifunctionSidebarViewController.view;
-        self.playlistButton.state = libraryWindow.mainSplitView isSubviewCollapsed:sidebarView ?
+        self.playQueueButton.state = libraryWindow.mainSplitView isSubviewCollapsed:sidebarView ?
             NSControlStateValueOff : NSControlStateValueOn;
     }
 }
@@ -460,9 +452,9 @@
     _fakeTitleBarHeightConstraint.constant = windowFullscreen ? 0 : windowTitlebarHeight;
 
     _returnButtonTopConstraint.constant = buttonTopSpace;
-    _playlistButtonTopConstraint.constant = buttonTopSpace;
+    _playQueueButtonTopConstraint.constant = buttonTopSpace;
     _returnButtonBottomConstraint.active = placeInFakeToolbar;
-    _playlistButtonBottomConstraint.active = placeInFakeToolbar;
+    _playQueueButtonBottomConstraint.active = placeInFakeToolbar;
 
     NSControlSize buttonSize = NSControlSizeRegular;
 
@@ -476,64 +468,79 @@
         buttonSize = NSControlSizeMini;
     }
 
-    NSControlSize previousButtonSize = _playlistButton.controlSize;
+    NSControlSize previousButtonSize = _playQueueButton.controlSize;
     _returnButton.controlSize = buttonSize;
-    _playlistButton.controlSize = buttonSize;
+    _playQueueButton.controlSize = buttonSize;
 
     // HACK: Upon changing the control size the actual highlight of toggled/hovered buttons doesn't change
     // properly, at least for recessed buttons. This is most obvious on the toggleable playlist button.
     // So reset the state and then retoggle once done.
     if (previousButtonSize != buttonSize) {
-        NSControlStateValue returnButtonControlState = _returnButton.state;
-        NSControlStateValue playlistButtonControlState = _playlistButton.state;
+        const NSControlStateValue returnButtonControlState = _returnButton.state;
+        const NSControlStateValue playQueueButtonControlState = _playQueueButton.state;
         _returnButton.state = NSControlStateValueOff;
-        _playlistButton.state = NSControlStateValueOff;
+        _playQueueButton.state = NSControlStateValueOff;
         _returnButton.state = returnButtonControlState;
-        _playlistButton.state = playlistButtonControlState;
+        _playQueueButton.state = playQueueButtonControlState;
     }
 
-    const CGFloat realButtonSpace = (windowTitlebarHeight - _playlistButton.cell.cellSize.height) / 2;
+    const CGFloat realButtonSpace = (windowTitlebarHeight - _playQueueButton.cell.cellSize.height) / 2;
     const NSRect windowButtonBox = self windowButtonsRect;
 
     _returnButtonLeadingConstraint.constant = placeInFakeToolbar ? windowButtonBox.size.width + VLCLibraryUIUnits.mediumSpacing + realButtonSpace : VLCLibraryUIUnits.largeSpacing;
-    _playlistButtonTrailingConstraint.constant = placeInFakeToolbar ? realButtonSpace: VLCLibraryUIUnits.largeSpacing;
+    _playQueueButtonTrailingConstraint.constant = placeInFakeToolbar ? realButtonSpace: VLCLibraryUIUnits.largeSpacing;
 
     _overlayView.drawGradientForTopControls = !placeInFakeToolbar;
     _overlayView setNeedsDisplay:YES;
 }
 
-- (void)pictureInPictureChanged:(VLCPlayerController *)playerController {
-    if (_voutViewController)
+- (BOOL)pipIsActive
+{
+    return _voutViewController != nil;
+}
+
+- (void)pictureInPictureChanged:(NSNotification *)notification
+{
+    if (self.pipIsActive) {
         return;
-    self.view.window orderOut:self.view.window;
+    }
+
+    NSWindow * const window = self.view.window;
+    window orderOut:window;
+    self.retainedWindow = window;
+
     _voutViewController = PIPVoutViewController new;
-    _voutViewController.view = _voutView;
-    VLCPlayerController * const controller =
-        VLCMain.sharedInstance.playlistController.playerController;
+    _voutViewController.view = self.voutContainingView;
+    VLCPlayerController * const controller = notification.object;
     _pipViewController.playing = controller.playerState == VLC_PLAYER_STATE_PLAYING;
     
-    VLCInputItem *item = controller.currentMedia;
+    VLCInputItem * const item = controller.currentMedia;
     input_item_t * const p_input = item.vlcInputItem;
     vlc_mutex_lock(&p_input->lock);
     const struct input_item_es *item_es;
-    vlc_vector_foreach_ref(item_es, &p_input->es_vec)
-    {
-        if (item_es->es.i_cat != VIDEO_ES)
+    vlc_vector_foreach_ref(item_es, &p_input->es_vec) {
+        if (item_es->es.i_cat != VIDEO_ES) {
             continue;
-        const video_format_t *fmt = &item_es->es.video;
+        }
+        const video_format_t * const fmt = &item_es->es.video;
         unsigned int width = fmt->i_visible_width;
         unsigned int height = fmt->i_visible_height;
-        if (fmt->i_sar_num && fmt->i_sar_den)
+        if (fmt->i_sar_num && fmt->i_sar_den) {
             height = (height * fmt->i_sar_den) / fmt->i_sar_num;
+        }
         _pipViewController.aspectRatio = CGSizeMake(width, height);
         break;
     }
     vlc_mutex_unlock(&p_input->lock);
-    _pipViewController.title = self.view.window.title;
+    _pipViewController.title = window.title;
     _pipViewController presentViewControllerAsPictureInPicture:_voutViewController;
+    
+    if (window isKindOfClass:VLCLibraryWindow.class) {
+        self returnToLibrary:self;
+    }
 }
 
-- (IBAction)togglePlaylist:(id)sender
+- (IBAction)togglePlayQueue:(id)sender
 {
     VLCLibraryWindow * const libraryWindow = (VLCLibraryWindow*)self.view.window;
     if (libraryWindow != nil) {
@@ -550,29 +557,38 @@
 }
 #pragma mark - PIPViewControllerDelegate
 
-- (BOOL)pipShouldClose:(PIPViewController *)pip {
+- (BOOL)pipShouldClose:(PIPViewController *)pip
+{
     return YES;
 }
 
-- (void)pipWillClose:(PIPViewController *)pip {
-    _voutView removeFromSuperview;
-    _voutContainingView addSubview:_voutView;
-    _voutContainingView.topAnchor constraintEqualToAnchor:_voutView.topAnchor.active = YES;
-    _voutContainingView.bottomAnchor constraintEqualToAnchor:_voutView.bottomAnchor.active = YES;
-    _voutContainingView.leftAnchor constraintEqualToAnchor:_voutView.leftAnchor.active = YES;
-    _voutContainingView.rightAnchor constraintEqualToAnchor:_voutView.rightAnchor.active = YES;
-    _voutViewController = nil;
-    pip.replacementWindow = self.view.window;
-    pip.replacementRect = self.voutContainingView.frame;
+- (void)pipWillClose:(PIPViewController *)pip
+{
+    NSWindow * const window = self.retainedWindow;
+    pip.replacementWindow = window;
+    pip.replacementRect = self.view.frame;
+    if (window isKindOfClass:VLCLibraryWindow.class) {
+        (VLCLibraryWindow *)window enableVideoPlaybackAppearance;
+    }
+    window makeKeyAndOrderFront:window;
+    self.retainedWindow = nil;
 }
 
-- (void)pipDidClose:(PIPViewController *)pip {
-    self.view.window orderFront:self.view.window;
+- (void)pipDidClose:(PIPViewController *)pip
+{
+    self.voutContainingView removeFromSuperview;
+    self.view addSubview:self.voutContainingView
+               positioned:NSWindowBelow
+               relativeTo:self.mainControlsView;
+    self.voutContainingView applyConstraintsToFillSuperview;
+    _voutViewController = nil;
+    self applyAudioDecorativeViewForegroundCoverArtViewConstraints;
 }
 
-- (void)pipActionPlay:(PIPViewController *)pip {
+- (void)pipActionPlay:(PIPViewController *)pip
+{
     VLCPlayerController * const controller =
-    VLCMain.sharedInstance.playlistController.playerController;
+        VLCMain.sharedInstance.playQueueController.playerController;
     if (controller.playerState == VLC_PLAYER_STATE_PAUSED) {
         controller resume;
     } else {
@@ -580,15 +596,17 @@
     }
 }
 
-- (void)pipActionStop:(PIPViewController *)pip {
+- (void)pipActionStop:(PIPViewController *)pip
+{
     VLCPlayerController * const controller =
-        VLCMain.sharedInstance.playlistController.playerController;
+        VLCMain.sharedInstance.playQueueController.playerController;
     controller pause;
 }
 
-- (void)pipActionPause:(PIPViewController *)pip {
+- (void)pipActionPause:(PIPViewController *)pip
+{
     VLCPlayerController * const controller =
-        VLCMain.sharedInstance.playlistController.playerController;
+        VLCMain.sharedInstance.playQueueController.playerController;
     controller pause;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCVideoOutputProvider.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCVideoOutputProvider.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m Changed

@@ -37,8 +37,8 @@
 #import "panels/VLCBookmarksWindowController.h"
 #import "panels/VLCTrackSynchronizationWindowController.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 
 #import "windows/video/VLCAspectRatioRetainingVideoWindow.h"
 #import "windows/video/VLCMainVideoViewController.h"
@@ -451,7 +451,7 @@
 - (VLCVoutView *)setupVoutForWindow:(vlc_window_t *)p_wnd
       withProposedVideoViewPosition:(NSRect)videoViewPosition
 {
-    _playerController = VLCMain.sharedInstance.playlistController.playerController;
+    _playerController = VLCMain.sharedInstance.playQueueController.playerController;
     VLCVideoWindowCommon *newVideoWindow = self setupVideoWindow;
     VLCVoutView *voutView = newVideoWindow.videoViewController.voutView;
 
@@ -642,6 +642,11 @@
     NSNotificationCenter.defaultCenter postNotificationName:VLCWindowShouldUpdateLevel object:self userInfo:@{VLCWindowLevelKey : @(_currentWindowLevel)};
 }
 
+- (VLCVideoWindowCommon *)videoWindowForVoutView:(VLCVoutView *)voutView
+{
+    return self.voutWindows objectForKey:NSValue valueWithPointer:voutView.voutWindow;
+}
+
 #pragma mark -
 #pragma mark Property methods

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m Changed

@@ -32,8 +32,8 @@
 #import "main/CompatibilityFixes.h"
 #import "main/VLCMain.h"
 
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 
 #import "windows/video/VLCMainVideoViewController.h"
 #import "windows/video/VLCVideoOutputProvider.h"
@@ -127,7 +127,7 @@
     o_temp_view = NSView alloc init;
     o_temp_view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable;
 
-    _playerController = VLCMain.sharedInstance.playlistController.playerController;
+    _playerController = VLCMain.sharedInstance.playQueueController.playerController;
     _videoViewController = VLCMainVideoViewController alloc init;
 
     self mediaMetadataChanged:nil;
@@ -144,16 +144,16 @@
 
 - (void)mediaMetadataChanged:(NSNotification *)aNotification
 {
-    VLCPlaylistController *playlistController = VLCMain.sharedInstance.playlistController;
-    VLCInputItem *inputItem = playlistController currentlyPlayingInputItem;
+    VLCPlayQueueController * const playQueueController = VLCMain.sharedInstance.playQueueController;
+    VLCInputItem * const inputItem = playQueueController currentlyPlayingInputItem;
     if (inputItem == NULL || _playerController.playerState == VLC_PLAYER_STATE_STOPPED) {
         self setTitle:_NS("VLC media player");
         self.representedURL = nil;
         return;
     }
 
-    NSString *title = inputItem.title;
-    NSString *nowPlaying = inputItem.nowPlaying;
+    NSString * const title = inputItem.title;
+    NSString * const nowPlaying = inputItem.nowPlaying;
     if (nowPlaying) {
         self setTitle:NSString stringWithFormat:@"%@ — %@", title, nowPlaying;
     } else {
@@ -370,7 +370,7 @@
         o_fullscreen_window setFullscreen: YES;
         o_fullscreen_window setAcceptsMouseMovedEvents:YES;
 
-        /* Make sure video view gets visible in case the playlist was visible before */
+        /* Make sure video view gets visible in case the play queue was visible before */
         b_video_view_was_hidden = _videoViewController.view isHidden;
         _videoViewController.view setHidden: NO;
         _videoViewController.view.translatesAutoresizingMaskIntoConstraints = YES;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCVoutView.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCVoutView.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCVoutView.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCVoutView.m Changed

@@ -36,8 +36,8 @@
 #import "coreinteraction/VLCHotkeysController.h"
 #import "main/VLCMain.h"
 #import "menus/VLCMainMenu.h"
-#import "playlist/VLCPlaylistController.h"
-#import "playlist/VLCPlayerController.h"
+#import "playqueue/VLCPlayQueueController.h"
+#import "playqueue/VLCPlayerController.h"
 #import "windows/video/VLCVideoWindowCommon.h"
 
 #import <vlc_actions.h>
@@ -99,17 +99,18 @@
 
 - (void)setup
 {
-    self registerForDraggedTypes:@NSFilenamesPboardType;
+    self.dropTarget = self;
     i_lastScrollWheelDirection = 0;
     f_cumulated_magnification = 0.0;
 
-    _playerController = VLCMain.sharedInstance.playlistController.playerController;
+    _playerController = VLCMain.sharedInstance.playQueueController.playerController;
     _hotkeysController = VLCHotkeysController alloc init;
     _eventQueue = dispatch_queue_create("org.videolan.vlc.vout.events", DISPATCH_QUEUE_SERIAL);
     vlc_mutex_init(&_mutex);
 }
 
-- (void)layout {
+- (void)layout
+{
     NSRect bounds = self convertRectToBacking:self.bounds;
     // dispatch the event async to prevent potential deadlock 
     // with video output's RenderPicture's display lock
@@ -129,32 +130,6 @@
     NSRectFill(rect);
 }
 
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
-    if ((NSDragOperationGeneric & sender draggingSourceOperationMask) == NSDragOperationGeneric)
-        return NSDragOperationGeneric;
-    return NSDragOperationNone;
-}
-
-- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
-{
-    return YES;
-}
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-{
-    // FIXME: re-implement drag and drop of new input items to the playlist
-    BOOL b_returned = NO;
-
-    self setNeedsDisplay:YES;
-    return b_returned;
-}
-
-- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
-{
-    self setNeedsDisplay:YES;
-}
-
 #pragma mark -
 #pragma mark vout actions
 
@@ -424,4 +399,9 @@
     f_cumulated_magnification = 0.0;
 }
 
+- (BOOL)handlePasteBoardFromDragSession:(NSPasteboard *)pasteboard
+{
+    return VLCFileDragRecognisingView handlePasteboardFromDragSessionAsPlayQueueItems:pasteboard;
+}
+
 @end

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/macosx/windows/video/VLCWindow.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/macosx/windows/video/VLCWindow.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/Makefile.am Changed

@@ -11,13 +11,22 @@
 # For each qml and js resource
 #   - Add it to ..._QML
 
+CLEANFILES =
+
 include ../../common.am
 guidir = $(pluginsdir)/gui
 gui_LTLIBRARIES =
 SUFFIXES += .ui .h .hpp .moc.cpp .qml .js .mjs .moc
 TEST_EXTENSIONS = .qml
-EXTRA_DIST = qt6.pro private-core.pro private-gui.pro private-quick.pro quicktest.pro scripts
+EXTRA_DIST = qt6.pro qtest.pro quicktest.pro scripts
 vlc_qt_libs = $(QT_LIBS)
+RCC_EXTRA_PARAMS =
+
+if HAVE_QT_ZSTD
+RCC_EXTRA_PARAMS += -compress-algo=zstd
+else
+RCC_EXTRA_PARAMS += -compress-algo=zlib
+endif
 
 vlc_qt_check_SOURCES = vlc-qt-check.cpp plugins.hpp
 vlc_qt_check_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) -fPIC $(CXXFLAGS_qt)
@@ -29,6 +38,7 @@
 	-DQT_STRICT_ITERATORS \
 	-DQT_USE_QSTRINGBUILDER \
 	-DQT_NO_CAST_TO_ASCII \
+	-DQT_NO_CAST_FROM_BYTEARRAY \
 	-I$(srcdir) -I$(builddir) \
 	-I$(builddir)/dialogs/extended \
 	-I$(builddir)/dialogs/fingerprint \
@@ -43,6 +53,10 @@
 
 libqt_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt) -fPIC
 libqt_plugin_la_LIBADD = $(vlc_qt_libs)
+if HAVE_LIBATOMIC
+libqt_plugin_la_CXXFLAGS += -DQT_HAS_LIBATOMIC
+libqt_plugin_la_LIBADD += -latomic
+endif
 libqt_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
 if HAVE_DARWIN
 libqt_plugin_la_LDFLAGS += -Wl,-framework,Cocoa
@@ -70,18 +84,6 @@
 libqt_plugin_la_CPPFLAGS += -DQT_HAS_GTK
 endif
 
-if HAVE_QT_CORE_PRIVATE
-libqt_plugin_la_CPPFLAGS += -DQT_CORE_PRIVATE $(QT_CORE_PRIVATE_CFLAGS)
-endif
-
-if HAVE_QT_GUI_PRIVATE
-libqt_plugin_la_CPPFLAGS += -DQT_GUI_PRIVATE $(QT_GUI_PRIVATE_CFLAGS)
-endif
-
-if HAVE_QT_DECLARATIVE_PRIVATE
-libqt_plugin_la_CPPFLAGS += -DQT_DECLARATIVE_PRIVATE $(QT_QUICK_PRIVATE_CFLAGS)
-endif
-
 libqt_plugin_la_SOURCES = \
 	qt.cpp qt.hpp plugins.hpp \
 	dialogs/bookmarks/bookmarks.cpp dialogs/bookmarks/bookmarks.hpp \
@@ -120,7 +122,6 @@
 	dialogs/open/open.cpp dialogs/open/open.hpp \
 	dialogs/open/open_panels.cpp dialogs/open/open_panels.hpp \
 	dialogs/open/openurl.cpp dialogs/open/openurl.hpp \
-	dialogs/plugins/addons_manager.cpp dialogs/plugins/addons_manager.hpp \
 	dialogs/plugins/plugins.cpp dialogs/plugins/plugins.hpp \
 	dialogs/podcast/podcast_configuration.cpp \
 	dialogs/podcast/podcast_configuration.hpp \
@@ -243,6 +244,8 @@
 	menus/qml_menu_wrapper.cpp \
 	menus/qml_menu_wrapper.hpp \
 	menus/menus.cpp menus/menus.hpp \
+	network/addonsmodel.cpp \
+	network/addonsmodel.hpp \
 	network/mediatreelistener.cpp \
 	network/mediatreelistener.hpp \
 	network/devicesourceprovider.cpp \
@@ -255,10 +258,9 @@
 	network/networksourcesmodel.hpp \
 	network/networkmediamodel.cpp \
 	network/networkmediamodel.hpp \
-	network/servicesdiscoverymodel.cpp \
-	network/servicesdiscoverymodel.hpp \
 	network/standardpathmodel.cpp \
 	network/standardpathmodel.hpp \
+	network/vlcmediasourcewrapper.hpp \
 	style/qtthemeprovider.hpp \
 	style/colorcontext.cpp \
 	style/colorcontext.hpp \
@@ -290,12 +292,14 @@
 	util/workerthreadset.hpp util/workerthreadset.cpp \
 	util/base_model.hpp util/base_model_p.hpp util/base_model.cpp \
 	util/color_scheme_model.cpp util/color_scheme_model.hpp \
+	util/ui_notifier.cpp util/ui_notifier.hpp \
 	util/color_svg_image_provider.cpp util/color_svg_image_provider.hpp \
 	util/vlcaccess_image_provider.cpp util/vlcaccess_image_provider.hpp \
 	util/covergenerator.cpp \
 	util/covergenerator.hpp \
 	util/imageluminanceextractor.cpp util/imageluminanceextractor.hpp \
 	util/csdbuttonmodel.cpp util/csdbuttonmodel.hpp \
+	util/csdmenu.cpp util/csdmenu.hpp \
 	util/imagehelper.cpp util/imagehelper.hpp \
 	util/keyhelper.cpp util/keyhelper.hpp \
 	util/listcache.hxx util/listcache.hpp \
@@ -317,6 +321,7 @@
 	util/varcommon_p.hpp \
 	util/varchoicemodel.cpp  util/varchoicemodel.hpp \
 	util/variables.cpp util/variables.hpp \
+	util/vlchotkeyconverter.cpp util/vlchotkeyconverter.hpp \
 	util/vlctick.cpp \
 	util/vlctick.hpp \
 	util/shared_input_item.hpp \
@@ -325,11 +330,17 @@
 	util/effects_image_provider.hpp \
 	util/qsgroundedrectangularimagenode.cpp \
 	util/qsgroundedrectangularimagenode.hpp \
+	util/qsgtextureview.cpp \
+	util/qsgtextureview.hpp \
 	util/dismiss_popup_event_filter.cpp \
 	util/dismiss_popup_event_filter.hpp \
 	util/list_selection_model.cpp \
 	util/list_selection_model.hpp \
 	util/model_recovery_agent.hpp \
+	util/vlcqtmessagehandler.cpp \
+	util/vlcqtmessagehandler.hpp \
+	util/colorizedsvgicon.cpp \
+	util/colorizedsvgicon.hpp \
 	widgets/native/animators.cpp \
 	widgets/native/animators.hpp \
 	widgets/native/customwidgets.cpp widgets/native/customwidgets.hpp \
@@ -343,16 +354,16 @@
 	widgets/native/mlfolderseditor.hpp \
 	widgets/native/qvlcframe.cpp \
 	widgets/native/qvlcframe.hpp \
-	widgets/native/roundimage.cpp widgets/native/roundimage.hpp widgets/native/roundimage_p.hpp \
 	widgets/native/searchlineedit.cpp widgets/native/searchlineedit.hpp \
 	widgets/native/viewblockingrectangle.cpp widgets/native/viewblockingrectangle.hpp \
-	widgets/native/doubleclickignoringitem.hpp
+	widgets/native/doubleclickignoringitem.hpp \
+	widgets/native/textureprovideritem.cpp widgets/native/textureprovideritem.hpp
 
 # Meta-object compilation
 
 moc_verbose = $(moc_verbose_$(V))
 moc_verbose_ = $(moc_verbose__$(AM_DEFAULT_VERBOSITY))
-moc_verbose_0 = @echo "  MOC   " $@;
+moc_verbose_0 = @echo "  MOC     " $@;
 moc_verbose__0 = $(moc_verbose_0)
 
 .hpp.moc.cpp:
@@ -391,7 +402,6 @@
 	dialogs/open/open.moc.cpp \
 	dialogs/open/open_panels.moc.cpp \
 	dialogs/open/openurl.moc.cpp \
-	dialogs/plugins/addons_manager.moc.cpp \
 	dialogs/plugins/plugins.moc.cpp \
 	dialogs/podcast/podcast_configuration.moc.cpp \
 	dialogs/preferences/complete_preferences.moc.cpp \
@@ -443,12 +453,12 @@
 	menus/custom_menus.moc.cpp \
 	menus/qml_menu_wrapper.moc.cpp \
 	menus/menus.moc.cpp \
+	network/addonsmodel.moc.cpp \
 	network/devicesourceprovider.moc.cpp \
 	network/networkdevicemodel.moc.cpp \
 	network/networkbasemodel.moc.cpp \
 	network/networksourcesmodel.moc.cpp \
 	network/networkmediamodel.moc.cpp \
-	network/servicesdiscoverymodel.moc.cpp \
 	network/standardpathmodel.moc.cpp \
 	style/colorcontext.moc.cpp \
 	style/systempalette.moc.cpp \
@@ -466,10 +476,12 @@
 	util/workerthreadset.moc.cpp \
 	util/base_model.moc.cpp \
 	util/color_scheme_model.moc.cpp \
+	util/ui_notifier.moc.cpp \
 	util/color_svg_image_provider.moc.cpp \
 	util/vlcaccess_image_provider.moc.cpp \
 	util/imageluminanceextractor.moc.cpp \
 	util/csdbuttonmodel.moc.cpp \
+	util/csdmenu.moc.cpp \
 	util/keyhelper.moc.cpp \
 	util/listcache.moc.cpp \
 	util/locallistcacheloader.moc.cpp \
@@ -484,16 +496,17 @@
 	util/vlctick.moc.cpp \
 	util/dismiss_popup_event_filter.moc.cpp \
 	util/list_selection_model.moc.cpp \
+	util/vlchotkeyconverter.moc.cpp \
+	util/qsgtextureview.moc.cpp \
 	widgets/native/animators.moc.cpp \
 	widgets/native/csdthemeimage.moc.cpp \
 	widgets/native/customwidgets.moc.cpp \
 	widgets/native/interface_widgets.moc.cpp \
 	widgets/native/navigation_attached.moc.cpp \
 	widgets/native/mlfolderseditor.moc.cpp \
-	widgets/native/roundimage.moc.cpp \
-	widgets/native/roundimage_p.moc.cpp \
 	widgets/native/searchlineedit.moc.cpp \
-	widgets/native/viewblockingrectangle.moc.cpp
+	widgets/native/viewblockingrectangle.moc.cpp \
+	widgets/native/textureprovideritem.moc.cpp
 
 nodist_libqt_plugin_la_SOURCES += \
 	dialogs/extended/ui_equalizer.h \
@@ -531,12 +544,13 @@
 	maininterface/compositor_win7.hpp \
 	style/windowsthemeprovider.cpp \
 	maininterface/win32windoweffects_module.cpp \
-	maininterface/win32windoweffects_module.hpp
+	maininterface/win32windoweffects_module.hpp \
+	util/csdmenu_win32.c \
+	util/csdmenu_win32.h
 
 nodist_libqt_plugin_la_SOURCES += maininterface/mainctx_win32.moc.cpp \
 	maininterface/compositor_win7.moc.cpp
 
-if HAVE_DCOMP
 libqt_plugin_la_SOURCES += \
 	maininterface/compositor_dcomp.cpp \
 	maininterface/compositor_dcomp.hpp \
@@ -549,7 +563,6 @@
 	maininterface/compositor_dcomp.moc.cpp
 
 endif
-endif
 
 # X11 compositor
 
@@ -559,7 +572,7 @@
 if HAVE_XCB_XFIXES
 
 libqt_plugin_la_CXXFLAGS += -DQT_HAS_X11_COMPOSITOR \
-	$(QT_X11_CFLAGS) $(XCB_RENDER_CFLAGS) $(XCB_COMPOSITE_CFLAGS) $(XLCB_DAMAGE_CFLAGS) $(XCB_XFIXES_CFLAGS)
+	$(QT_X11_CFLAGS) $(XCB_RENDER_CFLAGS) $(XCB_COMPOSITE_CFLAGS) $(XCB_DAMAGE_CFLAGS) $(XCB_XFIXES_CFLAGS)
 
 libqt_plugin_la_LIBADD += $(QT_X11_LIBS) $(XCB_RENDER_LIBS) $(XCB_COMPOSITE_LIBS) $(XCB_DAMAGE_LIBS) $(XCB_XFIXES_LIBS)
 
@@ -579,8 +592,24 @@
 	maininterface/compositor_x11.moc.cpp \
 	maininterface/compositor_x11_renderclient.moc.cpp \
 	maininterface/compositor_x11_renderwindow.moc.cpp \
-	maininterface/compositor_x11_uisurface.moc.cpp \
-	maininterface/compositor_x11_utils.moc.cpp
+	maininterface/compositor_x11_uisurface.moc.cpp
+
+#extra X11 features
+
+libqt_x11_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(XCB_CFLAGS) $(XCB_RENDER_CFLAGS) $(XCB_COMPOSITE_CFLAGS) $(XCB_DAMAGE_CFLAGS) $(XCB_XFIXES_CFLAGS)
+libqt_x11_plugin_la_LIBADD = $(XCB_LIBS) $(XCB_RENDER_LIBS) $(XCB_COMPOSITE_LIBS) $(XCB_DAMAGE_LIBS) $(XCB_XFIXES_LIBS)
+libqt_x11_plugin_la_SOURCES = \
+	maininterface/qt_x11_plugin.c \
+	maininterface/compositor_x11_utils.hpp \
+	maininterface/compositor_x11_utils.cpp \
+	util/csdmenu_module.h \
+	util/csdmenu_x11.cpp \
+	util/csdmenu_x11.h
+
+if ENABLE_QT
+gui_LTLIBRARIES += libqt_x11_plugin.la
+endif
+
 
 endif
 endif
@@ -603,8 +632,9 @@
 	maininterface/compositor_wayland.moc.cpp
 
 libqt_wayland_plugin_la_CFLAGS = $(AM_CFLAGS) $(WAYLAND_CLIENT_CFLAGS)
-libqt_wayland_plugin_la_LIBADD =  $(WAYLAND_CLIENT_LIBS)
+libqt_wayland_plugin_la_LIBADD =  $(WAYLAND_CLIENT_LIBS) $(LIBM)
 libqt_wayland_plugin_la_SOURCES = \
+	maininterface/qt_wayland_plugin.c \
 	maininterface/compositor_wayland_module.c \
 	maininterface/compositor_wayland_module.h
 
@@ -612,12 +642,21 @@
 #if WAYLAND_SCANNER
 libqt_wayland_plugin_la_CFLAGS += -DQT_HAS_WAYLAND_PROTOCOLS -I$(builddir)/maininterface
 
+libqt_wayland_plugin_la_SOURCES += \
+	util/csdmenu_wayland.c \
+	util/csdmenu_wayland.h \
+	util/csdmenu_module.h
+
 nodist_libqt_wayland_plugin_la_SOURCES = \
+	maininterface/xdg-shell-client-protocol.h \
+	maininterface/xdg-shell-protocol.c
+
+if HAVE_QT65
+libqt_wayland_plugin_la_CFLAGS += -DQT_HAS_WAYLAND_FRACTIONAL_SCALING
+nodist_libqt_wayland_plugin_la_SOURCES += \
 	maininterface/viewporter-client-protocol.h \
 	maininterface/viewporter-protocol.c
 
-BUILT_SOURCES += $(nodist_libqt_wayland_plugin_la_SOURCES)
-
 maininterface/viewporter-client-protocol.h: \
 		$(WAYLAND_PROTOCOLS)/stable/viewporter/viewporter.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
@@ -626,6 +665,15 @@
 		$(WAYLAND_PROTOCOLS)/stable/viewporter/viewporter.xml \
 		maininterface/viewporter-client-protocol.h
 	$(AM_V_GEN)$(WAYLAND_SCANNER) private-code $< $@
+endif
+
+BUILT_SOURCES += $(nodist_libqt_wayland_plugin_la_SOURCES)
+
+maininterface/xdg-shell-client-protocol.h: $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml Makefile.am
+	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
+
+maininterface/xdg-shell-protocol.c: $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml Makefile.am
+	$(AM_V_GEN)$(WAYLAND_SCANNER) private-code $< $@
 
 #endif
 #endif
@@ -657,7 +705,7 @@
 
 uic_verbose = $(uic_verbose_$(V))
 uic_verbose_ = $(uic_verbose__$(AM_DEFAULT_VERBOSITY))
-uic_verbose_0 = @echo "  UIC   " $@;
+uic_verbose_0 = @echo "  UIC     " $@;
 uic_verbose__0 = $(uic_verbose_0)
 
 MOC_CPPFLAGS = $(DEFS) \
@@ -1043,7 +1091,6 @@
 	player/qml/MiniPlayer.qml \
 	player/qml/PIPPlayer.qml \
 	player/qml/Player.qml \
-	player/qml/PlayerBlurredBackground.qml \
 	player/qml/PlayerControlLayout.qml \
 	player/qml/PlayerPlaylistVisibilityFSM.qml \
 	player/qml/PlayerToolbarVisibilityFSM.qml \
@@ -1127,7 +1174,7 @@
 libqml_module_playlist_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
 libqml_module_playlist_a_QML = \
 	playlist/qml/PlaylistDelegate.qml \
-	playlist/qml/PlaylistListView.qml \
+	playlist/qml/PlaylistPane.qml \
 	playlist/qml/PlaylistToolbar.qml \
 	playlist/qml/PlaylistDetachedWindow.qml
 nodist_libqml_module_playlist_a_SOURCES = playlist_qmlassets.cpp
@@ -1183,6 +1230,7 @@
 	widgets/qml/CheckedDelegate.qml \
 	widgets/qml/ComboBoxExt.qml \
 	widgets/qml/AcrylicBackground.qml \
+	widgets/qml/FloatingNotification.qml \
 	widgets/qml/AnimatedBackground.qml \
 	widgets/qml/CSDThemeButton.qml \
 	widgets/qml/CSDThemeButtonSet.qml \
@@ -1207,7 +1255,7 @@
 	widgets/qml/ImageToolButton.qml \
 	widgets/qml/ListViewExt.qml \
 	widgets/qml/TableViewExt.qml \
-	widgets/qml/TableViewDelegate.qml \
+	widgets/qml/TableViewDelegateExt.qml \
 	widgets/qml/TableRowDelegate.qml \
 	widgets/qml/TableHeaderDelegate.qml \
 	widgets/qml/DefaultShadow.qml \
@@ -1250,11 +1298,18 @@
 	widgets/qml/PopupIconToolButton.qml \
 	widgets/qml/PartialEffect.qml \
 	widgets/qml/ViewHeader.qml \
-	widgets/qml/ProgressIndicator.qml
+	widgets/qml/ProgressIndicator.qml \
+	widgets/qml/RectangularGlow.qml \
+	widgets/qml/ImageExt.qml \
+	widgets/qml/ScrollBarExt.qml
 if HAVE_QT65
-libqml_module_widgets_a_QML += widgets/qml/DynamicShadow.qml
+libqml_module_widgets_a_QML += \
+	widgets/qml/DynamicShadow.qml \
+	widgets/qml/BlurEffect.qml
 else
-libqml_module_widgets_a_QML += widgets/qml/compat/DynamicShadow.qml
+libqml_module_widgets_a_QML += \
+	widgets/qml/compat/DynamicShadow.qml \
+	widgets/qml/compat/BlurEffect.qml
 endif
 nodist_libqml_module_widgets_a_SOURCES = widgets_qmlassets.cpp
 $(libqml_module_widgets_a_QML:.qml=.cpp) : $(builddir)/widgets/res.qrc
@@ -1293,10 +1348,15 @@
 libqt_plugin_la_SHADER := shaders/FadingEdge.frag \
                           shaders/FadingEdgeX.vert \
                           shaders/FadingEdgeY.vert \
-                          shaders/FrostedGlass.frag \
+                          shaders/Noise.frag \
                           shaders/RectFilter.frag \
                           shaders/SubTexture.vert \
-                          shaders/PlayerBlurredBackground.frag
+                          shaders/PlayerBlurredBackground.frag \
+                          shaders/HollowRectangularGlow.frag \
+                          shaders/RectangularGlow.frag \
+                          shaders/SDFAARoundedTexture.frag \
+                          shaders/SDFAARoundedTexture_cropsupport_bordersupport.frag \
+                          shaders/DitheredTexture.frag
 if ENABLE_QT
 
 libqt_plugin_la_LIBADD += libqml_module_dialogs.a \
@@ -1350,15 +1410,17 @@
 QSB_PARAMS_VERBOSE_0 = -s
 QSB_PARAMS_VERBOSE__0 = $(QSB_PARAMS_VERBOSE_0)
 
-%.frag.qsb: %.frag
+EXTRA_DIST += shaders/Common.glsl
+
+%.frag.qsb: %.frag shaders/Common.glsl
 	$(qsb_verbose)PATH="$(QSB_EXTRA_PATH)$$PATH" $(QSB) $(QSB_PARAMS) $(QSB_PARAMS_VERBOSE) -o $@ $<
 
-%.vert.qsb: %.vert
+%.vert.qsb: %.vert shaders/Common.glsl
 	$(qsb_verbose)PATH="$(QSB_EXTRA_PATH)$$PATH" $(QSB) $(QSB_PARAMS) $(QSB_PARAMS_VERBOSE) -o $@ $<
 
 shaders/shaders.cpp: $(srcdir)/shaders/shaders.qrc $(libqt_plugin_la_SHADER:.frag=.frag.qsb) $(libqt_plugin_la_SHADER:.vert=.vert.qsb)
 	$(AM_V_GEN) cp -f $(filter %.qrc, $^) $(builddir)/shaders/shaders.qrc || true
-	$(AM_V_GEN) $(RCC) --name shaders -o $@ $(builddir)/shaders/$(notdir $(filter %.qrc, $^))
+	$(AM_V_GEN) $(RCC) $(RCC_EXTRA_PARAMS) --name shaders -o $@ $(builddir)/shaders/$(notdir $(filter %.qrc, $^))
 
 libqt_plugin_la_SOURCES += shaders/shaders.qrc $(libqt_plugin_la_SHADER)
 BUILT_SOURCES += shaders/shaders.qrc
@@ -1370,7 +1432,7 @@
 
 windows.cpp: $(libqt_plugin_la_RES)
 windows.cpp: windows.qrc
-	$(AM_V_GEN)$(RCC) --name windows -o $@ $<
+	$(AM_V_GEN)$(RCC) $(RCC_EXTRA_PARAMS) --name windows -o $@ $<
 
 nodist_libqt_plugin_la_SOURCES += windows.cpp
 endif
@@ -1461,7 +1523,7 @@
 
 #package qmldir files
 %_qmlassets.cpp: $(builddir)/%/qmldir.qrc
-	$(AM_V_GEN)$(RCC) --name $*_assets -o $@ $<
+	$(AM_V_GEN)$(RCC) $(RCC_EXTRA_PARAMS) --name $*_assets -o $@ $<
 
 
 CLEANFILES += \
@@ -1479,7 +1541,7 @@
 libqt_plugin_la_QML_MODULES_QMLDIR_QRC = $(libqt_plugin_la_QML_MODULES:%=$(builddir)/%/qmldir.qrc)
 
 %_qmlassets.cpp: $(builddir)/%/qmldir.qrc $(builddir)/%/res.qrc $(libqt_plugin_la_ALL_QML)
-	$(AM_V_GEN)$(RCC) --name $*_assets -o $@ $(builddir)/$*/qmldir.qrc $(builddir)/$*/res.qrc
+	$(AM_V_GEN)$(RCC) $(RCC_EXTRA_PARAMS) --name $*_assets -o $@ $(builddir)/$*/qmldir.qrc $(builddir)/$*/res.qrc
 
 nodist_libqt_plugin_la_SOURCES += $(libqt_plugin_la_QML_MODULES:%=%_qmlassets.cpp)
 
@@ -1493,7 +1555,7 @@
 
 assets.cpp: $(libqt_plugin_la_RES)
 assets.cpp: assets.qrc
-	$(AM_V_GEN)$(RCC) --name assets -o $@ $<
+	$(AM_V_GEN)$(RCC) $(RCC_EXTRA_PARAMS) --name assets -o $@ $<
 
 
 if HAVE_QT_GTK
@@ -1549,10 +1611,47 @@
 QT_QTEST_COMMON_ldadd = $(QT_LIBS) $(LIBS_qt) $(QT_QTEST_LIBS) $(LIBVLCCORE) $(LIBVLC)
 QT_QTEST_COMMON_ldflags = $(AM_LDFLAGS) $(QT_LDFLAGS) $(QT_QTEST_LDFLAGS)
 
+
+# test_ml_model
+
+test_ml_model_SOURCES = \
+	tests/vlc_stub_modules.cpp tests/vlc_stub_modules.hpp \
+	tests/test_ml_model.cpp \
+	util/base_model.hpp util/base_model_p.hpp  util/base_model.cpp \
+	util/listcache.hpp \
+	util/locallistcacheloader.hpp \
+	medialibrary/mlqmltypes.hpp \
+	medialibrary/mlbasemodel.hpp medialibrary/mlbasemodel.cpp \
+	medialibrary/medialib.hpp medialibrary/medialib.cpp \
+	medialibrary/mlthreadpool.hpp medialibrary/mlthreadpool.cpp \
+	playlist/playlist_controller.hpp playlist/playlist_controller.cpp \
+	playlist/playlist_item.hpp playlist/playlist_item.cpp
+
+nodist_test_ml_model_SOURCES = \
+	tests/test_ml_model.moc \
+	util/base_model.moc.cpp \
+	util/listcache.moc.cpp \
+	util/locallistcacheloader.moc.cpp \
+	medialibrary/mlqmltypes.moc.cpp \
+	medialibrary/mlbasemodel.moc.cpp \
+	medialibrary/medialib.moc.cpp \
+	medialibrary/mlthreadpool.moc.cpp \
+	playlist/playlist_controller.moc.cpp \
+	playlist/playlist_item.moc.cpp
+
+BUILT_SOURCES += tests/test_ml_model.moc
+CLEANFILES += tests/test_ml_model.moc
+test_ml_model_CPPFLAGS = $(QT_QTEST_COMMON_cppflags)
+test_ml_model_CXXFLAGS = $(QT_QTEST_COMMON_cxxflags)
+test_ml_model_LDADD = $(QT_QTEST_COMMON_ldadd)
+test_ml_model_LDFLAGS = $(QT_QTEST_COMMON_ldflags)
+check_PROGRAMS += test_ml_model
+TESTS += test_ml_model
+
 # test_renderer_manager_model
 
 test_renderer_manager_model_SOURCES = \
-	tests/vlc_stub_modules.cpp \
+	tests/vlc_stub_modules.cpp tests/vlc_stub_modules.hpp \
 	tests/test_renderer_manager_model.cpp \
     util/renderer_manager.hpp util/renderer_manager.cpp
 
@@ -1569,10 +1668,29 @@
 check_PROGRAMS += test_renderer_manager_model
 TESTS += test_renderer_manager_model
 
+# test_thread_runner
+
+test_thread_runner_SOURCES = \
+	tests/test_thread_runner.cpp \
+    medialibrary/mlthreadpool.cpp medialibrary/mlthreadpool.hpp
+
+nodist_test_thread_runner_SOURCES = \
+	tests/test_thread_runner.moc \
+    medialibrary/mlthreadpool.moc.cpp
+
+BUILT_SOURCES += tests/test_thread_runner.moc
+CLEANFILES += tests/test_thread_runner.moc
+test_thread_runner_CPPFLAGS = $(QT_QTEST_COMMON_cppflags)
+test_thread_runner_CXXFLAGS = $(QT_QTEST_COMMON_cxxflags)
+test_thread_runner_LDADD = $(QT_QTEST_COMMON_ldadd)
+test_thread_runner_LDFLAGS = $(QT_QTEST_COMMON_ldflags)
+check_PROGRAMS += test_thread_runner
+TESTS += test_thread_runner
+
 # test_vlc_dialog_model
 
 test_vlc_dialog_model_SOURCES = \
-	tests/vlc_stub_modules.cpp \
+	tests/vlc_stub_modules.cpp tests/vlc_stub_modules.hpp \
 	tests/test_vlc_dialog_model.cpp \
 	dialogs/dialogs/dialogmodel.cpp

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/dialogs/dialogmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/dialogs/dialogmodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/dialogs/qml/CustomDialog.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/dialogs/qml/CustomDialog.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/dialogs/qml/ModalDialog.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/dialogs/qml/ModalDialog.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/dialogs/qml/WindowDialog.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/dialogs/qml/WindowDialog.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/dialogs_provider.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/dialogs_provider.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/extended/extended_panels.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/extended/extended_panels.cpp Changed

@@ -159,7 +159,7 @@
     SETUP_VFILTER_OPTION( brightnessSlider, &QSlider::valueChanged )
     SETUP_VFILTER_OPTION( saturationSlider, &QSlider::valueChanged )
     SETUP_VFILTER_OPTION( gammaSlider, &QSlider::valueChanged )
-    SETUP_VFILTER_OPTION( brightnessThresholdCheck, &QCheckBox::stateChanged )
+    SETUP_VFILTER_OPTION( brightnessThresholdCheck, &QtCheckboxChanged )
 
     SETUP_VFILTER_gb( extract )
     SETUP_VFILTER_OPTION( extractComponentText, &QLineEdit::textChanged )
@@ -178,8 +178,8 @@
 
     SETUP_VFILTER_gb( gradient )
     SETUP_VFILTER_OPTION( gradientModeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged) )
-    SETUP_VFILTER_OPTION( gradientColorCheck, &QCheckBox::stateChanged )
-    SETUP_VFILTER_OPTION( gradientCartoonCheck, &QCheckBox::stateChanged )
+    SETUP_VFILTER_OPTION( gradientColorCheck, &QtCheckboxChanged )
+    SETUP_VFILTER_OPTION( gradientCartoonCheck, &QtCheckboxChanged )
 
     SETUP_VFILTER_gb( motionblur )
     SETUP_VFILTER_OPTION( blurFactorSlider, &QSlider::valueChanged )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/extensions/extensions.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/extensions/extensions.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/firstrun/firstrunwizard.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/firstrun/firstrunwizard.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/help/help.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/help/help.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/open/open.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/open/open.cpp Changed

@@ -82,14 +82,14 @@
 
     /* Menu for the Play button */
     QMenu * openButtonMenu = new QMenu( "Open", playButton );
-    openButtonMenu->addAction( qtr( "&Enqueue" ), this, &OpenDialog::enqueue,
-                                    QKeySequence( "Alt+E" ) );
-    openButtonMenu->addAction( qtr( "&Play" ), this, &OpenDialog::play,
-                                    QKeySequence( "Alt+P" ) );
-    openButtonMenu->addAction( qtr( "&Stream" ), this, &OpenDialog::stream,
-                                    QKeySequence( "Alt+S" ) );
-    openButtonMenu->addAction( qtr( "C&onvert" ), this, &OpenDialog::transcode,
-                                    QKeySequence( "Alt+O" ) );
+    openButtonMenu->addAction( qtr( "&Enqueue" ), this, &OpenDialog::enqueue
+                                    )->setShortcut( QKeySequence( "Alt+E" ) );
+    openButtonMenu->addAction( qtr( "&Play" ), this, &OpenDialog::play
+                                    )->setShortcut( QKeySequence( "Alt+P" ) );
+    openButtonMenu->addAction( qtr( "&Stream" ), this, &OpenDialog::stream
+                                    )->setShortcut( QKeySequence( "Alt+S" ) );
+    openButtonMenu->addAction( qtr( "C&onvert" ), this, &OpenDialog::transcode
+                                    )->setShortcut( QKeySequence( "Alt+O" ) );
 
     playButton->setMenu( openButtonMenu );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/open/open.ui -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/open/open.ui Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/open/open_disk.ui -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/open/open_disk.ui Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/open/open_file.ui -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/open/open_file.ui Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/open/open_panels.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/open/open_panels.cpp Changed

@@ -38,13 +38,11 @@
 #include "dialogs/dialogs_provider.hpp" /* Open Subtitle file */
 #include "util/qt_dirs.hpp"
 #include "util/validators.hpp"
+#include "util/colorizedsvgicon.hpp"
 #include <vlc_intf_strings.h>
 #include <vlc_modules.h>
 #include <vlc_plugin.h>
 #include <vlc_url.h>
-#ifdef _WIN32
-  #include <vlc_charset.h> /* FromWide for Win32 */
-#endif
 
 #include <QFileDialog>
 #include <QDialogButtonBox>
@@ -98,6 +96,8 @@
     /* Deactivate the subtitles control by default. */
     ui.subGroupBox->setEnabled( false );
 
+    ui.fileBrowseButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/add.svg", ui.fileBrowseButton ) );
+
     /* Connects  */
     BUTTONACT( ui.fileBrowseButton, &FileOpenPanel::browseFile );
     BUTTONACT( ui.removeFileButton, &FileOpenPanel::removeFile );
@@ -359,6 +359,8 @@
         ui.deviceCombo->setCurrentIndex( temp );
 #endif
 
+    ui.ejectButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_fluent_arrow_eject.svg", ui.ejectButton ) );
+
     /* CONNECTs */
     BUTTONACT( ui.dvdRadioButton,     &DiscOpenPanel::updateButtons );
     BUTTONACT( ui.bdRadioButton,      &DiscOpenPanel::updateButtons );
@@ -403,16 +405,14 @@
                 wchar_t psz_name512 = L"";
                 GetVolumeInformationW( drive, psz_name, 511, NULL, NULL, NULL, NULL, 0 );
 
-                char *psz_drive = FromWide( drive );
+                QString psz_drive = QString::fromWCharArray( drive );
                 QString displayName = psz_drive;
-                char *psz_title = FromWide( psz_name );
-                if( !EMPTY_STR(psz_title)) {
+                QString psz_title = QString::fromWCharArray( psz_name );
+                if( !psz_title.isEmpty()) {
                     displayName = displayName + " - "  + psz_title;
                 }
 
-                ui.deviceCombo->addItem( displayName, qfu(psz_drive) );
-                free( psz_drive );
-                free( psz_title );
+                ui.deviceCombo->addItem( displayName, psz_drive );
             }
 
             /* go to next drive */
@@ -572,7 +572,7 @@
     discPath = ui.deviceCombo->currentText();
 
     int tmp = ui.deviceCombo->findText( discPath );
-    if( tmp != -1 &&  ui.deviceCombo->itemData( tmp ) != QVariant::Invalid )
+    if( tmp != -1 &&  ui.deviceCombo->itemData( tmp ).isValid() )
         discPath = ui.deviceCombo->itemData( tmp ).toString();
 
     /* MRL scheme */
@@ -927,8 +927,8 @@
 
     /* Jack CONNECTs */
     CuMRL( jackChannels, QOverload<int>::of(&QSpinBox::valueChanged) );
-    CuMRL( jackPace, &QCheckBox::stateChanged );
-    CuMRL( jackConnect, &QCheckBox::stateChanged );
+    CuMRL( jackPace, &QtCheckboxChanged );
+    CuMRL( jackConnect, &QtCheckboxChanged );
     CuMRL( jackPortsSelected, &QLineEdit::textChanged );
     configList << "jack-input-use-vlc-pace" << "jack-input-auto-connect";
     }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/plugins/plugins.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/plugins/plugins.cpp Changed

@@ -29,9 +29,10 @@
 
 #include "widgets/native/searchlineedit.hpp"
 #include "dialogs/extensions/extensions_manager.hpp"
-#include "addons_manager.hpp"
+#include "network/addonsmodel.hpp"
 #include "widgets/native/animators.hpp"
 #include "util/imagehelper.hpp"
+#include "util/colorizedsvgicon.hpp"
 
 #include <cassert>
 
@@ -66,6 +67,7 @@
 #include <QStackedWidget>
 #include <QPainterPath>
 #include <QSignalMapper>
+#include <QtQml/QQmlFile>
 
 //match the image source (width/height)
 #define SCORE_ICON_WIDTH_SCALE 4
@@ -302,28 +304,6 @@
     dlg.exec();
 }
 
-static QIcon iconFromCategory( int type )
-{
-    switch( type )
-    {
-        case ADDON_EXTENSION:
-            return QIcon( ":/addons/addon_yellow.svg" );
-        case ADDON_PLAYLIST_PARSER:
-            return QIcon( ":/addons/addon_green.svg" );
-        case ADDON_SERVICE_DISCOVERY:
-            return QIcon( ":/addons/addon_red.svg" );
-        case ADDON_SKIN2:
-            return QIcon( ":/addons/addon_cyan.svg" );
-        case ADDON_INTERFACE:
-            return QIcon( ":/addons/addon_blue.svg" );
-        case ADDON_META:
-            return QIcon( ":/addons/addon_magenta.svg" );
-        default:
-            return QIcon( ":/addons/default.svg" );
-    }
-    vlc_assert_unreachable();
-}
-
 /* Add-ons tab */
 AddonsTab::AddonsTab( qt_intf_t *p_intf_ ) : QVLCFrame( p_intf_ )
 {
@@ -354,49 +334,53 @@
     leftPane->layout()->addWidget( searchInput );
     leftPane->layout()->addItem( new QSpacerItem( 0, 10 ) );
 
-    QToolButton * button;
     signalMapper = new QSignalMapper();
-#define ADD_CATEGORY( label, ltooltip, numb ) \
-    button = new QToolButton( this );\
-    button->setIcon( iconFromCategory( numb ) ); \
-    button->setText( label );\
-    button->setToolTip( ltooltip );\
-    button->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );\
-    button->setIconSize( QSize( 32, 32 ) );\
-    button->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Maximum) ;\
-    button->setMinimumSize( 32, 32 );\
-    button->setAutoRaise( true );\
-    button->setCheckable( true );\
-    if ( numb == -1 ) button->setChecked( true );\
-    button->setAutoExclusive( true );\
-    connect( button, &QToolButton::clicked, signalMapper, QOverload<>::of(&QSignalMapper::map) );\
-    signalMapper->setMapping( button, numb );\
-    leftPane->layout()->addWidget( button );
-
-    ADD_CATEGORY( qtr("All"), qtr("Interface Settings"),
-                  -1 );
-    ADD_CATEGORY( qtr("Skins"),
+
+    auto addCategory = this, leftPane( const QString& label, const QString& ltooltip,  AddonsModel::Type type) {
+        auto button = new QToolButton( this );
+
+        QString iconpath = QQmlFile::urlToLocalFileOrQrc(AddonsModel::getIconForType( type ));
+        button->setIcon( QIcon{ iconpath } );
+        button->setText( label );
+        button->setToolTip( ltooltip );
+        button->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
+        button->setIconSize( QSize( 32, 32 ) );
+        button->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Maximum) ;
+        button->setMinimumSize( 32, 32 );
+        button->setAutoRaise( true );
+        button->setCheckable( true );
+        if ( type == AddonsModel::Type::TYPE_NONE )
+            button->setChecked( true );
+        button->setAutoExclusive( true );
+        connect( button, &QToolButton::clicked, signalMapper, QOverload<>::of(&QSignalMapper::map) );
+        signalMapper->setMapping( button, static_cast<int>(type) );
+        leftPane->layout()->addWidget( button );
+    };
+
+    addCategory( qtr("All"), qtr("Interface Settings"),
+                  AddonsModel::Type::TYPE_NONE );
+    addCategory( qtr("Skins"),
                   qtr( "Skins customize player's appearance."
                        " You can activate them through preferences." ),
-                  ADDON_SKIN2 );
-    ADD_CATEGORY( qtr("Playlist parsers"),
+                  AddonsModel::Type::TYPE_SKIN2 );
+    addCategory( qtr("Playlist parsers"),
                   qtr( "Playlist parsers add new capabilities to read"
                        " internet streams or extract meta data." ),
-                  ADDON_PLAYLIST_PARSER );
-    ADD_CATEGORY( qtr("Service Discovery"),
+                  AddonsModel::Type::TYPE_PLAYLIST_PARSER );
+    addCategory( qtr("Service Discovery"),
                   qtr( "Service discoveries adds new sources to your playlist"
                        " such as web radios, video websites, ..." ),
-                  ADDON_SERVICE_DISCOVERY );
-    ADD_CATEGORY( qtr("Interfaces"),
+                  AddonsModel::Type::TYPE_SERVICE_DISCOVERY );
+    addCategory( qtr("Interfaces"),
                   "",
-                  ADDON_INTERFACE );
-    ADD_CATEGORY( qtr("Art and meta fetchers"),
+                  AddonsModel::Type::TYPE_INTERFACE );
+    addCategory( qtr("Art and meta fetchers"),
                   qtr( "Retrieves extra info and art for playlist items" ),
-                  ADDON_META );
-    ADD_CATEGORY( qtr("Extensions"),
+                  AddonsModel::Type::TYPE_META );
+    addCategory( qtr("Extensions"),
                   qtr( "Extensions brings various enhancements."
                        " Check descriptions for more details" ),
-                  ADDON_EXTENSION );
+                  AddonsModel::Type::TYPE_EXTENSION );
 
     // Right Pane
     rightPane->layout()->setContentsMargins(0, 0, 0, 0);
@@ -418,22 +402,46 @@
     QCheckBox *installedOnlyBox = new QCheckBox( qtr("Only installed") );
     installedOnlyBox->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Preferred );
     switchStack->insertWidget( WITHONLINEADDONS, installedOnlyBox );
-    connect( installedOnlyBox, &QCheckBox::stateChanged, this, &AddonsTab::installChecked );
+    connect( installedOnlyBox, &QtCheckboxChanged, this, &AddonsTab::installChecked );
+
+    // Model
+    m_model = std::make_unique<AddonsModel>( );
+    //model expect QMLlike behavior
+    m_model->classBegin();
+    m_model->setCtx(p_intf->p_mi);
+    connect( signalMapper, &QSignalMapper::mappedInt,
+            m_model.get(), model = m_model.get()(int mapped){
+                model->setTypeFilter(static_cast<AddonsModel::Type>(mapped));
+            });
+
+    connect( searchInput, &SearchLineEdit::textChanged,
+            m_model.get(), &AddonsModel::setSearchPattern );
 
+
+    // Update button
     QPushButton *reposyncButton = new QPushButton( QIcon( ":/menu/update.svg" ),
                                               qtr("Find more addons online") );
     reposyncButton->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Preferred );
     switchStack->insertWidget( ONLYLOCALADDONS, reposyncButton );
     switchStack->setCurrentIndex( ONLYLOCALADDONS );
     connect( reposyncButton, &QPushButton::clicked, this, &AddonsTab::reposync );
+    connect(
+        m_model.get(), &AddonsModel::loadingChanged,
+        this, this() {
+            if ( !m_model->loading()) {
+                spinnerAnimation->stop();
+                addonsView->viewport()->update();
+            }
+        });
 
     leftPane->layout()->addItem( new QSpacerItem( 0, 0, QSizePolicy::Maximum, QSizePolicy::Expanding ) );
 
     // Main View
-    AddonsManager *AM = AddonsManager::getInstance( p_intf );
 
     // ListView
     addonsView = new QListView( this );
+    addonsView->setModel(m_model.get());
+
     connect( addonsView, &QListView::activated, this, &AddonsTab::moreInformation );
     layout->addWidget( addonsView );
 
@@ -453,30 +461,9 @@
     addonsView->setDropIndicatorShown( true );
     addonsView->setDragDropMode( QAbstractItemView::DropOnly );
 
-    // Model
-    AddonsListModel *model = new AddonsListModel( AM, addonsView );
-    addonsModel = new AddonsSortFilterProxyModel( addonsView );
-    addonsModel->setDynamicSortFilter( true );
-    addonsModel->setFilterCaseSensitivity( Qt::CaseInsensitive );
-    addonsModel->setSortRole( Qt::DisplayRole );
-    addonsModel->sort( 0, Qt::AscendingOrder );
-    addonsModel->setSourceModel( model );
-    addonsModel->setFilterRole( Qt::DisplayRole );
-    addonsView->setModel( addonsModel );
-
-    connect( signalMapper, &QSignalMapper::mappedInt,
-             addonsModel, &AddonsSortFilterProxyModel::setTypeFilter );
-
-    connect( searchInput, &SearchLineEdit::textChanged,
-             addonsModel, &AddonsSortFilterProxyModel::setFilterFixedString );
-
     connect( addonsView->selectionModel(), &QItemSelectionModel::currentChanged,
              addonsView, QOverload<const QModelIndex&>::of(&QListView::edit) );
 
-    connect( AM, SIGNAL(addonAdded( addon_entry_t * )),
-             model, SLOT(addonAdded( addon_entry_t * )) );
-    connect( AM, SIGNAL(addonChanged( const addon_entry_t * )),
-             model, SLOT(addonChanged( const addon_entry_t * )) );
 
     QList<QString> frames;
     frames << ":/misc/wait1.svg";
@@ -487,6 +474,9 @@
     connect( spinnerAnimation, &PixmapAnimator::pixmapReady,
              addonsView->viewport(), QOverload<>::of(&QWidget::update) );
     addonsView->viewport()->installEventFilter( this );
+
+    //model expect QMLlike behavior
+    m_model->componentComplete();
 }
 
 AddonsTab::~AddonsTab()
@@ -528,7 +518,7 @@
             point -= QPoint( textsize.width() / 2, -spinner.height() );
             painter.drawText( point, text );
         }
-        else if ( addonsModel->rowCount() == 0 )
+        else if ( m_model->rowCount() == 0 )
         {
             QWidget *viewport = qobject_cast<QWidget *>( obj );
             if ( !viewport ) break;
@@ -540,14 +530,6 @@
             painter.drawText( point, text );
         }
         break;
-    case QEvent::Show:
-        if ( !b_localdone && addonsView->model()->rowCount() < 1 )
-        {
-            b_localdone = true;
-            AddonsManager *AM = AddonsManager::getInstance( p_intf );
-            AM->findInstalled();
-        }
-        break;
     case QEvent::DragEnter:
     {
         QDragEnterEvent *dragEvent = static_cast<QDragEnterEvent *>(event);
@@ -578,8 +560,7 @@
             return false;
         if ( dropEvent->mimeData()->urls().count() )
         {
-            AddonsManager *AM = AddonsManager::getInstance( p_intf );
-            AM->findDesignatedAddon( dropEvent->mimeData()->urls().first().toString() );
+            m_model->loadFromExternalRepository(dropEvent->mimeData()->urls().first());
             dropEvent->acceptProposedAction();
         }
         return true;
@@ -603,9 +584,9 @@
 void AddonsTab::installChecked( int i )
 {
     if ( i == Qt::Checked )
-        addonsModel->setStatusFilter( ADDON_INSTALLED );
+        m_model->setStateFilter( AddonsModel::State::STATE_INSTALLED );
     else
-        addonsModel->setStatusFilter( 0 );
+        m_model->setStateFilter( AddonsModel::State::STATE_NONE );
 }
 
 void AddonsTab::reposync()
@@ -614,11 +595,10 @@
     if ( tab )
     {
         tab->setCurrentIndex( WITHONLINEADDONS );
-        AddonsManager *AM = AddonsManager::getInstance( p_intf );
-        connect( AM, &AddonsManager::discoveryEnded, spinnerAnimation, &PixmapAnimator::stop );
-        connect( AM, &AddonsManager::discoveryEnded, addonsView->viewport(), QOverload<>::of(&QWidget::update) );
+
         spinnerAnimation->start();
-        AM->findNewAddons();
+
+        m_model->loadFromDefaultRepository();
     }
 }
 
@@ -758,300 +738,22 @@
     return createIndex( row, 0, extensions.at( row ) );
 }
 
-AddonsListModel::Addon::Addon( addon_entry_t *p_entry_ )
-{
-    p_entry = p_entry_;
-    addon_entry_Hold( p_entry );
-}
-
-AddonsListModel::Addon::~Addon()
-{
-    addon_entry_Release( p_entry );
-}
-
-bool AddonsListModel::Addon::operator==( const Addon & other ) const
-{
-    //return data( IDRole ) == other.data( IDRole );
-    return p_entry == other.p_entry;
-}
-
-bool AddonsListModel::Addon::operator==( const addon_entry_t * p_other ) const
-{
-    return p_entry == p_other;
-}
-
-QVariant AddonsListModel::Addon::data( int role ) const
-{
-    QVariant returnval;
-
-    vlc_mutex_lock( &p_entry->lock );
-    switch( role )
-    {
-    case Qt::DisplayRole:
-    {
-        returnval = qfu( p_entry->psz_name );
-        break;
-    }
-    case Qt::DecorationRole:
-        if ( p_entry->psz_image_data )
-        {
-            QPixmap pixmap;
-            pixmap.loadFromData( QByteArray::fromBase64( QByteArray( p_entry->psz_image_data ) ),
-                0,
-                Qt::AutoColor
-            );
-            returnval = pixmap;
-        }
-        else if ( p_entry->e_flags & ADDON_BROKEN )
-            returnval = QPixmap( ":/addons/addon_broken.svg" );
-        else
-            returnval = QPixmap( ":/addons/addon_default.svg" );
-        break;
-    case Qt::ToolTipRole:
-    {
-        if ( !( p_entry->e_flags & ADDON_MANAGEABLE ) )
-        {
-            returnval = qtr("This addon has been installed manually. VLC can't manage it by itself.");
-        }
-        break;
-    }
-    case SummaryRole:
-        returnval = qfu( p_entry->psz_summary );
-        break;
-    case DescriptionRole:
-        returnval = qfu( p_entry->psz_description );
-        break;
-    case TypeRole:
-        returnval = QVariant( (int) p_entry->e_type );
-        break;
-    case UUIDRole:
-        returnval = QByteArray( (const char *) p_entry->uuid, (int) sizeof( addon_uuid_t ) );
-        break;
-    case FlagsRole:
-        returnval = QVariant( (int) p_entry->e_flags );
-        break;
-    case StateRole:
-        returnval = QVariant( (int) p_entry->e_state );
-        break;
-    case DownloadsCountRole:
-        returnval = QVariant( (double) p_entry->i_downloads );
-        break;
-    case ScoreRole:
-        returnval = QVariant( (int) p_entry->i_score );
-        break;
-    case VersionRole:
-        returnval = QVariant( qfu(p_entry->psz_version) );
-        break;
-    case AuthorRole:
-        returnval = qfu( p_entry->psz_author );
-        break;
-    case LinkRole:
-        returnval = qfu( p_entry->psz_source_uri );
-        break;
-    case FilenameRole:
-    {
-        QList<QString> list;
-        addon_file_t *p_file;
-        ARRAY_FOREACH( p_file, p_entry->files )
-            list << qfu( p_file->psz_filename );
-        returnval = QVariant( list );
-        break;
-    }
-    default:
-        break;
-    }
-    vlc_mutex_unlock( &p_entry->lock );
-
-    return returnval;
-}
-
-AddonsListModel::AddonsListModel( AddonsManager *AM_, QObject *parent )
-    :ExtensionListModel( parent ), AM( AM_ )
-{
-
-}
-
-AddonsListModel::~AddonsListModel()
-{
-    qDeleteAll( addons );
-}
-
-void AddonsListModel::addonAdded(  addon_entry_t *p_entry )
-{
-    beginInsertRows( QModelIndex(), addons.count(), addons.count() );
-    addons << new Addon( p_entry );
-    insertRow( addons.count() - 1 );
-    endInsertRows();
-}
-
-void AddonsListModel::addonChanged( const addon_entry_t *p_entry )
-{
-    int row = 0;
-    foreach ( const Addon *addon, addons )
-    {
-        if ( *addon == p_entry )
-        {
-            emit dataChanged( index( row, 0 ), index( row, 0 ) );
-            break;
-        }
-        row++;
-    }
-}
-
-int AddonsListModel::rowCount( const QModelIndex & ) const
-{
-    return addons.count();
-}
-
-Qt::ItemFlags AddonsListModel::flags( const QModelIndex &index ) const
-{
-    Qt::ItemFlags i_flags = ExtensionListModel::flags( index );
-    int i_state = data( index, StateRole ).toInt();
-
-    if ( i_state == ADDON_UNINSTALLING || i_state == ADDON_INSTALLING )
-        i_flags &= ~Qt::ItemIsEnabled;
-
-    i_flags |= Qt::ItemIsEditable;
-
-    return i_flags;
-}
-
-bool AddonsListModel::setData( const QModelIndex &index, const QVariant &value, int role )
-{
-    /* We NEVER set values directly */
-    if ( role == StateRole )
-    {
-        int i_value = value.toInt();
-        if ( i_value == ADDON_INSTALLING )
-        {
-            AM->install( data( index, UUIDRole ).toByteArray() );
-        }
-        else if ( i_value == ADDON_UNINSTALLING )
-        {
-            AM->remove( data( index, UUIDRole ).toByteArray() );
-        }
-    }
-    else if ( role == StateRole + 1 )
-    {
-        emit dataChanged( index, index );
-    }
-    return true;
-}
-
-QColor AddonsListModel::getColorByAddonType( int i_type )
-{
-    QColor color;
-    switch( i_type )
-    {
-    case ADDON_EXTENSION:
-        color = QColor(0xDB, 0xC5, 0x40);
-        break;
-    case ADDON_PLAYLIST_PARSER:
-        color = QColor(0x36, 0xBB, 0x59);
-        break;
-    case ADDON_SERVICE_DISCOVERY:
-        color = QColor(0xDB, 0x52, 0x40);
-        break;
-    case ADDON_SKIN2:
-        color = QColor(0x8B, 0xD6, 0xFC);
-        break;
-    case ADDON_INTERFACE:
-        color = QColor(0x00, 0x13, 0x85);
-        break;
-    case ADDON_META:
-        color = QColor(0xCD, 0x23, 0xBF);
-        break;
-    case ADDON_PLUGIN:
-    case ADDON_UNKNOWN:
-    case ADDON_OTHER:
-    default:
-        break;
-    }
-    return color;
-}
-
-QVariant AddonsListModel::data( const QModelIndex& index, int role ) const
-{
-    if( !index.isValid() )
-        return QVariant();
-
-    return ((Addon *)index.internalPointer())->data( role );
-}
-
-QModelIndex AddonsListModel::index( int row, int column,
-                                       const QModelIndex& ) const
-{
-    if( column != 0 )
-        return QModelIndex();
-    if( row < 0 || row >= addons.count() )
-        return QModelIndex();
-
-    return createIndex( row, 0, addons.at( row ) );
-}
-
-/* Sort Filter */
-AddonsSortFilterProxyModel::AddonsSortFilterProxyModel( QObject *parent )
-    : QSortFilterProxyModel( parent )
-{
-    i_type_filter = -1;
-    i_status_filter = 0;
-}
-
-void AddonsSortFilterProxyModel::setTypeFilter( int type )
-{
-    i_type_filter = type;
-    invalidateFilter();
-}
-
-void AddonsSortFilterProxyModel::setStatusFilter( int flags )
-{
-    i_status_filter = flags;
-    invalidateFilter();
-}
-
-bool AddonsSortFilterProxyModel::filterAcceptsRow( int source_row,
-                                       const QModelIndex &source_parent ) const
-{
-    if ( !QSortFilterProxyModel::filterAcceptsRow( source_row, source_parent ) )
-        return false;
-
-    QModelIndex item = sourceModel()->index( source_row, 0, source_parent );
-
-    if ( i_type_filter > -1 &&
-         item.data( AddonsListModel::TypeRole ).toInt() != i_type_filter )
-        return false;
-
-    if ( i_status_filter > 0 &&
-        ( item.data( AddonsListModel::StateRole ).toInt() & i_status_filter ) != i_status_filter )
-        return false;
-
-    return true;
-}
-
-/* Extension List Widget Item */
-ExtensionItemDelegate::ExtensionItemDelegate( QObject *parent )
-        : QStyledItemDelegate( parent )
-{
-    margins = QMargins( 4, 4, 4, 4 );
-}
-
-ExtensionItemDelegate::~ExtensionItemDelegate()
-{
-}
-
-void ExtensionItemDelegate::paint( QPainter *painter,
-                                   const QStyleOptionViewItem &option,
-                                   const QModelIndex &index ) const
+static void commonPaint(
+    QPainter *painter,
+    const QStyleOptionViewItem &option,
+    const QMargins& margins,
+    const QPixmap& icon,
+    const QString& name,
+    const QString& description
+    )
 {
     QStyleOptionViewItem opt = option;
-    initStyleOption( &opt, index );
 
     // Draw background
     if ( opt.state & QStyle::State_Selected )
         painter->fillRect( opt.rect, opt.palette.highlight() );
 
     // Icon
-    QPixmap icon = index.data( Qt::DecorationRole ).value<QPixmap>();
     if( !icon.isNull() )
     {
         painter->drawPixmap( opt.rect.left() + margins.left(),
@@ -1077,18 +779,50 @@
                      - margins.right(),
                      - margins.bottom() - opt.fontMetrics.height() );
 
-    painter->drawText( textrect, Qt::AlignLeft,
-                       index.data( Qt::DisplayRole ).toString() );
+    painter->drawText( textrect, Qt::AlignLeft, name);
 
     font.setBold( false );
     painter->setFont( font );
     painter->drawText( textrect.translated( 0, option.fontMetrics.height() ),
                        Qt::AlignLeft,
-                       index.data( ExtensionListModel::SummaryRole ).toString() );
+                       description );
 
     painter->restore();
 }
 
+/* Extension List Widget Item */
+ExtensionItemDelegate::ExtensionItemDelegate( QObject *parent )
+        : QStyledItemDelegate( parent )
+{
+    margins = QMargins( 4, 4, 4, 4 );
+}
+
+ExtensionItemDelegate::~ExtensionItemDelegate()
+{
+}
+
+void ExtensionItemDelegate::paint( QPainter *painter,
+                                   const QStyleOptionViewItem &option,
+                                   const QModelIndex &index ) const
+{
+    QStyleOptionViewItem opt = option;
+    initStyleOption( &opt, index );
+
+    /* Draw common base  */
+    QString name = index.data( Qt::DisplayRole ).toString();
+    QPixmap icon = index.data( Qt::DecorationRole ).value<QPixmap>();
+    QString description = index.data( ExtensionListModel::SummaryRole ).toString();
+
+    commonPaint(
+        painter,
+        option,
+        margins,
+        icon,
+        name,
+        description
+        );
+}
+
 QSize ExtensionItemDelegate::sizeHint( const QStyleOptionViewItem &option,
                                        const QModelIndex &index ) const
 {
@@ -1111,9 +845,8 @@
 }
 
 AddonItemDelegate::AddonItemDelegate( QObject *parent )
-    : ExtensionItemDelegate( parent )
-    , animator( NULL )
-    , progressbar( NULL )
+    : QStyledItemDelegate( parent )
+    , margins( 4,4,4,4 )
 { }
 
 AddonItemDelegate::~AddonItemDelegate()
@@ -1126,11 +859,11 @@
                                const QModelIndex &index ) const
 {
     QStyleOptionViewItem newopt = option;
-    int i_state = index.data( AddonsListModel::StateRole ).toInt();
-    int i_type = index.data( AddonsListModel::TypeRole ).toInt();
+    auto i_state = index.data( AddonsModel::Role::STATE ).value<AddonsModel::State>();
+    auto i_type = index.data( AddonsModel::Role::TYPE ).value<AddonsModel::Type>();
 
     /* Draw Background gradient by addon type */
-    QColor backgroundColor = AddonsListModel::getColorByAddonType( i_type );
+    QColor backgroundColor = AddonsModel::getColorForType( i_type );
 
     if ( backgroundColor.isValid() )
     {
@@ -1146,15 +879,27 @@
     }
 
     /* Draw base info from parent */
-    ExtensionItemDelegate::paint( painter, newopt, index );
-
     initStyleOption( &newopt, index );
 
+    /* Draw common base  */
+    QString name = index.data( Qt::DisplayRole ).toString();
+    QPixmap icon = index.data( Qt::DecorationRole ).value<QPixmap>();
+    QString description = index.data( AddonsModel::Role::SUMMARY ).toString();
+
+    commonPaint(
+        painter,
+        newopt,
+        margins,
+        icon,
+        name,
+        description
+        );
+
     painter->save();
     painter->setRenderHint( QPainter::TextAntialiasing );
 
     /* Addon status */
-    if ( i_state == ADDON_INSTALLED )
+    if ( i_state == AddonsModel::State::STATE_INSTALLED )
     {
         painter->save();
         painter->setRenderHint( QPainter::Antialiasing );
@@ -1192,14 +937,14 @@
     textrect.translate( 0, newopt.fontMetrics.height() * 2 );
 
     /* Version */
-    QString version = index.data( AddonsListModel::VersionRole ).toString();
+    QString version = index.data( AddonsModel::Role::ADDON_VERSION).toString();
     if ( !version.isEmpty() )
         painter->drawText( textrect, Qt::AlignLeft, qtr("Version %1").arg( version ) );
 
     textrect.translate( 0, newopt.fontMetrics.height() );
 
     /* Score */
-    int i_score = index.data( AddonsListModel::ScoreRole ).toInt();
+    int i_score = index.data( AddonsModel::Role::SCORE).toInt();
     QPixmap scoreicon;
     if ( i_score )
     {
@@ -1207,7 +952,7 @@
         int i_scoreicon_width = i_scoreicon_height * SCORE_ICON_WIDTH_SCALE;
         scoreicon = ImageHelper::loadSvgToPixmap( ":/addons/addon_score.svg",
                     i_scoreicon_width, i_scoreicon_height );
-        int i_width = ( (float) i_score / ADDON_MAX_SCORE ) * i_scoreicon_width;
+        int i_width = ( (float) i_score / AddonsModel::getMaxScore() ) * i_scoreicon_width;
         /* Erase the end (value) of our pixmap with a shadow */
         QPainter erasepainter( &scoreicon );
         erasepainter.setCompositionMode( QPainter::CompositionMode_SourceIn );
@@ -1219,7 +964,7 @@
     }
 
     /* Downloads # */
-    int i_downloads = index.data( AddonsListModel::DownloadsCountRole ).toInt();
+    int i_downloads = index.data( AddonsModel::DOWNLOAD_COUNT).toInt();
     if ( i_downloads )
         painter->drawText( textrect.translated( scoreicon.width() + margins.left(), 0 ),
                            Qt::AlignLeft, qtr("%1 downloads").arg( i_downloads ) );
@@ -1230,12 +975,14 @@
     {
         if ( animator->isRunning() && animator->getIndex() == index )
         {
-            if ( i_state != ADDON_INSTALLING && i_state != ADDON_UNINSTALLING )
+            if ( i_state != AddonsModel::State::STATE_INSTALLING
+                && i_state != AddonsModel::State::STATE_UNINSTALLING )
                 animator->run( false );
         }
         /* Create our installation progress overlay */
 
-        if ( i_state == ADDON_INSTALLING || i_state == ADDON_UNINSTALLING )
+        if ( i_state == AddonsModel::State::STATE_INSTALLING
+            || i_state == AddonsModel::State::STATE_UNINSTALLING )
         {
             painter->save();
             painter->setCompositionMode( QPainter::CompositionMode_SourceOver );
@@ -1269,6 +1016,15 @@
         return QSize();
 }
 
+void AddonItemDelegate::initStyleOption( QStyleOptionViewItem *option,
+                                            const QModelIndex &index ) const
+{
+    QStyledItemDelegate::initStyleOption( option, index );
+    option->decorationSize = QSize( option->rect.height(), option->rect.height() );
+    option->decorationSize -= QSize( margins.left() + margins.right(),
+                                    margins.top() + margins.bottom() );
+}
+
 QWidget *AddonItemDelegate::createEditor( QWidget *parent,
                                           const QStyleOptionViewItem &option,
                                           const QModelIndex &index) const
@@ -1286,15 +1042,17 @@
     connect( infoButton, &QPushButton::clicked, this, &AddonItemDelegate::showInfo );
     editorWidget->layout()->addWidget( infoButton );
 
-    if ( ADDON_MANAGEABLE &
-         index.data( AddonsListModel::FlagsRole ).toInt() )
+    if ( index.data( AddonsModel::Role::MANAGEABLE).toBool() )
     {
-        if ( index.data( AddonsListModel::StateRole ).toInt() == ADDON_INSTALLED )
+        if ( index.data( AddonsModel::Role::STATE ).value<AddonsModel::State>()
+            == AddonsModel::State::STATE_INSTALLED )
             installButton = new QPushButton( QIcon( ":/menu/remove.svg" ),
                                              qtr("&Uninstall"), parent );
         else
-            installButton = new QPushButton( QIcon( ":/menu/add.svg" ),
-                                             qtr("&Install"), parent );
+        {
+            installButton = new QPushButton( qtr("&Install"), parent );
+            installButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/add.svg", installButton ) );
+        }
         connect( installButton, &QPushButton::clicked, this, &AddonItemDelegate::editButtonClicked );
         editorWidget->layout()->addWidget( installButton );
     }
@@ -1319,12 +1077,12 @@
 void AddonItemDelegate::setModelData( QWidget *editor, QAbstractItemModel *model,
                                       const QModelIndex &index ) const
 {
-    model->setData( index, editor->property("Addon::state"), AddonsListModel::StateRole );
+    model->setData( index, editor->property("Addon::state"), AddonsModel::Role::STATE);
 }
 
 void AddonItemDelegate::setEditorData( QWidget *editor, const QModelIndex &index ) const
 {
-    editor->setProperty("Addon::state", index.data( AddonsListModel::StateRole ) );
+    editor->setProperty("Addon::state", index.data( AddonsModel::Role::STATE ) );
 }
 
 void AddonItemDelegate::setAnimator( DelegateAnimationHelper *animator_ )
@@ -1344,13 +1102,13 @@
 {
     QWidget *editor = qobject_cast<QWidget *>(sender()->parent());
     if ( !editor ) return;
-    int value = editor->property("Addon::state").toInt();
-    if ( value == ADDON_INSTALLED )
+    auto value = editor->property("Addon::state").value<AddonsModel::State>();
+    if ( value == AddonsModel::State::STATE_INSTALLED )
         /* uninstall */
-        editor->setProperty("Addon::state", ADDON_UNINSTALLING );
+        editor->setProperty("Addon::state", QVariant::fromValue(AddonsModel::State::STATE_UNINSTALLING) );
     else
         /* install */
-        editor->setProperty("Addon::state", ADDON_INSTALLING );
+        editor->setProperty("Addon::state", QVariant::fromValue(AddonsModel::State::STATE_INSTALLING) );
     emit commitData( editor );
     emit closeEditor( editor );
 }
@@ -1449,7 +1207,7 @@
     setWindowModality( Qt::WindowModal );
 
     // Window title
-    setWindowTitle( qtr( "About" ) + " " + index.data(Qt::DisplayRole).toString() );
+    setWindowTitle( qtr( "About" ) + " " + index.data(AddonsModel::Role::NAME).toString() );
 
     // Layout
     QGridLayout *layout = new QGridLayout( this );
@@ -1465,7 +1223,7 @@
     layout->addWidget( iconLabel, 1, 0, 2, 1 );
 
     // Title
-    label = new QLabel( index.data(Qt::DisplayRole).toString(), this );
+    label = new QLabel( index.data(AddonsModel::Role::NAME).toString(), this );
     QFont font = label->font();
     font.setBold( true );
     font.setPointSizeF( font.pointSizeF() * 1.3f );
@@ -1483,12 +1241,12 @@
     layout->addWidget( textContent, 1, 1, 4, -1 );
 
     // Type
-    QString type = AddonsManager::getAddonType( index.data(AddonsListModel::TypeRole).toInt() );
+    QString type = AddonsModel::getLabelForType( index.data(AddonsModel::Role::TYPE).value<AddonsModel::Type>() );
     textContent->append( QString("<b>%1:</b> %2<br/>")
                          .arg( qtr("Type") ).arg( type ) );
 
     // Version
-    QString version = index.data(ExtensionListModel::VersionRole).toString();
+    QString version = index.data(AddonsModel::Role::ADDON_VERSION).toString();
     if ( !version.isEmpty() )
     {
         textContent->append( QString("<b>%1:</b> %2<br/>")
@@ -1496,7 +1254,7 @@
     }
 
     // Author
-    QString author = index.data(ExtensionListModel::AuthorRole).toString();
+    QString author = index.data(AddonsModel::Role::AUTHOR).toString();
     if ( !author.isEmpty() )
     {
         textContent->append( QString("<b>%1:</b> %2<br/>")
@@ -1505,10 +1263,10 @@
 
     // Summary
     textContent->append( QString("%1<br/>\n")
-                .arg( index.data(AddonsListModel::SummaryRole).toString() ) );
+                .arg( index.data(AddonsModel::Role::SUMMARY).toString() ) );
 
     // Description
-    QString description = index.data(AddonsListModel::DescriptionRole).toString();
+    QString description = index.data(AddonsModel::Role::DESCRIPTION).toString();
     if ( !description.isEmpty() )
     {
         textContent->append( QString("<hr/>\n%1")
@@ -1516,7 +1274,7 @@
     }
 
     // URL
-    QString sourceUrl = index.data(ExtensionListModel::LinkRole).toString();
+    QString sourceUrl = index.data(AddonsModel::Role::LINK).toString();
     if ( !sourceUrl.isEmpty() )
     {
         label = new QLabel( "<b>" + qtr( "Website" ) + ":</b>", this );
@@ -1528,7 +1286,7 @@
     }
 
     // Script files
-    QList<QVariant> list = index.data(ExtensionListModel::FilenameRole).toList();
+    QList<QVariant> list = index.data(AddonsModel::Role::FILENAME).toList();
     if ( ! list.empty() )
     {
         label = new QLabel( "<b>" + qtr( "Files" ) + ":</b>", this );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/plugins/plugins.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/plugins/plugins.hpp Changed

@@ -50,10 +50,9 @@
 class SearchLineEdit;
 class ExtensionCopy;
 class ExtensionsManager;
-class AddonsManager;
 class PixmapAnimator;
 class DelegateAnimationHelper;
-class AddonsSortFilterProxyModel;
+class AddonsModel;
 
 extern "C" {
     typedef struct extension_t extension_t;
@@ -148,11 +147,11 @@
         WITHONLINEADDONS
     };
     QListView *addonsView;
-    AddonsSortFilterProxyModel *addonsModel;
     /* Wait spinner */
     PixmapAnimator *spinnerAnimation;
     bool b_localdone;
     QSignalMapper *signalMapper;
+    std::unique_ptr<AddonsModel> m_model;
 };
 
 class PluginTreeItem : public QTreeWidgetItem
@@ -211,74 +210,6 @@
     QList<ExtensionCopy*> extensions;
 };
 
-class AddonsListModel: public ExtensionListModel
-{
-    Q_OBJECT
-
-public:
-    AddonsListModel( AddonsManager *AM, QObject *parent = 0 );
-    virtual ~AddonsListModel();
-    QVariant data( const QModelIndex& index, int role ) const override;
-    QModelIndex index( int row, int column = 0,
-                       const QModelIndex& = QModelIndex() ) const override;
-    int rowCount( const QModelIndex& = QModelIndex() ) const override;
-    Qt::ItemFlags flags( const QModelIndex &index ) const override;
-    bool setData( const QModelIndex &index, const QVariant &value, int role ) override;
-
-    enum
-    {
-        TypeRole = FilenameRole + 1,
-        DescriptionRole,
-        UUIDRole,
-        FlagsRole,
-        StateRole,
-        DownloadsCountRole,
-        ScoreRole
-    };
-
-    static QColor getColorByAddonType( int );
-
-protected slots:
-    void addonAdded( addon_entry_t * );
-    void addonChanged( const addon_entry_t * );
-
-protected:
-
-    class Addon
-    {
-    public:
-        Addon( addon_entry_t * );
-        ~Addon();
-        bool operator==( const Addon & other ) const;
-        bool operator==( const addon_entry_t * p_other ) const;
-        QVariant data( int ) const;
-    private:
-        addon_entry_t * p_entry;
-    };
-
-    QList<Addon*> addons;
-    AddonsManager *AM;
-};
-
-class AddonsSortFilterProxyModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-public:
-    AddonsSortFilterProxyModel( QObject *parent = 0 );
-
-public slots:
-    virtual void setTypeFilter( int );
-    virtual void setStatusFilter( int );
-
-protected:
-    bool filterAcceptsRow( int, const QModelIndex & ) const override;
-
-private:
-    int i_type_filter;
-    int i_status_filter;
-};
-
 class ExtensionItemDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
@@ -300,7 +231,7 @@
 };
 
 
-class AddonItemDelegate : public ExtensionItemDelegate
+class AddonItemDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 
@@ -313,6 +244,8 @@
                 const QModelIndex &index ) const override;
     QSize sizeHint( const QStyleOptionViewItem &option,
                     const QModelIndex &index ) const override;
+    void initStyleOption( QStyleOptionViewItem *option,
+                         const QModelIndex &index ) const override;
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
     void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
     void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
@@ -327,8 +260,9 @@
     void showInfo();
 
 protected:
-    DelegateAnimationHelper *animator;
-    QWidget *progressbar;
+    QMargins margins;
+    DelegateAnimationHelper *animator = nullptr;
+    QWidget *progressbar = nullptr;
 };
 
 class ExtensionInfoDialog : public QVLCDialog
@@ -346,4 +280,3 @@
 };
 
 #endif
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/preferences/preferences.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/preferences/preferences.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp Changed

@@ -31,8 +31,8 @@
 #endif
 
 #include "dialogs/preferences/preferences_widgets.hpp"
-#include "widgets/native/customwidgets.hpp"
 #include "widgets/native/searchlineedit.hpp"
+#include "util/vlchotkeyconverter.hpp"
 #include "util/qt_dirs.hpp"
 #include <vlc_intf_strings.h>
 #include <vlc_modules.h>
@@ -64,6 +64,7 @@
 #include <QGuiApplication>
 #include <QClipboard>
 #include <QFont>
+#include <QToolButton>
 
 #define MINWIDTH_BOX 90
 #define LAST_COLUMN 10
@@ -731,8 +732,6 @@
 
 ModuleListConfigControl::~ModuleListConfigControl()
 {
-    foreach ( checkBoxListItem *it, modules )
-        free( it->psz_module );
     qDeleteAll( modules );
     modules.clear();
 }
@@ -750,15 +749,15 @@
     QCheckBox *cb = new QCheckBox( label );
     checkBoxListItem *cbl = new checkBoxListItem;
 
-    connect( cb, &QCheckBox::stateChanged, this, &ModuleListConfigControl::onUpdate );
+    connect( cb, &QtCheckboxChanged, this, &ModuleListConfigControl::onUpdate );
     if( !help.isEmpty() )
         cb->setToolTip( formatTooltip( help ) );
     cbl->checkBox = cb;
 
-    cbl->psz_module = strdup( psz_module );
+    cbl->psz_module = qfu( psz_module );
     modules.append( cbl );
 
-    if( p_item->value.psz && strstr( p_item->value.psz, cbl->psz_module ) )
+    if( p_item->value.psz && strstr( p_item->value.psz, psz_module ) )
         cbl->checkBox->setChecked( true );
 }
 
@@ -1765,6 +1764,14 @@
     conflicts = false;
     existingkeys = NULL;
 
+    wheelConverter = new WheelToVLCConverter(this);
+    connect(wheelConverter, &WheelToVLCConverter::vlcWheelKey, this, this(int i_vlck){
+        vlckey = VLCKeyToString( i_vlck, false );
+        vlckey_tr = VLCKeyToString( i_vlck, true );
+        selected->setText( qtr( "Key: <b>%1</b>" ).arg( vlckey_tr ) );
+        checkForConflicts( QString() );
+    });
+
     bool global = ( column == KeySelectorControl::GLOBAL_HOTKEY_COL );
 
     setWindowTitle( global ? qtr( "Global Hotkey change" )
@@ -1864,11 +1871,7 @@
 
 void KeyInputDialog::wheelEvent( QWheelEvent *e )
 {
-    int i_vlck = qtWheelEventToVLCKey( *e );
-    vlckey = VLCKeyToString( i_vlck, false );
-    vlckey_tr = VLCKeyToString( i_vlck, true );
-    selected->setText( qtr( "Key: <b>%1</b>" ).arg( vlckey_tr ) );
-    checkForConflicts( QString() );
+    wheelConverter->wheelEvent(e);
 }
 
 void KeyInputDialog::unsetAction() { done( 2 ); }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/preferences/preferences_widgets.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/preferences/preferences_widgets.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/preferences/simple_preferences.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/preferences/simple_preferences.cpp Changed

@@ -570,7 +570,7 @@
                 ui.lastfm_zone->setVisible( ui.lastfm->isChecked() );
 
                 connect( ui.lastfm, &QCheckBox::toggled, ui.lastfm_zone, &QWidget::setVisible );
-                connect( ui.lastfm, &QCheckBox::stateChanged, this, &SPrefsPanel::lastfm_Changed );
+                connect( ui.lastfm, &QtCheckboxChanged, this, &SPrefsPanel::lastfm_Changed );
             }
             else
             {
@@ -787,9 +787,9 @@
             configBool( "qt-minimal-view", ui.minimalviewBox );
 
             /*Update layout radio buttons based on the checkState of the following checkboxes*/
-            connect(ui.menuBarCheck, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
-            connect(ui.pinVideoControlsCheckbox, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
-            connect(ui.titleBarCheckBox, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
+            connect(ui.menuBarCheck, &QtCheckboxChanged, this, &SPrefsPanel::updateLayoutSelection);
+            connect(ui.pinVideoControlsCheckbox, &QtCheckboxChanged, this, &SPrefsPanel::updateLayoutSelection);
+            connect(ui.titleBarCheckBox, &QtCheckboxChanged, this, &SPrefsPanel::updateLayoutSelection);
 
             /*Clicking on image will check the corresponding layout radio button*/
             layoutImages = new QButtonGroup( this );
@@ -830,7 +830,7 @@
 
             configBool( "qt-pin-controls", ui.pinVideoControlsCheckbox );
             m_resetters.push_back(std::make_unique<PropertyResetter>(ui.pinVideoControlsCheckbox, "checked"));
-            QObject::connect( ui.pinVideoControlsCheckbox, &QCheckBox::stateChanged, p_intf->p_mi, &MainCtx::setPinVideoControls );
+            QObject::connect( ui.pinVideoControlsCheckbox, &QtCheckboxChanged, p_intf->p_mi, &MainCtx::setPinVideoControls );
 
             ui.colorSchemeComboBox->setModel( p_intf->p_mi->getColorScheme() );
             ui.colorSchemeComboBox->setCurrentText( p_intf->p_mi->getColorScheme()->currentText() );
@@ -838,7 +838,7 @@
             QObject::connect( ui.colorSchemeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged)
                               , p_intf->p_mi->getColorScheme(), &ColorSchemeModel::setCurrentIndex );
 
-            const float intfScaleFloatFactor = 100.f;
+            const double intfScaleFloatFactor = 100;
             const auto updateIntfUserScaleFactorFromControls =
                     this, slider = ui.intfScaleFactorSlider, spinBox = ui.intfScaleFactorSpinBox, intfScaleFloatFactor(const int value)
             {
@@ -1208,10 +1208,10 @@
         QByteArray devicepath = m_inputCodecUI.DVDDeviceComboBox->currentText().toUtf8();
         if( devicepath.size() > 0 )
         {
-            config_PutPsz( "dvd", devicepath );
-            config_PutPsz( "vcd", devicepath );
+            config_PutPsz( "dvd", devicepath.constData() );
+            config_PutPsz( "vcd", devicepath.constData() );
             if( module_exists( "cdda" ) )
-                config_PutPsz( "cd-audio", devicepath );
+                config_PutPsz( "cd-audio", devicepath.constData() );
         }
 
 #define CaC( name, factor ) config_PutInt( name, i_comboValue * factor )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/sout/profile_selector.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/sout/profile_selector.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/sout/sout.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/sout/sout.cpp Changed

@@ -30,6 +30,7 @@
 #include "util/qt_dirs.hpp"
 #include "dialogs/sout/sout_widgets.hpp"
 #include "widgets/native/qvlcframe.hpp"
+#include "util/colorizedsvgicon.hpp"
 
 #include <QString>
 
@@ -43,6 +44,10 @@
     setWindowTitle( qtr( "Stream Output" ) );
     setWindowRole( "vlc-stream-output" );
 
+    // NOTE: Aero style seems to be incompatible with
+    //       Qt Modern Windows Style dark mode
+    setWizardStyle(QWizard::ModernStyle);
+
     QVLCDialog::setWindowTransientParent(this, parent , p_intf);
 
     /* UI stuff */
@@ -64,7 +69,7 @@
     QTabBar* tb = ui.destTab->findChild<QTabBar*>();
     if( tb != NULL ) tb->tabButton(0, QTabBar::RightSide)->hide();
     connect( ui.destTab, &QTabWidget::tabCloseRequested, this, &SoutDialog::closeTab );
-    ui.destTab->setTabIcon( 0, QIcon( ":/menu/add.svg" ) );
+    ui.destTab->setTabIcon( 0, ColorizedSvgIcon::colorizedIconForWidget( ":/menu/add.svg", ui.destTab ) );
 
     ui.destBox->addItem( qtr( "File" ) );
     ui.destBox->addItem( "HTTP" );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/systray/systray.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/systray/systray.cpp Changed

@@ -17,9 +17,11 @@
  *****************************************************************************/
 
 #include "systray.hpp"
+
+#include <QImageReader>
+
 #include "maininterface/mainctx.hpp"
 #include "menus/menus.hpp"
-#include <QSystemTrayIcon>
 #include "playlist/playlist_controller.hpp"
 #include "player/player_controller.hpp"
 #include "dialogs/dialogs_provider.hpp"
@@ -125,8 +127,34 @@
         if( ( m_notificationSetting == NOTIFICATION_ALWAYS ) ||
             ( m_notificationSetting == NOTIFICATION_MINIMIZED && (windowVisiblity == QWindow::Hidden || windowVisiblity == QWindow::Minimized)))
         {
-            showMessage( qtr( "VLC media player" ), name,
-                                 QSystemTrayIcon::NoIcon, 3000 );
+            const auto showMessageTemplate = this, &name(const auto &icon) {
+                showMessage( qtr( "VLC media player" ), name, icon, 3000 );
+            };
+
+            assert(m_intf);
+            assert(m_intf->p_mainPlayerController);
+            const QUrl& art = m_intf->p_mainPlayerController->getArtwork();
+            if (art.isValid())
+            {
+                // If there is artwork, use it but only when it is (almost) square:
+                const QString& fileName = art.toLocalFile();
+                const QImageReader imageReader(fileName);
+                if (Q_LIKELY(imageReader.canRead()))
+                {
+                    const QSize& size = imageReader.size(); // this does not read the whole image
+                    if (Q_LIKELY(!size.isEmpty()))
+                    {
+                        const double ratio = static_cast<double>(size.width()) / size.height();
+                        if (Q_LIKELY(std::abs(ratio - 1.0) < 0.2))
+                        {
+                            showMessageTemplate(QIcon(fileName));
+                            return;
+                        }
+                    }
+                }
+            }
+
+            showMessageTemplate( QSystemTrayIcon::NoIcon );
         }
     }
     update();

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml Changed

@@ -49,7 +49,7 @@
     
     readonly property ColorContext colorContext: ColorContext {
         id: theme
-        colorSet: ColorContext.ToolButton
+        colorSet: ColorContext.Item
     }
 
     MouseArea {
@@ -75,7 +75,10 @@
 
             } else {
                 dragAutoScrollHandler.dragItem = null
-                drag.target.Drag.drop()
+                control.visible = false
+                const action = drag.target.Drag.drop()
+                if (action === Qt.IgnoreAction)
+                    control.visible = true
                 removeInfoRectVisible = false
                 root.dragStopped(controlId)
             }
@@ -103,11 +106,11 @@
         onDropped: (drop) => {
             let destIndex = parent.DelegateModel.itemsIndex
 
-            if((drag.source.dndView === dndView)
-                    && (drag.source.DelegateModel.itemsIndex < destIndex))
+            if((drop.source.dndView === dndView)
+                    && (drop.source.DelegateModel.itemsIndex < destIndex))
                 --destIndex
 
-            dropEvent(drag, destIndex)
+            dropEvent(drop, destIndex)
         }
     }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml Changed

@@ -22,6 +22,7 @@
 
 import VLC.Style
 import VLC.Util
+import VLC.Widgets as Widgets
 
 ListView {
     id: playerBtnDND
@@ -40,7 +41,7 @@
 
     property bool extraWidthAvailable: true
 
-    ScrollBar.horizontal: ScrollBar {
+    ScrollBar.horizontal: Widgets.ScrollBarExt {
         id: scrollBar
     }
 
@@ -81,13 +82,17 @@
             // moving from same section
             playerBtnDND.model.move(drag.source.DelegateModel.itemsIndex,
                                     destIndex)
+            drag.source.visible = true
+            drag.accept(Qt.MoveAction)
         } else if (drag.source.objectName === "buttonsList") {
             // moving from buttonsList
             playerBtnDND.model.insert(destIndex, {"id" : drag.source.mIndex})
+            drag.accept(Qt.CopyAction)
         } else {
             // moving between sections or views
             playerBtnDND.model.insert(destIndex, {"id" : drag.source.controlId})
             drag.source.dndView.model.remove(drag.source.DelegateModel.itemsIndex)
+            drag.accept(Qt.MoveAction)
         }
     }
 
@@ -155,10 +160,10 @@
             onDropped: (drop) => {
                 let destIndex = playerBtnDND.count
 
-                if (drag.source.dndView === playerBtnDND)
+                if (drop.source.dndView === playerBtnDND)
                     --destIndex
 
-                dropEvent(drag, destIndex)
+                dropEvent(drop, destIndex)
             }
         }
     }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml Changed

@@ -31,7 +31,7 @@
 
     clip: true
 
-    ScrollBar.vertical: ScrollBar { }
+    ScrollBar.vertical: Widgets.ScrollBarExt { }
     model: PlayerControlbarControls.controlList.length
 
     currentIndex: -1
@@ -44,8 +44,8 @@
 
     property alias removeInfoRectVisible: removeInfoRect.visible
 
-    signal dragStarted(int id)
-    signal dragStopped(int id)
+    signal controlDragStarted(int id)
+    signal controlDragStopped(int id)
 
 
     readonly property ColorContext colorContext: ColorContext {
@@ -79,7 +79,8 @@
             if (isFromList())
                 return
 
-            drag.source.dndView.model.remove(drag.source.DelegateModel.itemsIndex)
+            drop.source.dndView.model.remove(drop.source.DelegateModel.itemsIndex)
+            drop.accept(Qt.MoveAction)
         }
     }
 
@@ -140,9 +141,13 @@
 
         readonly property int mIndex: PlayerControlbarControls.controlListmodel.index.id
 
+        readonly property ColorContext colorContext: ColorContext {
+            colorSet: ColorContext.Item
+        }
+
         drag.onActiveChanged: {
             if (drag.active) {
-                dragStarted(mIndex)
+                root.controlDragStarted(mIndex)
 
                 buttonDragItem.text = PlayerControlbarControls.controlListmodel.index.label
                 buttonDragItem.Drag.source = this
@@ -152,7 +157,7 @@
             } else {
                 buttonDragItem.Drag.drop()
 
-                dragStopped(mIndex)
+                root.controlDragStopped(mIndex)
 
                 GridView.delayRemove = false
             }
@@ -173,7 +178,7 @@
             color: "transparent"
 
             border.width: VLCStyle.dp(1, VLCStyle.scale)
-            border.color: containsMouse && !buttonDragItem.Drag.active ? theme.border
+            border.color: containsMouse && !buttonDragItem.Drag.active ? colorContext.border
                                                                        : "transparent"
 
             ColumnLayout {
@@ -185,7 +190,7 @@
                     Layout.preferredHeight: VLCStyle.icon_medium
                     Layout.alignment: Qt.AlignHCenter
 
-                    color: theme.fg.primary
+                    color: colorContext.fg.primary
                     text: PlayerControlbarControls.controlListmodel.index.label
                 }
 
@@ -193,7 +198,7 @@
                     Layout.fillWidth: true
                     Layout.fillHeight: true
 
-                    color: theme.fg.secondary
+                    color: colorContext.fg.secondary
                     elide: Text.ElideNone
                     fontSizeMode: Text.Fit
                     text: PlayerControlbarControls.controlListmodel.index.text

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/dialogs/vlm/vlm.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/dialogs/vlm/vlm.cpp Changed

@@ -31,6 +31,7 @@
 #include "dialogs/open/open.hpp"
 #include "dialogs/sout/sout.hpp"
 #include "util/qt_dirs.hpp"
+#include "util/colorizedsvgicon.hpp"
 
 #include <QString>
 #include <QVBoxLayout>
@@ -461,7 +462,7 @@
     objLayout->addWidget( time, 1, 3, 1, 2 );*/
 
     QToolButton *modifyButton = new QToolButton;
-    modifyButton->setIcon( QIcon( ":/menu/ic_fluent_options.svg" ) );
+    modifyButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( QStringLiteral(":/menu/ic_fluent_options.svg"), modifyButton ) );
     modifyButton->setToolTip( qtr("Change") );
     objLayout->addWidget( modifyButton, 0, 5 );
 
@@ -507,13 +508,13 @@
     b_looped = _looped;
 
     playButton = new QToolButton;
-    playButton->setIcon( QIcon( ":/menu/ic_fluent_play_filled.svg" ) );
+    playButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( QStringLiteral(":/menu/ic_fluent_play_filled.svg"), playButton ) );
     playButton->setToolTip( qtr("Play") );
     objLayout->addWidget( playButton, 1, 0 );
     b_playing = true;
 
     QToolButton *stopButton = new QToolButton;
-    stopButton->setIcon( QIcon( ":/menu/ic_fluent_stop.svg" ) );
+    stopButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_fluent_stop.svg", stopButton ) );
     stopButton->setToolTip( qtr("Stop") );
     objLayout->addWidget( stopButton, 1, 1 );
 
@@ -532,9 +533,9 @@
 {
     vlm->EditBroadcast( name, input, inputOptions, output, b_enabled, b_looped );
     if( b_looped )
-        loopButton->setIcon( QIcon( ":/menu/ic_fluent_arrow_repeat_all.svg" ) );
+        loopButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_fluent_arrow_repeat_all.svg", loopButton ) );
     else
-        loopButton->setIcon( QIcon( ":/menu/repeat_off.svg" ) );
+        loopButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/repeat_off.svg", loopButton ) );
 }
 
 void VLMBroadcast::togglePlayPause()
@@ -542,12 +543,12 @@
     if( b_playing )
     {
         vlm->ControlBroadcast( name, ControlBroadcastPause );
-        playButton->setIcon( QIcon( ":/menu/ic_pause_filled.svg" ) );
+        playButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_pause_filled.svg", playButton ) );
     }
     else
     {
         vlm->ControlBroadcast( name, ControlBroadcastPlay );
-        playButton->setIcon( QIcon( ":/menu/ic_fluent_play_filled.svg" ) );
+        playButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( QStringLiteral(":/menu/ic_fluent_play_filled.svg"), playButton ) );
     }
     b_playing = !b_playing;
 }
@@ -561,7 +562,7 @@
 void VLMBroadcast::stop()
 {
     vlm->ControlBroadcast( name, ControlBroadcastStop );
-    playButton->setIcon( QIcon( ":/menu/ic_fluent_play_filled.svg" ) );
+    playButton->setIcon( ColorizedSvgIcon::colorizedIconForWidget( QStringLiteral(":/menu/ic_fluent_play_filled.svg"), playButton ) );
 }
 
 /****************

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor.cpp Changed

@@ -26,10 +26,8 @@
 
 #ifdef _WIN32
 #include "mainctx_win32.hpp"
-#ifdef HAVE_DCOMP_H
-#  include "compositor_dcomp.hpp"
-#endif
-#  include "compositor_win7.hpp"
+#include "compositor_dcomp.hpp"
+#include "compositor_win7.hpp"
 #endif
 
 #ifdef QT_HAS_WAYLAND_COMPOSITOR
@@ -59,7 +57,7 @@
     const char* name;
     Compositor* (*instantiate)(qt_intf_t *p_intf);
 } static compositorList = {
-#if defined(_WIN32) && defined(HAVE_DCOMP_H)
+#if defined(_WIN32)
     {"dcomp", &instanciateCompositor<CompositorDirectComposition> },
 #endif
 #if defined(_WIN32) || defined(__APPLE__)
@@ -204,10 +202,13 @@
     // These need to be connected here, since the compositor might not be ready when
     // these signals are emitted. VOut window might not be set, or worse, compositor's
     // internal preparations might not be completed yet:
+    constexpr auto connType = static_cast<Qt::ConnectionType>(Qt::UniqueConnection | Qt::DirectConnection);
     connect(m_videoSurfaceProvider.get(), &VideoSurfaceProvider::surfacePositionChanged,
-            this, &CompositorVideo::onSurfacePositionChanged, Qt::UniqueConnection);
+            this, &CompositorVideo::onSurfacePositionChanged, connType);
     connect(m_videoSurfaceProvider.get(), &VideoSurfaceProvider::surfaceSizeChanged,
-            this, &CompositorVideo::onSurfaceSizeChanged, Qt::UniqueConnection);
+            this, &CompositorVideo::onSurfaceSizeChanged, connType);
+    connect(m_videoSurfaceProvider.get(), &VideoSurfaceProvider::surfaceScaleChanged,
+            this, &CompositorVideo::onSurfaceScaleChanged, connType);
 }
 
 void CompositorVideo::windowDestroy()
@@ -219,9 +220,14 @@
                this, &CompositorVideo::onSurfacePositionChanged);
     disconnect(m_videoSurfaceProvider.get(), &VideoSurfaceProvider::surfaceSizeChanged,
                this, &CompositorVideo::onSurfaceSizeChanged);
+    disconnect(m_videoSurfaceProvider.get(), &VideoSurfaceProvider::surfaceScaleChanged,
+               this, &CompositorVideo::onSurfaceScaleChanged);
 
     if (m_destroyCb)
         m_destroyCb(m_wnd);
+
+    m_wnd = nullptr;
+    m_destroyCb = nullptr;
 }
 
 void CompositorVideo::windowResize(unsigned width, unsigned height)
@@ -263,22 +269,26 @@
     assert(m_mainCtx);
     assert(window);
 
-    m_videoSurfaceProvider = std::make_unique<VideoSurfaceProvider>();
+    m_videoSurfaceProvider = std::make_unique<VideoSurfaceProvider>(canDoThreadedSurfaceUpdates());
     m_mainCtx->setVideoSurfaceProvider(m_videoSurfaceProvider.get());
     const bool backendIsOpenVg = QQuickWindow::sceneGraphBackend() == QLatin1String("openvg");
-    if (!backendIsOpenVg && (flags & CompositorVideo::CAN_SHOW_PIP))
+    if (!backendIsOpenVg && (flags & CompositorVideo::CAN_SHOW_PIP) && var_InheritBool(m_intf, "qt-pip-mode"))
     {
         m_mainCtx->setCanShowVideoPIP(true);
     }
+    m_mainCtx->setWindowSuportExtendedFrame(flags & CompositorVideo::HAS_EXTENDED_FRAME);
     if (!backendIsOpenVg && (flags & CompositorVideo::HAS_ACRYLIC))
     {
-        if (Q_LIKELY(!window->isActive()))
+#ifndef _WIN32
+        assert(qGuiApp);
+        if (qGuiApp->platformName().startsWith(QLatin1String("wayland")) && Q_LIKELY(!window->isActive()))
         {
             connect(window, &QWindow::activeChanged, this, this, window = QPointer(window)() {
                setBlurBehind(window, true);
             }, Qt::SingleShotConnection);
         }
         else
+#endif
         {
             setBlurBehind(window, true);
         }
@@ -291,7 +301,6 @@
 #else
     m_interfaceWindowHandler = std::make_unique<InterfaceWindowHandler>(m_intf, m_mainCtx, window);
 #endif
-    m_mainCtx->setWindowSuportExtendedFrame(flags & CompositorVideo::HAS_EXTENDED_FRAME);
 
 #ifdef _WIN32
     m_taskbarWidget = std::make_unique<WinTaskbarWidget>(m_intf, window);
@@ -301,6 +310,40 @@
     return true;
 }
 
+void CompositorVideo::adjustBlurBehind()
+{
+    if (m_mainCtx && m_windowEffectsModule)
+    {
+        if (QWindow *const window = interfaceMainWindow())
+        {
+            assert(m_windowEffectsModule->isEffectAvailable(window, WindowEffectsModule::BlurBehind));
+            const bool blurBehind = m_mainCtx->hasAcrylicSurface();
+            if (blurBehind && m_mainCtx->windowSuportExtendedFrame() && m_mainCtx->useClientSideDecoration())
+            {
+                QRegion blurRegion;
+                const QRegion maskRegion = window->mask();
+                if (maskRegion.isEmpty())
+                {
+                    // If there is window mask, we assume that the content area is smaller than the
+                    // window geometry. We also assume that in that case window has custom margins
+                    // set (Wayland case). KWin 6.2 Wayland already considers window custom margins
+                    // when applying the blur effect, but KWin X11 does not consider `_GTK_FRAME_EXTENTS`.
+                    // Since the mask region represents the actual content area, and the outside region
+                    // is included in the frame margins, we can set the blur region only if the mask is
+                    // empty. This fixes blur backdrop applied to client shadows on X11:
+                    const auto margin = m_mainCtx->windowExtendedMargin();
+                    blurRegion = QRegion(margin, margin, window->width() - 2 * margin, window->height() - 2 * margin);
+                }
+                m_windowEffectsModule->setBlurBehind(window, true, blurRegion);
+            }
+            else
+            {
+                m_windowEffectsModule->setBlurBehind(window, blurBehind, {});
+            }
+        }
+    }
+}
+
 bool CompositorVideo::commonGUICreate(QWindow* window, QmlUISurface* qmlSurface, CompositorVideo::Flags flags)
 {
     bool ret = commonGUICreateImpl(window, flags);
@@ -381,10 +424,41 @@
         }
     }
 
-    if (!m_windowEffectsModule->isEffectAvailable(WindowEffectsModule::BlurBehind))
+    if (!m_windowEffectsModule->isEffectAvailable(window, WindowEffectsModule::BlurBehind))
         return false;
 
-    m_windowEffectsModule->setBlurBehind(window, enable);
     m_mainCtx->setHasAcrylicSurface(enable);
+
+    if (m_mainCtx->windowSuportExtendedFrame())
+    {
+        assert(m_mainCtx);
+
+        if (enable)
+        {
+            connect(window, &QWindow::widthChanged, this, &CompositorVideo::adjustBlurBehind, Qt::UniqueConnection);
+            connect(window, &QWindow::heightChanged, this, &CompositorVideo::adjustBlurBehind, Qt::UniqueConnection);
+            connect(m_mainCtx, &MainCtx::windowExtendedMarginChanged, this, &CompositorVideo::adjustBlurBehind, Qt::UniqueConnection);
+            connect(m_mainCtx, &MainCtx::useClientSideDecorationChanged, this, &CompositorVideo::adjustBlurBehind, Qt::UniqueConnection);
+        }
+        else
+        {
+            disconnect(window, &QWindow::widthChanged, this, &CompositorVideo::adjustBlurBehind);
+            disconnect(window, &QWindow::heightChanged, this, &CompositorVideo::adjustBlurBehind);
+            disconnect(m_mainCtx, &MainCtx::windowExtendedMarginChanged, this, &CompositorVideo::adjustBlurBehind);
+            disconnect(m_mainCtx, &MainCtx::useClientSideDecorationChanged, this, &CompositorVideo::adjustBlurBehind);
+        }
+
+        adjustBlurBehind();
+    }
+    else
+    {
+        m_windowEffectsModule->setBlurBehind(window, enable, {});
+    }
+
     return true;
 }
+
+QQuickWindow *Compositor::quickWindow() const
+{
+    return qobject_cast<QQuickWindow*>(interfaceMainWindow());
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor.hpp Changed

@@ -71,7 +71,7 @@
 
     nodiscard virtual bool init() = 0;
 
-    nodiscard virtual bool makeMainInterface(MainCtx* intf) = 0;
+    nodiscard virtual bool makeMainInterface(MainCtx* intf, std::function<void(QQuickWindow*)> aboutToShowQuickWindowCallback = {}) = 0;
 
     /**
      * @brief destroyMainInterface must released all resources, this is called before
@@ -96,6 +96,10 @@
 
     virtual QWindow* interfaceMainWindow() const = 0;
 
+    // Override this to return the quick window if quick window
+    // is not the interface main window:
+    virtual QQuickWindow* quickWindow() const;
+
     virtual QQuickItem * activeFocusItem() const = 0;
 };
 
@@ -137,6 +141,9 @@
     virtual void windowUnsetFullscreen();
     virtual void windowSetFullscreen(const char *id);
 
+    // The following method should return true if surface updates can be threaded:
+    virtual bool canDoThreadedSurfaceUpdates() const { return false; };
+
 protected:
     void commonSetupVoutWindow(vlc_window_t* p_wnd, VoutDestroyCb destroyCb);
     void commonWindowEnable();
@@ -167,9 +174,13 @@
 private:
     bool commonGUICreateImpl(QWindow* window, CompositorVideo::Flags flags);
 
+private slots:
+    void adjustBlurBehind();
+
 protected slots:
     virtual void onSurfacePositionChanged(const QPointF&) {}
     virtual void onSurfaceSizeChanged(const QSizeF&) {}
+    virtual void onSurfaceScaleChanged(qreal) {}
 
 protected:
     qt_intf_t *m_intf = nullptr;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_accessibility.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_accessibility.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_dcomp.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_dcomp.cpp Changed

@@ -30,14 +30,7 @@
 #warning "QRhiD3D11 and QRhi headers are required for DirectComposition compositor."
 #endif
 
-#ifndef QT_CORE_PRIVATE
-#warning "QSystemLibrary private header is required for DirectComposition compositor."
-#endif
-
 #include <QtGui/qpa/qplatformnativeinterface.h>
-#include <QtCore/private/qsystemlibrary_p.h>
-
-#if __has_include(<dxgi1_6.h>)
 
 #if __has_include(<d3d11_1.h>)
 #define QRhiD3D11_ACTIVE
@@ -51,8 +44,6 @@
 #endif
 #endif
 
-#endif
-
 #if !defined(QRhiD3D11_ACTIVE) && !defined(QRhiD3D12_ACTIVE)
 #warning "Neither D3D11 nor D3D12 headers are available. compositor_dcomp will not work."
 #endif
@@ -60,6 +51,9 @@
 #include "compositor_dcomp_acrylicsurface.hpp"
 #include "maininterface/interface_window_handler.hpp"
 
+#include <memory>
+#include <type_traits>
+
 namespace vlc {
 
 int CompositorDirectComposition::windowEnable(const vlc_window_cfg_t *)
@@ -108,7 +102,6 @@
 {
     //m_acrylicSurface should be released before the RHI context is destroyed
     assert(!m_acrylicSurface);
-    destroyMainInterface();
 }
 
 bool CompositorDirectComposition::init()
@@ -124,14 +117,19 @@
             return false;
     }
 
-    QSystemLibrary dcomplib(QLatin1String("dcomp"));
+    std::unique_ptr<std::remove_pointer_t<HMODULE>, BOOL WINAPI (*)(HMODULE)>
+        dcomplib(::LoadLibraryEx(TEXT("dcomp.dll"), nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32), ::FreeLibrary);
 
     typedef HRESULT (__stdcall *DCompositionCreateDeviceFuncPtr)(
         _In_opt_ IDXGIDevice *dxgiDevice,
         _In_ REFIID iid,
         _Outptr_ void **dcompositionDevice);
-    DCompositionCreateDeviceFuncPtr func = reinterpret_cast<DCompositionCreateDeviceFuncPtr>(
-        dcomplib.resolve("DCompositionCreateDevice"));
+    DCompositionCreateDeviceFuncPtr func = nullptr;
+    if (dcomplib)
+    {
+        func = reinterpret_cast<DCompositionCreateDeviceFuncPtr>(
+            GetProcAddress(dcomplib.get(), "DCompositionCreateDevice"));
+    }
 
     Microsoft::WRL::ComPtr<IDCompositionDevice> device;
     if (!func || FAILED(func(nullptr, IID_PPV_ARGS(&device))))
@@ -238,7 +236,7 @@
     }
 }
 
-bool CompositorDirectComposition::makeMainInterface(MainCtx* mainCtx)
+bool CompositorDirectComposition::makeMainInterface(MainCtx* mainCtx, std::function<void(QQuickWindow*)> aboutToShowQuickWindowCallback)
 {
     assert(mainCtx);
     m_mainCtx = mainCtx;
@@ -257,7 +255,37 @@
             &CompositorDirectComposition::setup,
             Qt::SingleShotConnection);
 
-    m_quickView->create();
+    {
+        // Express the desire to use WS_EX_NOREDIRECTIONBITMAP, it has the following advantages:
+        // - Increased performance due to not having to copy buffers (within GPU, or inter GPU-CPU unlike WS_EX_LAYERED).
+        // - Win32 window background brush is invalidated, so window does not flash white when opened.
+        // - No more resize artifact until the opaque scene covers the new area when the window is resized.
+        // - Make it possible to use the Windows 11 22H2 native acrylic backdrop effect, because the white background does not remain as an artifact.
+        //   When the window has a frame (currently it is the case for both SSD and CSD), clear color does not clear that background, which means
+        //   that the window should not be exposed (transparent UI). Currently there is either the acrylic simulation visual in the background which is
+        //   completely opaque or the video visual or the UI visual does not get transparent, so we don't suffer from this issue. With `WS_EX_NOREDIRECTIONBITMAP`,
+        //   the background does not paint a rectangle with `WNDCLASSEX::hbrBackground`, even if `WS_EX_LAYERED` is not used, so we are fine. The scene graph
+        //   does not have anything in the window to clear, so clear color can be transparent which means that the UI can be transparent and expose the window
+        //   for the window to provide the (native) backdrop acrylic effect.
+
+        // WS_EX_NOREDIRECTIONBITMAP is only compatible with the flip swapchain model and D3D backend.
+        // In CompositorDirectComposition::init(), we already ensure that D3D is used (no OpenGL or Vulkan).
+        // Flip model is supported since Windows 8 and Qt does not use it only if the following environment
+        // variable is set. Since it targets Windows 10+, it does *not* check if flip model is supported and
+        // use the legacy swapchain model. For D3D12, flip model is always used.
+        const bool legacySwapchainModelIsExplicitlyWanted = qEnvironmentVariableIntValue("QT_D3D_NO_FLIP");
+
+        const char* const envDisableRedirectionSurface = "QT_QPA_DISABLE_REDIRECTION_SURFACE";
+        const bool redirectionSurfaceIsExplicitlyWanted = !qEnvironmentVariableIsEmpty(envDisableRedirectionSurface) && !qEnvironmentVariableIntValue(envDisableRedirectionSurface);
+
+        if (!legacySwapchainModelIsExplicitlyWanted && !redirectionSurfaceIsExplicitlyWanted)
+            qputenv(envDisableRedirectionSurface, "1"); // TODO: Other QQuickWindow (toolbar editor, independent popups)
+
+        m_quickView->create();
+
+        if (!legacySwapchainModelIsExplicitlyWanted && !redirectionSurfaceIsExplicitlyWanted)
+            qunsetenv(envDisableRedirectionSurface); // NOTE: We need to disable it, otherwise regular QWidget windows would have issues
+    }
 
     const bool ret = commonGUICreate(quickViewPtr, quickViewPtr, CompositorVideo::CAN_SHOW_PIP | CompositorVideo::HAS_ACRYLIC);
 
@@ -274,8 +302,22 @@
                 m_setupStateCond.notify_all();
             }, static_cast<Qt::ConnectionType>(Qt::SingleShotConnection | Qt::DirectConnection));
 
-    m_quickView->show();
+    // Qt "terminates the application" by default if there is no connection made to the signal
+    // QQuickWindow::sceneGraphError(). We need to do the same, because by the time the error
+    // is reported, it will likely be too late (`makeMainInterface()` already returned true,
+    // which is the latest point recovery is still possible) to recover from that error and
+    // the interface will remain unfunctional. It was proposed to wait here until the scene
+    // graph is done, but that was not changed in order not to slow down the application
+    // start up.
+    connect(quickViewPtr,
+            &QQuickWindow::sceneGraphError,
+            m_mainCtx,
+            &MainCtx::askToQuit);
+
+    if (aboutToShowQuickWindowCallback)
+        aboutToShowQuickWindowCallback(quickViewPtr);
 
+    m_quickView->setVisible(true);
     return true;
 }
 
@@ -300,23 +342,34 @@
         msg_Err(m_intf, "video surface still active while destroying main interface");
 
     commonIntfDestroy();
+    m_quickView.reset();
 }
 
 void CompositorDirectComposition::unloadGUI()
 {
     m_acrylicSurface.reset();
     m_interfaceWindowHandler.reset();
-    m_quickView.reset();
+
+    //at this point we need to unload the QML content but the window still need to
+    //be valid as it may still be used by the vout window.
+    //we cant' just delete the qmlEngine as the QmlView as the root item is parented to the QmlView
+    //setSource() to nothing will effectively destroy the root item
+    if (Q_LIKELY(m_quickView))
+        m_quickView->setSource(QUrl());
+
     commonGUIDestroy();
 }
 
 bool CompositorDirectComposition::setupVoutWindow(vlc_window_t *p_wnd, VoutDestroyCb destroyCb)
 {
+    if (m_wnd)
+        return false;
+
     {
         QMutexLocker lock(&m_setupStateLock);
         while (m_setupState == SetupState::Uninitialized)
         {
-            const bool ret = m_setupStateCond.wait(&m_setupStateLock, QDeadlineTimer(2500));
+            const bool ret = m_setupStateCond.wait(&m_setupStateLock);
             if (!ret)
                 return false;
         }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_dcomp.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_dcomp.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_dummy.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_dummy.cpp Changed

@@ -21,6 +21,10 @@
 #include "maininterface/mainui.hpp"
 #include "maininterface/interface_window_handler.hpp"
 
+#ifdef _WIN32
+#include "maininterface/mainctx_win32.hpp"
+#endif
+
 namespace vlc {
 
 CompositorDummy::CompositorDummy(qt_intf_t *p_intf, QObject* parent)
@@ -38,18 +42,22 @@
     return true;
 }
 
-bool CompositorDummy::makeMainInterface(MainCtx* mainCtx)
+bool CompositorDummy::makeMainInterface(MainCtx* mainCtx, std::function<void (QQuickWindow *)> aboutToShowQuickWindowCallback)
 {
     m_mainCtx = mainCtx;
 
     QQuickWindow::setDefaultAlphaBuffer(false);
 
     m_qmlWidget = std::make_unique<QQuickView>();
-    if (m_mainCtx->useClientSideDecoration())
-        m_qmlWidget->setFlag(Qt::FramelessWindowHint);
     m_qmlWidget->setResizeMode(QQuickView::SizeRootObjectToView);
 
-    m_intfWindowHandler = std::make_unique<InterfaceWindowHandler>(m_intf, m_mainCtx, m_qmlWidget.get(), nullptr);
+    m_qmlWidget->create();
+
+#ifdef _WIN32
+    m_intfWindowHandler = std::make_unique<InterfaceWindowHandlerWin32>(m_intf, m_mainCtx, m_qmlWidget.get());
+#else
+    m_intfWindowHandler = std::make_unique<InterfaceWindowHandler>(m_intf, m_mainCtx, m_qmlWidget.get());
+#endif
 
     MainUI* ui = new MainUI(m_intf, m_mainCtx, m_qmlWidget.get(), m_qmlWidget.get());
     if (!ui->setup(m_qmlWidget->engine()))
@@ -60,7 +68,10 @@
     if (m_qmlWidget->status() != QQuickView::Ready)
         return false;
 
-    m_qmlWidget->show();
+    if (aboutToShowQuickWindowCallback)
+        aboutToShowQuickWindowCallback(m_qmlWidget.get());
+
+    m_qmlWidget->setVisible(true);
 
     return true;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_dummy.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_dummy.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_platform.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_platform.cpp Changed

@@ -62,7 +62,7 @@
     return false;
 }
 
-bool CompositorPlatform::makeMainInterface(MainCtx *mainCtx)
+bool CompositorPlatform::makeMainInterface(MainCtx *mainCtx, std::function<void (QQuickWindow *)> aboutToShowQuickWindowCallback)
 {
     m_mainCtx = mainCtx;
 
@@ -97,9 +97,12 @@
 
     m_rootWindow->installEventFilter(this);
 
-    m_rootWindow->show();
-    m_videoWindow->show();
-    m_quickWindow->show();
+    if (aboutToShowQuickWindowCallback)
+        aboutToShowQuickWindowCallback(m_quickWindow);
+
+    m_rootWindow->setVisible(true);
+    m_videoWindow->setVisible(true);
+    m_quickWindow->setVisible(true);
 
     m_quickWindow->raise(); // Make sure quick window is above the video window.
 
@@ -115,12 +118,15 @@
 {
     m_rootWindow->removeEventFilter(this);
     m_interfaceWindowHandler.reset();
-    delete m_quickWindow;
+    m_quickWindow->setSource(QUrl());
     commonGUIDestroy();
 }
 
 bool CompositorPlatform::setupVoutWindow(vlc_window_t *p_wnd, VoutDestroyCb destroyCb)
 {
+    if (m_wnd)
+        return false;
+
     commonSetupVoutWindow(p_wnd, destroyCb);
 
 #ifdef __WIN32
@@ -145,6 +151,11 @@
     return m_rootWindow.get();
 }
 
+QQuickWindow *CompositorPlatform::quickWindow() const
+{
+    return m_quickWindow.get();
+}
+
 Compositor::Type CompositorPlatform::type() const
 {
     return Compositor::PlatformCompositor;
@@ -191,10 +202,12 @@
 
 void CompositorPlatform::onSurfacePositionChanged(const QPointF &position)
 {
-    m_videoWindow->setPosition((position / m_videoWindow->devicePixelRatio()).toPoint());
+    const QPointF point = position / m_videoWindow->devicePixelRatio();
+    m_videoWindow->setPosition({static_cast<int>(point.x()), static_cast<int>(point.y())});
 }
 
 void CompositorPlatform::onSurfaceSizeChanged(const QSizeF &size)
 {
-    m_videoWindow->resize((size / m_videoWindow->devicePixelRatio()).toSize());
+    const QSizeF area = (size / m_videoWindow->devicePixelRatio());
+    m_videoWindow->resize({static_cast<int>(std::ceil(area.width())), static_cast<int>(std::ceil(area.height()))});
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_platform.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_platform.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_wayland.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_wayland.cpp Changed

@@ -17,8 +17,6 @@
  *****************************************************************************/
 #include "compositor_wayland.hpp"
 
-#include <cmath>
-
 #include "maininterface/mainctx.hpp"
 #include "maininterface/interface_window_handler.hpp"
 
@@ -99,14 +97,12 @@
     return m_waylandImpl->init(m_waylandImpl, qpni_display);
 }
 
-bool CompositorWayland::makeMainInterface(MainCtx* mainCtx)
+bool CompositorWayland::makeMainInterface(MainCtx* mainCtx, std::function<void(QQuickWindow*)> aboutToShowQuickWindowCallback)
 {
     assert(mainCtx);
     m_mainCtx = mainCtx;
 
     m_qmlView = std::make_unique<QQuickView>();
-    if (m_mainCtx->useClientSideDecoration())
-        m_qmlView->setFlag(Qt::FramelessWindowHint);
     m_qmlView->setResizeMode(QQuickView::SizeRootObjectToView);
     m_qmlView->setColor(QColor(Qt::transparent));
 
@@ -117,7 +113,7 @@
     if (!interfaceSurface)
         return false;
 
-    m_waylandImpl->setupInterface(m_waylandImpl, interfaceSurface, std::ceil(dprForWindow(m_qmlView.get())));
+    m_waylandImpl->setupInterface(m_waylandImpl, interfaceSurface, dprForWindow(m_qmlView.get()));
 
     CompositorVideo::Flags flags = CompositorVideo::CAN_SHOW_PIP | CompositorVideo::HAS_ACRYLIC;
 
@@ -140,7 +136,11 @@
     const bool ret = commonGUICreate(m_qmlView.get(), m_qmlView.get(), flags);
 
     if (ret)
-        m_qmlView->show();
+    {
+        if (aboutToShowQuickWindowCallback)
+            aboutToShowQuickWindowCallback(m_qmlView.get());
+        m_qmlView->setVisible(true);
+    }
 
     return ret;
 }
@@ -184,6 +184,9 @@
 
 bool CompositorWayland::setupVoutWindow(vlc_window_t* p_wnd, VoutDestroyCb destroyCb)
 {
+    if (m_wnd)
+        return false;
+
     int ret = m_waylandImpl->setupVoutWindow(m_waylandImpl, p_wnd);
     if (ret != VLC_SUCCESS)
         return false;
@@ -231,8 +234,15 @@
     qreal nativeDpr = dprForWindow(m_qmlView.get());
 
     m_waylandImpl->resize(m_waylandImpl,
-                        size.width() / nativeDpr,
-                        size.height() / nativeDpr);
+                        std::ceil(size.width() / nativeDpr),
+                        std::ceil(size.height() / nativeDpr));
+}
+
+void CompositorWayland::onSurfaceScaleChanged(qreal dpr)
+{
+    assert(m_waylandImpl);
+
+    m_waylandImpl->rescale(m_waylandImpl, dpr);
 }
 
 #ifdef QT_WAYLAND_HAS_CUSTOM_MARGIN_SUPPORT

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_wayland.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_wayland.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_wayland_module.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_wayland_module.c Changed

@@ -25,11 +25,13 @@
 #include <vlc_plugin.h>
 #include <wayland-client.h>
 
-#ifdef QT_HAS_WAYLAND_PROTOCOLS
+#ifdef QT_HAS_WAYLAND_FRACTIONAL_SCALING
 #include "viewporter-client-protocol.h"
 #endif
 
+#include <math.h>
 #include <assert.h>
+#include <float.h>
 
 typedef struct
 {
@@ -38,7 +40,7 @@
     struct wl_compositor* compositor;
     struct wl_subcompositor* subcompositor;
 
-#ifdef QT_HAS_WAYLAND_PROTOCOLS
+#ifdef QT_HAS_WAYLAND_FRACTIONAL_SCALING
     struct wp_viewport* viewport;
     struct wp_viewporter* viewporter;
 #endif
@@ -49,6 +51,13 @@
     struct wl_subsurface* video_subsurface;
 
     int buffer_scale;
+    bool fractional_scale;
+
+    // Store the size, because we need them
+    // if the scale changes (if fractional)
+    // to update the viewport:
+    int width;
+    int height;
 
     uint32_t compositor_interface_version;
 } qtwayland_priv_t;
@@ -66,7 +75,7 @@
         sys->compositor_interface_version = version;
         sys->compositor = (struct wl_compositor*)wl_registry_bind(registry, id, &wl_compositor_interface, version);
     }
-#ifdef QT_HAS_WAYLAND_PROTOCOLS
+#ifdef QT_HAS_WAYLAND_FRACTIONAL_SCALING
     if (!strcmp(iface, "wp_viewporter"))
         sys->viewporter = (struct wp_viewporter*)wl_registry_bind(registry, id, &wp_viewporter_interface, version);
 #endif
@@ -84,43 +93,119 @@
     registry_global_remove_cb,
 };
 
-static int SetupInterface(qtwayland_t* obj, void* qpni_interface_surface, int scale)
+static void SetSize(struct qtwayland_t* obj, size_t width, size_t height)
 {
-    qtwayland_priv_t* sys = (qtwayland_priv_t*)obj->p_sys;
+    assert(obj);
+    qtwayland_priv_t* const sys = (qtwayland_priv_t*)obj->p_sys;
+    assert(sys);
 
-    if (! qpni_interface_surface)
-        return VLC_EGENERIC;
+    sys->width = width;
+    sys->height = height;
+}
 
-    sys->interface_surface = (struct wl_surface*)qpni_interface_surface;
-    sys->buffer_scale = scale;
+static bool CommitSize(struct qtwayland_t* obj)
+{
+#ifdef QT_HAS_WAYLAND_FRACTIONAL_SCALING
+    assert(obj);
+    const qtwayland_priv_t* const sys = (qtwayland_priv_t*)obj->p_sys;
+    assert(sys);
+    if (!sys->video_surface)
+        return false;
+    if (sys->viewport)
+    {
+        // Non-positive size (except (-1, -1) pair) causes protocol error:
+        if (unlikely(!((sys->width > 0 && sys->height > 0) || (sys->height == -1 && sys->width == -1))))
+            return false;
 
-    return VLC_SUCCESS;
-}
+        // width and height here represent the final size, after scaling
+        // is taken into account. The fractional scaling protocol is not
+        // necessary, because the (fractional) scale is retrieved from the
+        // Qt Quick window which uses the fractional scale protocol itself
+        // to determine the device pixel ratio.
+        wp_viewport_set_destination(sys->viewport, sys->width, sys->height);
+        wl_surface_commit(sys->video_surface);
+        return true;
+    }
+#endif
 
+    return false;
+}
 
-static int SetupVoutWindow(qtwayland_t* obj, vlc_window_t* wnd)
+static void SetScale(struct qtwayland_t* obj, double scale)
 {
+    assert(obj);
     qtwayland_priv_t* sys = (qtwayland_priv_t*)obj->p_sys;
+    assert(sys);
 
-    sys->video_surface = wl_compositor_create_surface(sys->compositor);
-    if (!sys->video_surface)
-        return VLC_EGENERIC;
+    // Determine if scale is fractional:
+    assert(scale > 0.0);
+    sys->buffer_scale = ceil(scale);
 
-#ifdef QT_HAS_WAYLAND_PROTOCOLS
-    if (sys->viewporter)
-        sys->viewport = wp_viewporter_get_viewport(sys->viewporter, sys->video_surface);
+    if ((sys->buffer_scale - scale) < DBL_EPSILON)
+        sys->fractional_scale = false;
     else
-#endif
+        sys->fractional_scale = true;
+}
+
+static void CommitScale(struct qtwayland_t* obj)
+{
+    assert(obj);
+    qtwayland_priv_t* const sys = (qtwayland_priv_t*)obj->p_sys;
+    assert(sys);
+
+    // Once the scale becomes fractional, viewport is used.
+    // If the scale becomes an integer number after that,
+    // viewport is still used.
+    if (sys->fractional_scale)
     {
-        // The buffer scale must remain 1 when fractional scaling is used
-        if (sys->buffer_scale != 1)
+#ifdef QT_HAS_WAYLAND_FRACTIONAL_SCALING
+        if (sys->viewporter)
+        {
+            if (!sys->viewport)
+            {
+                sys->viewport = wp_viewporter_get_viewport(sys->viewporter, sys->video_surface);
+
+                // The buffer scale must remain 1 when fractional scaling is used:
+                // If compositor has viewport support, it should be at least version 3:
+                if (likely(sys->compositor_interface_version >= 3))
+                {
+                    wl_surface_set_buffer_scale(sys->video_surface, 1);
+                    wl_surface_commit(sys->video_surface);
+                }
+
+                // Started using viewport, commit size so that viewport destination is set:
+                CommitSize(obj);
+            }
+        }
+        else
+#endif
         {
-            msg_Dbg(obj, "Viewporter protocol is not available, and scale is not 1." \
-                         "Only integer scaling may be possible.");
+            msg_Dbg(obj, "Viewporter protocol is not available or Qt version is less than " \
+                         "6.5.0, and scale is fractional. Only integer scaling may be possible.");
 
             if (sys->compositor_interface_version >= 3)
             {
                 wl_surface_set_buffer_scale(sys->video_surface, sys->buffer_scale);
+                wl_surface_commit(sys->video_surface);
+            }
+            else
+            {
+                msg_Dbg(obj, "Compositor interface version is below 3, integer scaling " \
+                             "is not possible.");
+            }
+        }
+    }
+    else
+    {
+#ifdef QT_HAS_WAYLAND_FRACTIONAL_SCALING
+        // Scale is not fractional, but if viewport has been initialized before, keep using it:
+        if (!sys->viewport)
+#endif
+        {
+            if (sys->compositor_interface_version >= 3)
+            {
+                wl_surface_set_buffer_scale(sys->video_surface, sys->buffer_scale);
+                wl_surface_commit(sys->video_surface);
             }
             else
             {
@@ -129,6 +214,32 @@
             }
         }
     }
+}
+
+static int SetupInterface(qtwayland_t* obj, void* qpni_interface_surface, double scale)
+{
+    qtwayland_priv_t* sys = (qtwayland_priv_t*)obj->p_sys;
+
+    if (! qpni_interface_surface)
+        return VLC_EGENERIC;
+
+    sys->interface_surface = (struct wl_surface*)qpni_interface_surface;
+
+    SetScale(obj, scale);
+
+    return VLC_SUCCESS;
+}
+
+
+static int SetupVoutWindow(qtwayland_t* obj, vlc_window_t* wnd)
+{
+    qtwayland_priv_t* sys = (qtwayland_priv_t*)obj->p_sys;
+
+    sys->video_surface = wl_compositor_create_surface(sys->compositor);
+    if (!sys->video_surface)
+        return VLC_EGENERIC;
+
+    CommitScale(obj);
 
     struct wl_region* region = wl_compositor_create_region(sys->compositor);
     if (!region)
@@ -155,7 +266,7 @@
 {
     qtwayland_priv_t* sys = (qtwayland_priv_t*)obj->p_sys;
 
-#ifdef QT_HAS_WAYLAND_PROTOCOLS
+#ifdef QT_HAS_WAYLAND_FRACTIONAL_SCALING
     if (sys->viewport)
     {
         wp_viewport_destroy(sys->viewport);
@@ -205,22 +316,52 @@
 
 static void Resize(struct qtwayland_t* obj, size_t width, size_t height)
 {
-#ifdef QT_HAS_WAYLAND_PROTOCOLS
+    assert(obj);
     qtwayland_priv_t* sys = (qtwayland_priv_t*)obj->p_sys;
     assert(sys);
-    if (!sys->video_surface)
-        return;
-    if (sys->viewport)
+
+    bool commitNecessary = false;
+
     {
-        // width and height here represent the final size, after scaling
-        // is taken into account. The fractional scaling protocol is not
-        // necessary, because the (fractional) scale is retrieved from the
-        // Qt Quick window which uses the fractional scale protocol itself
-        // to determine the device pixel ratio.
-        wp_viewport_set_destination(sys->viewport, width, height);
-        wl_surface_commit(sys->video_surface);
+        // Do not directly compare, because SetSize may not directly use size as is
+        const int oldWidth = sys->width;
+        const int oldHeight = sys->height;
+
+        SetSize(obj, width, height);
+
+        if (oldWidth != sys->width)
+            commitNecessary = true;
+        else if (oldHeight != sys->height)
+            commitNecessary = true;
     }
-#endif
+
+    if (commitNecessary)
+        CommitSize(obj);
+}
+
+
+static void Rescale(struct qtwayland_t* obj, double scale)
+{
+    assert(obj);
+    qtwayland_priv_t* sys = (qtwayland_priv_t*)obj->p_sys;
+    assert(sys);
+
+    bool commitNecessary = false;
+
+    {
+        const int oldBufferScale = sys->buffer_scale;
+        const bool oldFractionalScale = sys->fractional_scale;
+
+        SetScale(obj, scale);
+
+        if (oldBufferScale != sys->buffer_scale)
+            commitNecessary = true;
+        else if (oldFractionalScale != sys->fractional_scale)
+            commitNecessary = true;
+    }
+
+    if (commitNecessary)
+        CommitScale(obj);
 }
 
 static void Close(qtwayland_t* obj)
@@ -228,7 +369,7 @@
     qtwayland_priv_t* sys = (qtwayland_priv_t*)(obj->p_sys);
     wl_display_flush(sys->display);
 
-#ifdef QT_HAS_WAYLAND_PROTOCOLS
+#ifdef QT_HAS_WAYLAND_FRACTIONAL_SCALING
     if (sys->viewporter)
         wp_viewporter_destroy(sys->viewporter);
 #endif
@@ -254,7 +395,7 @@
     void* wrapper = wl_proxy_create_wrapper(display);
     wl_proxy_set_queue((struct wl_proxy*)wrapper, sys->queue);
 
-#ifdef QT_HAS_WAYLAND_PROTOCOLS
+#ifdef QT_HAS_WAYLAND_FRACTIONAL_SCALING
     sys->viewporter = NULL;
     sys->viewport = NULL;
 #endif
@@ -286,7 +427,7 @@
     return false;
 }
 
-static int Open(vlc_object_t* p_this)
+int OpenCompositor(vlc_object_t* p_this)
 {
     qtwayland_t* obj = (qtwayland_t*)p_this;
 
@@ -318,15 +459,9 @@
     obj->disable = Disable;
     obj->move = Move;
     obj->resize = Resize;
+    obj->rescale = Rescale;
 
     obj->p_sys = sys;
 
     return VLC_SUCCESS;
 }
-
-vlc_module_begin()
-    set_shortname(N_("QtWayland"))
-    set_description(N_(" calls for compositing with Qt"))
-    set_capability("qtwayland", 10)
-    set_callback(Open)
-vlc_module_end()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_wayland_module.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_wayland_module.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_win7.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_win7.cpp Changed

@@ -61,7 +61,7 @@
     return true;
 }
 
-bool CompositorWin7::makeMainInterface(MainCtx* mainCtx)
+bool CompositorWin7::makeMainInterface(MainCtx* mainCtx, std::function<void (QQuickWindow *)> aboutToShowQuickWindowCallback)
 {
     m_mainCtx = mainCtx;
 
@@ -84,7 +84,7 @@
     m_stable->setAttribute( Qt::WA_ShowWithoutActivating );
     m_stable->setVisible(true);
 
-    m_videoWidget->show();
+    m_videoWidget->setVisible(true);
     m_videoWindowHWND = (HWND)m_videoWidget->winId();
 
     BOOL excluseFromPeek = TRUE;
@@ -106,7 +106,11 @@
     const bool ret = commonGUICreate(m_qmlView.get(), m_qmlView.get(), CompositorVideo::CAN_SHOW_PIP);
 
     if (ret)
-        m_qmlView->show();
+    {
+        if (aboutToShowQuickWindowCallback)
+            aboutToShowQuickWindowCallback(m_qmlView.get());
+        m_qmlView->setVisible(true);
+    }
 
     return ret;
 }
@@ -130,6 +134,9 @@
 
 bool CompositorWin7::setupVoutWindow(vlc_window_t *p_wnd, VoutDestroyCb destroyCb)
 {
+    if (m_wnd)
+        return false;
+
     BOOL isCompositionEnabled;
     HRESULT hr = DwmIsCompositionEnabled(&isCompositionEnabled);
 
@@ -178,7 +185,7 @@
             m_videoWidget->hide();
         else
         {
-            m_videoWidget->show();
+            m_videoWidget->setVisible(true);
             m_videoWidget->setGeometry(m_qmlView->geometry());
             resetVideoZOrder();
         }
@@ -188,7 +195,7 @@
         resetVideoZOrder();
         break;
     case QEvent::Show:
-        m_videoWidget->show();
+        m_videoWidget->setVisible(true);
         resetVideoZOrder();
         break;
     case QEvent::Hide:
@@ -222,12 +229,14 @@
 
 void CompositorWin7::onSurfacePositionChanged(const QPointF& position)
 {
-    m_stable->move((position / m_stable->window()->devicePixelRatioF()).toPoint());
+    const QPointF point = position / m_stable->window()->devicePixelRatioF();
+    m_stable->move({static_cast<int>(point.x()), static_cast<int>(point.y())});
 }
 
 void CompositorWin7::onSurfaceSizeChanged(const QSizeF& size)
 {
-    m_stable->resize((size / m_stable->window()->devicePixelRatioF()).toSize());
+    const QSizeF area = (size / m_stable->window()->devicePixelRatioF());
+    m_stable->resize({static_cast<int>(std::ceil(area.width())), static_cast<int>(std::ceil(area.height()))});
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_win7.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_win7.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_x11.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_x11.cpp Changed

@@ -37,6 +37,10 @@
 #include <private/qquickwindow_p.h>
 #endif
 
+#ifndef X_DISPLAY_MISSING
+#include <X11/Xlib.h>
+#endif
+
 using namespace vlc;
 
 int CompositorX11::windowEnable(const vlc_window_cfg_t *)
@@ -166,13 +170,11 @@
     return true;
 }
 
-bool CompositorX11::makeMainInterface(MainCtx* mainCtx)
+bool CompositorX11::makeMainInterface(MainCtx* mainCtx, std::function<void (QQuickWindow *)> aboutToShowQuickWindowCallback)
 {
     m_mainCtx = mainCtx;
 
-
-    bool useCSD = m_mainCtx->useClientSideDecoration();
-    m_renderWindow = std::make_unique<vlc::CompositorX11RenderWindow>(m_intf, m_conn, useCSD);
+    m_renderWindow = std::make_unique<vlc::CompositorX11RenderWindow>(m_intf, m_conn);
     if (!m_renderWindow->init())
         return false;
 
@@ -194,7 +196,9 @@
 
     xcb_change_window_attributes(connection, m_videoWidget->winId(), mask, &values);
     setTransparentForMouseEvent(connection, m_videoWidget->winId());
-    m_videoWidget->show();
+    m_videoWidget->setVisible(true);
+
+    connect(m_mainCtx, &MainCtx::hasAcrylicSurfaceChanged, m_renderWindow.get(), &CompositorX11RenderWindow::setAcrylic);
 
     m_qmlView = std::make_unique<CompositorX11UISurface>(m_renderWindow.get());
 
@@ -207,7 +211,10 @@
     if (!commonGUICreate(m_renderWindow.get(), m_qmlView.get(), flags))
         return false;
 
-    m_qmlView->show();
+    if (aboutToShowQuickWindowCallback)
+        aboutToShowQuickWindowCallback(m_qmlView->getOffscreenWindow());
+
+    m_qmlView->setVisible(true);
 
     if (m_mainCtx->hasAcrylicSurface())
         m_renderWindow->m_hasAcrylic = true;
@@ -236,25 +243,76 @@
 
 void CompositorX11::onSurfacePositionChanged(const QPointF& position)
 {
-    m_renderWindow->setVideoPosition(position.toPoint());
+    m_renderWindow->setVideoPosition({static_cast<int>(position.x()), static_cast<int>(position.y())});
 }
 
 void CompositorX11::onSurfaceSizeChanged(const QSizeF& size)
 {
-    m_renderWindow->setVideoSize((size / m_videoWidget->window()->devicePixelRatioF()).toSize());
+    const QSizeF area = (size / m_videoWidget->window()->devicePixelRatioF());
+    m_renderWindow->setVideoSize({static_cast<int>(std::ceil(area.width())), static_cast<int>(std::ceil(area.height()))});
 }
 
 bool CompositorX11::setupVoutWindow(vlc_window_t* p_wnd, VoutDestroyCb destroyCb)
 {
+    if (m_wnd)
+        return false;
+
     p_wnd->type = VLC_WINDOW_TYPE_XID;
     p_wnd->handle.xid = m_videoWidget->winId();
+#ifndef X_DISPLAY_MISSING
+    assert(qGuiApp);
+    const auto x11App = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
+    assert(x11App); // already checked in `init()`
+    assert(x11App->display());
+    p_wnd->display.x11 = XDisplayString(x11App->display());
+#endif
+
     commonSetupVoutWindow(p_wnd, destroyCb);
     return true;
 }
 
 QWindow* CompositorX11::interfaceMainWindow() const { return m_renderWindow.get(); }
 
+QQuickWindow *CompositorX11::quickWindow() const
+{
+    assert(m_qmlView);
+    return m_qmlView->getOffscreenWindow();
+}
+
 QQuickItem * CompositorX11::activeFocusItem() const /* override */
 {
     return m_qmlView->activeFocusItem();
 }
+
+///////// DummyNativeWidget
+
+DummyNativeWidget::DummyNativeWidget(QWidget* parent, Qt::WindowFlags f)
+    : QWidget(parent, f)
+{
+    setAttribute(Qt::WA_NativeWindow, true);
+    setAttribute(Qt::WA_OpaquePaintEvent, true);
+    setAttribute(Qt::WA_PaintOnScreen, true);
+    setAttribute(Qt::WA_MouseTracking, true);
+    setAttribute(Qt::WA_TranslucentBackground, false);
+    QWindow* w =  window()->windowHandle();
+    assert(w);
+    /*
+     * force the window not to have an alpha channel, the  parent window
+     * may have an alpha channel and child widget would inhertit the format
+     * even if we set Qt::WA_TranslucentBackground to false. having an alpha
+     * in this surface would lead to the video begin semi-tranparent.
+     */
+    QSurfaceFormat format = w->format();
+    format.setAlphaBufferSize(0);
+    w->setFormat(format);
+}
+
+DummyNativeWidget::~DummyNativeWidget()
+{
+
+}
+
+QPaintEngine* DummyNativeWidget::paintEngine() const
+{
+    return nullptr;
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_x11.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_x11.hpp Changed

@@ -22,6 +22,8 @@
 #include "videosurface.hpp"
 #include <memory>
 
+#include <QWidget>
+
 #include <xcb/xcb.h>
 
 class QObject;
@@ -40,7 +42,7 @@
 
     bool init() override;
 
-    bool makeMainInterface(MainCtx*) override;
+    bool makeMainInterface(MainCtx*, std::function<void(QQuickWindow*)> aboutToShowQuickWindowCallback = {}) override;
     void destroyMainInterface() override;
     void unloadGUI() override;
 
@@ -49,6 +51,7 @@
     inline Type type() const override { return X11Compositor; }
 
     QWindow* interfaceMainWindow() const override;
+    QQuickWindow* quickWindow() const override;
 
     QQuickItem * activeFocusItem() const override;
 
@@ -68,6 +71,18 @@
     std::unique_ptr<CompositorX11RenderWindow> m_renderWindow;
 };
 
+class DummyNativeWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    DummyNativeWidget(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
+    virtual ~DummyNativeWidget();
+
+    //override paintEnging to suppress warning
+    QPaintEngine* paintEngine() const override;
+};
+
+
 }
 
 #endif // COMPOSITORX11_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_x11_renderwindow.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_x11_renderwindow.cpp Changed

@@ -343,18 +343,36 @@
 
 //// CompositorX11RenderWindow
 
-CompositorX11RenderWindow::CompositorX11RenderWindow(qt_intf_t* p_intf, xcb_connection_t* conn, bool useCSD, QWindow* parent)
+CompositorX11RenderWindow::CompositorX11RenderWindow(qt_intf_t* p_intf, xcb_connection_t* conn, QWindow* parent)
     : DummyRenderWindow(parent)
     , m_intf(p_intf)
     , m_conn(conn)
 {
-    if (useCSD)
-        setFlag(Qt::FramelessWindowHint);
-
     winId();
-    show();
+    setVisible(true);
 
     m_wid = winId();
+
+    m_lastVisibility = visibility();
+
+    connect(this, &QWindow::visibilityChanged, this, this(QWindow::Visibility visibility) {
+        if (visibility == QWindow::Visibility::Minimized)
+        {
+            // Hidden is handled in `QWindow::hideEvent()`.
+            emit visiblityChanged(false);
+        }
+        else if (m_lastVisibility == QWindow::Visibility::Minimized && visibility != QWindow::Visibility::Hidden)
+        {
+            // Show is handled in `QWindow::showEvent()`.
+            // Expose is handled in `QWindow::exposeEvent()`. However, KWin X11 does not send expose event when
+            // a window is restored from minimized state.
+            resetClientPixmaps();
+            emit visiblityChanged(true);
+            emit requestUIRefresh();
+        }
+
+        m_lastVisibility = visibility;
+    });
 }
 
 CompositorX11RenderWindow::~CompositorX11RenderWindow()
@@ -420,6 +438,7 @@
     connect(this, &CompositorX11RenderWindow::registerVideoWindow, m_renderTask, &RenderTask::onRegisterVideoWindow);
     connect(this, &CompositorX11RenderWindow::videoSurfaceChanged, m_renderTask, &RenderTask::onVideoSurfaceChanged, Qt::BlockingQueuedConnection);
     connect(this, &CompositorX11RenderWindow::hasExtendedFrameChanged, m_renderTask, &RenderTask::onExtendedFrameChanged, Qt::BlockingQueuedConnection);
+    connect(this, &CompositorX11RenderWindow::acrylicChanged, m_renderTask, &RenderTask::onAcrylicChanged);
     //pass initial values
     m_renderTask->onInterfaceSurfaceChanged(m_interfaceClient.get());
     m_renderTask->onVideoSurfaceChanged(m_videoClient.get());
@@ -527,6 +546,16 @@
     }
 }
 
+void CompositorX11RenderWindow::setAcrylic(bool value)
+{
+    if (m_hasAcrylic == value)
+        return;
+
+    m_hasAcrylic = value;
+
+    emit acrylicChanged(value);
+}
+
 void CompositorX11RenderWindow::setVideoWindow( QWindow* window)
 {
     //ensure Qt x11 pending operation have been forwarded to the server

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_x11_renderwindow.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_x11_renderwindow.hpp Changed

@@ -155,7 +155,7 @@
 
     Q_OBJECT
 public:
-    explicit CompositorX11RenderWindow(qt_intf_t* p_intf, xcb_connection_t* conn, bool useCSD, QWindow* parent = nullptr);
+    explicit CompositorX11RenderWindow(qt_intf_t* p_intf, xcb_connection_t* conn, QWindow* parent = nullptr);
     ~CompositorX11RenderWindow();
 
     bool init();
@@ -167,6 +167,7 @@
     void setVideoSize(const QSize& size);
 
     inline bool hasAcrylic() const { return m_hasAcrylic; }
+    void setAcrylic(bool value);
     inline bool supportExtendedFrame() const { return m_supportExtendedFrame; }
 
     void setVideoWindow(QWindow* window);
@@ -185,6 +186,7 @@
     void visiblityChanged(bool visible);
     void registerVideoWindow(unsigned int xid);
     bool hasExtendedFrameChanged(bool hasExtendedFrame);
+    void acrylicChanged(bool value);
 
 protected:
     //override from QWindow
@@ -220,6 +222,8 @@
 
     CompositorX11UISurface* m_interfaceWindow = nullptr;
     std::unique_ptr<CompositorX11RenderClient> m_interfaceClient;
+
+    QWindow::Visibility m_lastVisibility;
 };
 
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_x11_uisurface.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_x11_uisurface.cpp Changed

@@ -25,7 +25,6 @@
 #include <QApplication>
 #include <QQuickRenderTarget>
 #include <QQuickGraphicsDevice>
-#include <QOpenGLFramebufferObject>
 #include <QOpenGLExtraFunctions>
 #include <QThread>
 #include <QBackingStore>
@@ -90,8 +89,21 @@
 
     if (m_context)
     {
-        connect(m_uiWindow, &QQuickWindow::sceneGraphInitialized, this, &CompositorX11UISurface::createFbo);
-        connect(m_uiWindow, &QQuickWindow::sceneGraphInvalidated, this, &CompositorX11UISurface::destroyFbo);
+        connect(m_uiWindow, &QQuickWindow::sceneGraphInitialized, this, this() {
+            assert(m_context);
+            const bool ret = m_context->makeCurrent(this);
+            assert(ret); // initial fbo creation must succeed
+            createFbo();
+            m_context->doneCurrent();
+        });
+        connect(m_uiWindow, &QQuickWindow::sceneGraphInvalidated, this, this() {
+            assert(m_context);
+            if (Q_LIKELY(m_context->makeCurrent(this)))
+            {
+                destroyFbo();
+                m_context->doneCurrent();
+            }
+        });
     }
 
     connect(m_uiWindow, &QQuickWindow::beforeRendering, this, &CompositorX11UISurface::beforeRendering);
@@ -185,6 +197,9 @@
 
     f->glGenFramebuffers(1, &m_fboId);
 
+    m_context->functions()->glBindFramebuffer(GL_READ_FRAMEBUFFER, m_fboId);
+    m_context->functions()->glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_textureId, 0);
+
     emit sizeChanged(fboSize);
 }
 
@@ -202,15 +217,16 @@
     }
 }
 
-void CompositorX11UISurface::render()
+bool CompositorX11UISurface::render()
 {
     if (!isExposed())
-        return;
+        return false;
 
     if (m_context)
     {
         const bool current = m_context->makeCurrent(this);
-        assert(current);
+        if (!current)
+            return false;
         m_uiRenderControl->beginFrame();
     }
 
@@ -223,16 +239,15 @@
     if (m_context)
     {
         m_uiRenderControl->endFrame();
-        QOpenGLFramebufferObject::bindDefault();
         m_context->functions()->glFlush();
 
         const QSize fboSize = size() * devicePixelRatio();
 
-        m_context->functions()->glBindFramebuffer(GL_READ_FRAMEBUFFER, m_fboId);
-        m_context->functions()->glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_textureId, 0);
         //qt may mess with scissor/viewport
         m_context->functions()->glScissor(0,0, fboSize.width(), fboSize.height());
         m_context->extraFunctions()->glViewport(0,0, fboSize.width(), fboSize.height());
+        m_context->functions()->glBindFramebuffer(GL_READ_FRAMEBUFFER, m_fboId);
+        m_context->functions()->glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_context->defaultFramebufferObject());
         m_context->extraFunctions()->glBlitFramebuffer(0, 0, fboSize.width(), fboSize.height(), 0, 0, fboSize.width(), fboSize.height(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
         m_context->swapBuffers(this);
     }
@@ -246,8 +261,11 @@
         m_backingStore->flush(geometry());
     }
 
+    emit m_uiWindow->frameSwapped();
 
     emit updated();
+
+    return true;
 }
 
 void CompositorX11UISurface::updateSizes()
@@ -409,18 +427,21 @@
     return false;
 }
 
-void CompositorX11UISurface::resizeFbo()
+bool CompositorX11UISurface::resizeFbo()
 {
     if (m_rootItem)
     {
         const bool current = m_context->makeCurrent(this);
-        assert(current);
+        if (!current)
+            return false;
         destroyFbo();
         createFbo();
         m_context->doneCurrent();
         updateSizes();
         render();
+        return true;
     }
+    return false;
 }
 
 void CompositorX11UISurface::applyNvidiaWorkaround(QSurfaceFormat &format)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_x11_uisurface.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_x11_uisurface.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_x11_utils.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_x11_utils.cpp Changed

@@ -15,44 +15,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include <xcb/xfixes.h>
-#include <vlc_cxx_helpers.hpp>
-#include "compositor_x11_utils.hpp"
-
-#include <QWindow>
+#include <vector>
+#include <algorithm>
+#include <cstring>
 
-namespace vlc {
-
-DummyNativeWidget::DummyNativeWidget(QWidget* parent, Qt::WindowFlags f)
-    : QWidget(parent, f)
-{
-    setAttribute(Qt::WA_NativeWindow, true);
-    setAttribute(Qt::WA_OpaquePaintEvent, true);
-    setAttribute(Qt::WA_PaintOnScreen, true);
-    setAttribute(Qt::WA_MouseTracking, true);
-    setAttribute(Qt::WA_TranslucentBackground, false);
-    QWindow* w =  window()->windowHandle();
-    assert(w);
-    /*
-     * force the window not to have an alpha channel, the  parent window
-     * may have an alpha channel and child widget would inhertit the format
-     * even if we set Qt::WA_TranslucentBackground to false. having an alpha
-     * in this surface would lead to the video begin semi-tranparent.
-     */
-    QSurfaceFormat format = w->format();
-    format.setAlphaBufferSize(0);
-    w->setFormat(format);
-}
+#include <vlc_cxx_helpers.hpp>
 
-DummyNativeWidget::~DummyNativeWidget()
-{
+#include <xcb/xfixes.h>
 
-}
+#include "compositor_x11_utils.hpp"
 
-QPaintEngine* DummyNativeWidget::paintEngine() const
-{
-    return nullptr;
-}
+namespace vlc {
 
 bool queryExtension(xcb_connection_t* conn, const char* name, uint8_t* first_event_out, uint8_t* first_error_out)
 {
@@ -133,10 +106,10 @@
 //see https://specifications.freedesktop.org/wm-spec/wm-spec-latest.html#idm45894597940912
 bool wmScreenHasCompositor(xcb_connection_t* conn, int screen)
 {
-     QByteArray propName("_NET_WM_CM_S");
-     propName += QByteArray::number(screen);
+     std::string propName("_NET_WM_CM_S");
+    propName += std::to_string(screen);
 
-     xcb_atom_t atom = getInternAtom(conn, propName.constData());
+     xcb_atom_t atom = getInternAtom(conn, propName.c_str());
      if (atom == 0)
         return false;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/compositor_x11_utils.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/compositor_x11_utils.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/interface_window_handler.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/interface_window_handler.cpp Changed

@@ -52,18 +52,21 @@
     assert(m_window);
     assert(m_mainCtx);
 
+    if (m_mainCtx->useClientSideDecoration())
+        m_window->setFlag(Qt::FramelessWindowHint);
+
     /* */
     m_pauseOnMinimize = var_InheritBool( p_intf, "qt-pause-minimized" );
 
     m_window->setIcon( QApplication::windowIcon() );
     m_window->setOpacity( var_InheritFloat( p_intf, "qt-opacity" ) );
 
+    QVLCTools::restoreWindowPosition( getSettings(), m_window, QSize(600, 420) );
+
     // this needs to be called asynchronously
     // otherwise QQuickWidget won't initialize properly
     QMetaObject::invokeMethod(this, this()
     {
-        QVLCTools::restoreWindowPosition( getSettings(), m_window, QSize(600, 420) );
-
         WindowStateHolder::holdOnTop( m_window,  WindowStateHolder::INTERFACE, m_mainCtx->isInterfaceAlwaysOnTop() );
         WindowStateHolder::holdFullscreen( m_window,  WindowStateHolder::INTERFACE, m_window->visibility() == QWindow::FullScreen );
 
@@ -82,9 +85,15 @@
 
     const auto updateMinimumSize = this()
     {
+        if (m_mainCtx->isMinimalView())
+        {
+            m_window->setMinimumSize({128, 16});
+            return;
+        }
+
         int margin = m_mainCtx->windowExtendedMargin() * 2;
         int width = 320 + margin;
-        int height = 300 + margin;
+        int height = 360 + margin;
 
         double intfScaleFactor = m_mainCtx->getIntfScaleFactor();
         int scaledWidth = std::ceil( intfScaleFactor * width );
@@ -94,7 +103,9 @@
     };
     connect( m_mainCtx, &MainCtx::intfScaleFactorChanged, this, updateMinimumSize );
     connect( m_mainCtx, &MainCtx::windowExtendedMarginChanged, this, updateMinimumSize );
+    connect( m_mainCtx, &MainCtx::minimalViewChanged, this, updateMinimumSize );
     m_mainCtx->updateIntfScaleFactor();
+    updateMinimumSize();
 
     m_mainCtx->onWindowVisibilityChanged(m_window->visibility());
     connect( m_window, &QWindow::visibilityChanged,
@@ -138,17 +149,20 @@
 InterfaceWindowHandler::~InterfaceWindowHandler()
 {
     m_window->removeEventFilter(this);
-    WindowStateHolder::holdOnTop( m_window,  WindowStateHolder::INTERFACE, false );
-    WindowStateHolder::holdFullscreen( m_window,  WindowStateHolder::INTERFACE, false );
     /* Save this size */
     QVLCTools::saveWindowPosition(getSettings(), m_window);
+    assert(qApp);
+    if (!qApp->property("isDying").toBool())
+    {
+        // If application is dying, we don't need to adjust the state
+        WindowStateHolder::holdOnTop( m_window,  WindowStateHolder::INTERFACE, false );
+        WindowStateHolder::holdFullscreen( m_window,  WindowStateHolder::INTERFACE, false );
+    }
 }
 
 void InterfaceWindowHandler::updateCSDWindowSettings()
 {
-    m_window->hide(); // some window managers don't like to change frame window hint on visible window
     m_window->setFlag(Qt::FramelessWindowHint, m_mainCtx->useClientSideDecoration());
-    m_window->show();
 }
 
 bool InterfaceWindowHandler::eventFilter(QObject*, QEvent* event)
@@ -231,31 +245,38 @@
     }
     case QEvent::Close:
     {
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+        // Before Qt 6.9.0, `QWindow`'s `wl_surface` gets deleted when `QWindow::hide()` is called.
+        static bool platformIsWayland = () {
+            assert(qGuiApp);
+            return qGuiApp->platformName().startsWith(QLatin1String("wayland"));
+        }();
+
+        if (!platformIsWayland)
+            setInterfaceHiden();
+#else
+        setInterfaceHiden();
+#endif
+
         if (var_InheritBool(p_intf, "qt-close-to-system-tray"))
         {
             if (const QSystemTrayIcon* const sysTrayIcon = m_mainCtx->getSysTray())
             {
                 if (sysTrayIcon->isSystemTrayAvailable() && sysTrayIcon->isVisible())
                 {
-                    setInterfaceHiden();
-                    event->accept();
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+                    if (platformIsWayland)
+                        setInterfaceHiden();
+#endif
+                    event->ignore();
                     return true;
                 }
             }
         }
 
-        bool ret = m_mainCtx->onWindowClose(m_window);
-        if (ret)
-        {
-            /* Accept session quit. Otherwise we break the desktop mamager. */
-            event->accept();
-            return false;
-        }
-        else
-        {
-            event->ignore();
-            return true;
-        }
+        m_mainCtx->onWindowClose(m_window);
+        event->ignore();
+        return true;
     }
     default:
         break;
@@ -354,12 +375,38 @@
 
 void InterfaceWindowHandler::setInterfaceHiden()
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+    // `CompositorWayland` depends on the promise that the window resources are not deleted.
+    // Window's `wl_surface` gets deleted when the window gets hidden before Qt 6.9.0. So,
+    // here we should inhibit hiding the window. Note that intercepting `QEvent::hide` does
+    // not make it possible to inhibit hiding the window.
+    assert(p_intf);
+    assert(p_intf->p_compositor);
+    static bool inhibitHide = intf = p_intf() {
+        assert(qGuiApp);
+        // type() == WaylandCompositor is not used because any video embedding methodology may
+        // depend on window resources:
+        const bool ret = qGuiApp->platformName().startsWith(QLatin1String("wayland")) &&
+                         dynamic_cast<vlc::CompositorVideo*>(intf->p_compositor.get());
+        if (ret)
+            msg_Warn(intf, "In this configuration, the interface window can not get hidden.");
+        return ret;
+    }();
+
+    if (inhibitHide)
+    {
+        // Instead of doing nothing, minimize the window:
+        setInterfaceMinimized();
+        return;
+    }
+#endif
+
     m_window->hide();
 }
 
 void InterfaceWindowHandler::setInterfaceShown()
 {
-    m_window->show();
+    m_window->setVisible(true);
 }
 
 void InterfaceWindowHandler::setInterfaceMinimized()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/interface_window_handler.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/interface_window_handler.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/kwindowsystem_module.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/kwindowsystem_module.cpp Changed

@@ -23,7 +23,7 @@
 
 #include <KWindowEffects>
 
-static bool isEffectAvailable(const WindowEffectsModule::Effect effect)
+static bool isEffectAvailable(const QWindow*, const WindowEffectsModule::Effect effect)
 {
     KWindowEffects::Effect kWindowEffect;
 
@@ -39,9 +39,9 @@
     return KWindowEffects::isEffectAvailable(kWindowEffect);
 }
 
-static void setBlurBehind(QWindow* const window, const bool enable = true)
+static void setBlurBehind(QWindow* const window, const bool enable = true, const QRegion& region = {})
 {
-    KWindowEffects::enableBlurBehind(window, enable, QRegion());
+    KWindowEffects::enableBlurBehind(window, enable, region);
 }
 
 static int Open(vlc_object_t* const p_this)
@@ -54,7 +54,7 @@
     // In that case, simply fail here,
     // so that another potentially compatible
     // module can be loaded instead:
-    if (!isEffectAvailable(WindowEffectsModule::BlurBehind))
+    if (!isEffectAvailable(nullptr, WindowEffectsModule::BlurBehind))
         return VLC_EGENERIC;
 
     const auto obj = reinterpret_cast<WindowEffectsModule*>(p_this);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/mainctx.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/mainctx.cpp Changed

@@ -35,9 +35,8 @@
 #include "compositor.hpp"
 #include "util/renderer_manager.hpp"
 #include "util/csdbuttonmodel.hpp"
-#include "util/workerthreadset.hpp"
 
-#include "widgets/native/customwidgets.hpp"               // qtEventToVLCKey, QVLCStackedWidget
+#include "util/vlchotkeyconverter.hpp"
 #include "util/qt_dirs.hpp"                     // toNativeSeparators
 
 #include "util/color_scheme_model.hpp"
@@ -62,9 +61,10 @@
 #include <QUrl>
 #include <QDate>
 #include <QMimeData>
+#include <QClipboard>
+#include <QInputDialog>
 
 #include <QQmlProperty>
-#include <QQmlContext>
 
 #include <QWindow>
 #include <QScreen>
@@ -251,8 +251,14 @@
         QMetaObject::invokeMethod(m_medialib, &MediaLib::reload, Qt::QueuedConnection);
     }
 
-    m_network_preparser = vlc_preparser_New(VLC_OBJECT(libvlc), 1, 0,
-                                            META_REQUEST_OPTION_PARSE);
+    const struct vlc_preparser_cfg cfg = {
+        struct vlc_preparser_cfg cfg{};
+        cfg.types = VLC_PREPARSER_TYPE_PARSE;
+        cfg.max_parser_threads = 1;
+        cfg.timeout = 0;
+        return cfg;
+    }();
+    m_network_preparser = vlc_preparser_New(VLC_OBJECT(libvlc), &cfg);
 
 #ifdef UPDATE_CHECK
     /* Checking for VLC updates */
@@ -286,12 +292,16 @@
         }
     }
 #endif
+
+    m_threadRunner = new ThreadRunner();
 }
 
 MainCtx::~MainCtx()
 {
     /* Save states */
 
+    m_threadRunner->destroy();
+
     settings->beginGroup("MainWindow");
     settings->setValue( "pl-dock-status", b_playlistDocked );
     settings->setValue( "ShowRemainingTime", m_showRemainingTime );
@@ -416,6 +426,8 @@
     loadFromVLCOption(m_pinOpacity, "qt-fs-opacity", &MainCtx::pinOpacityChanged);
 
     loadFromVLCOption(m_safeArea, "qt-safe-area", &MainCtx::safeAreaChanged);
+
+    loadFromVLCOption(m_mouseHideTimeout, "mouse-hide-timeout", &MainCtx::mouseHideTimeoutChanged);
 }
 
 void MainCtx::loadFromSettingsImpl(const bool callSignals)
@@ -497,18 +509,29 @@
     var_SetInteger(vlc_object_instance(p_intf), "key-pressed", vlckey);
 }
 
+void MainCtx::sendVLCHotkey(int vlcHotkey)
+{
+    var_SetInteger(vlc_object_instance(p_intf), "key-pressed", vlcHotkey);
+}
+
 void MainCtx::updateIntfScaleFactor()
 {
-    m_intfScaleFactor = m_intfUserScaleFactor;
+    auto newValue = m_intfUserScaleFactor;
     if (QWindow* window = p_intf->p_compositor ? p_intf->p_compositor->interfaceMainWindow() : nullptr)
     {
         QScreen* screen = window->screen();
         if (screen)
         {
             qreal dpi = screen->logicalDotsPerInch();
-            m_intfScaleFactor = m_intfUserScaleFactor * dpi / VLC_REFERENCE_SCALE_FACTOR;
+            newValue = m_intfUserScaleFactor * dpi / VLC_REFERENCE_SCALE_FACTOR;
         }
     }
+
+    const int FACTOR_RESOLUTION = 100;
+    if ( static_cast<int>(m_intfScaleFactor * FACTOR_RESOLUTION)
+         == static_cast<int>(newValue * FACTOR_RESOLUTION) ) return;
+
+    m_intfScaleFactor = newValue;
     emit intfScaleFactorChanged();
 }
 
@@ -523,7 +546,7 @@
         return;
 
     m_hasAcrylicSurface = v;
-    emit hasAcrylicSurfaceChanged();
+    emit hasAcrylicSurfaceChanged(v);
 }
 
 void MainCtx::incrementIntfUserScaleFactor(bool increment)
@@ -591,14 +614,9 @@
         m_systray = std::make_unique<VLCSystray>(this);
 }
 
-WorkerThreadSet* MainCtx::workersThreads() const
+ThreadRunner* MainCtx::threadRunner() const
 {
-    if (!m_workersThreads)
-    {
-        m_workersThreads.reset( new WorkerThreadSet );
-    }
-
-    return m_workersThreads.get();
+    return m_threadRunner;
 }
 
 QUrl MainCtx::folderMRL(const QString &fileMRL) const
@@ -694,6 +712,9 @@
 
 void MainCtx::setInterfaceAlwaysOnTop( bool on_top )
 {
+    if (b_interfaceOnTop == on_top)
+        return;
+
     b_interfaceOnTop = on_top;
     emit interfaceAlwaysOnTopChanged(on_top);
 }
@@ -745,6 +766,16 @@
         else if (element.isString())
             // If the element is string, we assume it is already encoded
             decodedUrl = element.toString();
+        else if (element.isVariant())
+        {
+            const QVariant variant = element.toVariant();
+            if (variant.typeId() == QMetaType::QUrl)
+                decodedUrl = variant.toUrl().toString(QUrl::FullyEncoded);
+            else if (variant.typeId() == QMetaType::QString)
+                decodedUrl = variant.toString();
+            else
+                Q_UNREACHABLE();
+        }
         else
             Q_UNREACHABLE(); // Assertion failure in debug builds
         string += decodedUrl + QStringLiteral("\r\n");
@@ -768,7 +799,7 @@
  * Events stuff
  ************************************************************************/
 
-bool MainCtx::onWindowClose( QWindow* )
+void MainCtx::onWindowClose( QWindow* )
 {
     PlaylistController* playlistController = p_intf->p_mainPlaylistController;
     PlayerController* playerController = p_intf->p_mainPlayerController;
@@ -786,12 +817,10 @@
             }
         });
         playlistController->stop();
-        return false;
     }
     else
     {
         emit askToQuit(); /* ask THEDP to quit, so we have a unique method */
-        return true;
     }
 }
 
@@ -825,6 +854,66 @@
     return m_extraInterfaces;
 }
 
+bool MainCtx::pasteFromClipboard()
+{
+    assert(qApp);
+    const QClipboard *const clipboard = qApp->clipboard();
+    if (Q_UNLIKELY(!clipboard))
+        return false;
+    const QMimeData *mimeData = clipboard->mimeData(QClipboard::Selection);
+    if (!mimeData || !mimeData->hasUrls())
+        mimeData = clipboard->mimeData(QClipboard::Clipboard);
+
+    if (Q_UNLIKELY(!mimeData))
+        return false;
+
+    QList<QUrl> urlList = mimeData->urls();
+    QString text = mimeData->text();
+
+    if (urlList.count() > 1 || text.contains('\n'))
+    {
+        // NOTE: The reason that mime data for `text/uri-list` is not used
+        //       directly as the placeholder of the input dialog instead of
+        //       re-constructing is to decode the urls in the list.
+        QString placeholder;
+
+        if (urlList.isEmpty())
+        {
+            placeholder = std::move(text);
+        }
+        else
+        {
+            for (const auto& i : urlList)
+                placeholder += i.toString(QUrl::PrettyDecoded) + '\n';
+            placeholder.chop(1);
+        }
+
+        bool ok = false;
+        const QString ret = QInputDialog::getMultiLineText(nullptr,
+                                                           qtr("Paste from clipboard"),
+                                                           qtr("Do you want to enqueue the following URLs into the playlist?"),
+                                                           placeholder,
+                                                           &ok);
+        if (!ok)
+            return false;
+
+        for (const auto& i : QStringView(ret).split('\n'))
+        {
+            if (i.length() > 0)
+                THEMPL->append(i.trimmed().toString(), false);
+        }
+
+        return true;
+    }
+    else if ((urlList.count() == 1) || mimeData->hasText())
+    {
+        THEDP->openUrlDialog();
+        return true;
+    }
+
+    return false;
+}
+
 /*****************************************************************************
  * PopupMenuCB: callback triggered by the intf-popupmenu playlist variable.
  *  We don't show the menu directly here because we don't want the
@@ -1004,13 +1093,13 @@
     else
         newflags = oldflags & ~Qt::WindowFullScreen;
 
+    window->setProperty("__windowFullScreen", QVariant::fromValue(fullscreenCounter));
+
     if( newflags != oldflags )
     {
         window->setWindowStates( newflags );
     }
 
-    window->setProperty("__windowFullScreen", QVariant::fromValue(fullscreenCounter));
-
     return fullscreenCounter != 0;
 }
 
@@ -1027,21 +1116,30 @@
     else
         onTopCounter &= ~source;
 
-    Qt::WindowStates oldStates = window->windowStates();
-    Qt::WindowFlags oldflags = window->flags();
-    Qt::WindowFlags newflags;
+#ifdef _WIN32
+    if (!window->handle()) // do not call hold on top if there is no platform window
+        return false;
+#endif
 
     if( onTopCounter != 0 )
-        newflags = oldflags | Qt::WindowStaysOnTopHint;
+    {
+#ifdef _WIN32
+        // Qt::WindowStaysOnTopHint is broken on Windows: QTBUG-133034, QTBUG-132522.
+        // Reported to be fixed by Qt 6.9, but needs additional checking if the solution does not interfere with `CSDWin32EventHandler`.
+        SetWindowPos(reinterpret_cast<HWND>(window->winId()), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+#else
+        window->setFlag(Qt::WindowStaysOnTopHint, true);
+#endif
+    }
     else
-        newflags = oldflags & ~Qt::WindowStaysOnTopHint;
-    if( newflags != oldflags )
     {
-
-        window->setFlags( newflags );
-        window->show(); /* necessary to apply window flags */
-        //workaround: removing onTop state might drop fullscreen state
-        window->setWindowStates(oldStates);
+#ifdef _WIN32
+        // Qt::WindowStaysOnTopHint is broken on Windows: QTBUG-133034, QTBUG-132522.
+        // Reported to be fixed by Qt 6.9, but needs additional checking if the solution does not interfere with `CSDWin32EventHandler`.
+        SetWindowPos(reinterpret_cast<HWND>(window->winId()), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+#else
+        window->setFlag(Qt::WindowStaysOnTopHint, false);
+#endif
     }
 
     window->setProperty("__windowOnTop", QVariant::fromValue(onTopCounter));

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/mainctx.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/mainctx.hpp Changed

@@ -62,7 +62,6 @@
 class ControlbarProfileModel;
 class SearchCtx;
 class SortCtx;
-class WorkerThreadSet;
 class VLCSystray;
 class MediaLib;
 class ColorSchemeModel;
@@ -71,6 +70,7 @@
 class UpdateModel;
 #endif
 struct vlc_preparser_t;
+class ThreadRunner;
 
 namespace vlc {
 namespace playlist {
@@ -128,6 +128,7 @@
     Q_PROPERTY(int maxVolume READ maxVolume NOTIFY maxVolumeChanged FINAL)
     Q_PROPERTY(float safeArea READ safeArea NOTIFY safeAreaChanged FINAL)
     Q_PROPERTY(VideoSurfaceProvider* videoSurfaceProvider READ getVideoSurfaceProvider WRITE setVideoSurfaceProvider NOTIFY hasEmbededVideoChanged FINAL)
+    Q_PROPERTY(int mouseHideTimeout READ mouseHideTimeout NOTIFY mouseHideTimeoutChanged FINAL)
 
     Q_PROPERTY(CSDButtonModel *csdButtonModel READ csdButtonModel CONSTANT FINAL)
 
@@ -255,6 +256,26 @@
     VideoSurfaceProvider* getVideoSurfaceProvider() const;
     void setVideoSurfaceProvider(VideoSurfaceProvider* videoSurfaceProvider);
 
+    int mouseHideTimeout() const { return m_mouseHideTimeout; }
+
+    Q_INVOKABLE static inline bool useTopLevelWindowForToolTip() {
+        assert(qGuiApp);
+        if constexpr (QT_VERSION < QT_VERSION_CHECK(6, 8, 0))
+            return false; // Feature is not available
+#ifndef QT_STATIC // We have patched contrib Qt to fix both of the spotted Qt bugs
+        if constexpr (QT_VERSION < QT_VERSION_CHECK(6, 8, 2))
+            return false; // This feature was not tested properly upstream, and often causes crashes (QTBUG-131898, #28919).
+#endif
+        if constexpr (QT_VERSION < QT_VERSION_CHECK(6, 9, 1))
+        {
+            if (qGuiApp->platformName().startsWith(QLatin1String("wayland")))
+                return false; // QTBUG-135158
+        }
+        return true;
+    }
+    
+    Q_INVOKABLE bool backdropBlurRequested() const { return var_InheritBool(p_intf, "qt-backdrop-blur"); }
+
     Q_INVOKABLE static inline void setCursor(Qt::CursorShape cursor) { QApplication::setOverrideCursor(QCursor(cursor)); }
     Q_INVOKABLE static inline void restoreCursor(void) { QApplication::restoreOverrideCursor(); }
 
@@ -276,11 +297,48 @@
 
     Q_INVOKABLE QJSValue urlListToMimeData(const QJSValue& array);
 
+    Q_INVOKABLE static void setFiltersChildMouseEvents(QQuickItem *item, bool enable)
+    {
+        assert(item);
+        item->setFiltersChildMouseEvents(enable);
+    }
+
+    Q_INVOKABLE qreal effectiveDevicePixelRatio(const QQuickWindow* window) {
+        if (window)
+            return window->effectiveDevicePixelRatio();
+        else
+        {
+            // This is useful when item no longer has window when getting removed from the scene,
+            // which happens when the view changes. We should return the same value so that the
+            // images are not loaded just before getting destroyed due to source size change.
+            // Different windows have the same device pixel ratio, so this should not be a
+            // problem. At the same time, don't use `QGuiApplication::devicePixelRatio()` as
+            // it is not valid on Wayland and we prefer to return 0.0 rather than an intermediate
+            // or invalid value here to intent not to load an image just to discard them afterwards.
+            const auto window = intfMainWindow();
+            const auto quickWindow = qobject_cast<QQuickWindow*>(window);
+            if (quickWindow)
+                return quickWindow->effectiveDevicePixelRatio();
+            else if (window)
+                return window->devicePixelRatio();
+        }
+
+        // Return 0.0 to indicate not to load the image, as we know that this is an intermediate
+        // situation and we don't want to load image just to discard them after there is a window.
+        // QQuickImage still loads image with (0, 0) source size, but at least we indicate our
+        // intention and this can be handled manually in the future if necessary. Currently,
+        // intfMainWindow() is always available, so in only rare cases this would return 0.0.
+        return 0.0;
+    }
+
+    Q_INVOKABLE virtual bool platformHandlesResizeWithCSD() const { return false; };
+    Q_INVOKABLE virtual bool platformHandlesTitleBarButtonsWithCSD() const { return false; };
+    Q_INVOKABLE virtual bool platformHandlesShadowsWithCSD() const { return false; };
+
     /**
      * @brief ask for the application to terminate
-     * @return true if the application can be close right away, false if it will be delayed
      */
-    bool onWindowClose(QWindow* );
+    void onWindowClose(QWindow* );
 
     bool acrylicActive() const;
     void setAcrylicActive(bool newAcrylicActive);
@@ -302,7 +360,7 @@
 
     Q_INVOKABLE bool useXmasCone() const;
 
-    WorkerThreadSet *workersThreads() const;
+    ThreadRunner* threadRunner() const;
 
     Q_INVOKABLE QUrl folderMRL(const QString &fileMRL) const;
     Q_INVOKABLE QUrl folderMRL(const QUrl &fileMRL) const;
@@ -382,6 +440,8 @@
 
     float m_safeArea = 0.0;
 
+    int m_mouseHideTimeout = 1000;
+
     OsType m_osName;
     int m_osVersion;
 
@@ -399,7 +459,7 @@
     mutable std::unique_ptr<UpdateModel> m_updateModel;
 #endif
 
-    mutable std::unique_ptr<WorkerThreadSet> m_workersThreads;
+    ThreadRunner* m_threadRunner = nullptr;
 
 public slots:
     void toggleToolbarMenu();
@@ -427,6 +487,7 @@
     void setMinimalView(bool);
 
     void sendHotkey(Qt::Key key, Qt::KeyboardModifiers modifiers );
+    void sendVLCHotkey(int vlcHotkey);
 
     void emitBoss();
     void emitRaise();
@@ -435,6 +496,8 @@
     virtual void reloadPrefs();
     VLCVarChoiceModel* getExtraInterfaces();
 
+    bool pasteFromClipboard();
+
 protected slots:
     void onInputChanged( bool );
 
@@ -475,7 +538,7 @@
     void pinVideoControlsChanged();
     void pinOpacityChanged();
 
-    void hasAcrylicSurfaceChanged();
+    void hasAcrylicSurfaceChanged(bool);
 
     void minimalViewChanged();
 
@@ -491,6 +554,8 @@
 
     void safeAreaChanged();
 
+    void mouseHideTimeoutChanged();
+
     void navBoxToggled();
 
     void bgConeToggled();

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/mainctx_win32.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/mainctx_win32.cpp Changed

@@ -40,10 +40,6 @@
 
 #include <QWindow>
 
-#ifndef QT_GUI_PRIVATE
-#warning "qplatformnativeinterface.h header is required for MainCtxWin32"
-#endif
-#include <QtGui/qpa/qplatformnativeinterface.h>
 #include <dwmapi.h>
 
 #define WM_APPCOMMAND 0x0319
@@ -108,141 +104,77 @@
 
 namespace  {
 
-HWND WinId( QWindow *windowHandle )
+HWND WinId( const QWindow *window )
 {
-    if( windowHandle && windowHandle->handle() )
-        return static_cast<HWND>(QGuiApplication::platformNativeInterface()->
-            nativeResourceForWindow("handle", windowHandle));
-    else
-        return 0;
-}
-
-
-bool isWindowFixedSize(const QWindow *window)
-{
-    if (window->flags() & Qt::MSWindowsFixedSizeDialogHint)
-        return true;
-
-    const auto minSize = window->minimumSize();
-    const auto maxSize = window->maximumSize();
-
-    return minSize.isValid() && maxSize.isValid() && minSize == maxSize;
+    assert(window);
+    if (!window->handle())
+        return NULL;
+    return reinterpret_cast<HWND>(window->winId());
 }
 
-
-class WinSystemMenuButton : public SystemMenuButton
+class CSDWin32EventHandler : public QObject, public QAbstractNativeEventFilter
 {
 public:
-    WinSystemMenuButton(QWindow *window, QObject *parent)
-        : SystemMenuButton {parent}
+    CSDWin32EventHandler(MainCtx* mainctx, QWindow *window, QObject *parent)
+        : QObject {parent}
+        , m_useClientSideDecoration {mainctx->useClientSideDecoration()}
         , m_window {window}
+        , m_buttonmodel {mainctx->csdButtonModel()}
+        , m_mainCtx(mainctx)
+        , m_platformHandlesResize(m_mainCtx->platformHandlesResizeWithCSD())
     {
-        connect(this, &CSDButton::clicked, this, &WinSystemMenuButton::handleClick);
-        connect(this, &CSDButton::doubleClicked, this, &WinSystemMenuButton::handleDoubleClick);
-    }
-
-    void showSystemMenu(const QPoint &windowpos) override
-    {
-        HWND hwnd = (HWND)m_window->winId();
-        HMENU hmenu = ::GetSystemMenu(hwnd, FALSE);
-        if (!hmenu)
-            return;
-
-        // Tweak the menu items according to the current window status.
-        const auto winState = m_window->windowStates();
-        const bool maxOrFull = (winState.testFlag(Qt::WindowMaximized) || winState.testFlag(Qt::WindowFullScreen));
-        const bool fixedSize = isWindowFixedSize(m_window);
-
-        EnableMenuItem(hmenu, SC_MOVE, (MF_BYCOMMAND | (!maxOrFull ? MFS_ENABLED : MFS_DISABLED)));
-        EnableMenuItem(hmenu, SC_SIZE, (MF_BYCOMMAND | ((!maxOrFull && !fixedSize) ? MFS_ENABLED : MFS_DISABLED)));
-
-        EnableMenuItem(hmenu, SC_RESTORE, (MF_BYCOMMAND | ((maxOrFull && !fixedSize) ? MFS_ENABLED : MFS_DISABLED)));
-        EnableMenuItem(hmenu, SC_MINIMIZE, (MF_BYCOMMAND | MFS_ENABLED));
-        EnableMenuItem(hmenu, SC_MAXIMIZE, (MF_BYCOMMAND | ((!maxOrFull && !fixedSize) ? MFS_ENABLED : MFS_DISABLED)));
-        EnableMenuItem(hmenu, SC_CLOSE, (MF_BYCOMMAND | MFS_ENABLED));
+        assert(m_mainCtx);
 
-        // map pos to screen points and convert according to device DPR, required on HI-DPI displays
-        const auto screenPoints = m_window->mapToGlobal(windowpos) * m_window->devicePixelRatio();
+        // CSDWin32EventHandler does not support Qt::FramelessWindowHint:
+        m_window->setFlag(Qt::FramelessWindowHint, false);
 
-        const auto alignment = (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN);
-
-        // show menu
-        emit systemMenuVisibilityChanged(true);
-
-        const int action = TrackPopupMenu(hmenu, (TPM_RETURNCMD | alignment)
-                                          , screenPoints.x(), screenPoints.y()
-                                          , 0, hwnd, nullptr);
-
-        // unlike native system menu which sends WM_SYSCOMMAND, TrackPopupMenu sends WM_COMMAND
-        // imitate native system menu by sending the action manually as WM_SYSCOMMAND
-        PostMessageW(hwnd, WM_SYSCOMMAND, action, 0);
-
-        emit systemMenuVisibilityChanged(false);
+        QApplication::instance()->installNativeEventFilter(this);
+        updateCSDSettings();
     }
 
-private:
-    // target window
-    QWindow *m_window = {};
-
-    // used to reject click() incase a doubleClick() is followed
-    bool m_triggerSystemMenu = false;
+    ~CSDWin32EventHandler()
+    {
+        QApplication::instance()->removeNativeEventFilter(this);
+    }
 
-    void handleClick()
+    static int getSystemMetricsForDpi(int nIndex, UINT dpi)
     {
-        // delay the show of sytem menu to check if this 'click' is
-        // a double click, 'm_triggerSystemMenu' is used to reject the
-        // queued 'showSystemMenu' call in case this is a double click
+        typedef int (WINAPI *GetSystemMetricsForDpiFunc)(int, UINT);
+        static GetSystemMetricsForDpiFunc getSystemMetricsForDpi = () {
+            const auto user32dll = LoadLibraryEx(TEXT("user32.dll"), nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
+            return reinterpret_cast<GetSystemMetricsForDpiFunc>(GetProcAddress(user32dll, "GetSystemMetricsForDpi"));
+        }();
 
-        m_triggerSystemMenu = true;
-        QTimer::singleShot(100, this, this()
-        {
-            if (!m_triggerSystemMenu)
-                return;
+        if (getSystemMetricsForDpi)
+            return getSystemMetricsForDpi(nIndex, dpi);
 
-            // show system menu 'margin' below the rect
-            constexpr QPoint margin {0, 4};
-            showSystemMenu(rect().bottomLeft() + margin);
-        });
+        return GetSystemMetrics(nIndex);
     }
 
-    void handleDoubleClick()
+    static int getSystemMetricsForWindow(int nIndex, const QWindow* window)
     {
-        // reject any queued showSystemMenu call
-        m_triggerSystemMenu = false;
+        assert(window);
 
-        m_window->close();
-    }
-};
+        typedef UINT (WINAPI *GetDpiForWindowFunc)(HWND);
+        static GetDpiForWindowFunc getDpiForWindow = () {
+            const auto user32dll = LoadLibraryEx(TEXT("user32.dll"), nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
+            return reinterpret_cast<GetDpiForWindowFunc>(GetProcAddress(user32dll, "GetDpiForWindow"));
+        }();
 
-class CSDWin32EventHandler : public QObject, public QAbstractNativeEventFilter
-{
-public:
-    CSDWin32EventHandler(MainCtx* mainctx, QWindow *window, QObject *parent)
-        : QObject {parent}
-        , m_useClientSideDecoration {mainctx->useClientSideDecoration()}
-        , m_window {window}
-        , m_buttonmodel {mainctx->csdButtonModel()}
-    {
-        QApplication::instance()->installNativeEventFilter(this);
-        updateCSDSettings();
+        if (getDpiForWindow)
+            return getSystemMetricsForDpi(nIndex, getDpiForWindow(WinId(window)));
+
+        return GetSystemMetrics(nIndex);
     }
 
     static int resizeBorderWidth(QWindow *window)
     {
-        const int result = GetSystemMetrics(SM_CXSIZEFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER);
-        if (result > 0)
-            return qRound(static_cast<qreal>(result) / window->devicePixelRatio());
-        else
-            return qRound(static_cast<qreal>(8) * window->devicePixelRatio());
+        return getSystemMetricsForWindow(SM_CXSIZEFRAME, window) + getSystemMetricsForWindow(SM_CXPADDEDBORDER, window);
     }
 
     static int resizeBorderHeight(QWindow *window)
     {
-        const int result = GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER);
-        if (result > 0)
-            return qRound(static_cast<qreal>(result) / window->devicePixelRatio());
-        else
-            return qRound(static_cast<qreal>(8) * window->devicePixelRatio());
+        return getSystemMetricsForWindow(SM_CYSIZEFRAME, window) + getSystemMetricsForWindow(SM_CXPADDEDBORDER, window);
     }
 
     bool nativeEventFilter(const QByteArray &, void *message, qintptr *result) override
@@ -297,6 +229,24 @@
                 clientRect->right -= rbw;
                 nonClientAreaExists = true;
             }
+            else if (m_platformHandlesResize && !IsZoomed(msg->hwnd))
+            {
+                // Resize outside client area:
+
+                // Before entering to fullscreen, Windows sends a WM_NCCALCSIZE message to determine
+                // the window geometry for fullscreen. In this case, we should not make an adjustment
+                // so that the window gets placed appropriately. At the same time, when getting
+                // restored from full screen, we should make this adjustment (state is still fullscreen):
+                if (m_window->property("__windowFullScreen").toInt() == 0) // not about to enter full screen OR about to restore from full screen OR stateless window
+                {
+                    // Do not adjust top, top is resized within the caption area. This is the behavior of SSD as well.
+                    const int resizeWidth = resizeBorderWidth(m_window);
+                    clientRect->left += resizeWidth;
+                    clientRect->right -= resizeWidth;
+                    clientRect->bottom -= resizeBorderHeight(m_window);
+                    nonClientAreaExists = true;
+                }
+            }
 
             *result = nonClientAreaExists ? 0 : WVR_REDRAW;
             return true;
@@ -325,19 +275,57 @@
             // Map the point to client coordinates.
             ::MapWindowPoints(nullptr, msg->hwnd, &point, 1);
 
-            // excluse resize handle area
-            if ((m_window->windowState() != Qt::WindowFullScreen)
-                && (point.y < resizeBorderHeight(m_window)
-                    || point.x > (m_window->width() * m_window->devicePixelRatio() - resizeBorderWidth(m_window))))
-                return false;
-
             const double scaleFactor = m_window->devicePixelRatio();
 
             //divide by scale factor as buttons coordinates will be in dpr
             const QPoint qtPoint {static_cast<int>(point.x / scaleFactor), static_cast<int>(point.y / scaleFactor)};
             auto button = overlappingButton(qtPoint);
             if (!button)
+            {
+                if (!m_platformHandlesResize)
+                    return false;
+
+                if (!IsZoomed(msg->hwnd) && (m_window->windowState() != Qt::WindowFullScreen))
+                {
+                    // Top is resized within the caption area (even though it is client area), but still
+                    // handled by the platform. This is also the behavior with SSD and we can not have
+                    // the resize handle outside the window frame for the top side, because the top side
+                    // does not have transparent area but rather system caption is shown instead:
+
+                    int resizeHandleSize;
+                    const double intfScaleFactor = m_mainCtx->getIntfScaleFactor();
+                    const int unscaledResizeHandleSize = resizeBorderHeight(m_window);
+                    if (intfScaleFactor < 1.0)
+                    {
+                        // Make the top resize handle smaller if necessary, but not bigger (as the other edge
+                        // handles can't be made bigger), if the interface scale factor is small so that the
+                        // buttons in the caption area can be clicked more comfortably. This does not apply
+                        // to the minimize/maximize/close buttons, in that case resize handle should be the
+                        // minimal size regardless of the interface scale:
+                        resizeHandleSize = std::max<int>(2, unscaledResizeHandleSize * m_mainCtx->getIntfScaleFactor());
+                    }
+                    else
+                        resizeHandleSize = unscaledResizeHandleSize;
+
+                    if (point.y >= 0 && point.y <= resizeHandleSize)
+                    {
+                        const auto windowWidth = m_window->width() * m_window->devicePixelRatio();
+                        if (point.x >= -unscaledResizeHandleSize && point.x <= resizeHandleSize)
+                            *result = HTTOPLEFT;
+                        else if ((point.x >= windowWidth - resizeHandleSize) && (point.x <= windowWidth + unscaledResizeHandleSize))
+                            *result = HTTOPRIGHT;
+                        else if ((point.x > resizeHandleSize) && (point.x < windowWidth - resizeHandleSize))
+                            *result = HTTOP;
+                        else
+                            return false;
+
+                        // The rest (left, right, bottom) is handled by the system outside the client area
+                        // Only top resize should be within the client area, as that area corresponds to the caption.
+                        return true;
+                    }
+                }
                 return false;
+            }
 
             switch (button->type())
             {
@@ -366,19 +354,13 @@
             switch ( msg->wParam )
             {
             case HTCLOSE:
-                setHovered(CSDButton::Close);
-                setHovered(CSDButton::Minimize, false);
-                setHovered(CSDButton::MaximizeRestore, false);
+                hoverExclusive(CSDButton::Close);
                 break;
             case HTMINBUTTON:
-                setHovered(CSDButton::Minimize);
-                setHovered(CSDButton::Close, false);
-                setHovered(CSDButton::MaximizeRestore, false);
+                hoverExclusive(CSDButton::Minimize);
                 break;
             case HTMAXBUTTON:
-                setHovered(CSDButton::MaximizeRestore);
-                setHovered(CSDButton::Close, false);
-                setHovered(CSDButton::Minimize, false);
+                hoverExclusive(CSDButton::MaximizeRestore);
                 break;
             default:
                 setAllUnhovered();
@@ -411,54 +393,24 @@
         case WM_NCLBUTTONUP:
         case WM_NCLBUTTONDOWN:
         {
-            void (CSDButton::*function)();
-            void (CSDButton::*functionForOthers)() = nullptr;
-
-            if (msg->message == WM_NCLBUTTONDOWN)
-                function = &CSDButton::externalPress;
-            else if (msg->message == WM_NCLBUTTONUP)
-            {
-                function = &CSDButton::externalRelease;
-                functionForOthers = &CSDButton::unsetExternalPressed;
-            }
-            else
-                Q_UNREACHABLE();
+            const bool pressed = (msg->message == WM_NCLBUTTONDOWN);
 
             // manually trigger button here, UI will never get click
             // signal because we have captured the mouse in non client area
             switch ( msg->wParam )
             {
             case HTCLOSE:
-                trigger(CSDButton::Close, function);
-                if (functionForOthers)
-                {
-                    trigger(CSDButton::Minimize, functionForOthers);
-                    trigger(CSDButton::MaximizeRestore, functionForOthers);
-                }
+                handleButtonActionExclusive(CSDButton::Close, pressed);
                 break;
             case HTMINBUTTON:
-                trigger(CSDButton::Minimize, function);
-                if (functionForOthers)
-                {
-                    trigger(CSDButton::Close, functionForOthers);
-                    trigger(CSDButton::MaximizeRestore, functionForOthers);
-                }
+                handleButtonActionExclusive(CSDButton::Minimize, pressed);
                 break;
             case HTMAXBUTTON:
-                trigger(CSDButton::MaximizeRestore, function);
-                if (functionForOthers)
-                {
-                    trigger(CSDButton::Close, functionForOthers);
-                    trigger(CSDButton::Minimize, functionForOthers);
-                }
+                handleButtonActionExclusive(CSDButton::MaximizeRestore, pressed);
                 break;
             default:
-                if (functionForOthers)
-                {
-                    trigger(CSDButton::Close, functionForOthers);
-                    trigger(CSDButton::Minimize, functionForOthers);
-                    trigger(CSDButton::MaximizeRestore, functionForOthers);
-                }
+                resetPressedState();
+                return false;
             }
 
 
@@ -492,6 +444,12 @@
 private:
     void updateClientFrame()
     {
+        // DwmExtendFrameIntoClientArea() is not necessary when WS_POPUP is not
+        // used and platform handles resize (outside), where there is non-client
+        // area
+        if (m_platformHandlesResize)
+            return;
+
         auto hwnd = (HWND)m_window->winId();
 
         MARGINS margin {};
@@ -503,7 +461,7 @@
         // that somehow breaks snaplayouts menu with WS_CAPTION style ^_____^
         //
         // warning2: if you set negative margin, the window will start painting
-        // default CSD button underneath the qml layer, you won't be able to see
+        // server-side buttons underneath the qml layer, you won't be able to see
         // it but those will capture all your CSD events.
         margin.cxLeftWidth = (m_useClientSideDecoration ? 1 : 0);
 
@@ -527,50 +485,86 @@
 
     CSDButton *overlappingButton(const QPoint point)
     {
-        for (auto button : m_buttonmodel->windowCSDButtons())
+        const auto& buttons = m_buttonmodel->windowCSDButtons();
+        const auto it = std::find_if(buttons.begin(), buttons.end(), &point(const auto& button)
         {
-            if (button->rect().contains(point))
-                return button;
-        }
-        return nullptr;
+            QRect rect = button->rect();
+            rect.setY(rect.y() + 2); // leave a small gap for top resize which is always within the caption area
+            if (rect.contains(point))
+                return true;
+            return false;
+        });
+        if (it == buttons.end())
+            return nullptr;
+
+        return *it;
     }
 
-    void setHovered(CSDButton::ButtonType type, bool hovered = true)
+    void hoverExclusive(CSDButton::ButtonType type)
     {
-        for (auto button : m_buttonmodel->windowCSDButtons()) {
-            if (button->type() == type) {
-                button->setShowHovered(hovered);
-                return ;
-            }
-        }
+        if (Q_UNLIKELY(!qApp) || qApp->property("isDying").toBool())
+            return;
 
-        vlc_assert_unreachable();
+        const auto& buttons = m_buttonmodel->windowCSDButtons();
+        std::for_each(buttons.begin(), buttons.end(), type(const auto& button)
+        {
+            button->setShowHovered(button->type() == type);
+        });
     }
 
-    void trigger(CSDButton::ButtonType type, void (CSDButton::*function)())
+    void handleButtonActionExclusive(CSDButton::ButtonType type, bool pressed)
     {
-        for (auto button : m_buttonmodel->windowCSDButtons()) {
-            if (button->type() == type) {
-                (button->*function)();
-                return ;
+        if (Q_UNLIKELY(!qApp) || qApp->property("isDying").toBool())
+            return;
+
+        const auto& buttons = m_buttonmodel->windowCSDButtons();
+        std::for_each(buttons.begin(), buttons.end(), type, pressed(const auto& button)
+        {
+            if (pressed)
+            {
+                if (button->type() == type)
+                    button->externalPress();
             }
-        }
+            else
+            {
+                if (button->type() == type)
+                    button->externalRelease();
+                else
+                    button->unsetExternalPressed();
+            }
+        });
+    }
 
-        vlc_assert_unreachable();
+    void resetPressedState()
+    {
+        if (Q_UNLIKELY(!qApp) || qApp->property("isDying").toBool())
+            return;
+
+        const auto& buttons = m_buttonmodel->windowCSDButtons();
+        std::for_each(buttons.begin(), buttons.end(), (const auto& button)
+        {
+            button->unsetExternalPressed();
+        });
     }
 
     void setAllUnhovered()
     {
-        for (auto button : m_buttonmodel->windowCSDButtons())
+        if (Q_UNLIKELY(!qApp) || qApp->property("isDying").toBool())
+            return;
+
+        const auto& buttons = m_buttonmodel->windowCSDButtons();
+        std::for_each(buttons.begin(), buttons.end(), (const auto& button)
         {
             button->setShowHovered(false);
-        }
+        });
     }
 
     bool m_useClientSideDecoration;
     QWindow *m_window;
     CSDButtonModel *m_buttonmodel;
     bool m_trackingMouse = false;
+    MainCtx *m_mainCtx = nullptr;
+    const bool m_platformHandlesResize;
 };
 
 }
@@ -674,17 +668,17 @@
     thbButtons0.dwMask = dwMask;
     thbButtons0.iId = 0;
     thbButtons0.iBitmap = 0;
-    thbButtons0.dwFlags = THEMPL->count() > 1 ? THBF_ENABLED : THBF_HIDDEN;
+    thbButtons0.dwFlags = THEMPL->hasPrev() ? THBF_ENABLED : THBF_DISABLED;
 
     thbButtons1.dwMask = dwMask;
     thbButtons1.iId = 1;
     thbButtons1.iBitmap = 2;
-    thbButtons1.dwFlags = THEMPL->count() > 0 ? THBF_ENABLED : THBF_HIDDEN;
+    thbButtons1.dwFlags = THEMPL->count() > 0 ? THBF_ENABLED : THBF_DISABLED;
 
     thbButtons2.dwMask = dwMask;
     thbButtons2.iId = 2;
     thbButtons2.iBitmap = 3;
-    thbButtons2.dwFlags = THEMPL->count() > 1 ? THBF_ENABLED : THBF_HIDDEN;
+    thbButtons2.dwFlags = THEMPL->hasNext() ? THBF_ENABLED : THBF_DISABLED;
 
     hr = p_taskbl->ThumbBarSetImageList( winId, himl );
     if( FAILED(hr) )
@@ -701,8 +695,12 @@
              this, &WinTaskbarWidget::changeThumbbarButtons);
     connect( THEMPL, &vlc::playlist::PlaylistController::countChanged,
             this, &WinTaskbarWidget::playlistItemCountChanged );
+    connect( THEMPL, &vlc::playlist::PlaylistController::hasPrevChanged,
+            this, &WinTaskbarWidget::changeThumbbarButtons );
+    connect( THEMPL, &vlc::playlist::PlaylistController::hasNextChanged,
+            this, &WinTaskbarWidget::changeThumbbarButtons );
     if( THEMIM->getPlayingState() == PlayerController::PLAYING_STATE_PLAYING )
-        changeThumbbarButtons( THEMIM->getPlayingState() );
+        changeThumbbarButtons( );
 }
 
 bool WinTaskbarWidget::nativeEventFilter(const QByteArray &, void *message, qintptr* /* result */)
@@ -742,16 +740,16 @@
 
 void WinTaskbarWidget::playlistItemCountChanged( size_t  )
 {
-    changeThumbbarButtons( THEMIM->getPlayingState() );
+    changeThumbbarButtons( );
 }
 
 void WinTaskbarWidget::onVideoFullscreenChanged( bool fs )
 {
     if( !fs )
-        changeThumbbarButtons( THEMIM->getPlayingState() );
+        changeThumbbarButtons( );
 }
 
-void WinTaskbarWidget::changeThumbbarButtons( PlayerController::PlayingState i_status )
+void WinTaskbarWidget::changeThumbbarButtons( )
 {
     if( p_taskbl == NULL )
         return;
@@ -765,7 +763,7 @@
     thbButtons0.dwMask = dwMask;
     thbButtons0.iId = 0;
     thbButtons0.iBitmap = 0;
-    thbButtons0.dwFlags = THEMPL->count() > 1 ? THBF_ENABLED : THBF_HIDDEN;
+    thbButtons0.dwFlags = THEMPL->hasPrev() ? THBF_ENABLED : THBF_DISABLED;
 
     //play/pause
     thbButtons1.dwMask = dwMask;
@@ -776,9 +774,9 @@
     thbButtons2.dwMask = dwMask;
     thbButtons2.iId = 2;
     thbButtons2.iBitmap = 3;
-    thbButtons2.dwFlags = THEMPL->count() > 1 ? THBF_ENABLED : THBF_HIDDEN;
+    thbButtons2.dwFlags = THEMPL->hasNext() ? THBF_ENABLED : THBF_DISABLED;
 
-    switch( i_status )
+    switch( THEMIM->getPlayingState() )
     {
         case PlayerController::PLAYING_STATE_PLAYING:
             {
@@ -846,8 +844,14 @@
 
 InterfaceWindowHandlerWin32::InterfaceWindowHandlerWin32(qt_intf_t *_p_intf, MainCtx* mainCtx, QWindow* window, QObject *parent)
     : InterfaceWindowHandler(_p_intf, mainCtx, window, parent)
-    , m_CSDWindowEventHandler(new CSDWin32EventHandler(mainCtx, window, window))
 {
+    assert(mainCtx);
+    if (mainCtx->platformHandlesResizeWithCSD() || mainCtx->platformHandlesShadowsWithCSD())
+    {
+        assert(mainCtx->platformHandlesResizeWithCSD() && mainCtx->platformHandlesShadowsWithCSD());
+        m_CSDWindowEventHandler = new CSDWin32EventHandler(mainCtx, window, window);
+    }
+
     auto mainCtxWin32 = qobject_cast<MainCtxWin32*>(mainCtx);
     assert(mainCtxWin32);
     m_disableVolumeKeys = mainCtxWin32->getDisableVolumeKeys();
@@ -855,9 +859,6 @@
         m_disableVolumeKeys = disable;
     });
 
-    auto systemMenuButton = std::make_shared<WinSystemMenuButton>(mainCtx->intfMainWindow(), nullptr);
-    mainCtx->csdButtonModel()->setSystemMenuButton(systemMenuButton);
-
     QApplication::instance()->installNativeEventFilter(this);
 }
 
@@ -1038,5 +1039,8 @@
 
 void InterfaceWindowHandlerWin32::updateCSDWindowSettings()
 {
-    static_cast<CSDWin32EventHandler *>(m_CSDWindowEventHandler)->setUseClientSideDecoration(m_mainCtx->useClientSideDecoration());
+    if (m_CSDWindowEventHandler)
+        static_cast<CSDWin32EventHandler *>(m_CSDWindowEventHandler)->setUseClientSideDecoration(m_mainCtx->useClientSideDecoration());
+    else
+        InterfaceWindowHandler::updateCSDWindowSettings();
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/mainctx_win32.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/mainctx_win32.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/mainui.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/mainui.cpp Changed

@@ -33,6 +33,7 @@
 #include "playlist/playlist_model.hpp"
 #include "playlist/playlist_controller.hpp"
 
+#include "util/csdmenu.hpp"
 #include "util/item_key_event_filter.hpp"
 #include "util/imageluminanceextractor.hpp"
 #include "util/keyhelper.hpp"
@@ -45,21 +46,23 @@
 #include "util/csdbuttonmodel.hpp"
 #include "util/vlctick.hpp"
 #include "util/list_selection_model.hpp"
+#include "util/ui_notifier.hpp"
 
 #include "dialogs/help/aboutmodel.hpp"
 #include "dialogs/dialogs_provider.hpp"
 #include "dialogs/dialogs/dialogmodel.hpp"
+#include "util/vlchotkeyconverter.hpp"
 
 #include "network/networkmediamodel.hpp"
 #include "network/networkdevicemodel.hpp"
 #include "network/networksourcesmodel.hpp"
-#include "network/servicesdiscoverymodel.hpp"
+#include "network/addonsmodel.hpp"
 #include "network/standardpathmodel.hpp"
 
 #include "menus/qml_menu_wrapper.hpp"
 
+#include "widgets/native/textureprovideritem.hpp"
 #include "widgets/native/csdthemeimage.hpp"
-#include "widgets/native/roundimage.hpp"
 #include "widgets/native/navigation_attached.hpp"
 #include "widgets/native/viewblockingrectangle.hpp"
 #if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
@@ -98,9 +101,6 @@
 
 bool MainUI::setup(QQmlEngine* engine)
 {
-    engine->setOutputWarningsToStandardError(false);
-    connect(engine, &QQmlEngine::warnings, this, &MainUI::onQmlWarning);
-
     if (m_mainCtx->hasMediaLibrary())
     {
         engine->addImageProvider(MLCustomCover::providerId, new MLCustomCover(m_mainCtx->getMediaLibrary()));
@@ -172,6 +172,8 @@
         qmlRegisterSingletonInstance<MainCtx>(uri, versionMajor, versionMinor, "MainCtx", m_mainCtx);
         qmlRegisterUncreatableType<SearchCtx>(uri, versionMajor, versionMinor, "SearchCtx", "");
         qmlRegisterUncreatableType<SortCtx>(uri, versionMajor, versionMinor, "SortCtx", "");
+        qmlRegisterUncreatableType<UINotifier>(uri, versionMajor, versionMinor, "UINotifier", "");
+        qmlRegisterSingletonInstance<UINotifier>(uri, versionMajor, versionMinor, "UINotifier", new UINotifier(m_mainCtx, m_mainCtx));
         qmlRegisterSingletonInstance<NavigationHistory>(uri, versionMajor, versionMinor, "History", new NavigationHistory(this));
         qmlRegisterUncreatableType<QAbstractItemModel>(uri, versionMajor, versionMinor, "QtAbstractItemModel", "");
         qmlRegisterUncreatableType<QWindow>(uri, versionMajor, versionMinor, "QtWindow", "");
@@ -182,8 +184,8 @@
         qmlRegisterUncreatableType<VLCVarChoiceModel>(uri, versionMajor, versionMinor, "VLCVarChoiceModel", "generic variable with choice model" );
         qmlRegisterUncreatableType<CSDButton>(uri, versionMajor, versionMinor, "CSDButton", "");
         qmlRegisterUncreatableType<CSDButtonModel>(uri, versionMajor, versionMinor, "CSDButtonModel", "has CSD buttons and provides for communicating CSD events between UI and backend");
+        qmlRegisterTypesAndRevisions<CSDMenu>( uri, versionMajor);
         qmlRegisterUncreatableType<NavigationAttached>( uri, versionMajor, versionMinor, "Navigation", "Navigation is only available via attached properties");
-
         qmlRegisterModule(uri, versionMajor, versionMinor);
         qmlProtectModule(uri, versionMajor);
     }
@@ -292,7 +294,7 @@
         qmlRegisterType<NetworkMediaModel>( uri, versionMajor, versionMinor, "NetworkMediaModel");
         qmlRegisterType<NetworkDeviceModel>( uri, versionMajor, versionMinor, "NetworkDeviceModel");
         qmlRegisterType<NetworkSourcesModel>( uri, versionMajor, versionMinor, "NetworkSourcesModel");
-        qmlRegisterType<ServicesDiscoveryModel>( uri, versionMajor, versionMinor, "ServicesDiscoveryModel");
+        qmlRegisterType<AddonsModel>( uri, versionMajor, versionMinor, "ServicesDiscoveryModel");
         qmlRegisterType<StandardPathModel>( uri, versionMajor, versionMinor, "StandardPathModel");
         qmlRegisterType<MLFoldersModel>( uri, versionMajor, versionMinor, "MLFolderModel");
 
@@ -330,6 +332,7 @@
         qmlRegisterSingletonInstance<SVGColorImage>(uri, versionMajor, versionMinor, "SVGColorImage", new SVGColorImage(this));
         qmlRegisterSingletonInstance<VLCAccessImage>(uri, versionMajor, versionMinor, "VLCAccessImage", new VLCAccessImage(this));
         qmlRegisterType<DelayEstimator>( uri, versionMajor, versionMinor, "DelayEstimator" );
+        qmlRegisterTypesAndRevisions<WheelToVLCConverter>( uri, versionMajor );
 
         qmlRegisterType<ImageLuminanceExtractor>( uri, versionMajor, versionMinor, "ImageLuminanceExtractor");
 
@@ -348,9 +351,9 @@
         const int versionMinor = 0;
 
         // @uri VLC.Widgets
-        qmlRegisterType<RoundImage>( uri, versionMajor, versionMinor, "RoundImage" );
         qmlRegisterType<CSDThemeImage>(uri, versionMajor, versionMinor, "CSDThemeImage");
         qmlRegisterType<ViewBlockingRectangle>( uri, versionMajor, versionMinor, "ViewBlockingRectangle" );
+        qmlRegisterType<TextureProviderItem>( uri, versionMajor, versionMinor, "TextureProviderItem" );
 
         qmlRegisterModule(uri, versionMajor, versionMinor);
         qmlProtectModule(uri, versionMajor);
@@ -384,7 +387,7 @@
         qmlRegisterType<NetworkMediaModel>( uri, versionMajor, versionMinor, "NetworkMediaModel");
         qmlRegisterType<NetworkDeviceModel>( uri, versionMajor, versionMinor, "NetworkDeviceModel");
         qmlRegisterType<NetworkSourcesModel>( uri, versionMajor, versionMinor, "NetworkSourcesModel");
-        qmlRegisterType<ServicesDiscoveryModel>( uri, versionMajor, versionMinor, "ServicesDiscoveryModel");
+        qmlRegisterType<AddonsModel>( uri, versionMajor, versionMinor, "ServicesDiscoveryModel");
         qmlRegisterType<MLFoldersModel>( uri, versionMajor, versionMinor, "MLFolderModel");
         qmlRegisterType<MLRecentsModel>( uri, versionMajor, versionMinor, "MLRecentModel" );
 
@@ -399,34 +402,9 @@
     // Dummy QtQuick.Effects module
     qmlRegisterModule("QtQuick.Effects", 0, 0);
     // Do not protect, types can still be registered.
+#else
+    // Dummy Qt5Compat.GraphicalEffects module
+    qmlRegisterModule("Qt5Compat.GraphicalEffects", 0, 0);
+    // Do not protect, types can still be registered.
 #endif
 }
-
-void MainUI::onQmlWarning(const QList<QQmlError>& qmlErrors)
-{
-    for( const auto& error: qmlErrors )
-    {
-        vlc_log_type type;
-
-        switch( error.messageType() )
-        {
-        case QtInfoMsg:
-            type = VLC_MSG_INFO; break;
-        case QtWarningMsg:
-            type = VLC_MSG_WARN; break;
-        case QtCriticalMsg:
-        case QtFatalMsg:
-            type = VLC_MSG_ERR; break;
-        case QtDebugMsg:
-        default:
-            type = VLC_MSG_DBG;
-        }
-
-        msg_Generic( m_intf,
-                     type,
-                     "qml message %s:%i %s",
-                     qtu(error.url().toString()),
-                     error.line(),
-                     qtu(error.description()) );
-    }
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/mainui.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/mainui.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/qml/BannerSources.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/qml/BannerSources.qml Changed

@@ -20,7 +20,6 @@
 import QtQuick.Controls
 import QtQuick.Templates as T
 import QtQuick.Layouts
-import Qt5Compat.GraphicalEffects
 import QtQml.Models
 import QtQuick.Window
 
@@ -43,7 +42,7 @@
 
     // For now, used for d&d functionality
     // Not strictly necessary to set
-    property PlaylistListView plListView: null
+    property PlaylistPane playlistPane: null
 
     property bool _showCSD: MainCtx.clientSideDecoration && !(MainCtx.intfMainWindow.visibility === Window.FullScreen)
 
@@ -120,7 +119,7 @@
 
                     Menus.Menubar {
                         id: menubar
-                        width: parent.width
+                        width: root._showCSD ? (parent.width - globalToolbarRight.width) : parent.width
                         height: implicitHeight
                         visible: MainCtx.hasToolbarMenu
                         enabled: visible
@@ -203,7 +202,7 @@
                         rightMargin: VLCStyle.applicationHorizontalMargin
                     }
                     height: VLCStyle.globalToolbar_height
-                    active: root._showCSD
+                    active: root._showCSD && !MainCtx.platformHandlesTitleBarButtonsWithCSD()
                     source: VLCStyle.palette.hasCSDImage
                               ? "qrc:///qt/qml/VLC/Widgets/CSDThemeButtonSet.qml"
                               : "qrc:///qt/qml/VLC/Widgets/CSDWindowButtonSet.qml"
@@ -349,7 +348,7 @@
                             contentWidth: localMenuGroup.width
                             contentHeight: VLCStyle.localToolbar_height // don't allow vertical flickering
 
-                            ScrollBar.horizontal: ScrollBar {
+                            ScrollBar.horizontal: Widgets.ScrollBarExt {
                                 y: localMenuView.height - height
                                 width: localMenuView.availableWidth
                                 policy: ScrollBar.AsNeeded
@@ -429,10 +428,10 @@
                                     }
 
                                     onEntered: (drag) => {
-                                        if (plListView) {
-                                            console.assert(plListView.isDropAcceptableFunc)
-                                            console.assert(plListView.model)
-                                            if (plListView.isDropAcceptableFunc(drag, plListView.model.count)) {
+                                        if (root.playlistPane) {
+                                            console.assert(root.playlistPane.isDropAcceptableFunc)
+                                            console.assert(root.playlistPane.model)
+                                            if (root.playlistPane.isDropAcceptableFunc(drag, root.playlistPane.model.count)) {
                                                 drag.accept()
                                             } else {
                                                 drag.accepted = false
@@ -443,9 +442,9 @@
                                     }
 
                                     onDropped: (drop) => {
-                                        if (plListView) {
-                                            console.assert(plListView.acceptDropFunc)
-                                            plListView.acceptDropFunc(plListView.model.count, drop)
+                                        if (root.playlistPane) {
+                                            console.assert(root.playlistPane.acceptDropFunc)
+                                            root.playlistPane.acceptDropFunc(root.playlistPane.model.count, drop)
                                         }
                                     }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/qml/MainDisplay.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/qml/MainDisplay.qml Changed

@@ -18,8 +18,6 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import Qt5Compat.GraphicalEffects
-
 
 import VLC.Style
 import VLC.MainInterface
@@ -102,8 +100,6 @@
             MainCtx.sendHotkey(event.key, event.modifiers);
     }
 
-    layer.enabled: (StackView.status === StackView.Deactivating || StackView.status === StackView.Activating)
-
     readonly property var pageModel: 
         {
             listed: MainCtx.mediaLibraryAvailable,
@@ -184,9 +180,9 @@
 
             model: g_mainDisplay.tabModel
 
-            plListView: playlistLoader.active ? playlistLoader.item
-                                              : (playlistWindowLoader.status === Loader.Ready ? playlistWindowLoader.item.playlistView
-                                                                                              : null)
+            playlistPane: playlistLoader.active ? playlistLoader.item
+                                                : (playlistWindowLoader.status === Loader.Ready ? playlistWindowLoader.item.playlistView
+                                                                                                : null)
 
             onItemClicked: (index) => {
                 const name = g_mainDisplay.tabModel.get(index).name
@@ -201,14 +197,18 @@
             }
 
             Navigation.parentItem: mainColumn
-            Navigation.downItem: stackView
+            Navigation.downItem: mainRow
         }
 
-        Item {
+        FocusScope {
+            id: mainRow
+
             Layout.fillWidth: true
             Layout.fillHeight: true
             z: 0
 
+            focus: true
+
             Rectangle {
                 id: stackViewParent
 
@@ -228,7 +228,8 @@
 
                 color: theme.bg.primary
 
-                layer.enabled: (GraphicsInfo.shaderType === GraphicsInfo.RhiShader) &&
+                layer.enabled: MainCtx.backdropBlurRequested() &&
+                               (GraphicsInfo.shaderType === GraphicsInfo.RhiShader) &&
                                (miniPlayer.visible || (loaderProgress.active && loaderProgress.item.visible))
 
                 layer.effect: Widgets.PartialEffect {
@@ -249,8 +250,6 @@
                                 colorSet: ColorContext.Window
                             }
 
-                            blending: stackViewParentLayerEffect.blending
-
                             tint: frostedTheme.bg.secondary
                         }
                     }
@@ -298,7 +297,7 @@
                         }
 
                         // Capture WheelEvents before they reach stackView
-                        onWheel: {
+                        onWheel: (wheel) => {
                             wheel.accepted = true
                         }
                     }
@@ -324,6 +323,12 @@
 
                 readonly property bool shown: (status === Loader.Ready) && item.visible
 
+                onVisibleChanged: {
+                    if (!visible) {
+                        stackView.focus = true
+                    }
+                }
+
                 Component.onCompleted: {
                     Qt.callLater(() => { playlistTransition.enabled = true; })
                 }
@@ -332,7 +337,7 @@
                     name: "expanded"
                     PropertyChanges {
                         target: playlistLoader
-                        width: Math.round(playlistLoader.implicitWidth)
+                        width: playlistLoader.implicitWidth
                         visible: true
                     }
                 }
@@ -355,14 +360,14 @@
                     }
                 }
 
-                sourceComponent: PlaylistListView {
+                sourceComponent: PlaylistPane {
                     id: playlist
 
-                    implicitWidth: VLCStyle.isScreenSmall
+                    implicitWidth: Math.round(VLCStyle.isScreenSmall
                                    ? g_mainDisplay.width * 0.8
                                    : Helpers.clamp(g_mainDisplay.width / resizeHandle.widthFactor,
                                                    minimumWidth,
-                                                   g_mainDisplay.width / 2 + playlistLeftBorder.width / 2)
+                                                   g_mainDisplay.width / 2 + playlistLeftBorder.width / 2))
 
                     focus: true
 
@@ -521,6 +526,17 @@
         }
     }
 
+    Widgets.FloatingNotification {
+        id: notif
+
+        anchors {
+            bottom: miniPlayer.top
+            left: parent.left
+            right: parent.right
+            margins: VLCStyle.margin_large
+        }
+    }
+
     MiniPlayer {
         id: miniPlayer
 
@@ -536,7 +552,7 @@
         background.visible: !stackViewParent.layer.enabled
 
         Navigation.parentItem: mainColumn
-        Navigation.upItem: stackView
+        Navigation.upItem: mainRow
         Navigation.cancelItem:sourcesBanner
         onVisibleChanged: {
             if (!visible && miniPlayer.activeFocus)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/qml/MainInterface.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/qml/MainInterface.qml Changed

@@ -25,8 +25,8 @@
 import QtQuick.Templates
 import QtQuick.Controls
 import QtQuick.Window
-import QtQuick.Effects
-import Qt5Compat.GraphicalEffects
+import QtQuick.Effects // Unconditionally available, dummy if Qt version is less than 6.5.0
+import Qt5Compat.GraphicalEffects // Unconditionally available, dummy if Qt version is equal to or greater than 6.5.0
 
 
 import VLC.MainInterface
@@ -310,7 +310,7 @@
         Loader {
             active: {
                 const windowVisibility = MainCtx.intfMainWindow.visibility
-                return MainCtx.clientSideDecoration
+                return MainCtx.clientSideDecoration && !MainCtx.platformHandlesResizeWithCSD()
                         && (windowVisibility !== Window.Maximized)
                         && (windowVisibility !== Window.FullScreen)
 
@@ -327,10 +327,12 @@
 
     //draw the window drop shadow ourselve when the windowing system doesn't
     //provide them but support extended frame
-    RectangularGlow {
+    Widgets.RectangularGlow {
         id: effect
         z: -1
-        visible: _extendedFrameVisible
+        hollow: Window.window && (Window.window.color.a < 1.0) // the interface may be translucent if the window has backdrop blur
+        blending: false // stacked below everything, no need for blending even though it is not opaque
+        visible: _extendedFrameVisible && !MainCtx.platformHandlesShadowsWithCSD()
         anchors.fill: g_mainInterface
         spread: 0.0
         color: "black"

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/qml/MainViewLoader.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/qml/MainViewLoader.qml Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/qt_wayland_plugin.c Added

@@ -0,0 +1,35 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include "compositor_wayland_module.h"
+
+#ifdef QT_HAS_WAYLAND_PROTOCOLS
+#include "util/csdmenu_wayland.h"
+#endif
+
+vlc_module_begin()
+    set_shortname(N_("QtWayland"))
+    set_description(N_(" calls for compositing with Qt"))
+    set_capability("qtwayland", 10)
+    set_callback(OpenCompositor)
+#ifdef QT_HAS_WAYLAND_PROTOCOLS
+add_submodule()
+    set_capability("qtcsdmenu", 10)
+    set_callbacks(WaylandCSDMenuOpen, WaylandCSDMenuClose)
+#endif
+vlc_module_end()

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/qt_x11_plugin.c Added

@@ -0,0 +1,25 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#include "util/csdmenu_x11.h"
+
+vlc_module_begin()
+    set_shortname(N_("QtX11"))
+    set_description(N_("Qt extra X11 features"))
+    set_capability("qtcsdmenu", 10)
+    set_callback(X11CSDMenuOpen)
+vlc_module_end()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/video_window_handler.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/video_window_handler.cpp Changed

@@ -30,6 +30,9 @@
     /* Does the interface resize to video size or the opposite */
     m_autoresize = var_InheritBool( m_intf, "qt-video-autoresize" );
 
+    assert(qGuiApp);
+    m_hasWayland = qGuiApp->platformName().startsWith(QLatin1String("wayland"));
+
     connect( this, &VideoWindowHandler::askVideoToResize,
              this, &VideoWindowHandler::setVideoSize, Qt::QueuedConnection );
     connect( this, &VideoWindowHandler::askVideoSetFullScreen,
@@ -59,7 +62,9 @@
 
 void VideoWindowHandler::requestResizeVideo( unsigned i_width, unsigned i_height )
 {
-    emit askVideoToResize( i_width, i_height );
+    if (!m_window)
+        return;
+    emit askVideoToResize( i_width, i_height, m_window->windowStates() );
 }
 
 void VideoWindowHandler::requestVideoWindowed( )
@@ -78,11 +83,24 @@
     emit askVideoOnTop( on_top );
 }
 
-void VideoWindowHandler::setVideoSize(unsigned int w, unsigned int h)
+void VideoWindowHandler::setVideoSize(unsigned int w, unsigned int h, Qt::WindowStates currentStates)
 {
     if (!m_window)
         return;
     Qt::WindowStates states = m_window->windowStates();
+
+    // This slot is queued, so by the time it is called
+    // the window states reflect the final states.
+    // `qt-video-autoresize` should not apply during state
+    // transition, that was also the behavior in VLC 3.
+    // Otherwise, when getting disengaged from fullscreen
+    // the interface/video would forget its old (overridden)
+    // size.
+
+    // Do not resize when transitioning between states:
+    if (currentStates != states)
+        return;
+
     if ((states & (Qt::WindowFullScreen | Qt::WindowMaximized)) == 0)
     {
         /* Resize video widget to video size, or keep it at the same
@@ -100,14 +118,15 @@
                 w = screen.width();
                 h = screen.height();
             }
-            else
+            else if (!m_hasWayland)
             {
                 // Convert the size in logical pixels
                 w = qRound( (float)w / factor );
                 h = qRound( (float)h / factor );
                 msg_Dbg( m_intf, "Logical video size: %ux%u", w, h );
             }
-            m_window->resize(w, h);
+            m_window->resize(std::clamp<int>(w, m_window->minimumWidth(), m_window->maximumWidth()),
+                             std::clamp<int>(h, m_window->minimumHeight(), m_window->maximumHeight()));
         }
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/video_window_handler.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/video_window_handler.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/videosurface.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/videosurface.cpp Changed

@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #include "videosurface.hpp"
-#include "maininterface/mainctx.hpp"
-#include "widgets/native/customwidgets.hpp" //for qtEventToVLCKey
+
 #include <QSGRectangleNode>
 #include <QThreadPool>
 #include <vlc_window.h>
@@ -27,75 +26,16 @@
 #  include <QtGui/qpa/qplatformwindow.h>
 #endif
 
-WindowResizer::WindowResizer(vlc_window_t* window):
-    m_requestedWidth(0),
-    m_requestedHeight(0),
-    m_currentWidth(0),
-    m_currentHeight(0),
-    m_running(false),
-    m_voutWindow(window)
-{
-    vlc_mutex_init(&m_lock);
-    vlc_cond_init(&m_cond);
-    setAutoDelete(false);
-}
-
-WindowResizer::~WindowResizer()
-{
-}
-
-void WindowResizer::run()
-{
-    vlc_mutex_lock(&m_lock);
-    while (m_requestedWidth != m_currentWidth ||
-           m_requestedHeight != m_currentHeight)
-    {
-        unsigned width = m_requestedWidth;
-        unsigned height = m_requestedHeight;
-        vlc_mutex_unlock(&m_lock);
-
-        vlc_window_ReportSize(m_voutWindow, width, height);
-
-        vlc_mutex_lock(&m_lock);
-        m_currentWidth = width;
-        m_currentHeight = height;
-    }
-    m_running = false;
-    vlc_cond_signal(&m_cond);
-    vlc_mutex_unlock(&m_lock);
-}
-
-void WindowResizer::reportSize(float width, float height)
-{
-    if (width < 0 || height < 0)
-        return;
-
-    vlc_mutex_locker locker(&m_lock);
-    m_requestedWidth = static_cast<unsigned>(width);
-    m_requestedHeight = static_cast<unsigned>(height);
-    if (m_running == false)
-    {
-        m_running = true;
-        QThreadPool::globalInstance()->start(this);
-    }
-}
-
-/* Must called under m_voutlock before deletion */
-void WindowResizer::waitForCompletion()
-{
-    vlc_mutex_locker locker(&m_lock);
-    while (m_running)
-        vlc_cond_wait(&m_cond, &m_lock);
-}
+#include "maininterface/mainctx.hpp"
 
-VideoSurfaceProvider::VideoSurfaceProvider(QObject* parent)
+VideoSurfaceProvider::VideoSurfaceProvider(bool threadedSurfaceUpdates, QObject* parent)
     : QObject(parent)
+    , m_threadedSurfaceUpdates(threadedSurfaceUpdates)
 {
 }
 
 bool VideoSurfaceProvider::isEnabled()
 {
-    QMutexLocker lock(&m_voutlock);
     return m_voutWindow != nullptr;
 }
 
@@ -107,27 +47,14 @@
 void VideoSurfaceProvider::enable(vlc_window_t* voutWindow)
 {
     assert(voutWindow);
-    {
-        QMutexLocker lock(&m_voutlock);
-        m_voutWindow = voutWindow;
-        m_resizer = new (std::nothrow) WindowResizer(voutWindow);
-    }
+    m_voutWindow = voutWindow;
     emit videoEnabledChanged(true);
 }
 
 void VideoSurfaceProvider::disable()
 {
     setVideoEmbed(false);
-    {
-        QMutexLocker lock(&m_voutlock);
-        if (m_resizer != nullptr)
-        {
-            m_resizer->waitForCompletion();
-            delete m_resizer;
-            m_resizer = nullptr;
-        }
-        m_voutWindow = nullptr;
-    }
+    m_voutWindow = nullptr;
     emit videoEnabledChanged(false);
 }
 
@@ -139,67 +66,53 @@
 
 void VideoSurfaceProvider::onWindowClosed()
 {
-    QMutexLocker lock(&m_voutlock);
-    if (m_resizer != nullptr)
-        m_resizer->waitForCompletion();
     if (m_voutWindow)
         vlc_window_ReportClose(m_voutWindow);
 }
 
 void VideoSurfaceProvider::onMousePressed(int vlcButton)
 {
-    QMutexLocker lock(&m_voutlock);
     if (m_voutWindow)
         vlc_window_ReportMousePressed(m_voutWindow, vlcButton);
 }
 
 void VideoSurfaceProvider::onMouseReleased(int vlcButton)
 {
-    QMutexLocker lock(&m_voutlock);
     if (m_voutWindow)
         vlc_window_ReportMouseReleased(m_voutWindow, vlcButton);
 }
 
 void VideoSurfaceProvider::onMouseDoubleClick(int vlcButton)
 {
-    QMutexLocker lock(&m_voutlock);
     if (m_voutWindow)
         vlc_window_ReportMouseDoubleClick(m_voutWindow, vlcButton);
 }
 
 void VideoSurfaceProvider::onMouseMoved(float x, float y)
 {
-    QMutexLocker lock(&m_voutlock);
     if (m_voutWindow)
         vlc_window_ReportMouseMoved(m_voutWindow, x, y);
 }
 
-void VideoSurfaceProvider::onMouseWheeled(const QWheelEvent& event)
+void VideoSurfaceProvider::onMouseWheeled(int vlcButton)
 {
-    int vlckey = qtWheelEventToVLCKey(event);
-    QMutexLocker lock(&m_voutlock);
     if (m_voutWindow)
-        vlc_window_ReportKeyPress(m_voutWindow, vlckey);
+        vlc_window_ReportKeyPress(m_voutWindow, vlcButton);
 }
 
 void VideoSurfaceProvider::onKeyPressed(int key, Qt::KeyboardModifiers modifiers)
 {
     QKeyEvent event(QEvent::KeyPress, key, modifiers);
     int vlckey = qtEventToVLCKey(&event);
-    QMutexLocker lock(&m_voutlock);
     if (m_voutWindow)
         vlc_window_ReportKeyPress(m_voutWindow, vlckey);
-
 }
 
 void VideoSurfaceProvider::onSurfaceSizeChanged(QSizeF size)
 {
     emit surfaceSizeChanged(size);
-    QMutexLocker lock(&m_voutlock);
-    if (m_resizer)
-        m_resizer->reportSize(size.width(), size.height());
-    else if (m_voutWindow)
-        vlc_window_ReportSize(m_voutWindow, size.width(), size.height());
+    if (m_voutWindow)
+        vlc_window_ReportSize(m_voutWindow, std::ceil(size.width()), std::ceil(size.height()));
 }
 
 
@@ -209,16 +122,6 @@
     setAcceptHoverEvents(true);
     setAcceptedMouseButtons(Qt::AllButtons);
     setFlag(ItemAcceptsInputMethod, true);
-
-    {
-        connect(this, &QQuickItem::widthChanged, this, &VideoSurface::updateSurfaceSize);
-        connect(this, &QQuickItem::heightChanged, this, &VideoSurface::updateSurfaceSize);
-
-        connect(this, &QQuickItem::xChanged, this, &VideoSurface::updateSurfacePosition);
-        connect(this, &QQuickItem::yChanged, this, &VideoSurface::updateSurfacePosition);
-        connect(this, &QQuickItem::parentChanged, this, &VideoSurface::updateParentChanged);
-        updateParentChanged();
-    }
 }
 
 int VideoSurface::qtMouseButton2VLC( Qt::MouseButton qtButton )
@@ -307,7 +210,7 @@
 #if QT_CONFIG(wheelevent)
 void VideoSurface::wheelEvent(QWheelEvent *event)
 {
-    emit mouseWheeled(*event);
+    m_wheelEventConverter.wheelEvent(event);
     event->accept();
 }
 #endif
@@ -322,41 +225,63 @@
     setCursor(shape);
 }
 
-void VideoSurface::updatePolish()
+void VideoSurface::synchronize()
 {
-    QQuickItem::updatePolish();
+    // This may be called from the rendering thread, not necessarily
+    // during synchronization (GUI thread is not blocked). Try to
+    // be very careful.
 
-    if (m_sizeDirty)
+    QSizeF size;
+    QPointF position;
+
+    if (QThread::currentThread() == thread())
+    {
+        // Item's thread (GUI thread):
+        size = this->size();
+        position = this->mapToScene(QPointF(0,0));
+    }
+    else
     {
-        emit surfaceSizeChanged(size() * window()->effectiveDevicePixelRatio());
-        m_sizeDirty = false;
+        // Render thread:
+        size = renderSize();
+        position = renderPosition();
     }
 
-    if (m_positionDirty)
+    if (m_oldRenderSize != size || m_dprDirty)
     {
-        QPointF scenePosition = this->mapToScene(QPointF(0,0));
+        if (!size.isEmpty())
+        {
+            emit surfaceSizeChanged(size * m_dpr);
+            m_oldRenderSize = size;
+        }
+    }
 
-        emit surfacePositionChanged(scenePosition * window()->effectiveDevicePixelRatio());
-        m_positionDirty = false;
+    if (m_oldRenderPosition != position || m_dprDirty)
+    {
+        if (position.x() >= 0.0 && position.y() >= 0.0)
+        {
+            emit surfacePositionChanged(position * m_dpr); // render position is relative to scene/viewport
+            m_oldRenderPosition = position;
+        }
     }
-}
 
-void VideoSurface::updateSurfacePosition()
-{
-    m_positionDirty = true;
-    polish();
+    if (m_dprDirty)
+    {
+        emit surfaceScaleChanged(m_dpr);
+        m_dprDirty = false;
+    }
 }
 
-void VideoSurface::updateSurfaceSize()
+void VideoSurface::itemChange(ItemChange change, const ItemChangeData &value)
 {
-    m_sizeDirty = true;
-    polish();
-}
+    if (change == ItemDevicePixelRatioHasChanged || change == ItemSceneChange)
+    {
+        m_dprChanged = true;
+        // Request update, so that `updatePaintNode()` gets called which updates the DPR for `::synchronize()`:
+        update();
+    }
 
-void VideoSurface::updateSurfacePositionAndSize()
-{
-    updateSurfacePosition();
-    updateSurfaceSize();
+    QQuickItem::itemChange(change, value);
 }
 
 void VideoSurface::setVideoSurfaceProvider(VideoSurfaceProvider *newVideoSurfaceProvider)
@@ -366,6 +291,8 @@
 
     if (m_provider)
     {
+        disconnect(this, nullptr, m_provider, nullptr);
+        disconnect(&m_wheelEventConverter, nullptr, m_provider, nullptr);
         disconnect(m_provider, nullptr, this, nullptr);
     }
 
@@ -377,15 +304,14 @@
         connect(this, &VideoSurface::mousePressed, m_provider, &VideoSurfaceProvider::onMousePressed);
         connect(this, &VideoSurface::mouseDblClicked, m_provider, &VideoSurfaceProvider::onMouseDoubleClick);
         connect(this, &VideoSurface::mouseReleased, m_provider, &VideoSurfaceProvider::onMouseReleased);
-        connect(this, &VideoSurface::mouseWheeled, m_provider, &VideoSurfaceProvider::onMouseWheeled);
         connect(this, &VideoSurface::keyPressed, m_provider, &VideoSurfaceProvider::onKeyPressed);
-        connect(this, &VideoSurface::surfaceSizeChanged, m_provider, &VideoSurfaceProvider::onSurfaceSizeChanged);
-        connect(this, &VideoSurface::surfacePositionChanged, m_provider, &VideoSurfaceProvider::surfacePositionChanged);
+        connect(this, &VideoSurface::surfaceSizeChanged, m_provider, &VideoSurfaceProvider::onSurfaceSizeChanged, Qt::DirectConnection);
+        connect(this, &VideoSurface::surfacePositionChanged, m_provider, &VideoSurfaceProvider::surfacePositionChanged, Qt::DirectConnection);
+        connect(this, &VideoSurface::surfaceScaleChanged, m_provider, &VideoSurfaceProvider::surfaceScaleChanged, Qt::DirectConnection);
 
-        connect(m_provider, &VideoSurfaceProvider::videoEnabledChanged, this, &VideoSurface::updateSurfacePositionAndSize);
+        connect(&m_wheelEventConverter, &WheelToVLCConverter::vlcWheelKey, m_provider, &VideoSurfaceProvider::onMouseWheeled);
 
         setFlag(ItemHasContents, true);
-        updateSurfacePositionAndSize(); // Polish is queued anyway, updatePolish() should be called when the initial size is set.
     }
     else
     {
@@ -395,26 +321,47 @@
     emit videoSurfaceProviderChanged();
 }
 
-void VideoSurface::updateParentChanged()
+QSGNode *VideoSurface::updatePaintNode(QSGNode *node, UpdatePaintNodeData *data)
 {
-    //we need to track the global position of the VideoSurface within the scene
-    //it depends on the position of the VideoSurface itself and all its parents
+    // This is called from the render thread, but during synchronization.
+    // So the GUI thread is blocked here. This makes it safer to access the window
+    // to get the effective DPR, rather than doing it outside the synchronization
+    // stage.
 
-    for (const QPointer<QQuickItem>& p : m_parentList)
+    const auto w = window();
+    assert (w);
+
+    if (Q_UNLIKELY(!m_provider))
+        return node;
+
+    if (w != m_oldWindow)
     {
-        if (!p)
-            continue;
-        disconnect(p, &QQuickItem::xChanged, this, &VideoSurface::updateSurfacePosition);
-        disconnect(p, &QQuickItem::yChanged, this, &VideoSurface::updateSurfacePosition);
-        disconnect(p, &QQuickItem::parentChanged, this, &VideoSurface::updateParentChanged);
+        if (m_oldWindow)
+            disconnect(m_synchConnection);
+
+        m_oldWindow = w;
+
+        if (w)
+        {
+            // This is constant:
+            if (m_provider->supportsThreadedSurfaceUpdates())
+            {
+                // Synchronize just before swapping the frame for better synchronization:
+                m_synchConnection = connect(w, &QQuickWindow::afterRendering, this, &VideoSurface::synchronize, Qt::DirectConnection);
+            }
+            else
+            {
+                m_synchConnection = connect(w, &QQuickWindow::afterAnimating, this, &VideoSurface::synchronize);
+            }
+        }
     }
-    m_parentList.clear();
 
-    for (QQuickItem* p = parentItem(); p != nullptr; p = p->parentItem())
+    if (m_dprChanged)
     {
-        connect(p, &QQuickItem::xChanged, this, &VideoSurface::updateSurfacePosition);
-        connect(p, &QQuickItem::yChanged, this, &VideoSurface::updateSurfacePosition);
-        connect(p, &QQuickItem::parentChanged, this, &VideoSurface::updateParentChanged);
-        m_parentList.push_back(p);
+        m_dpr = w->effectiveDevicePixelRatio();
+        m_dprDirty = true;
+        m_dprChanged = false;
     }
+
+    return ViewBlockingRectangle::updatePaintNode(node, data);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/videosurface.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/videosurface.hpp Changed

@@ -23,6 +23,7 @@
 #include <QRunnable>
 #include <QPointer>
 #include "qt.hpp"
+#include "util/vlchotkeyconverter.hpp"
 
 #include <vlc_threads.h>
 
@@ -34,33 +35,11 @@
 
 class MainCtx;
 
-class WindowResizer :
-    public QRunnable
-{
-public:
-    WindowResizer(vlc_window_t* window);
-    virtual ~WindowResizer();
-
-    void run() override;
-    void reportSize(float width, float height);
-    void waitForCompletion();
-
-private:
-    vlc_mutex_t m_lock;
-    vlc_cond_t m_cond;
-    unsigned m_requestedWidth;
-    unsigned m_requestedHeight;
-    unsigned m_currentWidth;
-    unsigned m_currentHeight;
-    bool m_running;
-    vlc_window_t* m_voutWindow;
-};
-
 class VideoSurfaceProvider : public QObject
 {
     Q_OBJECT
 public:
-    VideoSurfaceProvider(QObject* parent = nullptr);
+    VideoSurfaceProvider(bool threadedSurfaceUpdates = false, QObject* parent = nullptr);
     virtual ~VideoSurfaceProvider() {}
 
     void enable(vlc_window_t* voutWindow);
@@ -70,12 +49,15 @@
     void setVideoEmbed(bool embed);
     bool hasVideoEmbed() const;
 
+    bool supportsThreadedSurfaceUpdates() const { return m_threadedSurfaceUpdates; };
+
 signals:
     void ctxChanged(MainCtx*);
     bool videoEnabledChanged(bool);
     bool hasVideoEmbedChanged(bool);
     void surfacePositionChanged(QPointF position);
     void surfaceSizeChanged(QSizeF size);
+    void surfaceScaleChanged(qreal);
 
 public slots:
     void onWindowClosed();
@@ -83,15 +65,14 @@
     void onMouseReleased( int vlcButton );
     void onMouseDoubleClick( int vlcButton );
     void onMouseMoved( float x, float y );
-    void onMouseWheeled(const QWheelEvent& event);
+    void onMouseWheeled(int vlcButton);
     void onKeyPressed(int key, Qt::KeyboardModifiers modifiers);
     void onSurfaceSizeChanged(QSizeF size);
 
 protected:
-    QMutex m_voutlock;
     vlc_window_t* m_voutWindow = nullptr;
-    WindowResizer * m_resizer = nullptr;
     bool m_videoEmbed = false;
+    bool m_threadedSurfaceUpdates = false;
 };
 
 
@@ -108,6 +89,8 @@
     void setVideoSurfaceProvider(VideoSurfaceProvider *newVideoSurfaceProvider);
 
 protected:
+    QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
+
     int qtMouseButton2VLC( Qt::MouseButton qtButton );
 
     void mousePressEvent(QMouseEvent *event) override;
@@ -123,37 +106,47 @@
     Qt::CursorShape getCursorShape() const;
     void setCursorShape(Qt::CursorShape);
 
-    void updatePolish() override;
-
+    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value) override;
 signals:
     void surfaceSizeChanged(QSizeF);
     void surfacePositionChanged(QPointF);
+    void surfaceScaleChanged(qreal);
 
     void mousePressed( int vlcButton );
     void mouseReleased( int vlcButton );
     void mouseDblClicked( int vlcButton );
     void mouseMoved( float x, float y );
     void keyPressed(int key, Qt::KeyboardModifiers modifier);
-    void mouseWheeled(const QWheelEvent& event);
 
     void videoSurfaceProviderChanged();
 
 protected slots:
-    void updateSurfacePosition();
-    void updateSurfaceSize();
-    void updateSurfacePositionAndSize();
-
-    void updateParentChanged();
+    void synchronize();
 
 private:
     QPointF m_oldHoverPos;
 
+    WheelToVLCConverter m_wheelEventConverter;
+
     QPointer<VideoSurfaceProvider> m_provider;
 
-    std::vector<QPointer<QQuickItem>> m_parentList;
+    QPointer<QQuickWindow> m_oldWindow;
+    QMetaObject::Connection m_synchConnection;
+
+    // This is updated and read from different threads, but during synchronization stage so explicit synchronization
+    // such as atomic boolean or locking is not necessary:
+    bool m_dprChanged = false; // itemChange() <-> updatePaintNode() (different threads, but GUI thread is blocked)
+
+    // These are updated and read from either the item/GUI thread or the render thread:
+    QSizeF m_oldRenderSize;
+    QPointF m_oldRenderPosition {-1., -1.};
 
-    bool m_sizeDirty = false;
-    bool m_positionDirty = false;
+    // m_dpr and m_dprDirty are updated in render thread when the GUI thread is blocked (updatePaintNode()).
+    // m_dprDirty may be updated in GUI thread when threaded updates is not possible. Since m_dprDirty can
+    // not be updated both in render thread and GUI thread concurrently (as GUI thread is blocked during
+    // updatePaintNode() call), data synchronization should not be necessary:
+    qreal m_dpr = 1.0;
+    bool m_dprDirty = false;
 };
 
 #endif // VIDEOSURFACE_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/win32windoweffects_module.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/win32windoweffects_module.cpp Changed

@@ -20,25 +20,56 @@
 
 #include <QOperatingSystemVersion>
 #include <QWindow>
+#include <QRegion>
 
 #include <cassert>
 
 #include <dwmapi.h>
+#include <winuser.h>
 
-static bool isEffectAvailable(const WindowEffectsModule::Effect effect)
+static bool isEffectAvailable(const QWindow* window, const WindowEffectsModule::Effect effect)
 {
     // Version check is done on module open, no need to re-do it here.
     switch (effect)
     {
     case WindowEffectsModule::BlurBehind:
+        // NOTE: Qt does not officially support translucent window with frame.
+        //       The documentation states that `Qt::FramelessWindowHint` is
+        //       required on certain platforms, such as Windows. Otherwise,
+        //       The window starts with a white background, which is a widely
+        //       known Windows issue regardless of translucency, but the white
+        //       background is never cleared if the window clear color is
+        //       translucent. In this case, minimizing and restoring the window
+        //       makes the background cleared, but this still does not make
+        //       it a portable solution.
+        // NOTE: See QTBUG-56201, QTBUG-120691. From the reports, it appears
+        //       that Nvidia graphics is "fine" with translucent framed window
+        //       while Intel graphics is not. However, the said issue above
+        //       is still a concern with Nvidia graphics according to my own
+        //       experience.
+        // TODO: Ideally, we should at least use the frameless window hint
+        //       when CSD is in use and use native backdrop effect since
+        //       the custom solution has more chance to cause issues.
+        if (!window->flags().testFlag(Qt::FramelessWindowHint))
+        {
+            const auto extendedStyle = GetWindowLong((HWND)window->winId(), GWL_EXSTYLE);
+            if (!(extendedStyle & 0x00200000L /* WS_EX_NOREDIRECTIONBITMAP */))
+            {
+                qDebug("Target window is not frameless and does not use WS_EX_NOREDIRECTIONBITMAP, " \
+                       "window can not be translucent for the Windows 11 22H2 native acrylic backdrop effect.");
+                return false;
+            }
+        }
         return true;
     default:
         return false;
     };
 }
 
-static void setBlurBehind(QWindow* const window, const bool enable = true)
+static void setBlurBehind(QWindow* const window, const bool enable = true, const QRegion& region = {})
 {
+    Q_UNUSED(region);
+
     assert(window);
     assert(window->winId()); // use QWindow::create() before calling this function

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/maininterface/windoweffects_module.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/maininterface/windoweffects_module.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/medialib.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/medialib.cpp Changed

@@ -34,7 +34,7 @@
 {
     m_event_cb.reset( vlc_ml_event_register_callback( m_ml, MediaLib::onMediaLibraryEvent,
                                                       this ) );
-    m_runner = new MLThreadRunner(m_ml);
+    m_runner = new ThreadRunner();
 }
 
 MediaLib::~MediaLib()
@@ -404,55 +404,14 @@
     }
 }
 
-
-
-MLThreadRunner::MLThreadRunner(vlc_medialibrary_t* ml)
-    : m_ml(ml)
-{
-    m_mlThreadPool.setMaxThreadCount(4);
-}
-
-MLThreadRunner::~MLThreadRunner()
-{
-    assert(m_objectTasks.empty());
-    assert(m_runningTasks.empty());
-}
-
-void MLThreadRunner::destroy()
-{
-    m_shuttingDown = true;
-    //try to cancel as many tasks as possible
-    for (auto taskIt = m_objectTasks.begin(); taskIt != m_objectTasks.end(); /**/)
-    {
-        const QObject* object = taskIt.key();
-        quint64 key = taskIt.value();
-        auto task = m_runningTasks.value(key, nullptr);
-        if (m_mlThreadPool.tryTake(task))
-        {
-            delete task;
-            m_runningTasks.remove(key);
-            taskIt = m_objectTasks.erase(taskIt);
-            if (m_objectTasks.count(object) == 0)
-                disconnect(object, &QObject::destroyed, this, &MLThreadRunner::runOnMLThreadTargetDestroyed);
-        }
-        else
-            ++taskIt;
-    }
-
-    if (m_runningTasks.empty())
-    {
-        deleteLater();
-    }
-}
-
 quint64 MediaLib::runOnMLThread(const QObject* obj,
                 std::function< void(vlc_medialibrary_t* ml)> mlCb,
                 std::function< void()> uiCb,
                 const char* queue)
 {
     struct NoCtx{};
-    return m_runner->runOnMLThread<NoCtx>(obj,
-    mlCb(vlc_medialibrary_t* ml, NoCtx&){
+    return m_runner->runOnThread<NoCtx>(obj,
+    mlCb, ml=m_ml(NoCtx&){
         mlCb(ml);
     },
     uiCb(quint64, NoCtx&){
@@ -466,8 +425,8 @@
                 std::function< void(quint64)> uiCb, const char* queue)
 {
     struct NoCtx{};
-    return m_runner->runOnMLThread<NoCtx>(obj,
-    mlCb(vlc_medialibrary_t* ml, NoCtx&){
+    return m_runner->runOnThread<NoCtx>(obj,
+    mlCb, ml=m_ml(NoCtx&){
         mlCb(ml);
     },
     uiCb(quint64 requestId, NoCtx&){
@@ -481,8 +440,8 @@
                 const char* queue)
 {
     struct NoCtx{};
-    return m_runner->runOnMLThread<NoCtx>(obj,
-    mlCb(vlc_medialibrary_t* ml, NoCtx&){
+    return m_runner->runOnThread<NoCtx>(obj,
+    mlCb, ml=m_ml(NoCtx&){
         mlCb(ml);
     },
     (quint64, NoCtx&){
@@ -492,66 +451,6 @@
 
 void MediaLib::cancelMLTask(const QObject* object, quint64 taskId)
 {
-    m_runner->cancelMLTask(object, taskId);
-}
-
-void MLThreadRunner::cancelMLTask(const QObject* object, quint64 taskId)
-{
-    assert(taskId != 0);
-
-    auto task = m_runningTasks.value(taskId, nullptr);
-    if (!task)
-        return;
-    task->cancel();
-    bool removed = m_mlThreadPool.tryTake(task);
-    if (removed)
-        delete task;
-    m_runningTasks.remove(taskId);
-    m_objectTasks.remove(object, taskId);
-    if (m_objectTasks.count(object) == 0)
-        disconnect(object, &QObject::destroyed, this, &MLThreadRunner::runOnMLThreadTargetDestroyed);
+    m_runner->cancelTask(object, taskId);
 }
 
-void MLThreadRunner::runOnMLThreadDone(RunOnMLThreadBaseRunner* runner, quint64 target, const QObject* object, int status)
-{
-    if (m_shuttingDown)
-    {
-        if (m_runningTasks.contains(target))
-        {
-            m_runningTasks.remove(target);
-            m_objectTasks.remove(object, target);
-            if (m_objectTasks.count(object) == 0)
-                disconnect(object, &QObject::destroyed, this, &MLThreadRunner::runOnMLThreadTargetDestroyed);
-        }
-        if (m_runningTasks.empty())
-            deleteLater();
-    }
-    else if (m_runningTasks.contains(target))
-    {
-        if (status == ML_TASK_STATUS_SUCCEED)
-            runner->runUICallback();
-        m_runningTasks.remove(target);
-        m_objectTasks.remove(object, target);
-        if (m_objectTasks.count(object) == 0)
-            disconnect(object, &QObject::destroyed, this, &MLThreadRunner::runOnMLThreadTargetDestroyed);
-    }
-    runner->deleteLater();
-}
-
-void MLThreadRunner::runOnMLThreadTargetDestroyed(QObject * object)
-{
-    if (m_objectTasks.contains(object))
-    {
-        for (auto taskId : m_objectTasks.values(object))
-        {
-            auto task = m_runningTasks.value(taskId, nullptr);
-            assert(task);
-            bool removed = m_mlThreadPool.tryTake(task);
-            if (removed)
-                delete task;
-            m_runningTasks.remove(taskId);
-        }
-        m_objectTasks.remove(object);
-        //no need to disconnect QObject::destroyed, as object is currently being destroyed
-    }
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/medialib.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/medialib.hpp Changed

@@ -35,9 +35,6 @@
 
 struct vlc_medialibrary_t;
 
-class MLThreadRunner;
-class RunOnMLThreadBaseRunner;
-
 class MediaLib : public QObject
 {
     Q_OBJECT
@@ -192,134 +189,16 @@
     /* Medialibrary */
     vlc_medialibrary_t* m_ml;
     std::unique_ptr<vlc_ml_event_callback_t, std::function<void(vlc_ml_event_callback_t*)>> m_event_cb;
-    MLThreadRunner* m_runner = nullptr;
+    ThreadRunner* m_runner = nullptr;
 
     QMap<QVector<MLItemId>, QVector<QJSValue>> m_inputItemQuery;
 };
 
-class MLThreadRunner : public QObject
-{
-    Q_OBJECT
-
-public:
-    enum MLTaskStatus {
-        ML_TASK_STATUS_SUCCEED,
-        ML_TASK_STATUS_CANCELED
-    };
-
-    MLThreadRunner(vlc_medialibrary_t* ml);
-    ~MLThreadRunner();
-
-    void destroy();
-    void cancelMLTask(const QObject* object, quint64 taskId);
-
-    template<typename Ctx>
-    quint64 runOnMLThread(const QObject* obj,
-                          std::function<void (vlc_medialibrary_t*, Ctx&)> mlFun,
-                          std::function<void (quint64 taskId, Ctx&)> uiFun,
-                          const char* queue);
-
-private:
-    vlc_medialibrary_t* m_ml = nullptr;
-    MLThreadPool m_mlThreadPool;
-
-    bool m_shuttingDown = false;
-    quint64 m_taskId = 1;
-    QMap<quint64, RunOnMLThreadBaseRunner*> m_runningTasks;
-    QMultiMap<const QObject*, quint64> m_objectTasks;
-
-
-private slots:
-    void runOnMLThreadDone(RunOnMLThreadBaseRunner* runner, quint64 target, const QObject* object, int status);
-    void runOnMLThreadTargetDestroyed(QObject * object);
-};
-
-class RunOnMLThreadBaseRunner : public QObject, public QRunnable
-{
-    Q_OBJECT
-public:
-    virtual ~RunOnMLThreadBaseRunner() = default;
-    virtual void runUICallback() = 0;
-    virtual void cancel() = 0;
-signals:
-    void done(RunOnMLThreadBaseRunner* runner, quint64 target, const QObject* object, int status);
-};
-
-template<typename Ctx>
-class RunOnMLThreadRunner : public RunOnMLThreadBaseRunner {
-public:
-    RunOnMLThreadRunner(
-        quint64 taskId,
-        const QObject* obj,
-        std::function<void (vlc_medialibrary_t*, Ctx&)> mlFun,
-        std::function<void (quint64, Ctx&)> uiFun,
-        vlc_medialibrary_t* ml
-    )
-        : RunOnMLThreadBaseRunner()
-        , m_taskId(taskId)
-        , m_obj(obj)
-        , m_mlFun(mlFun)
-        , m_uiFun(uiFun)
-        , m_ml(ml)
-    {
-        setAutoDelete(false);
-    }
-
-    void run() override
-    {
-        if (m_canceled)
-        {
-            emit done(this, m_taskId, m_obj, MLThreadRunner::ML_TASK_STATUS_CANCELED);
-            return;
-        }
-        m_mlFun(m_ml, m_ctx);
-        emit done(this, m_taskId, m_obj, MLThreadRunner::ML_TASK_STATUS_SUCCEED);
-    }
-
-    //called from UI thread
-    void runUICallback() override
-    {
-        m_uiFun(m_taskId, m_ctx);
-    }
-
-    void cancel() override
-    {
-        m_canceled = true;
-    }
-private:
-    std::atomic_bool m_canceled {false};
-    quint64 m_taskId;
-    Ctx m_ctx; //default constructed
-    const QObject* m_obj = nullptr;
-    std::function<void (vlc_medialibrary_t*, Ctx&)> m_mlFun;
-    std::function<void (quint64, Ctx&)> m_uiFun;
-    vlc_medialibrary_t* m_ml = nullptr;
-};
-
-template<typename Ctx>
-quint64 MLThreadRunner::runOnMLThread(const QObject* obj,
-                            std::function<void (vlc_medialibrary_t*, Ctx&)> mlFun,
-                            std::function<void (quint64 taskId, Ctx&)> uiFun,
-                            const char* queue)
-{
-    if (m_shuttingDown)
-        return 0;
-
-    auto taskId = m_taskId++;
-    auto runnable = new RunOnMLThreadRunner<Ctx>(taskId, obj, mlFun, uiFun, m_ml);
-    connect(runnable, &RunOnMLThreadBaseRunner::done, this, &MLThreadRunner::runOnMLThreadDone);
-    connect(obj, &QObject::destroyed, this, &MLThreadRunner::runOnMLThreadTargetDestroyed);
-    m_runningTasks.insert(taskId, runnable);
-    m_objectTasks.insert(obj, taskId);
-    m_mlThreadPool.start(runnable, queue);
-    return taskId;
-}
-
 template<typename Ctx>
 quint64 MediaLib::runOnMLThread(const QObject* obj,
                                     std::function<void (vlc_medialibrary_t*, Ctx&)> mlFun,
                                     std::function<void (quint64 taskId, Ctx&)> uiFun,
                                     const char* queue)
 {
-    return m_runner->runOnMLThread<Ctx>(obj, mlFun, uiFun, queue);
+    return m_runner->runOnThread<Ctx>(obj, ml = m_ml, mlFun(Ctx& ctx){mlFun(ml,ctx);}, uiFun, queue);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlalbummodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlalbummodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlalbummodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlalbummodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlalbumtrackmodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlalbumtrackmodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlartistmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlartistmodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlartistmodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlartistmodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlbasemodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlbasemodel.cpp Changed

@@ -97,6 +97,79 @@
         return true;
     }
 
+    //this will load data until id is in the cache, then returns its position
+    void getIndexFromIdImpl(MLItemId id, std::function<void (std::optional<int> index)> cb) const
+    {
+        Q_Q(const MLBaseModel);
+
+        int index;
+        MLItem* item = q->findInCache(id, &index);
+
+        if (item) {
+            cb(index);
+        }
+        else
+        {
+            unsigned int loaded = q->getLoadedCount();
+            int count = q->getCount();
+            int limit = q->getLimit();
+            //item doesn't exists
+            if ((limit != 0 && count >= limit) || loaded == getMaximumCount()) {
+                cb(std::nullopt);
+            }
+            else
+            {
+                //load data until we have our item in cache
+                QObject::connect(q, &MLBaseModel::dataChanged, q, this, id, cb(){
+                    getIndexFromIdImpl(id, cb);
+                }, Qt::SingleShotConnection);
+
+                if (m_cache)
+                    m_cache->fetchMore();
+            }
+        }
+    }
+
+    QJSValue itemToJSValue(const MLItem* item) const {
+        Q_Q(const MLBaseModel);
+        if (!item)
+            return QJSValue::NullValue;
+
+        QMap<QString, QVariant> dataDict;
+        const QHash<int, QByteArray> roles = q->roleNames();
+        if (item) // item may fail to load
+            for (int role: roles.keys())
+                dataDictrolesrole = q->itemRoleData(item, role);
+        auto jsEngine = qjsEngine(q);
+        return jsEngine->toScriptValue(dataDict);
+    }
+
+    //FIXME: building Promise from C++ should be available to other classes
+    std::tuple<QJSValue, QJSValue, QJSValue> makeJSPromise() const
+    {
+        Q_Q(const MLBaseModel);
+        auto jsEngine = qjsEngine(q);
+        QJSValue promiseRet = jsEngine->evaluate(
+            //no newline at beginning of string, () surrounding is mandatory
+            R"raw((function() {
+    let resolve;
+    let reject;
+    let p = new Promise((_resolve, _reject) => {
+        resolve = _resolve;
+        reject = _reject;
+    });
+    return p, resolve, reject;
+}())
+)raw");
+        assert(promiseRet.isArray());
+        assert(promiseRet.property(QStringLiteral("length")).toInt() == 3);
+        QJSValue p = promiseRet.property(0);
+        QJSValue resolve = promiseRet.property(1);
+        assert(resolve.isCallable());
+        QJSValue reject = promiseRet.property(2);
+        assert(reject.isCallable());
+        return {p, resolve, reject};
+    }
 };
 
 // MLBaseModel
@@ -174,13 +247,15 @@
         for (int i = 0; i < indxSize; ++i)
         {
             const auto &item = itemsi;
-            QMap<QString, QVariant> dataDict;
 
+            QJSValue jsitem;
             if (item) // item may fail to load
-                for (int role: roles.keys())
-                    dataDictrolesrole = itemRoleData(item.get(), role);
+                jsitem = d_func()->itemToJSValue(item.get());
+            else
+                jsitem = jsEngine->newObject();
+
 
-            jsArray.setProperty(i, jsEngine->toScriptValue(dataDict));
+            jsArray.setProperty(i, jsitem);
         }
 
         callback.call({jsArray});
@@ -189,6 +264,67 @@
     *requestId = loadItems(indexes, cb);
 }
 
+
+Q_INVOKABLE QJSValue MLBaseModel::getDataById(MLItemId id)
+{
+    Q_D(const MLBaseModel);
+
+    auto p, resolve, reject = d->makeJSPromise();
+
+    MLItem* item = findInCache(id, nullptr);
+    if (item)
+    {
+        resolve.call({d->itemToJSValue(item)});
+    }
+    else
+    {
+        if (!m_itemLoader)
+            m_itemLoader = createMLLoader();
+
+        m_itemLoader->loadItemByIdTask(
+            id,
+            this, resolve=std::move(resolve), reject=std::move(reject)(size_t taskId, MLListCache::ItemType&& item)
+            {
+                Q_UNUSED(taskId);
+
+                if (!item)
+                {
+                    reject.call();
+                    return;
+                }
+
+                resolve.call({d_func()->itemToJSValue(item.get())});
+            }
+        );
+    }
+    return p;
+}
+
+
+Q_INVOKABLE QJSValue MLBaseModel::getIndexFromId(MLItemId id)
+{
+    Q_D(const MLBaseModel);
+
+    auto p, resolve, reject = d->makeJSPromise();
+    auto cb = resolve = resolve, reject = reject(std::optional<int> index)
+    {
+        if (index.has_value())
+            resolve.call({*index});
+        else
+            reject.call(); //not present
+    };
+
+    getIndexFromId2(id, cb);
+    return p;
+}
+
+void MLBaseModel::getIndexFromId2(MLItemId id, std::function<void (std::optional<int>)> cb)
+{
+    Q_D(const MLBaseModel);
+
+    d->getIndexFromIdImpl(id, cb);
+}
+
 QVariant MLBaseModel::data(const QModelIndex &index, int role) const
 {
     Q_D(const MLBaseModel);
@@ -370,6 +506,9 @@
 MLItem *MLBaseModel::findInCache(const MLItemId& id, int *index) const
 {
     Q_D(const MLBaseModel);
+    if (!d->m_cache)
+        return nullptr;
+
     const auto item = d->m_cache->find(id(const auto &item)
     {
         return item->getId() == id;
@@ -380,7 +519,6 @@
 
 void MLBaseModel::updateItemInCache(const MLItemId&)
 {
-    Q_D(MLBaseModel);
     // we can't safely update the item in the cache because our view may have a filter
     // and the update may cause the item filtered state to change requiring it to enter/leave
     // the cache

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlbasemodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlbasemodel.hpp Changed

@@ -59,7 +59,7 @@
 
     virtual ~MLBaseModel();
 
-    virtual QVariant itemRoleData(MLItem *item, int role) const = 0;
+    virtual QVariant itemRoleData(const MLItem *item, int role) const = 0;
 
     Q_INVOKABLE void sortByColumn(QByteArray criteria, Qt::SortOrder order);
 
@@ -69,6 +69,25 @@
     Q_INVOKABLE void getDataFlat(const QVector<int> &indexList, QJSValue callback);
     QVariant data(const QModelIndex &index, int role) const override final;
 
+    /**
+     * @brief getDataById allows getting the informations of an mlitem from its Id
+     * @param id of the item
+     * @return a JS Promise with the content of the item
+     */
+    Q_INVOKABLE QJSValue getDataById(MLItemId id);
+
+
+    /**
+     * @brief getIndexFromId allow getting the row of an item from its id,
+     *        if the item is not in cache, data will be retreived until it is
+     *        satisfied
+     * @param id of the item
+     * @return a JS Promise with the row index
+     */
+    Q_INVOKABLE QJSValue getIndexFromId(MLItemId id);
+
+    void getIndexFromId2(MLItemId id, std::function<void(std::optional<int> index)> cb);
+
 public:
     // properties functions

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlgenremodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlgenremodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlgenremodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlgenremodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlplaylistlistmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlplaylistlistmodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlplaylistlistmodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlplaylistlistmodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlplaylistmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlplaylistmodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlplaylistmodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlplaylistmodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlrecentsmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlrecentsmodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlrecentsmodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlrecentsmodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlthreadpool.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlthreadpool.cpp Changed

@@ -20,52 +20,32 @@
 
 #include <QMutexLocker>
 
-MLThreadPoolSerialTask::MLThreadPoolSerialTask(MLThreadPool* parent, const QString& queueName)
-    : m_parent(parent)
-    , m_queueName(queueName)
+ThreadRunner::ThreadRunner()
 {
-    assert(m_parent);
+    m_threadPool.setMaxThreadCount(4);
 }
 
-
-void MLThreadPoolSerialTask::run()
+ThreadRunner::~ThreadRunner()
 {
-    QRunnable* task = m_parent->getNextTaskFromQueue(m_queueName);
-    if (!task)
-    {
-        deleteLater();
-        return;
-    }
-    task->run();
-    if (task->autoDelete())
-        delete task;
-    m_parent->start(this, nullptr);
+    assert(m_objectTasks.empty());
+    assert(m_runningTasks.empty());
 }
 
-MLThreadPool::MLThreadPool()
+void ThreadRunner::setMaxThreadCount(size_t threadCount)
 {
+    m_threadPool.setMaxThreadCount(threadCount);
 }
 
 
-MLThreadPool::~MLThreadPool()
-{
-}
-
-
-void MLThreadPool::setMaxThreadCount(size_t poolsize)
-{
-    m_threadpool.setMaxThreadCount(poolsize);
-}
-
-void MLThreadPool::start(QRunnable* task, const char* queue)
+void ThreadRunner::start(QRunnable* task, const char* queue)
 {
     if (queue == nullptr)
     {
-        m_threadpool.start(task);
+        m_threadPool.start(task);
     }
     else
     {
-        QMutexLocker lock(&m_lock);
+        QMutexLocker lock(&m_serialTaskLock);
         if (m_serialTasks.contains(queue))
         {
             m_serialTasksqueue.push_back(task);
@@ -74,21 +54,19 @@
         {
             m_serialTasksqueue = QQueue<QRunnable*>();
             m_serialTasksqueue.push_back(task);
-            auto serialTasks = new MLThreadPoolSerialTask(this, queue);
-            serialTasks->setAutoDelete(false);
-            m_threadpool.start(serialTasks);
+            processQueueLocked(queue);
         }
     }
 }
 
-bool MLThreadPool::tryTake(QRunnable* task)
+bool ThreadRunner::tryTake(QRunnable* task)
 {
-    bool ret = m_threadpool.tryTake(task);
+    bool ret = m_threadPool.tryTake(task);
     if (ret)
         return true;
 
     {
-        QMutexLocker lock(&m_lock);
+        QMutexLocker lock(&m_serialTaskLock);
         for (auto queueIt = m_serialTasks.begin(); queueIt != m_serialTasks.end(); ++queueIt)
         {
             auto& queue = queueIt.value();
@@ -106,9 +84,9 @@
 }
 
 
-QRunnable* MLThreadPool::getNextTaskFromQueue(const QString& queueName)
+QRunnable* ThreadRunner::getNextTaskFromQueue(const QString& queueName)
 {
-    QMutexLocker lock(&m_lock);
+    QMutexLocker lock(&m_serialTaskLock);
     auto& queue = m_serialTasksqueueName;
     if (queue.empty())
     {
@@ -119,3 +97,141 @@
     queue.pop_front();
     return task;
 }
+
+void ThreadRunner::processQueueLocked(const QString& queueName)
+{
+    if (!m_serialTasks.contains(queueName))
+        return;
+
+    auto taskId = m_taskId++;
+    struct Ctx{};
+    auto runnable = new RunOnThreadRunner<Ctx>(taskId, this,
+        this, queueName(Ctx&){
+            QRunnable* task = getNextTaskFromQueue(queueName);
+            if (!task)
+            {
+                return;
+            }
+            task->run();
+            if (task->autoDelete())
+                delete task;
+        },
+        this, queueName(quint64, const Ctx&){
+             QMutexLocker lock(&m_serialTaskLock);
+             processQueueLocked(queueName);
+        });
+    connect(runnable, &RunOnThreadBaseRunner::done, this, &ThreadRunner::runOnThreadDone);
+    m_runningTasks.insert(taskId, runnable);
+    m_objectTasks.insert(this, taskId);
+
+    m_threadPool.start(runnable);
+}
+
+void ThreadRunner::destroy()
+{
+    QMutexLocker locker{&m_lock};
+    m_shuttingDown = true;
+    //try to cancel as many tasks as possible
+    for (auto taskIt = m_objectTasks.begin(); taskIt != m_objectTasks.end(); /**/)
+    {
+        const QObject* object = taskIt.key();
+        quint64 key = taskIt.value();
+        auto task = m_runningTasks.value(key, nullptr);
+        if (tryTake(task))
+        {
+            delete task;
+            m_runningTasks.remove(key);
+            taskIt = m_objectTasks.erase(taskIt);
+            if (m_objectTasks.count(object) == 0)
+                disconnect(object, &QObject::destroyed, this, &ThreadRunner::runOnThreadTargetDestroyed);
+        }
+        else
+            ++taskIt;
+    }
+
+    if (m_runningTasks.empty())
+    {
+        deleteLater();
+    }
+}
+
+void ThreadRunner::cancelTask(const QObject* object, quint64 taskId)
+{
+    assert(taskId != 0);
+    QMutexLocker locker{&m_lock};
+
+    auto task = m_runningTasks.value(taskId, nullptr);
+    if (!task)
+        return;
+    task->cancel();
+    bool removed = tryTake(task);
+    if (removed)
+        delete task;
+    m_runningTasks.remove(taskId);
+    m_objectTasks.remove(object, taskId);
+    if (m_objectTasks.count(object) == 0)
+        disconnect(object, &QObject::destroyed, this, &ThreadRunner::runOnThreadTargetDestroyed);
+}
+
+void ThreadRunner::runOnThreadDone(RunOnThreadBaseRunner* runner, quint64 target, const QObject* object, int status)
+{
+    QMutexLocker locker{&m_lock};
+    if (!m_runningTasks.contains(target))
+    {
+        runner->deleteLater();
+        return;
+    }
+
+    m_runningTasks.remove(target);
+    m_objectTasks.remove(object, target);
+    if (m_objectTasks.count(object) == 0)
+        disconnect(object, &QObject::destroyed, this, &ThreadRunner::runOnThreadTargetDestroyed);
+
+    if (m_shuttingDown)
+    {
+        if (m_runningTasks.empty())
+            deleteLater();
+        runner->deleteLater();
+        return;
+    }
+
+    if (status == ML_TASK_STATUS_SUCCEED)
+    {
+        if (object->thread() == this->thread())
+        {
+            locker.unlock();
+            runner->runUICallback();
+            runner->deleteLater();
+        }
+        else
+        {
+            //run the callback in the object thread
+            QMetaObject::invokeMethod(
+                const_cast<QObject*>(object),
+                runner(){
+                    runner->runUICallback();
+                    runner->deleteLater();
+                }
+            );
+        }
+    }
+}
+
+void ThreadRunner::runOnThreadTargetDestroyed(QObject * object)
+{
+    QMutexLocker locker{&m_lock};
+    if (m_objectTasks.contains(object))
+    {
+        for (auto taskId : m_objectTasks.values(object))
+        {
+            auto task = m_runningTasks.value(taskId, nullptr);
+            assert(task);
+            bool removed = tryTake(task);
+            if (removed)
+                delete task;
+            m_runningTasks.remove(taskId);
+        }
+        m_objectTasks.remove(object);
+        //no need to disconnect QObject::destroyed, as object is currently being destroyed
+    }
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlthreadpool.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlthreadpool.hpp Changed

@@ -26,35 +26,38 @@
 #include <QThreadPool>
 #include <QMutex>
 
-class MLThreadPool;
+class RunOnThreadBaseRunner;
 
-//internal task MLThreadPool
-class MLThreadPoolSerialTask : public QObject, public QRunnable
+class ThreadRunner : public QObject
 {
     Q_OBJECT
+
 public:
-    MLThreadPoolSerialTask(MLThreadPool* parent, const QString& queueName);
+    enum MLTaskStatus {
+        ML_TASK_STATUS_SUCCEED,
+        ML_TASK_STATUS_CANCELED
+    };
 
-    void run() override;
+    ThreadRunner();
+    ~ThreadRunner();
 
-private:
-    MLThreadPool* m_parent = nullptr;
-    QString m_queueName;
-};
+    void setMaxThreadCount(size_t threadCount);
 
-/**
- * @brief The MLThreadPool act like a QThreadPool, with the difference that it allows tasks
- * to be run sequentially by specifying a queue name when starting the task.
- */
-class MLThreadPool
-{
-public:
-    explicit MLThreadPool();
-    ~MLThreadPool();
+    void destroy();
+    void cancelTask(const QObject* object, quint64 taskId);
 
+    template<typename Ctx>
+    quint64 runOnThread(const QObject* obj,
+                          std::function<void (Ctx&)> mlFun,
+                          std::function<void (quint64 taskId, Ctx&)> uiFun,
+                          const char* queue = nullptr);
+
+private slots:
+    void runOnThreadDone(RunOnThreadBaseRunner* runner, quint64 target, const QObject* object, int status);
+    void runOnThreadTargetDestroyed(QObject * object);
 
-    void setMaxThreadCount(size_t threadCount);
 
+private:
     /**
      * @brief start enqueue a QRunnable to be executed on the threadpool
      * @param task is the task to enqueue
@@ -70,14 +73,101 @@
      */
     bool tryTake(QRunnable* task);
 
+    QRunnable* getNextTaskFromQueue(const QString& queueName);
+    void processQueueLocked(const QString& queueName);
+
 private:
-    friend class MLThreadPoolSerialTask;
+    QThreadPool m_threadPool;
 
-    QRunnable* getNextTaskFromQueue(const QString& queueName);
+    friend class MLThreadPoolSerialTask;
+    QMutex m_serialTaskLock;
+    QMap<QString, QQueue<QRunnable*>> m_serialTasks;
 
+    bool m_shuttingDown = false;
+    quint64 m_taskId = 1;
+    QMap<quint64, RunOnThreadBaseRunner*> m_runningTasks;
+    QMultiMap<const QObject*, quint64> m_objectTasks;
     QMutex m_lock;
-    QThreadPool m_threadpool;
-    QMap<QString, QQueue<QRunnable*>> m_serialTasks;
 };
 
+class RunOnThreadBaseRunner : public QObject, public QRunnable
+{
+    Q_OBJECT
+public:
+    virtual ~RunOnThreadBaseRunner() = default;
+    virtual void runUICallback() = 0;
+    virtual void cancel() = 0;
+signals:
+    void done(RunOnThreadBaseRunner* runner, quint64 target, const QObject* object, int status);
+};
+
+template<typename Ctx>
+class RunOnThreadRunner : public RunOnThreadBaseRunner {
+public:
+    RunOnThreadRunner(
+        quint64 taskId,
+        const QObject* obj,
+        std::function<void (Ctx&)> mlFun,
+        std::function<void (quint64, Ctx&)> uiFun
+        )
+        : RunOnThreadBaseRunner()
+        , m_taskId(taskId)
+        , m_obj(obj)
+        , m_mlFun(mlFun)
+        , m_uiFun(uiFun)
+    {
+        setAutoDelete(false);
+    }
+
+    void run() override
+    {
+        if (m_canceled)
+        {
+            emit done(this, m_taskId, m_obj, ThreadRunner::ML_TASK_STATUS_CANCELED);
+            return;
+        }
+        m_mlFun(m_ctx);
+        emit done(this, m_taskId, m_obj, ThreadRunner::ML_TASK_STATUS_SUCCEED);
+    }
+
+    //called from UI thread
+    void runUICallback() override
+    {
+        m_uiFun(m_taskId, m_ctx);
+    }
+
+    void cancel() override
+    {
+        m_canceled = true;
+    }
+private:
+    std::atomic_bool m_canceled {false};
+    quint64 m_taskId;
+    Ctx m_ctx; //default constructed
+    const QObject* m_obj = nullptr;
+    std::function<void (Ctx&)> m_mlFun;
+    std::function<void (quint64, Ctx&)> m_uiFun;
+};
+
+template<typename Ctx>
+quint64 ThreadRunner::runOnThread(const QObject* obj,
+                                      std::function<void (Ctx&)> mlFun,
+                                      std::function<void (quint64 taskId, Ctx&)> uiFun,
+                                      const char* queue)
+{
+    QMutexLocker locker{&m_lock};
+
+    if (m_shuttingDown)
+        return 0;
+
+    auto taskId = m_taskId++;
+    auto runnable = new RunOnThreadRunner<Ctx>(taskId, obj, mlFun, uiFun);
+    connect(runnable, &RunOnThreadBaseRunner::done, this, &ThreadRunner::runOnThreadDone);
+    connect(obj, &QObject::destroyed, this, &ThreadRunner::runOnThreadTargetDestroyed, Qt::DirectConnection);
+    m_runningTasks.insert(taskId, runnable);
+    m_objectTasks.insert(obj, taskId);
+    start(runnable, queue);
+    return taskId;
+}
+
 #endif // MLTHREADPOOL_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlurlmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlurlmodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlurlmodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlurlmodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlvideo.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlvideo.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlvideofoldersmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlvideofoldersmodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlvideofoldersmodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlvideofoldersmodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlvideogroupsmodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlvideogroupsmodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlvideomodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlvideomodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/mlvideomodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/mlvideomodel.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml Changed

@@ -20,7 +20,6 @@
 import QtQuick.Layouts
 import QtQuick.Window
 import QtQml.Models
-import Qt5Compat.GraphicalEffects
 
 import VLC.MainInterface
 import VLC.MediaLibrary
@@ -63,20 +62,63 @@
         sourceSize: artist.cover ? Qt.size(Helpers.alignUp(Screen.desktopAvailableWidth, 32), 0)
                                  : undefined
         mipmap: !!artist.cover
-        fillMode: artist.cover ? Image.PreserveAspectCrop : Image.Tile
-        visible: layer.enabled
+        // Fill mode is stretch when blur effect is used, otherwise an implicit layer is created.
+        // Having the fill mode stretch does not have a side effect here, because source size
+        // is still calculated as to preserve the aspect ratio as height is left empty (0) and the
+        // image is not shown stretched because it is invisible when blur effect is used:
+        // "If only one dimension of the size is set to greater than 0, the other dimension is
+        //  set in proportion to preserve the source image's aspect ratio. (The fillMode is
+        //  independent of this.)". Unfortunately with old Qt versions we can not do this
+        // because it does not seem to create a layer when fill mode (tiling is wanted)
+        // is changed at a later point.
+        fillMode: artist.cover ? ((visible || (MainCtx.qtVersion() < MainCtx.qtVersionCheck(6, 5, 0))) ? Image.PreserveAspectCrop : Image.Stretch)
+                                : Image.Tile
+
+        visible: !blurEffect.visible
         cache: (source === VLCStyle.noArtArtist)
 
-        // Single pass linear filtering, in case the effect is not available:
-        layer.enabled: (GraphicsInfo.shaderType === GraphicsInfo.UnknownShadingLanguage)
-        layer.smooth: true
-        layer.textureSize: Qt.size(width * .75, height * .75)
+        // In fact, since layering is not used blur effect
+        // would not care about the opacity here. Still,
+        // to show intention we can have a simple binding:
+        opacity: blurEffect.visible ? 1.0 : 0.5
     }
 
-    FastBlur {
+    Item {
         anchors.fill: background
-        source: background
-        radius: VLCStyle.dp(4, VLCStyle.scale)
+
+        // The texture is big, and the blur item should only draw the portion of it.
+        // If the blur effect creates an implicit layer, it properly adjusts the
+        // area that it needs to cover. However, as we don't want an additional
+        // layer that keeps getting updated every time the size changes, we feed
+        // the whole static texture. For that reason, we need clipping because
+        // the blur effect is applied to the whole texture and shown as whole:
+        clip: !blurEffect.sourceNeedsLayering
+
+        visible: (GraphicsInfo.shaderType === GraphicsInfo.RhiShader)
+
+        // This blur effect does not create an implicit layer that is updated
+        // each time the size changes. The source texture is static, so the blur
+        // is applied only once and we adjust the viewport through the parent item
+        // with clipping.
+        Widgets.BlurEffect {
+            id: blurEffect
+
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            // If source image is tiled, layering is necessary:
+            readonly property bool sourceNeedsLayering: (background.fillMode !== Image.Stretch) ||
+                                                        (MainCtx.qtVersion() < MainCtx.qtVersionCheck(6, 5, 0))
+
+            readonly property real aspectRatio: (background.implicitHeight / background.implicitWidth)
+
+            height: sourceNeedsLayering ? background.height : (aspectRatio * width)
+
+            source: background
+
+            radius: VLCStyle.dp(4, VLCStyle.scale)
+        }
     }
 
     Rectangle {
@@ -102,20 +144,15 @@
             implicitHeight: VLCStyle.cover_normal
             implicitWidth: VLCStyle.cover_normal
 
-            Widgets.RoundImage {
+            Widgets.ImageExt {
+                id: roundImage
                 source: artist.cover || VLCStyle.noArtArtist
-                sourceSize.width: width
-                sourceSize.height: height
-                anchors.fill: parent
-                radius: VLCStyle.cover_normal
-            }
-
-            Rectangle {
+                sourceSize: Qt.size(width * eDPR, height * eDPR)
                 anchors.fill: parent
                 radius: VLCStyle.cover_normal
-                color: "transparent"
-                border.width: VLCStyle.dp(1, VLCStyle.scale)
-                border.color: theme.border
+                borderColor: theme.border
+                borderWidth: VLCStyle.dp(1, VLCStyle.scale)
+                readonly property real eDPR: MainCtx.effectiveDevicePixelRatio(Window.window)
             }
         }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/AudioGridItem.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/AudioGridItem.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/MusicAlbums.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/MusicAlbums.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml Changed

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 import QtQuick
+import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQml.Models
@@ -76,6 +77,8 @@
     }
 
     Rectangle {
+        id: background
+
         anchors.fill: parent
         color: theme.bg.secondary
 
@@ -113,7 +116,7 @@
         Component {
             id: cover
 
-            Widgets.RoundImage {
+            Widgets.ImageExt {
                 id: expand_cover_id
 
                 property int cover_height: parent.cover_height
@@ -125,15 +128,16 @@
                 source: (root.model && root.model.cover && root.model.cover !== "")
                     ?  root.model.cover
                     : VLCStyle.noArtAlbumCover
-                sourceSize.width: width
-                sourceSize.height: height
+                sourceSize: Qt.size(width * eDPR, height * eDPR)
+
+                readonly property real eDPR: MainCtx.effectiveDevicePixelRatio(Window.window)
 
                 Widgets.DefaultShadow {
                     anchors.centerIn: parent
 
                     sourceItem: parent
 
-                    visible: (parent.status === Widgets.RoundImage.Ready)
+                    visible: (parent.status === Image.Ready)
                 }
             }
         }
@@ -363,52 +367,60 @@
         MusicTrackListDisplay {
             id: tracks
 
-            headerColor: theme.bg.secondary
+            readonly property var _titleModel: {
+                weight: 1,
 
-            fadingEdge.backgroundColor: headerColor
+                model: {
+                    criteria: "title",
 
-            property Component titleDelegate: Widgets.TableRowDelegate {
-                id: title
+                    visible: true,
 
-                RowLayout {
-                    anchors.fill: parent
+                    text: VLCStyle.isScreenSmall ? qsTr("Tracks") : qsTr("Title"),
 
-                    Widgets.ListLabel {
-                        text: title.rowModel?.track_number ?? ""
-                        color: theme.fg.primary
-                        font.weight: Font.Normal
+                    showSection: "",
 
-                        Layout.fillHeight: true
-                        Layout.leftMargin: VLCStyle.margin_xxsmall
-                        Layout.preferredWidth: VLCStyle.margin_large
-                    }
+                    subCriterias: "track_number", "duration",
 
-                    Widgets.ListLabel {
-                        text: title.rowModel?.title ?? ""
-                        color: theme.fg.primary
+                    colDelegate: tableColumns.titleTextDelegate,
+                    headerDelegate: tableColumns.titleTextHeaderDelegate
+                }
+            }
 
-                        Layout.fillHeight: true
-                        Layout.fillWidth: true
-                    }
+            readonly property var _allModel: 
+            {
+                size: .2,
+
+                model: {
+                    criteria: "track_number",
+
+                    visible: true,
+
+                    text: qsTr("#"),
+
+                    showSection: "",
+
+                    hCenterText: true
                 }
-            }
+            },
+                ..._titleModel,
+            {
+                size: 1,
 
-            property Component titleHeaderDelegate: Widgets.TableHeaderDelegate {
-                id: headerDelegate
-                Row {
-                    anchors.fill: parent
-                    Widgets.CaptionLabel {
-                        text: "#"
-                        width: VLCStyle.margin_large
-                        color: headerDelegate.colorContext.fg.secondary
-                    }
+                model: {
+                    criteria: "duration",
 
-                    Widgets.CaptionLabel {
-                        text: qsTr("Title")
-                        color: headerDelegate.colorContext.fg.secondary
-                    }
+                    visible: true,
+
+                    text: qsTr("Duration"),
+
+                    showSection: "",
+
+                    colDelegate: tableColumns.timeColDelegate,
+                    headerDelegate: tableColumns.timeHeaderDelegate
                 }
-            }
+            }
+
+            fadingEdge.backgroundColor: background.color
 
             header: Loader {
                 sourceComponent: VLCStyle.isScreenSmall
@@ -433,44 +445,19 @@
                 currentIndex = 0
             }
 
-            sortModel: {
-                weight: 1,
-
-                model: {
-                    criteria: "title",
-
-                    visible: true,
-
-                    text: qsTr("Title"),
-
-                    showSection: "",
-
-                    colDelegate: titleDelegate,
-                    headerDelegate: titleHeaderDelegate
-                }
-            }, {
-                size: 1,
-
-                model: {
-                    criteria: "duration",
-
-                    visible: true,
-
-                    text: qsTr("Duration"),
-
-                    showSection: "",
-
-                    colDelegate: tableColumns.timeColDelegate,
-                    headerDelegate: tableColumns.timeHeaderDelegate
-                }
-            }
+            sortModel: VLCStyle.isScreenSmall
+                       ? _titleModel // use criterias text with small screens
+                       : _allModel
 
             Navigation.parentItem: root
             Navigation.leftItem: VLCStyle.isScreenSmall ? null : root.enqueueActionBtn
             Navigation.upItem: headerItem
 
+
             Widgets.MLTableColumns {
                 id: tableColumns
+
+                showCriterias: VLCStyle.isScreenSmall
             }
         }
     }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/MusicAllArtists.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/MusicAllArtists.qml Changed

@@ -42,7 +42,22 @@
     property alias sortOrder: artistModel.sortOrder
     property alias sortCriteria: artistModel.sortCriteria
 
-    signal requestArtistAlbumView(int reason)
+    signal artistAlbumViewRequested(var id, int reason)
+
+    function requestArtistAlbumView(reason: int, id = null) {
+        if (id !== null) {
+            console.assert(id !== undefined)
+            artistAlbumViewRequested(id, reason)
+        } else {
+            // Do not call this function if there is no current item,
+            // and you are not providing an explicit id:
+            console.assert(currentIndex >= 0)
+            // Do not call this function if there is no model:
+            console.assert(root.model)
+            const data = root.model.getDataAt(currentIndex)
+            artistAlbumViewRequested(data.id, reason)
+        }
+    }
 
     isSearchable: true
 
@@ -98,7 +113,7 @@
                     artistModel.addAndPlay( selectionModel.selectedIndexes )
                 } else {
                     currentIndex = index
-                    requestArtistAlbumView(Qt.TabFocusReason)
+                    root.requestArtistAlbumView(Qt.TabFocusReason)
                 }
             }
 
@@ -124,7 +139,7 @@
 
                 onItemClicked: (modifier) => { artistGrid.leftClickOnItem(modifier, index) }
 
-                onItemDoubleClicked: root.requestArtistAlbumView(Qt.MouseFocusReason)
+                onItemDoubleClicked: root.requestArtistAlbumView(Qt.MouseFocusReason, model.id)
 
                 onContextMenuButtonClicked: (_, globalMousePos) => {
                     artistGrid.rightClickOnItem(index)
@@ -188,6 +203,7 @@
             model: artistModel
             focus: true
             dragItem: artistsDragItem
+            rowContextMenu: contextMenu
             rowHeight: VLCStyle.tableCoverRow_height
 
             header: root.header
@@ -202,11 +218,10 @@
             sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall
                                                                   : _modelMedium
 
-            onItemDoubleClicked: root.requestArtistAlbumView(Qt.MouseFocusReason)
-
-            onContextMenuButtonClicked: (_,_, globalMousePos) => {
-                contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
+            onItemDoubleClicked: function(index, model) {
+                root.requestArtistAlbumView(Qt.MouseFocusReason, model.id)
             }
+
             onRightClick: (_,_,globalMousePos) => {
                 contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
             }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/MusicArtist.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/MusicArtist.qml Changed

@@ -30,7 +30,11 @@
 FocusScope {
     id: root
 
-    property var artist: ({})
+    required property var artistId
+
+    readonly property int _extraMargin: VLCStyle.dynamicAppMargins(width)
+    readonly property int _contentLeftMargin: VLCStyle.layout_left_margin + _extraMargin
+    readonly property int _contentRightMargin: VLCStyle.layout_right_margin + _extraMargin
 
     //the index to "go to" when the view is loaded
     property int initialIndex: 0
@@ -57,6 +61,8 @@
 
     property alias _currentView: view.currentItem
 
+    property var _artist: ({})
+
     function navigationShowHeader(y, height) {
         const newContentY = Helpers.flickablePositionContaining(_currentView, y, height, 0, 0)
 
@@ -94,7 +100,7 @@
 
                 rightPadding: root.rightPadding
 
-                artist: root.artist
+                artist: root._artist
 
                 onActiveFocusChanged: {
                     // make sure content is visible with activeFocus
@@ -115,7 +121,7 @@
             Widgets.ViewHeader {
                 view: root
 
-                leftPadding: VLCStyle.margin_xlarge
+                leftPadding: root._contentLeftMargin
                 bottomPadding: VLCStyle.layoutTitle_bottom_padding -
                                (MainCtx.gridView ? 0 : VLCStyle.gridItemSelectedBorder)
 
@@ -145,9 +151,9 @@
                     Widgets.ListViewExt {
                         id: albumsList
 
-                        x: VLCStyle.margin_xlarge - VLCStyle.gridItemSelectedBorder
+                        x: root._contentLeftMargin - VLCStyle.gridItemSelectedBorder
 
-                        width: root.width - root.rightPadding - x * 2
+                        width: root.width - root.rightPadding - root._contentLeftMargin - root._contentRightMargin
                         height: gridHelper.cellHeight + topMargin + bottomMargin + VLCStyle.margin_xxxsmall
 
                         leftMargin: VLCStyle.gridItemSelectedBorder
@@ -186,6 +192,9 @@
                         delegate: Widgets.GridItem {
                             id: gridItem
 
+                            required property var model
+                            required property int index
+
                             y: selectedBorderWidth
 
                             width: gridHelper.cellWidth
@@ -199,9 +208,15 @@
 
                             title: model.title || qsTr("Unknown title")
                             subtitle: model.release_year || ""
+                            subtitleVisible: true
                             textAlignHCenter: true
                             dragItem: albumDragItem
 
+                            // updates to selection is manually handled for optimization purpose
+                            Component.onCompleted: _updateSelected()
+
+                            onIndexChanged: _updateSelected()
+
                             onPlayClicked: play()
                             onItemDoubleClicked: play()
 
@@ -214,16 +229,33 @@
                             Connections {
                                 target: albumsList.selectionModel
 
-                                function onSelectionChanged() {
-                                    gridItem.selected = albumsList.selectionModel.isSelected(index)
+                                function onSelectionChanged(selected, deselected) {
+                                    const idx = albumModel.index(gridItem.index, 0)
+                                    const findInSelection = s => s.find(range => range.contains(idx)) !== undefined
+
+                                    // NOTE: we only get diff of the selection
+                                    if (findInSelection(selected))
+                                        gridItem.selected = true
+                                    else if (findInSelection(deselected))
+                                        gridItem.selected = false
                                 }
                             }
 
+                            onContextMenuButtonClicked: (_, globalMousePos) => {
+                                albumSelectionModel.updateSelection( Qt.NoModifier , albumsList.currentIndex, index )
+                                contextMenu.popup(albumSelectionModel.selectedIndexes
+                                                  , globalMousePos)
+                            }
+
                             function play() {
                                 if ( model.id !== undefined ) {
                                     MediaLib.addAndPlay( model.id )
                                 }
                             }
+
+                            function _updateSelected() {
+                                selected = albumSelectionModel.isRowSelected(gridItem.index)
+                            }
                         }
 
                         onActionAtIndex: (index) => { albumModel.addAndPlay( new Array(index) ) }
@@ -232,7 +264,7 @@
                     Widgets.ViewHeader {
                         view: root
 
-                        leftPadding: VLCStyle.margin_xlarge
+                        leftPadding: root._contentLeftMargin
                         topPadding: 0
 
                         text: qsTr("Tracks")
@@ -246,6 +278,8 @@
 
     onInitialIndexChanged: resetFocus()
 
+    onArtistIdChanged: fetchArtistData()
+
     function setCurrentItemFocus(reason) {
         if (view.currentItem === null) {
             Qt.callLater(setCurrentItemFocus, reason)
@@ -291,16 +325,40 @@
             tableView_id.currentIndex = 0;
     }
 
+    function fetchArtistData() {
+        if (!artistId)
+            return
+
+        if (artistModel.loading)
+            return
+
+        artistModel.getDataById(artistId)
+            .then((artistData) => {
+                root._artist = artistData
+            })
+    }
+
     readonly property ColorContext colorContext: ColorContext {
         id: theme
         colorSet: ColorContext.View
     }
 
+
+    MLArtistModel {
+        id: artistModel
+        ml: MediaLib
+
+        onLoadingChanged: {
+            if (!loading)
+                fetchArtistData()
+        }
+    }
+
     MLAlbumModel {
         id: albumModel
 
         ml: MediaLib
-        parentId: artist.id
+        parentId: artistId
 
         onCountChanged: {
             if (albumModel.count > 0 && !albumSelectionModel.hasSelection) {
@@ -515,6 +573,8 @@
 
             dragItem: tableDragItem
 
+            rowContextMenu: trackContextMenu
+
             Navigation.parentItem: root
 
             Navigation.upAction: function() {
@@ -524,7 +584,6 @@
             Navigation.cancelAction: root._onNavigationCancel
 
             onItemDoubleClicked: MediaLib.addAndPlay(model.id)
-            onContextMenuButtonClicked: trackContextMenu.popup(tableView_id.selectionModel.selectedIndexes, globalMousePos)
             onRightClick: trackContextMenu.popup(tableView_id.selectionModel.selectedIndexes, globalMousePos)
 
             onDragItemChanged: console.assert(tableView_id.dragItem === tableDragItem)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml Changed

@@ -19,12 +19,14 @@
  *****************************************************************************/
 
 import QtQuick
+import QtQuick.Window
 import QtQuick.Templates as T
 import QtQuick.Layouts
 import QtQml.Models
 
 import VLC.MediaLibrary
 
+import VLC.MainInterface
 import VLC.Widgets as Widgets
 import VLC.Style
 import VLC.Util
@@ -97,7 +99,7 @@
 
                 if (!(root.selected && button === Qt.RightButton)) {
                     view.selectionModel.updateSelection(point.modifiers, view.currentIndex, index)
-                    view.currentIndex = index
+                    view.currentIndex = root.index
                 }
             }
 
@@ -124,7 +126,7 @@
                     if (active) {
                         if (!selected) {
                             view.selectionModel.select(index, ItemSelectionModel.ClearAndSelect)
-                            view.currentIndex = index
+                            view.currentIndex = root.index
                         }
 
                         target.Drag.active = true
@@ -157,9 +159,10 @@
     contentItem: RowLayout {
         spacing: VLCStyle.margin_xsmall
 
-        Widgets.RoundImage {
-            implicitWidth: VLCStyle.play_cover_small
-            implicitHeight: VLCStyle.play_cover_small
+        Widgets.ImageExt {
+            id: roundImage
+
+            Layout.preferredHeight: VLCStyle.play_cover_small
             Layout.fillHeight: true
             Layout.preferredWidth: height
 
@@ -167,22 +170,29 @@
 
             source: (model.cover) ? model.cover
                                   : VLCStyle.noArtArtistSmall
-            sourceSize.width: width
-            sourceSize.height: height
+            sourceSize: Qt.size(width * eDPR, height * eDPR)
 
             Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
 
+            readonly property real eDPR: MainCtx.effectiveDevicePixelRatio(Window.window)
+
+            borderColor: (isCurrent || _isHover) ? theme.accent
+                                                 : theme.border
+
+            borderWidth: VLCStyle.dp(1, VLCStyle.scale)
+
+            // FIXME: Qt bug (observed 6.2 and 6.8): Without an alpha node beneath the image, the image does not get rendered.
             Rectangle {
-                anchors.fill: parent
+                z: -1
 
-                radius: VLCStyle.play_cover_small
+                anchors.centerIn: parent
 
-                color: "transparent"
+                width: 1
+                height: 1
 
-                border.width: VLCStyle.dp(1, VLCStyle.scale)
+                opacity: 0.01
 
-                border.color: (isCurrent || _isHover) ? theme.accent
-                                                      : theme.border
+                color: "black"
             }
         }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml Changed

@@ -42,6 +42,9 @@
 
     property int initialIndex: 0
     property int initialAlbumIndex: 0
+    property var artistId: undefined
+
+    property var _requestedArtistId: undefined
 
     //behave like a page
     property var pagePrefix: 
@@ -59,12 +62,11 @@
     property alias currentIndex: artistList.currentIndex
     property alias currentAlbumIndex: albumSubView.currentIndex
 
-    property alias currentArtist: albumSubView.artist
     property bool isScreenSmall: VLCStyle.isScreenSmall
 
     onInitialAlbumIndexChanged: resetFocus()
     onInitialIndexChanged: resetFocus()
-    onCurrentIndexChanged: currentArtist = model.getDataAt(currentIndex)
+
     onIsScreenSmallChanged: {
         if (VLCStyle.isScreenSmall)
             resetFocus()
@@ -78,8 +80,6 @@
 
         if (model.count === 0 || initialIndex === -1) return
 
-        selectionModel.select(model.index(initialIndex, 0), ItemSelectionModel.ClearAndSelect)
-
         artistList.positionViewAtIndex(initialIndex, ItemView.Contain)
 
         artistList.setCurrentItem(initialIndex)
@@ -108,9 +108,38 @@
             root.resetFocus()
         }
 
-        onDataChanged: {
-            if (topLeft.row <= currentIndex && bottomRight.row >= currentIndex)
-                currentArtist = artistModel.getDataAt(currentIndex)
+        //set the list on the requested artist id
+        onLoadingChanged: {
+            if (loading)
+                return
+
+            const defined = v => typeof v !== "undefined"
+
+            if ((root._requestedArtistId === root.artistId)
+                    && defined(root._requestedArtistId))
+                return
+
+            root._requestedArtistId = root.artistId
+            if (!defined(root._requestedArtistId))
+                return
+
+            const thisRequestID = root._requestedArtistId
+            artistModel.getIndexFromId(root._requestedArtistId)
+                .then((row) => {
+                    if ((root._requestedArtistId !== thisRequestID)
+                        || (root._requestedArtistId !== root.artistId))
+                        return
+
+                    artistList.currentIndex = row
+                    artistList._sidebarInitialyPositioned = true
+                })
+                .catch(() => {
+                    if ((root._requestedArtistId !== thisRequestID)
+                       || (root._requestedArtistId !== root.artistId))
+                    return
+
+                    artistList._sidebarInitialyPositioned = true
+                })
         }
     }
 
@@ -131,6 +160,8 @@
         Widgets.ListViewExt {
             id: artistList
 
+            property bool _sidebarInitialyPositioned: false
+
             model: artistModel
             selectionModel: root.selectionModel
             currentIndex: -1
@@ -148,15 +179,70 @@
             fadingEdge.backgroundColor: artistListBackground.usingAcrylic ? "transparent"
                                                                           : artistListBackground.alternativeColor
 
+
+            onCurrentIndexChanged: {
+                if (!artistList._sidebarInitialyPositioned)
+                    return
+                root.artistId = model.getDataAt(currentIndex).id
+            }
+
             Widgets.AcrylicBackground {
                 id: artistListBackground
 
                 z: -1
 
                 anchors.fill: parent
-                anchors.bottomMargin: -artistList.displayMarginEnd
+
+                anchors.bottomMargin: usingAcrylic ? 0 : -artistList.displayMarginEnd
 
                 tintColor: artistList.colorContext.bg.secondary
+
+                Rectangle {
+                    // For the frosted glass effect to work properly, the content
+                    // (source) should be opaque. If there is inter-window backdrop
+                    // blur, this is not the case.
+
+                    // Note that beneath there is already (`stackViewParent`) a
+                    // background rectangle, but since `ViewBlockingRectangle` does
+                    // not use blending to block anything beneath in the scene graph
+                    // being rendered, the layered source essentially has transparent
+                    // area. Qt 5 (barely) allowed having layered items to have RGB
+                    // texture, but Qt 6 RHI mandates RGBA format
+                    // (`ShaderEffectSource.RGBA`).
+
+                    // For that reason, we need to restrict the extents of inter-window
+                    // backdrop blur (`AcrylicBackground`) to the beginning boundaries
+                    // of the area that is going to be blurred by `FrostedGlassEffect`.
+
+                    // This rectangle would not be necessary if there was a guarantee
+                    // that `stackViewParent`'s color is the same as
+                    // `artistListBackground.alternativeColor` as the `AcrylicBackground`
+                    // area is restricted, but since there is no such mandate this
+                    // rectangle can act as the opaque background provider with the
+                    // desired color.
+
+                    // Ideally the `FrostedGlassEffect` itself should have a base
+                    // rectangle that it places beneath the source, similar to
+                    // how it has a `filter` that it places on top of the source,
+                    // but this is not possible because `AcrylicBackground`/
+                    // `ViewBlockingRectangle` prevents anything beneath in the
+                    // scene graph to be rendered as it acts as a "pass through"
+                    // (for video visual PIP player case, or the window itself
+                    // for the inter-window backdrop blur case).
+
+                    // Background should be opaque, though here if it is translucent,
+                    // there is also another background provider `stackViewParent`
+                    // but its color may be different:
+                    color: Qt.alpha(artistListBackground.alternativeColor, 1.0)
+
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.top: parent.bottom
+
+                    height: artistList.displayMarginEnd
+
+                    visible: (height > 0.0) && artistListBackground.usingAcrylic
+                }
             }
 
             // To get blur effect while scrolling in mainview
@@ -261,6 +347,8 @@
         MusicArtist {
             id: albumSubView
 
+            artistId: root.artistId
+
             Layout.fillHeight: true
             Layout.fillWidth: true

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/MusicArtistsDisplay.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/MusicArtistsDisplay.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/MusicGenres.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/MusicGenres.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml Changed

@@ -155,14 +155,15 @@
     function _dropAction(drop, index) {
         const item = drop.source
         if (Helpers.isValidInstanceOf(item, Widgets.DragItem)) {
-            item.getSelectedInputItem().then(inputItems => {
+            drop.accepted = true
+            return item.getSelectedInputItem().then(inputItems => {
                 if (index === undefined)
                     DialogsProvider.playlistsDialog(inputItems)
                 else
                     root.model.append(root.model.getItemId(index), inputItems)
             })
-            drop.accepted = true
         } else if (drop.hasUrls) {
+            drop.accepted = true
             const urlList = 
             for (let url in drop.urls)
                 urlList.push(drop.urlsurl)
@@ -170,10 +171,10 @@
                 DialogsProvider.playlistsDialog(inputItems)
             else
                 root.model.append(root.model.getItemId(index), urlList)
-            drop.accepted = true
         } else {
             drop.accepted = false
         }
+        return Promise.resolve()
     }
 
     //---------------------------------------------------------------------------------------------
@@ -237,6 +238,10 @@
         model: root.model
 
         ctx: MainCtx
+
+        function tableView_popup(index, selectedIndexes, globalPos) {
+            popup(selectedIndexes, globalPos)
+        }
     }
 
     // TBD: Refactor this with MusicGenres ?
@@ -314,9 +319,19 @@
                     }
 
                     onDropped: function(drop) {
-                        root._dropAction(drop, index)
+                        MainCtx.setCursor(gridView, Qt.BusyCursor)
+                        root._dropAction(drop, index).then(() => {
+                            if (gridView)
+                                MainCtx.unsetCursor(gridView)
+                        })
                     }
                 }
+
+                Component.onCompleted: {
+                    // Qt Quick Button sets a cursor for itself, unset it so that if the view has
+                    // busy cursor, it is visible over the delegate:
+                    MainCtx.unsetCursor(this)
+                }
             }
 
             //-------------------------------------------------------------------------------------
@@ -403,14 +418,15 @@
 
             header: root.header
 
+            rowContextMenu: contextMenu
+
             listView.isDropAcceptableFunc: function(drag, index) {
                 root._adjustDragAccepted(drag)
                 return drag.accepted
             }
 
             listView.acceptDropFunc: function(index, drop) {
-                return new Promise(() => { root._dropAction(drop,
-                                                            listView.itemContainsDrag.index) } )
+                return root._dropAction(drop, listView.itemContainsDrag.index)
             }
 
             listView.dropIndicator: null
@@ -424,10 +440,6 @@
 
             onItemDoubleClicked: (_, model) => showList(model, Qt.MouseFocusReason)
 
-            onContextMenuButtonClicked: (_, _, globalMousePos) => {
-                contextMenu.popup(selectionModel.selectedRows(), globalMousePos)
-            }
-
             onRightClick: (_, _, globalMousePos) => {
                 contextMenu.popup(selectionModel.selectedRows(), globalMousePos)
             }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/UrlListDisplay.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/UrlListDisplay.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/VideoAll.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/VideoAll.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml Changed

@@ -42,7 +42,29 @@
 
     // Private
 
-    property var _meta: null
+    readonly property QtObject _meta: {
+        const grouping = MainCtx.grouping;
+
+        if (grouping === MainCtx.GROUPING_NAME)
+            return groupComponent.createObject()
+        else if (grouping === MainCtx.GROUPING_FOLDER)
+            return folderComponent.createObject()
+        else
+            return videoComponent.createObject()
+    }
+
+    on_MetaChanged: {
+        // Purge the objects that are pending deletion, to have the model
+        // preservation behavior aligned with 460cd3d4. If we don't do
+        // this, the QML/JS engine would pick an arbitrary time to collect
+        // garbage, potentially leading having all models alive at the
+        // same time:
+        // > having the three models always present, means that the data (at
+        // > least the first chuck) is loaded 3 times, and will be reloaded
+        // > 3 times every time a database event triggers a refresh of the
+        // > model.
+        gc() // `QJSEngine::GarbageCollectionExtension` is installed by default
+    }
 
     // Signals
 
@@ -64,19 +86,6 @@
 
     // Functions
 
-    function _updateMetaModel(groupping) {
-        if (root._meta)
-            root._meta.destroy()
-
-        if (groupping === MainCtx.GROUPING_NAME) {
-            root._meta = groupComponent.createObject(root)
-        } else if (groupping === MainCtx.GROUPING_FOLDER) {
-            root._meta = folderComponent.createObject(root)
-        } else {
-            root._meta = videoComponent.createObject(root)
-        }
-    }
-
     function getLabelGroup(model, string) {
         if (!model) return ""
 
@@ -104,15 +113,6 @@
 
     // Children
 
-    Connections {
-        target: MainCtx
-        function onGroupingChanged() {
-            root._updateMetaModel(MainCtx.grouping)
-        }
-    }
-
-    Component.onCompleted: root._updateMetaModel(MainCtx.grouping)
-
     Component {
         id: videoComponent

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/VideoGridItem.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/VideoGridItem.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/menus/custom_menus.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/menus/custom_menus.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/menus/menus.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/menus/menus.cpp Changed

@@ -46,6 +46,7 @@
 #include "dialogs/systray/systray.hpp"
 #include "util/varchoicemodel.hpp"
 #include "util/color_scheme_model.hpp"
+#include "util/colorizedsvgicon.hpp"
 #include "medialibrary/medialib.hpp"
 #include "medialibrary/mlrecentsmodel.hpp"
 #include "medialibrary/mlbookmarkmodel.hpp"
@@ -87,20 +88,15 @@
 #ifndef __APPLE__ /* We don't set icons in menus in MacOS X */
     if( !EMPTY_STR( icon ) )
     {
-        if( !EMPTY_STR( shortcut ) )
-            action = menu->addAction( QIcon( icon ), text, THEDP,
-                                      member, qfut( shortcut ) );
-        else
-            action = menu->addAction( QIcon( icon ), text, THEDP, member );
+        action = menu->addAction( ColorizedSvgIcon::colorizedIconForWidget( icon, menu ), text, THEDP, member );
     }
     else
 #endif
     {
-        if( !EMPTY_STR( shortcut ) )
-            action = menu->addAction( text, THEDP, member, qfut( shortcut ) );
-        else
-            action = menu->addAction( text, THEDP, member );
+        action = menu->addAction( text, THEDP, member );
     }
+    if( !EMPTY_STR( shortcut ) )
+        action->setShortcut( qfut( shortcut ) );
 #ifdef __APPLE__
     action->setMenuRole( role );
 #else
@@ -124,7 +120,7 @@
     if( !EMPTY_STR( icon ) )
     {
         action = menu->addAction( text, THEMIM,  member );
-        action->setIcon( QIcon( icon ) );
+        action->setIcon( ColorizedSvgIcon::colorizedIconForWidget( icon, menu ) );
     }
     else
 #endif
@@ -146,7 +142,7 @@
     if( !EMPTY_STR( icon ) )
     {
         action = menu->addAction( text, THEMPL,  member );
-        action->setIcon( QIcon( icon ) );
+        action->setIcon( ColorizedSvgIcon::colorizedIconForWidget( icon, menu ) );
     }
     else
 #endif
@@ -318,7 +314,7 @@
 
     action = menu->addAction(
 #ifndef __APPLE__
-            QIcon( ":/menu/ic_playlist.svg" ),
+            ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_playlist.svg", menu ),
 #endif
             qtr( "Play&list" ));
     action->setShortcut(QString( "Ctrl+L" ));
@@ -343,7 +339,8 @@
 
     /* FullScreen View */
     action = menu->addAction( qtr( "&Fullscreen Interface" ), mi,
-            &MainCtx::toggleInterfaceFullScreen, QString( "F11" ) );
+            &MainCtx::toggleInterfaceFullScreen );
+    action->setShortcut( QString( "F11" ) );
     action->setCheckable( true );
     action->setChecked( mi->interfaceVisibility() == QWindow::FullScreen );
 
@@ -457,7 +454,10 @@
 {
     if( current->isEmpty() )
     {
-        current->addMenu(new CheckableListMenu(qtr( "Video &Track" ), THEMIM->getVideoTracks(), QActionGroup::ExclusionPolicy::ExclusiveOptional, current));
+        current->addMenu(new CheckableListMenu(qtr( "Video &Track" ), THEMIM->getVideoTracks(), QActionGroup::ExclusionPolicy::None, current));
+
+        current->addSeparator();
+        current->addMenu( new CheckableListMenu(qtr( "&3D Output" ), THEMIM->getVideoStereoMode(), QActionGroup::ExclusionPolicy::Exclusive, current) );
 
         current->addSeparator();
         /* Surface modifiers */
@@ -587,7 +587,7 @@
                 THEMPL->togglePlayPause();
         });
 #ifndef __APPLE__ /* No icons in menus in Mac */
-        action->setIcon( QIcon( ":/menu/ic_fluent_play_filled.svg" ) );
+        action->setIcon( ColorizedSvgIcon::colorizedIconForWidget( QStringLiteral(":/menu/ic_fluent_play_filled.svg"), menu ) );
 #endif
     }
     else
@@ -634,17 +634,17 @@
         action = rateMenu->addAction( qtr( "&Faster" ), THEMIM,
                                   &PlayerController::faster );
 #ifndef __APPLE__ /* No icons in menus in Mac */
-        action->setIcon( QIcon( ":/menu/ic_fluent_fast_forward.svg") );
+        action->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_fluent_fast_forward.svg", rateMenu ) );
 #endif
     }
 
-    action = rateMenu->addAction( QIcon( ":/menu/ic_fluent_fast_forward.svg" ), qtr( "Faster (fine)" ), THEMIM,
+    action = rateMenu->addAction( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_fluent_fast_forward.svg", rateMenu ), qtr( "Faster (fine)" ), THEMIM,
                               &PlayerController::littlefaster );
 
     action = rateMenu->addAction( qtr( "N&ormal Speed" ), THEMIM,
                               &PlayerController::normalRate );
 
-    action = rateMenu->addAction( QIcon( ":/menu/ic_fluent_rewind.svg" ), qtr( "Slower (fine)" ), THEMIM,
+    action = rateMenu->addAction( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_fluent_rewind.svg", rateMenu ), qtr( "Slower (fine)" ), THEMIM,
                               &PlayerController::littleslower );
 
     if( b_normal )
@@ -652,7 +652,7 @@
         action = rateMenu->addAction( qtr( "Slo&wer" ), THEMIM,
                                   &PlayerController::slower );
 #ifndef __APPLE__ /* No icons in menus in Mac */
-        action->setIcon( QIcon( ":/menu/ic_fluent_rewind.svg") );
+        action->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_fluent_rewind.svg", rateMenu ) );
 #endif
     }
 
@@ -665,16 +665,17 @@
     action = menu->addAction( qtr( "&Jump Forward" ), THEMIM,
              &PlayerController::jumpFwd );
 #ifndef __APPLE__ /* No icons in menus in Mac */
-    action->setIcon( QIcon( ":/menu/ic_fluent_skip_forward_10.svg") );
+    action->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_fluent_skip_forward_10.svg", menu ) );
 #endif
 
     action = menu->addAction( qtr( "Jump Bac&kward" ), THEMIM,
              &PlayerController::jumpBwd );
 #ifndef __APPLE__ /* No icons in menus in Mac */
-    action->setIcon( QIcon( ":/menu/ic_fluent_skip_back_10.svg") );
+    action->setIcon( ColorizedSvgIcon::colorizedIconForWidget( ":/menu/ic_fluent_skip_back_10.svg", menu ) );
 #endif
 
-    action = menu->addAction( qfut( I_MENU_GOTOTIME ), THEDP, &DialogsProvider::gotoTimeDialog, qtr( "Ctrl+T" ) );
+    action = menu->addAction( qfut( I_MENU_GOTOTIME ), THEDP, &DialogsProvider::gotoTimeDialog );
+    action->setShortcut( qtr( "Ctrl+T" ) );
 
     menu->addSeparator();
 }
@@ -759,12 +760,7 @@
         /* Add a fullscreen switch button, since it is the most used function */
         if( p_vout )
         {
-            b_isFullscreen = THEMIM->isFullscreen();
-            if (b_isFullscreen)
-                menu->addAction(new BooleanPropertyAction(qtr( "Leave Fullscreen" ), THEMIM, "fullscreen", menu) );
-            else
-                menu->addAction(new BooleanPropertyAction(qtr( "&Fullscreen" ), THEMIM, "fullscreen", menu) );
-
+            menu->addAction(new BooleanPropertyAction(qtr( "&Fullscreen" ), THEMIM, "fullscreen", menu) );
             menu->addSeparator();
         }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/menus/menus.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/menus/menus.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/menus/qml/GlobalShortcuts.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/menus/qml/GlobalShortcuts.qml Changed

@@ -28,7 +28,7 @@
     ShortcutExt{ sequence:"Ctrl+D"; onActivated: DialogsProvider.openDiscDialog(); }
     ShortcutExt{ sequence:"Ctrl+N"; onActivated: DialogsProvider.openNetDialog(); }
     ShortcutExt{ sequence:"Ctrl+C"; onActivated: DialogsProvider.openCaptureDialog(); }
-    ShortcutExt{ sequence:"Ctrl+V"; onActivated: DialogsProvider.openUrlDialog(); }
+    ShortcutExt{ sequences: StandardKey.Paste; onActivated: MainCtx.pasteFromClipboard(); }
     ShortcutExt{ context: Qt.WindowShortcut; sequence:"Ctrl+Y"; onActivated: DialogsProvider.savePlayingToPlaylist(); }
     ShortcutExt{ sequence:"Ctrl+R"; onActivated: DialogsProvider.openAndTranscodingDialogs(); }
     ShortcutExt{ sequence:"Ctrl+S"; onActivated: DialogsProvider.openAndStreamingDialogs(); }
@@ -49,8 +49,8 @@
     ShortcutExt{ sequence:"F11"; onActivated: MainCtx.toggleInterfaceFullScreen() }
     ShortcutExt{ sequence:"Ctrl+H"; onActivated: MainCtx.minimalView = !MainCtx.minimalView; }
 
-    ShortcutExt{ sequence: StandardKey.ZoomIn; onActivated: MainCtx.incrementIntfUserScaleFactor(true) }
-    ShortcutExt{ sequence: StandardKey.ZoomOut; onActivated: MainCtx.incrementIntfUserScaleFactor(false) }
+    ShortcutExt{ sequences: StandardKey.ZoomIn; onActivated: MainCtx.incrementIntfUserScaleFactor(true) }
+    ShortcutExt{ sequences: StandardKey.ZoomOut; onActivated: MainCtx.incrementIntfUserScaleFactor(false) }
 
     Loader {
         active: MainCtx.mediaLibraryAvailable

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/menus/qml/Menubar.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/menus/qml/Menubar.qml Changed

@@ -23,8 +23,10 @@
 
 import VLC.MainInterface
 import VLC.Style
+import VLC.Widgets as Widgets
 import VLC.Menus
 
+
 Item {
     id: root
 
@@ -38,45 +40,76 @@
         colorSet: ColorContext.MenuBar
     }
 
-    Action{ id: mediaMenu;    text: qsTr("&Media")    ; onTriggered: (source) => menubar.popupMediaMenu(source);   }
-    Action{ id: playbackMenu; text: qsTr("&Playback") ; onTriggered: (source) => menubar.popupPlaybackMenu(source);}
-    Action{ id: videoMenu;    text: qsTr("&Video")    ; onTriggered: (source) => menubar.popupVideoMenu(source);   }
-    Action{ id: audioMenu;    text: qsTr("&Audio")    ; onTriggered: (source) => menubar.popupAudioMenu(source);   }
-    Action{ id: subtitleMenu; text: qsTr("&Subtitle") ; onTriggered: (source) => menubar.popupSubtitleMenu(source);}
-    Action{ id: toolMenu;     text: qsTr("&Tools")    ; onTriggered: (source) => menubar.popupToolsMenu(source);   }
-    Action{ id: viewMenu;     text: qsTr("V&iew")     ; onTriggered: (source) => menubar.popupViewMenu(source);    }
-    Action{ id: helpMenu;     text: qsTr("&Help")     ; onTriggered: (source) => menubar.popupHelpMenu(source);    }
-
-    property var toolbarModel: 
-        mediaMenu,
-        playbackMenu,
-        videoMenu,
-        audioMenu,
-        subtitleMenu,
-        toolMenu,
-        viewMenu,
-        helpMenu,
+    readonly property var toolbarModel: 
+        QmlMenuBar.MEDIA,
+        QmlMenuBar.PLAYBACK,
+        QmlMenuBar.VIDEO,
+        QmlMenuBar.AUDIO,
+        QmlMenuBar.SUBTITLE,
+        QmlMenuBar.TOOL,
+        QmlMenuBar.VIEW,
+        QmlMenuBar.HELP
     
 
     property int _menuIndex: -1
     property int _countHovered: 0
 
+    //will contain the visible action (after _updateContentModel)
+    property var _visibleActionsModel: 
+    //will contain the actions acessible through the '>' menu (after _updateContentModel)
+    property var _extraActionsModel: 
+
+
+    signal _requestMenuPopup(int menuId)
 
     // Accessible
     Accessible.role: Accessible.MenuBar
 
-    function openMenu(obj, cb, index) {
-        cb.trigger(obj)
+    onWidthChanged: _updateContentModel()
+
+    function _openMenu(item, index) {
+        menubar.popupMenuEntry(item, toolbarModelindex)
         root._menuIndex = index
     }
 
-    function updateHover(obj, cb, index, hovered ) {
+    function _updateHover(item, index, hovered ) {
         root._countHovered += hovered ? 1 : -1
 
         if (hovered && menubar.openMenuOnHover) {
-            cb.trigger(obj)
-            root._menuIndex = index
+            _openMenu(item, index)
+        }
+    }
+
+    //set up the model to show as many as possible menu entries
+    //remaining menus are placed in the ">" menu
+    function _updateContentModel() {
+        const visibleActions = 
+        const extraActions = 
+        const extraPadding = VLCStyle.margin_xsmall * 2
+        //keep enough place for the > menu
+        let availableWidth = root.width - _buttonWidth(root._extraActionLabel)
+        let i = 0
+        for (; i < root.toolbarModel.length; ++i) {
+            const textWidth = _buttonWidth(toolbarModeli)
+            if (textWidth < availableWidth) {
+                visibleActions.push(i)
+            } else {
+                break
+            }
+            availableWidth -= textWidth;
+        }
+        for (; i < toolbarModel.length; ++i) {
+            extraActions.push(i)
         }
+
+        root._visibleActionsModel = visibleActions
+        root._extraActionsModel = extraActions
+    }
+
+    function _buttonWidth(buttonId) {
+        return fontMetrics.advanceWidth(
+                    menubar.menuEntryTitle(buttonId).replace("&", "") //beware of mnemonics
+                ) + (VLCStyle.margin_xsmall * 2)
     }
 
     QmlMenuBar {
@@ -88,51 +121,130 @@
         onMenuClosed: _menuIndex = -1
         onNavigateMenu: (direction) => {
             const i =  (root._menuIndex + root.toolbarModel.length + direction) % root.toolbarModel.length
-            root.openMenu(menubarLayout.visibleChildreni, root.toolbarModeli, i)
+            root._requestMenuPopup(i)
         }
     }
 
-    RowLayout {
+    FontMetrics {
+        id: fontMetrics
+        font.pixelSize: VLCStyle.fontSize_normal
+    }
+
+    Row {
         id: menubarLayout
         spacing: 0
+
         Repeater {
-            model: root.toolbarModel
+            model: root._visibleActionsModel
 
-            T.MenuItem {
-                id: control
+            MenubarButton {
+                id: visibleButton
 
-                text: modelData.text
-                onClicked: root.openMenu(this, modelData, index)
-                onHoveredChanged: root.updateHover(this, modelData, index, hovered)
-                font.pixelSize: VLCStyle.fontSize_normal
+                text: menubar.menuEntryTitle(toolbarModelmodelData)
+                focused: modelData === root._menuIndex
 
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                onClicked: root._openMenu(visibleButton, modelData)
+                onHoveredChanged: root._updateHover(visibleButton, modelData, hovered)
 
-                implicitWidth: contentItem.implicitWidth + VLCStyle.margin_xsmall * 2
-                implicitHeight: contentItem.implicitHeight + VLCStyle.margin_xxxsmall * 2
+                Connections {
+                    target: root
+                    function on_RequestMenuPopup(menuId) {
+                        if (menuId === modelData) {
+                            root._openMenu(visibleButton, modelData)
+                        }
+                    }
+                }
+            }
+        }
 
-                Accessible.onPressAction: control.clicked()
+        Repeater {
+            model: root._extraActionsModel
 
-                ColorContext {
-                    id: theme
-                    colorSet: root.colorContext.colorSet
+            Item {
+                id: hiddenButton
 
-                    enabled: control.enabled
-                    focused: index === root._menuIndex
-                    hovered: control.hovered
-                }
+                width: _buttonWidth(toolbarModelmodelData)
+                height: 1 //item with 0 height are discarded
+                anchors.bottom: menubarLayout.bottom
+
+                T.MenuItem {
+                    text: menubar.menuEntryTitle(toolbarModelmodelData)
+
+                    width: 0
+                    height: 0
+
+                    onClicked: root._openMenu(hiddenButton, modelData)
+                    Accessible.onPressAction: root._openMenu(hiddenButton, modelData)
 
-                contentItem: IconLabel {
-                    text: control.text
-                    font: control.font
-                    opacity: enabled ? 1.0 : 0.3
-                    color: theme.fg.primary
+                    contentItem: null
+                    background: null
                 }
 
-                background: Rectangle {
-                    color: theme.bg.primary
+                Connections {
+                    target: root
+                    function on_RequestMenuPopup(menuId) {
+                        if (menuId === modelData) {
+                            root._openMenu(hiddenButton, modelData)
+                        }
+                    }
                 }
             }
         }
     }
+
+    MenubarButton {
+        id: extraActionButton
+
+        anchors.top:  parent.top
+        anchors.right: parent.right
+
+        text: ">"
+
+        Accessible.ignored: true
+
+        visible: _extraActionsModel.length > 0
+        enabled: visible
+
+        onClicked: menubar.popupExtraActionsMenu(extraActionButton, root._extraActionsModel)
+    }
+
+    component MenubarButton: T.MenuItem {
+        id: control
+
+        property bool focused: false
+        property bool textVisible: true
+
+        font.pixelSize: VLCStyle.fontSize_normal
+
+        padding: 0
+
+        implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
+        implicitHeight: contentItem.implicitHeight + VLCStyle.margin_xxxsmall * 2
+
+        leftPadding: VLCStyle.margin_xsmall
+        rightPadding: VLCStyle.margin_xsmall
+
+        Accessible.onPressAction: control.clicked()
+
+        ColorContext {
+            id: theme
+            colorSet: root.colorContext.colorSet
+
+            enabled: control.enabled
+            focused: control.focused
+            hovered: control.hovered
+        }
+
+        contentItem: IconLabel {
+            text: control.text
+            font: control.font
+            opacity: enabled ? 1.0 : 0.3
+            color: theme.fg.primary
+            visible: control.textVisible
+        }
+
+        background: Rectangle {
+            color: theme.bg.primary
+        }
+    }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/menus/qml_menu_wrapper.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/menus/qml_menu_wrapper.cpp Changed

@@ -27,6 +27,7 @@
 #include "playlist/playlist_controller.hpp"
 #include "playlist/playlist_model.hpp"
 #include "dialogs/dialogs_provider.hpp"
+#include "util/colorizedsvgicon.hpp"
 
 // Qt includes
 #include <QPainter>
@@ -70,8 +71,7 @@
 void StringListMenu::popup(const QPoint &point, const QVariantList &stringList)
 {
     assert(m_ctx);
-    QMenu *m = new VLCMenu(m_ctx->getIntf());
-    m->setAttribute(Qt::WA_DeleteOnClose);
+    QMenu *m = newMenu();
 
     for (int i = 0; i != stringList.size(); ++i)
     {
@@ -85,6 +85,30 @@
     m->popup(point);
 }
 
+QMenu *BasicMenuContainer::newMenu()
+{
+    QMenu *m = new VLCMenu(m_ctx->getIntf());
+    m->setAttribute(Qt::WA_DeleteOnClose);
+    if (m_prevMenu)
+    {
+        setVisible(false);
+        m_prevMenu->disconnect(this);
+    }
+
+    m_prevMenu = m;
+    connect(m, &QMenu::aboutToShow, this, this(){ setVisible(true);});
+    connect(m, &QMenu::aboutToHide, this, this(){ setVisible(false);});
+    return m;
+}
+
+void BasicMenuContainer::setVisible(bool visible)
+{
+    if (m_visible == visible) return;
+
+    m_visible = visible;
+    emit visibleChanged();
+}
+
 // SortMenu
 
 void SortMenu::popup(const QPoint &point, const bool popupAbovePoint, const QVariantList &model)
@@ -101,12 +125,16 @@
         shownChanged();
     } );
 
+    const auto actionGroup = new QActionGroup(m_menu.get());
+    actionGroup->setExclusive(true);
+
     // model => {text: "", checked: <bool>, order: <sort order> if checked else <invalid>}...
     for (int i = 0; i != model.size(); ++i)
     {
         const auto obj = modeli.toMap();
 
         auto action = m_menu->addAction(obj.value("text").toString());
+        action->setActionGroup(actionGroup);
         action->setCheckable(true);
 
         const bool checked = obj.value("checked").toBool();
@@ -293,6 +321,31 @@
 {
 }
 
+ QString QmlMenuBar::menuEntryTitle(MenuEntry entry)
+{
+    switch (entry)
+    {
+    case MEDIA:
+        return qtr("&Media");
+    case PLAYBACK:
+        return qtr("&Playback");
+    case VIDEO:
+        return qtr("&Video");
+    case AUDIO:
+        return qtr("&Audio");
+    case SUBTITLE:
+        return qtr("&Subtitle");
+    case TOOL:
+        return qtr("&Tools");
+    case VIEW:
+        return qtr("V&iew");
+    case HELP:
+        return qtr("&Help");
+    }
+    vlc_assert_unreachable();
+    return "";
+}
+
 void QmlMenuBar::popupMenuCommon( QQuickItem* button, std::function<void(QMenu*)> createMenuFunc)
 {
     if (!m_ctx || !m_menubar || !button)
@@ -311,6 +364,47 @@
     m_menu->popup(position.toPoint());
 }
 
+
+void QmlMenuBar::setupMenuEntry(QMenu* menu, MenuEntry entry)
+{
+    qt_intf_t* p_intf = m_ctx->getIntf();
+    switch (entry) {
+    case MEDIA:
+        FileMenu(p_intf, menu);
+        break;
+    case PLAYBACK:
+        NavigMenu(p_intf, menu);
+        break;
+    case VIDEO:
+        VideoMenu(p_intf, menu);
+        break;
+    case AUDIO:
+        AudioMenu(p_intf, menu);
+        break;
+    case SUBTITLE:
+        SubtitleMenu(p_intf, menu);
+        break;
+    case TOOL:
+        ToolsMenu(p_intf, menu);
+        break;
+    case VIEW:
+        ViewMenu( p_intf, menu, m_playerViewVisible );
+        break;
+    case HELP:
+        HelpMenu( menu );
+        break;
+    default:
+        vlc_assert_unreachable();
+    };
+}
+
+void QmlMenuBar::popupMenuEntry(QQuickItem* button, MenuEntry entry)
+{
+    popupMenuCommon(button, this, entry(QMenu* menu) {
+        setupMenuEntry(menu, entry);
+    });
+}
+
 void QmlMenuBar::popupMediaMenu( QQuickItem* button )
 {
     popupMenuCommon(button, this(QMenu* menu) {
@@ -370,6 +464,16 @@
     });
 }
 
+void QmlMenuBar::popupExtraActionsMenu( QQuickItem* button, const QList<MenuEntry>& extraActions )
+{
+    popupMenuCommon(button, this, extraActions(QMenu* menu) {
+        for (auto action: extraActions) {
+            QMenu* subMenu = menu->addMenu(menuEntryTitle(action));
+            setupMenuEntry(subMenu, action);
+        }
+    });
+}
+
 void QmlMenuBar::onMenuClosed()
 {
     if (!m_openMenuOnHover)
@@ -501,7 +605,7 @@
     if (m_ctx->hasMediaLibrary())
     {
         // FIXME: Do we really need a translation call for the string shortcut ?
-        m_menu->addAction(qtr("&Manage"), THEDP, &DialogsProvider::bookmarksDialog, qtr("Ctrl+B"));
+        m_menu->addAction(qtr("&Manage"), THEDP, &DialogsProvider::bookmarksDialog )->setShortcut( qtr("Ctrl+B"));
 
         m_menu->addSeparator();
 
@@ -628,7 +732,7 @@
         emit triggered(Synchronize);
     });
 
-    menu->addAction(QIcon(":/menu/download.svg"), qtr("Search online"), this, this()
+    menu->addAction(ColorizedSvgIcon::colorizedIconForWidget(":/menu/download.svg", menu), qtr("Search online"), this, this()
     {
         emit triggered(Download);
     });
@@ -690,7 +794,7 @@
 //=================================================================================================
 
 PlaylistListContextMenu::PlaylistListContextMenu(QObject * parent)
-    : QObject(parent)
+    : BasicMenuContainer(parent)
 {}
 
 
@@ -706,17 +810,17 @@
     for (const QModelIndex & modelIndex : selected)
         ids.push_back(m_model->data(modelIndex, MLPlaylistListModel::PLAYLIST_ID));
 
-    m_menu = std::make_unique<VLCMenu>(m_ctx->getIntf());
+    auto menu = newMenu();
 
     MediaLib * ml = m_model->ml();
 
-    QAction * action = m_menu->addAction(qtr("Add and play"));
+    QAction * action = menu->addAction(qtr("Add and play"));
 
     connect(action, &QAction::triggered, ml, ids() {
         ml->addAndPlay(ids);
     });
 
-    action = m_menu->addAction(qtr("Enqueue"));
+    action = menu->addAction(qtr("Enqueue"));
 
     connect(action, &QAction::triggered, ml, ids() {
         ml->addToPlaylist(ids);
@@ -724,7 +828,7 @@
 
     if (ids.count() == 1)
     {
-        action = m_menu->addAction(qtr("Rename"));
+        action = menu->addAction(qtr("Rename"));
 
         QModelIndex index = selected.first();
 
@@ -733,20 +837,19 @@
         });
     }
 
-    action = m_menu->addAction(qtr("Delete"));
+    action = menu->addAction(qtr("Delete"));
 
     connect(action, &QAction::triggered, this, ids() {
         m_model->deletePlaylists(ids);
     });
 
-    m_menu->popup(pos);
+    menu->popup(pos);
 }
 
 //=================================================================================================
 // PlaylistMediaContextMenu
 //=================================================================================================
 
-PlaylistMediaContextMenu::PlaylistMediaContextMenu(QObject * parent) : QObject(parent) {}
 
 void PlaylistMediaContextMenu::popup(const QModelIndexList & selected, QPoint pos,
                                      QVariantMap options)
@@ -761,38 +864,38 @@
     for (const QModelIndex& modelIndex : selected)
         ids.push_back(m_model->data(modelIndex, MLPlaylistModel::MEDIA_ID));
 
-    m_menu = std::make_unique<VLCMenu>(m_ctx->getIntf());
+    auto menu =newMenu();
 
     MediaLib * ml = m_model->ml();
 
-    QAction * action = m_menu->addAction(qtr("Add and play"));
+    QAction * action = menu->addAction(qtr("Add and play"));
 
     connect(action, &QAction::triggered, ml, ids() {
         ml->addAndPlay(ids);
     });
 
-    action = m_menu->addAction(qtr("Enqueue"));
+    action = menu->addAction(qtr("Enqueue"));
 
     connect(action, &QAction::triggered, ml, ids() {
         ml->addToPlaylist(ids);
     });
 
-    action = m_menu->addAction(qtr("Add to playlist"));
+    action = menu->addAction(qtr("Add to playlist"));
 
     connect(action, &QAction::triggered, ids() {
         DialogsProvider::getInstance()->playlistsDialog(ids);
     });
 
-    action = m_menu->addAction(qtr("Play as audio"));
+    action = menu->addAction(qtr("Play as audio"));
 
     connect(action, &QAction::triggered, ml, ids() {
         ml->addAndPlay(ids, {":no-video"});
     });
 
     if (options.contains("information") && options"information".typeId() == QMetaType::Int) {
-        action = m_menu->addAction(qtr("Information"));
+        action = menu->addAction(qtr("Information"));
 
-        QSignalMapper * mapper = new QSignalMapper(m_menu.get());
+        QSignalMapper * mapper = new QSignalMapper(menu);
 
         connect(action, &QAction::triggered, mapper, QOverload<>::of(&QSignalMapper::map));
 
@@ -801,9 +904,9 @@
                 this, &PlaylistMediaContextMenu::showMediaInformation);
     }
 
-    m_menu->addSeparator();
+    menu->addSeparator();
 
-    action = m_menu->addAction(qtr("Remove Selected"));
+    action = menu->addAction(qtr("Remove Selected"));
 
     action->setIcon(QIcon(":/menu/remove.svg"));
 
@@ -811,15 +914,11 @@
         m_model->remove(selected);
     });
 
-    m_menu->popup(pos);
+    menu->popup(pos);
 }
 
 //=================================================================================================
 
-NetworkMediaContextMenu::NetworkMediaContextMenu(QObject* parent)
-    : QObject(parent)
-{}
-
 void NetworkMediaContextMenu::popup(const QModelIndexList& selected, QPoint pos)
 {
     assert(m_ctx);
@@ -827,15 +926,15 @@
     if (!m_model)
         return;
 
-    m_menu = std::make_unique<VLCMenu>(m_ctx->getIntf());
+    auto menu = newMenu();
     QAction* action;
 
-    action = m_menu->addAction( qtr("Add and play") );
+    action = menu->addAction( qtr("Add and play") );
     connect(action, &QAction::triggered, this, selected( ) {
         m_model->addAndPlay(selected);
     });
 
-    action = m_menu->addAction( qtr("Enqueue") );
+    action = menu->addAction( qtr("Enqueue") );
     connect(action, &QAction::triggered, this, selected( ) {
         m_model->addToPlaylist(selected);
     });
@@ -859,7 +958,7 @@
     if (canBeIndexed)
     {
         bool removeFromML = countIndexed > 0;
-        action = m_menu->addAction(removeFromML
+        action = menu->addAction(removeFromML
             ? qtr("Remove from Media Library")
             : qtr("Add to Media Library"));
 
@@ -870,13 +969,9 @@
         });
     }
 
-    m_menu->popup(pos);
+    menu->popup(pos);
 }
 
-NetworkDeviceContextMenu::NetworkDeviceContextMenu(QObject* parent)
-    : QObject(parent)
-{}
-
 void NetworkDeviceContextMenu::popup(const QModelIndexList& selected, QPoint pos)
 {
     assert(m_ctx);
@@ -884,20 +979,20 @@
     if (!m_model)
         return;
 
-    m_menu = std::make_unique<VLCMenu>(m_ctx->getIntf());
+    auto menu = newMenu();
     QAction* action;
 
-    action = m_menu->addAction( qtr("Add and play") );
+    action = menu->addAction( qtr("Add and play") );
     connect(action, &QAction::triggered, this, selected( ) {
         m_model->addAndPlay(selected);
     });
 
-    action = m_menu->addAction( qtr("Enqueue") );
+    action = menu->addAction( qtr("Enqueue") );
     connect(action, &QAction::triggered, this, selected( ) {
         m_model->addToPlaylist(selected);
     });
 
-    m_menu->popup(pos);
+    menu->popup(pos);
 }
 
 PlaylistContextMenu::PlaylistContextMenu(QObject* parent)
@@ -971,19 +1066,20 @@
     }
 
     action = m_menu->addAction( qtr("Add File...") );
-    action->setIcon(QIcon(":/menu/add.svg"));
+
+    action->setIcon(ColorizedSvgIcon::colorizedIconForWidget(":/menu/add.svg", m_menu.get()));
     connect(action, &QAction::triggered, ( ) {
         DialogsProvider::getInstance()->simpleOpenDialog(false);
     });
 
     action = m_menu->addAction( qtr("Add Directory...") );
-    action->setIcon(QIcon(":/menu/add.svg"));
+    action->setIcon(ColorizedSvgIcon::colorizedIconForWidget(":/menu/add.svg", m_menu.get()));
     connect(action, &QAction::triggered, ( ) {
         DialogsProvider::getInstance()->PLAppendDir();
     });
 
     action = m_menu->addAction( qtr("Advanced Open...") );
-    action->setIcon(QIcon(":/menu/add.svg"));
+    action->setIcon(ColorizedSvgIcon::colorizedIconForWidget(":/menu/add.svg", m_menu.get()));
     connect(action, &QAction::triggered, ( ) {
         DialogsProvider::getInstance()->PLAppendDialog();
     });
@@ -1047,7 +1143,7 @@
         }
 
         action = m_menu->addAction( qtr("Shuffle the playlist") );
-        action->setIcon(QIcon(":/menu/ic_fluent_arrow_shuffle_on.svg"));
+        action->setIcon(ColorizedSvgIcon::colorizedIconForWidget(":/menu/ic_fluent_arrow_shuffle.svg", m_menu.get()));
         connect(action, &QAction::triggered, this, this( ) {
             m_controler->shuffle();
         });

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/menus/qml_menu_wrapper.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/menus/qml_menu_wrapper.hpp Changed

@@ -57,22 +57,44 @@
     type m_##name = defaultValue;
 
 
-class StringListMenu : public QObject
+class BasicMenuContainer : public QObject
 {
     Q_OBJECT
 
     SIMPLE_MENU_PROPERTY(MainCtx *, ctx, nullptr)
+    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged FINAL)
 
 public:
     using QObject::QObject;
 
+    bool visible() const { return m_visible; }
+
+signals:
+    void visibleChanged();
+
+protected:
+    QMenu *newMenu();
+
+private:
+    void setVisible(bool visible);
+
+    bool m_visible = false;
+    QPointer<QMenu> m_prevMenu;
+};
+
+class StringListMenu : public BasicMenuContainer
+{
+    Q_OBJECT
+
+public:
+    using BasicMenuContainer::BasicMenuContainer;
+
     Q_INVOKABLE void popup(const QPoint &point, const QVariantList &stringList);
 
 signals:
     void selected(int index, const QString &str);
 };
 
-
 class SortMenu : public QObject
 {
     Q_OBJECT
@@ -151,8 +173,24 @@
     SIMPLE_MENU_PROPERTY(bool, playerViewVisible, false)
 
 public:
+    enum MenuEntry {
+        MEDIA,
+        PLAYBACK,
+        VIDEO,
+        AUDIO,
+        SUBTITLE,
+        TOOL,
+        VIEW,
+        HELP
+    };
+    Q_ENUM(MenuEntry);
+
+public:
     explicit QmlMenuBar(QObject *parent = nullptr);
 
+
+    Q_INVOKABLE static QString menuEntryTitle(MenuEntry entry);
+
 signals:
     //navigate to the left(-1)/right(1) menu
     void navigateMenu(int direction);
@@ -160,6 +198,8 @@
     void menuClosed();
 
 public slots:
+    void popupMenuEntry(QQuickItem* button, MenuEntry entry);
+
     void popupMediaMenu( QQuickItem* button);
     void popupPlaybackMenu( QQuickItem* button);
     void popupAudioMenu( QQuickItem* button );
@@ -168,6 +208,7 @@
     void popupToolsMenu( QQuickItem* button );
     void popupViewMenu( QQuickItem* button );
     void popupHelpMenu( QQuickItem* button );
+    void popupExtraActionsMenu( QQuickItem* button, const QList<MenuEntry>& extraActions );
 
 private slots:
     void onMenuClosed();
@@ -175,6 +216,7 @@
 private:
     typedef QMenu* (*CreateMenuFunc)();
     void popupMenuCommon( QQuickItem* button, std::function<void(QMenu*)> createMenuFunc);
+    void setupMenuEntry(QMenu* menu, MenuEntry entry);
     std::unique_ptr<QMenu> m_menu;
     QQuickItem* m_button = nullptr;
     friend class QmlMenuBarMenu;
@@ -340,18 +382,15 @@
     void beforePopup(QMenu * menu) override;
 };
 
-class PlaylistListContextMenu : public QObject {
+class PlaylistListContextMenu : public BasicMenuContainer {
     Q_OBJECT
 
-    SIMPLE_MENU_PROPERTY(MainCtx *, ctx, nullptr)
     SIMPLE_MENU_PROPERTY(MLPlaylistListModel *, model, nullptr)
 public:
     PlaylistListContextMenu(QObject * parent = nullptr);
 
 public slots:
     void popup(const QModelIndexList & selected, QPoint pos, QVariantMap options = {});
-private:
-    std::unique_ptr<QMenu> m_menu;
 };
 
 class QmlAudioContextMenu : public VLCMenuBar
@@ -369,44 +408,45 @@
     std::unique_ptr<QMenu> m_menu;
 };
 
-class PlaylistMediaContextMenu : public QObject {
+class PlaylistMediaContextMenu : public BasicMenuContainer {
     Q_OBJECT
     SIMPLE_MENU_PROPERTY(MLPlaylistModel *, model, nullptr)
-    SIMPLE_MENU_PROPERTY(MainCtx *, ctx, nullptr)
 public:
-    PlaylistMediaContextMenu(QObject * parent = nullptr);
+    using BasicMenuContainer::BasicMenuContainer;
 
 public slots:
     void popup(const QModelIndexList & selected, QPoint pos, QVariantMap options = {});
 signals:
     void showMediaInformation(int index);
-private:
-    std::unique_ptr<QMenu> m_menu;
 };
 
-class NetworkMediaContextMenu : public QObject {
+class NetworkMediaContextMenu : public BasicMenuContainer {
     Q_OBJECT
     SIMPLE_MENU_PROPERTY(NetworkMediaModel*, model, nullptr)
-    SIMPLE_MENU_PROPERTY(MainCtx *, ctx, nullptr)
 public:
-    NetworkMediaContextMenu(QObject* parent = nullptr);
+        using BasicMenuContainer::BasicMenuContainer;
 
 public slots:
     void popup(const QModelIndexList& selected, QPoint pos );
-private:
-    std::unique_ptr<QMenu> m_menu;
+    void tableView_popup(int /*current*/, const QModelIndexList &selected, QPoint pos)
+    {
+        popup(selected, pos);
+    }
 };
 
-class NetworkDeviceContextMenu : public QObject {
+class NetworkDeviceContextMenu : public BasicMenuContainer {
     Q_OBJECT
     SIMPLE_MENU_PROPERTY(NetworkDeviceModel*, model, nullptr)
-    SIMPLE_MENU_PROPERTY(MainCtx *, ctx, nullptr)
 public:
-    NetworkDeviceContextMenu(QObject* parent = nullptr);
+    using BasicMenuContainer::BasicMenuContainer;
+
 public slots:
     void popup(const QModelIndexList& selected, QPoint pos );
-private:
-    std::unique_ptr<QMenu> m_menu;
+    void tableView_popup(int /*current*/, const QModelIndexList &selected, QPoint pos)
+    {
+        popup(selected, pos);
+    }
+
 };
 
 class PlaylistContextMenu : public QObject {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/meson.build Changed

@@ -7,7 +7,7 @@
 qt_include_dir = include_directories('.')
 
 qt_extra_deps = 
-qt_extra_flags = '-DQT_STRICT_ITERATORS','-DQT_USE_QSTRINGBUILDER','-DQT_NO_CAST_TO_ASCII'
+qt_extra_flags = '-DQT_STRICT_ITERATORS','-DQT_USE_QSTRINGBUILDER','-DQT_NO_CAST_TO_ASCII','-DQT_NO_CAST_FROM_BYTEARRAY'
 qt_cppargs = 
 qt_link_args = 
 
@@ -15,8 +15,7 @@
     # Note that Qt < 6.2.5 does not provide pc files!
     version: '>=6.2',
     modules: 
-        'Core', 'Gui', 'Widgets', 'Svg', 'Qml', 'QmlModels',
-        'QuickLayouts', 'QuickTemplates2', 'QmlWorkerScript',
+        'Core', 'Gui', 'Widgets', 'Qml',
         'Quick', 'QuickControls2'
         ,
     private_headers: true,
@@ -49,7 +48,6 @@
     'dialogs/open/open.hpp',
     'dialogs/open/open_panels.hpp',
     'dialogs/open/openurl.hpp',
-    'dialogs/plugins/addons_manager.hpp',
     'dialogs/plugins/plugins.hpp',
     'dialogs/podcast/podcast_configuration.hpp',
     'dialogs/preferences/complete_preferences.hpp',
@@ -102,12 +100,12 @@
     'menus/custom_menus.hpp',
     'menus/qml_menu_wrapper.hpp',
     'menus/menus.hpp',
+    'network/addonsmodel.hpp',
     'network/devicesourceprovider.hpp',
     'network/networkbasemodel.hpp',
     'network/networkdevicemodel.hpp',
     'network/networksourcesmodel.hpp',
     'network/networkmediamodel.hpp',
-    'network/servicesdiscoverymodel.hpp',
     'network/standardpathmodel.hpp',
     'style/systempalette.hpp',
     'style/colorcontext.hpp',
@@ -125,9 +123,11 @@
     'util/workerthreadset.hpp',
     'util/base_model.hpp',
     'util/color_scheme_model.hpp',
+    'util/ui_notifier.hpp',
     'util/color_svg_image_provider.hpp',
     'util/vlcaccess_image_provider.hpp',
     'util/csdbuttonmodel.hpp',
+    'util/csdmenu.hpp',
     'util/imageluminanceextractor.hpp',
     'util/keyhelper.hpp',
     'util/listcache.hpp',
@@ -140,32 +140,29 @@
     'util/validators.hpp',
     'util/varchoicemodel.hpp',
     'util/variables.hpp',
+    'util/vlchotkeyconverter.hpp',
     'util/vlctick.hpp',
     'util/dismiss_popup_event_filter.hpp',
     'util/list_selection_model.hpp',
+    'util/qsgtextureview.hpp',
     'widgets/native/animators.hpp',
     'widgets/native/csdthemeimage.hpp',
     'widgets/native/customwidgets.hpp',
     'widgets/native/interface_widgets.hpp',
     'widgets/native/navigation_attached.hpp',
     'widgets/native/mlfolderseditor.hpp',
-    'widgets/native/roundimage.hpp',
-    'widgets/native/roundimage_p.hpp',
     'widgets/native/searchlineedit.hpp',
     'widgets/native/viewblockingrectangle.hpp',
+    'widgets/native/textureprovideritem.hpp',
 )
 
 if host_system == 'windows'
     moc_headers += files(
         'maininterface/mainctx_win32.hpp',
         'maininterface/compositor_win7.hpp',
+        'maininterface/compositor_dcomp.hpp',
+        'maininterface/compositor_dcomp_acrylicsurface.hpp',
     )
-    if cdata.has('HAVE_DCOMP_H')
-        moc_headers += files(
-            'maininterface/compositor_dcomp.hpp',
-            'maininterface/compositor_dcomp_acrylicsurface.hpp',
-        )
-    endif
 endif
 
 if (x11_dep.found() and
@@ -181,7 +178,7 @@
     )
 endif
 
-some_sources = files(
+qt_plugin_sources = files(
     'qt.cpp',
     'qt.hpp',
     'plugins.hpp',
@@ -239,8 +236,6 @@
     'dialogs/open/open_panels.hpp',
     'dialogs/open/openurl.cpp',
     'dialogs/open/openurl.hpp',
-    'dialogs/plugins/addons_manager.cpp',
-    'dialogs/plugins/addons_manager.hpp',
     'dialogs/plugins/plugins.cpp',
     'dialogs/plugins/plugins.hpp',
     'dialogs/podcast/podcast_configuration.cpp',
@@ -368,6 +363,8 @@
     'menus/qml_menu_wrapper.hpp',
     'menus/menus.cpp',
     'menus/menus.hpp',
+    'network/addonsmodel.cpp',
+    'network/addonsmodel.hpp',
     'network/mediatreelistener.cpp',
     'network/mediatreelistener.hpp',
     'network/devicesourceprovider.cpp',
@@ -380,10 +377,9 @@
     'network/networksourcesmodel.hpp',
     'network/networkmediamodel.cpp',
     'network/networkmediamodel.hpp',
-    'network/servicesdiscoverymodel.cpp',
-    'network/servicesdiscoverymodel.hpp',
     'network/standardpathmodel.cpp',
     'network/standardpathmodel.hpp',
+    'network/vlcmediasourcewrapper.hpp',
     'style/qtthemeprovider.hpp',
     'style/colorcontext.cpp',
     'style/colorcontext.hpp',
@@ -423,6 +419,8 @@
     'util/base_model_p.hpp',
     'util/color_scheme_model.cpp',
     'util/color_scheme_model.hpp',
+    'util/ui_notifier.cpp',
+    'util/ui_notifier.hpp',
     'util/color_svg_image_provider.cpp',
     'util/color_svg_image_provider.hpp',
     'util/vlcaccess_image_provider.cpp',
@@ -431,6 +429,8 @@
     'util/covergenerator.hpp',
     'util/csdbuttonmodel.cpp',
     'util/csdbuttonmodel.hpp',
+    'util/csdmenu.cpp',
+    'util/csdmenu.hpp',
     'util/imageluminanceextractor.cpp',
     'util/imageluminanceextractor.hpp',
     'util/imagehelper.cpp',
@@ -466,17 +466,25 @@
     'util/variables.hpp',
     'util/vlctick.cpp',
     'util/vlctick.hpp',
+    'util/vlchotkeyconverter.cpp',
+    'util/vlchotkeyconverter.hpp',
     'util/shared_input_item.hpp',
     'util/fast_gaussian_blur_template.h',
     'util/effects_image_provider.cpp',
     'util/effects_image_provider.hpp',
     'util/qsgroundedrectangularimagenode.cpp',
     'util/qsgroundedrectangularimagenode.hpp',
+    'util/qsgtextureview.cpp',
+    'util/qsgtextureview.hpp',
     'util/dismiss_popup_event_filter.cpp',
     'util/dismiss_popup_event_filter.hpp',
     'util/list_selection_model.cpp',
     'util/list_selection_model.hpp',
     'util/model_recovery_agent.hpp',
+    'util/vlcqtmessagehandler.cpp',
+    'util/vlcqtmessagehandler.hpp',
+    'util/colorizedsvgicon.cpp',
+    'util/colorizedsvgicon.hpp',
     'widgets/native/animators.cpp',
     'widgets/native/animators.hpp',
     'widgets/native/customwidgets.cpp',
@@ -491,37 +499,34 @@
     'widgets/native/mlfolderseditor.hpp',
     'widgets/native/qvlcframe.cpp',
     'widgets/native/qvlcframe.hpp',
-    'widgets/native/roundimage.cpp',
-    'widgets/native/roundimage.hpp',
     'widgets/native/searchlineedit.cpp',
     'widgets/native/searchlineedit.hpp',
     'widgets/native/viewblockingrectangle.cpp',
     'widgets/native/viewblockingrectangle.hpp',
     'widgets/native/doubleclickignoringitem.hpp',
+    'widgets/native/textureprovideritem.cpp',
+    'widgets/native/textureprovideritem.hpp',
 )
 
 if host_system == 'windows'
-    some_sources += files(
+    qt_plugin_sources += files(
         'maininterface/mainctx_win32.cpp',
         'maininterface/mainctx_win32.hpp',
         'maininterface/compositor_win7.cpp',
         'maininterface/compositor_win7.hpp',
         'style/windowsthemeprovider.cpp',
+        'util/csdmenu_win32.c',
+        'util/csdmenu_win32.h',
+        'maininterface/compositor_dcomp.cpp',
+        'maininterface/compositor_dcomp_acrylicsurface.cpp',
     )
-
-    if cdata.has('HAVE_DCOMP_H')
-        some_sources += files(
-            'maininterface/compositor_dcomp.cpp',
-            'maininterface/compositor_dcomp_acrylicsurface.cpp',
-        )
-    endif
 endif
 
 if (x11_dep.found() and
     xcb_dep.found() and
     xcb_damage_dep.found() and
     xcb_xfixes_dep.found())
-    some_sources += files(
+    qt_plugin_sources += files(
         'maininterface/compositor_x11.cpp',
         'maininterface/compositor_x11_renderclient.cpp',
         'maininterface/compositor_x11_renderwindow.cpp',
@@ -681,7 +686,6 @@
        'player/qml/MiniPlayer.qml',
        'player/qml/PIPPlayer.qml',
        'player/qml/Player.qml',
-       'player/qml/PlayerBlurredBackground.qml',
        'player/qml/PlayerControlLayout.qml',
        'player/qml/PlayerPlaylistVisibilityFSM.qml',
        'player/qml/PlayerToolbarVisibilityFSM.qml',
@@ -762,7 +766,7 @@
     'outdir' : 'VLC/Playlist',
     'sources': files(
         'playlist/qml/PlaylistDelegate.qml',
-        'playlist/qml/PlaylistListView.qml',
+        'playlist/qml/PlaylistPane.qml',
         'playlist/qml/PlaylistToolbar.qml',
         'playlist/qml/PlaylistDetachedWindow.qml',
     ),
@@ -801,8 +805,10 @@
 
 if qt6_dep.version().version_compare('>=6.5.0')
     qml_dynamicshadow_file = 'widgets/qml/DynamicShadow.qml'
+    qml_blureffect_file = 'widgets/qml/BlurEffect.qml'
 else
     qml_dynamicshadow_file = 'widgets/qml/compat/DynamicShadow.qml'
+    qml_blureffect_file = 'widgets/qml/compat/BlurEffect.qml'
 endif
 
 qml_modules += {
@@ -821,6 +827,7 @@
         'widgets/qml/CheckedDelegate.qml',
         'widgets/qml/ComboBoxExt.qml',
         'widgets/qml/AcrylicBackground.qml',
+        'widgets/qml/FloatingNotification.qml',
         'widgets/qml/AnimatedBackground.qml',
         'widgets/qml/CSDThemeButton.qml',
         'widgets/qml/CSDThemeButtonSet.qml',
@@ -845,7 +852,7 @@
         'widgets/qml/ImageToolButton.qml',
         'widgets/qml/ListViewExt.qml',
         'widgets/qml/TableViewExt.qml',
-        'widgets/qml/TableViewDelegate.qml',
+        'widgets/qml/TableViewDelegateExt.qml',
         'widgets/qml/TableRowDelegate.qml',
         'widgets/qml/TableHeaderDelegate.qml',
         'widgets/qml/DefaultShadow.qml',
@@ -856,6 +863,7 @@
         'widgets/qml/MenuCaption.qml',
         'widgets/qml/MenuLabel.qml',
         'widgets/qml/MLDragItem.qml',
+        'widgets/qml/MLTableColumns.qml',
         'widgets/qml/NavigableCol.qml',
         'widgets/qml/NavigableRow.qml',
         'widgets/qml/PlayCover.qml',
@@ -888,7 +896,11 @@
         'widgets/qml/PartialEffect.qml',
         'widgets/qml/ViewHeader.qml',
         'widgets/qml/ProgressIndicator.qml',
+        'widgets/qml/RectangularGlow.qml',
         qml_dynamicshadow_file,
+        qml_blureffect_file,
+        'widgets/qml/ImageExt.qml',
+        'widgets/qml/ScrollBarExt.qml',
     ),
 }
 
@@ -899,6 +911,25 @@
 qmllibs = 
 
 if qt6_dep.found()
+    qt_rcc_extra_arguments = 
+    qt_zstd_check = '''
+    #include <qconfig.h>
+    #if QT_FEATURE_zstd != 1
+    #error "Qt can not decompress zstd. Resources are going to be compressed using zlib."
+    #endif
+    '''
+    if cpp.compiles(qt_zstd_check, dependencies: qt6_dep, name: 'Qt supports decompressing zstd')
+        qt_rcc_extra_arguments += '-compress-algo=zstd'
+    else
+        qt_rcc_extra_arguments += '-compress-algo=zlib'
+    endif
+
+    atomic_lib = cc.find_library('atomic', required: false)
+    if atomic_lib.found()
+        qt_extra_deps += atomic_lib
+        qt_extra_flags += '-DQT_HAS_LIBATOMIC'
+    endif
+
     prog_python = find_program('python3')
     modules_qrc = 
     foreach module : qml_modules
@@ -936,7 +967,8 @@
                 meson.current_build_dir() / module'outdir' / 'qmldir.qrc',
             ),
             include_directories: qt_include_dir,
-            dependencies: qt6_dep
+            dependencies: qt6_dep,
+            rcc_extra_arguments: qt_rcc_extra_arguments
         )
 
         #FIXME copy every files to the outdir module so they can be used by qt tooling
@@ -947,15 +979,61 @@
             dependencies: qt6_dep)
     endforeach
 
+    qt_static_check = '''
+    #include <qconfig.h>
+    #ifndef QT_STATIC
+    # error Qt using shared libraries
+    #endif
+    '''
+
+    if cpp.compiles(qt_static_check, dependencies: qt6_dep, name: 'Qt6 compiled with static libraries')
+        qt_install_bin_directory = qt6_dep.get_variable(pkgconfig: 'bindir', configtool: '-query QT_INSTALL_BINS')
+        qmake6 = find_program(qt_install_bin_directory + '/qmake6', required: true)
+        if qmake6.found()
+            qmake_additional_params = 
+            if get_option('buildtype') == 'debug'
+                qmake_additional_params += '--debug'
+            endif
+            qtcflags = run_command(
+                prog_python,
+                meson.current_source_dir() / 'scripts/static_dirs.py',
+                '--qmake', qmake6.full_path(),
+                '--pro', meson.current_source_dir() / 'qt6.pro',
+                '--builddir', meson.current_build_dir(),
+                '--cflags',
+                qmake_additional_params,
+                check: false,
+            )
+            if qtcflags.returncode() == 0
+                qt_extra_flags += qtcflags.stdout().split()
+            else
+                warning('Failed to get static Qt compilation flags: ' + qtcflags.stderr())
+            endif
+            qtlflags = run_command(
+                prog_python,
+                meson.current_source_dir() / 'scripts/static_dirs.py',
+                '--qmake', qmake6.full_path(),
+                '--pro', meson.current_source_dir() / 'qt6.pro',
+                '--builddir', meson.current_build_dir(),
+                '--libs', '--ldflags',
+                qmake_additional_params,
+                check: false,
+            )
+            if qtlflags.returncode() == 0
+                qt_link_args += qtlflags.stdout().split()
+            else
+                warning('Failed to get static Qt link flags: ' + qtlflags.stderr())
+            endif
+        else
+            warning('Failed to find qmake6 to get static Qt variables')
+        endif
+    endif
+
     qt6pre_qrc = qt6.preprocess(
         qresources: qrc_files,
         include_directories: qt_include_dir,
-        dependencies: qt6_dep)
-
-    qt6pre_files = qt6.preprocess(ui_files: ui_sources,
-        moc_headers: moc_headers,
-        include_directories: qt_include_dir,
-        dependencies: qt6_dep)
+        dependencies: qt6_dep,
+        rcc_extra_arguments: qt_rcc_extra_arguments)
 
     qt_sources = files('qt.cpp')
 
@@ -998,44 +1076,39 @@
         qt_extra_flags += '-DQT_GUI_PRIVATE'
     endif
 
-    if cpp.has_header('private/qobject_p.h', dependencies: qt6_dep)
-        qt_extra_flags += '-DQT_CORE_PRIVATE'
-    endif
-
     if host_system == 'windows'
         qt_cppargs += libcom_cppflags
     endif
 
-    if not (host_system in 'windows', 'darwin')
-        #Qt GTK theme module
-        gtk_dep = dependency(
-            'gtk+-3.0',
-            version: '>=3.20',
-            required: get_option('qt_gtk')
-        )
+    #Qt GTK theme module
+    gtk_dep = dependency(
+        'gtk+-3.0',
+        version: '>=3.20',
+        required: get_option('qt_gtk').disable_auto_if(host_system in 'windows', 'darwin')
+    )
 
-        if gtk_dep.found()
-            vlc_modules += {
-                'name' : 'qt_gtktheme',
-                'sources' : files(
-                    'style/gtkthemeprovider/gtk_compat.cpp',
-                    'style/gtkthemeprovider/gtk_compat.h',
-                    'style/gtkthemeprovider/gtkthemeprovider.cpp',
-                    'style/gtkthemeprovider/gtk_util.cpp',
-                    'style/gtkthemeprovider/gtk_util.h',
-                    'style/gtkthemeprovider/nav_button_provider_gtk.cpp',
-                    'style/gtkthemeprovider/nav_button_provider_gtk.h',
-                    'style/gtkthemeprovider/scoped_gobject.h'
-                ),
-                'dependencies' : gtk_dep
-            }
+    vlc_modules += {
+        'name' : 'qt_gtktheme',
+        'sources' : files(
+            'style/gtkthemeprovider/gtk_compat.cpp',
+            'style/gtkthemeprovider/gtk_compat.h',
+            'style/gtkthemeprovider/gtkthemeprovider.cpp',
+            'style/gtkthemeprovider/gtk_util.cpp',
+            'style/gtkthemeprovider/gtk_util.h',
+            'style/gtkthemeprovider/nav_button_provider_gtk.cpp',
+            'style/gtkthemeprovider/nav_button_provider_gtk.h',
+            'style/gtkthemeprovider/scoped_gobject.h'
+        ),
+        'dependencies' : gtk_dep,
+        'enabled' : gtk_dep.found()
+    }
 
-            qt_extra_flags += '-DQT_HAS_GTK'
-        endif
+    if gtk_dep.found()
+        qt_extra_flags += '-DQT_HAS_GTK'
     endif
 
     if host_system == 'windows'
-        some_sources += files('maininterface/win32windoweffects_module.cpp',
+        qt_plugin_sources += files('maininterface/win32windoweffects_module.cpp',
                               'maininterface/win32windoweffects_module.hpp')
     else
         kf6WindowSystem_dep = dependency('KF6WindowSystem',
@@ -1053,13 +1126,40 @@
         endif
     endif
 
+    if get_option('update-check').allowed() and gcrypt_dep.found()
+        qt_extra_flags += '-DUPDATE_CHECK'
+    endif
+
+
+    vlc_modules += {
+        'name' : 'qt_x11',
+        'include_directories' : qt_include_dir,
+        'sources' : files(
+            'maininterface/qt_x11_plugin.c',
+            'maininterface/compositor_x11_utils.hpp',
+            'maininterface/compositor_x11_utils.cpp',
+            'util/csdmenu_module.h',
+            'util/csdmenu_x11.cpp',
+            'util/csdmenu_x11.h'
+        ),
+        'dependencies' : xcb_dep, xcb_render_dep, xcb_xfixes_dep,
+        'enabled': xcb_dep.found() and xcb_render_dep.found() and xcb_xfixes_dep.found(),
+    }
+
+    qt6pre_files = qt6.preprocess(ui_files: ui_sources,
+        moc_headers: moc_headers,
+        moc_extra_arguments: qt_extra_flags,
+        include_directories: qt_include_dir,
+        dependencies: qt6_dep,
+        rcc_extra_arguments: qt_rcc_extra_arguments)
+
     # TODO support qmlcachegen
 
     vlc_modules += {
         'name' : 'qt',
-        'sources' : qt6pre_files, qt6pre_qrc, shader_targets, shaders_processed, qt_sources, some_sources,
+        'sources' : qt6pre_files, qt6pre_qrc, shader_targets, shaders_processed, qt_sources, qt_plugin_sources,
         'extra_files' : shader_files,
-        'dependencies' : qt_extra_deps, qt6_dep,
+        'dependencies' : qt_extra_deps, qt6_dep, corefoundation_dep,
         'include_directories' : qt_include_dir,
         'c_args' : qt_extra_flags,
         'cpp_args' : qt_extra_flags, qt_cppargs,
@@ -1067,26 +1167,6 @@
         'link_with' : qmllibs,
     }
 
-    quicktest_qt6_dep = dependency('qt6', version: '=' + qt6_dep.version(), modules: 'QuickTest', required: false)
-    if quicktest_qt6_dep.found()
-        qml_test_moc = qt6.compile_moc(
-            headers : files('tests/qml_test.hpp'),
-            dependencies : quicktest_qt6_dep, qt6_dep
-        )
-        qml_test = executable(
-          'qml_test',
-          files('tests/qml_test.cpp', 'tests/qml_test.hpp'), qml_test_moc,
-          qt6pre_qrc,
-          build_by_default: false,
-          dependencies: quicktest_qt6_dep, qt6_dep,
-          link_with: qmllibs,
-          cpp_args: '-DQUICK_TEST_SOURCE_DIR="' + meson.current_source_dir() + '/tests"'
-        )
-        foreach test_name, test_file : qml_tests
-              test(test_name, qml_test, args: '-input', test_file, suite:'qt')
-        endforeach
-    endif
-
     vlc_tests += {
         'name': 'base_model_test',
         'sources': files(
@@ -1106,6 +1186,39 @@
     qtest_qt6_dep = dependency('qt6', version: '=' + qt6_dep.version(), modules: 'Test', required: false)
     if qtest_qt6_dep.found()
         vlc_tests += {
+            'name': 'test_qt_ml_model',
+            'sources': files(
+                'tests/test_ml_model.cpp',
+                'tests/vlc_stub_modules.cpp',
+                'util/base_model.cpp',
+                'medialibrary/mlbasemodel.cpp',
+                'medialibrary/medialib.cpp',
+                'medialibrary/mlthreadpool.cpp',
+                'playlist/playlist_controller.cpp',
+                'playlist/playlist_item.cpp',
+            ),
+            'moc_sources': files(
+                'tests/test_ml_model.cpp'
+            ),
+            'moc_headers': files(
+                'tests/vlc_stub_modules.cpp',
+	            'util/base_model.hpp',
+	            'util/listcache.hpp',
+	            'util/locallistcacheloader.hpp',
+	            'medialibrary/mlqmltypes.hpp',
+	            'medialibrary/mlbasemodel.hpp',
+	            'medialibrary/medialib.hpp',
+	            'medialibrary/mlthreadpool.hpp',
+	            'playlist/playlist_controller.hpp',
+	            'playlist/playlist_item.hpp',
+            ),
+            'suite': 'qt',
+            'include_directories' : qt_include_dir,
+            'link_with': libvlccore, libvlc,
+            'dependencies': qt6_dep, qt_extra_deps, qtest_qt6_dep,
+        }
+
+        vlc_tests += {
             'name': 'test_qt_renderer_manager',
             'sources': files(
                 'tests/vlc_stub_modules.cpp',
@@ -1126,6 +1239,25 @@
         }
 
         vlc_tests += {
+            'name': 'test_qt_thread_runner',
+            'sources': files(
+                'tests/test_thread_runner.cpp',
+                'medialibrary/mlthreadpool.cpp',
+                'medialibrary/mlthreadpool.hpp'
+            ),
+            'moc_sources': files(
+                'tests/test_thread_runner.cpp'
+            ),
+            'moc_headers': files(
+                'medialibrary/mlthreadpool.hpp'
+            ),
+            'suite': 'qt',
+            'include_directories' : qt_include_dir,
+            'dependencies': qt6_dep, qtest_qt6_dep
+        }
+
+
+        vlc_tests += {
             'name': 'test_qt_dialog_model',
             'sources': files(
                 'tests/vlc_stub_modules.cpp',
@@ -1144,6 +1276,26 @@
             'link_with': libvlccore, libvlc,
             'dependencies': qt6_dep, qt_extra_deps, qtest_qt6_dep,
         }
+    endif
 
+    quicktest_qt6_dep = dependency('qt6', version: '=' + qt6_dep.version(), modules: 'QuickTest', required: false)
+    if quicktest_qt6_dep.found() and  qtest_qt6_dep.found()
+        qml_test_moc = qt6.compile_moc(
+            headers : files('tests/qml_test.hpp'),
+            dependencies : quicktest_qt6_dep, qt6_dep
+        )
+        qml_test = executable(
+          'qml_test',
+          files('tests/qml_test.cpp', 'tests/qml_test.hpp'), qml_test_moc,
+          qt6pre_qrc,
+          build_by_default: false,
+          dependencies: quicktest_qt6_dep, qt6_dep, qtest_qt6_dep,
+          link_with: qmllibs,
+          cpp_args: '-DQUICK_TEST_SOURCE_DIR="' + meson.current_source_dir() + '/tests"'
+        )
+        foreach test_name, test_file : qml_tests
+              test(test_name, qml_test, args: '-input', test_file, suite:'qt')
+        endforeach
     endif
+
 endif

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/addonsmodel.cpp Added

@@ -0,0 +1,658 @@
+/*****************************************************************************
+ * Copyright (C) 2020 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include "addonsmodel.hpp"
+
+#include "util/locallistbasemodel.hpp"
+
+#include "medialibrary/mlhelper.hpp"
+
+#include "playlist/media.hpp"
+#include "playlist/playlist_controller.hpp"
+
+#include <memory>
+#include <QPixmap>
+#include <QQmlFile>
+
+#include <vlc_media_source.h>
+#include <vlc_addons.h>
+#include <vlc_cxx_helpers.hpp>
+#include <vlc_addons.h>
+
+#define CHECK_ADDON_TYPE_MATCH(type) \
+    static_assert(static_cast<addon_type_t>(AddonsModel::Type::TYPE_ ## type) == ADDON_##type)
+
+CHECK_ADDON_TYPE_MATCH(UNKNOWN);
+CHECK_ADDON_TYPE_MATCH(PLAYLIST_PARSER);
+CHECK_ADDON_TYPE_MATCH(SERVICE_DISCOVERY);
+CHECK_ADDON_TYPE_MATCH(SKIN2);
+CHECK_ADDON_TYPE_MATCH(PLUGIN);
+CHECK_ADDON_TYPE_MATCH(INTERFACE);
+CHECK_ADDON_TYPE_MATCH(META);
+CHECK_ADDON_TYPE_MATCH(OTHER);
+
+#undef CHECK_ADDON_TYPE_MATCH
+
+#define CHECK_ADDON_STATE_MATCH(type) \
+    static_assert(static_cast<addon_state_t>(AddonsModel::State::STATE_ ## type) == ADDON_##type)
+
+CHECK_ADDON_STATE_MATCH(INSTALLING);
+CHECK_ADDON_STATE_MATCH(INSTALLED);
+CHECK_ADDON_STATE_MATCH(UNINSTALLING);
+
+#undef CHECK_ADDON_STATE_MATCH
+
+namespace {
+
+using AddonPtr = vlc_shared_data_ptr_type(addon_entry_t,
+                                          addon_entry_Hold, addon_entry_Release);
+
+class AddonItem {
+public:
+    //
+    AddonItem( AddonPtr addon )
+    {
+        vlc_mutex_locker locker{&addon->lock};
+        name = qfu( addon->psz_name );
+        summary = qfu( addon->psz_summary ).trimmed();
+        description = qfu( addon->psz_description ).trimmed();
+        author = qfu( addon->psz_author );
+        sourceUrl = QUrl( addon->psz_source_uri );
+        entry = addon;
+        uuid = QByteArray( reinterpret_cast<const char*>(addon->uuid), sizeof( addon_uuid_t ));
+
+        if ( addon->psz_image_data ) {
+            char *cDir = config_GetUserDir( VLC_CACHE_DIR );
+            if (likely(cDir != nullptr))
+            {
+                QDir dir( cDir );
+                free(cDir);
+                dir.mkdir("art");
+                dir.cd("art");
+                dir.mkdir("qt-addon-covers");
+                dir.cd("qt-addon-covers");
+                char* uuidStr = addons_uuid_to_psz( &addon->uuid );
+                QString filename = QString("addon_thumbnail_%1.png").arg(uuidStr);
+                free(uuidStr);
+                QString absoluteFilePath =  dir.absoluteFilePath(filename);
+
+                if ( !QFileInfo::exists( absoluteFilePath )) {
+                    QPixmap pixmap;
+                    pixmap.loadFromData( QByteArray::fromBase64( QByteArray( addon->psz_image_data ) ),
+                                        0,
+                                        Qt::AutoColor
+                                        );
+                    pixmap.save(absoluteFilePath);
+                }
+                artworkUrl = QUrl::fromLocalFile( absoluteFilePath );
+            }
+        }
+        else if ( addon->e_flags & ADDON_BROKEN )
+            artworkUrl = QUrl( ":/addons/addon_broken.svg" );
+        else
+            artworkUrl = QUrl( ":/addons/addon_default.svg" );
+    }
+
+public:
+    QByteArray  uuid;
+    QString name;
+    QString summary;
+    QString description;
+    QString author;
+    QUrl sourceUrl;
+    QUrl artworkUrl;
+    AddonPtr entry;
+};
+
+} //namespace
+
+using AddonItemPtr = std::shared_ptr<AddonItem> ;
+using AddonItemList = std::vector<AddonItemPtr> ;
+
+// ListCache specialisation
+
+template<>
+bool ListCache<AddonItemPtr>::compareItems(const AddonItemPtr& a, const AddonItemPtr& b)
+{
+    //just compare the pointers here
+    return a->uuid == b->uuid;
+}
+
+// AddonsModelPrivate
+
+class AddonsModelPrivate
+    : public LocalListBaseModelPrivate<AddonItemPtr>
+{
+
+public:
+    Q_DECLARE_PUBLIC(AddonsModel)
+
+public: //ctor/dtor
+    AddonsModelPrivate(AddonsModel* pub)
+        : LocalListBaseModelPrivate<AddonItemPtr>(pub)
+    {
+    }
+
+    ~AddonsModelPrivate()
+    {
+        if ( m_manager )
+            addons_manager_Delete( m_manager );
+    }
+
+public:
+    const AddonItem* getItemForRow(int row) const
+    {
+        const AddonItemPtr* ref = item(row);
+        if (ref)
+            return ref->get();
+        return nullptr;
+    }
+
+    bool gatherRepository(const char* uri)
+    {
+        Q_Q(AddonsModel);
+        if (!m_manager)
+            return false;
+        m_loading = true;
+        emit q->loadingChanged();
+        addons_manager_Gather( m_manager, uri);
+        return true;
+    }
+
+public: //BaseModelPrivateT implementation
+    bool initializeModel() override;
+
+    LocalListCacheLoader<AddonItemPtr>::ItemCompare getSortFunction() const override
+    {
+        if (m_sortOrder == Qt::SortOrder::DescendingOrder)
+            return (const AddonItemPtr& a, const AddonItemPtr& b){
+                return QString::compare(a->name, b->name) > 0;
+            };
+        else
+            return (const AddonItemPtr& a, const AddonItemPtr& b) {
+                return QString::compare(a->name, b->name) < 0;
+            };
+    }
+
+
+
+public: //discovery callbacks
+    void addonFound( AddonPtr addon );
+    void addonChanged( AddonPtr addon );
+    void discoveryEnded();
+
+public: //LocalListCacheLoader implementation
+    //return the data matching the pattern
+    AddonItemList getModelData(const QString& pattern) const override
+    {
+        if (pattern.isEmpty()
+            && m_typeFilter == AddonsModel::Type::TYPE_NONE
+            && m_stateFilter == AddonsModel::State::STATE_NONE)
+            return m_items;
+
+        AddonItemList items;
+        std::copy_if(
+            m_items.cbegin(), m_items.cend(),
+            std::back_inserter(items),
+            &pattern, filter = m_typeFilter, state = m_stateFilter(const AddonItemPtr& item) {
+                if (state != AddonsModel::State::STATE_NONE
+                    && static_cast<AddonsModel::State>(item->entry->e_state) != state)
+                    return false;
+                if (filter != AddonsModel::Type::TYPE_NONE
+                    && static_cast<AddonsModel::Type>(item->entry->e_type) != filter)
+                        return false;
+                return item->name.contains(pattern, Qt::CaseInsensitive);
+            });
+        return items;
+    }
+
+public: // data
+    MainCtx* m_ctx = nullptr;
+    addons_manager_t* m_manager = nullptr;
+    AddonItemList m_items;
+    AddonsModel::Type m_typeFilter = AddonsModel::Type::TYPE_NONE;
+    AddonsModel::State m_stateFilter = AddonsModel::State::STATE_NONE;
+};
+
+AddonsModel::AddonsModel( QObject* parent )
+    : BaseModel( new AddonsModelPrivate(this), parent )
+{
+}
+
+QVariant AddonsModel::data( const QModelIndex& index, int role ) const
+{
+    Q_D(const AddonsModel);
+    if (!d->m_ctx)
+        return {};
+
+    const AddonItem* item = d->getItemForRow(index.row());
+    if (!item)
+        return {};
+
+    switch ( role )
+    {
+        case Qt::DisplayRole:
+        case Role::NAME:
+            return item->name;
+        case Role::AUTHOR:
+            return item->author;
+        case Role::SUMMARY:
+            return item->summary;
+        case Role::DESCRIPTION:
+            return item->description;
+        case Role::DOWNLOADS:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return QVariant::fromValue( item->entry->i_downloads );
+        }
+        case Role::SCORE:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return item->entry->i_score;
+        }
+        case Role::STATE:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return item->entry->e_state;
+        }
+        case Role::ARTWORK:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return item->artworkUrl;
+        }
+        case Role::TYPE:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return QVariant::fromValue(item->entry->e_type);
+        }
+        case Role::LINK:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return QString{ item->entry->psz_source_uri };
+        }
+        case Role::ADDON_VERSION:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return qfu(item->entry->psz_version);
+        }
+        case Role::UUID:
+            return item->uuid;
+        case Role::DOWNLOAD_COUNT:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return QVariant::fromValue(item->entry->i_downloads);
+        }
+        case Role::FILENAME:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            QList<QString> list;
+            addon_file_t *p_file;
+            ARRAY_FOREACH( p_file, item->entry->files )
+            list << qfu( p_file->psz_filename );
+            return QVariant{ list };
+        }
+        case  Role::BROKEN:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return item->entry->e_flags & ADDON_BROKEN;
+        }
+        case  Role::MANAGEABLE:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return item->entry->e_flags & ADDON_MANAGEABLE;
+        }
+        case  Role::UPDATABLE:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            return item->entry->e_flags & ADDON_UPDATABLE;
+        }
+
+        case Qt::ToolTipRole:
+        {
+            vlc_mutex_locker locker{&item->entry->lock};
+            if ( !( item->entry->e_flags & ADDON_MANAGEABLE ) )
+            {
+                return qtr("This addon has been installed manually. VLC can't manage it by itself.");
+            }
+            return QVariant{};
+        }
+        case Qt::DecorationRole:
+            return QPixmap{QQmlFile::urlToLocalFileOrQrc(item->artworkUrl)};
+        default:
+            return {};
+    }
+}
+
+bool AddonsModel::setData(const QModelIndex& index, const QVariant &value, int role)
+{
+    if ( role == Role::STATE )
+    {
+        auto i_value = value.value<AddonsModel::State>();
+        if ( i_value == AddonsModel::State::STATE_INSTALLING )
+        {
+            installService(index.row());
+        }
+        else if ( i_value == AddonsModel::State::STATE_UNINSTALLING )
+        {
+            removeService(index.row());
+        }
+    }
+    return true;
+}
+
+Qt::ItemFlags AddonsModel::flags( const QModelIndex &index ) const
+{
+    Q_D(const AddonsModel);
+    Qt::ItemFlags qtFlags = BaseModel::flags(index);
+
+    const AddonItem* item = d->getItemForRow(index.row());
+    if (!item)
+        return qtFlags;
+
+    {
+        vlc_mutex_locker locker{&item->entry->lock};
+        addon_state_t addonState = item->entry->e_state;
+        if (addonState == ADDON_INSTALLING || addonState == ADDON_UNINSTALLING)
+            qtFlags &= ~Qt::ItemIsEnabled;
+
+    }
+    qtFlags |= Qt::ItemIsEditable;
+
+    return qtFlags;
+}
+
+QHash<int, QByteArray> AddonsModel::roleNames() const
+{
+    return {
+        { Role::NAME, "name" },
+        { Role::AUTHOR, "author"},
+        { Role::SUMMARY, "summary" },
+        { Role::DESCRIPTION, "description" },
+        { Role::DOWNLOADS, "downloads" },
+        { Role::SCORE, "score" },
+        { Role::STATE, "state" },
+        { Role::ARTWORK, "artwork" },
+        { Role::TYPE, "type" },
+        { Role::LINK, "link" },
+        { Role::FILENAME, "filename" },
+        { Role::ADDON_VERSION, "version" },
+        { Role::UUID, "uuid" },
+        { Role::DOWNLOAD_COUNT, "downloadCount" },
+        { Role::BROKEN, "broken" },
+        { Role::MANAGEABLE, "manageable" },
+        { Role::UPDATABLE, "updatable" },
+    };
+}
+
+void AddonsModel::installService(int idx)
+{
+    Q_D(AddonsModel);
+
+    const AddonItem* item = d->getItemForRow(idx);
+    if (!item)
+        return;
+
+    addon_uuid_t uuid;
+    assert(sizeof(uuid) == item->uuid.size());
+    memcpy( uuid, item->uuid.constData(), sizeof( uuid ) );
+    addons_manager_Install( d->m_manager, uuid );
+}
+
+void AddonsModel::removeService(int idx)
+{
+    Q_D(AddonsModel);
+
+    const AddonItem* item = d->getItemForRow(idx);
+    if (!item)
+        return;
+
+    addon_uuid_t uuid;
+    assert(sizeof(uuid) == item->uuid.size());
+    memcpy( uuid, item->uuid.constData(), sizeof( uuid ) );
+    addons_manager_Remove( d->m_manager, uuid );
+}
+
+void AddonsModel::loadFromDefaultRepository()
+{
+    Q_D(AddonsModel);
+    d->gatherRepository("repo://");
+}
+
+void AddonsModel::loadFromExternalRepository(QUrl uri)
+{
+    Q_D(AddonsModel);
+    d->gatherRepository(uri.toEncoded().constData());
+}
+
+void AddonsModel::setCtx(MainCtx* ctx)
+{
+    Q_D(AddonsModel);
+
+    if (ctx == d->m_ctx)
+        return;
+
+    assert(ctx);
+    d->m_ctx = ctx;
+    d->initializeModel();
+    emit ctxChanged();
+}
+
+MainCtx* AddonsModel::getCtx() const
+{
+    Q_D(const AddonsModel);
+    return d->m_ctx;
+}
+
+AddonsModel::Type AddonsModel::getTypeFilter() const
+{
+    Q_D(const AddonsModel);
+    return d->m_typeFilter;
+}
+
+void AddonsModel::setTypeFilter(AddonsModel::Type type)
+{
+    Q_D(AddonsModel);
+    if (type == d->m_typeFilter)
+        return;
+    d->m_typeFilter = type;
+
+    d->m_revision++;
+    invalidateCache();
+
+    emit typeFilterChanged();
+}
+
+AddonsModel::State AddonsModel::getStateFilter() const
+{
+    Q_D(const AddonsModel);
+    return d->m_stateFilter;
+}
+
+void AddonsModel::setStateFilter(AddonsModel::State state)
+{
+    Q_D(AddonsModel);
+    if (state == d->m_stateFilter)
+        return;
+    d->m_stateFilter = state;
+
+    d->m_revision++;
+    invalidateCache();
+
+    emit stateFilterChanged();
+}
+
+QString AddonsModel::getLabelForType(AddonsModel::Type type)
+{
+    switch ( type )
+    {
+    case Type::TYPE_SKIN2 :
+        return qtr( "Skins" );
+    case Type::TYPE_PLAYLIST_PARSER:
+        return qtr("Playlist parsers");
+    case Type::TYPE_SERVICE_DISCOVERY:
+        return qtr("Service Discovery");
+    case Type::TYPE_INTERFACE:
+        return qtr("Interfaces");
+    case Type::TYPE_META:
+        return qtr("Art and meta fetchers");
+    case Type::TYPE_EXTENSION:
+        return qtr("Extensions");
+    default:
+        return qtr("Unknown");
+    }
+}
+
+QColor AddonsModel::getColorForType(AddonsModel::Type type)
+{
+    QColor color;
+    switch( type )
+    {
+    case Type::TYPE_EXTENSION:
+        color = QColor(0xDB, 0xC5, 0x40);
+        break;
+    case Type::TYPE_PLAYLIST_PARSER:
+        color = QColor(0x36, 0xBB, 0x59);
+        break;
+    case Type::TYPE_SERVICE_DISCOVERY:
+        color = QColor(0xDB, 0x52, 0x40);
+        break;
+    case Type::TYPE_SKIN2:
+        color = QColor(0x8B, 0xD6, 0xFC);
+        break;
+    case Type::TYPE_INTERFACE:
+        color = QColor(0x00, 0x13, 0x85);
+        break;
+    case Type::TYPE_META:
+        color = QColor(0xCD, 0x23, 0xBF);
+        break;
+    case Type::TYPE_PLUGIN:
+    case Type::TYPE_UNKNOWN:
+    case Type::TYPE_OTHER:
+    default:
+        break;
+    }
+    return color;
+}
+
+QString AddonsModel::getIconForType(AddonsModel::Type type)
+{
+    switch( type )
+    {
+    case AddonsModel::Type::TYPE_EXTENSION:
+        return QStringLiteral("qrc:///addons/addon_yellow.svg");
+    case AddonsModel::Type::TYPE_PLAYLIST_PARSER:
+        return QStringLiteral("qrc:///addons/addon_green.svg");
+    case AddonsModel::Type::TYPE_SERVICE_DISCOVERY:
+        return QStringLiteral("qrc:///addons/addon_red.svg");
+    case AddonsModel::Type::TYPE_SKIN2:
+        return QStringLiteral("qrc:///addons/addon_cyan.svg");
+    case AddonsModel::Type::TYPE_INTERFACE:
+        return QStringLiteral("qrc:///addons/addon_blue.svg");
+    case AddonsModel::Type::TYPE_META:
+        return QStringLiteral("qrc:///addons/addon_magenta.svg");
+    default:
+        return QStringLiteral("qrc:///addons/addon_default.svg");
+    }
+    vlc_assert_unreachable();
+}
+
+int AddonsModel::getMaxScore()
+{
+    return ADDON_MAX_SCORE;
+}
+
+static void addonFoundCallback( addons_manager_t *manager, addon_entry_t *entry )
+{
+    AddonsModelPrivate* d = (AddonsModelPrivate*) manager->owner.sys;
+    QMetaObject::invokeMethod( d->q_func(), d, entryPtr = AddonPtr(entry)()
+        {
+            d->addonFound( std::move( entryPtr ) );
+        }, Qt::QueuedConnection);
+}
+
+static void addonsDiscoveryEndedCallback( addons_manager_t *manager )
+{
+    AddonsModelPrivate* d = (AddonsModelPrivate*) manager->owner.sys;
+    QMetaObject::invokeMethod( d->q_func(), d()
+        {
+            d->discoveryEnded();
+        }, Qt::QueuedConnection);
+}
+
+static void addonChangedCallback( addons_manager_t *manager, addon_entry_t *entry )
+{
+    AddonsModelPrivate* d = (AddonsModelPrivate*) manager->owner.sys;
+    QMetaObject::invokeMethod( d->q_func(), d, entryPtr = AddonPtr(entry)()
+        {
+            d->addonChanged( std::move( entryPtr ) );
+        }, Qt::QueuedConnection);
+}
+
+bool AddonsModelPrivate::initializeModel()
+{
+    Q_Q(AddonsModel);
+    if (m_qmlInitializing || !m_ctx)
+        return false;
+
+    if ( m_manager )
+        addons_manager_Delete( m_manager );
+
+    struct addons_manager_owner owner =
+    {
+        this,
+        addonFoundCallback,
+        addonsDiscoveryEndedCallback,
+        addonChangedCallback,
+    };
+
+    m_manager = addons_manager_New( VLC_OBJECT( m_ctx->getIntf() ), &owner );
+    assert( m_manager );
+
+    emit q->loadingChanged();
+    addons_manager_LoadCatalog( m_manager );
+
+    m_revision++;
+    m_loading = false;
+    emit q->loadingChanged();
+    return true;
+}
+
+
+void AddonsModelPrivate::addonFound( AddonPtr addon )
+{
+    m_items.emplace_back(std::make_shared<AddonItem>(addon));
+}
+
+void AddonsModelPrivate::addonChanged( AddonPtr addon )
+{
+    AddonItemPtr sdItem = std::make_shared<AddonItem>(addon);
+    m_cache->updateItem(std::move(sdItem));
+
+    m_revision++;
+    invalidateCache();
+}
+
+void AddonsModelPrivate::discoveryEnded()
+{
+    Q_Q(AddonsModel);
+    assert( m_loading );
+    m_loading = false;
+    emit q->loadingChanged();
+    m_revision++;
+    invalidateCache();
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/addonsmodel.hpp Added

@@ -0,0 +1,126 @@
+/*****************************************************************************
+ * Copyright (C) 2020 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef ADDONS_MODEL_HPP
+#define ADDONS_MODEL_HPP
+
+#include "util/base_model.hpp"
+#include "maininterface/mainctx.hpp"
+
+class AddonsModelPrivate;
+class AddonsModel : public BaseModel
+{
+    Q_OBJECT
+
+public:
+
+    Q_PROPERTY(MainCtx* ctx READ getCtx WRITE setCtx NOTIFY ctxChanged FINAL)
+    //filter list by to match addonTypeFilter, set to NONE to disable filtering
+    Q_PROPERTY(Type typeFilter READ getTypeFilter WRITE setTypeFilter NOTIFY typeFilterChanged FINAL)
+    Q_PROPERTY(State stateFilter READ getStateFilter WRITE setStateFilter NOTIFY stateFilterChanged FINAL)
+
+    Q_PROPERTY(int maxScore READ getMaxScore CONSTANT FINAL)
+
+    enum class State // equivalent to addon_state_t
+    {
+        STATE_NOTINSTALLED = 0,
+        STATE_INSTALLING,
+        STATE_INSTALLED,
+        STATE_UNINSTALLING,
+        STATE_NONE //not defined in addon_state_t
+    };
+    Q_ENUM(State)
+
+    enum Role : int {
+        NAME = Qt::UserRole + 1,
+        AUTHOR,
+        SUMMARY,
+        DESCRIPTION,
+        DOWNLOADS,
+        SCORE,
+        STATE,
+        TYPE,
+        ARTWORK,
+        LINK,
+        FILENAME,
+        ADDON_VERSION, //VERSION conflicts with config.h define
+        UUID,
+        DOWNLOAD_COUNT,
+        BROKEN,
+        MANAGEABLE,
+        UPDATABLE,
+    };
+    Q_ENUM(Role)
+
+    enum class Type // equivalent as addon_type_t
+    {
+        TYPE_UNKNOWN = 0,
+        TYPE_EXTENSION,
+        TYPE_PLAYLIST_PARSER,
+        TYPE_SERVICE_DISCOVERY,
+        TYPE_SKIN2,
+        TYPE_PLUGIN,
+        TYPE_INTERFACE,
+        TYPE_META,
+        TYPE_OTHER,
+        TYPE_NONE //not defined in addon_type_t
+    };
+    Q_ENUM(Type)
+
+
+    explicit AddonsModel(QObject* parent = nullptr);
+
+public: //QAbstractListModel override
+    QVariant data(const QModelIndex& index, int role) const override;
+    bool setData(const QModelIndex& index, const QVariant &value, int role) override;
+    Qt::ItemFlags flags( const QModelIndex &index ) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+public: //invokable functions
+    Q_INVOKABLE void installService(int idx);
+    Q_INVOKABLE void removeService(int idx);
+
+    Q_INVOKABLE void loadFromDefaultRepository();
+    Q_INVOKABLE void loadFromExternalRepository(QUrl uri);
+
+    Q_INVOKABLE static QString getLabelForType(Type type);
+    Q_INVOKABLE static QColor getColorForType(Type type);
+    Q_INVOKABLE static QString getIconForType(Type type);
+
+    static int getMaxScore();
+
+public: // properties
+    void setCtx(MainCtx* ctx);
+    MainCtx* getCtx() const;
+
+    State getStateFilter() const;
+    void setStateFilter(State state);
+
+    Type getTypeFilter() const;
+    void setTypeFilter(Type type);
+
+signals:
+    void ctxChanged();
+    void stateFilterChanged();
+    void typeFilterChanged();
+
+private:
+    Q_DECLARE_PRIVATE(AddonsModel);
+};
+
+#endif // ADDONS_MODEL_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/devicesourceprovider.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/devicesourceprovider.cpp Changed

@@ -18,13 +18,14 @@
 
 #include "devicesourceprovider.hpp"
 #include "networkmediamodel.hpp"
-
+#include "maininterface/mainctx.hpp"
+#include "medialibrary/mlthreadpool.hpp"
 
 //handle discovery events from the media source provider
-struct DeviceSourceProvider::ListenerCb : public MediaTreeListener::MediaTreeListenerCb {
-    ListenerCb(DeviceSourceProvider* provider, NetworkDeviceModel::MediaSourcePtr mediaSource)
-        : provider(provider)
-        , mediaSource(std::move(mediaSource))
+struct MediaSourceModel::ListenerCb : public MediaTreeListener::MediaTreeListenerCb {
+    ListenerCb(MediaSourceModel* model, MediaSourcePtr& mediaSource)
+        : m_model(model)
+        , m_mediaSource(mediaSource)
     {}
 
     inline void onItemPreparseEnded( MediaTreePtr, input_item_node_t *, int ) override final {}
@@ -56,11 +57,11 @@
         for ( auto i = 0u; i < count; ++i )
             itemList.emplace_back( childreni->p_item );
 
-        QMetaObject::invokeMethod(provider, provider = this->provider,
+        QMetaObject::invokeMethod(m_model, model = this->m_model,
                                   itemList = std::move(itemList),
-                                  mediaSource = this->mediaSource()
+                                  mediaSource = this->m_mediaSource()
         {
-            provider->removeItems(itemList, mediaSource);
+            model->removeItems(itemList, mediaSource);
         });
     }
 
@@ -73,156 +74,221 @@
         for (size_t i = 0; i < count; i++)
             itemList.emplace_back(childreni->p_item);
 
-        QMetaObject::invokeMethod(provider, provider = this->provider,
+        QMetaObject::invokeMethod(m_model, model = this->m_model,
                                   itemList = std::move(itemList),
-                                  mediaSource = this->mediaSource, clear()
+                                  mediaSource = this->m_mediaSource, clear()
         {
-            provider->addItems(itemList, mediaSource, clear);
+            model->addItems(itemList, mediaSource, clear);
         });
     }
 
-    DeviceSourceProvider *provider;
-    MediaSourcePtr mediaSource;
+    MediaSourceModel* m_model;
+    MediaSourcePtr m_mediaSource;
 };
 
-
-DeviceSourceProvider::DeviceSourceProvider(NetworkDeviceModel::SDCatType sdSource
-                                           , const QString &sourceName, QObject *parent)
-    : QObject(parent)
-    , m_sdSource {sdSource}
-    , m_sourceName {sourceName}
+MediaSourceModel::MediaSourceModel(MediaSourcePtr& mediaSource)
+    : m_mediaSource(mediaSource)
 {
 }
 
-void DeviceSourceProvider::init(qt_intf_t *intf)
+MediaSourceModel::~MediaSourceModel()
 {
-    using SourceMetaPtr = std::unique_ptr<vlc_media_source_meta_list_t,
-                                          decltype( &vlc_media_source_meta_list_Delete )>;
+    //reset the listenner before the source
+    m_listenner.reset();
 
-    auto libvlc = vlc_object_instance(intf);
+    for (const SharedInputItem & media : m_medias)
+        emit mediaRemoved(media);
+    m_medias.clear();
 
-    auto provider = vlc_media_source_provider_Get( libvlc );
-    SourceMetaPtr providerList( vlc_media_source_provider_List(
-                                    provider,
-                                    static_cast<services_discovery_category_e>(m_sdSource) ),
-                               &vlc_media_source_meta_list_Delete );
+    m_mediaSource.reset();
+}
 
-    if (!providerList)
-    {
-        emit failed();
+void MediaSourceModel::init()
+{
+    assert(m_mediaSource);
+
+    if (m_listenner)
         return;
-    }
 
-    size_t nbProviders = vlc_media_source_meta_list_Count( providerList.get() );
-    for ( auto i = 0u; i < nbProviders; ++i )
-    {
-        auto meta = vlc_media_source_meta_list_Get( providerList.get(), i );
-        const QString sourceName = qfu( meta->name );
-        if ( m_sourceName != '*' && m_sourceName != sourceName )
-            continue;
+    m_listenner = std::make_unique<MediaTreeListener>(
+        MediaTreePtr{ m_mediaSource->tree },
+        std::make_unique<MediaSourceModel::ListenerCb>(this, m_mediaSource)
+        );
+}
 
-        m_name += m_name.isEmpty() ? qfu( meta->longname ) : ", " + qfu( meta->longname );
+const std::vector<SharedInputItem>& MediaSourceModel::getMedias() const
+{
+    return m_medias;
+}
 
-        MediaSourcePtr mediaSource(
-                    vlc_media_source_provider_GetMediaSource(provider, meta->name)
-                    , false );
+QString MediaSourceModel::getDescription() const
+{
+    return qfu(m_mediaSource->description);
+}
 
-        if ( mediaSource == nullptr )
-            continue;
+MediaTreePtr MediaSourceModel::getTree() const
+{
+    return MediaTreePtr(m_mediaSource->tree);
+}
 
-        std::unique_ptr<MediaTreeListener> l{ new MediaTreeListener(
-            MediaTreePtr{ mediaSource->tree },
-            std::make_unique<DeviceSourceProvider::ListenerCb>(this, mediaSource) ) };
-        if ( l->listener == nullptr )
-            break;
+void MediaSourceModel::addItems(const std::vector<SharedInputItem> &inputList,
+                                    const MediaSourcePtr &mediaSource, const bool clear)
+{
+    if (mediaSource != m_mediaSource)
+    {
+        qWarning() << "unexpected media source";
+        return;
+    }
 
-        m_mediaSources.push_back( std::move( mediaSource ) );
-        m_listeners.push_back( std::move( l ) );
+    if (clear)
+    {
+        for (const SharedInputItem & media : m_medias)
+            emit mediaRemoved(media);
+        m_medias.clear();
     }
 
-    if ( !m_name.isEmpty() )
-        emit nameUpdated( m_name );
+    for (const SharedInputItem & inputItem : inputList)
+    {
+        auto it = std::find(
+            m_medias.cbegin(), m_medias.cend(),
+            inputItem
+        );
+        if (it != m_medias.end())
+            continue;
 
-    if ( !m_listeners.empty() )
-        emit itemsUpdated( m_items );
-    else
-        emit failed();
+        emit mediaAdded(inputItem);
+        m_medias.push_back(std::move(inputItem));
+    }
 }
 
-void DeviceSourceProvider::addItems(const std::vector<SharedInputItem> &inputList,
-                                    const MediaSourcePtr &mediaSource, const bool clear)
+void MediaSourceModel::removeItems(const std::vector<SharedInputItem> &inputList,
+                                       const MediaSourcePtr &mediaSource)
 {
-    bool dataChanged = false;
-
-    if (clear)
+    if (mediaSource != m_mediaSource)
     {
-        const qsizetype removed = m_items.removeIf(&mediaSource(const NetworkDeviceItemPtr &item)
-        {
-            return item->mediaSource == mediaSource;
-        });
-
-        if (removed > 0)
-            dataChanged = true;
+        qWarning() << "unexpected media source";
+        return;
     }
 
-    for (const SharedInputItem & inputItem : inputList)
+    for (const SharedInputItem& inputItem : inputList)
     {
-        auto newItem = std::make_shared<NetworkDeviceItem>(inputItem, mediaSource);
-        auto it = m_items.find(newItem);
-        if (it != m_items.end())
-        {
-            (*it)->mrls.push_back(std::make_pair(newItem->mainMrl, mediaSource));
-        }
-        else
+        auto it = std::remove(m_medias.begin(), m_medias.end(), inputItem);
+        if (it != m_medias.end())
         {
-            m_items.insert(std::move(newItem));
-            dataChanged = true;
+            m_medias.erase(it);
+            mediaRemoved(inputItem);
         }
     }
+}
 
-    if (dataChanged)
+SharedMediaSourceModel MediaSourceCache::getMediaSourceModel(vlc_media_source_provider_t* provider, const char* name)
+{
+    //MediaSourceCache may be accessed by multiple threads
+    QMutexLocker lock{&m_mutex};
+
+    QString key = qfu(name);
+    auto it = m_cache.find(key);
+    if (it != m_cache.end())
     {
-        emit itemsUpdated(m_items);
+        SharedMediaSourceModel ref = it->second.toStrongRef();
+        if (ref)
+            return ref;
     }
+    MediaSourcePtr mediaSource(
+        vlc_media_source_provider_GetMediaSource(provider, name),
+        false );
+
+    if (!mediaSource)
+        return nullptr;
+
+    SharedMediaSourceModel item = SharedMediaSourceModel::create(mediaSource);
+    m_cachekey = item;
+    return item;
 }
 
-void DeviceSourceProvider::removeItems(const std::vector<SharedInputItem> &inputList,
-                                       const MediaSourcePtr &mediaSource)
+DeviceSourceProvider::DeviceSourceProvider(
+    NetworkDeviceModel::SDCatType sdSource,
+    const QString &sourceName,
+    MainCtx* ctx,
+    QObject* parent)
+    : QObject(parent)
+    , m_ctx(ctx)
+    , m_sdSource {sdSource}
+    , m_sourceName {sourceName}
 {
-    bool dataChanged = false;
-    for (const SharedInputItem& p_item : inputList)
-    {
-        auto oldItem = std::make_shared<NetworkDeviceItem>(p_item, mediaSource);
-        NetworkDeviceItemSet::iterator it = m_items.find(oldItem);
-        if (it != m_items.end())
-        {
-            bool found = false;
+}
 
-            const NetworkDeviceItemPtr& item = *it;
-            if (item->mrls.size() > 1)
-            {
-                auto mrlIt = std::find_if(
-                    item->mrls.begin(), item->mrls.end(),
-                    &oldItem( const std::pair<QUrl, MediaSourcePtr>& mrl ) {
-                        return mrl.first.matches(oldItem->mainMrl, QUrl::StripTrailingSlash)
-                            && mrl.second == oldItem->mediaSource;
-                    });
-
-                if ( mrlIt != item->mrls.end() )
-                {
-                    found = true;
-                    item->mrls.erase( mrlIt );
-                }
-            }
+DeviceSourceProvider::~DeviceSourceProvider()
+{
+    if (m_taskId != 0)
+        m_ctx->threadRunner()->cancelTask(this, m_taskId);
+}
 
-            if (!found)
+void DeviceSourceProvider::init()
+{
+    using SourceMetaPtr = std::unique_ptr<vlc_media_source_meta_list_t,
+                                          decltype( &vlc_media_source_meta_list_Delete )>;
+
+    struct Ctx {
+        bool success = false;
+        QString name;
+        std::vector<SharedMediaSourceModel> sources;
+    };
+    QThread* thread = QThread::currentThread();
+    m_taskId = m_ctx->threadRunner()->runOnThread<Ctx>(
+        this,
+        //Worker thread
+        intf = m_ctx->getIntf(), sdSource = m_sdSource, nameFilter = m_sourceName, thread(Ctx& ctx){
+            auto libvlc = vlc_object_instance(intf);
+
+            auto provider = vlc_media_source_provider_Get( libvlc );
+            SourceMetaPtr providerList( vlc_media_source_provider_List(
+                                           provider,
+                                           static_cast<services_discovery_category_e>(sdSource) ),
+                                       &vlc_media_source_meta_list_Delete );
+
+            if (!providerList)
+                return;
+
+            size_t nbProviders = vlc_media_source_meta_list_Count( providerList.get() );
+
+            for ( size_t i = 0u; i < nbProviders; ++i )
             {
-                m_items.erase(it);
-                dataChanged = true;
+                auto meta = vlc_media_source_meta_list_Get( providerList.get(), i );
+                const QString sourceName = qfu( meta->name );
+                if ( nameFilter != '*' && nameFilter != sourceName )
+                    continue;
+
+                SharedMediaSourceModel mediaSource = MediaSourceCache::getInstance()->getMediaSourceModel(provider, meta->name);
+
+                if (!mediaSource)
+                    continue;
+
+                //ensure this QObject don't live in the worker thread
+                mediaSource->moveToThread(thread);
+
+                ctx.name += ctx.name.isEmpty() ? qfu( meta->longname ) : ", " + qfu( meta->longname );
+                ctx.sources.push_back(mediaSource);
+            }
+        },
+        //UI thread
+        this(quint64, Ctx& ctx){
+            m_name = ctx.name;
+            emit nameUpdated( m_name );
+
+            for (auto& mediaSource : ctx.sources) {
+                mediaSource->init();
+                m_mediaSources.push_back( mediaSource );
             }
-        }
-    }
 
-    if (dataChanged)
-        emit itemsUpdated(m_items);
+            if ( !m_mediaSources.empty() )
+                emit itemsUpdated();
+            else
+                emit failed();
+        });
+}
+
+const std::vector<SharedMediaSourceModel>& DeviceSourceProvider::getMediaSources() const
+{
+    return m_mediaSources;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/devicesourceprovider.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/devicesourceprovider.hpp Changed

@@ -27,93 +27,102 @@
 #include <QString>
 #include <QSet>
 #include <vector>
+#include <QMutex>
 
 #include "networkdevicemodel.hpp"
 #include "mediatreelistener.hpp"
+#include "util/shared_input_item.hpp"
+#include "vlcmediasourcewrapper.hpp"
+#include "util/singleton.hpp"
 
-//represents an entry of the model
-struct NetworkDeviceItem : public NetworkBaseItem
+static inline std::size_t qHash(const SharedInputItem& item, size_t seed = 0) noexcept
 {
-    NetworkDeviceItem(const SharedInputItem& item, const NetworkDeviceModel::MediaSourcePtr& source)
-    {
-        name = qfu(item->psz_name);
-        mainMrl = QUrl::fromEncoded(item->psz_uri);
-        protocol = mainMrl.scheme();
-        type = static_cast<NetworkDeviceModel::ItemType>(item->i_type);
-        mediaSource = source;
-        inputItem = item;
-
-        id = qHash(name) ^ qHash(protocol);
-        mrls.push_back(std::make_pair(mainMrl, source));
-
-        char* artworkUrl = input_item_GetArtworkURL(inputItem.get());
-        if (artworkUrl)
-        {
-            artwork = QString::fromUtf8(artworkUrl);
-            free(artworkUrl);
-        }
-    }
-
-    uint id;
-    std::vector<std::pair<QUrl, NetworkDeviceModel::MediaSourcePtr>> mrls;
-    NetworkDeviceModel::MediaSourcePtr mediaSource;
-    SharedInputItem inputItem;
- };
-
-using NetworkDeviceItemPtr =std::shared_ptr<NetworkDeviceItem>;
-
-static inline bool operator == (const NetworkDeviceItemPtr& a, const NetworkDeviceItemPtr& b) noexcept
-{
-    return a->id == b->id
-        && QString::compare(a->name, b->name, Qt::CaseInsensitive) == 0
-        && QString::compare(a->protocol, b->protocol, Qt::CaseInsensitive) == 0;
+    QString name = qfu(item->psz_name);
+    QUrl mainMrl = QUrl::fromEncoded(item->psz_uri);
+    QString protocol = mainMrl.scheme();
+    return qHash(name, seed) ^ qHash(protocol);;
 }
 
+class MediaSourceModel : public QObject
+{
+    Q_OBJECT
+public:
+
+    MediaSourceModel(MediaSourcePtr& mediaSource);
+    ~MediaSourceModel();
+
+public:
+    void init();
+
+    const std::vector<SharedInputItem>& getMedias() const;
+
+    QString getDescription() const;
+    MediaTreePtr getTree() const;
+
+signals:
+    void mediaAdded(SharedInputItem media);
+    void mediaRemoved(SharedInputItem media);
 
-static inline std::size_t qHash(const NetworkDeviceItemPtr& s, size_t = 0) noexcept
+private:
+    void addItems(const std::vector<SharedInputItem>& inputList,
+                  const MediaSourcePtr& mediaSource,
+                  bool clear);
+
+    void removeItems(const std::vector<SharedInputItem>& inputList,
+                     const MediaSourcePtr& mediaSource);
+
+    struct ListenerCb;
+    std::unique_ptr<MediaTreeListener> m_listenner;
+    MediaSourcePtr m_mediaSource;
+    std::vector<SharedInputItem> m_medias;
+};
+typedef QSharedPointer<MediaSourceModel> SharedMediaSourceModel;
+
+
+class MediaSourceCache : public Singleton<MediaSourceCache>
 {
-    return s->id;
-}
+public:
+    SharedMediaSourceModel getMediaSourceModel(vlc_media_source_provider_t* provider, const char* name);
+
+private:
+    MediaSourceCache() = default;
+    ~MediaSourceCache() = default;
+    friend class Singleton<MediaSourceCache>;
 
-using NetworkDeviceItemSet = QSet<NetworkDeviceItemPtr>;
+private:
+    //we keep a weak pointer to the model sources, if no other party is
+    //referencing the source, then it will be freed,
+    std::map<QString, QWeakPointer<MediaSourceModel>> m_cache;
+    QMutex m_mutex;
+};
 
 class DeviceSourceProvider : public QObject
 {
     Q_OBJECT
 
 public:
-    using MediaSourcePtr = NetworkDeviceModel::MediaSourcePtr;
-
     DeviceSourceProvider(NetworkDeviceModel::SDCatType sdSource,
                          const QString &sourceName,
+                         MainCtx* ctx,
                          QObject *parent = nullptr);
+    virtual ~DeviceSourceProvider();
+
+    void init();
 
-    void init(qt_intf_t *intf);
+    const std::vector<SharedMediaSourceModel>& getMediaSources() const;
 
 signals:
     void failed();
     void nameUpdated( QString name );
-    void itemsUpdated( NetworkDeviceItemSet items );
+    void itemsUpdated();
 
 private:
-    struct ListenerCb;
-
-    void addItems(const std::vector<SharedInputItem>& inputList,
-                  const MediaSourcePtr& mediaSource,
-                  bool clear);
-
-    void removeItems(const std::vector<SharedInputItem>& inputList,
-                     const MediaSourcePtr& mediaSource);
+    MainCtx* m_ctx = nullptr;
+    quint64 m_taskId = 0;
 
     NetworkDeviceModel::SDCatType m_sdSource;
     QString m_sourceName; // '*' -> all sources
     QString m_name; // source long name
 
-    NetworkDeviceItemSet m_items;
-
-    // destruction of listeners may cause destruction of source 'MediaSource'
-    // maintain a seperate reference of MediaSources to fix cyclic free
-    std::vector<MediaSourcePtr> m_mediaSources;
-
-    std::vector<std::unique_ptr<MediaTreeListener>> m_listeners;
+    std::vector<SharedMediaSourceModel> m_mediaSources;
 };

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/mediatreelistener.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/mediatreelistener.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/networkdevicemodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/networkdevicemodel.cpp Changed

@@ -20,7 +20,6 @@
 #include <QTimer>
 
 #include "maininterface/mainctx.hpp"
-#include "util/workerthreadset.hpp"
 
 #include "devicesourceprovider.hpp"
 #include "networkmediamodel.hpp"
@@ -29,11 +28,120 @@
 #include "playlist/playlist_controller.hpp"
 
 #include "util/shared_input_item.hpp"
+#include "vlcmediasourcewrapper.hpp"
+
 #include "util/locallistbasemodel.hpp"
 
+#include "vlcmediasourcewrapper.hpp"
+
 namespace
 {
 
+//represents an entry of the model
+struct NetworkDeviceItem : public NetworkBaseItem
+{
+    NetworkDeviceItem(
+        const SharedInputItem& item,
+        const SharedMediaSourceModel& source
+        )
+    {
+        name = qfu(item->psz_name);
+        mainMrl = QUrl::fromEncoded(item->psz_uri);
+        protocol = mainMrl.scheme();
+        type = static_cast<NetworkDeviceModel::ItemType>(item->i_type);
+
+        id = qHash(item);
+        mrls.push_back(Source{mainMrl, item, source});
+
+        char* artworkUrl = input_item_GetArtworkURL(item.get());
+        if (artworkUrl)
+        {
+            artwork = QString::fromUtf8(artworkUrl);
+            free(artworkUrl);
+        }
+    }
+
+    QString sourceDesciption() const {
+        if (mrls.empty())
+            return {};
+        return mrls.front().source->getDescription();
+    }
+
+    NetworkTreeItem makeTreeItem() const
+    {
+        if (unlikely(mrls.empty()))
+            return {};
+        const Source& src = mrls.front();
+        return NetworkTreeItem(src.source, src.item);
+    }
+
+    SharedInputItem getInputItem() const
+    {
+        if (unlikely(mrls.empty()))
+            return {};
+        const Source& src = mrls.front();
+        return src.item;
+    }
+
+    void addSource(const SharedInputItem& item,
+                   const SharedMediaSourceModel& source)
+    {
+        mrls.emplace_back(Source{
+            QUrl::fromEncoded(item->psz_uri),
+            item,
+            source
+        });
+    }
+
+    /**
+     * @brief addRemoveSource
+     * @param item
+     * @param source
+     * @return false when no sources left
+     */
+    bool removeSource(const SharedInputItem& item,
+                   const SharedMediaSourceModel&)
+    {
+        mrls.erase(std::remove_if(
+            mrls.begin(), mrls.end(),
+            item(const Source& source){
+                return source.item == item;
+            })
+        );
+
+        if (mrls.empty())
+        {
+            mainMrl = QUrl{};
+            return false;
+        }
+        else
+        {
+            mainMrl = mrls.front().mrl;
+            return true;
+        }
+    }
+
+
+    struct Source {
+        QUrl mrl;
+        SharedInputItem item;
+        SharedMediaSourceModel source;
+    };
+
+    size_t id;
+    std::vector<Source> mrls;
+};
+
+using NetworkDeviceItemPtr =std::shared_ptr<NetworkDeviceItem>;
+
+
+static inline bool operator == (const NetworkDeviceItemPtr& a, const NetworkDeviceItemPtr& b) noexcept
+{
+    return a->id == b->id
+           && QString::compare(a->name, b->name, Qt::CaseInsensitive) == 0
+           && QString::compare(a->protocol, b->protocol, Qt::CaseInsensitive) == 0;
+}
+
 bool itemMatchPattern(const NetworkDeviceItemPtr& a, const QString& pattern)
 {
     return a->name.contains(pattern, Qt::CaseInsensitive);
@@ -95,6 +203,17 @@
         : LocalListBaseModelPrivate<NetworkDeviceItemPtr>(pub)
     {}
 
+    ~NetworkDeviceModelPrivate()
+    {
+        //Explicilty disconnect signals here:
+        // - destructor will release m_sourcesProvider
+        // - its shared MediaSourceModel will be released
+        // - they will notify `mediaRemoved`, but the slot expects the shared MediaSourceModel to be valid
+        // at this point we don't care about model updates
+        for (auto& conn : m_sourceUpdateConnections)
+            QObject::disconnect(conn);
+    }
+
     NetworkDeviceModelLoader::ItemCompare getSortFunction() const override
     {
         if (m_sortCriteria == "mrl")
@@ -117,32 +236,20 @@
     {
         Q_Q(NetworkDeviceModel);
 
-        if (m_qmlInitializing || !q->m_ctx || q->m_sdSource == NetworkDeviceModel::CAT_UNDEFINED || q->m_sourceName.isEmpty())
+        if (m_qmlInitializing || !m_ctx || m_sdSource == NetworkDeviceModel::CAT_UNDEFINED || m_sourceName.isEmpty())
             return false;
 
         m_items.clear();
 
-        if (m_sources)
-        {
-            q->disconnect( m_sources );
-            m_sources->deleteLater();
-            m_sources = nullptr;
-        }
+        if (m_sourcesProvider)
+            m_sourcesProvider.reset();
 
-        q->m_name = QString {};
+        m_name = QString {};
         emit q->nameChanged();
 
-        m_sources = new DeviceSourceProvider( q->m_sdSource, q->m_sourceName );
-        q->m_ctx->workersThreads()->assignToWorkerThread( m_sources );
-
-        // make sure we're not releasing resources on main thread
-        // by clearing copies of model before source provider
-        QObject::connect(q, &QObject::destroyed, m_sources, sources = m_sources()
-        {
-            sources->deleteLater();
-        });
+        m_sourcesProvider = std::make_unique<DeviceSourceProvider>( m_sdSource, m_sourceName, m_ctx );
 
-        QObject::connect(m_sources, &DeviceSourceProvider::failed, q,
+        QObject::connect(m_sourcesProvider.get(), &DeviceSourceProvider::failed, q,
                 this()
         {
             m_items.clear();
@@ -151,27 +258,58 @@
             invalidateCache();
         });
 
-        QObject::connect(m_sources, &DeviceSourceProvider::nameUpdated, q,
-                q(QString name)
+        QObject::connect(m_sourcesProvider.get(), &DeviceSourceProvider::nameUpdated, q,
+                this, q(QString name)
         {
-            q->m_name = name;
+            m_name = name;
             emit q->nameChanged();
         });
 
-        QObject::connect(m_sources, &DeviceSourceProvider::itemsUpdated, q,
-                this(NetworkDeviceItemSet items)
+        for (auto conn : m_sourceUpdateConnections)
+            QObject::disconnect(conn);
+        m_sourceUpdateConnections.clear();
+
+        //itemsUpdated is called only once after init.
+        QObject::connect(m_sourcesProvider.get(), &DeviceSourceProvider::itemsUpdated, q,
+                this()
         {
-            m_items = items;
+            for (const auto& source: m_sourcesProvider->getMediaSources())
+            {
+                //fill initial values
+                for (const SharedInputItem& media : source->getMedias())
+                    onMediaAdded(source, media);
+
+                //don't store a strong reference in the lambda or this may leak the source
+                //as the connection is destroyed when the source is destroyed but the
+                //connection holds a reference
+                QWeakPointer<MediaSourceModel> weakSource{source};
+
+                auto conn = QObject::connect(
+                    source.get(), &MediaSourceModel::mediaAdded,
+                    q_ptr, this, weakSource(SharedInputItem media) {
+                        //source is the signal emitter, it should always exist
+                        auto strongSource  = weakSource.toStrongRef();
+                        assert(strongSource);
+                        onMediaAdded(strongSource, media);
+                    });
+                m_sourceUpdateConnections.push_back(conn);
+
+                conn = QObject::connect(
+                    source.get(), &MediaSourceModel::mediaRemoved,
+                    q_ptr, this, weakSource(SharedInputItem media) {
+                        auto strongSource  = weakSource.toStrongRef();
+                        assert(strongSource);
+                        onMediaRemoved(strongSource, media);
+                    });
+
+                m_sourceUpdateConnections.push_back(conn);
+            }
 
             m_revision += 1;
             invalidateCache();
         });
 
-        QMetaObject::invokeMethod(m_sources,
-                                  sources = this->m_sources, intf = q->m_ctx->getIntf()()
-        {
-            sources->init( intf );
-        });
+        m_sourcesProvider->init();
 
         //service discovery don't notify preparse end
         m_loading = false;
@@ -188,6 +326,47 @@
         return nullptr;
     }
 
+    void onMediaAdded(const QSharedPointer<MediaSourceModel>& mediaSource, SharedInputItem media)
+    {
+        std::size_t hash = qHash(media);
+        auto it = std::find_if(
+            m_items.begin(), m_items.end(),
+            hash(const NetworkDeviceItemPtr& item) {
+                return item->id == hash;
+            });
+        if (it != m_items.end())
+        {
+            (*it)->addSource(media, mediaSource);
+        }
+        else
+        {
+            m_items.push_back(std::make_unique<NetworkDeviceItem>(media, mediaSource));
+            m_revision += 1;
+            invalidateCache();
+        }
+    }
+
+    void onMediaRemoved(const QSharedPointer<MediaSourceModel>& mediaSource, SharedInputItem media)
+    {
+        std::size_t hash = qHash(media);
+        auto it = std::find_if(
+            m_items.begin(), m_items.end(),
+            hash(const NetworkDeviceItemPtr& item) {
+                return item->id == hash;
+            });
+        if (it == m_items.end())
+            return;
+
+        bool needDestruction = (*it)->removeSource(media, mediaSource);
+        if (needDestruction)
+        {
+            m_items.erase(it);
+        }
+
+        m_revision += 1;
+        invalidateCache();
+    }
+
 public: //LocalListCacheLoader::ModelSource
     std::vector<NetworkDeviceItemPtr> getModelData(const QString& pattern) const override
     {
@@ -211,8 +390,15 @@
     }
 
 public:
-    NetworkDeviceItemSet m_items;
-    QPointer<DeviceSourceProvider> m_sources {};
+    std::unique_ptr<DeviceSourceProvider> m_sourcesProvider;
+    std::vector<NetworkDeviceItemPtr> m_items;
+
+    MainCtx* m_ctx = nullptr;
+    NetworkDeviceModel::SDCatType m_sdSource = NetworkDeviceModel::CAT_UNDEFINED;
+    QString m_sourceName; // '*' -> all sources
+    QString m_name; // source long name
+
+    std::vector<QMetaObject::Connection> m_sourceUpdateConnections;
 };
 
 NetworkDeviceModel::NetworkDeviceModel( QObject* parent )
@@ -228,7 +414,7 @@
 QVariant NetworkDeviceModel::data( const QModelIndex& index, int role ) const
 {
     Q_D(const NetworkDeviceModel);
-    if (!m_ctx)
+    if (!d->m_ctx)
         return {};
 
     const NetworkDeviceItem* item = d->getItemForRow(index.row());
@@ -238,9 +424,9 @@
     switch ( role )
     {
         case NETWORK_SOURCE:
-            return item->mediaSource->description;
+            return item->sourceDesciption();
         case NETWORK_TREE:
-            return QVariant::fromValue( NetworkTreeItem(MediaTreePtr{ item->mediaSource->tree }, item->inputItem.get()) );
+            return QVariant::fromValue(item->makeTreeItem());
         default:
             return NetworkBaseModel::basedata(*item, role);
     }
@@ -257,19 +443,39 @@
 void NetworkDeviceModel::setCtx(MainCtx* ctx)
 {
     Q_D(NetworkDeviceModel);
-    if (m_ctx == ctx)
+    if (d->m_ctx == ctx)
         return;
-    m_ctx = ctx;
+    d->m_ctx = ctx;
     d->initializeModel();
     emit ctxChanged();
 }
 
+MainCtx* NetworkDeviceModel::getCtx() const
+{
+    Q_D(const NetworkDeviceModel);
+    return d->m_ctx;
+}
+
+NetworkDeviceModel::SDCatType NetworkDeviceModel::getSdSource() const {
+    Q_D(const NetworkDeviceModel);
+    return d->m_sdSource;
+}
+QString NetworkDeviceModel::getName() const {
+    Q_D(const NetworkDeviceModel);
+    return d->m_name;
+
+}
+QString NetworkDeviceModel::getSourceName() const {
+    Q_D(const NetworkDeviceModel);
+    return d->m_sourceName;
+}
+
 void NetworkDeviceModel::setSdSource(SDCatType s)
 {
     Q_D(NetworkDeviceModel);
-    if (m_sdSource == s)
+    if (d->m_sdSource == s)
         return;
-    m_sdSource = s;
+    d->m_sdSource = s;
     d->initializeModel();
     emit sdSourceChanged();
 }
@@ -277,9 +483,9 @@
 void NetworkDeviceModel::setSourceName(const QString& sourceName)
 {
     Q_D(NetworkDeviceModel);
-    if (m_sourceName == sourceName)
+    if (d->m_sourceName == sourceName)
         return;
-    m_sourceName = sourceName;
+    d->m_sourceName = sourceName;
     d->initializeModel();
     emit sourceNameChanged();
 }
@@ -287,7 +493,7 @@
 bool NetworkDeviceModel::insertIntoPlaylist(const QModelIndexList &itemIdList, ssize_t playlistIndex)
 {
     Q_D(NetworkDeviceModel);
-    if (!(m_ctx && m_sdSource != CAT_MYCOMPUTER))
+    if (!(d->m_ctx && d->m_sdSource != CAT_MYCOMPUTER))
         return false;
     QVector<vlc::playlist::Media> medias;
     medias.reserve( itemIdList.size() );
@@ -296,26 +502,26 @@
         const NetworkDeviceItem* item = d->getItemForRow(id.row());
         if (!item)
             continue;
-        medias.append( vlc::playlist::Media {item->inputItem.get()} );
+        medias.append( vlc::playlist::Media {item->getInputItem().get() } );
     }
     if (medias.isEmpty())
         return false;
-    m_ctx->getIntf()->p_mainPlaylistController->insert(playlistIndex, medias, false);
+    d->m_ctx->getIntf()->p_mainPlaylistController->insert(playlistIndex, medias, false);
     return true;
 }
 
 bool NetworkDeviceModel::addToPlaylist(int row)
 {
     Q_D(NetworkDeviceModel);
-    if (!(m_ctx && m_sdSource != CAT_MYCOMPUTER))
+    if (!(d->m_ctx && d->m_sdSource != CAT_MYCOMPUTER))
         return false;
 
     const NetworkDeviceItem* item = d->getItemForRow(row);
     if (!item)
         return false;
 
-    vlc::playlist::Media media{ item->inputItem.get() };
-    m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, false);
+    vlc::playlist::Media media{ item->getInputItem().get() };
+    d->m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, false);
     return true;
 }
 
@@ -348,15 +554,15 @@
 bool NetworkDeviceModel::addAndPlay(int row)
 {
     Q_D(NetworkDeviceModel);
-    if (!(m_ctx && m_sdSource != CAT_MYCOMPUTER))
+    if (!(d->m_ctx && d->m_sdSource != CAT_MYCOMPUTER))
         return false;
 
     const NetworkDeviceItem* item = d->getItemForRow(row);
     if (!item)
         return false;
 
-    vlc::playlist::Media media{ item->inputItem.get() };
-    m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, true);
+    vlc::playlist::Media media{ item->getInputItem().get() };
+    d->m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, true);
     return true;
 }
 
@@ -404,9 +610,8 @@
         if (!item)
             continue;
 
-        items.append(QVariant::fromValue(SharedInputItem(item->inputItem.get(), true)));
+        items.append(QVariant::fromValue(SharedInputItem(item->getInputItem().get(), true)));
     }
 
     return items;
 }
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/networkdevicemodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/networkdevicemodel.hpp Changed

@@ -19,17 +19,10 @@
 #ifndef MLNETWORKDEVICEMODEL_HPP
 #define MLNETWORKDEVICEMODEL_HPP
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <QAbstractListModel>
 #include <QUrl>
 
-#include <vlc_media_source.h>
-
 #include "networkbasemodel.hpp"
-#include "util/shared_input_item.hpp"
 
 #include <memory>
 
@@ -63,13 +56,6 @@
     };
     Q_ENUM( SDCatType )
 
-public: // Declarations
-    using MediaSourcePtr = vlc_shared_data_ptr_type(vlc_media_source_t,
-                                    vlc_media_source_Hold, vlc_media_source_Release);
-
-    using MediaTreePtr = vlc_shared_data_ptr_type(vlc_media_tree_t,
-                                                  vlc_media_tree_Hold,
-                                                  vlc_media_tree_Release);
 public:
     NetworkDeviceModel( QObject* parent = nullptr );
     virtual ~NetworkDeviceModel() = default;
@@ -84,10 +70,10 @@
     void setSdSource(SDCatType s);
     void setSourceName(const QString& sourceName);
 
-    inline MainCtx* getCtx() const { return m_ctx; }
-    inline SDCatType getSdSource() const { return m_sdSource; }
-    inline QString getName() const { return m_name; }
-    inline QString getSourceName() const { return m_sourceName; }
+    MainCtx* getCtx() const;
+    SDCatType getSdSource() const;
+    QString getName() const;
+    QString getSourceName() const;
 
     Q_INVOKABLE bool insertIntoPlaylist( const QModelIndexList& itemIdList, ssize_t playlistIndex );
     Q_INVOKABLE bool addToPlaylist(int row );
@@ -107,15 +93,6 @@
     void itemsUpdated();
 
 private:
-    void refreshDeviceList(MediaSourcePtr mediaSource, input_item_node_t* const children, size_t count , bool clear);
-    bool initializeMediaSources();
-
-private:
-    MainCtx* m_ctx = nullptr;
-    SDCatType m_sdSource = CAT_UNDEFINED;
-    QString m_sourceName; // '*' -> all sources
-    QString m_name; // source long name
-
     Q_DECLARE_PRIVATE(NetworkDeviceModel)
 };

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/networkmediamodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/networkmediamodel.cpp Changed

@@ -53,7 +53,6 @@
 };
 
 using NetworkMediaItemPtr = std::shared_ptr<NetworkMediaItem>;
-using NetworkMediaItemSet = std::unordered_set<NetworkMediaItemPtr>;
 
 inline bool isADir(const NetworkMediaItemPtr& x)
 {
@@ -144,8 +143,7 @@
 
     void removeItem(const SharedInputItem& node, const std::vector<SharedInputItem>& itemsList)
     {
-        Q_Q(NetworkMediaModel);
-        if (node != q->m_treeItem.media)
+        if (node != m_treeItem.media)
             return;
 
         for (auto p_item : itemsList)
@@ -172,7 +170,7 @@
     }
 
     void refreshMediaList(
-        MediaTreePtr tree,
+        NetworkTreeItem& treeItem,
         std::vector<SharedInputItem> children,
         bool clear )
     {
@@ -229,7 +227,7 @@
                     item->fileModified = QDateTime::fromSecsSinceEpoch(time, QTimeZone::systemTimeZone());
             }
 
-            item->tree = NetworkTreeItem( tree, inputItem.get() );
+            item->tree = NetworkTreeItem(treeItem, inputItem );
 
             if ( m_mediaLib && item->canBeIndexed)
             {
@@ -352,38 +350,38 @@
     {
         Q_Q(NetworkMediaModel);
 
-        if (!q->m_ctx || !m_hasTree || m_qmlInitializing)
+        if (!m_ctx || !m_hasTree || m_qmlInitializing)
             return false;
 
-        auto parser = q->m_ctx->getNetworkPreparser();
+        auto parser = m_ctx->getNetworkPreparser();
         if (unlikely(parser == NULL))
             return false;
 
         m_listener.reset();
         m_items.clear();
 
-        if (!q->m_treeItem)
+        if (!m_treeItem)
             return false;
 
-        auto tree = q->m_treeItem.tree.get();
-        auto l = std::make_unique<MediaTreeListener>( q->m_treeItem.tree,
-                                                     std::make_unique<NetworkMediaModel::ListenerCb>(q) );
+        auto& tree = m_treeItem.tree;
+        auto l = std::make_unique<MediaTreeListener>(tree,
+                                                     std::make_unique<NetworkMediaModelPrivate::ListenerCb>(q) );
         if ( l->listener == nullptr )
             return false;
 
-        if (q->m_treeItem.media)
+        if (m_treeItem.media)
         {
-            q->m_name = q->m_treeItem.media->psz_name;
+            m_name = m_treeItem.media->psz_name;
             emit q->nameChanged();
-            q->m_url = QUrl::fromEncoded( QByteArray{ q->m_treeItem.media->psz_uri }.append( '/' ) );
+            m_url = QUrl::fromEncoded( QByteArray{ m_treeItem.media->psz_uri }.append( '/' ) );
             emit q->urlChanged();
-            q->m_type = static_cast<NetworkMediaModel::ItemType>(q->m_treeItem.media->i_type);
+            m_type = static_cast<NetworkMediaModel::ItemType>(m_treeItem.media->i_type);
             emit q->typeChanged();
-            q->m_canBeIndexed = canBeIndexed( q->m_url, q->m_type );
+            m_canBeIndexed = canBeIndexed( m_url, m_type );
             emit q->canBeIndexedChanged();
             if (m_mediaLib)
             {
-                auto uri = QByteArray(q->m_treeItem.media->psz_uri).append('/');
+                auto uri = QByteArray(m_treeItem.media->psz_uri).append('/');
                 struct Ctx {
                     bool succeed;
                     bool isIndexed;
@@ -399,7 +397,7 @@
                         Q_Q(NetworkMediaModel);
                         if (!ctx.succeed)
                             return;
-                        q->m_indexed = ctx.isIndexed;
+                        m_indexed = ctx.isIndexed;
                         emit q->isIndexedChanged();
                     });
             }
@@ -408,37 +406,39 @@
         {
             input_item_node_t* mediaNode = nullptr;
             input_item_node_t* parent = nullptr;
-            vlc_media_tree_Lock(tree);
-            if (m_parserId != VLC_PREPARSER_REQ_ID_INVALID)
-                vlc_preparser_Cancel( parser, m_parserId );
             std::vector<SharedInputItem> itemList;
-            q->m_path = {QVariant::fromValue(PathNode(q->m_treeItem, q->m_name))};
-            if (vlc_media_tree_Find( tree, q->m_treeItem.media.get(), &mediaNode, &parent))
             {
-                itemList.reserve(mediaNode->i_children);
-                for (int i = 0; i < mediaNode->i_children; i++)
-                    itemList.emplace_back(mediaNode->pp_childreni->p_item);
-
-                while (parent && parent->p_item) {
-                    q->m_path.push_front(QVariant::fromValue(PathNode(
-                        NetworkTreeItem(q->m_treeItem.tree, parent->p_item),
-                        parent->p_item->psz_name)));
-                    input_item_node_t *node = nullptr;
-                    input_item_node_t *grandParent = nullptr;
-                    if (!vlc_media_tree_Find( tree, parent->p_item, &node, &grandParent)) {
-                        break;
+                MediaTreeLocker lock{tree};
+                if (m_parserId != VLC_PREPARSER_REQ_ID_INVALID)
+                    vlc_preparser_Cancel( parser, m_parserId );
+                m_path = {QVariant::fromValue(PathNode(m_treeItem, m_name))};
+                if (vlc_media_tree_Find( tree.get(), m_treeItem.media.get(), &mediaNode, &parent))
+                {
+                    itemList.reserve(mediaNode->i_children);
+                    for (int i = 0; i < mediaNode->i_children; i++)
+                        itemList.emplace_back(mediaNode->pp_childreni->p_item);
+
+
+                    while (parent && parent->p_item) {
+                        m_path.push_front(QVariant::fromValue(PathNode(
+                            NetworkTreeItem(m_treeItem, SharedInputItem{parent->p_item}),
+                            parent->p_item->psz_name)));
+                        input_item_node_t *node = nullptr;
+                        input_item_node_t *grandParent = nullptr;
+                        if (!vlc_media_tree_Find( tree.get(), parent->p_item, &node, &grandParent)) {
+                            break;
+                        }
+                        parent = grandParent;
                     }
-                    parent = grandParent;
                 }
             }
-            vlc_media_tree_Unlock(tree);
             if (!itemList.empty())
-                refreshMediaList( q->m_treeItem.tree, std::move( itemList ), true );
+                refreshMediaList( m_treeItem, std::move( itemList ), true );
             emit q->pathChanged();
         }
 
         m_preparseSem.acquire();
-        m_parserId = vlc_media_tree_Preparse( tree, parser, q->m_treeItem.media.get() );
+        m_parserId = vlc_media_tree_Preparse( tree.get(), parser, m_treeItem.media.get() );
 
         m_listener = std::move( l );
 
@@ -467,13 +467,26 @@
     std::unique_ptr<MediaTreeListener> m_listener;
     QHash<QString, NetworkMediaItemPtr> m_items;
     std::unique_ptr<MLMediaStore> m_MLMedias;
+
+    //properties of the current node
+    QString m_name;
+    QUrl m_url;
+    NetworkMediaModel::ItemType m_type = NetworkMediaModel::ItemType::TYPE_UNKNOWN;
+    bool m_indexed = false;
+    bool m_canBeIndexed  = false;
+
+    MainCtx* m_ctx = nullptr;
+    NetworkTreeItem m_treeItem;
+    QVariantList m_path;
+
+    struct ListenerCb;
 private:
     vlc_preparser_req_id m_parserId;
 };
 
 // NetworkMediaModel::ListenerCb implementation
 
-struct NetworkMediaModel::ListenerCb : public MediaTreeListener::MediaTreeListenerCb {
+struct NetworkMediaModelPrivate::ListenerCb : public MediaTreeListener::MediaTreeListenerCb {
     ListenerCb(NetworkMediaModel *model) : model(model) {}
 
     void onItemCleared( MediaTreePtr tree, input_item_node_t* node ) override;
@@ -497,7 +510,7 @@
     //this can only be acquired from UI thread
     if (!d->m_preparseSem.tryAcquire())
     {
-        auto parser = m_ctx->getNetworkPreparser();
+        auto parser = d->m_ctx->getNetworkPreparser();
         if (likely(parser != NULL))
         {
             if (d->m_parserId != VLC_PREPARSER_REQ_ID_INVALID)
@@ -514,7 +527,7 @@
 QVariant NetworkMediaModel::data( const QModelIndex& index, int role ) const
 {
     Q_D(const NetworkMediaModel);
-    if (!m_ctx)
+    if (!d->m_ctx)
         return {};
     const NetworkMediaItem* item = d->getItemForRow(index.row());
     if (!item)
@@ -659,9 +672,9 @@
 {
     Q_D(NetworkMediaModel);
 
-    if (indexed == m_indexed || !m_canBeIndexed)
+    if (indexed == d->m_indexed || !d->m_canBeIndexed)
         return;
-    QString url = m_url.toString( QUrl::FullyEncoded );
+    QString url = d->m_url.toString( QUrl::FullyEncoded );
     struct Ctx {
         bool success;
     };
@@ -680,7 +693,7 @@
     this, indexed(quint64, Ctx& ctx){
         if (ctx.success)
         {
-            m_indexed = indexed;
+            d_func()->m_indexed = indexed;
             emit isIndexedChanged();
         }
     },
@@ -690,11 +703,11 @@
 void NetworkMediaModel::setCtx(MainCtx* ctx)
 {
     Q_D(NetworkMediaModel);
-    if (m_ctx == ctx)
+    if (d->m_ctx == ctx)
         return;
 
     assert(ctx);
-    m_ctx = ctx;
+    d->m_ctx = ctx;
     d->m_mediaLib = ctx->getMediaLibrary();
 
     d->m_MLMedias.reset();
@@ -716,9 +729,9 @@
 {
     Q_D(NetworkMediaModel);
     if (parentTree.canConvert<NetworkTreeItem>())
-        m_treeItem = parentTree.value<NetworkTreeItem>();
+        d->m_treeItem = parentTree.value<NetworkTreeItem>();
     else
-        m_treeItem = NetworkTreeItem();
+        d->m_treeItem = NetworkTreeItem();
     d->m_hasTree = true;
 
     d->initializeModel();
@@ -728,7 +741,7 @@
 bool NetworkMediaModel::insertIntoPlaylist(const QModelIndexList &itemIdList, const ssize_t playlistIndex)
 {
     Q_D(NetworkMediaModel);
-    if (!(m_ctx && d->m_hasTree))
+    if (!(d->m_ctx && d->m_hasTree))
         return false;
     QVector<vlc::playlist::Media> medias;
     medias.reserve( itemIdList.size() );
@@ -745,21 +758,21 @@
     }
     if (medias.isEmpty())
         return false;
-    m_ctx->getIntf()->p_mainPlaylistController->insert(playlistIndex, medias, false);
+    d->m_ctx->getIntf()->p_mainPlaylistController->insert(playlistIndex, medias, false);
     return true;
 }
 
 bool NetworkMediaModel::addToPlaylist(const int index)
 {
     Q_D(NetworkMediaModel);
-    if (!(m_ctx && d->m_hasTree))
+    if (!(d->m_ctx && d->m_hasTree))
         return false;
     const NetworkMediaItem* item = d->getItemForRow(index);
     if (!item)
         return false;
 
     vlc::playlist::Media media{ item->tree.media.get() };
-    m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, false);
+    d->m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, false);
     return true;
 }
 
@@ -797,7 +810,7 @@
 bool NetworkMediaModel::addAndPlay(int index)
 {
     Q_D(NetworkMediaModel);
-    if (!(m_ctx && d->m_hasTree))
+    if (!(d->m_ctx && d->m_hasTree))
         return false;
 
     const NetworkMediaItem* item = d->getItemForRow(index);
@@ -805,7 +818,7 @@
         return false;
 
     vlc::playlist::Media media{ item->tree.media.get() };
-    m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, true);
+    d->m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, true);
     return true;
 }
 
@@ -869,32 +882,70 @@
     return items;
 }
 
-void NetworkMediaModel::ListenerCb::onItemCleared( MediaTreePtr tree, input_item_node_t* node)
+MainCtx* NetworkMediaModel::getCtx() const {
+    Q_D(const NetworkMediaModel);
+    return d->m_ctx;
+}
+QVariant NetworkMediaModel::getTree() const {
+    Q_D(const NetworkMediaModel);
+    return QVariant::fromValue( d->m_treeItem);
+}
+QVariantList NetworkMediaModel::getPath() const {
+    Q_D(const NetworkMediaModel);
+    return d->m_path;
+}
+
+QString NetworkMediaModel::getName() const {
+    Q_D(const NetworkMediaModel);
+    return d->m_name;
+}
+QUrl NetworkMediaModel::getUrl() const {
+    Q_D(const NetworkMediaModel);
+    return d->m_url;
+}
+NetworkMediaModel::ItemType NetworkMediaModel::getType() const {
+    Q_D(const NetworkMediaModel);
+    return d->m_type;
+}
+bool NetworkMediaModel::isIndexed() const {
+    Q_D(const NetworkMediaModel);
+    return d->m_indexed;
+}
+bool NetworkMediaModel::canBeIndexed() const {
+    Q_D(const NetworkMediaModel);
+    return d->m_canBeIndexed;
+}
+
+
+void NetworkMediaModelPrivate::ListenerCb::onItemCleared( MediaTreePtr tree, input_item_node_t* node)
 {
     SharedInputItem p_node { node->p_item };
     QMetaObject::invokeMethod(model, model=model, p_node = std::move(p_node), tree = std::move(tree)() {
-        if (p_node != model->m_treeItem.media)
+        NetworkMediaModelPrivate* d = model->d_func();
+        if (p_node != d->m_treeItem.media)
             return;
         input_item_node_t *res;
         input_item_node_t *parent;
         // XXX is tree == m_treeItem.tree?
-        vlc_media_tree_Lock( model->m_treeItem.tree.get() );
-        bool found = vlc_media_tree_Find( model->m_treeItem.tree.get(), model->m_treeItem.media.get(),
-                                          &res, &parent );
-        vlc_media_tree_Unlock( model->m_treeItem.tree.get() );
-        if (!found)
-            return;
+
+        {
+            MediaTreeLocker lock{ d->m_treeItem.tree };
+            bool found = vlc_media_tree_Find( d->m_treeItem.tree.get(), d->m_treeItem.media.get(),
+                                             &res, &parent );
+            if (!found)
+                return;
+        }
 
         std::vector<SharedInputItem> itemList;
         itemList.reserve( static_cast<size_t>(res->i_children) );
         for (int i = 0; i < res->i_children; i++)
             itemList.emplace_back(res->pp_childreni->p_item);
 
-        model->d_func()->refreshMediaList( std::move( tree ), std::move( itemList ), true );
+        model->d_func()->refreshMediaList(  d->m_treeItem, std::move( itemList ), true );
     }, Qt::QueuedConnection);
 }
 
-void NetworkMediaModel::ListenerCb::onItemAdded( MediaTreePtr tree, input_item_node_t* parent,
+void NetworkMediaModelPrivate::ListenerCb::onItemAdded( MediaTreePtr tree, input_item_node_t* parent,
                                                  input_item_node_t *const children,
                                                  size_t count )
 {
@@ -905,12 +956,13 @@
         itemList.emplace_back(childreni->p_item);
 
     QMetaObject::invokeMethod(model, model=model, p_parent = std::move(p_parent), tree = std::move(tree), itemList=std::move(itemList)() {
-        if ( p_parent == model->m_treeItem.media )
-            model->d_func()->refreshMediaList( std::move( tree ), std::move( itemList ), false );
+        NetworkMediaModelPrivate* d = model->d_func();
+        if ( p_parent == d->m_treeItem.media )
+            d->refreshMediaList(  d->m_treeItem , std::move( itemList ), false );
     }, Qt::QueuedConnection);
 }
 
-void NetworkMediaModel::ListenerCb::onItemRemoved( MediaTreePtr, input_item_node_t * node,
+void NetworkMediaModelPrivate::ListenerCb::onItemRemoved( MediaTreePtr, input_item_node_t * node,
                                                    input_item_node_t *const children,
                                                    size_t count )
 {
@@ -927,12 +979,12 @@
     }, Qt::QueuedConnection);
 }
 
-void NetworkMediaModel::ListenerCb::onItemPreparseEnded(MediaTreePtr, input_item_node_t* node, int )
+void NetworkMediaModelPrivate::ListenerCb::onItemPreparseEnded(MediaTreePtr, input_item_node_t* node, int )
 {
     model->d_func()->m_preparseSem.release();
     SharedInputItem p_node { node->p_item };
     QMetaObject::invokeMethod(model, model=model, p_node=std::move(p_node)() {
-        if (p_node != model->m_treeItem.media)
+        if (p_node != model->d_func()->m_treeItem.media)
             return;
 
         model->d_func()->m_loading = false;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/networkmediamodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/networkmediamodel.hpp Changed

@@ -19,17 +19,13 @@
 #ifndef MLNETWORKMEDIAMODEL_HPP
 #define MLNETWORKMEDIAMODEL_HPP
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <QAbstractListModel>
 #include <QUrl>
 
-#include <vlc_media_source.h>
-#include <vlc_cxx_helpers.hpp>
-
+#include "vlcmediasourcewrapper.hpp"
 #include "util/shared_input_item.hpp"
+#include "devicesourceprovider.hpp"
+
 #include "networkbasemodel.hpp"
 
 #include <memory>
@@ -38,21 +34,31 @@
 
 class MainCtx;
 
-using MediaSourcePtr = vlc_shared_data_ptr_type(vlc_media_source_t,
-                                vlc_media_source_Hold, vlc_media_source_Release);
-
-using MediaTreePtr = vlc_shared_data_ptr_type(vlc_media_tree_t,
-                                              vlc_media_tree_Hold,
-                                              vlc_media_tree_Release);
-
 class NetworkTreeItem
 {
     Q_GADGET
 public:
-    NetworkTreeItem() : tree(nullptr), media(nullptr) {}
-    NetworkTreeItem( MediaTreePtr tree, input_item_t* m )
-        : tree( std::move( tree ) )
-        , media( m )
+    NetworkTreeItem() : source(nullptr), tree(nullptr), media(nullptr) {}
+
+    NetworkTreeItem( SharedMediaSourceModel source, const SharedInputItem& item )
+        : source(source)
+        , tree(source->getTree())
+        , media(item)
+    {
+    }
+
+    NetworkTreeItem( MediaTreePtr tree, const SharedInputItem& item )
+        : source(nullptr)
+        , tree(tree)
+        , media(item)
+    {
+    }
+
+    //build a NetworkTreeItem with the same source/tree as parent
+    NetworkTreeItem(NetworkTreeItem& parent, const SharedInputItem& item)
+        : source(parent.source)
+        , tree(parent.tree)
+        , media(item)
     {
     }
 
@@ -67,13 +73,12 @@
     }
 
     bool isValid() {
-        vlc_media_tree_Lock(tree.get());
+        MediaTreeLocker lock{ tree };
         input_item_node_t* node;
-        bool ret = vlc_media_tree_Find( tree.get(), media.get(), &node, nullptr);
-        vlc_media_tree_Unlock(tree.get());
-        return ret;
+        return vlc_media_tree_Find( tree.get(), media.get(), &node, nullptr);
     }
 
+    SharedMediaSourceModel source;
     MediaTreePtr tree;
     SharedInputItem media;
 };
@@ -141,15 +146,15 @@
     void setCtx(MainCtx* ctx);
     void setTree(QVariant tree);
 
-    inline MainCtx* getCtx() const { return m_ctx; }
-    inline QVariant getTree() const { return QVariant::fromValue( m_treeItem); }
-    inline QVariantList getPath() const { return m_path; }
+    MainCtx* getCtx() const;
+    QVariant getTree() const;
+    QVariantList getPath() const;
 
-    inline QString getName() const { return m_name; }
-    inline QUrl getUrl() const { return m_url; }
-    inline ItemType getType() const { return m_type; }
-    inline bool isIndexed() const { return m_indexed; }
-    inline bool canBeIndexed() const { return m_canBeIndexed; }
+    QString getName() const;
+    QUrl getUrl() const;
+    ItemType getType() const;
+    bool isIndexed() const;
+    bool canBeIndexed() const;
 
     Q_INVOKABLE bool insertIntoPlaylist( const QModelIndexList& itemIdList, ssize_t playlistIndex );
     Q_INVOKABLE bool addToPlaylist( int index );
@@ -175,18 +180,6 @@
     void pathChanged();
 
 private:
-    //properties of the current node
-    QString m_name;
-    QUrl m_url;
-    ItemType m_type = ItemType::TYPE_UNKNOWN;
-    bool m_indexed = false;
-    bool m_canBeIndexed  = false;
-
-    MainCtx* m_ctx = nullptr;
-    NetworkTreeItem m_treeItem;
-    QVariantList m_path;
-
-    struct ListenerCb;
     Q_DECLARE_PRIVATE(NetworkMediaModel);
 };

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/qml/BrowseDeviceView.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/qml/BrowseDeviceView.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/qml/BrowseHomeDisplay.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/qml/BrowseHomeDisplay.qml Changed

@@ -135,7 +135,7 @@
         anchors.leftMargin: root.leftPadding
         anchors.rightMargin: root.rightPadding
 
-        ScrollBar.vertical: ScrollBar { }
+        ScrollBar.vertical: Widgets.ScrollBarExt { }
 
         flickableDirection: Flickable.AutoFlickIfNeeded
         boundsBehavior: Flickable.StopAtBounds
@@ -149,10 +149,29 @@
 
         Navigation.parentItem: root
 
+        Component.onCompleted: {
+            // Flickable filters child mouse events for flicking (even when
+            // the delegate is grabbed). However, this is not a useful
+            // feature for non-touch cases, so disable it here and enable
+            // it if touch is detected through the hover handler:
+            MainCtx.setFiltersChildMouseEvents(this, false)
+        }
+
+        HoverHandler {
+            acceptedDevices: PointerDevice.TouchScreen
+
+            onHoveredChanged: {
+                if (hovered)
+                    MainCtx.setFiltersChildMouseEvents(flickable, true)
+                else
+                    MainCtx.setFiltersChildMouseEvents(flickable, false)
+            }
+        }
+
         Widgets.NavigableCol {
             id: column
 
-            width: foldersSection.width
+            width: flickable.width
             height: implicitHeight
 
             spacing: (MainCtx.gridView ? VLCStyle.gridView_spacing : VLCStyle.tableView_spacing) -
@@ -256,7 +275,7 @@
     }
 
     component HomeDeviceView: BrowseDeviceView {
-        width: root.width
+        width: flickable.width
         height: contentHeight
 
         maximumRows: root.maximumRows

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/qml/BrowseTreeDisplay.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/qml/BrowseTreeDisplay.qml Changed

@@ -37,10 +37,12 @@
     readonly property int contentLeftMargin: currentItem?.contentLeftMargin ?? 0
     readonly property int contentRightMargin: currentItem?.contentRightMargin ?? 0
 
+    readonly property int extraMargin: VLCStyle.dynamicAppMargins(width)
+
     readonly property int headerLeftPadding: (contentLeftMargin > 0)
-                                             ? contentLeftMargin : VLCStyle.dynamicAppMargins(width)
+                                             ? contentLeftMargin : extraMargin + VLCStyle.layout_left_margin
     readonly property int headerRightPadding: (contentRightMargin > 0)
-                                              ? contentRightMargin : VLCStyle.dynamicAppMargins(width)
+                                              ? contentRightMargin : extraMargin + VLCStyle.layout_right_margin
 
     // fixme remove this
     property Item _currentView: currentItem
@@ -281,8 +283,8 @@
             header: BrowseTreeHeader {
                 providerModel: root.model
 
-                leftPadding: root.contentLeftPadding
-                rightPadding: root.contentRightPadding
+                leftPadding: root.headerLeftPadding
+                rightPadding: root.headerRightPadding
 
                 width: tableView.width
 
@@ -293,11 +295,11 @@
                 }
             }
 
+            rowContextMenu: contextMenu
+
             onActionForSelection: (selection) => _actionAtIndex(selection0.row)
             onItemDoubleClicked: (index, model) => _actionAtIndex(index)
-            onContextMenuButtonClicked: (_,_,globalMousePos) => {
-                contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
-            }
+
             onRightClick: (_,_,globalMousePos) => {
                 contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
             }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/qml/BrowseTreeHeader.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/qml/BrowseTreeHeader.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/qml/NetworkCustomCover.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/qml/NetworkCustomCover.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/qml/NetworkGridItem.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/qml/NetworkGridItem.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/qml/NetworkThumbnailItem.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/qml/NetworkThumbnailItem.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/qml/ServicesManage.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/qml/ServicesManage.qml Changed

@@ -38,9 +38,14 @@
 
         ctx: MainCtx
 
+        typeFilter: ServicesDiscoveryModel.TYPE_SERVICE_DISCOVERY
         searchPattern: MainCtx.search.pattern
         sortOrder: MainCtx.sort.order
         sortCriteria: MainCtx.sort.criteria
+
+        Component.onCompleted: {
+            discoveryModel.loadFromDefaultRepository()
+        }
     }
 
     topMargin: VLCStyle.margin_large
@@ -111,25 +116,25 @@
                         id: action_btn
 
                         focus: true
-                        iconTxt: model.state === ServicesDiscoveryModel.INSTALLED ? VLCIcons.del : VLCIcons.add
-                        busy: model.state === ServicesDiscoveryModel.INSTALLING || model.state === ServicesDiscoveryModel.UNINSTALLING
+                        iconTxt: model.state === ServicesDiscoveryModel.STATE_INSTALLED ? VLCIcons.del : VLCIcons.add
+                        busy: model.state === ServicesDiscoveryModel.STATE_INSTALLING || model.state === ServicesDiscoveryModel.STATE_UNINSTALLING
                         text: {
                             switch(model.state) {
-                            case ServicesDiscoveryModel.INSTALLED:
+                            case ServicesDiscoveryModel.STATE_INSTALLED:
                                 return qsTr("Remove")
-                            case ServicesDiscoveryModel.NOTINSTALLED:
+                            case ServicesDiscoveryModel.STATE_NOTINSTALLED:
                                 return qsTr("Install")
-                            case ServicesDiscoveryModel.INSTALLING:
+                            case ServicesDiscoveryModel.STATE_INSTALLING:
                                 return qsTr("Installing")
-                            case ServicesDiscoveryModel.UNINSTALLING:
+                            case ServicesDiscoveryModel.STATE_UNINSTALLING:
                                 return qsTr("Uninstalling")
                             }
                         }
 
                         onClicked: {
-                            if (model.state === ServicesDiscoveryModel.NOTINSTALLED)
+                            if (model.state === ServicesDiscoveryModel.STATE_NOTINSTALLED)
                                 discoveryModel.installService(index)
-                            else if (model.state === ServicesDiscoveryModel.INSTALLED)
+                            else if (model.state === ServicesDiscoveryModel.STATE_INSTALLED)
                                 discoveryModel.removeService(index)
                         }
                     }
@@ -146,7 +151,9 @@
                 }
 
                 Widgets.CaptionLabel {
-                    text: qsTr("Score: %1/5  Downloads: %2").arg(model.score).arg(model.downloads)
+                    text: qsTr("Score: %1/5  Downloads: %2")
+                        .arg( (5 * model.score / discoveryModel.maxScore).toFixed(1) )
+                        .arg(model.downloads)
                     topPadding: VLCStyle.margin_xsmall
                     color: servicesView.colorContext.fg.secondary
                     Layout.fillWidth: true

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/network/standardpathmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/standardpathmodel.cpp Changed

@@ -24,7 +24,6 @@
 #include "networkmediamodel.hpp"
 
 #include "util/locallistbasemodel.hpp"
-#include "util/shared_input_item.hpp"
 
 // VLC includes
 #include <vlc_media_source.h>
@@ -34,9 +33,7 @@
 #include <QStandardPaths>
 #include <QUrl>
 
-using MediaTreePtr = vlc_shared_data_ptr_type(vlc_media_tree_t,
-                                              vlc_media_tree_Hold,
-                                              vlc_media_tree_Release);
+#include "vlcmediasourcewrapper.hpp"
 
 struct StandardPathItem : public NetworkBaseItem
 {
@@ -98,7 +95,7 @@
         : LocalListBaseModelPrivate<StandardPathItemPtr>(pub)
     {}
 
-    StandardPathLoader::ItemCompare getSortFunction() const
+    StandardPathLoader::ItemCompare getSortFunction() const override
     {
         if (m_sortCriteria == "mrl")
         {
@@ -157,12 +154,12 @@
         input_item_t * inputItem = input_item_NewDirectory(qtu(url.toString()), qtu(name), ITEM_LOCAL);
         item->inputItem = SharedInputItem(inputItem, false);
 
-        vlc_media_tree_t * tree = vlc_media_tree_New();
-        vlc_media_tree_Lock(tree);
-        vlc_media_tree_Add(tree, &(tree->root), inputItem);
-        vlc_media_tree_Unlock(tree);
+        item->tree = MediaTreePtr(vlc_media_tree_New(), false);
+        {
+            MediaTreeLocker lock{item->tree};
+            vlc_media_tree_Add(item->tree.get(), &(item->tree->root), inputItem);
+        }
 
-        item->tree = MediaTreePtr(tree, false);
         item->artwork = artwork;
 
         m_items.emplace_back(std::move(item));
@@ -216,7 +213,7 @@
     switch (role)
     {
         case PATH_TREE:
-            return QVariant::fromValue(NetworkTreeItem(item->tree, item->inputItem.get()));
+            return QVariant::fromValue(NetworkTreeItem(item->tree, item->inputItem));
         default:
             return NetworkBaseModel::basedata(*item, role);
     }

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/network/vlcmediasourcewrapper.hpp Added

@@ -0,0 +1,58 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef VLCMEDIASOURCEWRAPPER_HPP
+#define VLCMEDIASOURCEWRAPPER_HPP
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <vlc_media_source.h>
+#include <vlc_cxx_helpers.hpp>
+
+using MediaSourcePtr = vlc_shared_data_ptr_type(vlc_media_source_t,
+                                                vlc_media_source_Hold,
+                                                vlc_media_source_Release);
+
+using MediaTreePtr = vlc_shared_data_ptr_type(vlc_media_tree_t,
+                                              vlc_media_tree_Hold,
+                                              vlc_media_tree_Release);
+
+class MediaTreeLocker
+{
+public:
+    MediaTreeLocker(MediaTreePtr& tree)
+        : m_tree(tree)
+    {
+        vlc_media_tree_Lock(m_tree.get());
+    }
+
+    ~MediaTreeLocker() {
+        vlc_media_tree_Unlock(m_tree.get());
+    }
+
+    MediaTreeLocker( const MediaTreeLocker& ) = delete;
+    MediaTreeLocker( MediaTreeLocker&& ) = delete;
+
+    MediaTreeLocker& operator=( const MediaTreeLocker& ) = delete;
+    MediaTreeLocker& operator=( MediaTreeLocker&& ) = delete;
+
+private:
+    MediaTreePtr& m_tree;
+};
+
+#endif // VLCMEDIASOURCEWRAPPER_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/add.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/add.svg Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/download.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/download.svg Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_arrow_eject.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_arrow_eject.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2" d="m11.598 7.2002c0.19996-0.26692 0.6002-0.26697 0.8003-1e-4l4.4982 6.0013c0.247 0.3296 0.0118 0.7999-0.4001 0.7999h-8.994c-0.41189 0-0.64712-0.4702-0.40016-0.7998zm1.6004-0.59987c-0.6001-0.8006-1.8009-0.80044-2.4007 3.2e-4l-4.4958 6.0012c-0.74086 0.989-0.03518 2.3994 1.2005 2.3994h8.994c1.2358 0 1.9415-1.4108 1.2002-2.3997zm-7.1987 10.4c-0.27614 0-0.5 0.2239-0.5 0.5s0.22386 0.5 0.5 0.5h12c0.2761 0 0.5-0.2239 0.5-0.5s-0.2239-0.5-0.5-0.5z" fill="#212121"/>
+ <path id="path2" d="m11.598 7.2002c0.19996-0.26692 0.6002-0.26697 0.8003-1e-4l4.4982 6.0013c0.247 0.3296 0.0118 0.7999-0.4001 0.7999h-8.994c-0.41189 0-0.64712-0.4702-0.40016-0.7998zm1.6004-0.59987c-0.6001-0.8006-1.8009-0.80044-2.4007 3.2e-4l-4.4958 6.0012c-0.74086 0.989-0.03518 2.3994 1.2005 2.3994h8.994c1.2358 0 1.9415-1.4108 1.2002-2.3997zm-7.1987 10.4c-0.27614 0-0.5 0.2239-0.5 0.5s0.22386 0.5 0.5 0.5h12c0.2761 0 0.5-0.2239 0.5-0.5s-0.2239-0.5-0.5-0.5z" fill="#FF00FF"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_arrow_repeat_1.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_arrow_repeat_1.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2-224" d="m18.5 8.6712c0.1163 0 0.22329 0.039685 0.30822 0.1062l0.06731 0.063118 0.01625 0.018898c0.6931 0.85822 1.1082 1.9504 1.1082 3.1394 0 0.19691-0.01134 0.39152-0.03364 0.58273-0.30841-0.15496-0.6334-0.28195-0.9716-0.3772 0.0035-0.06803 0.0053-0.13682 0.0053-0.20561 0-0.95346-0.33358-1.829-0.8905-2.5163-0.06811-0.084661-0.10949-0.19351-0.10949-0.31257 0-0.27628 0.2239-0.50003 0.5-0.50003zm-6.293 7.3288c-0.09109 0.32239-0.1536 0.65658-0.18459 0.99999h-3.0224c-0.10174 0-0.20276-3e-3 -0.303-0.0076l1.6565 1.6554c0.17356 0.17348 0.19283 0.443 0.05787 0.63791l-0.05787 0.06916c-0.17356 0.17348-0.44299 0.19276-0.63786 0.05783l-0.06924-0.05783-2.5-2.5c-0.17357-0.17348-0.19285-0.44304-0.05786-0.63791l0.05786-0.06916 2.5-2.5c0.19526-0.19502 0.51184-0.19502 0.7071 0 0.17356 0.17348 0.19283 0.443 0.05787 0.63791l-0.05787 0.06916-1.6366 1.6365 0.14088 0.0076 0.14213 0.0025zm1.4394-11.354c0.17359-0.17348 0.443-0.19276 0.6379-0.057827l0.06932 0.057827 2.5 2.5 0.05779 0.069165c0.11811 0.17046 0.11811 0.39814 0 0.56863l-0.05779 0.069165-2.5 2.5-0.06932 0.05783c-0.17049 0.11792-0.3981 0.11792-0.5686 0l-0.06932-0.05783-0.05779-0.06916c-0.11811-0.17046-0.11811-0.3981 0-0.56863l0.05779-0.069165 1.6366-1.6366-0.1409-0.00756-0.14211-0.00249h-6c-2.2091 0-4 1.7909-4 4 0 0.9563 0.33557 1.8342 0.89537 2.5224 0.06417 0.08353 0.10463 0.19162 0.10463 0.30879 0 0.2759-0.22386 0.49999-0.5 0.49999-0.167 0-0.31488-0.08202-0.40568-0.2075-0.68439-0.85603-1.0943-1.9419-1.0943-3.1236 0-2.6888 2.1223-4.8818 4.7831-4.9954l0.21689-0.00378h6c0.10171 0 0.20281 0.00302 0.303 0.00756l-1.6566-1.6555-0.057789-0.069165c-0.13501-0.19502-0.11569-0.46428 0.057789-0.63783zm8.3536 12.854c0 2.4853-2.0147 4.5-4.5 4.5s-4.5-2.0147-4.5-4.5 2.0147-4.5 4.5-4.5 4.5 2.0147 4.5 4.5zm-3.9523-2.6614c-0.1844-0.05216-0.4905-0.03402-0.6794 0.2332-0.2132 0.30312-0.5812 0.72559-1.0919 0.9809-0.24699 0.12359-0.34711 0.4238-0.2236 0.67079 0.12352 0.24718 0.4238 0.34696 0.6708 0.22375 0.2993-0.14967 0.5578-0.33562 0.7764-0.52898v3.0818c0 0.27628 0.2239 0.49999 0.5 0.49999 0.27609 0 0.5-0.22375 0.5-0.49999v-4.0764c0-0.34847-0.26729-0.53261-0.4523-0.585z" fill="#212121"/>
+ <path id="path2-224" d="m18.5 8.6712c0.1163 0 0.22329 0.039685 0.30822 0.1062l0.06731 0.063118 0.01625 0.018898c0.6931 0.85822 1.1082 1.9504 1.1082 3.1394 0 0.19691-0.01134 0.39152-0.03364 0.58273-0.30841-0.15496-0.6334-0.28195-0.9716-0.3772 0.0035-0.06803 0.0053-0.13682 0.0053-0.20561 0-0.95346-0.33358-1.829-0.8905-2.5163-0.06811-0.084661-0.10949-0.19351-0.10949-0.31257 0-0.27628 0.2239-0.50003 0.5-0.50003zm-6.293 7.3288c-0.09109 0.32239-0.1536 0.65658-0.18459 0.99999h-3.0224c-0.10174 0-0.20276-3e-3 -0.303-0.0076l1.6565 1.6554c0.17356 0.17348 0.19283 0.443 0.05787 0.63791l-0.05787 0.06916c-0.17356 0.17348-0.44299 0.19276-0.63786 0.05783l-0.06924-0.05783-2.5-2.5c-0.17357-0.17348-0.19285-0.44304-0.05786-0.63791l0.05786-0.06916 2.5-2.5c0.19526-0.19502 0.51184-0.19502 0.7071 0 0.17356 0.17348 0.19283 0.443 0.05787 0.63791l-0.05787 0.06916-1.6366 1.6365 0.14088 0.0076 0.14213 0.0025zm1.4394-11.354c0.17359-0.17348 0.443-0.19276 0.6379-0.057827l0.06932 0.057827 2.5 2.5 0.05779 0.069165c0.11811 0.17046 0.11811 0.39814 0 0.56863l-0.05779 0.069165-2.5 2.5-0.06932 0.05783c-0.17049 0.11792-0.3981 0.11792-0.5686 0l-0.06932-0.05783-0.05779-0.06916c-0.11811-0.17046-0.11811-0.3981 0-0.56863l0.05779-0.069165 1.6366-1.6366-0.1409-0.00756-0.14211-0.00249h-6c-2.2091 0-4 1.7909-4 4 0 0.9563 0.33557 1.8342 0.89537 2.5224 0.06417 0.08353 0.10463 0.19162 0.10463 0.30879 0 0.2759-0.22386 0.49999-0.5 0.49999-0.167 0-0.31488-0.08202-0.40568-0.2075-0.68439-0.85603-1.0943-1.9419-1.0943-3.1236 0-2.6888 2.1223-4.8818 4.7831-4.9954l0.21689-0.00378h6c0.10171 0 0.20281 0.00302 0.303 0.00756l-1.6566-1.6555-0.057789-0.069165c-0.13501-0.19502-0.11569-0.46428 0.057789-0.63783zm8.3536 12.854c0 2.4853-2.0147 4.5-4.5 4.5s-4.5-2.0147-4.5-4.5 2.0147-4.5 4.5-4.5 4.5 2.0147 4.5 4.5zm-3.9523-2.6614c-0.1844-0.05216-0.4905-0.03402-0.6794 0.2332-0.2132 0.30312-0.5812 0.72559-1.0919 0.9809-0.24699 0.12359-0.34711 0.4238-0.2236 0.67079 0.12352 0.24718 0.4238 0.34696 0.6708 0.22375 0.2993-0.14967 0.5578-0.33562 0.7764-0.52898v3.0818c0 0.27628 0.2239 0.49999 0.5 0.49999 0.27609 0 0.5-0.22375 0.5-0.49999v-4.0764c0-0.34847-0.26729-0.53261-0.4523-0.585z" fill="#FF00FF"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_arrow_repeat_all.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_arrow_repeat_all.svg Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_arrow_shuffle.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_arrow_shuffle.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2" d="m17.854 6.1464c-0.1953-0.19527-0.5119-0.19527-0.7072 0-0.1952 0.19526-0.1952 0.51184 0 0.7071l1.1488 1.1487c-3.3225 0.07241-5.2825 1.9019-7.1044 3.6025l-0.03192 0.02979c-1.8819 1.7565-3.6259 3.3655-6.6588 3.3655-0.27614 0-0.5 0.2239-0.5 0.5 0 0.2762 0.22386 0.5 0.5 0.5 3.4473 0 5.4502-1.8694 7.3092-3.6046l0.03192-0.0298c1.8381-1.7156 3.5446-3.2906 6.4491-3.363l-1.1439 1.1439c-0.1952 0.19526-0.1952 0.51184 0 0.70711 0.1953 0.19526 0.5119 0.19526 0.7072 0l2-2c0.1953-0.19526 0.1953-0.51184 0-0.7071zm-13.354 1.8536c2.8107 0 4.6612 1.2428 6.2564 2.6423l-0.27993 0.26122c-0.15483 0.14451-0.3069 0.28607-0.45704 0.42419-1.5026-1.3049-3.1014-2.3277-5.5195-2.3277-0.27614 0-0.5-0.22386-0.5-0.5s0.22386-0.5 0.5-0.5zm13.795 7.9978c-2.6964-0.0588-4.4954-1.2748-6.0516-2.64l0.2799-0.2611c0.1548-0.1446 0.3069-0.2862 0.4571-0.4243 1.4587 1.2667 3.0081 2.2677 5.3097 2.325l-1.1439-1.1439c-0.1952-0.1952-0.1952-0.5118 0-0.7071 0.1953-0.1953 0.5119-0.1953 0.7072 0l2 2c0.1953 0.1953 0.1953 0.5119 0 0.7072l-2 2c-0.1953 0.1953-0.5119 0.1953-0.7072 0-0.1952-0.1953-0.1952-0.5118 0-0.7071z" fill="#212121"/>
+ <path id="path2" d="m17.854 6.1464c-0.1953-0.19527-0.5119-0.19527-0.7072 0-0.1952 0.19526-0.1952 0.51184 0 0.7071l1.1488 1.1487c-3.3225 0.07241-5.2825 1.9019-7.1044 3.6025l-0.03192 0.02979c-1.8819 1.7565-3.6259 3.3655-6.6588 3.3655-0.27614 0-0.5 0.2239-0.5 0.5 0 0.2762 0.22386 0.5 0.5 0.5 3.4473 0 5.4502-1.8694 7.3092-3.6046l0.03192-0.0298c1.8381-1.7156 3.5446-3.2906 6.4491-3.363l-1.1439 1.1439c-0.1952 0.19526-0.1952 0.51184 0 0.70711 0.1953 0.19526 0.5119 0.19526 0.7072 0l2-2c0.1953-0.19526 0.1953-0.51184 0-0.7071zm-13.354 1.8536c2.8107 0 4.6612 1.2428 6.2564 2.6423l-0.27993 0.26122c-0.15483 0.14451-0.3069 0.28607-0.45704 0.42419-1.5026-1.3049-3.1014-2.3277-5.5195-2.3277-0.27614 0-0.5-0.22386-0.5-0.5s0.22386-0.5 0.5-0.5zm13.795 7.9978c-2.6964-0.0588-4.4954-1.2748-6.0516-2.64l0.2799-0.2611c0.1548-0.1446 0.3069-0.2862 0.4571-0.4243 1.4587 1.2667 3.0081 2.2677 5.3097 2.325l-1.1439-1.1439c-0.1952-0.1952-0.1952-0.5118 0-0.7071 0.1953-0.1953 0.5119-0.1953 0.7072 0l2 2c0.1953 0.1953 0.1953 0.5119 0 0.7072l-2 2c-0.1953 0.1953-0.5119 0.1953-0.7072 0-0.1952-0.1953-0.1952-0.5118 0-0.7071z" fill="#FF00FF"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_fast_forward.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_fast_forward.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2" d="m12.018 7.4862c0-0.8191 0.9308-1.2908 1.5914-0.80641l5.8796 4.3117c0.681 0.49944 0.681 1.5165 0 2.016l-5.8796 4.3117c-0.6606 0.4844-1.5914 0.0127-1.5914-0.8064v-3.16l-5.4086 3.9664c-0.66052 0.4844-1.5914 0.0127-1.5914-0.8064v-9.0266c0-0.8191 0.93084-1.2908 1.5914-0.80641l5.4086 3.9663zm6.8796 4.3117-5.8796-4.3117v9.0266l5.8796-4.3117c0.1362-0.0999 0.1362-0.30335 0-0.40324zm-7 0-5.8796-4.3117v9.0266l5.8796-4.3117c0.1362-0.0999 0.1362-0.30335 0-0.40324z" fill="#212121"/>
+ <path id="path2" d="m12.018 7.4862c0-0.8191 0.9308-1.2908 1.5914-0.80641l5.8796 4.3117c0.681 0.49944 0.681 1.5165 0 2.016l-5.8796 4.3117c-0.6606 0.4844-1.5914 0.0127-1.5914-0.8064v-3.16l-5.4086 3.9664c-0.66052 0.4844-1.5914 0.0127-1.5914-0.8064v-9.0266c0-0.8191 0.93084-1.2908 1.5914-0.80641l5.4086 3.9663zm6.8796 4.3117-5.8796-4.3117v9.0266l5.8796-4.3117c0.1362-0.0999 0.1362-0.30335 0-0.40324zm-7 0-5.8796-4.3117v9.0266l5.8796-4.3117c0.1362-0.0999 0.1362-0.30335 0-0.40324z" fill="#FF00FF"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_next.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_next.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2" d="m19 5.5c0-0.27614-0.2239-0.5-0.5-0.5-0.2762 0-0.5 0.22386-0.5 0.5v13c0 0.2761 0.2238 0.5 0.5 0.5 0.2761 0 0.5-0.2239 0.5-0.5zm-14 0.75211c0-1.0002 1.1164-1.5954 1.9468-1.0378l8.4992 5.7071c0.7345 0.4932 0.7383 1.5724 0.0072 2.0707l-8.4993 5.7929c-0.82977 0.5655-1.954-0.0288-1.954-1.0329zm1.3894-0.20755c-0.16608-0.11152-0.38937 0.0075-0.38937 0.20755v11.5c0 0.2008 0.22485 0.3196 0.3908 0.2065l8.4993-5.7928c0.1462-0.0997 0.1455-0.31552-0.0014-0.41415z" fill="#212121"/>
+ <path id="path2" d="m19 5.5c0-0.27614-0.2239-0.5-0.5-0.5-0.2762 0-0.5 0.22386-0.5 0.5v13c0 0.2761 0.2238 0.5 0.5 0.5 0.2761 0 0.5-0.2239 0.5-0.5zm-14 0.75211c0-1.0002 1.1164-1.5954 1.9468-1.0378l8.4992 5.7071c0.7345 0.4932 0.7383 1.5724 0.0072 2.0707l-8.4993 5.7929c-0.82977 0.5655-1.954-0.0288-1.954-1.0329zm1.3894-0.20755c-0.16608-0.11152-0.38937 0.0075-0.38937 0.20755v11.5c0 0.2008 0.22485 0.3196 0.3908 0.2065l8.4993-5.7928c0.1462-0.0997 0.1455-0.31552-0.0014-0.41415z" fill="#FF00FF"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_options.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_options.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2" d="m16.95 7c-0.2316-1.1411-1.2405-2-2.45-2s-2.2184 0.85888-2.45 2h-7.55c-0.27614 0-0.5 0.22386-0.5 0.5s0.22386 0.5 0.5 0.5h7.55c0.2316 1.1411 1.2405 2 2.45 2 1.2297 0 2.252-0.88783 2.461-2.0575-0.0035 0.01923-0.0071 0.03839-0.011 0.05746h2.55c0.2761 0 0.5-0.22386 0.5-0.5s-0.2239-0.5-0.5-0.5zm-2.45 2c-0.8284 0-1.5-0.67157-1.5-1.5s0.6716-1.5 1.5-1.5 1.5 0.67157 1.5 1.5-0.6716 1.5-1.5 1.5zm-2.55 7c-0.23163-1.1411-1.2405-2-2.45-2s-2.2184 0.8589-2.45 2h-2.55c-0.27614 0-0.5 0.2239-0.5 0.5s0.22386 0.5 0.5 0.5h2.55c0.23163 1.1411 1.2405 2 2.45 2s2.2184-0.8589 2.45-2h7.55c0.2761 0 0.5-0.2239 0.5-0.5s-0.2239-0.5-0.5-0.5zm-2.45 2c-0.82843 0-1.5-0.6716-1.5-1.5s0.67157-1.5 1.5-1.5 1.5 0.6716 1.5 1.5-0.67157 1.5-1.5 1.5z" fill="#212121"/>
+ <path id="path2" d="m16.95 7c-0.2316-1.1411-1.2405-2-2.45-2s-2.2184 0.85888-2.45 2h-7.55c-0.27614 0-0.5 0.22386-0.5 0.5s0.22386 0.5 0.5 0.5h7.55c0.2316 1.1411 1.2405 2 2.45 2 1.2297 0 2.252-0.88783 2.461-2.0575-0.0035 0.01923-0.0071 0.03839-0.011 0.05746h2.55c0.2761 0 0.5-0.22386 0.5-0.5s-0.2239-0.5-0.5-0.5zm-2.45 2c-0.8284 0-1.5-0.67157-1.5-1.5s0.6716-1.5 1.5-1.5 1.5 0.67157 1.5 1.5-0.6716 1.5-1.5 1.5zm-2.55 7c-0.23163-1.1411-1.2405-2-2.45-2s-2.2184 0.8589-2.45 2h-2.55c-0.27614 0-0.5 0.2239-0.5 0.5s0.22386 0.5 0.5 0.5h2.55c0.23163 1.1411 1.2405 2 2.45 2s2.2184-0.8589 2.45-2h7.55c0.2761 0 0.5-0.2239 0.5-0.5s-0.2239-0.5-0.5-0.5zm-2.45 2c-0.82843 0-1.5-0.6716-1.5-1.5s0.67157-1.5 1.5-1.5 1.5 0.6716 1.5 1.5-0.67157 1.5-1.5 1.5z" fill="#FF00FF"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_play_filled.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_play_filled.svg Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_previous.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_previous.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2" d="m5 5.5c0-0.27614 0.22386-0.5 0.5-0.5s0.5 0.22386 0.5 0.5v13c0 0.2761-0.22386 0.5-0.5 0.5s-0.5-0.2239-0.5-0.5zm14 0.75211c0-1.0002-1.1164-1.5954-1.9468-1.0378l-8.4992 5.7071c-0.73449 0.4932-0.73822 1.5724-0.00717 2.0707l8.4992 5.7929c0.8298 0.5655 1.954-0.0288 1.954-1.0329zm-1.3893-0.20755c0.1661-0.11152 0.3893 0.0075 0.3893 0.20755v11.5c0 0.2008-0.2248 0.3196-0.3908 0.2065l-8.4992-5.7928c-0.14621-0.0997-0.14547-0.31552 0.00143-0.41415z" fill="#212121"/>
+ <path id="path2" d="m5 5.5c0-0.27614 0.22386-0.5 0.5-0.5s0.5 0.22386 0.5 0.5v13c0 0.2761-0.22386 0.5-0.5 0.5s-0.5-0.2239-0.5-0.5zm14 0.75211c0-1.0002-1.1164-1.5954-1.9468-1.0378l-8.4992 5.7071c-0.73449 0.4932-0.73822 1.5724-0.00717 2.0707l8.4992 5.7929c0.8298 0.5655 1.954-0.0288 1.954-1.0329zm-1.3893-0.20755c0.1661-0.11152 0.3893 0.0075 0.3893 0.20755v11.5c0 0.2008-0.2248 0.3196-0.3908 0.2065l-8.4992-5.7928c-0.14621-0.0997-0.14547-0.31552 0.00143-0.41415z" fill="#FF00FF"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_rewind.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_rewind.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2" d="m12 7.4871c0-0.8191-0.93084-1.2908-1.5914-0.8064l-5.8796 4.3117c-0.68106 0.49945-0.68106 1.5166 0 2.016l5.8796 4.3117c0.66052 0.4844 1.5914 0.0127 1.5914-0.8064v-3.1599l5.4086 3.9663c0.6606 0.4844 1.5914 0.0127 1.5914-0.8064v-9.0266c0-0.8191-0.9308-1.2908-1.5914-0.8064l-5.4086 3.9663zm-6.8796 4.3117 5.8796-4.3117v9.0266l-5.8796-4.3117c-0.13621-0.0998-0.13621-0.30327 0-0.40316zm7 0 5.8796-4.3117v9.0266l-5.8796-4.3117c-0.1362-0.0998-0.1362-0.30327 0-0.40316z" fill="#212121"/>
+ <path id="path2" d="m12 7.4871c0-0.8191-0.93084-1.2908-1.5914-0.8064l-5.8796 4.3117c-0.68106 0.49945-0.68106 1.5166 0 2.016l5.8796 4.3117c0.66052 0.4844 1.5914 0.0127 1.5914-0.8064v-3.1599l5.4086 3.9663c0.6606 0.4844 1.5914 0.0127 1.5914-0.8064v-9.0266c0-0.8191-0.9308-1.2908-1.5914-0.8064l-5.4086 3.9663zm-6.8796 4.3117 5.8796-4.3117v9.0266l-5.8796-4.3117c-0.13621-0.0998-0.13621-0.30327 0-0.40316zm7 0 5.8796-4.3117v9.0266l-5.8796-4.3117c-0.1362-0.0998-0.1362-0.30327 0-0.40316z" fill="#FF00FF"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_skip_back_10.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_skip_back_10.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2" d="m4.998 5.5c0-0.27614 0.22385-0.5 0.5-0.5 0.27614 0 0.5 0.22386 0.5 0.5v2.2063c0.91262-1.0345 2.0839-1.8225 3.4064-2.2752 1.8362-0.62864 3.8384-0.56798 5.6332 0.17064s3.2597 2.1048 4.1216 3.8438c0.1226 0.24742 0.0215 0.54741-0.226 0.67003-0.2474 0.12263-0.5474 0.02146-0.67-0.22596-0.7541-1.5215-2.0358-2.7168-3.6062-3.3631-1.5703-0.64625-3.3221-0.69932-4.9287-0.1493-1.4133 0.48384-2.6293 1.4053-3.4765 2.6228h3.2462c0.27614 0 0.5 0.22386 0.5 0.5s-0.22386 0.5-0.5 0.5h-4c-0.27615 0-0.5-0.22386-0.5-0.5zm5.002 7c0-0.1844-0.10149-0.3538-0.26407-0.4408-0.16258-0.08705-0.35985-0.07751-0.51328 0.0248l-1.5 1c-0.22976 0.1532-0.29185 0.4636-0.13867 0.6934 0.15317 0.2297 0.46361 0.2918 0.69337 0.1386l0.72265-0.4817v5.0657c0 0.2761 0.22386 0.5 0.5 0.5 0.27615 0 0.5-0.2239 0.5-0.5zm4.5028-0.5c-0.9349 0-1.5971 0.4367-1.9958 1.1292-0.3765 0.6541-0.5042 1.5074-0.5042 2.3708s0.1277 1.7167 0.5042 2.3708c0.3987 0.6925 1.0609 1.1292 1.9958 1.1292 0.935 0 1.5972-0.4367 1.9959-1.1292 0.3765-0.6541 0.5041-1.5074 0.5041-2.3708s-0.1276-1.7167-0.5041-2.3708c-0.3987-0.6925-1.0609-1.1292-1.9959-1.1292zm-1.5 3.5c0-0.7935 0.1224-1.4402 0.3709-1.8719 0.2263-0.3932 0.5641-0.6281 1.1291-0.6281 0.5651 0 0.9029 0.2349 1.1292 0.6281 0.2485 0.4317 0.3708 1.0784 0.3708 1.8719s-0.1223 1.4402-0.3708 1.8719c-0.2263 0.3932-0.5641 0.6281-1.1292 0.6281-0.565 0-0.9028-0.2349-1.1291-0.6281-0.2485-0.4317-0.3709-1.0784-0.3709-1.8719z" fill="#212121"/>
+ <path id="path2" d="m4.998 5.5c0-0.27614 0.22385-0.5 0.5-0.5 0.27614 0 0.5 0.22386 0.5 0.5v2.2063c0.91262-1.0345 2.0839-1.8225 3.4064-2.2752 1.8362-0.62864 3.8384-0.56798 5.6332 0.17064s3.2597 2.1048 4.1216 3.8438c0.1226 0.24742 0.0215 0.54741-0.226 0.67003-0.2474 0.12263-0.5474 0.02146-0.67-0.22596-0.7541-1.5215-2.0358-2.7168-3.6062-3.3631-1.5703-0.64625-3.3221-0.69932-4.9287-0.1493-1.4133 0.48384-2.6293 1.4053-3.4765 2.6228h3.2462c0.27614 0 0.5 0.22386 0.5 0.5s-0.22386 0.5-0.5 0.5h-4c-0.27615 0-0.5-0.22386-0.5-0.5zm5.002 7c0-0.1844-0.10149-0.3538-0.26407-0.4408-0.16258-0.08705-0.35985-0.07751-0.51328 0.0248l-1.5 1c-0.22976 0.1532-0.29185 0.4636-0.13867 0.6934 0.15317 0.2297 0.46361 0.2918 0.69337 0.1386l0.72265-0.4817v5.0657c0 0.2761 0.22386 0.5 0.5 0.5 0.27615 0 0.5-0.2239 0.5-0.5zm4.5028-0.5c-0.9349 0-1.5971 0.4367-1.9958 1.1292-0.3765 0.6541-0.5042 1.5074-0.5042 2.3708s0.1277 1.7167 0.5042 2.3708c0.3987 0.6925 1.0609 1.1292 1.9958 1.1292 0.935 0 1.5972-0.4367 1.9959-1.1292 0.3765-0.6541 0.5041-1.5074 0.5041-2.3708s-0.1276-1.7167-0.5041-2.3708c-0.3987-0.6925-1.0609-1.1292-1.9959-1.1292zm-1.5 3.5c0-0.7935 0.1224-1.4402 0.3709-1.8719 0.2263-0.3932 0.5641-0.6281 1.1291-0.6281 0.5651 0 0.9029 0.2349 1.1292 0.6281 0.2485 0.4317 0.3708 1.0784 0.3708 1.8719s-0.1223 1.4402-0.3708 1.8719c-0.2263 0.3932-0.5641 0.6281-1.1292 0.6281-0.565 0-0.9028-0.2349-1.1291-0.6281-0.2485-0.4317-0.3709-1.0784-0.3709-1.8719z" fill="#FF00FF"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_skip_forward_10.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_skip_forward_10.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2" d="m18.999 5.5c0-0.27614-0.2238-0.5-0.5-0.5-0.2761 0-0.5 0.22386-0.5 0.5v2.2024c-0.9121-1.0326-2.0822-1.8192-3.403-2.2714-1.8362-0.62864-3.8384-0.56798-5.6332 0.17064s-3.2597 2.1048-4.1216 3.8438c-0.12263 0.24742-0.02146 0.54741 0.22596 0.67003 0.24742 0.12263 0.5474 0.02146 0.67003-0.22596 0.75409-1.5215 2.0358-2.7168 3.6062-3.3631 1.5704-0.64625 3.3222-0.69932 4.9288-0.1493 1.4133 0.48384 2.6293 1.4053 3.4766 2.6228h-3.2497c-0.2761 0-0.5 0.22386-0.5 0.5s0.2239 0.5 0.5 0.5h4c0.2762 0 0.5-0.22386 0.5-0.5zm-6.4929 7.6292c0.3987-0.6925 1.0609-1.1292 1.9959-1.1292 0.9349 0 1.5971 0.4367 1.9958 1.1292 0.3765 0.6541 0.5042 1.5074 0.5042 2.3708s-0.1277 1.7167-0.5042 2.3708c-0.3987 0.6925-1.0609 1.1292-1.9958 1.1292-0.935 0-1.5972-0.4367-1.9959-1.1292-0.3765-0.6541-0.5041-1.5074-0.5041-2.3708s0.1276-1.7167 0.5041-2.3708zm0.8667 0.4989c-0.2485 0.4317-0.3708 1.0784-0.3708 1.8719s0.1223 1.4402 0.3708 1.8719c0.2263 0.3932 0.5641 0.6281 1.1292 0.6281 0.565 0 0.9028-0.2349 1.1291-0.6281 0.2485-0.4317 0.3709-1.0784 0.3709-1.8719s-0.1224-1.4402-0.3709-1.8719c-0.2263-0.3932-0.5641-0.6281-1.1291-0.6281-0.5651 0-0.9029 0.2349-1.1292 0.6281zm-3.3737-1.1281c0-0.1844-0.1015-0.3538-0.26407-0.4408-0.16258-0.08705-0.35986-0.07751-0.51328 0.0248l-1.5 1c-0.22977 0.1532-0.29185 0.4636-0.13868 0.6934 0.15318 0.2297 0.46361 0.2918 0.69338 0.1386l0.72265-0.4817v5.0657c0 0.2761 0.22385 0.5 0.5 0.5 0.27614 0 0.5-0.2239 0.5-0.5z" fill="#212121"/>
+ <path id="path2" d="m18.999 5.5c0-0.27614-0.2238-0.5-0.5-0.5-0.2761 0-0.5 0.22386-0.5 0.5v2.2024c-0.9121-1.0326-2.0822-1.8192-3.403-2.2714-1.8362-0.62864-3.8384-0.56798-5.6332 0.17064s-3.2597 2.1048-4.1216 3.8438c-0.12263 0.24742-0.02146 0.54741 0.22596 0.67003 0.24742 0.12263 0.5474 0.02146 0.67003-0.22596 0.75409-1.5215 2.0358-2.7168 3.6062-3.3631 1.5704-0.64625 3.3222-0.69932 4.9288-0.1493 1.4133 0.48384 2.6293 1.4053 3.4766 2.6228h-3.2497c-0.2761 0-0.5 0.22386-0.5 0.5s0.2239 0.5 0.5 0.5h4c0.2762 0 0.5-0.22386 0.5-0.5zm-6.4929 7.6292c0.3987-0.6925 1.0609-1.1292 1.9959-1.1292 0.9349 0 1.5971 0.4367 1.9958 1.1292 0.3765 0.6541 0.5042 1.5074 0.5042 2.3708s-0.1277 1.7167-0.5042 2.3708c-0.3987 0.6925-1.0609 1.1292-1.9958 1.1292-0.935 0-1.5972-0.4367-1.9959-1.1292-0.3765-0.6541-0.5041-1.5074-0.5041-2.3708s0.1276-1.7167 0.5041-2.3708zm0.8667 0.4989c-0.2485 0.4317-0.3708 1.0784-0.3708 1.8719s0.1223 1.4402 0.3708 1.8719c0.2263 0.3932 0.5641 0.6281 1.1292 0.6281 0.565 0 0.9028-0.2349 1.1291-0.6281 0.2485-0.4317 0.3709-1.0784 0.3709-1.8719s-0.1224-1.4402-0.3709-1.8719c-0.2263-0.3932-0.5641-0.6281-1.1291-0.6281-0.5651 0-0.9029 0.2349-1.1292 0.6281zm-3.3737-1.1281c0-0.1844-0.1015-0.3538-0.26407-0.4408-0.16258-0.08705-0.35986-0.07751-0.51328 0.0248l-1.5 1c-0.22977 0.1532-0.29185 0.4636-0.13868 0.6934 0.15318 0.2297 0.46361 0.2918 0.69338 0.1386l0.72265-0.4817v5.0657c0 0.2761 0.22385 0.5 0.5 0.5 0.27614 0 0.5-0.2239 0.5-0.5z" fill="#FF00FF"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_stop.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_fluent_stop.svg Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_pause_filled.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_pause_filled.svg Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/pixmaps/menu/ic_playlist.svg -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/pixmaps/menu/ic_playlist.svg Changed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path id="path2158" d="m4.5 6a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5h9a0.5 0.5 0 0 0 0.5-0.5 0.5 0.5 0 0 0-0.5-0.5h-9zm0 4a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5h9a0.5 0.5 0 0 0 0.5-0.5 0.5 0.5 0 0 0-0.5-0.5h-9zm9.7188 3.002c-0.63441 0.02776-1.2188 0.5487-1.2188 1.2441v5.5078c0 0.92717 1.0373 1.5446 1.8496 1.0957l4.9883-2.7539c0.8396-0.46365 0.83939-1.7274 0-2.1914l-4.9883-2.7539c-0.20304-0.11215-0.41939-0.15769-0.63086-0.14844zm0.013672 0.98438c0.043094 9.6e-4 0.088524 0.013522 0.13477 0.039063l4.9863 2.7539c0.19449 0.1075 0.19428 0.33412 0 0.44141l-4.9863 2.7539c-0.18484 0.10215-0.36719-0.005178-0.36719-0.2207v-5.5078c0-0.16187 0.10314-0.26264 0.23242-0.25977zm-9.7324 0.013672a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5h5a0.5 0.5 0 0 0 0.5-0.5 0.5 0.5 0 0 0-0.5-0.5h-5z" color="#000000" fill="#000" fill-rule="evenodd"/>
+ <path id="path2158" d="m4.5 6a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5h9a0.5 0.5 0 0 0 0.5-0.5 0.5 0.5 0 0 0-0.5-0.5h-9zm0 4a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5h9a0.5 0.5 0 0 0 0.5-0.5 0.5 0.5 0 0 0-0.5-0.5h-9zm9.7188 3.002c-0.63441 0.02776-1.2188 0.5487-1.2188 1.2441v5.5078c0 0.92717 1.0373 1.5446 1.8496 1.0957l4.9883-2.7539c0.8396-0.46365 0.83939-1.7274 0-2.1914l-4.9883-2.7539c-0.20304-0.11215-0.41939-0.15769-0.63086-0.14844zm0.013672 0.98438c0.043094 9.6e-4 0.088524 0.013522 0.13477 0.039063l4.9863 2.7539c0.19449 0.1075 0.19428 0.33412 0 0.44141l-4.9863 2.7539c-0.18484 0.10215-0.36719-0.005178-0.36719-0.2207v-5.5078c0-0.16187 0.10314-0.26264 0.23242-0.25977zm-9.7324 0.013672a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5h5a0.5 0.5 0 0 0 0.5-0.5 0.5 0.5 0 0 0-0.5-0.5h-5z" color="#FF00FF" fill="#FF00FF" fill-rule="evenodd"/>
 </svg>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/player_controller.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/player_controller.cpp Changed

@@ -38,6 +38,10 @@
 #include <QDir>
 #include <QSignalMapper>
 #include <QThreadPool>
+#ifndef QT_HAS_LIBATOMIC
+#include <QReadLocker>
+#include <QWriteLocker>
+#endif
 
 #include <cassert>
 
@@ -221,6 +225,7 @@
     if (m_hasVideo)
         main_vout = vouts0;
 
+    m_videoStereoMode.resetObject( main_vout );
     m_zoom.resetObject( main_vout );
     m_aspectRatio.resetObject( main_vout );
     m_crop.resetObject(  main_vout );
@@ -293,9 +298,9 @@
     SharedInputItem newMediaPtr = SharedInputItem( new_media );
     that->callAsync(that,newMediaPtr () {
         PlayerController* q = that->q_func();
-        that->UpdateName( newMediaPtr.get() );
         that->UpdateArt( newMediaPtr.get() );
         that->UpdateMeta( newMediaPtr.get() );
+        that->UpdateName( newMediaPtr.get() );
         that->m_url = vlc::wrap_cptr( input_item_GetURI( newMediaPtr.get() ) ).get();
 
         {
@@ -1008,16 +1013,10 @@
                                          void *data)
 {
     PlayerControllerPrivate* that = static_cast<PlayerControllerPrivate *>(data);
-
-    that->callAsync(that, tc_copy = *tc(){
-        that->m_highResolutionTime = QString::asprintf("%02u:%02u:%02u%c%02u",
-                                                       tc_copy.hours,
-                                                       tc_copy.minutes,
-                                                       tc_copy.seconds,
-                                                       tc_copy.drop_frame ? '.' : ':',
-                                                       tc_copy.frames);
-        emit that->q_func()->highResolutionTimeChanged(that->m_highResolutionTime);
-    });
+#ifndef QT_HAS_LIBATOMIC
+    QWriteLocker lock(&that->m_highResolutionTimeLock);
+#endif
+    that->m_highResolutionTime = *tc;
 }
 
 
@@ -1114,6 +1113,7 @@
     , m_titleList(m_player)
     , m_chapterList(m_player)
     , m_programList(m_player)
+    , m_videoStereoMode((vout_thread_t*)nullptr, "video-stereo-mode")
     , m_zoom((vout_thread_t*)nullptr, "zoom")
     , m_aspectRatio((vout_thread_t*)nullptr, "aspect-ratio")
     , m_crop((vout_thread_t*)nullptr, "crop")
@@ -1220,10 +1220,23 @@
 void PlayerController::setRate( float new_rate )
 {
     Q_D(PlayerController);
+
+    if (qFuzzyCompare(d->m_rate, new_rate))
+        return;
+
     msg_Dbg( d->p_intf, "setRate %f", new_rate);
     vlc_player_locker lock{ d->m_player };
     if ( vlc_player_CanChangeRate( d->m_player ) )
+    {
         vlc_player_ChangeRate( d->m_player, new_rate );
+
+        // Until the timer notifies the change, we need to still change
+        // the rate, because player timer update may take a long time.
+        // For position, it is supposed to be interpolated but for rate
+        // the new value can be taken as is:
+        d->m_rate = new_rate;
+        emit rateChanged(d->m_rate);
+    }
 }
 
 void PlayerController::slower()
@@ -1938,6 +1951,39 @@
     }
 }
 
+QString PlayerController::highResolutionTime() const
+{
+    Q_D(const PlayerController);
+
+    // Sample:
+    vlc_player_timer_smpte_timecode sample;
+    {
+#ifndef QT_HAS_LIBATOMIC
+        QReadLocker lock(&d->m_highResolutionTimeLock);
+#endif
+        sample = d->m_highResolutionTime;
+    }
+
+    const vlc_player_timer_smpte_timecode& lastSample = d->m_highResolutionTimeSample.first;
+
+    if (sample.frames == lastSample.frames &&
+        sample.frame_resolution == lastSample.frame_resolution &&
+        sample.seconds == lastSample.seconds &&
+        sample.minutes == lastSample.minutes &&
+        sample.hours == lastSample.hours &&
+        sample.drop_frame == lastSample.drop_frame)
+        return d->m_highResolutionTimeSample.second;
+
+    d->m_highResolutionTimeSample.second = QString::asprintf("%02u:%02u:%02u%c%02u",
+                                                             sample.hours,
+                                                             sample.minutes,
+                                                             sample.seconds,
+                                                             sample.drop_frame ? '.' : ':',
+                                                             sample.frames);
+    d->m_highResolutionTimeSample.first = std::move(sample);
+
+    return d->m_highResolutionTimeSample.second;
+}
 
 //OTHER
 
@@ -1955,17 +2001,21 @@
         if (default_timeout < 0)
             default_timeout = 0;
 
-        d->m_preparser = vlc_preparser_New(VLC_OBJECT(d->p_intf), 1,
-                                           default_timeout,
-                                           META_REQUEST_OPTION_FETCH_ANY);
+        const struct vlc_preparser_cfg cfg = default_timeout{
+            struct vlc_preparser_cfg cfg{};
+            cfg.types = VLC_PREPARSER_TYPE_FETCHMETA_ALL;
+            cfg.max_parser_threads = 1;
+            cfg.timeout = default_timeout;
+            return cfg;
+        }();
+        d->m_preparser = vlc_preparser_New(VLC_OBJECT(d->p_intf), &cfg);
         if (unlikely(d->m_preparser == nullptr))
             return;
     }
 
-    input_item_meta_request_option_t fetch_options =
-        var_InheritBool( d->p_intf, "metadata-network-access" ) ?
-            META_REQUEST_OPTION_FETCH_ANY :
-            META_REQUEST_OPTION_FETCH_LOCAL;
+    int fetch_options = var_InheritBool( d->p_intf, "metadata-network-access" ) ?
+            VLC_PREPARSER_TYPE_FETCHMETA_ALL :
+            VLC_PREPARSER_TYPE_FETCHMETA_LOCAL;
 
     vlc_preparser_Push( d->m_preparser, p_item, fetch_options,
                         &art_fetcher_cbs, d  );
@@ -2053,6 +2103,7 @@
 QABSTRACTLIST_GETTER( ChapterListModel,getChapters, m_chapterList)
 QABSTRACTLIST_GETTER( AudioDeviceModel, getAudioDevices, m_audioDeviceList)
 QABSTRACTLIST_GETTER( ProgramListModel, getPrograms, m_programList)
+QABSTRACTLIST_GETTER( VLCVarChoiceModel, getVideoStereoMode, m_videoStereoMode)
 QABSTRACTLIST_GETTER( VLCVarChoiceModel, getZoom, m_zoom)
 QABSTRACTLIST_GETTER( VLCVarChoiceModel, getAspectRatio, m_aspectRatio)
 QABSTRACTLIST_GETTER( VLCVarChoiceModel, getCrop, m_crop)
@@ -2117,7 +2168,4 @@
 PRIMITIVETYPE_GETTER(QUrl, getArtwork, m_artwork)
 PRIMITIVETYPE_GETTER(QUrl, getUrl, m_url)
 
-// High resolution time fed by SMPTE timer
-PRIMITIVETYPE_GETTER(QString, highResolutionTime, m_highResolutionTime)
-
 #undef PRIMITIVETYPE_GETTER

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/player_controller.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/player_controller.hpp Changed

@@ -168,6 +168,7 @@
 
     //vout properties
     Q_PROPERTY(bool hasVideoOutput READ hasVideoOutput NOTIFY hasVideoOutputChanged FINAL)
+    Q_PROPERTY(VLCVarChoiceModel* videoStereoMode READ getVideoStereoMode CONSTANT FINAL)
     Q_PROPERTY(VLCVarChoiceModel* zoom READ getZoom CONSTANT FINAL)
     Q_PROPERTY(VLCVarChoiceModel* aspectRatio READ getAspectRatio CONSTANT FINAL)
     Q_PROPERTY(VLCVarChoiceModel* crop READ getCrop CONSTANT FINAL)
@@ -195,7 +196,7 @@
     Q_PROPERTY(RendererManager* rendererManager READ getRendererManager CONSTANT FINAL)
 
     // High resolution time fed by SMPTE Timer
-    Q_PROPERTY(QString highResolutionTime READ highResolutionTime NOTIFY highResolutionTimeChanged FINAL)
+    Q_PROPERTY(QString highResolutionTime READ highResolutionTime FINAL)
 
     /* exposed actions */
 public slots:
@@ -350,6 +351,7 @@
 
     //vout properties
     bool hasVideoOutput() const;
+    VLCVarChoiceModel* getVideoStereoMode();
     VLCVarChoiceModel* getZoom();
     VLCVarChoiceModel* getAspectRatio();
     VLCVarChoiceModel* getCrop();

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/player_controller_p.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/player_controller_p.hpp Changed

@@ -29,6 +29,11 @@
 #include <QTimer>
 #include <QUrl>
 
+#ifndef QT_HAS_LIBATOMIC
+#warning "libatomic is not available. Read write lock is going to be used instead."
+#include <QReadWriteLock>
+#endif
+
 typedef struct vlc_preparser_t vlc_preparser_t;
 
 class PlayerControllerPrivate {
@@ -95,7 +100,14 @@
     double       m_position = 0.f;
     VLCTick      m_length= 0;
 
-    QString m_highResolutionTime { "00:00:00:00" };
+#if QT_HAS_LIBATOMIC
+    std::atomic<vlc_player_timer_smpte_timecode> m_highResolutionTime;
+#else
+    vlc_player_timer_smpte_timecode m_highResolutionTime;
+    mutable QReadWriteLock m_highResolutionTimeLock;
+#endif
+    mutable QPair<vlc_player_timer_smpte_timecode, QString> m_highResolutionTimeSample;
+
     unsigned m_smpteTimerRequestCount = 0;
 
     SharedInputItem    m_currentItem;
@@ -144,6 +156,7 @@
     bool m_teletextTransparent = false;
 
     //vout properties
+    VLCVarChoiceModel m_videoStereoMode;
     VLCVarChoiceModel m_zoom;
     VLCVarChoiceModel m_aspectRatio;
     VLCVarChoiceModel m_crop;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/ControlBar.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/ControlBar.qml Changed

@@ -38,9 +38,9 @@
     }
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     topInset: sliderY
 
@@ -102,7 +102,19 @@
         id: timeTextMetrics
         font.pixelSize: (textPosition === ControlBar.TimeTextPosition.LeftRightSlider) ? VLCStyle.fontSize_small
                                                                                        : VLCStyle.fontSize_normal
-        text: "00--00" // Some extra space to compensate non-monospaced fonts.
+        text: {
+            // This text metrics is used for both the time and length, as we want them to have the same width.
+            // Length might not be reported in some cases, for that reason we should check both and use the bigger one.
+            let t
+            const time = Player.time
+            const length = Player.length
+            if (time > length)
+                t = time
+            else
+                t = length
+            // Some extra space to compensate non-monospaced fonts ("-" takes more space than ":", double "-" for guarantee)
+            return t.isSubHour() ? "00--00" : "00--00--00"
+        }
     }
 
     background: Rectangle {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/MinimalView.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/MinimalView.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/PIPPlayer.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/PIPPlayer.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/Player.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/Player.qml Changed

@@ -19,7 +19,6 @@
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQml.Models
-import Qt5Compat.GraphicalEffects
 import QtQuick.Window
 
 import VLC.MainInterface
@@ -61,8 +60,6 @@
 
     // Settings
 
-    layer.enabled: (StackView.status === StackView.Deactivating || StackView.status === StackView.Activating)
-
     Accessible.role: Accessible.Client
     Accessible.name: qsTr("Player")
 
@@ -142,6 +139,8 @@
 
     PlayerPlaylistVisibilityFSM {
         id: playlistVisibility
+
+        onIsPlaylistVisibleChanged: lockUnlockAutoHide(isPlaylistVisible)
     }
 
     Connections {
@@ -169,14 +168,18 @@
         anchors {
             left: parent.left
             right: parent.right
-            top: (MainCtx.hasEmbededVideo && !rootPlayer._controlsUnderVideo) ? parent.top : topBar.bottom
-            bottom: (MainCtx.hasEmbededVideo && !rootPlayer._controlsUnderVideo) ? parent.bottom : controlBar.top
+            top: (MainCtx.hasEmbededVideo && rootPlayer._controlsUnderVideo) ? topBar.bottom : parent.top
+            bottom: (MainCtx.hasEmbededVideo && rootPlayer._controlsUnderVideo) ? controlBar.top : parent.bottom
         }
 
         sourceComponent: MainCtx.hasEmbededVideo ? videoComponent : audioComponent
 
         property int cursorShape
 
+        // Have padding here, so that the content (unlike background) does not go behind the top bar or the control bar:
+        property real topPadding: (anchors.top === parent.top) ? topBar.height : 0
+        property real bottomPadding: (anchors.bottom === parent.bottom) ? controlBar.height : 0
+
         Component {
             id: videoComponent
 
@@ -207,9 +210,9 @@
                     }
 
                     Binding on cursorShape {
-                        when: topBar.state === "hidden"
-                              && controlBar.state === "hidden"
-                              && !interactiveAutoHideTimer.running
+                        when: playerToolbarVisibilityFSM.started
+                            && !playerToolbarVisibilityFSM.isVisible
+                            && !interactiveAutoHideTimer.running
                         value: Qt.BlankCursor
                     }
                 }
@@ -254,10 +257,14 @@
             id: audioComponent
 
             FocusScope {
+                id: audioFocusScope
                 // Audio
 
                 focus: true
 
+                property real topPadding: playerSpecializationLoader.topPadding
+                property real bottomPadding: playerSpecializationLoader.bottomPadding
+
                 // background image
                 Rectangle {
                     focus: false
@@ -269,8 +276,10 @@
                         colorSet: ColorContext.View
                     }
 
-                    PlayerBlurredBackground {
-                        id: backgroundImage
+                    Widgets.BlurEffect {
+                        id: blurredBackground
+
+                        radius: 64
 
                         //destination aspect ratio
                         readonly property real dar: parent.width / parent.height
@@ -279,10 +288,40 @@
                         width: (cover.sar < dar) ? parent.width :  parent.height * cover.sar
                         height: (cover.sar < dar) ? parent.width / cover.sar :  parent.height
 
-                        source: cover
+                        source: textureProviderItem
+
+                        Widgets.TextureProviderItem {
+                            // Texture indirection to fool Qt into not creating an implicit
+                            // ShaderEffectSource because source image does not have fill mode
+                            // stretch. "If needed, MultiEffect will internally generate a
+                            // ShaderEffectSource as the texture source.": Qt creates a layer
+                            // if source has children, source is image and does not have
+                            // fill mode stretch or source size is null. In this case,
+                            // we really don't need Qt to create an implicit layer.
+
+                            // Note that this item does not create a new texture, it simply
+                            // represents the source image provider.
+                            id: textureProviderItem
 
-                        screenColor: bgtheme.bg.primary.alpha(.55)
-                        overlayColor: Qt.tint(bgtheme.fg.primary, bgtheme.bg.primary).alpha(0.4)
+                            // Do not set textureSubRect, because we don't want blur to be
+                            // updated everytime the viewport changes. It is better to have
+                            // the static source texture blurred once, and adjust the blur
+                            // than to blur each time the viewport changes.
+
+                            source: cover
+                        }
+
+                        layer.enabled: true
+                        layer.samplerName: "backgroundSource"
+                        layer.effect: ShaderEffect {
+                            readonly property color screenColor: bgtheme.bg.primary.alpha(.55)
+                            readonly property color overlayColor: Qt.tint(bgtheme.fg.primary, bgtheme.bg.primary).alpha(0.4)
+
+                            blending: false
+                            cullMode: ShaderEffect.BackFaceCulling
+
+                            fragmentShader: "qrc:///shaders/PlayerBlurredBackground.frag.qsb"
+                        }
                     }
                 }
 
@@ -295,18 +334,18 @@
                     }
 
                     anchors.fill: parent
-                    anchors.topMargin: VLCStyle.margin_xsmall
-                    anchors.bottomMargin: VLCStyle.margin_xsmall
+                    anchors.topMargin: VLCStyle.margin_xsmall + audioFocusScope.topPadding
+                    anchors.bottomMargin: VLCStyle.margin_xsmall + audioFocusScope.bottomPadding
 
                     onWheel: (wheel) => {
                         wheel.accepted = true
+                        wheelToVlc.qmlWheelEvent(wheel)
+                    }
 
-                        var delta = wheel.angleDelta.y
-
-                        if (delta === 0)
-                            return
+                    WheelToVLCConverter {
+                        id: wheelToVlc
 
-                        Helpers.applyVolume(Player, delta)
+                        onVlcWheelKey: (key) => MainCtx.sendVLCHotkey(key)
                     }
 
                     ColumnLayout {
@@ -345,11 +384,13 @@
 
                                 //source aspect ratio
                                 readonly property real sar: paintedWidth / paintedHeight
-                                readonly property int maximumWidth: Helpers.alignUp((Screen.desktopAvailableWidth / coverItem.sizeConstant), 32)
-                                readonly property int maximumHeight: Helpers.alignUp((Screen.desktopAvailableHeight / coverItem.sizeConstant), 32)
+                                readonly property int maximumWidth: Helpers.alignUp((Screen.desktopAvailableWidth * eDPR / coverItem.sizeConstant), 32)
+                                readonly property int maximumHeight: Helpers.alignUp((Screen.desktopAvailableHeight * eDPR / coverItem.sizeConstant), 32)
 
                                 readonly property int maximumSize: Math.min(maximumWidth, maximumHeight)
 
+                                readonly property real eDPR: MainCtx.effectiveDevicePixelRatio(Window.window)
+
                                 anchors.top: parent.top
                                 anchors.bottom: parent.bottom
                                 anchors.horizontalCenter: parent.horizontalCenter
@@ -363,11 +404,6 @@
 
                                 Accessible.role: Accessible.Graphic
                                 Accessible.name: qsTr("Cover")
-
-                                onStatusChanged: {
-                                    if (status === Image.Ready)
-                                        backgroundImage.scheduleUpdate()
-                                }
                             }
                         }
 
@@ -541,6 +577,7 @@
 
         showCSD: MainCtx.clientSideDecoration && (MainCtx.intfMainWindow.visibility !== Window.FullScreen)
         showToolbar: MainCtx.hasToolbarMenu && (MainCtx.intfMainWindow.visibility !== Window.FullScreen)
+        playlistVisible: playlistVisibility.isPlaylistVisible
 
         Navigation.parentItem: rootPlayer
         Navigation.downItem: {
@@ -556,7 +593,7 @@
         //initial state value is "", using a binding avoid animation on startup
         Binding on state {
             when: playerToolbarVisibilityFSM.started
-            value: playerToolbarVisibilityFSM.isVisible ? "visible" : "hidden"
+            value: (playerToolbarVisibilityFSM.isVisible || rootPlayer._controlsUnderVideo) ? "visible" : "hidden"
         }
 
         onTogglePlaylistVisibility: playlistVisibility.togglePlaylistVisibility()
@@ -616,7 +653,7 @@
             value: playlistVisibility.isPlaylistVisible ? "visible" : "hidden"
         }
 
-        component: PlaylistListView {
+        component: PlaylistPane {
             id: playlistView
 
             width: Helpers.clamp(rootPlayer.width / resizeHandle.widthFactor
@@ -784,6 +821,17 @@
         }
     }
 
+    Widgets.FloatingNotification {
+        id: notif
+
+        anchors {
+            bottom: controlBar.top
+            left: parent.left
+            right: parent.right
+            margins: VLCStyle.margin_large
+        }
+    }
+
     ControlBar {
         id: controlBar
 
@@ -828,7 +876,7 @@
         //initial state value is "", using a binding avoid animation on startup
         Binding on state {
             when: playerToolbarVisibilityFSM.started
-            value: playerToolbarVisibilityFSM.isVisible ? "visible" : "hidden"
+            value: (playerToolbarVisibilityFSM.isVisible || rootPlayer._controlsUnderVideo) ? "visible" : "hidden"
         }
 
         onRequestLockUnlockAutoHide: (lock) => rootPlayer.lockUnlockAutoHide(lock)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/PlayerControlbarControls.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/PlayerControlbarControls.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/PlayerToolbarVisibilityFSM.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/PlayerToolbarVisibilityFSM.qml Changed

@@ -59,7 +59,7 @@
     property alias isVisible: fsmVisible.active
 
     property int lockCount: 0 // Track the number of locks
-    property int timeoutDuration: 3000
+    property int timeoutDuration: MainCtx.mouseHideTimeout
 
     initialState: ((Player.isInteractive && MainCtx.hasEmbededVideo))
                   ? fsmHidden : fsmVisible
@@ -130,14 +130,14 @@
                     mouseMove: {
                         guard: () => !Player.isInteractive,
                         action: () => { 
-                            fsm.timeoutDuration = 3000;
+                            fsm.timeoutDuration = MainCtx.mouseHideTimeout;
                         },
                         target: fsmVideoMode
                     },
                     keyboardMove: {
                         guard: () => !Player.isInteractive,
                         action: () => { 
-                            fsm.timeoutDuration = 5000
+                            fsm.timeoutDuration = MainCtx.mouseHideTimeout * 2
                         },
                         target: fsmVideoMode
                     }
@@ -177,14 +177,14 @@
             mouseMove: {
                 guard: () => !Player.isInteractive,
                 action: () => {
-                    fsm.timeoutDuration = 3000
+                    fsm.timeoutDuration = MainCtx.mouseHideTimeout
                 },
                 target: fsmVisible
             },
             keyboardMove: {
                 guard: () => !Player.isInteractive,
                 action: () => {
-                    fsm.timeoutDuration = 5000
+                    fsm.timeoutDuration = MainCtx.mouseHideTimeout * 2
                 },
                 target: fsmVisible
             },

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/SliderBar.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/SliderBar.qml Changed

@@ -19,8 +19,6 @@
 import QtQuick.Controls
 import QtQuick.Templates as T
 import QtQuick.Layouts
-import Qt5Compat.GraphicalEffects
-
 
 import VLC.Player
 import VLC.Widgets as Widgets
@@ -251,6 +249,8 @@
             dragThreshold: 0
             grabPermissions: PointerHandler.CanTakeOverFromAnything
 
+            property bool filterEvents: false
+
             function moveControl() {
                 fsm.moveControl(dragHandler.centroid.position.x / control.width,
                                 dragHandler.centroid.modifiers === Qt.ShiftModifier)
@@ -258,6 +258,7 @@
 
             onActiveChanged: {
                 if (active) {
+                    filterEvents = false
                     fsm.pressControl(centroid.position.x / control.width, centroid.modifiers === Qt.ShiftModifier)
                 } else {
                     fsm.releaseControl( centroid.position.x / control.width, centroid.modifiers === Qt.ShiftModifier)
@@ -266,7 +267,12 @@
 
             onCentroidChanged: {
                 // FIXME: Qt 6.5 use xAxis.onActiveValueChanged in the DragHandler
-                Qt.callLater(dragHandler.moveControl)
+                if (filterEvents) {
+                    Qt.callLater(dragHandler.moveControl)
+                } else {
+                    dragHandler.moveControl()
+                    filterEvents = true
+                }
             }
         }
     }
@@ -388,12 +394,36 @@
             property int bufferAnimPosition: 0
             property int bufferFrames: 1000
             property alias animateLoading: loadingAnim.running
+            property bool display: false
+            property bool buffering: Player.buffering > 0 && Player.buffering < 1
 
             height: control.barHeight
             opacity: 0.4
             color: theme.fg.neutral //FIXME buffer color ?
             radius: control.barHeight
 
+            Timer {
+                id: bufferingTimer
+                interval: VLCStyle.duration_humanMoment
+                repeat: false
+                running: false
+                onTriggered: {
+                    bufferRect.display = true
+                }
+            }
+
+            onBufferingChanged: {
+                if(buffering)
+                {
+                    bufferingTimer.start()
+                }
+                else
+                {
+                    bufferingTimer.stop()
+                    bufferRect.display = false
+                }
+            }
+
             states: 
                 State {
                     name: "hidden"
@@ -419,7 +449,7 @@
                 },
                 State {
                     name: "time to start playing known"
-                    when: control.visible && Player.buffering < 1
+                    when: control.visible && bufferRect.display
                     PropertyChanges {
                         target: bufferRect
                         width: Player.buffering * parent.width
@@ -430,7 +460,7 @@
                 },
                 State {
                     name: "playing from buffer"
-                    when: control.visible && Player.buffering === 1
+                    when: control.visible && !bufferRect.display
                     PropertyChanges {
                         target: bufferRect
                         width: Player.buffering * parent.width

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/TopBar.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/TopBar.qml Changed

@@ -64,6 +64,8 @@
 
     property alias resumeVisible: resumeDialog.visible
 
+    property alias playlistVisible: playlistButton.checked
+
     // Signals
 
     signal togglePlaylistVisibility()
@@ -93,6 +95,7 @@
 
     // Functions
 
+    // FIXME: Imperative layouting in QML is stupid, this needs to be gone.
     function _layoutLine(c1, c2, offset)
     {
         let c1Height = c1?.implicitHeight ?? 0
@@ -118,6 +121,7 @@
         return lineHeight
     }
 
+    // FIXME: Imperative layouting in QML is stupid, this needs to be gone.
     //FIXME: if CSD will be weirdly placed if application safe-area are used,
     //nota that if you need a safe area (kiosk mode), you probably don't need CSD
     function _layout() {
@@ -198,6 +202,14 @@
         anchors.fill: parent
         active: root.showCSD
         source: "qrc:///qt/qml/VLC/Widgets/CSDTitlebarTapNDrapHandler.qml"
+
+        Connections {
+            target: tapNDrag.item
+            enabled: tapNDrag.status === Loader.Ready
+            function onCsdMenuVisibleChanged() {
+                root.requestLockUnlockAutoHide(tapNDrag.item.csdMenuVisible)
+            }
+        }
     }
 
     // Components -
@@ -207,14 +219,15 @@
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.leftMargin: root.sideMargin
+        anchors.right: root.showCSD ? csdDecorations.left : parent.right
 
-        width: implicitWidth
 
         visible: root.showToolbar
         enabled: root.showToolbar
 
         onHoveredChanged: menu => root.requestLockUnlockAutoHide(hovered)
         onMenuOpenedChanged: menu => root.requestLockUnlockAutoHide(menuOpened)
+        onImplicitHeightChanged: root._layout()
     }
 
     Item {
@@ -276,13 +289,7 @@
 
                 color: theme.accent
 
-                Connections {
-                    target: logo.button
-
-                    function onSystemMenuVisibilityChanged() {
-                        root.requestLockUnlockAutoHide(visible)
-                    }
-                }
+                onCsdMenuVisibleChanged: root.requestLockUnlockAutoHide(csdMenuVisible)
             }
         }
 
@@ -468,8 +475,6 @@
             description: qsTr("Playlist")
             focus: root.showToolbar
 
-            checked: MainCtx.playlistVisible
-
             width: VLCStyle.bannerButton_width
             height: VLCStyle.bannerButton_height

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/controlbarcontrols/AtoBButton.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/controlbarcontrols/AtoBButton.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/controlbarcontrols/Fallback.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/controlbarcontrols/Fallback.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/controlbarcontrols/HighResolutionTimeWidget.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/controlbarcontrols/HighResolutionTimeWidget.qml Changed

@@ -17,6 +17,7 @@
  *****************************************************************************/
 
 import QtQuick
+import QtQuick.Window
 import QtQuick.Controls
 
 
@@ -37,7 +38,7 @@
     Keys.onPressed: (event) => Navigation.defaultKeyAction(event)
 
     Accessible.role: Accessible.Indicator
-    Accessible.name:  paintOnly ? "00:00:00:00" : Player.highResolutionTime
+    Accessible.name: contentItem.text
 
     function _adjustSMPTETimer(add) {
         if (typeof toolbarEditor !== "undefined") // FIXME: Can't use paintOnly because it is set later
@@ -73,16 +74,46 @@
         implicitHeight: smpteTimecodeMetrics.height
         implicitWidth: smpteTimecodeMetrics.width
 
+        property alias text: label.text
+
         Widgets.MenuLabel {
             id: label
             anchors.fill: parent
 
-            text: paintOnly ? "00:00:00:00" : Player.highResolutionTime
+            text: paintOnly ? "00:00:00:00" : timeText
             color: theme.fg.primary
 
             horizontalAlignment: Text.AlignHCenter
 
             Accessible.ignored: true
+
+            property string timeText
+
+            Connections {
+                target: label.Window.window
+                enabled: label.visible
+
+                function onAfterAnimating() {
+                    // Sampling point
+                    // Emitted from the GUI thread
+
+                    // Constantly update the label, so that the window
+                    // prepares new frames as we don't know when the
+                    // timecode changes. This is similar to animations:
+                    label.update()
+
+                    if (label.timeText === Player.highResolutionTime)
+                        return
+
+                    label.timeText = Player.highResolutionTime
+
+                    // Text would like polishing after text change.
+                    // We need this because `afterAnimating()` is
+                    // signalled after the items are polished:
+                    if (label.ensurePolished)
+                        label.ensurePolished()
+                }
+            }
         }
 
         TextMetrics {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/controlbarcontrols/PlaybackSpeedButton.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/controlbarcontrols/PlaybackSpeedButton.qml Changed

@@ -44,16 +44,32 @@
         Navigation.rightItem: root
     }
 
-    contentItem: T.Label {
-        verticalAlignment: Text.AlignVCenter
-        horizontalAlignment: Text.AlignHCenter
+    contentItem: Item {
+        implicitHeight: label.implicitHeight
+        implicitWidth: textMetrics.width
+
+        TextMetrics {
+            id: textMetrics
+            font: label.font
+            // '-' is for additional space if certain digits have more width with certain fonts
+            text: "0.00x-"
+        }
+
+        Text {
+            id: label
+
+            anchors.fill: parent
+
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
 
-        font.pixelSize: VLCStyle.fontSize_normal
+            font.pixelSize: VLCStyle.fontSize_normal
 
-        text: !root.paintOnly ? qsTr("%1x").arg(+Player.rate.toFixed(2))
-                              : qsTr("1x")
+            text: !root.paintOnly ? qsTr("%1x").arg(+Player.rate.toFixed(2))
+                                  : qsTr("1x")
 
-        color: root.color
+            color: root.color
+        }
     }
 
     // TODO: Qt bug 6.2: QTBUG-103604
@@ -62,39 +78,53 @@
 
         z: -1
 
+        WheelToVLCConverter {
+            id: wheelToVLC
+
+            function handle(steps: int) {
+                let func
+                if (steps > 0)
+                    func = root.popup.contentItem.slider.increase
+                else
+                    func = root.popup.contentItem.slider.decrease
+
+                for (let i = 0; i < Math.abs(steps); ++i)
+                    func()
+            }
+
+            Component.onCompleted: {
+                wheelUpDown.connect(wheelToVLC.handle)
+                wheelLeftRight.connect(wheelToVLC.handle)
+            }
+        }
+
         WheelHandler {
-            onWheel: (event) => {
+            orientation: Qt.Vertical | Qt.Horizontal
+
+            onWheel: (wheel) => {
                 if (!root.popup.contentItem || !root.popup.contentItem.slider) {
                     event.accepted = false
                     return
                 }
 
-                let delta = 0
-
-                if (event.angleDelta.x)
-                    delta = event.angleDelta.x
-                else if (event.angleDelta.y)
-                    delta = event.angleDelta.y
-                else {
-                    event.accepted = false
-                    return
+                // NOTE: Uncomment below to support (not only handle) high precision adjustment:
+                // if ((Math.abs(wheel.pixelDelta.x) % 120 > 0) || (Math.abs(wheel.pixelDelta.y) % 120 > 0)) {
+                //     let delta = 0
+                //     if (Math.abs(wheel.pixelDelta.x) > Math.abs(wheel.pixelDelta.y))
+                //         delta = wheel.pixelDelta.x
+                //     else
+                //         delta = wheel.pixelDelta.y
+
+                //     if (wheel.inverted)
+                //         delta = -delta
+
+                //     root.popup.contentItem.slider.value += 0.01 * delta
+                // } else
+                {
+                    wheelToVLC.qmlWheelEvent(wheel)
                 }
 
-                if (event.inverted)
-                    delta = -delta
-
-                event.accepted = true
-
-                delta = delta / 8 / 15
-
-                let func
-                if (delta > 0)
-                    func = root.popup.contentItem.slider.increase
-                else
-                    func = root.popup.contentItem.slider.decrease
-
-                for (let i = 0; i < Math.ceil(Math.abs(delta)); ++i)
-                    func()
+                wheel.accepted = true
             }
         }
 
@@ -103,6 +133,8 @@
 
             enabled: root.popup.contentItem && root.popup.contentItem.slider
 
+            gesturePolicy: TapHandler.ReleaseWithinBounds
+
             onTapped: (eventPoint, button) => {
                 root.popup.contentItem.slider.value = 0
             }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml Changed

@@ -18,8 +18,6 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Templates as T
-import Qt5Compat.GraphicalEffects
-
 
 import VLC.MainInterface
 import VLC.Widgets as Widgets
@@ -111,6 +109,8 @@
 
             property bool _keyPressed: false
 
+            property bool filterEvents: false
+
             color: root.sliderColor
 
             from: 0
@@ -211,7 +211,12 @@
                     return
 
                 if (!volControl._inhibitPlayerVolumeUpdate) {
-                    Qt.callLater(volControl._adjustPlayerVolume)
+                    if (filterEvents) {
+                        Qt.callLater(volControl._adjustPlayerVolume)
+                    } else {
+                        volControl._adjustPlayerVolume()
+                        filterEvents = true
+                    }
                 }
             }
 
@@ -271,6 +276,7 @@
                         return
                     }
 
+                    volControl.filterEvents = false
                     adjustVolume(mouse)
                 }
 
@@ -280,30 +286,20 @@
                 }
 
                 onWheel: (wheel) => {
-                    let delta = 0, fineControl = false
 
                     if ((Math.abs(wheel.pixelDelta.x) % 120 > 0) || (Math.abs(wheel.pixelDelta.y) % 120 > 0)) {
+                        let delta = 0
                         if (Math.abs(wheel.pixelDelta.x) > Math.abs(wheel.pixelDelta.y))
                             delta = wheel.pixelDelta.x
                         else
                             delta = wheel.pixelDelta.y
-                        fineControl = true
-                    }
-                    else if (wheel.angleDelta.x)
-                        delta = wheel.angleDelta.x
-                    else if (wheel.angleDelta.y)
-                        delta = wheel.angleDelta.y
 
-                    if (delta === 0)
-                        return
-
-                    if (wheel.inverted)
-                        delta = -delta
-
-                    if (fineControl)
+                        if (wheel.inverted)
+                            delta = -delta
                         volControl.value += 0.001 * delta
+                    }
                     else
-                        Helpers.applyVolume(Player, delta)
+                        wheelToVLC.qmlWheelEvent(wheel)
 
                     wheel.accepted = true
                 }
@@ -322,6 +318,22 @@
                     else
                         volControl.value = 1.25
                 }
+
+                WheelToVLCConverter {
+                    id: wheelToVLC
+
+                    function handle(steps: int) {
+                        if (steps > 0)
+                            Player.setVolumeUp(steps)
+                        else
+                            Player.setVolumeDown(-steps)
+                    }
+
+                    Component.onCompleted: {
+                        wheelUpDown.connect(wheelToVLC.handle)
+                        wheelLeftRight.connect(wheelToVLC.handle)
+                    }
+                }
             }
         }
     }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/playlist/playlist_controller.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/playlist/playlist_controller.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/playlist/playlist_controller.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/playlist/playlist_controller.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/playlist/playlist_item.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/playlist/playlist_item.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/playlist/playlist_item.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/playlist/playlist_item.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/playlist/playlist_model.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/playlist/playlist_model.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/playlist/playlist_model.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/playlist/playlist_model.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/playlist/qml/PlaylistDelegate.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/playlist/qml/PlaylistDelegate.qml Changed

@@ -22,7 +22,7 @@
 import QtQuick.Layouts
 import QtQml.Models
 
-
+// import VLC.MainInterface // TODO: for vlcTick, not used for now due to Qt 6.2
 import VLC.Widgets as Widgets
 import VLC.Style
 import VLC.Playlist
@@ -48,6 +48,17 @@
                                                       dropAreaLayout.dragPosition.x,
                                                       dropAreaLayout.dragPosition.y)
 
+    // Model roles:
+    required property int index
+    required property bool isCurrent
+    required property url artwork
+    required property url url
+    required property string artist
+    required property string album
+    required property string title
+    required property var duration // TODO: Qt 6.2 can not use value type vlcTick
+    required property bool preparsed
+
     // Optional
     property var contextMenu
 
@@ -75,6 +86,8 @@
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding)
 
+    height: Math.round(implicitHeight)
+
     ListView.delayRemove: dragHandler.active
 
     T.ToolTip.visible: ( visible && (visualFocus || hovered) &&
@@ -120,7 +133,7 @@
             implicitHeight: parent.height * 3 / 4
 
             color: {
-                if (model.isCurrent)
+                if (delegate.isCurrent)
                     return theme.accent
 
                 // based on design, ColorContext can't handle this case
@@ -145,7 +158,7 @@
             Accessible.role: Accessible.Graphic
             Accessible.name: qsTr("Cover")
             Accessible.description: {
-                if (model.isCurrent) {
+                if (delegate.isCurrent) {
                     if (Player.playingState === Player.PLAYING_STATE_PLAYING)
                         return qsTr("Playing")
                     else if (Player.playingState === Player.PLAYING_STATE_PAUSED)
@@ -159,15 +172,26 @@
 
                 anchors.fill: parent
                 fillMode: Image.PreserveAspectFit
-                source: (model?.artwork.toString()) ? VLCAccessImage.uri(model.artwork) : VLCStyle.noArtAlbumCover
+                source: delegate.preparsed ? targetSource : ""
                 visible: !statusIcon.visible
                 asynchronous: true
 
+                readonly property url targetSource: (delegate?.artwork.toString()) ? VLCAccessImage.uri(delegate.artwork) : VLCStyle.noArtAlbumCover
+
                 onStatusChanged: {
                     if (source !== VLCStyle.noArtAlbumCover && status === Image.Error)
                         source = VLCStyle.noArtAlbumCover
                 }
 
+                Timer {
+                    running: (artwork.status === Image.Null)
+                    interval: VLCStyle.duration_long
+                    onTriggered: {
+                        // Remove the preparse guard, enough time has passed:
+                        artwork.source = Qt.binding(() => { return artwork.targetSource; })
+                    }
+                }
+
                 Widgets.DefaultShadow {
                     anchors.centerIn: parent
 
@@ -181,7 +205,7 @@
                 id: statusIcon
 
                 anchors.centerIn: parent
-                visible: (model.isCurrent && text !== "")
+                visible: (delegate.isCurrent && text !== "")
                 color: theme.accent
                 text: {
                     if (Player.playingState === Player.PLAYING_STATE_PLAYING)
@@ -207,8 +231,8 @@
 
                 Layout.fillWidth: true
 
-                font.weight: model.isCurrent ? Font.Bold : Font.DemiBold
-                text: model.title
+                font.weight: delegate.isCurrent ? Font.Bold : Font.DemiBold
+                text: delegate.title || qsTr("Unknown Title")
                 color: theme.fg.primary
             }
 
@@ -217,7 +241,7 @@
 
                 Layout.fillWidth: true
 
-                text: model.artist || qsTr("Unknown Artist")
+                text: delegate.artist || (delegate.title.length === 0 ? delegate.url : "")
                 color: theme.fg.primary
             }
         }
@@ -225,7 +249,7 @@
         Widgets.ListLabel {
             id: textDuration
 
-            text: model.duration.formatHMS()
+            text: delegate.duration.formatHMS()
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             color: theme.fg.primary
@@ -318,5 +342,7 @@
     Widgets.ListViewExt.VerticalDropAreaLayout {
         id: dropAreaLayout
         anchors.fill: parent
+
+        view: delegate.view
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/playlist/qml/PlaylistDetachedWindow.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/playlist/qml/PlaylistDetachedWindow.qml Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/playlist/qml/PlaylistPane.qml Added

@@ -0,0 +1,385 @@
+/*****************************************************************************
+ * Copyright (C) 2019 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.Layouts
+import QtQml.Models
+
+
+import VLC.MainInterface
+import VLC.Widgets as Widgets
+import VLC.Util
+import VLC.Playlist
+import VLC.Style
+
+T.Pane {
+    id: root
+
+    property var model: PlaylistListModel {
+        playlist: MainPlaylistController.playlist
+    }
+    readonly property ListSelectionModel selectionModel: listView?.selectionModel ?? null
+
+    property bool useAcrylic: true
+
+    readonly property real minimumWidth: contentItem.Layout.minimumWidth +
+                                         leftPadding +
+                                         rightPadding +
+                                         2 * (VLCStyle.margin_xsmall)
+
+    readonly property ListView listView: contentItem.listView
+
+    property alias contextMenu: contextMenu
+
+    property alias dragItem: dragItem
+
+    property alias isDropAcceptableFunc: listView.isDropAcceptableFunc
+    property alias acceptDropFunc: listView.acceptDropFunc
+
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding)
+
+    verticalPadding: VLCStyle.margin_normal
+
+    Accessible.name: qsTr("Playqueue")
+
+    readonly property ColorContext colorContext: ColorContext {
+        id: theme
+        colorSet: ColorContext.View
+
+        focused: root.activeFocus
+        hovered: root.hovered
+        enabled: root.enabled
+    }
+
+    Widgets.DragItem {
+        id: dragItem
+
+        onRequestData: (indexes, resolve, reject) => {
+            resolve(indexes.map((index) => {
+                const item = root.model.itemAt(index)
+                return {
+                    "title": item.title,
+                    "cover": (!!item.artwork && item.artwork.toString() !== "") ? item.artwork : VLCStyle.noArtAlbumCover,
+                    "url": item.url
+                }
+            }))
+        }
+
+        onRequestInputItems: (indexes, data, resolve, reject) => {
+            resolve(root.model.getItemsForIndexes(root.selectionModel.selectedIndexesFlat))
+        }
+    }
+
+    PlaylistContextMenu {
+        id: contextMenu
+        model: root.model
+        selectionModel: root.selectionModel
+        controler: MainPlaylistController
+        ctx: MainCtx
+
+        onJumpToCurrentPlaying: listView.positionViewAtIndex( MainPlaylistController.currentIndex, ItemView.Center)
+    }
+
+    background: Widgets.AcrylicBackground {
+        enabled: root.useAcrylic
+        tintColor: theme.bg.primary
+    }
+
+    contentItem: ColumnLayout {
+        spacing: VLCStyle.margin_xxsmall
+
+        Layout.minimumWidth: noContentInfoColumn.implicitWidth
+
+        readonly property ListView listView: listView
+
+        Column {
+            Layout.fillHeight: false
+            Layout.fillWidth: true
+            Layout.leftMargin: VLCStyle.margin_normal
+
+            spacing: VLCStyle.margin_xxxsmall
+
+            Widgets.SubtitleLabel {
+                text: qsTr("Playqueue")
+                color: theme.fg.primary
+                font.weight: Font.Bold
+                font.pixelSize: VLCStyle.dp(24, VLCStyle.scale)
+            }
+
+            Widgets.CaptionLabel {
+                color: theme.fg.secondary
+                visible: model.count !== 0
+                text: qsTr("%1 elements, %2").arg(model.count).arg(model.duration.formatLong())
+            }
+        }
+
+        Item {
+            // Spacer
+
+            implicitHeight: VLCStyle.margin_xsmall
+        }
+
+        RowLayout {
+            visible: model.count !== 0
+
+            Layout.fillHeight: false
+            Layout.leftMargin: VLCStyle.margin_normal
+            Layout.rightMargin: Math.max(listView.ScrollBar.vertical.width, VLCStyle.margin_normal)
+
+            spacing: VLCStyle.margin_large
+
+            Widgets.IconLabel {
+                // playlist cover column
+                Layout.preferredWidth: VLCStyle.icon_playlistArt
+
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                text: VLCIcons.album_cover
+                font.pixelSize: VLCStyle.icon_playlistHeader
+
+                color: theme.fg.secondary
+
+                Accessible.role: Accessible.ColumnHeader
+                Accessible.name: qsTr("Cover")
+                Accessible.ignored: false
+            }
+
+            //Use Text here as we're redefining its Accessible.role
+            Text {
+                Layout.fillWidth: true
+
+                elide: Text.ElideRight
+                font.pixelSize: VLCStyle.fontSize_normal
+                textFormat: Text.PlainText
+
+                verticalAlignment: Text.AlignVCenter
+                text: qsTr("Title")
+                color: theme.fg.secondary
+
+                Accessible.role: Accessible.ColumnHeader
+                Accessible.name: text
+            }
+
+            Widgets.IconLabel {
+                Layout.preferredWidth: durationMetric.width
+
+                text: VLCIcons.time
+                color: theme.fg.secondary
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                font.pixelSize: VLCStyle.icon_playlistHeader
+
+                Accessible.role: Accessible.ColumnHeader
+                Accessible.name: qsTr("Duration")
+                Accessible.ignored: false
+
+                TextMetrics {
+                    id: durationMetric
+
+                    font.weight: Font.DemiBold
+                    font.pixelSize: VLCStyle.fontSize_normal
+                    text: "00:00"
+                }
+            }
+        }
+
+        Widgets.ListViewExt {
+            id: listView
+
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+            focus: true
+
+            clip: true // else out of view items will overlap with surronding items
+
+            model: root.model
+
+            fadingEdge.backgroundColor: (root.background && (root.background.color.a >= 1.0)) ? root.background.color
+                                                                                             : "transparent"
+
+            isDropAcceptableFunc: function(drop, index) {
+                if (drop.source === dragItem)
+                    return Helpers.itemsMovable(selectionModel.sortedSelectedIndexesFlat, index)
+                else if (Helpers.isValidInstanceOf(drop.source, Widgets.DragItem))
+                    return true
+                else if (drop.hasUrls)
+                    return true
+                else
+                    return false
+            }
+
+            acceptDropFunc: function(index, drop) {
+                const item = drop.source;
+
+                // NOTE: Move implementation.
+                if (dragItem === item) {
+                    model.moveItemsPre(root.selectionModel.sortedSelectedIndexesFlat, index);
+                    listView.forceActiveFocus();
+                // NOTE: Dropping medialibrary content into the queue.
+                } else if (Helpers.isValidInstanceOf(item, Widgets.DragItem)) {
+                    return item.getSelectedInputItem().then((inputItems) => {
+                            if (!Helpers.isArray(inputItems) || inputItems.length === 0) {
+                                console.warn("can't convert items to input items");
+                                return
+                            }
+                            MainPlaylistController.insert(index, inputItems, false)
+                        }).then(() => { listView.forceActiveFocus(); })
+                // NOTE: Dropping an external item (i.e. filesystem) into the queue.
+                } else if (drop.hasUrls) {
+                    const urlList = ;
+
+                    for (let url in drop.urls)
+                        urlList.push(drop.urlsurl);
+
+                    MainPlaylistController.insert(index, urlList, false);
+
+                    // NOTE This is required otherwise backend may handle the drop as well yielding double addition.
+                    drop.accept(Qt.IgnoreAction);
+                    listView.forceActiveFocus();
+                }
+
+                return Promise.resolve()
+            }
+
+            property int shiftIndex: -1
+
+            onShowContextMenu: (globalPos) => {
+                contextMenu.popup(-1, globalPos)
+            }
+
+            Connections {
+                target: listView.model
+
+                function onRowsInserted() {
+                    if (listView.currentIndex === -1)
+                        listView.currentIndex = 0
+                }
+
+                function onModelReset() {
+                    if (listView.currentIndex === -1 && root.model.count > 0)
+                        listView.currentIndex = 0
+                }
+            }
+
+            delegate: PlaylistDelegate {
+                id: delegate
+
+                width: listView.contentWidth
+                rightPadding: Math.max(listView.ScrollBar.vertical.width, VLCStyle.margin_normal)
+
+                contextMenu: root.contextMenu
+
+                dragItem: root.dragItem
+
+                isDropAcceptable: listView.isDropAcceptableFunc
+                acceptDrop: listView.acceptDropFunc
+
+                onContainsDragChanged: listView.updateItemContainsDrag(this, containsDrag)
+            }
+
+            Keys.onDeletePressed: model.removeItems(selectionModel.selectedIndexesFlat)
+
+            Navigation.parentItem: root
+
+            onActionAtIndex: (index) => {
+                if (index < 0)
+                    return
+
+                MainPlaylistController.goTo(index, true)
+            }
+
+            Column {
+                id: noContentInfoColumn
+
+                anchors.centerIn: parent
+
+                visible: false
+                enabled: visible
+
+                opacity: (listView.activeFocus) ? 1.0 : 0.4
+
+                Binding on visible {
+                    delayed: true
+                    value: (listView.model.count === 0 && !listView.footerItem.firstItemIndicatorVisible)
+                }
+
+                Widgets.IconLabel {
+                    id: label
+
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                    text: VLCIcons.playlist
+
+                    color: theme.fg.primary
+
+                    font.pixelSize: VLCStyle.dp(48, VLCStyle.scale)
+                }
+
+                T.Label {
+                    anchors.topMargin: VLCStyle.margin_xlarge
+
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                    text: qsTr("No content yet")
+
+                    color: label.color
+
+                    font.pixelSize: VLCStyle.fontSize_xxlarge
+                }
+
+                T.Label {
+                    anchors.topMargin: VLCStyle.margin_normal
+
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                    text: qsTr("Drag & Drop some content here!")
+
+                    color: label.color
+
+                    font.pixelSize: VLCStyle.fontSize_large
+                }
+            }
+        }
+
+        PlaylistToolbar {
+            id: toolbar
+
+            Layout.preferredHeight: VLCStyle.heightBar_normal
+            Layout.fillHeight: false
+            Layout.fillWidth: true
+            Layout.leftMargin: VLCStyle.margin_normal
+            Layout.rightMargin: VLCStyle.margin_normal
+        }
+    }
+
+    Keys.priority: Keys.AfterItem
+    Keys.forwardTo: listView
+    Keys.onPressed: (event) => root.Navigation.defaultKeyAction(event)
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/playlist/qml/PlaylistToolbar.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/playlist/qml/PlaylistToolbar.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/plugins.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/plugins.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/qt.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/qt.cpp Changed

@@ -72,19 +72,21 @@
 #ifdef _WIN32
 # include "maininterface/mainctx_win32.hpp"
 #include "maininterface/win32windoweffects_module.hpp"
+#include "util/csdmenu_win32.h"
 #else
 # include "maininterface/mainctx.hpp"   /* MainCtx creation */
 #endif
 #include "style/defaultthemeproviders.hpp"
 #include "dialogs/extensions/extensions_manager.hpp" /* Extensions manager */
-#include "dialogs/plugins/addons_manager.hpp" /* Addons manager */
 #include "dialogs/help/help.hpp"     /* Launch Update */
 #include "util/dismiss_popup_event_filter.hpp"
 #include "maininterface/compositor.hpp"
 #include "util/vlctick.hpp"
 #include "util/shared_input_item.hpp"
 #include "util/model_recovery_agent.hpp"
+#include "util/vlcqtmessagehandler.hpp"
 #include "network/networkmediamodel.hpp"
+#include "network/devicesourceprovider.hpp"
 #include "playlist/playlist_common.hpp"
 #include "playlist/playlist_item.hpp"
 #include "dialogs/dialogs/dialogmodel.hpp"
@@ -265,6 +267,9 @@
 #define BACKDROP_BLUR_FILTER_LONGTEXT N_( "If backdrop blur filter is available, use translucency in the backgrounds of certain parts of the user interface " \
     "instead of a solid color. This setting impairs readibility of text." )
 
+#define PIP_MODE_TEXT N_( "Enable picture-in-picture (PiP) mode" )
+#define PIP_MODE_LONGTEXT N_( "Picture-in-picture mode allows playing video contained in a smaller area so that the interface remains usable." )
+
 static const int initial_prefs_view_list = { 0, 1, 2 };
 static const char *const initial_prefs_view_list_texts =
     { N_("Simple"), N_("Advanced"), N_("Expert") };
@@ -285,9 +290,7 @@
 static const char *const compositor_vlc = {
     "auto",
 #ifdef _WIN32
-#ifdef HAVE_DCOMP_H
     "dcomp",
-#endif
     "platform",
     "win7",
 #endif
@@ -302,9 +305,7 @@
 static const char *const compositor_user = {
     N_("Automatic"),
 #ifdef _WIN32
-#ifdef HAVE_DCOMP_H
     "Direct Composition",
-#endif
     "Platform Composition",
     "Windows 7",
 #endif
@@ -443,6 +444,8 @@
 
     add_bool( "qt-backdrop-blur", true, BACKDROP_BLUR_FILTER_TEXT, BACKDROP_BLUR_FILTER_LONGTEXT )
 
+    add_bool( "qt-pip-mode", true, PIP_MODE_TEXT, PIP_MODE_LONGTEXT )
+
     add_float_with_range( "qt-safe-area", 0, 0, 100.0, SAFE_AREA_TEXT, SAFE_AREA_LONGTEXT )
 
     cannot_unload_broken_library()
@@ -469,6 +472,11 @@
         set_description( "Provides window effects on Windows." )
         set_capability( "qtwindoweffects", 10 )
         set_callback( QtWin32WindowEffectsOpen )
+    add_submodule ()
+        add_shortcut( "QtWin32CSDMenu" )
+        set_description( "Provides csd menu on Windows." )
+        set_capability( "qtcsdmenu", 10 )
+        set_callback( QtWin32CSDMenuOpen )
 #endif
     add_submodule()
         set_capability("qt theme provider", 1)
@@ -757,36 +765,7 @@
 {
     qt_intf_t *p_intf = (qt_intf_t *)obj;
 
-    {
-        QString filterRules;
-
-        const int verbosity = var_InheritInteger(p_intf, "verbose");
-        if (verbosity < VLC_MSG_DBG)
-        {
-            filterRules += QStringLiteral("*.debug=false\n");
-            if (verbosity < VLC_MSG_WARN)
-            {
-                filterRules += QStringLiteral("*.warning=false\n");
-                if (verbosity < VLC_MSG_ERR)
-                {
-                    filterRules += QStringLiteral("*.critical=false\n");
-                    if (verbosity < VLC_MSG_INFO)
-                    {
-                        filterRules += QStringLiteral("*.info=false\n");
-                    }
-                }
-            }
-        }
-
-        if (var_InheritBool(p_intf, "qt-verbose"))
-        {
-            filterRules += QStringLiteral("*=true\n" /* Qt by default does not enable some info and error messages */
-                                          "qt.*.debug=false\n" /* Qt's own debug messages are way too much verbose */
-                                          "qt.widgets.painting=false\n" /* Not necessary */);
-        }
-
-        QLoggingCategory::setFilterRules(filterRules);
-    }
+    auto vlcQtMessageHandler = VlcQtMessageHandlerRegisterer{VLC_OBJECT(p_intf)};
 
     char vlc_name = "vlc"; /* for WM_CLASS */
     char *argv3 = { nullptr };
@@ -853,8 +832,16 @@
 #endif
     Q_INIT_RESOURCE( shaders );
 
-    Q_INIT_RESOURCE( qmake_Qt5Compat_GraphicalEffects );
-    Q_INIT_RESOURCE( qmake_Qt5Compat_GraphicalEffects_private );
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+    // NOTE:  Qt declarative 6.8.0 initializes scenegraph_shaders,
+    //        but not scenegraph_curve_shaders. Curve shaders
+    //        are used in particular cases even when curve
+    //        rendering is not explicitly enabled, this was
+    //        observed with underlined text on Windows which lead
+    //        access violation in the scene graph thread.
+    Q_INIT_RESOURCE( scenegraph_curve_shaders );
+#endif
+
     Q_INIT_RESOURCE( qmake_QtQml );
 #if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
     Q_INIT_RESOURCE( qmake_QtQml_Base );
@@ -869,6 +856,7 @@
     Q_INIT_RESOURCE( qmake_QtQuick_Controls_Basic_impl );
     Q_INIT_RESOURCE( qmake_QtQuick_Layouts );
     Q_INIT_RESOURCE( qmake_QtQuick_Templates );
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
     // Qt Quick Effects:
     Q_INIT_RESOURCE( qmake_QtQuick_Effects );
     Q_INIT_RESOURCE( effects );
@@ -876,27 +864,23 @@
     Q_INIT_RESOURCE( multieffect_shaders2 );
     Q_INIT_RESOURCE( multieffect_shaders3 );
     Q_INIT_RESOURCE( multieffect_shaders4 );
-    Q_INIT_RESOURCE( multieffect_shaders5 );
     Q_INIT_RESOURCE( multieffect_shaders6 );
-    Q_INIT_RESOURCE( multieffect_shaders7 );
     Q_INIT_RESOURCE( multieffect_shaders8 );
     Q_INIT_RESOURCE( multieffect_shaders9 );
-    Q_INIT_RESOURCE( multieffect_shaders10 );
-    Q_INIT_RESOURCE( multieffect_shaders11 );
     Q_INIT_RESOURCE( multieffect_shaders12 );
-    Q_INIT_RESOURCE( multieffect_shaders13 );
     Q_INIT_RESOURCE( multieffect_shaders14 );
     Q_INIT_RESOURCE( multieffect_shaders15 );
-    Q_INIT_RESOURCE( multieffect_shaders16 );
-    Q_INIT_RESOURCE( multieffect_shaders17 );
     Q_INIT_RESOURCE( multieffect_shaders18 );
-    Q_INIT_RESOURCE( multieffect_shaders19 );
     Q_INIT_RESOURCE( multieffect_shaders20 );
     Q_INIT_RESOURCE( multieffect_shaders21 );
-    Q_INIT_RESOURCE( multieffect_shaders22 );
-    Q_INIT_RESOURCE( multieffect_shaders23 );
     Q_INIT_RESOURCE( multieffect_shaders24 );
-    Q_INIT_RESOURCE( multieffect_shaders25 );
+#else
+    Q_INIT_RESOURCE( qmake_Qt5Compat_GraphicalEffects );
+    Q_INIT_RESOURCE( qmake_Qt5Compat_GraphicalEffects_private );
+    Q_INIT_RESOURCE( qtgraphicaleffectsplugin_raw_qml_0 );
+    Q_INIT_RESOURCE( qtgraphicaleffectsprivate_raw_qml_0 );
+    Q_INIT_RESOURCE( qtgraphicaleffectsshaders );
+#endif
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
     Q_INIT_RESOURCE( QuickControls2Basic_raw_qml_0 );
@@ -906,9 +890,6 @@
     Q_INIT_RESOURCE( qtquickcontrols2basicstyleplugin );
 #endif
 
-    Q_INIT_RESOURCE( qtgraphicaleffectsplugin_raw_qml_0 );
-    Q_INIT_RESOURCE( qtgraphicaleffectsprivate_raw_qml_0 );
-    Q_INIT_RESOURCE( qtgraphicaleffectsshaders );
     // Q_INIT_RESOURCE( qtquickshapes_shaders );
 #endif
 
@@ -928,45 +909,6 @@
     QApplication app( argc, argv );
     app.setProperty("initialStyle", app.style()->objectName());
 
-#if defined(_WIN32)
-    // NOTE: Qt Quick does not have a cross-API RHI fallback procedure (as of Qt 6.7.1).
-    //       We have to manually pick a graphics api here, since the default graphics
-    //       api (Direct3D 11.2) may not be supported.
-
-    if (qEnvironmentVariableIsEmpty("QSG_RHI_BACKEND") &&
-        qEnvironmentVariableIsEmpty("QT_QUICK_BACKEND") &&
-        (QT_VERSION < QT_VERSION_CHECK(6, 4, 0) || !uint(qEnvironmentVariableIntValue("QSG_RHI_PREFER_SOFTWARE_RENDERER"))))
-    {
-        // If OS version is lower than Windows 8.1, and Qt version is lower than
-        // 6.6.0, do not take risk and use OpenGL (since probing is not available).
-        // If OS version is greater than or equal to Windows 8.1, and Qt version is
-        // lower than 6.6.0, take risk and do not use the fallback procedure.
-        // Qt in the contribs is already version 6.7.0, so this should not be a
-        // concern.
-        if ((QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows8_1) ||
-            (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)))
-        {
-            // TODO: Probe D3D12 when it becomes the default.
-            // If probing is not available, use OpenGL as a compromise:
-            QSGRendererInterface::GraphicsApi graphicsApi = QSGRendererInterface::OpenGL;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-            QRhiD3D11InitParams params;
-            if (QRhi::probe(QRhi::D3D11, &params))
-                graphicsApi = QSGRendererInterface::Direct3D11;
-            else
-            {
-                QRhiGles2InitParams params1;
-                params1.fallbackSurface = QRhiGles2InitParams::newFallbackSurface();
-                if (!QRhi::probe(QRhi::OpenGLES2, &params1))
-                    graphicsApi = QSGRendererInterface::Software;
-                delete params1.fallbackSurface;
-            }
-#endif
-            QQuickWindow::setGraphicsApi(graphicsApi);
-        }
-    }
-#endif
-
     {
         // Install custom translator:
         const auto translator = new Translator(&app);
@@ -1003,6 +945,70 @@
 #endif
             QSettings::UserScope, "vlc", "vlc-qt-interface" );
 
+#if defined(_WIN32)
+    // NOTE: Qt Quick does not have a cross-API RHI fallback procedure (as of Qt 6.7.1).
+    //       We have to manually pick a graphics api here, since the default graphics
+    //       api (Direct3D 11.2) may not be supported.
+    static const auto probeRhi = () -> QSGRendererInterface::GraphicsApi {
+        QSGRendererInterface::GraphicsApi graphicsApi = QSGRendererInterface::OpenGL;
+        // TODO: Probe D3D12 when it becomes the default.
+        QRhiD3D11InitParams params;
+        if (QRhi::probe(QRhi::D3D11, &params))
+            graphicsApi = QSGRendererInterface::Direct3D11;
+        else
+        {
+            QRhiGles2InitParams params1;
+            params1.fallbackSurface = QRhiGles2InitParams::newFallbackSurface();
+            if (!QRhi::probe(QRhi::OpenGLES2, &params1))
+                graphicsApi = QSGRendererInterface::Software;
+            delete params1.fallbackSurface;
+        }
+        return graphicsApi;
+    };
+
+    static const char* const asyncRhiProbeCompletedProperty = "asyncRhiProbeCompleted";
+    if (qEnvironmentVariableIsEmpty("QSG_RHI_BACKEND") &&
+        qEnvironmentVariableIsEmpty("QT_QUICK_BACKEND") &&
+        (QT_VERSION < QT_VERSION_CHECK(6, 4, 0) || !uint(qEnvironmentVariableIntValue("QSG_RHI_PREFER_SOFTWARE_RENDERER"))))
+    {
+        static const char* const graphicsApiKey = "graphics-api";
+        const QVariant graphicsApiValue = p_intf->mainSettings->value(graphicsApiKey);
+        // settings value can be string (ini file), do not use `typeId()`:
+        if (graphicsApiValue.isValid() && Q_LIKELY(graphicsApiValue.canConvert<int>()))
+        {
+            // A cached (by then) valid graphics api is found, use it:
+            QQuickWindow::setGraphicsApi(static_cast<QSGRendererInterface::GraphicsApi>(graphicsApiValue.value<int>()));
+            // Asynchronous re-probe to see if the cached graphics api is still applicable.
+            // If not, QQuickWindow is going to emit scene graph error, and the application is
+            // likely going to terminate. However, when the user starts the application again
+            // there will not be an error thanks to this. We can not prevent the error, as
+            // it is decided to not make compositor initializaation wait to not reduce the startup
+            // speed. Startup time is defined as the time it takes to start playing the initial
+            // item. Currently the player waits for the interface, and QQuickWindow initialization
+            // is therefore not enforced to be synchronous (`QWindow::setVisible(true)` which
+            // initializes the scene graph thus rhi is asynchronous).
+            QMetaObject::invokeMethod(&app, &app, settings = QPointer(p_intf->mainSettings)() {
+                // We can not use `QQuickWindow::setGraphicsApi()` here, as QQuickWindow
+                // may have already tried to initialize the scene graph hence rhi. If the
+                // cached graphics api is not optimal or not available anymore, the next
+                // startup will use the refreshed value. That's the best we can do here
+                // without forcing QQuickWindow to wait (hence delaying startup).
+                assert(settings);
+                settings->setValue(graphicsApiKey, static_cast<int>(probeRhi()));
+                settings->sync();
+                app.setProperty(asyncRhiProbeCompletedProperty, true);
+            }, Qt::QueuedConnection); // Asynchronous, so probing here does not cause start-up slowdown.
+        }
+        else
+        {
+            const QSGRendererInterface::GraphicsApi graphicsApi = probeRhi();
+            QQuickWindow::setGraphicsApi(graphicsApi);
+            p_intf->mainSettings->setValue(graphicsApiKey, static_cast<int>(graphicsApi));
+            p_intf->mainSettings->sync();
+        }
+    }
+#endif
+
     app.setApplicationDisplayName( qtr("VLC media player") );
 
     if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) )
@@ -1038,12 +1044,38 @@
 
     if( !p_intf->b_isDialogProvider )
     {
+        static const auto gracefulExitHandler = &app, mainCtx = QPointer(p_intf->p_mi), settings = QPointer(p_intf->mainSettings)(QQuickWindow *window) {
+            // Graceful exit on error, as if this signal is not connected
+            // Qt uses `qFatal()`. With `MainCtx::askToQuit()`, the event loop
+            // would be cleared first:
+            assert(window);
+            QObject::connect(window,
+                             &QQuickWindow::sceneGraphError,
+                             &app,
+                             &app, mainCtx, settings(QQuickWindow::SceneGraphError error, const QString &message) {
+                                 qWarning() << "Compositor: Scene Graph Error: " << error << ", Message: " << message;
+                                 assert(mainCtx);
+#ifdef _WIN32
+                                // This is not really important, as with graceful exit the events in the queue should
+                                // be cleared first. This means that in the worst case the application should wait
+                                // until asynchronous probing is completed before exiting.
+                                 if (!app.property(asyncRhiProbeCompletedProperty).toBool())
+                                 {
+                                     assert(settings);
+                                     settings->remove(asyncRhiProbeCompletedProperty);
+                                     settings->sync();
+                                 }
+#endif
+                                 mainCtx->askToQuit();
+                             });
+        };
+
         bool ret = false;
         do {
             p_intf->p_compositor.reset(compositorFactory.createCompositor());
             if (! p_intf->p_compositor)
                 break;
-            ret = p_intf->p_compositor->makeMainInterface(p_intf->p_mi);
+            ret = p_intf->p_compositor->makeMainInterface(p_intf->p_mi, gracefulExitHandler);
             if (!ret)
             {
                 p_intf->p_compositor->destroyMainInterface();
@@ -1136,7 +1168,6 @@
 
     /* */
     ExtensionsManager::killInstance();
-    AddonsManager::killInstance();
 
     /* Destroy all remaining windows,
        because some are connected to some slots
@@ -1146,6 +1177,7 @@
     DialogsProvider::killInstance();
     VLCDialogModel::killInstance();
     DialogErrorModel::killInstance();
+    MediaSourceCache::killInstance();
 
     //destroy MainCtx, Compositor shouldn't not use MainCtx after `unloadGUI`
     if (p_intf->p_mi) {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/qt.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/qt.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/qt6.pro -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/qt6.pro Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/qtest.pro Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/scripts/static_dirs.py Added

@@ -0,0 +1,118 @@
+#!/usr/bin/env python3
+
+# SPDX-License-Identifier: ISC
+# Copyright © 2025 VideoLabs, VLC authors and VideoLAN
+#
+# Authors: Steve Lhomme <robux4@videolabs.io>
+
+import argparse
+import os
+import pathlib
+import re
+import subprocess
+import sys
+
+def call_qmake(qmake:str, qtconf, builddir, pro, debug:bool) -> str:
+    if builddir and builddir != '' and not os.path.exists(builddir):
+        os.makedirs(builddir)
+    qmake_cmd =  qmake 
+    if debug:
+        qmake_cmd += 'CONFIG+=debug'
+    if qtconf and qtconf != '':
+        qmake_cmd +=  '-qtconf', qtconf 
+    qmake_cmd += pro, '-o', '-' 
+    call = subprocess.Popen(qmake_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=builddir)
+    stdout_bin, stderr_bin = call.communicate()
+    errcode = call.wait()
+
+    if errcode != 0:
+        sys.stderr.write(stderr_bin.decode('utf-8'))
+        sys.exit(errcode)
+
+    return stdout_bin.decode('utf-8')
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="This program provides the list of directories/defines to use with Qt static"
+    )
+    parser.add_argument("--qmake",
+                        type=pathlib.Path, required=True,
+                        help="native qmake path")
+    parser.add_argument("--qtconf",
+                        type=str, required=False,
+                        help="qmake qtconf path")
+    parser.add_argument("--pro",
+                        type=pathlib.Path, required=True,
+                        help=".pro file to use as base")
+    parser.add_argument("--builddir",
+                        type=str, required=True,
+                        help="build directory path")
+
+    parser.add_argument("--cflags",
+                        required=False, action='store_true',
+                        help="get the list of compiler flags")
+    parser.add_argument("--libs",
+                        required=False, action='store_true',
+                        help="get the list of libraries")
+    parser.add_argument("--ldflags",
+                        required=False, action='store_true',
+                        help="get the list of linker flags")
+    parser.add_argument("--debug",
+                        required=False, action='store_true',
+                        help="debug mode")
+    args = parser.parse_args()
+
+    result = ''
+    sources =  os.path.join(args.builddir, '.qmake.stash') 
+    in_sources = False
+    makefile = call_qmake(args.qmake, args.qtconf, args.builddir, args.pro, args.debug)
+    for line in makefile.splitlines():
+        if in_sources:
+            l = line.strip()
+            in_sources = l.endswith('\\')
+            if in_sources:
+                l = l:-1.strip()
+            sources += l.split(' ')
+        elif line.startswith('SOURCES '):
+            l = re.sub(r'SOURCES\W+=', ' ', line).strip()
+            in_sources = l.endswith(' \\')
+            if in_sources:
+                l = l:-1.strip()
+            sources += l.split(' ')
+        elif line.startswith('DEFINES '):
+            if args.cflags:
+                l = re.sub(r'DEFINES\W+=', ' ', line)
+                for i in l.strip().split(' '):
+                    result += ' ' + i
+        elif line.startswith('INCPATH '):
+            if args.cflags:
+                l = re.sub(r'INCPATH\W+=', ' ', line)
+                for i in l.strip().split(' '):
+                    result += ' ' + i
+        elif line.startswith('LFLAGS '):
+            if args.ldflags:
+                l = re.sub(r'LFLAGS\W+=', ' ', line)
+                for i in l.strip().split(' '):
+                    result += ' ' + i
+        elif line.startswith('LIBS '):
+            if args.libs:
+                l = re.sub(r'LIBS\W+=', ' ', line).split(' ')
+                for lib in l:
+                    if lib == '':
+                        continue
+                    if lib.startswith('-l'):
+                        result += ' ' + lib
+                    elif lib.endswith('.so') or lib.endswith('.a'):
+                        libname = os.path.splitext(os.path.basename(lib))0
+                        if libname.startswith('lib'):
+                            libdir = os.path.dirname(lib)
+                            result += ' -L' + libdir
+                            result += ' -l' + libname3:
+                    else:
+                        result += ' ' + lib
+
+    for generated in sources:
+        if os.path.exists(generated):
+            os.remove(generated)
+
+    sys.stdout.write(result)

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/Common.glsl Added

@@ -0,0 +1,108 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Graphical Effects module.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//blending formulas are taken from Qt's Blend.qml implementation
+
+#define DITHERING_CUTOFF 0.01
+#define DITHERING_STRENGTH 0.01
+
+vec4 fromPremult(vec4 color) {
+    vec4 result = vec4(0.0);
+    result.rgb = color.rgb / max(1.0/256.0, color.a);
+    result.a = color.a;
+    return result;
+}
+
+vec4 toPremult(vec4 color) {
+    vec4 result = vec4(0.0);
+    result.rbg = color.rbg * color.a;
+    result.a = color.a;
+    return result;
+}
+
+vec4 screen(vec4 color1, vec4 color2) {
+    vec4 result = vec4(0.0);
+    float a = max(color1.a, color1.a * color2.a);
+
+    result.rgb = 1.0 - (vec3(1.0) - color1.rgb) * (vec3(1.0) - color2.rgb);
+
+    result.rgb = mix(color1.rgb, result.rgb, color2.a);
+    result.a = max(color1.a, color1.a * color2.a);
+    return result;
+}
+
+vec4 multiply(vec4 color1, vec4 color2) {
+    vec4 result = vec4(0.0);
+
+    result.rgb = color1.rgb * color2.rgb;
+
+    result.rgb = mix(color1.rgb, result.rgb, color2.a);
+    result.a = max(color1.a, color1.a * color2.a);
+    return result;
+}
+
+vec4 normal(vec4 color1, vec4 color2) {
+    vec4 result = vec4(0.0);
+    result.rgb = mix(color1.rgb, color2.rgb, color2.a);
+    result.a = max(color1.a, color2.a);
+    return result;
+}
+
+float rand(vec2 co){
+    return fract(sin(dot(co.xy, vec2(12.9898, 78.233))) * 43758.5453);
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/DitheredTexture.frag Added

@@ -0,0 +1,55 @@
+#version 440
+
+// TODO: Dithering is not necessary with light colors. It is pretty much
+//       necessary with dark colors due to premultiplied alpha to prevent
+//       color banding. So, this should ideally be used only when the
+//       background color is dark. When the build system starts supporting
+//       defines to feed qsb, we can have the non-dithering version as well.
+#define DITHERING
+
+/*****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#extension GL_GOOGLE_include_directive : enable
+
+#include "Common.glsl"
+
+layout(location = 0) in vec2 qt_TexCoord0;
+
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
+layout(std140, binding = 0) uniform buf {
+  mat4 qt_Matrix;
+  float qt_Opacity;
+};
+
+
+void main()
+{
+    vec4 texel = texture(source, qt_TexCoord0);
+
+    fragColor = texel * qt_Opacity;
+
+#ifdef DITHERING
+    float r = rand(qt_TexCoord0) - 0.5;
+    vec4 noise = vec4(r,r,r,r) * DITHERING_STRENGTH;
+    fragColor += noise * step(DITHERING_CUTOFF, fragColor.a); // additive
+#endif
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/shaders/FadingEdge.frag -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/FadingEdge.frag Changed

@@ -1,5 +1,12 @@
 #version 440
 
+// TODO: Dithering is not necessary with light colors. It is pretty much
+//       necessary with dark colors due to premultiplied alpha to prevent
+//       color banding. So, this should ideally be used only when the
+//       background color is dark. When the build system starts supporting
+//       defines to feed qsb, we can have the non-dithering version as well.
+#define DITHERING
+
 /*****************************************************************************
  * Copyright (C) 2024 VLC authors and VideoLAN
  *
@@ -18,6 +25,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#extension GL_GOOGLE_include_directive : enable
+
+#include "Common.glsl"
+
 layout(location = 0) in vec2 coord;
 layout(location = 0) out vec4 fragColor;
 layout(std140, binding = 0) uniform buf {
@@ -30,7 +41,7 @@
 layout(location = 1) in float pos;
 
 void main() {
-  lowp vec4 texel = texture(source, coord);
+  vec4 texel = texture(source, coord);
 
   // Note that the whole texel is multiplied instead
   // of only the alpha component because it must be
@@ -40,4 +51,12 @@
 
   // We still need to respect the accumulated scene graph opacity:
   fragColor = texel * qt_Opacity;
+
+#ifdef DITHERING
+  float r = rand(coord) - 0.5;
+  vec4 noise = vec4(r,r,r,r) * DITHERING_STRENGTH;
+  vec4 beginningNoise = noise * (1.0 - step(beginningFadeSize, pos));
+  vec4 endNoise = noise * step(endFadePos, pos);
+  fragColor += (beginningNoise + endNoise) * step(DITHERING_CUTOFF, fragColor.a); // additive
+#endif
 }

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/HollowRectangularGlow.frag Added

@@ -0,0 +1,58 @@
+#version 440
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ * Copyright (C) 2022 The Qt Company Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform buf {
+    // qt_Matrix and qt_Opacity must always be both present
+    // if the built-in vertex shader is used.
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    vec4 color;
+    float relativeSizeX;
+    float relativeSizeY;
+    float spread;
+    float width;
+    float height;
+    float cornerRadius;
+    float inverseSpread;
+};
+
+float linearstep(float e0, float e1, float x)
+{
+    return clamp((x - e0) / (e1 - e0), 0.0, 1.0);
+}
+
+void main()
+{
+    // discard inner rectangle:
+    float radius = ((relativeSizeX * width - cornerRadius * 2.0) / (inverseSpread * inverseSpread)) + cornerRadius;
+    if ((qt_TexCoord0.x >= (radius / width) && qt_TexCoord0.x <= (1.0 - (radius / width))) &&
+        (qt_TexCoord0.y >= (radius / height) && qt_TexCoord0.y <= (1.0 - (radius / height))))
+        discard;
+
+    float alpha =
+        smoothstep(0.0, relativeSizeX, 0.5 - abs(0.5 - qt_TexCoord0.x)) *
+        smoothstep(0.0, relativeSizeY, 0.5 - abs(0.5 - qt_TexCoord0.y));
+
+    float spreadMultiplier = linearstep(spread, 1.0 - spread, alpha);
+    fragColor = color * qt_Opacity * spreadMultiplier * alpha;
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/Noise.frag Added

@@ -0,0 +1,46 @@
+#version 440
+
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#extension GL_GOOGLE_include_directive : enable
+
+#include "Common.glsl"
+
+layout(location = 0) in vec2 qt_TexCoord0;
+
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform buf {
+  mat4 qt_Matrix;
+  float qt_Opacity;
+  float strength;
+};
+
+void main() {
+   float r = rand(qt_TexCoord0) - 0.5;
+   vec4 noise = vec4(r,r,r,1.0) * strength;
+   fragColor = noise * qt_Opacity;
+   // Noise should use additive blending (S + D) instead of the default source-over
+   // blending (S + D * (1 - S.a)). For that, set alpha to 0:
+   // Since it is premultiplied, alpha is already factored in the other channels
+   // and should be still respected. "If blending is enabled, source-over blending
+   // is used. However, additive blending can be achieved by outputting zero in the
+   // alpha channel."
+   fragColor.a = 0.0;
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/shaders/PlayerBlurredBackground.frag -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/PlayerBlurredBackground.frag Changed

@@ -57,7 +57,9 @@
 **
 ****************************************************************************/
 
-//blending formulas are taken from Qt's Blend.qml implementation
+#extension GL_GOOGLE_include_directive : enable
+
+#include "Common.glsl"
 
 layout(location = 0) in vec2 qt_TexCoord0;
 layout(location = 0) out vec4 fragColor;
@@ -69,48 +71,6 @@
 };
 layout(binding = 1) uniform sampler2D backgroundSource;
 
-lowp vec4 fromPremult(lowp vec4 color) {
-    lowp vec4 result = vec4(0.0);
-    result.rgb = color.rgb / max(1.0/256.0, color.a);
-    result.a = color.a;
-    return result;
-}
-
-lowp vec4 toPremult(lowp vec4 color) {
-    lowp vec4 result = vec4(0.0);
-    result.rbg = color.rbg * color.a;
-    result.a = color.a;
-    return result;
-}
-
-lowp vec4 screen(lowp vec4 color1, lowp vec4 color2) {
-    lowp vec4 result = vec4(0.0);
-    highp float a = max(color1.a, color1.a * color2.a);
-
-    result.rgb = 1.0 - (vec3(1.0) - color1.rgb) * (vec3(1.0) - color2.rgb);
-
-    result.rgb = mix(color1.rgb, result.rgb, color2.a);
-    result.a = max(color1.a, color1.a * color2.a);
-    return result;
-}
-
-lowp vec4 multiply(lowp vec4 color1, lowp vec4 color2) {
-    lowp vec4 result = vec4(0.0);
-
-    result.rgb = color1.rgb * color2.rgb;
-
-    result.rgb = mix(color1.rgb, result.rgb, color2.a);
-    result.a = max(color1.a, color1.a * color2.a);
-    return result;
-}
-
-lowp vec4 normal(lowp vec4 color1, lowp vec4 color2) {
-    lowp vec4 result = vec4(0.0);
-    result.rgb = mix(color1.rgb, color2.rgb, color2.a);
-    result.a = max(color1.a, color2.a);
-    return result;
-}
-
 void main() {
     lowp vec4 result = vec4(0.0);
     lowp vec4 colorP = fromPremult(texture(backgroundSource, qt_TexCoord0));

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/RectangularGlow.frag Added

@@ -0,0 +1,47 @@
+#version 440
+/*****************************************************************************
+ * Copyright (C) 2022 The Qt Company Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform buf {
+    // qt_Matrix and qt_Opacity must always be both present
+    // if the built-in vertex shader is used.
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    vec4 color;
+    float relativeSizeX;
+    float relativeSizeY;
+    float spread;
+};
+
+float linearstep(float e0, float e1, float x)
+{
+    return clamp((x - e0) / (e1 - e0), 0.0, 1.0);
+}
+
+void main()
+{
+    float alpha =
+        smoothstep(0.0, relativeSizeX, 0.5 - abs(0.5 - qt_TexCoord0.x)) *
+        smoothstep(0.0, relativeSizeY, 0.5 - abs(0.5 - qt_TexCoord0.y));
+
+    float spreadMultiplier = linearstep(spread, 1.0 - spread, alpha);
+    fragColor = color * qt_Opacity * spreadMultiplier * spreadMultiplier;
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/SDFAARoundedTexture.frag Added

@@ -0,0 +1,165 @@
+#version 440
+
+#define ANTIALIASING
+#define BACKGROUND_SUPPORT
+#define CUSTOM_SOFTEDGE
+
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Copyright (C) 2015 Inigo Quilez
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the “Software”), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *****************************************************************************/
+
+layout(location = 0) in vec2 qt_TexCoord0;
+
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    vec4 qt_SubRect_source;
+    vec2 size;
+#ifdef CROP_SUPPORT
+    vec2 cropRate;
+#endif
+#ifdef BACKGROUND_SUPPORT
+    vec4 backgroundColor;
+#endif
+#ifdef BORDER_SUPPORT
+    vec4 borderColor;
+    float borderRange;
+#endif
+    float radiusTopRight;
+    float radiusBottomRight;
+    float radiusTopLeft;
+    float radiusBottomLeft;
+#ifdef CUSTOM_SOFTEDGE
+    float softEdgeMin;
+    float softEdgeMax;
+#endif
+};
+
+layout(binding = 1) uniform sampler2D source;
+
+// Signed distance function by Inigo Quilez (https://iquilezles.org/articles/distfunctions2d)
+// b.x = width
+// b.y = height
+// r.x = roundness top-right
+// r.y = roundness boottom-right
+// r.z = roundness top-left
+// r.w = roundness bottom-left
+float sdRoundBox( in vec2 p, in vec2 b, in vec4 r )
+{
+    r.xy = (p.x>0.0)?r.xy : r.zw;
+    r.x  = (p.y>0.0)?r.x  : r.y;
+    vec2 q = abs(p)-b+r.x;
+    return min(max(q.x,q.y),0.0) + length(max(q,0.0)) - r.x;
+}
+
+void main()
+{
+    // The signed distance function works when the primitive is centered.
+    // If the texture is in the atlas, this condition is not satisfied.
+    // Therefore, we have to normalize the coordinate for the distance
+    // function to 0, 1:
+    vec2 normalCoord = vec2(1.0, 1.0) / (qt_SubRect_source.zw) * (qt_TexCoord0 - (qt_SubRect_source.zw + qt_SubRect_source.xy)) + vec2(1.0, 1.0);
+
+    vec2 p = (size.xy * ((2.0 * normalCoord) - 1)) / size.y;
+    // Signed distance:
+    float dist = sdRoundBox(p, vec2(size.x / size.y, 1.0), vec4(radiusTopRight, radiusBottomRight, radiusTopLeft, radiusBottomLeft));
+
+#ifdef CROP_SUPPORT
+    vec2 texCoord;
+
+    // if (cropRate.x > 0.0)
+    {
+        float normalCropRate = qt_SubRect_source.z * cropRate.x;
+
+        float k = qt_SubRect_source.z + qt_SubRect_source.x - normalCropRate;
+        float l = qt_SubRect_source.x + normalCropRate;
+
+        texCoord.x = (k - l) / (qt_SubRect_source.z) * (qt_TexCoord0.x - qt_SubRect_source.x) + l;
+    }
+    // else { texCoord.x = qt_TexCoord0.x; }
+
+    // if (cropRate.y > 0.0)
+    {
+        float normalCropRate = qt_SubRect_source.w * cropRate.y;
+
+        float k = qt_SubRect_source.w + qt_SubRect_source.y - normalCropRate;
+        float l = qt_SubRect_source.y + normalCropRate;
+
+        texCoord.y = (k - l) / (qt_SubRect_source.w) * (qt_TexCoord0.y - qt_SubRect_source.y) + l;
+    }
+    // else { texCoord.y = qt_TexCoord0.y; }
+
+    vec4 texel = texture(source, texCoord);
+#else
+    vec4 texel = texture(source, qt_TexCoord0);
+#endif
+
+#ifdef BACKGROUND_SUPPORT
+    // Source over blending (S + D * (1 - S.a)):
+    texel = texel + backgroundColor * (1.0 - texel.a);
+#endif
+
+#ifdef BORDER_SUPPORT
+    if (borderRange > 0.0)
+    {
+        // Solid border:
+        float borderStep = step(-borderRange, dist);
+        vec4 border = borderStep * borderColor;
+#ifdef ANTIALIASING
+        // Inner AA (Outer AA is handled below, regardless of the border):
+        // This is additive, solid and AA part do not intersect:
+        border += (smoothstep(-borderRange - fwidth(dist) * 1.5, -borderRange, dist)) * (1.0 - borderStep) * borderColor;
+#endif
+        // Source over blending (S + D * (1 - S.a)):
+        texel = border + texel * (1.0 - border.a);
+    }
+#endif
+
+#ifdef ANTIALIASING
+#ifndef CUSTOM_SOFTEDGE
+    float softEdgeMax = fwidth(dist) * 0.75;
+    float softEdgeMin = -softEdgeMax;
+#endif
+    // Breathing room (shrink):
+    dist += softEdgeMax;
+
+    // Soften the outline, as recommended by the Valve paper, using smoothstep:
+    // "Improved Alpha-Tested Magnification for Vector Textures and Special Effects"
+    // NOTE: The whole texel is multiplied, because of premultiplied alpha.
+    float factor = smoothstep(softEdgeMin, softEdgeMax, dist);
+#else
+    float factor = step(0.0, dist);
+#endif
+    texel *= 1.0 - factor;
+
+    fragColor = texel * qt_Opacity;
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/SDFAARoundedTexture_cropsupport_bordersupport.frag Added

@@ -0,0 +1,178 @@
+#version 440
+
+// TODO: Build system support for preprocessor defines, like CMake's `qt6_add_shaders()`.
+// NOTE: Currently the build system does not support defines for the shaders,
+//       So, the following is imported manually from SDFAARoundedTexture.frag.
+// FIXME: Remove this file when build system starts supporting defines for the
+//        shaders.
+
+#define CROP_SUPPORT
+#define BORDER_SUPPORT
+
+// WARNING: The contents of this file must be in sync with SDFAARoundedTexture.frag
+//          for maintenance purposes. IF YOU EDIT THIS FILE, MAKE SURE TO DO THE
+//          SAME IN SDFAARoundedTexture.frag.
+
+#define ANTIALIASING
+#define BACKGROUND_SUPPORT
+#define CUSTOM_SOFTEDGE
+
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Copyright (C) 2015 Inigo Quilez
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the “Software”), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *****************************************************************************/
+
+layout(location = 0) in vec2 qt_TexCoord0;
+
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    vec4 qt_SubRect_source;
+    vec2 size;
+#ifdef CROP_SUPPORT
+    vec2 cropRate;
+#endif
+#ifdef BACKGROUND_SUPPORT
+    vec4 backgroundColor;
+#endif
+#ifdef BORDER_SUPPORT
+    vec4 borderColor;
+    float borderRange;
+#endif
+    float radiusTopRight;
+    float radiusBottomRight;
+    float radiusTopLeft;
+    float radiusBottomLeft;
+#ifdef CUSTOM_SOFTEDGE
+    float softEdgeMin;
+    float softEdgeMax;
+#endif
+};
+
+layout(binding = 1) uniform sampler2D source;
+
+// Signed distance function by Inigo Quilez (https://iquilezles.org/articles/distfunctions2d)
+// b.x = width
+// b.y = height
+// r.x = roundness top-right
+// r.y = roundness boottom-right
+// r.z = roundness top-left
+// r.w = roundness bottom-left
+float sdRoundBox( in vec2 p, in vec2 b, in vec4 r )
+{
+    r.xy = (p.x>0.0)?r.xy : r.zw;
+    r.x  = (p.y>0.0)?r.x  : r.y;
+    vec2 q = abs(p)-b+r.x;
+    return min(max(q.x,q.y),0.0) + length(max(q,0.0)) - r.x;
+}
+
+void main()
+{
+    // The signed distance function works when the primitive is centered.
+    // If the texture is in the atlas, this condition is not satisfied.
+    // Therefore, we have to normalize the coordinate for the distance
+    // function to 0, 1:
+    vec2 normalCoord = vec2(1.0, 1.0) / (qt_SubRect_source.zw) * (qt_TexCoord0 - (qt_SubRect_source.zw + qt_SubRect_source.xy)) + vec2(1.0, 1.0);
+
+    vec2 p = (size.xy * ((2.0 * normalCoord) - 1)) / size.y;
+    // Signed distance:
+    float dist = sdRoundBox(p, vec2(size.x / size.y, 1.0), vec4(radiusTopRight, radiusBottomRight, radiusTopLeft, radiusBottomLeft));
+
+#ifdef CROP_SUPPORT
+    vec2 texCoord;
+
+    // if (cropRate.x > 0.0)
+    {
+        float normalCropRate = qt_SubRect_source.z * cropRate.x;
+
+        float k = qt_SubRect_source.z + qt_SubRect_source.x - normalCropRate;
+        float l = qt_SubRect_source.x + normalCropRate;
+
+        texCoord.x = (k - l) / (qt_SubRect_source.z) * (qt_TexCoord0.x - qt_SubRect_source.x) + l;
+    }
+    // else { texCoord.x = qt_TexCoord0.x; }
+
+    // if (cropRate.y > 0.0)
+    {
+        float normalCropRate = qt_SubRect_source.w * cropRate.y;
+
+        float k = qt_SubRect_source.w + qt_SubRect_source.y - normalCropRate;
+        float l = qt_SubRect_source.y + normalCropRate;
+
+        texCoord.y = (k - l) / (qt_SubRect_source.w) * (qt_TexCoord0.y - qt_SubRect_source.y) + l;
+    }
+    // else { texCoord.y = qt_TexCoord0.y; }
+
+    vec4 texel = texture(source, texCoord);
+#else
+    vec4 texel = texture(source, qt_TexCoord0);
+#endif
+
+#ifdef BACKGROUND_SUPPORT
+    // Source over blending (S + D * (1 - S.a)):
+    texel = texel + backgroundColor * (1.0 - texel.a);
+#endif
+
+#ifdef BORDER_SUPPORT
+    if (borderRange > 0.0)
+    {
+        // Solid border:
+        float borderStep = step(-borderRange, dist);
+        vec4 border = borderStep * borderColor;
+#ifdef ANTIALIASING
+        // Inner AA (Outer AA is handled below, regardless of the border):
+        // This is additive, solid and AA part do not intersect:
+        border += (smoothstep(-borderRange - fwidth(dist) * 1.5, -borderRange, dist)) * (1.0 - borderStep) * borderColor;
+#endif
+        // Source over blending (S + D * (1 - S.a)):
+        texel = border + texel * (1.0 - border.a);
+    }
+#endif
+
+#ifdef ANTIALIASING
+#ifndef CUSTOM_SOFTEDGE
+    float softEdgeMax = fwidth(dist) * 0.75;
+    float softEdgeMin = -softEdgeMax;
+#endif
+    // Breathing room (shrink):
+    dist += softEdgeMax;
+
+    // Soften the outline, as recommended by the Valve paper, using smoothstep:
+    // "Improved Alpha-Tested Magnification for Vector Textures and Special Effects"
+    // NOTE: The whole texel is multiplied, because of premultiplied alpha.
+    float factor = smoothstep(softEdgeMin, softEdgeMax, dist);
+#else
+    float factor = step(0.0, dist);
+#endif
+    texel *= 1.0 - factor;
+
+    fragColor = texel * qt_Opacity;
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/shaders/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/meson.build Changed

@@ -10,16 +10,21 @@
     'FadingEdge.frag',
     'FadingEdgeX.vert',
     'FadingEdgeY.vert',
-    'FrostedGlass.frag',
+    'Noise.frag',
     'RectFilter.frag',
     'SubTexture.vert',
-    'PlayerBlurredBackground.frag'
+    'PlayerBlurredBackground.frag',
+    'HollowRectangularGlow.frag',
+    'RectangularGlow.frag',
+    'SDFAARoundedTexture.frag',
+    'SDFAARoundedTexture_cropsupport_bordersupport.frag',
+    'DitheredTexture.frag'
 
 
 shader_files = files(shader_sources)
 
-qt_bin_directory = qt6_dep.get_variable(pkgconfig: 'bindir', configtool: '-query QT_HOST_BINS')
-qsb = find_program(qt_bin_directory + '/qsb', required: true)
+qt_bin_directory = qt6_dep.get_variable(pkgconfig: 'bindir', configtool: 'QT_HOST_BINS')
+qsb = find_program('qsb', dirs: qt_bin_directory, required: true)
 
 qsb_params = '--glsl=100 es,120,150', '--batchable', '-O'
 if host_system == 'windows'
@@ -33,6 +38,7 @@
     shader_target_name = shader + '.qsb'
 
     target = custom_target(shader_target_name,
+      depend_files: 'Common.glsl',
       input: shader,
       output: shader_target_name,
       command: qsb, qsb_params, '--output', '@OUTPUT@', '@INPUT@'

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/shaders/shaders.qrc -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/shaders/shaders.qrc Changed

@@ -4,9 +4,14 @@
         <file alias="FadingEdge.frag.qsb">FadingEdge.frag.qsb</file>
         <file alias="FadingEdgeX.vert.qsb">FadingEdgeX.vert.qsb</file>
         <file alias="FadingEdgeY.vert.qsb">FadingEdgeY.vert.qsb</file>
-        <file alias="FrostedGlass.frag.qsb">FrostedGlass.frag.qsb</file>
+        <file alias="Noise.frag.qsb">Noise.frag.qsb</file>
         <file alias="RectFilter.frag.qsb">RectFilter.frag.qsb</file>
         <file alias="SubTexture.vert.qsb">SubTexture.vert.qsb</file>
         <file alias="PlayerBlurredBackground.frag.qsb">PlayerBlurredBackground.frag.qsb</file>
+        <file alias="HollowRectangularGlow.frag.qsb">HollowRectangularGlow.frag.qsb</file>
+        <file alias="RectangularGlow.frag.qsb">RectangularGlow.frag.qsb</file>
+        <file alias="SDFAARoundedTexture.frag.qsb">SDFAARoundedTexture.frag.qsb</file>
+        <file alias="SDFAARoundedTexture_cropsupport_bordersupport.frag.qsb">SDFAARoundedTexture_cropsupport_bordersupport.frag.qsb</file>
+        <file alias="DitheredTexture.frag.qsb">DitheredTexture.frag.qsb</file>
     </qresource>
 </RCC>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/style/VLCStyle.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/style/VLCStyle.qml Changed

@@ -20,6 +20,7 @@
 import QtQuick.Controls
 import VLC.MainInterface
 import VLC.Style
+import VLC.Widgets as Widgets
 
 QtObject {
     id: vlc_style
@@ -57,7 +58,7 @@
     readonly property double margin_xlarge: MainCtx.dp(32, scale);
     readonly property double margin_xxlarge: MainCtx.dp(36, scale);
 
-    property Component _scrollBarComponent: ScrollBar { }
+    property Component _scrollBarComponent: Widgets.ScrollBarExt { }
     property real resizeHandleWidth
 
     // Borders
@@ -89,10 +90,10 @@
 
     readonly property int listAlbumCover_height: MainCtx.dp(32, scale)
     readonly property int listAlbumCover_width: listAlbumCover_height * 16.0/9
-    readonly property int listAlbumCover_radius: MainCtx.dp(3, scale)
+    readonly property int listAlbumCover_radius: 0
     readonly property int trackListAlbumCover_width: MainCtx.dp(32, scale)
     readonly property int trackListAlbumCover_heigth: MainCtx.dp(32, scale)
-    readonly property int trackListAlbumCover_radius: MainCtx.dp(2, scale)
+    readonly property int trackListAlbumCover_radius: 0
 
     readonly property int tableCoverRow_height: Math.max(listAlbumCover_height, fontHeight_normal) + margin_xsmall * 2
     readonly property int tableRow_height: fontHeight_normal + margin_small * 2
@@ -169,6 +170,9 @@
     readonly property int button_width_normal: MainCtx.dp(96, scale)
     readonly property int button_width_large: MainCtx.dp(128, scale)
 
+    readonly property int contextButton_width: icon_normal
+    readonly property int contextButton_margin: margin_xxsmall
+
     readonly property int checkButton_width: MainCtx.dp(56, scale)
     readonly property int checkButton_height: MainCtx.dp(32, scale)
 
@@ -226,6 +230,9 @@
     readonly property int layoutTitle_top_padding: margin_large + margin_xxsmall
     readonly property int layoutTitle_bottom_padding: margin_normal + margin_xxxsmall
 
+    readonly property int layout_left_margin: margin_normal
+    readonly property int layout_right_margin: layout_left_margin
+
     readonly property int table_cover_border: MainCtx.dp(2, scale)
 
     readonly property int tableHeaderText_height: fontHeight_normal

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/style/colorcontext.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/style/colorcontext.cpp Changed

@@ -189,8 +189,7 @@
         return false;
     if (m_palette)
     {
-        disconnect(m_palette, &SystemPalette::sourceChanged, this, &ColorContext::colorsChanged);
-        disconnect(m_palette, &SystemPalette::paletteChanged, this, &ColorContext::colorsChanged);
+        disconnect(m_palette, nullptr, this, nullptr);
     }
 
     m_palette = palette;
@@ -199,6 +198,17 @@
     {
         connect(m_palette, &SystemPalette::sourceChanged, this, &ColorContext::colorsChanged);
         connect(m_palette, &SystemPalette::paletteChanged, this, &ColorContext::colorsChanged);
+        connect(m_palette, &SystemPalette::destroyed, this, this(){
+            if (m_parentContext)
+            {
+                if (m_hasExplicitPalette)
+                    connect(m_parentContext, &ColorContext::paletteChanged, this, &ColorContext::setInheritedPalette);
+                setInheritedPalette(m_parentContext->m_palette);
+            }
+            else
+                setInheritedPalette(nullptr);
+            m_hasExplicitPalette = false;
+        });
     }
     else
         m_initialized = false;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/style/systempalette.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/style/systempalette.cpp Changed

@@ -520,6 +520,11 @@
         setColor(CS, C::Fg, C::Primary, C::Hovered, Qt::black);
         setColor(CS, C::Fg, C::Primary, C::Disabled, setColorAlpha(Qt::black, 0.2));
         setColor(CS, C::Fg, C::Secondary, C::Normal, Qt::black);
+
+        setColor(CS, C::Decoration, C::Border, C::Normal, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Focused, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Hovered, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Disabled, Qt::transparent);
     }
 
     //menubar
@@ -560,6 +565,11 @@
 
         setColor(CS, C::Fg, C::Primary, C::Normal, Qt::white);
         setColor(CS, C::Fg, C::Primary, C::Disabled, setColorAlpha(Qt::black, 0.3));
+
+        setColor(CS, C::Decoration, C::Border, C::Normal, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Focused, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Hovered, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Disabled, Qt::transparent);
     }
 
     //Standard Buttons
@@ -571,6 +581,11 @@
         setColor(CS, C::Fg, C::Primary, C::Focused, Qt::black);
         setColor(CS, C::Fg, C::Primary, C::Hovered, Qt::black);
         setColor(CS, C::Fg, C::Primary, C::Disabled, setColorAlpha(Qt::black, 0.3));
+
+        setColor(CS, C::Decoration, C::Border, C::Normal, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Focused, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Hovered, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Disabled, Qt::transparent);
     }
 
     //tooltip
@@ -718,6 +733,11 @@
         setColor(CS, C::Fg, C::Primary, C::Hovered, Qt::white);
         setColor(CS, C::Fg, C::Primary, C::Disabled, setColorAlpha(Qt::white, 0.2));
         setColor(CS, C::Fg, C::Secondary, C::Normal, Qt::white);
+
+        setColor(CS, C::Decoration, C::Border, C::Normal, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Focused, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Hovered, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Disabled, Qt::transparent);
     }
 
     //menubar
@@ -757,6 +777,11 @@
 
         setColor(CS, C::Fg, C::Primary, C::Normal, Qt::white);
         setColor(CS, C::Fg, C::Primary, C::Disabled, setColorAlpha(Qt::white, 0.3));
+
+        setColor(CS, C::Decoration, C::Border, C::Normal, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Focused, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Hovered, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Disabled, Qt::transparent);
     }
 
     //Standard Buttons
@@ -768,6 +793,11 @@
         setColor(CS, C::Fg, C::Primary, C::Focused, Qt::white);
         setColor(CS, C::Fg, C::Primary, C::Hovered, Qt::white);
         setColor(CS, C::Fg, C::Primary, C::Disabled, setColorAlpha(Qt::white, 0.3));
+
+        setColor(CS, C::Decoration, C::Border, C::Normal, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Focused, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Hovered, Qt::transparent);
+        setColor(CS, C::Decoration, C::Border, C::Disabled, Qt::transparent);
     }
 
     //tooltip

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/style/systempalettethemeprovider.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/style/systempalettethemeprovider.cpp Changed

@@ -121,12 +121,12 @@
 }
 
 static void setQtColorSetBorder(vlc_qt_theme_provider_t* obj,
-    vlc_qt_theme_color_set set, QPalette::ColorRole roleBg, QPalette::ColorRole roleFg)
+    vlc_qt_theme_color_set set, QPalette::ColorRole roleBg, QPalette::ColorRole roleFg, float blend = 0.5)
 {
     auto sys = static_cast<SystemePaletteObserver*>(obj->p_sys);
     QColor fg = sys->m_palette.color(QPalette::Normal, roleFg);
     QColor bg = sys->m_palette.color(QPalette::Normal, roleBg);
-    setQtColor(obj, set, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_NORMAL, blendColors(bg, fg));
+    setQtColor(obj, set, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_NORMAL, blendColors(bg, fg, blend));
 }
 
 
@@ -237,7 +237,7 @@
 
         setQtColor(obj, CS, VQTC_SECTION_FG, VQTC_NAME_SECONDARY, VQTC_STATE_NORMAL, secondaryTextButton);
 
-        setQtColorSetBorder(obj, CS, QPalette::Button, QPalette::ButtonText);
+        setQtColorSetBorder(obj, CS, QPalette::Button, QPalette::ButtonText, 0.8);
 
         setQtColor(obj, CS, VQTC_SECTION_BG, VQTC_NAME_NEGATIVE, VQTC_STATE_NORMAL, negative);
         setQtColor(obj, CS, VQTC_SECTION_BG, VQTC_NAME_NEGATIVE, VQTC_STATE_HOVERED, negativeHover);
@@ -352,7 +352,6 @@
         setQtColorSetBg(obj, CS, VQTC_NAME_PRIMARY, QPalette::AlternateBase);
         setQtColorSetFg(obj, CS, VQTC_NAME_PRIMARY, QPalette::Text);
 
-        QColor textfieldBorder;
         setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_NORMAL, inputBorderNormal);
         setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_HOVERED, inputBorderNormal);
         setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_FOCUSED, inputBorderFocused);
@@ -378,7 +377,6 @@
         setQtColorSetBg(obj, CS, VQTC_NAME_PRIMARY, QPalette::AlternateBase);
         setQtColorSetFg(obj, CS, VQTC_NAME_PRIMARY, QPalette::Text);
 
-        QColor textfieldBorder;
         setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_NORMAL, inputBorderNormal);
         setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_HOVERED, inputBorderNormal);
         setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_FOCUSED, inputBorderFocused);
@@ -390,7 +388,6 @@
         setQtColorSetBg(obj, CS, VQTC_NAME_PRIMARY, QPalette::AlternateBase);
         setQtColorSetFg(obj, CS, VQTC_NAME_PRIMARY, QPalette::Text);
 
-        QColor textfieldBorder;
         setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_NORMAL, inputBorderNormal);
         setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_HOVERED, inputBorderNormal);
         setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_FOCUSED, inputBorderFocused);

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/tests/test_ml_model.cpp Added

@@ -0,0 +1,217 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "../medialibrary/mlbasemodel.hpp"
+#include "vlc_stub_modules.hpp"
+
+#include <memory>
+#include <vector>
+
+#include <QCoreApplication>
+#include <QTest>
+
+struct vlc_medialibrary_t;
+
+class MLTestModel : public MLBaseModel
+{
+    Q_OBJECT
+
+public:
+    virtual QVariant itemRoleData(const MLItem *item, int role) const override
+    {
+        VLC_UNUSED(role);
+        if (!item)
+            return {};
+
+        return QVariant::fromValue(item->getId());
+    }
+
+    void appendRange(int64_t min, int64_t max)
+    {
+        for (int64_t i = min; i <= max; ++i)
+            m_items.emplace_back(i, VLC_ML_PARENT_UNKNOWN);
+        emit resetRequested();
+    }
+
+    void updateItem(size_t position, int64_t id)
+    {
+        MLItemId itemId{id, VLC_ML_PARENT_UNKNOWN};
+        m_itemsposition = itemId;
+        updateItemInCache(itemId);
+    }
+
+
+protected:
+    std::unique_ptr<MLListCacheLoader> createMLLoader() const override
+    {
+        return std::make_unique<MLListCacheLoader>(m_mediaLib, std::make_shared<MLTestModel::Loader>(*this, *this));
+    }
+
+    struct Loader : public MLListCacheLoader::MLOp
+    {
+        Loader(const MLBaseModel& model, const MLTestModel& parent)
+            : MLOp(model)
+            , m_mlTestModel(parent)
+        {}
+
+        size_t count(vlc_medialibrary_t* ml, const vlc_ml_query_params_t* queryParams) const override
+        {
+            VLC_UNUSED(ml);
+            VLC_UNUSED(queryParams);
+            return m_mlTestModel.m_items.size();
+        }
+
+        std::vector<std::unique_ptr<MLItem>> load(vlc_medialibrary_t* ml, const vlc_ml_query_params_t* queryParams) const override
+        {
+            VLC_UNUSED(ml);
+
+            if (m_mlTestModel.m_items.empty())
+                return {};
+
+            uint32_t offset = queryParams->i_offset;
+            uint32_t count = queryParams->i_nbResults;
+            size_t maxIndex = std::min(
+                static_cast<size_t>(offset + count),
+                m_mlTestModel.m_items.size() - 1);
+            std::vector<std::unique_ptr<MLItem>> ret;
+            for (size_t i = offset; i <= maxIndex; ++i) {
+                ret.emplace_back(std::make_unique<MLItem>(m_mlTestModel.m_itemsi));
+            }
+            return ret;
+        }
+
+        std::unique_ptr<MLItem> loadItemById(vlc_medialibrary_t* ml, MLItemId itemId) const override
+        {
+            VLC_UNUSED(ml);
+            return std::make_unique<MLItem>(itemId);
+        }
+
+        const MLTestModel& m_mlTestModel;
+    };
+
+
+    std::vector<MLItemId> m_items;
+};
+
+class TestVLCMLModel : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase() {
+        m_env = std::make_unique<VLCTestingEnv>();
+        QVERIFY(m_env->init());
+    }
+
+    void cleanupTestCase() {
+        m_env.reset();
+    }
+
+
+    void init() {
+        m_medialib = std::make_unique<MediaLib>(m_env->intf, nullptr);
+        m_model = std::make_unique<MLTestModel>();
+        m_model->classBegin();
+        m_model->setMl(m_medialib.get());
+        m_model->componentComplete();
+    }
+
+    void cleanup() {
+        m_model.reset();
+        m_medialib.reset();
+    }
+
+    /**
+     * @brief testModelUpdatedFromCallback
+     * test for !6537 scenario
+     *
+     * - Count&Load task issued (task n°1)
+     * - model need reset (thumbnail is updated for instance) => `needReload = true`
+     * - Count&Load task (n°1) is resolved
+     *    * diff util insert/remove rows
+     *    - Callback from model change ask to refer an item beyond the cache
+     *    - refer issue a new 'fetch more' request (n°2) as m_countTask is 0
+     *    - as `needReload await true`, cache is moved to oldCache, new count&load request
+     *       is issued (n° 3)
+     * - task n°2 resolve, cache is null, assertion fails
+     *
+     */
+    void testModelRecuseUpdateFromSlot()
+    {
+        connect(m_model.get(), &BaseModel::countChanged, this, this(){
+            m_model->updateItem(13, 37);
+            //model will initially only load 100 elements fetching beyond the loaded range
+            // will trigger "fetch more" request
+            m_model->data(m_model->index(500), Qt::DisplayRole);
+        }, Qt::SingleShotConnection);
+
+        m_model->appendRange(1, 1000);
+        QTRY_COMPARE_WITH_TIMEOUT(m_model->getCount(), 1000u, 100);
+    }
+
+
+    void testGetIndexFromID()
+    {
+        const int low = 1;
+        const int high = 300;
+        m_model->appendRange(low, high);
+
+        // let loading complete, getIndexFromID won't work for 'loading' model
+        QVERIFY(QTest::qWaitFor(this () { return !m_model->loading(); }));
+
+        std::optional<int> row = -1;
+        auto cb = &row(std::optional<int> index)
+        {
+            row = index;
+        };
+
+        // bug of MR6926, here model tries to get index for data outside the initial chunk size
+        m_model->getIndexFromId2(MLItemId{high, VLC_ML_PARENT_UNKNOWN}, cb);
+
+        // NOTE: CI fails with QTRY_COMPARE_WITH_TIMEOUT
+        QVERIFY(QTest::qWaitFor(&row() { return row != -1; }));
+        QCOMPARE(row, high - 1);
+
+        // above we must have loaded all the data, following this we should not need to wait for results
+        m_model->getIndexFromId2(MLItemId{low - 1, VLC_ML_PARENT_UNKNOWN}, cb);
+        QCOMPARE(row, std::nullopt);
+
+        m_model->getIndexFromId2(MLItemId{low, VLC_ML_PARENT_UNKNOWN}, cb);
+        QCOMPARE(row, low - 1);
+
+        m_model->getIndexFromId2(MLItemId{high + 1, VLC_ML_PARENT_UNKNOWN}, cb);
+        QCOMPARE(row, std::nullopt);
+
+        const int mid = (low + high) / 2;
+        m_model->getIndexFromId2(MLItemId{mid, VLC_ML_PARENT_UNKNOWN}, cb);
+        QCOMPARE(row, mid - 1);
+    }
+
+private:
+    std::unique_ptr<VLCTestingEnv> m_env;
+    std::unique_ptr<MediaLib> m_medialib;
+    std::unique_ptr<MLTestModel> m_model;
+};
+
+
+QTEST_GUILESS_MAIN(TestVLCMLModel)
+#include "test_ml_model.moc"

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/tests/test_thread_runner.cpp Added

@@ -0,0 +1,810 @@
+/*****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include <QTest>
+#include <QSignalSpy>
+#include <QWaitCondition>
+#include "../medialibrary/mlthreadpool.hpp"
+#include "qtestcase.h"
+
+static const int TASK_TIMEOUT = 300; //MS
+
+class Dummy : public QObject
+{
+    Q_OBJECT
+};
+
+//simple context for testing
+struct Ctx {
+    int id;
+};
+
+struct Barrier {
+    Barrier(size_t count)
+        : count(count)
+    {}
+
+    bool wait(unsigned long timeout = 0) {
+        QMutexLocker lock{&mutex};
+        --count;
+        if (count > 0)
+        {
+            bool ret = condition.wait(&mutex, timeout);
+            if (!ret)
+                return false;
+        }
+        else
+            condition.wakeAll();
+        return true;
+    }
+private:
+    int count;
+    QMutex mutex;
+    QWaitCondition condition;
+};
+
+class RunnerInThread : public QThread
+{
+    Q_OBJECT
+
+public:
+    void run() override {
+        m_runner = new ThreadRunner();
+        emit ready();
+        exec();
+        if (m_runner)
+        {
+            QSignalSpy deletedSpy(m_runner.get(), &QObject::destroyed);
+            m_runner->destroy();
+            deletedSpy.wait(TASK_TIMEOUT);
+        }
+    }
+
+    QPointer<ThreadRunner> m_runner;
+
+signals:
+    void ready();
+};
+
+
+class TestThreadRunner : public QObject
+{
+    Q_OBJECT
+
+private:
+
+    ThreadRunner* getRunner()
+    {
+        QFETCH_GLOBAL(bool, threaded);
+        if (threaded)
+            return m_runnerThread->m_runner.get();
+        else
+            return m_runner.get();
+    }
+
+    enum TaskStatus {
+        PENDING,
+        FAILED,
+        SUCCESS
+    };
+
+#define CHECK_TASK_TIMEOUT(task) QCOMPARE(QTest::qWaitFor(&task(){ return task != PENDING;}, TASK_TIMEOUT), false);
+#define CHECK_TASK_COMPLETE(task) QCOMPARE(QTest::qWaitFor(&task(){ return task != PENDING;}, TASK_TIMEOUT), true); QCOMPARE(task, SUCCESS);
+
+private slots:
+    void init() {
+        m_runner = new ThreadRunner();
+        m_runnerThread = std::make_unique<RunnerInThread>();
+        QSignalSpy startSpy(m_runnerThread.get(), &RunnerInThread::ready);
+        m_runnerThread->start();
+        startSpy.wait(TASK_TIMEOUT);
+    }
+
+    void cleanup() {
+        if (m_runner) {
+            QSignalSpy deletedSpy(m_runner.get(), &QObject::destroyed);
+            m_runner->destroy();
+            deletedSpy.wait();
+        }
+        m_runnerThread->quit();
+        m_runnerThread->wait();
+    }
+
+    void initTestCase_data()
+    {
+        QTest::addColumn<bool>("threaded");
+        QTest::newRow("same thread") << false;
+        QTest::newRow("different thread") << true;
+    }
+
+    void testSimpleTask()
+    {
+        ThreadRunner* runner = getRunner();
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+        TaskStatus ret = PENDING;
+        runner->runOnThread<Ctx>(dummy.get(), (Ctx& ctx){
+            ctx.id = 42;
+        }, &ret(size_t, const Ctx& ctx){
+            if (ctx.id == 42)
+                ret = SUCCESS;
+            else
+                ret = FAILED;
+        });
+        CHECK_TASK_COMPLETE(ret);
+    }
+
+    void testParallelTask()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        Barrier barrierPre(3);
+
+        TaskStatus ret1 = PENDING;
+        TaskStatus ret2 = PENDING;
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            //T1
+            &barrierPre, &ret1(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    ret1 = FAILED;
+                    return;
+                }
+            },
+            &ret1(size_t, const Ctx&){
+                if (ret1 != FAILED)
+                    ret1 = SUCCESS;
+            }
+        );
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            //T2
+            &barrierPre, &ret2(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    ret2 = FAILED;
+                    return;
+                }
+            },
+            &ret2(size_t, const Ctx&){
+                if (ret2 != FAILED)
+                    ret2 = SUCCESS;
+            }
+        );
+
+        QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+
+        CHECK_TASK_COMPLETE(ret1);
+        CHECK_TASK_COMPLETE(ret2);
+    }
+
+
+    void testParallelTaskQueued()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+        QMutex mutex;
+
+        Barrier barrierPre(3);
+
+        TaskStatus ret1 = PENDING;
+        TaskStatus ret2 = PENDING;
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            //T1
+            &mutex, &barrierPre, &ret1(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    ret1 = FAILED;
+                    return;
+                }
+            },
+            &ret1(size_t, const Ctx&){
+                if (ret1 != FAILED)
+                    ret1 = SUCCESS;
+            },
+            "queue1"
+        );
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            //T2
+            &barrierPre, &ret2(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    ret2 = FAILED;
+                    return;
+                }
+            },
+            &ret2(size_t, const Ctx&){
+                if (ret2 != FAILED)
+                    ret2 = SUCCESS;
+            },
+            "queue2" //not the same queue
+        );
+
+        //Both tasks should be running at the same time
+        QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+
+        CHECK_TASK_COMPLETE(ret1);
+        CHECK_TASK_COMPLETE(ret2);
+    }
+
+    void testQueuedTask()
+    {
+        ThreadRunner* runner = getRunner();
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        //theses tasks should execute sequentially
+        int ret = 0;
+        runner->runOnThread<Ctx>(dummy.get(),
+            (Ctx& ){
+                //N/A
+            }, &ret(size_t, const Ctx&){
+                if (ret != 0)
+                    ret = -1;
+                else
+                    ret = 1;
+             }, "queue");
+
+        runner->runOnThread<Ctx>(dummy.get(),
+            (Ctx& ){
+                //N/A
+            },
+            &ret(size_t, const Ctx& ){
+                if (ret != 1)
+                    ret = -2;
+                else
+                    ret = 2;
+            }, "queue");
+
+        runner->runOnThread<Ctx>(dummy.get(),
+             (Ctx& ){
+                 //N/A
+             },
+             &ret(size_t, const Ctx& ){
+                 if (ret != 2)
+                     ret = -3;
+                 else
+                     ret = 3;
+             }, "queue");
+
+        QTRY_COMPARE_WITH_TIMEOUT(ret, 3, TASK_TIMEOUT);
+    }
+
+
+    void testTargetDeletedDuringTask()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        Barrier barrierPre(2);
+        Barrier barrierPost(2);
+
+        TaskStatus ret = PENDING;
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            &barrierPre, &barrierPost, &ret(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    ret = FAILED;
+                    return;
+                }
+
+                //dummy is destroyed here in the other thread
+
+                if (!barrierPost.wait(TASK_TIMEOUT))
+                {
+                    ret = FAILED;
+                    return;
+                }
+            },
+            &ret(size_t, const Ctx&){
+                //this should not be executed
+                ret = FAILED;
+            });
+
+        {
+            //wait for the task to be started
+            QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+            dummy.reset();
+            QVERIFY(barrierPost.wait(TASK_TIMEOUT));
+        }
+        CHECK_TASK_TIMEOUT(ret);
+    }
+
+    void testTargetDeletedDuringTaskQueued()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        Barrier barrierPre(2);
+        Barrier barrierPost(2);
+
+        TaskStatus ret = PENDING;
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            &barrierPre, &barrierPost, &ret(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    ret = FAILED;
+                    return;
+                }
+
+                //dummy is destroyed here in the other thread
+
+                if (!barrierPost.wait(TASK_TIMEOUT))
+                {
+                    ret = FAILED;
+                    return;
+                }
+            },
+            &ret(size_t, const Ctx&){
+                //this should not be executed
+                ret = FAILED;
+            }, "queued");
+
+        //wait for the task to be started
+        QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+        dummy.reset();
+        QVERIFY(barrierPost.wait(TASK_TIMEOUT));
+
+        CHECK_TASK_TIMEOUT(ret);
+    }
+
+    void testTargetDeletedBeforeStart()
+    {
+        ThreadRunner* runner = getRunner();
+
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        Barrier barrierPre(2);
+        Barrier barrierPost(2);
+
+        TaskStatus task1ret = PENDING;
+        TaskStatus task1UIret = PENDING;
+        TaskStatus task2ret = PENDING;
+
+        //there is only 1 worker thread so tasks will be executed consecutivelly
+        runner->setMaxThreadCount(1);
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            &barrierPre, &barrierPost, &task1ret(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    task1ret = FAILED;
+                    return;
+                }
+
+                //dummy is destroyed here in the other thread
+
+                if (!barrierPost.wait(TASK_TIMEOUT))
+                {
+                    task1ret = FAILED;
+                    return;
+                }
+                task1ret = SUCCESS;
+            },
+            &task1UIret(size_t, const Ctx&){
+                //target is deleted this should not be executed
+                task1UIret = FAILED;
+            });
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            &task2ret(Ctx&) {
+                //this should not be executed
+                task2ret = FAILED;
+            },
+            &task2ret(size_t, const Ctx&){
+                //this should not be executed
+                task2ret = FAILED;
+            });
+
+        //wait for the task to be started
+        QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+        dummy.reset();
+        QVERIFY(barrierPost.wait(TASK_TIMEOUT));
+
+        //task1 thread callback execute
+        CHECK_TASK_COMPLETE(task1ret);
+        //this should timeout
+        CHECK_TASK_TIMEOUT(task2ret);
+        QCOMPARE(task1UIret, PENDING);
+    }
+
+    void testTargetDeletedBeforeStartQueued()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        Barrier barrierPre(2);
+        Barrier barrierPost(2);
+
+        TaskStatus task1ret = PENDING;
+        TaskStatus task1UIret = PENDING;
+        TaskStatus task2ret = PENDING;
+
+        //task are on the same queue so they will execute consecutively
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            &barrierPre, &barrierPost, &task1ret(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    task1ret = FAILED;
+                    return;
+                }
+
+                //dummy is destroyed here in the other thread
+
+                if (!barrierPost.wait(TASK_TIMEOUT))
+                {
+                    task1ret = FAILED;
+                    return;
+                }
+                task1ret = SUCCESS;
+            },
+            &task1UIret(size_t, const Ctx&){
+                //target is deleted this should not be executed
+                task1UIret = FAILED;
+            },
+            "samequeue");
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            &task2ret(Ctx&) {
+                //this should not be executed
+                task2ret = FAILED;
+            },
+            &task2ret(size_t, const Ctx&){
+                //this should not be executed
+                task2ret = FAILED;
+            },
+            "samequeue");
+
+        //wait for the task to be started
+        QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+        dummy.reset();
+        QVERIFY(barrierPost.wait(TASK_TIMEOUT));
+
+        //task1 thread callback execute
+        CHECK_TASK_COMPLETE(task1ret);
+        //this should timeout
+        CHECK_TASK_TIMEOUT(task2ret);
+        QCOMPARE(task1UIret, PENDING);
+    }
+
+
+    void testTaskCanceledBeforeStart()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        Barrier barrierPre(2);
+        Barrier barrierPost(2);
+
+        TaskStatus task1ret = PENDING;
+        TaskStatus task2ret = PENDING;
+
+        //task are on the same queue so they will execute consecutively
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            &barrierPre, &barrierPost, &task1ret(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    task1ret = FAILED;
+                    return;
+                }
+
+                //task is canceled here in the other thread
+
+                if (!barrierPost.wait(TASK_TIMEOUT))
+                {
+                    task1ret = FAILED;
+                    return;
+                }
+            },
+            &task1ret(size_t, const Ctx&){
+                if (task1ret != FAILED)
+                    task1ret = SUCCESS;
+            },
+            "samequeue");
+
+        quint64 task2 = runner->runOnThread<Ctx>(
+            dummy.get(),
+            &task2ret(Ctx&) {
+                //this should not be executed
+                task2ret = FAILED;
+            },
+            &task2ret(size_t, const Ctx&){
+                //this should not be executed
+                task2ret = FAILED;
+            },
+            "samequeue");
+
+        //wait for the task to be started
+        QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+        runner->cancelTask(dummy.get(), task2);
+        QVERIFY(barrierPost.wait(TASK_TIMEOUT));
+
+        CHECK_TASK_COMPLETE(task1ret);
+        CHECK_TASK_TIMEOUT(task2ret);
+    }
+
+    void testTaskCanceledDuringExecution()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        Barrier barrierPre(2);
+        Barrier barrierPost(2);
+
+        TaskStatus taskRet = PENDING;
+
+        quint64 taskId = runner->runOnThread<Ctx>(
+            dummy.get(),
+            &barrierPre, &barrierPost, &taskRet(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    taskRet = FAILED;
+                    return;
+                }
+
+                //task is canceled here in the other thread
+
+                if (!barrierPost.wait(TASK_TIMEOUT))
+                {
+                    taskRet = FAILED;
+                    return;
+                }
+            },
+            &taskRet(size_t, const Ctx&){
+                //this should not be executed
+                taskRet = FAILED;
+            });
+
+        QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+        runner->cancelTask(dummy.get(), taskId);
+        QVERIFY(barrierPost.wait(TASK_TIMEOUT));
+
+        CHECK_TASK_TIMEOUT(taskRet);
+    }
+
+    void testTaskCanceledDuringExecutionQueued()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        Barrier barrierPre(2);
+        Barrier barrierPost(2);
+
+        TaskStatus taskRet = PENDING;
+
+        quint64 taskId = runner->runOnThread<Ctx>(
+            dummy.get(),
+            &barrierPre, &barrierPost, &taskRet(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    taskRet = FAILED;
+                    return;
+                }
+
+                //task is canceled here in the other thread
+
+                if (!barrierPost.wait(TASK_TIMEOUT))
+                {
+                    taskRet = FAILED;
+                    return;
+                }
+            },
+            &taskRet(size_t, const Ctx&){
+                //this should not be executed
+                taskRet = FAILED;
+            }, "queued");
+
+        QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+        runner->cancelTask(dummy.get(), taskId);
+        QVERIFY(barrierPost.wait(TASK_TIMEOUT));
+
+        CHECK_TASK_TIMEOUT(taskRet);
+    }
+
+    void testRunnerDestroyedDuringExecution()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        Barrier barrierPre(2);
+        Barrier barrierPost(2);
+
+        TaskStatus taskRet = PENDING;
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            &barrierPre, &barrierPost, &taskRet(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    taskRet = FAILED;
+                    return;
+                }
+
+                //runner is destroyed here in the other thread
+
+                if (!barrierPost.wait(TASK_TIMEOUT))
+                {
+                    taskRet = FAILED;
+                    return;
+                }
+            },
+            &taskRet(size_t, const Ctx&){
+                //this should not be executed
+                taskRet = FAILED;
+            });
+
+        QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+        //destroy runner in its thread
+        if (runner->thread() == this->thread())
+            runner->destroy();
+        else
+            QMetaObject::invokeMethod(runner, &ThreadRunner::destroy, Qt::BlockingQueuedConnection);
+        QVERIFY(barrierPost.wait(TASK_TIMEOUT));
+
+        CHECK_TASK_TIMEOUT(taskRet);
+    }
+
+    void testRunnerDestroyedDuringExecutionQueued()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        Barrier barrierPre(2);
+        Barrier barrierPost(2);
+
+        TaskStatus taskRet = PENDING;
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            &barrierPre, &barrierPost, &taskRet(Ctx&) {
+                if (!barrierPre.wait(TASK_TIMEOUT))
+                {
+                    taskRet = FAILED;
+                    return;
+                }
+
+                //runner is destroyed here in the other thread
+
+                if (!barrierPost.wait(TASK_TIMEOUT))
+                {
+                    taskRet = FAILED;
+                    return;
+                }
+            },
+            &taskRet(size_t, const Ctx&){
+                //this should not be executed
+                taskRet = FAILED;
+            }, "queue");
+
+        QVERIFY(barrierPre.wait(TASK_TIMEOUT));
+        //destroy runner in its thread
+        if (runner->thread() == this->thread())
+            runner->destroy();
+        else
+            QMetaObject::invokeMethod(runner, &ThreadRunner::destroy, Qt::BlockingQueuedConnection);
+        QVERIFY(barrierPost.wait(TASK_TIMEOUT));
+
+        CHECK_TASK_TIMEOUT(taskRet);
+    }
+
+
+    void testNestedTask()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        TaskStatus taskRet = PENDING;
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            (Ctx& ctx) {
+                //run on worker thread
+                ctx.id = 1;
+            },
+            runner, &taskRet, dummy = dummy.get()(size_t, const Ctx& ctx){
+                if (ctx.id != 1)
+                {
+                    taskRet = FAILED;
+                    return;
+                }
+                runner->runOnThread<Ctx>(
+                    dummy,
+                    (Ctx& ctx) {
+                        ctx.id = 2;
+                    },
+                    &taskRet(size_t, const Ctx& ctx){
+                        taskRet = (ctx.id == 2 ? SUCCESS : FAILED);
+                    });
+            }
+            );
+        CHECK_TASK_COMPLETE(taskRet);
+    }
+
+    void testNestedTaskQueued()
+    {
+        ThreadRunner* runner = getRunner();
+
+        std::unique_ptr<Dummy> dummy = std::make_unique<Dummy>();
+
+        TaskStatus taskRet = PENDING;
+
+        runner->runOnThread<Ctx>(
+            dummy.get(),
+            (Ctx& ctx) {
+                //run on worker thread
+                ctx.id = 1;
+            },
+            runner, &taskRet, dummy = dummy.get()(size_t, const Ctx& ctx){
+                if (ctx.id != 1)
+                {
+                    taskRet = FAILED;
+                    return;
+                }
+                runner->runOnThread<Ctx>(
+                    dummy,
+                    (Ctx& ctx) {
+                        ctx.id = 2;
+                    },
+                    &taskRet(size_t, const Ctx& ctx){
+                        taskRet = (ctx.id == 2 ? SUCCESS : FAILED);
+                    },
+                    "queue"
+                );
+            },
+            "queue"
+            );
+        CHECK_TASK_COMPLETE(taskRet);
+    }
+
+private:
+    //A runner living in the main thread
+    QPointer<ThreadRunner> m_runner;
+
+    //A runner living in a different thread
+    std::unique_ptr<RunnerInThread> m_runnerThread;
+};
+
+QTEST_GUILESS_MAIN(TestThreadRunner)
+#include "test_thread_runner.moc"

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/tests/vlc_stub_modules.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/tests/vlc_stub_modules.cpp Changed

@@ -33,6 +33,7 @@
 #include <vlc_probe.h>
 #include <vlc_interface.h>
 #include <vlc_player.h>
+#include <vlc_media_library.h>
 
 #include "../../../../lib/libvlc_internal.h"
 
@@ -111,6 +112,38 @@
     testenv->intf = nullptr;
 }
 
+//Medialib module
+
+static void* MLGet( vlc_medialibrary_module_t*, int, va_list )
+{
+    return nullptr;
+}
+
+static int MLList( vlc_medialibrary_module_t*, int,
+                const vlc_ml_query_params_t*, va_list )
+{
+    return VLC_EGENERIC;
+}
+
+static int MLControl( vlc_medialibrary_module_t*, int, va_list )
+{
+    return VLC_EGENERIC;
+}
+
+static int MLOpen( vlc_object_t* obj )
+{
+    auto* p_ml = reinterpret_cast<vlc_medialibrary_module_t*>( obj );
+    p_ml->pf_control = MLControl;
+    p_ml->pf_get = MLGet;
+    p_ml->pf_list = MLList;
+    return VLC_SUCCESS;
+}
+
+static void MLClose( vlc_object_t* obj )
+{
+    VLC_UNUSED(obj);
+}
+
 //module declaration
 
 vlc_module_begin()
@@ -123,6 +156,9 @@
 add_submodule()
     set_capability("renderer probe", 10000)
     set_callback(vlc_rd_probe_open)
+add_submodule()
+    set_capability("medialibrary", 10000)
+    set_callbacks(MLOpen, MLClose)
 vlc_module_end()
 
 extern "C" {
@@ -148,7 +184,7 @@
 }
 
 static const char * test_defaults_args = {
-    "-v", "--vout=vdummy", "--aout=adummy", "--text-renderer=tdummy",
+    "-v", "--vout=vdummy", "--aout=adummy", "--text-renderer=tdummy", "--media-library"
 };
 
 static const int test_defaults_nargs =

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/base_model.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/base_model.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/base_model.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/base_model.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/base_model_p.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/base_model_p.hpp Changed

@@ -36,6 +36,8 @@
     virtual void resetCache() = 0;
     virtual void invalidateCache() = 0;
     virtual bool loading() const = 0;
+
+    virtual unsigned int getLoadedCount() const = 0;
     virtual unsigned int getCount() const = 0;
     virtual unsigned int getMaximumCount() const = 0;
 
@@ -134,6 +136,7 @@
     const T* item(int signedidx) const;
 
     unsigned int getCount() const override;
+    unsigned int getLoadedCount() const override;
     unsigned int getMaximumCount() const override;
 
     virtual std::unique_ptr<ListCacheLoader<T>> createLoader() const = 0;
@@ -157,6 +160,19 @@
 }
 
 template<typename T>
+unsigned BaseModelPrivateT<T>::getLoadedCount() const
+{
+    if (!m_cache)
+        return 0;
+
+    ssize_t loadedCount = m_cache->loadedCount();
+    if (loadedCount == ListCache<T>::COUNT_UNINITIALIZED)
+        return 0;
+
+    return static_cast<unsigned>(loadedCount);
+}
+
+template<typename T>
 unsigned BaseModelPrivateT<T>::getMaximumCount() const
 {
     if (!m_cache)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/color_svg_image_provider.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/color_svg_image_provider.cpp Changed

@@ -19,22 +19,16 @@
 #include "color_svg_image_provider.hpp"
 #include "qt.hpp"
 #include "util/asynctask.hpp"
+#include "util/imagehelper.hpp"
 
-#include <QSvgRenderer>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QPainter>
 #include <QFile>
 #include <QQmlFile>
 #include <QDebug>
-
-#define PATH_KEY "_res_PATH"
-#define BACKGROUND_KEY "_res_BG"
-#define COLOR1_KEY "_res_C1"
-#define COLOR2_KEY "_res_C2"
-#define COLOR_ACCENT_KEY "_res_ACCENT"
-
-namespace {
+#include <QBuffer>
+#include <QImageIOHandler>
 
 static const QMap<QString, QString> predefinedSubst = {
     {COLOR1_KEY, "#FF00FF"},
@@ -42,93 +36,144 @@
     {COLOR_ACCENT_KEY, "#FF8800"},
 };
 
+QPair<QByteArray, std::optional<QColor>> colorizeSvg(const QString &filename, const QList<QPair<QString, QString> > &replacements)
+{
+    QFile file(filename);
+    if (!file.open(QIODevice::ReadOnly))
+    {
+        qWarning() << "SVGColorizer: can not open file " << filename << " for read.";
+        return {};
+    }
+
+    QByteArray data = file.readAll();
+    //we pass by QString because we want to perform case incensite replacements
+    QString dataStr = QString::fromUtf8(data);
+
+    std::optional<QColor> backgroundColor;
+
+    for (const auto& replacePair: replacements)
+    {
+        if (replacePair.first == PATH_KEY)
+            continue;
+        else if (replacePair.first == BACKGROUND_KEY)
+        {
+            backgroundColor = QColor(replacePair.second);
+        }
+        else if (predefinedSubst.contains(replacePair.first))
+        {
+            dataStr = dataStr.replace(predefinedSubstreplacePair.first,
+                                      replacePair.second, Qt::CaseInsensitive);
+        }
+        else
+        {
+            dataStr = dataStr.replace(replacePair.first, replacePair.second, Qt::CaseInsensitive);
+        }
+    }
+
+    return {dataStr.toUtf8(), backgroundColor};
+}
+
+namespace {
+
 class SVGColorImageReader: public AsyncTask<QImage>
 {
 public:
     SVGColorImageReader(const QString& filename, const QList<QPair<QString, QString>>& replacements, QSize requestedSize)
         : AsyncTask<QImage>()
+        , m_fileName(filename)
         , m_requestedSize(requestedSize)
         , m_replacements(replacements)
     {
-        m_file = new QFile(filename, this);
         if (!m_requestedSize.isValid())
             m_requestedSize = QSize{256, 256};
     }
 
     QImage execute() override
     {
-        if (m_requestedSize.width() == 0 || m_requestedSize.height() == 0)
+        if (m_requestedSize.width() < 0 || m_requestedSize.height() < 0)
         {
             m_error = "invalid size requested";
             return {};
         }
 
-        if (!m_file->open(QIODevice::ReadOnly))
+        const auto data = colorizeSvg(m_fileName, m_replacements);
+
+        if (data.first.isEmpty())
         {
             m_error = "file can't be opened";
             return {};
         }
 
-        QColor backgroundColor{Qt::transparent};
+        const auto svgHandler = QScopedPointer<QImageIOHandler>(ImageHelper::createSvgImageIOHandler());
+
+        QImage image;
 
-        QByteArray data = m_file->readAll();
-        //we pass by QString because we want to perform case incensite replacements
-        QString dataStr = QString::fromUtf8(data);
-        for (const auto& replacePair: m_replacements)
+        if (svgHandler)
         {
-            if (replacePair.first == PATH_KEY)
-                continue;
-            else if (replacePair.first == BACKGROUND_KEY)
-            {
-                backgroundColor = QColor(replacePair.second);
-            }
-            else if (predefinedSubst.contains(replacePair.first))
+            QBuffer buffer;
+            buffer.setData(data.first);
+
+            if (Q_LIKELY(buffer.open(QFile::ReadOnly)))
             {
-                dataStr = dataStr.replace(predefinedSubstreplacePair.first,
-                                          replacePair.second, Qt::CaseInsensitive);
+                svgHandler->setDevice(&buffer);
+
+                if (Q_LIKELY(svgHandler->canRead()))
+                {
+                    QSize scaledSize;
+
+                    if ((m_requestedSize.width() == 0 || m_requestedSize.height() == 0))
+                    {
+                        // QImageReader standard behavior, if width or height is 0,
+                        // it is calculated to preserve the aspect ratio:
+
+                        const QSize naturalSize = svgHandler->option(QImageIOHandler::Size).toSize();
+
+                        if (m_requestedSize.width() == 0)
+                        {
+                            scaledSize.setWidth(m_requestedSize.height() * ((qreal)naturalSize.width() / naturalSize.height()));
+                            scaledSize.setHeight(m_requestedSize.height());
+                        }
+                        else if (m_requestedSize.height() == 0)
+                        {
+                            scaledSize.setHeight(m_requestedSize.width() * ((qreal)naturalSize.height() / naturalSize.width()));
+                            scaledSize.setWidth(m_requestedSize.width());
+                        }
+                    }
+                    else
+                    {
+                        scaledSize = m_requestedSize;
+                    }
+
+                    if (!scaledSize.isEmpty())
+                        svgHandler->setOption(QImageIOHandler::ScaledSize, scaledSize);
+
+                    if (data.second.has_value())
+                        svgHandler->setOption(QImageIOHandler::BackgroundColor, *data.second);
+
+                    svgHandler->read(&image);
+                }
+                else
+                {
+                    m_error = QStringLiteral("Svg Image Provider: svg image handler can not read the svg contents, is the file svg specification compliant?");
+                }
             }
             else
             {
-                dataStr = dataStr.replace(replacePair.first, replacePair.second, Qt::CaseInsensitive);
+                m_error = QStringLiteral("Svg Image Provider: can not open colorized svg buffer for read.");
             }
         }
-
-        QSvgRenderer renderer(dataStr.toUtf8());
-        if (!renderer.isValid())
+        else
         {
-            m_error = "can't parse SVG content";
-            return {};
+            m_error = QStringLiteral("Svg Image Provider: can not found QSvgPlugin, is it installed?");
         }
 
-        //FIXME QT < 5.15 doesn't support QSvgRenderer::setAspectRatioMode
-        //scale to fit manually
-        QRect bounds;
-        QSize bbox = renderer.defaultSize();
-        float sourceAR = bbox.width() / (float)bbox.height();
-        float destAR = m_requestedSize.width() / (float)m_requestedSize.height();
-        if (qFuzzyCompare(sourceAR, destAR))
-            bounds = QRect({0,0}, m_requestedSize);
-        else if (sourceAR < destAR) {
-            float scaledWidth = m_requestedSize.height() * sourceAR;
-            bounds = QRect((m_requestedSize.width() - scaledWidth) / 2, 0,
-                           scaledWidth, m_requestedSize.height());
-        } else {
-            float scaledHeight = m_requestedSize.width() / sourceAR;
-            bounds = QRect(0, (m_requestedSize.height() - scaledHeight) / 2,
-                           m_requestedSize.width(), scaledHeight);
-        }
-
-        QImage image;
-        if (backgroundColor.alpha() == 255)
+        if (Q_UNLIKELY(image.isNull()))
+        {
+            if (m_error.isEmpty())
+                m_error = QStringLiteral("Svg Image Provider: unspecified error.");
             image = QImage(m_requestedSize, QImage::Format_RGB32);
-        else
-            image = QImage(m_requestedSize, QImage::Format_ARGB32_Premultiplied);
-        image.fill(backgroundColor);
-
-        QPainter painter;
-        painter.begin(&image);
-        renderer.render(&painter, bounds);
-        painter.end();
+            image.fill(QColor("purple"));
+        }
 
         return image;
     }
@@ -139,7 +184,7 @@
     }
 
 private:
-    QFile* m_file = nullptr;
+    QString m_fileName;
     QString m_error;
     QSize m_requestedSize;
     QList<QPair<QString, QString>> m_replacements;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/color_svg_image_provider.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/color_svg_image_provider.hpp Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/colorizedsvgicon.cpp Added

@@ -0,0 +1,123 @@
+/*****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include "colorizedsvgicon.hpp"
+
+#include <QPluginLoader>
+#include <QIconEnginePlugin>
+#include <QIconEngine>
+#include <QPointer>
+#include <QWidget>
+#include <QFileInfo>
+
+ColorizedSvgIcon::ColorizedSvgIcon(QString filename, std::optional<QColor> color1, std::optional<QColor> color2, std::optional<QColor> accentColor, const QList<QPair<QString, QString> > &otherReplacements)
+    : QIcon(newEngine()) // QIcon takes the ownership of the icon engine
+{
+    captureEngine();
+
+    if (!m_engine)
+    {
+        qWarning() << "ColorizedSvgIcon: could not create svg icon engine, icon " << filename << " will not be colorized.";
+        addFile(filename);
+        return;
+    }
+
+    QList<QPair<QString, QString>> replacements;
+    {
+        if (color1.has_value())
+            replacements.push_back({QStringLiteral(COLOR1_KEY), color1->name(QColor::HexRgb)});
+
+        if (color2.has_value())
+            replacements.push_back({QStringLiteral(COLOR2_KEY), color2->name(QColor::HexRgb)});
+
+        if (accentColor.has_value())
+            replacements.push_back({QStringLiteral(COLOR_ACCENT_KEY), accentColor->name(QColor::HexRgb)});
+
+        replacements.append(otherReplacements.begin(), otherReplacements.end());
+    }
+
+    QByteArray data;
+    {
+        // Serialization (akin to `QSvgIconEngine::write()`):
+        int isCompressed = 0;
+
+        QHash<int, QString> svgFiles;
+        QHash<int, QByteArray> svgBuffers;
+
+        const QByteArray& buf = colorizeSvg(filename, replacements).first;
+
+        const auto key = hashKey(Normal, Off); // QIcon(QString) uses these settings
+
+        // Different colored svgs should have different file names assigned,
+        // for now it is not relevant, so don't provide the file name to the
+        // engine:
+        // svgFiles.insert(key, filename);
+        svgBuffers.insert(key, buf);
+
+        QDataStream out(&data, QDataStream::OpenModeFlag::WriteOnly);
+
+        out << svgFiles << isCompressed << svgBuffers;
+        out << 0; // no additional added pixmaps
+    }
+
+    {
+        // Feed the engine with the colorized svg content:
+        QDataStream in(std::as_const(data)); // read-only
+        if (!m_engine->read(in))
+        {
+            qWarning() << "ColorizedSvgIcon: svg icon engine can not read contents, icon " << filename << " will not be colorized.";
+            addFile(filename);
+            return;
+        }
+    }
+}
+
+ColorizedSvgIcon ColorizedSvgIcon::colorizedIconForWidget(const QString &fileName, const QWidget *widget)
+{
+    assert(widget);
+    return ColorizedSvgIcon(fileName, widget->palette().text().color());
+}
+
+QIconEngine *ColorizedSvgIcon::svgIconEngine()
+{
+    static const auto plugin = () -> QPointer<QIconEnginePlugin> {
+#ifdef QT_STATIC
+        const auto& staticPlugins = QPluginLoader::staticInstances();
+        const auto it = std::find_if(staticPlugins.begin(), staticPlugins.end(), (QObject *obj) -> bool {
+            return obj->inherits("QSvgIconPlugin");
+        });
+
+        if (it != staticPlugins.end())
+            return qobject_cast<QIconEnginePlugin*>(*it);
+        else
+            return nullptr;
+#else
+        QPluginLoader loader(QStringLiteral("iconengines/qsvgicon")); // Official Qt plugin
+        // No need to check the metadata (or inherits `QSvgIconPlugin`), a plugin named "qsvgicon" should already support svg.
+        return qobject_cast<QIconEnginePlugin*>(loader.instance());
+#endif
+    }();
+
+    if (!plugin)
+    {
+        qWarning() << "ColorizedSvgIcon: svg icon plugin is not found.";
+        return nullptr;
+    }
+
+    return plugin->create();
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/colorizedsvgicon.hpp Added

@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef COLORIZEDSVGICON_HPP
+#define COLORIZEDSVGICON_HPP
+
+#include <QIcon>
+
+#include "util/color_svg_image_provider.hpp"
+
+#include <QMutex>
+
+#include <optional>
+
+class ColorizedSvgIcon : public QIcon
+{
+    QIconEngine *m_engine = nullptr;
+
+    inline static QMutex engineLock;
+    inline static QIconEngine *lastEngine; // static variables are initialized by default
+
+    static QIconEngine *newEngine()
+    {
+        engineLock.lock();
+        assert(!lastEngine);
+        lastEngine = svgIconEngine();
+        return lastEngine;
+    }
+
+    void captureEngine()
+    {
+        assert(!m_engine);
+        assert(lastEngine);
+        m_engine = lastEngine;
+        lastEngine = nullptr;
+        engineLock.unlock();
+    }
+
+    static int hashKey(QIcon::Mode mode, QIcon::State state)
+    {
+        // From QSvgIconEnginePrivate:
+        return ((mode << 4) | state);
+    }
+
+public:
+    explicit ColorizedSvgIcon(QString filename,
+                              std::optional<QColor> color1 = std::nullopt,
+                              std::optional<QColor> color2 = std::nullopt,
+                              std::optional<QColor> accentColor = std::nullopt,
+                              const QList<QPair<QString, QString>>& otherReplacements = {});
+
+    nodiscard static ColorizedSvgIcon colorizedIconForWidget(const QString& fileName, const QWidget *widget);
+
+    nodiscard static QIconEngine *svgIconEngine();
+};
+
+#endif // COLORIZEDSVGICON_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/csdbuttonmodel.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdbuttonmodel.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/csdbuttonmodel.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdbuttonmodel.hpp Changed

@@ -90,21 +90,6 @@
     bool m_externalPressed = false;
 };
 
-
-class SystemMenuButton : public CSDButton
-{
-    Q_OBJECT
-
-public:
-    SystemMenuButton(QObject *parent = nullptr) : CSDButton {SystemMenuButton::SystemMenu, parent} {}
-
-    Q_INVOKABLE virtual void showSystemMenu(const QPoint &windowpos) = 0;
-
-signals:
-    void systemMenuVisibilityChanged(bool visible);
-};
-
-
 class MainCtx;
 
 
@@ -113,17 +98,13 @@
     Q_OBJECT
     Q_PROPERTY(QList<CSDButton *> windowCSDButtons READ windowCSDButtons CONSTANT)
 
-    Q_PROPERTY(CSDButton *systemMenuButton READ systemMenuButton CONSTANT)
-
 public:
     CSDButtonModel(MainCtx *mainCtx, QObject *parent = nullptr);
 
-    QList<CSDButton *> windowCSDButtons() const;
-    CSDButton *systemMenuButton() const;
-
-    // set by internal implmentation
-    // all the actions are also handled by implementation
-    void setSystemMenuButton(std::shared_ptr<SystemMenuButton> button);
+    // QList may cause crash on destruction (QTBUG-132126),
+    // return by reference so that the QList rvalue is not
+    // destructed:
+    const QList<CSDButton *>& windowCSDButtons() const;
 
 private slots:
     void minimizeButtonClicked();
@@ -135,9 +116,6 @@
 
     // CSD window action buttons i.e minimize, maximize, close
     QList<CSDButton *> m_windowCSDButtons;
-
-    // sysmenu button, available on windows only
-    std::shared_ptr<SystemMenuButton> m_systemMenuButton = nullptr;
 };

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdmenu.cpp Added

@@ -0,0 +1,331 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#include "csdmenu.hpp"
+
+#include <QApplication>
+#include <QAction>
+#include <QWindow>
+
+#ifdef QT_GUI_PRIVATE
+#include <QtGui/qpa/qplatformnativeinterface.h>
+#include <QtGui/qpa/qplatformwindow.h>
+#include <QtGui/qpa/qplatformwindow_p.h>
+#endif
+
+#include "maininterface/mainctx.hpp"
+#include "util/csdmenu_module.h"
+#include "menus/menus.hpp"
+
+#include <vlc_common.h>
+#include <vlc_modules.h>
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
+#if defined(Q_OS_UNIX)
+#define QT_FEATURE_wayland 1
+#else
+#define QT_FEATURE_wayland -1
+#endif
+#endif
+
+struct xdg_surface;
+
+namespace {
+
+//vlc module callback
+static int csdMenuInfoOpen(void *func, bool forced, va_list ap)
+{
+    VLC_UNUSED(forced);
+    qt_csd_menu_open open = reinterpret_cast<qt_csd_menu_open>(func);
+    qt_csd_menu_t* obj = va_arg(ap, qt_csd_menu_t*);
+    qt_csd_menu_info* info = va_arg(ap, qt_csd_menu_info*);
+    return open(obj, info);
+}
+
+bool isWindowFixedSize(const QWindow *window)
+{
+    if (window->flags() & Qt::MSWindowsFixedSizeDialogHint)
+        return true;
+
+    const auto minSize = window->minimumSize();
+    const auto maxSize = window->maximumSize();
+
+    return minSize.isValid() && maxSize.isValid() && minSize == maxSize;
+}
+
+}
+
+class CSDMenuPrivate
+{
+    Q_DECLARE_PUBLIC(CSDMenu)
+public:
+
+    CSDMenuPrivate(CSDMenu* parent)
+        : q_ptr(parent)
+    {
+        const QString& platform = qApp->platformName();;
+        if (platform == QLatin1String("windows") || platform == QLatin1String("direct2d"))
+            m_plateform = QT_CSD_PLATFORM_WINDOWS;
+        else if (platform.startsWith( QLatin1String("wayland")))
+            m_plateform = QT_CSD_PLATFORM_WAYLAND;
+        else if (platform == QLatin1String("xcb"))
+            m_plateform = QT_CSD_PLATFORM_X11;
+    }
+
+    static void notifyMenuVisible(void* data, bool visible)
+    {
+        auto that = static_cast<CSDMenuPrivate*>(data);
+        that->m_menuVisible = visible;
+        emit that->q_func()->menuVisibleChanged(visible);
+    }
+
+    void fallbackMenu(QPoint pos)
+    {
+        auto menu = new VLCMenu(m_ctx->getIntf());
+        menu->setAttribute(Qt::WA_DeleteOnClose);
+
+        QObject::connect(menu, &QMenu::aboutToShow, q_ptr, this(){
+            notifyMenuVisible(this, true);
+        });
+
+        QObject::connect(menu, &QMenu::aboutToHide, q_ptr, this(){
+            notifyMenuVisible(this, false);
+        });
+
+        QWindow::Visibility visibility = m_ctx->interfaceVisibility();
+        QAction* action;
+        action = menu->addAction(qtr("Restore"));
+        action->setEnabled(visibility != QWindow::Windowed);
+        action->connect(action, &QAction::triggered, q_ptr, this() {
+            m_ctx->requestInterfaceNormal();
+        });
+        action = menu->addAction(qtr("Minimize"));
+        action->connect(action, &QAction::triggered, q_ptr, this() {
+            m_ctx->requestInterfaceMinimized();
+        });
+        action = menu->addAction(qtr("Maximized"));
+        action->setEnabled(visibility != QWindow::Maximized);
+        action->connect(action, &QAction::triggered, q_ptr, this() {
+            m_ctx->requestInterfaceMaximized();
+        });
+        action = menu->addAction(qtr("Always on top"));
+        action->setCheckable(true);
+        action->setChecked(m_ctx->isInterfaceAlwaysOnTop());
+        action->connect(action, &QAction::triggered, q_ptr, this(bool checked) {
+            m_ctx->setInterfaceAlwaysOnTop(checked);
+        });
+        action = menu->addAction(qtr("Close"));
+        action->connect(action, &QAction::triggered, q_ptr, this() {
+            m_ctx->intfMainWindow()->close();
+        });
+
+        /* Ideally we should allow moving and resizing the window through startSystemXXX
+         * But, startSystemXXX is usually active from a mouse press until a mouse release,
+         * so calling it from a menu is broken with some desktop environments
+         */
+
+        menu->popup(pos);
+    }
+
+    void loadModule()
+    {
+        QWindow* window = m_ctx->intfMainWindow();
+        assert(window);
+
+        qt_csd_menu_info info = {};
+        info.platform = QT_CSD_PLATFORM_UNKNOWN;
+#ifdef _WIN32
+        if (m_plateform == QT_CSD_PLATFORM_WINDOWS)
+        {
+            info.platform = QT_CSD_PLATFORM_WINDOWS;
+        };
+#else
+#ifdef QT_GUI_PRIVATE
+        if (m_plateform == QT_CSD_PLATFORM_X11)
+        {
+            QPlatformNativeInterface* native = qApp->platformNativeInterface();
+            info.platform = QT_CSD_PLATFORM_X11;
+            info.data.x11.rootwindow = reinterpret_cast<intptr_t>(native->nativeResourceForIntegration(QByteArrayLiteral("rootwindow")));
+            info.data.x11.connection = reinterpret_cast<struct xcb_connection_t*>(native->nativeResourceForIntegration(QByteArrayLiteral("connection")));
+        }
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_CONFIG(wayland)
+        if (m_plateform == QT_CSD_PLATFORM_WAYLAND)
+        {
+            info.platform = QT_CSD_PLATFORM_WAYLAND;
+
+            auto appNative = qApp->nativeInterface<QNativeInterface::QWaylandApplication>();
+            auto windowNative = window->nativeInterface<QNativeInterface::Private::QWaylandWindow>();
+
+            info.data.wayland.display = appNative->display();
+            info.data.wayland.toplevel = windowNative->surfaceRole<xdg_toplevel>();
+        }
+#endif // QT 6.5
+#endif // QT_GUI_PRIVATE
+#endif // _WIN32
+        info.isRtl = QGuiApplication::isRightToLeft();
+
+        info.userData = this;
+        info.notifyMenuVisible = &notifyMenuVisible;
+
+        m_systemMenuState = UNAVAILABLE;
+        m_systemMenu = vlc_object_create<qt_csd_menu_t>(m_ctx->getIntf());
+        if (!m_systemMenu)
+            return;
+        m_module = vlc_module_load(vlc_object_logger(m_systemMenu), "qtcsdmenu", nullptr, false, &csdMenuInfoOpen, m_systemMenu, &info);
+        if (!m_module)
+        {
+            vlc_object_delete(m_systemMenu);
+            m_systemMenu = nullptr;
+            return;
+        }
+        m_systemMenuState = AVAILABLE;
+    }
+
+    void unloadModule()
+    {
+        if (m_module)
+        {
+            module_unneed(m_systemMenu, m_module);
+            m_module = nullptr;
+        }
+        if (m_systemMenu)
+        {
+            vlc_object_delete(m_systemMenu);
+            m_systemMenu = nullptr;
+        }
+        m_systemMenuState = CSDMenuPrivate::NEED_INITIALISATION;
+    }
+
+    enum {
+        NEED_INITIALISATION,
+        UNAVAILABLE,
+        AVAILABLE
+    } m_systemMenuState = NEED_INITIALISATION;
+
+    module_t* m_module = nullptr;
+    qt_csd_menu_t* m_systemMenu = nullptr;
+
+    qt_csd_menu_platform m_plateform = QT_CSD_PLATFORM_UNKNOWN;
+    MainCtx* m_ctx = nullptr;
+    bool m_menuVisible = false;
+
+    CSDMenu* q_ptr;
+};
+
+CSDMenu::CSDMenu(QObject* parent)
+    : QObject(parent)
+    , d_ptr(new CSDMenuPrivate(this))
+{
+}
+
+CSDMenu::~CSDMenu()
+{
+    Q_D(CSDMenu);
+    d->unloadModule();
+}
+
+MainCtx* CSDMenu::getCtx() const
+{
+    Q_D(const CSDMenu);
+    return d->m_ctx;
+}
+
+void CSDMenu::setCtx(MainCtx* ctx)
+{
+    Q_D(CSDMenu);
+
+    if (d->m_ctx == ctx)
+        return;
+    d->m_ctx = ctx;
+    emit ctxChanged(ctx);
+}
+
+bool CSDMenu::getMenuVisible() const
+{
+    Q_D(const CSDMenu);
+    return d->m_menuVisible;
+}
+
+void CSDMenu::popup(const QPoint &pos)
+{
+    Q_D(CSDMenu);
+
+    assert(d->m_ctx);
+
+    QWindow* window = d->m_ctx->intfMainWindow();
+    assert(window);
+
+    if (d->m_systemMenuState == CSDMenuPrivate::NEED_INITIALISATION)
+        d->loadModule();
+
+    if (d->m_systemMenuState == CSDMenuPrivate::AVAILABLE) {
+        assert(d->m_systemMenu);
+
+        qreal qtDpr = window->devicePixelRatio();
+        QPlatformWindow* nativeWindow = window->handle();
+        qreal nativeDpr = nativeWindow->devicePixelRatio();
+
+        qt_csd_menu_event event = {};
+        event.platform = QT_CSD_PLATFORM_UNKNOWN;
+        event.x = (pos.x() * qtDpr) / nativeDpr;
+        event.y = (pos.y() * qtDpr) / nativeDpr;
+
+        const auto winState = window->windowStates();
+        int windowFlags = (winState.testFlag(Qt::WindowMaximized) ? QT_CSD_WINDOW_MAXIMIZED : 0)
+            | (winState.testFlag(Qt::WindowFullScreen) ? QT_CSD_WINDOW_FULLSCREEN : 0)
+            | (winState.testFlag(Qt::WindowMinimized) ? QT_CSD_WINDOW_MINIMIZED: 0)
+            | (isWindowFixedSize(window) ? QT_CSD_WINDOW_FIXED_SIZE : 0);
+
+        event.windowState = static_cast<qt_csd_menu_window_state>(windowFlags);
+
+#ifdef _WIN32
+        if (d->m_plateform == QT_CSD_PLATFORM_WINDOWS)
+        {
+            event.platform = QT_CSD_PLATFORM_WINDOWS;
+            event.data.win32.hwnd = reinterpret_cast<void*>(window->winId());
+        }
+#else
+
+#ifdef QT_GUI_PRIVATE
+        if (d->m_plateform == QT_CSD_PLATFORM_X11)
+        {
+            event.platform = QT_CSD_PLATFORM_X11;
+            event.data.x11.window = window->winId();
+        }
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_CONFIG(wayland)
+        if (d->m_plateform == QT_CSD_PLATFORM_WAYLAND)
+        {
+            event.platform = QT_CSD_PLATFORM_WAYLAND;
+            auto appNative = qApp->nativeInterface<QNativeInterface::QWaylandApplication>();
+            assert(appNative);
+            event.data.wayland.seat = appNative->lastInputSeat();
+            event.data.wayland.serial = appNative->lastInputSerial();
+        }
+#endif // Qt 6.5
+#endif // QT_GUI_PRIVATE
+#endif // _WIN32
+
+        bool ret = d->m_systemMenu->popup(d->m_systemMenu, &event);
+        if (ret)
+            return;
+    }
+
+    d->fallbackMenu(pos);
+}
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdmenu.hpp Added

@@ -0,0 +1,57 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef CSDMENU_HPP
+#define CSDMENU_HPP
+
+#include <QQmlEngine>
+#include <QMenu>
+
+Q_MOC_INCLUDE("maininterface/mainctx.hpp")
+class MainCtx;
+
+class CSDMenuPrivate;
+class CSDMenu : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+    Q_PROPERTY(MainCtx* ctx READ getCtx WRITE setCtx NOTIFY ctxChanged FINAL)
+    Q_PROPERTY(bool menuVisible READ getMenuVisible NOTIFY menuVisibleChanged FINAL)
+
+public:
+    explicit CSDMenu(QObject* parent = nullptr);
+    ~CSDMenu();
+
+public:
+    Q_INVOKABLE void popup(const QPoint &windowpos);
+
+    MainCtx* getCtx() const;
+    void setCtx(MainCtx* ctx);
+
+    bool getMenuVisible() const;
+
+signals:
+    void ctxChanged(MainCtx*);
+    void menuVisibleChanged(bool);
+
+protected:
+    QScopedPointer<CSDMenuPrivate> d_ptr;
+    Q_DECLARE_PRIVATE(CSDMenu)
+};
+
+#endif // CSDMENU_HPP

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdmenu_module.h Added

@@ -0,0 +1,91 @@
+#ifndef QTCSDMENU_MODULE_H
+#define QTCSDMENU_MODULE_H
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_objects.h>
+
+#include <stdint.h>
+
+struct xcb_connection_t;
+
+struct wl_display;
+struct wl_seat;
+struct xdg_toplevel;
+
+typedef enum {
+    QT_CSD_PLATFORM_UNKNOWN,
+    QT_CSD_PLATFORM_WAYLAND,
+    QT_CSD_PLATFORM_X11,
+    QT_CSD_PLATFORM_WINDOWS
+} qt_csd_menu_platform;
+
+typedef enum {
+    QT_CSD_WINDOW_FULLSCREEN = (1 << 0),
+    QT_CSD_WINDOW_MAXIMIZED  = (1 << 1),
+    QT_CSD_WINDOW_MINIMIZED  = (1 << 2),
+    QT_CSD_WINDOW_FIXED_SIZE = (1 << 3)
+} qt_csd_menu_window_state;
+
+
+typedef void (*notifyMenuVisibleCallback)(void* userData, bool visible);
+
+//information about the window, plateform dependent
+typedef struct {
+    qt_csd_menu_platform platform;
+    union {
+        struct {
+            struct xcb_connection_t* connection;
+            uint32_t rootwindow;
+        } x11;
+        struct {
+            struct wl_display* display;
+            struct xdg_toplevel* toplevel;
+        } wayland;
+        struct {
+            void* hwnd;
+        } windows;
+    } data;
+
+    //is the UI rtl or ltr
+    bool isRtl;
+
+    //callback called to notify that the menu is visible/hidden
+    notifyMenuVisibleCallback notifyMenuVisible;
+    //user data passed to callbacks
+    void* userData;
+} qt_csd_menu_info;
+
+typedef struct {
+    qt_csd_menu_platform platform;
+    union {
+        struct {
+            struct wl_seat* seat;
+            uint32_t serial;
+        } wayland;
+        struct {
+            uint32_t window;
+        } x11;
+        struct {
+            void* hwnd;
+        } win32;
+    } data;
+    int x;
+    int y;
+    qt_csd_menu_window_state windowState;
+} qt_csd_menu_event;
+
+typedef struct qt_csd_menu_t {
+    struct vlc_object_t obj;
+    void* p_sys;
+
+    bool (*popup)(struct qt_csd_menu_t* menu, qt_csd_menu_event* event);
+} qt_csd_menu_t;
+
+typedef int (*qt_csd_menu_open)(qt_csd_menu_t* obj, qt_csd_menu_info* info);
+
+#endif // QTCSDMENU_MODULE_H

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdmenu_wayland.c Added

@@ -0,0 +1,127 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#include "csdmenu_wayland.h"
+
+#include <assert.h>
+#include <wayland-client.h>
+#include "xdg-shell-client-protocol.h"
+
+typedef struct {
+    struct wl_display* display;
+    struct wl_event_queue* queue;
+    struct xdg_wm_base *wm_base;
+    struct xdg_toplevel *toplevel;
+    bool supportWindowMenu;
+} csd_menu_priv_t;
+
+static void csd_registry_global_cb(void* data, struct wl_registry* registry,
+                                   uint32_t id, const char* iface, uint32_t version)
+{
+    qt_csd_menu_t* obj = (qt_csd_menu_t*)data;
+    csd_menu_priv_t* sys = (csd_menu_priv_t*)obj->p_sys;
+
+    if (!strcmp(iface, "xdg_wm_base")) {
+        sys->wm_base = (struct xdg_wm_base*)wl_registry_bind(registry, id, &xdg_wm_base_interface, version);
+    }
+}
+
+static void csd_registry_global_remove_cb(void* data, struct wl_registry* registry, uint32_t id)
+{
+    VLC_UNUSED(data);
+    VLC_UNUSED(registry);
+    VLC_UNUSED(id);
+}
+
+static const struct wl_registry_listener csd_registry_cbs = {
+    csd_registry_global_cb,
+    csd_registry_global_remove_cb,
+};
+
+static bool CSDMenuPopup(qt_csd_menu_t* p_this, qt_csd_menu_event* event)
+{
+    csd_menu_priv_t* sys = (csd_menu_priv_t*)p_this->p_sys;
+    assert (event->platform == QT_CSD_PLATFORM_WAYLAND);
+
+    if (!sys->supportWindowMenu)
+        return false;
+
+    xdg_toplevel_show_window_menu(sys->toplevel, event->data.wayland.seat, event->data.wayland.serial, event->x, event->y);
+
+    return true;
+}
+
+void WaylandCSDMenuClose(vlc_object_t* obj)
+{
+    qt_csd_menu_t* menu = (qt_csd_menu_t*)obj;
+    csd_menu_priv_t* sys = (csd_menu_priv_t*)menu->p_sys;
+    if (sys->wm_base)
+        xdg_wm_base_destroy(sys->wm_base);
+    if (sys->queue)
+        wl_event_queue_destroy(sys->queue);
+}
+
+int WaylandCSDMenuOpen(qt_csd_menu_t* p_this, qt_csd_menu_info* info)
+{
+    if (info->platform != QT_CSD_PLATFORM_WAYLAND) {
+        return VLC_EGENERIC;
+    }
+
+    if (info->data.wayland.display == NULL || info->data.wayland.toplevel == NULL) {
+        msg_Warn(p_this, "wayland display or surface not provided");
+        return VLC_EGENERIC;
+    }
+
+    csd_menu_priv_t* sys = (csd_menu_priv_t*)vlc_obj_calloc(p_this, 1, sizeof(csd_menu_priv_t));
+    if (!sys)
+        return VLC_ENOMEM;
+
+    p_this->p_sys = sys;
+
+    sys->display = info->data.wayland.display;
+
+    sys->queue = wl_display_create_queue(sys->display);
+    void* wrapper = wl_proxy_create_wrapper(sys->display);
+    wl_proxy_set_queue((struct wl_proxy*)wrapper, sys->queue);
+
+    struct wl_registry* registry = wl_display_get_registry((struct wl_display*)wrapper);
+    wl_proxy_wrapper_destroy(wrapper);
+
+    wl_registry_add_listener(registry, &csd_registry_cbs, p_this);
+    wl_display_roundtrip_queue(sys->display, sys->queue);
+
+    wl_registry_destroy(registry);
+
+    if (!sys->wm_base) {
+        msg_Dbg(p_this, "wm_base not found");
+        goto error;
+    }
+
+    sys->toplevel = info->data.wayland.toplevel;
+
+    //module functions
+    p_this->popup = CSDMenuPopup;
+
+    return VLC_SUCCESS;
+
+error:
+    p_this->p_sys = NULL;
+    WaylandCSDMenuClose(VLC_OBJECT(p_this));
+    vlc_obj_free(p_this, sys);
+    return VLC_EGENERIC;
+}
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdmenu_wayland.h Added

@@ -0,0 +1,26 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef CSDMENU_WAYLAND_HPP
+#define CSDMENU_WAYLAND_HPP
+
+#include "csdmenu_module.h"
+
+int WaylandCSDMenuOpen(qt_csd_menu_t* obj, qt_csd_menu_info* info);
+void WaylandCSDMenuClose(vlc_object_t* obj);
+
+#endif // CSDMENU_WAYLAND_HPP

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdmenu_win32.c Added

@@ -0,0 +1,92 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#include <windows.h>
+#include <winuser.h>
+#include <assert.h>
+#include "csdmenu_win32.h"
+
+typedef struct
+{
+    bool isRtl;
+    notifyMenuVisibleCallback notifyMenuVisible;
+    void* userData;
+} qt_csd_menu_priv_t;
+
+static bool Popup(struct qt_csd_menu_t* menu, qt_csd_menu_event* event)
+{
+    qt_csd_menu_priv_t* sys = (qt_csd_menu_priv_t*)menu->p_sys;
+
+    assert(event->platform == QT_CSD_PLATFORM_WINDOWS);
+
+    HWND hwnd = event->data.win32.hwnd;
+    HMENU hmenu = GetSystemMenu(hwnd, FALSE);
+    if (!hmenu)
+        return false;
+
+    // Tweak the menu items according to the current window status.
+    const bool maxOrFull = event->windowState & (QT_CSD_WINDOW_FULLSCREEN |  QT_CSD_WINDOW_MAXIMIZED);
+    const bool fixedSize = event->windowState & QT_CSD_WINDOW_FIXED_SIZE;
+
+    EnableMenuItem(hmenu, SC_MOVE, (MF_BYCOMMAND | (!maxOrFull ? MFS_ENABLED : MFS_DISABLED)));
+    EnableMenuItem(hmenu, SC_SIZE, (MF_BYCOMMAND | ((!maxOrFull && !fixedSize) ? MFS_ENABLED : MFS_DISABLED)));
+
+    EnableMenuItem(hmenu, SC_RESTORE, (MF_BYCOMMAND | ((maxOrFull && !fixedSize) ? MFS_ENABLED : MFS_DISABLED)));
+    EnableMenuItem(hmenu, SC_MINIMIZE, (MF_BYCOMMAND | MFS_ENABLED));
+    EnableMenuItem(hmenu, SC_MAXIMIZE, (MF_BYCOMMAND | ((!maxOrFull && !fixedSize) ? MFS_ENABLED : MFS_DISABLED)));
+    EnableMenuItem(hmenu, SC_CLOSE, (MF_BYCOMMAND | MFS_ENABLED));
+
+
+    const unsigned alignment = sys->isRtl ? TPM_RIGHTALIGN : TPM_LEFTALIGN;
+
+    // show menu
+
+    if (sys->notifyMenuVisible)
+        sys->notifyMenuVisible(sys->userData, true);
+
+    const int action = TrackPopupMenu(hmenu, (TPM_RETURNCMD | alignment)
+                                      , event->x, event->y
+                                      , 0, hwnd, NULL);
+
+    // unlike native system menu which sends WM_SYSCOMMAND, TrackPopupMenu sends WM_COMMAND
+    // imitate native system menu by sending the action manually as WM_SYSCOMMAND
+    PostMessageW(hwnd, WM_SYSCOMMAND, action, 0);
+
+    if (sys->notifyMenuVisible)
+        sys->notifyMenuVisible(sys->userData, false);
+
+    return true;
+}
+
+int QtWin32CSDMenuOpen(qt_csd_menu_t* p_this, qt_csd_menu_info* info)
+{
+    if (info->platform != QT_CSD_PLATFORM_WINDOWS)
+        return VLC_EGENERIC;
+
+    qt_csd_menu_priv_t* sys = vlc_obj_malloc(p_this, sizeof(qt_csd_menu_priv_t));
+    if (!sys)
+        return VLC_ENOMEM;
+
+    sys->isRtl = info->isRtl;
+
+    sys->notifyMenuVisible = info->notifyMenuVisible;
+    sys->userData = info->userData;
+
+    p_this->p_sys = sys;
+    p_this->popup = Popup;
+    return VLC_SUCCESS;
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdmenu_win32.h Added

@@ -0,0 +1,33 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef CSDMENU_WIN32_H
+#define CSDMENU_WIN32_H
+
+#include "csdmenu_module.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int QtWin32CSDMenuOpen(qt_csd_menu_t* obj, qt_csd_menu_info* info);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // CSDMENU_WIN32_H

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdmenu_x11.cpp Added

@@ -0,0 +1,93 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#include "csdmenu_x11.h"
+#include <cassert>
+#include "maininterface/compositor_x11_utils.hpp"
+
+typedef struct {
+    xcb_connection_t* connection;
+    xcb_atom_t gtkShowWindowMenuAtom;
+    xcb_window_t rootWindow;
+} csd_menu_priv_t;
+
+extern "C" {
+
+static bool CSDMenuPopup(qt_csd_menu_t* p_this, qt_csd_menu_event* event)
+{
+    csd_menu_priv_t* sys = static_cast<csd_menu_priv_t*>(p_this->p_sys);
+
+    assert(event->platform == QT_CSD_PLATFORM_X11);
+
+    xcb_client_message_event_t x11event;
+    x11event.response_type = XCB_CLIENT_MESSAGE;
+    x11event.type = sys->gtkShowWindowMenuAtom;
+    x11event.window = event->data.x11.window;
+    x11event.sequence = 0;
+    x11event.format = 32;
+    x11event.data.data320 = 0; //device id ignored
+    x11event.data.data321 = event->x;
+    x11event.data.data322 = event->y;
+    x11event.data.data323 = 0;
+    x11event.data.data324 = 0;
+
+    // ungrab pointer to allow the window manager to grab them
+    xcb_ungrab_pointer(sys->connection, XCB_CURRENT_TIME);
+    xcb_send_event(sys->connection, false, sys->rootWindow, XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY, reinterpret_cast<const char*>(&x11event));
+    return true;
+}
+
+int X11CSDMenuOpen(qt_csd_menu_t* p_this, qt_csd_menu_info* info)
+{
+    if (info->platform != QT_CSD_PLATFORM_X11) {
+        return VLC_EGENERIC;
+    }
+
+    if (info->data.x11.connection == NULL || info->data.x11.rootwindow == 0) {
+        msg_Warn(p_this, "X11 connection or root window missing");
+        return VLC_EGENERIC;
+    }
+
+    csd_menu_priv_t* sys = (csd_menu_priv_t*)vlc_obj_calloc(p_this, 1, sizeof(csd_menu_priv_t));
+    if (!sys)
+        return VLC_ENOMEM;
+
+    sys->connection = info->data.x11.connection;
+    sys->rootWindow = info->data.x11.rootwindow;
+
+    sys->gtkShowWindowMenuAtom = vlc::getInternAtom(sys->connection, "_GTK_SHOW_WINDOW_MENU");
+
+    if (sys->gtkShowWindowMenuAtom == 0)
+        goto error;
+
+    if (!vlc::wmNetSupport(sys->connection, info->data.x11.rootwindow, sys->gtkShowWindowMenuAtom))
+        goto error;
+
+
+    //module functions
+    p_this->popup = CSDMenuPopup;
+    p_this->p_sys = sys;
+
+    return VLC_SUCCESS;
+
+error:
+    p_this->p_sys = NULL;
+    vlc_obj_free(p_this, sys);
+    return VLC_EGENERIC;
+}
+
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/csdmenu_x11.h Added

@@ -0,0 +1,33 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef CSD_MENU_X11_H
+#define CSD_MENU_X11_H
+
+#include "csdmenu_module.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int X11CSDMenuOpen(qt_csd_menu_t* obj, qt_csd_menu_info* info);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // CSD_MENU_X11_H

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/effects_image_provider.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/effects_image_provider.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/flickable_scroll_handler.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/flickable_scroll_handler.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/imagehelper.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/imagehelper.cpp Changed

@@ -28,25 +28,76 @@
 #include <QApplication>
 #include <QPainter>
 #include <QScreen>
-#include <QSvgRenderer>
+#include <QImageIOHandler>
+#include <QPluginLoader>
+#include <QFile>
 #include "imagehelper.hpp"
 
 
 QPixmap ImageHelper::loadSvgToPixmap( const QString &path, qint32 i_width, qint32 i_height )
 {
     qreal ratio = QApplication::primaryScreen()->devicePixelRatio();
-    QPixmap pixmap( QSize( i_width, i_height ) * ratio );
 
+    const auto svgHandler = QScopedPointer<QImageIOHandler>(createSvgImageIOHandler());
 
-    pixmap.fill( Qt::transparent );
+    QImage image;
+    const auto size = QSize( i_width, i_height ) * ratio;
 
-    QSvgRenderer renderer( path );
-    QPainter painter;
+    if (svgHandler)
+    {
+        QFile file(path);
 
-    painter.begin( &pixmap );
-    renderer.render( &painter );
-    painter.end();
+        if (file.open(QFile::ReadOnly))
+        {
+            svgHandler->setDevice(&file);
+            svgHandler->setOption(QImageIOHandler::ScaledSize, size);
 
-    pixmap.setDevicePixelRatio( ratio );
-    return pixmap;
+            if (svgHandler->canRead())
+                svgHandler->read(&image);
+            else
+                qWarning() << "ImageHelper: svg image handler can not read file " << path << ".";
+        }
+        else
+        {
+            qWarning() << "ImageHelper: can not open file " << path << ".";
+        }
+    }
+
+    if (Q_UNLIKELY(image.isNull()))
+    {
+        image = QImage(size, QImage::Format_RGB32);
+        image.fill(QColor("purple"));
+    }
+
+    image.setDevicePixelRatio(ratio);
+    return QPixmap::fromImage(image);
+}
+
+QImageIOHandler *ImageHelper::createSvgImageIOHandler()
+{
+    static const auto plugin = () -> QPointer<QImageIOPlugin> {
+#ifdef QT_STATIC
+        const auto& staticPlugins = QPluginLoader::staticInstances();
+        const auto it = std::find_if(staticPlugins.begin(), staticPlugins.end(), (QObject *obj) -> bool {
+            return obj->inherits("QSvgPlugin");
+        });
+
+        if (it != staticPlugins.end())
+            return qobject_cast<QImageIOPlugin*>(*it);
+        else
+            return nullptr;
+#else
+        QPluginLoader loader(QStringLiteral("imageformats/qsvg")); // Official Qt plugin
+        // No need to check the metadata (or inherits `QSvgPlugin`), a plugin named "qsvg" should already support svg.
+        return qobject_cast<QImageIOPlugin*>(loader.instance());
+#endif
+    }();
+
+    if (!plugin)
+    {
+        qWarning() << "ImageHelper: svg image plugin is not found.";
+        return nullptr;
+    }
+
+    return plugin->create(nullptr);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/imagehelper.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/imagehelper.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/listcache.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/listcache.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/listcache.hxx -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/listcache.hxx Changed

@@ -375,6 +375,27 @@
 }
 
 template<typename T>
+void  ListCache<T>::fetchMore()
+{
+    const CacheData* cache = m_cachedData.get();
+    if (!cache)
+        cache = m_oldData.get();
+    if (!cache)
+        return; //nothing loaded yet
+
+    if (cache->loadedCount >= cache->queryCount)
+        return;
+
+    if (m_maxReferedIndex >= cache->loadedCount + m_chunkSize)
+        return;
+
+    m_maxReferedIndex = std::min(cache->loadedCount + m_chunkSize, cache->queryCount);
+    if (!m_appendTask
+            && cache != m_oldData.get()) // data will be loaded after completing pending updates
+        asyncFetchMore();
+}
+
+template<typename T>
 void ListCache<T>::invalidate()
 {
     if (m_cachedData)
@@ -521,8 +542,6 @@
             if (m_countTask != taskId)
                 return;
 
-            m_countTask = 0;
-
             //quite unlikley but model may change between count and load
             if (unlikely(list.size() > maximumCount))
             {
@@ -556,6 +575,8 @@
                     emit localSizeChanged(0, m_cachedData->maximumCount);
             }
 
+            m_countTask = 0;
+
             if (m_needReload)
             {
                 m_needReload  = false;
@@ -579,10 +600,10 @@
 template<typename T>
 void ListCache<T>::asyncFetchMore()
 {
+    assert(m_cachedData);
     if (m_maxReferedIndex <= m_cachedData->loadedCount)
         return;
 
-    assert(m_cachedData);
     if (m_appendTask)
         m_loader->cancelTask(m_appendTask);
 
@@ -615,4 +636,11 @@
         });
 }
 
+
+template<typename T>
+inline ssize_t ListCache<T>::loadedCount() const
+{
+    return m_cachedData ? m_cachedData->loadedCount : COUNT_UNINITIALIZED;
+}
+
 #endif /* LISTCACHE_HXX */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/model_recovery_agent.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/model_recovery_agent.hpp Changed

@@ -27,6 +27,7 @@
 #include <QMessageBox>
 #include <QTemporaryFile>
 #include <QAbstractItemModel>
+#include <QLockFile>
 
 #include <cstdio>
 
@@ -39,6 +40,7 @@
     QString m_recoveryFileName;
     QTimer m_timer;
     bool m_conditionDismissInitialDirtiness = false;
+    std::unique_ptr<QLockFile> m_lockFile;
 
 public:
     // NOTE: settings and model must outlive the instance of this class.
@@ -56,6 +58,12 @@
             if (!recoveryFileName.isEmpty())
             {
                 m_recoveryFileName = std::move(recoveryFileName);
+                {
+                    m_lockFile = std::make_unique<QLockFile>(m_recoveryFileName + QStringLiteral(".lock"));
+                    m_lockFile->setStaleLockTime(0); // if the process crashed, QLockFile considers the lock stale regardless of the lock time
+                    if (!m_lockFile->tryLock()) // if the older instance is still alive, it would have the lock
+                        throw std::exception(); // Older instance is managing the recovery, don't take over. We don't support recovering multiple models at the moment.
+                }
                 const QFileInfo fileInfo(m_recoveryFileName);
                 if (fileInfo.size() > 0)
                 {
@@ -81,6 +89,14 @@
             if (!temporaryFile.open())
                 throw std::exception();
             m_recoveryFileName = temporaryFile.fileName();
+            {
+                assert(!m_lockFile);
+                m_lockFile = std::make_unique<QLockFile>(m_recoveryFileName + QStringLiteral(".lock"));
+                m_lockFile->setStaleLockTime(0); // if the process crashed, QLockFile considers the lock stale regardless of the lock time
+                assert(!m_lockFile->isLocked()); // the file name is new here, it can not be locked before
+                if (!m_lockFile->tryLock())
+                    throw std::exception();
+            }
             settings->setValue(m_key, m_recoveryFileName);
             settings->sync();
         }
@@ -97,13 +113,20 @@
 
             assert(!m_recoveryFileName.isEmpty());
 
-            const char* tmpFileName = (m_recoveryFileName + QStringLiteral(".part")).toLatin1();
-            const char* recoveryFileName = m_recoveryFileName.toLatin1();
+            const QByteArray tmpFileName = (m_recoveryFileName + QStringLiteral(".part")).toLatin1();
+            const QByteArray recoveryFileName = m_recoveryFileName.toLatin1();
+
+            if (model->isEmpty())
+            {
+                remove(recoveryFileName.constData());
+                return;
+            }
 
-            model->serialize(tmpFileName);
+            if (model->serialize(tmpFileName.constData()) != VLC_SUCCESS)
+                return;
 
-            remove(recoveryFileName);
-            if (!rename(tmpFileName, recoveryFileName))
+            remove(recoveryFileName.constData());
+            if (!rename(tmpFileName.constData(), recoveryFileName.constData()))
             {
                 assert(m_settings);
                 m_settings->sync();
@@ -137,7 +160,7 @@
         assert(m_settings);
 
         m_settings->sync();
-        assert(m_settings->contains(m_key));
+
         if (m_settings->value(m_key) == m_recoveryFileName)
         {
             m_settings->remove(m_key);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/qml/GridSizeHelper.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/qml/GridSizeHelper.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/qml/Helpers.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/qml/Helpers.qml Changed

@@ -40,20 +40,6 @@
         item.forceActiveFocus(reason);
     }
 
-    function applyVolume(player, delta) {
-        // Degrees to steps for standard mouse
-        delta = delta / 8 / 15
-
-        const steps = Math.ceil(Math.abs(delta))
-
-        player.muted = false
-
-        if (delta > 0)
-            player.setVolumeUp(steps)
-        else
-            player.setVolumeDown(steps)
-    }
-
     function pointInRadius(x, y, radius) {
          return (x * x + y * y < radius * radius)
     }
@@ -122,11 +108,20 @@
         else
             newContentY = flickable.contentY
 
-        return newContentY
+        return clamp(newContentY, flickable.originY, flickable.originY + flickable.contentHeight)
     }
 
     function isArray(obj) {
         return (obj?.length !== undefined) ?? false
     }
 
+    // Similar to Item::contains(), but accepts area (rectangle):
+    function itemIntersects(item: Item, area: rect) : bool {
+        if (!item)
+            return false
+        if (area.width <= 0.0 || area.height <= 0.0)
+            return false
+        return !(((item.x < (area.x + area.width)) && ((item.x + item.width) > area.x)) &&
+                 ((item.y < (area.y + area.height)) && ((item.y + item.height) > area.y)))
+    }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/qml/MLContextMenu.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/qml/MLContextMenu.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/qml/NativeMenu.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/qml/NativeMenu.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/qml/ViewDragAutoScrollHandler.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/qml/ViewDragAutoScrollHandler.qml Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/qsgtextureview.cpp Added

@@ -0,0 +1,243 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#include "qsgtextureview.hpp"
+
+QSGTextureView::QSGTextureView(QSGTexture *texture)
+{
+    setTexture(texture);
+}
+
+QSGTexture *QSGTextureView::texture() const
+{
+    return m_texture;
+}
+
+void QSGTextureView::setTexture(QSGTexture *texture)
+{
+    if (m_texture == texture)
+        return;
+
+    if (m_texture)
+    {
+        disconnect(m_texture, nullptr, this, nullptr);
+    }
+
+    m_texture = texture;
+
+    if (texture)
+    {
+        setFiltering(texture->filtering());
+        if (!texture->isAtlasTexture())
+        {
+            // Atlas textures are not rendered if they have mipmap filtering.
+            // Normally it should not happen because atlas textures are not
+            // mipmapped, mipmap filtering should not change anything.
+            setMipmapFiltering(texture->mipmapFiltering());
+        }
+
+        setAnisotropyLevel(texture->anisotropyLevel());
+        setHorizontalWrapMode(texture->horizontalWrapMode());
+        setVerticalWrapMode(texture->verticalWrapMode());
+
+        if (texture->inherits("QSGLayer"))
+        {
+            connect(texture, SIGNAL(updateRequested()), this, SLOT(adjustNormalRect()));
+            connect(texture, SIGNAL(updateRequested()), this, SIGNAL(updateRequested()));
+        }
+    }
+
+    adjustNormalRect();
+    emit updateRequested();
+}
+
+bool QSGTextureView::adjustNormalRect() const
+{
+    if (!m_rect.isValid())
+        return false;
+
+    assert(m_texture);
+
+    QSizeF size = m_texture->textureSize();
+
+    if (size.isValid())
+    {
+        m_normalRect = QRectF(m_rect.x() / size.width(),
+                              m_rect.y() / size.height(),
+                              m_rect.width() / size.width(),
+                              m_rect.height() / size.height());
+        m_normalRectChanged = true;
+        return true;
+    }
+
+    // Do not emit `updateRequested()` here, as this method may be called
+    // from `normalizedTextureSubRect()`. At the same time, this method is
+    // called when `updateRequested()` is emitted, it should not emit the
+    // same signal. Instead, `setRect()` emits `updateRequested()` when
+    // applicable.
+
+    return false;
+}
+
+QRect QSGTextureView::rect() const
+{
+    return m_rect;
+}
+
+void QSGTextureView::setRect(const QRect &rect)
+{
+    if (m_rect == rect)
+        return;
+
+    if (!rect.isValid())
+        return;
+
+    m_rect = rect;
+
+    // We need the source texture in order to calculate the normal rect.
+    // If texture is not available when the rect is set, it will be done
+    // later in `normalizedTextureSubRect()`.
+    if (m_texture)
+    {
+        adjustNormalRect();
+        emit updateRequested();
+    }
+    else
+    {
+        // Invalidate the normal rect, so that it is calculated via
+        // `normalizedTextureSubRect()` when there is a texture:
+        m_normalRect.reset();
+    }
+}
+
+qint64 QSGTextureView::comparisonKey() const
+{
+    assert(m_texture);
+    return m_texture->comparisonKey();
+}
+
+QRhiTexture *QSGTextureView::rhiTexture() const
+{
+    assert(m_texture);
+    return m_texture->rhiTexture();
+}
+
+QSize QSGTextureView::textureSize() const
+{
+    assert(m_texture);
+    if (m_rect.isNull())
+        return m_texture->textureSize();
+    else
+        return m_rect.size();
+}
+
+bool QSGTextureView::hasAlphaChannel() const
+{
+    assert(m_texture);
+    return m_texture->hasAlphaChannel();
+}
+
+bool QSGTextureView::hasMipmaps() const
+{
+    assert(m_texture);
+    return m_texture->hasMipmaps();
+}
+
+QRectF QSGTextureView::normalizedTextureSubRect() const
+{
+    assert(m_texture);
+
+    if (!m_normalRect.has_value())
+        adjustNormalRect();
+
+    QRectF subRect = m_texture->normalizedTextureSubRect();
+
+    if (m_normalRect.has_value() && m_normalRect->isValid())
+    {
+        // Sub texture:
+        // NOTE: The source texture might be in the atlas.
+        subRect = QRectF(subRect.x() + m_normalRect->x() * subRect.width(),
+                         subRect.y() + m_normalRect->y() * subRect.height(),
+                         m_normalRect->width() * subRect.width(),
+                         m_normalRect->height() * subRect.height());
+    }
+
+    return subRect;
+}
+
+bool QSGTextureView::isAtlasTexture() const
+{
+    assert(m_texture);
+    // If Qt does not respect normalizedTextureSubRect() of a QSGTexture
+    // that does not report to be in the atlas texture, we should return
+    // true regardless. Experiments show that Qt cares about the normalized
+    // sub rect even if the texture is not in the atlas.
+    return m_texture->isAtlasTexture();
+}
+
+QSGTexture *QSGTextureView::removedFromAtlas(QRhiResourceUpdateBatch *batch) const
+{
+    assert(m_texture); // it is absurd to call removedFromAtlas() when there is no target
+
+    // We can "remove" the target texture from the atlas, and re-attach the view to the detached texture.
+    // It should be noted that this method does not mutate the target texture, which can be guessed by
+    // the method signature (being a const method), but rather creates a new texture which is an independent
+    // texture that has its content copied from the atlas texture (still owned by the atlas texture).
+    // This would not cause a leak, because:
+    // 1) we are not owning the atlas texture (current view target) here.
+    // 2) the returned (detached) texture is owned by the atlas texture (current view target).
+    QSGTexture *const detachedTexture = m_texture->removedFromAtlas(batch);
+    if (Q_LIKELY(detachedTexture))
+    {
+        // This virtual method is const, which is fine for QSGTexture (removing
+        // from atlas means returning a new image which is a copy from the relevant
+        // part of the atlas), but not for QSGTextureView, because the texture view
+        // needs to mutate to point to the detached texture. There is not much to
+        // do besides 1) creating a new QSGTextureView and returning it, and leaking
+        // this instance 2) using const cast.
+        const_cast<QSGTextureView*>(this)->setTexture(detachedTexture);
+        return const_cast<QSGTextureView*>(this);
+    }
+
+    return nullptr;
+}
+
+void QSGTextureView::commitTextureOperations(QRhi *rhi, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    if (m_texture)
+        m_texture->commitTextureOperations(rhi, resourceUpdates);
+}
+
+bool QSGTextureView::updateTexture()
+{
+    bool ret = false;
+
+    if (const auto dynamicTexture = qobject_cast<QSGDynamicTexture*>(m_texture))
+    {
+        if (dynamicTexture->updateTexture())
+            ret = true;
+    }
+
+    if (m_normalRectChanged)
+    {
+        ret = true;
+        m_normalRectChanged = false;
+    }
+
+    return ret;
+}
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/qsgtextureview.hpp Added

@@ -0,0 +1,68 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef QSGTEXTUREVIEW_HPP
+#define QSGTEXTUREVIEW_HPP
+
+#include <QSGTexture>
+
+#include <optional>
+
+class QSGTextureView : public QSGDynamicTexture
+{
+    Q_OBJECT
+
+    QSGTexture* m_texture = nullptr;
+    QRect m_rect;
+    mutable std::optional<QRectF> m_normalRect;
+    mutable bool m_normalRectChanged = false;
+
+private slots:
+    bool adjustNormalRect() const;
+
+public:
+    QSGTextureView() = default;
+    explicit QSGTextureView(QSGTexture* texture);
+
+    QSGTexture* texture() const;
+    void setTexture(QSGTexture* texture);
+
+    // Subtexturing:
+    QRect rect() const;
+    void setRect(const QRect& rect);
+
+    qint64 comparisonKey() const override;
+    QRhiTexture *rhiTexture() const override;
+    QSize textureSize() const override;
+    bool hasAlphaChannel() const override;
+    bool hasMipmaps() const override;
+
+    QRectF normalizedTextureSubRect() const override;
+
+    bool isAtlasTexture() const override;
+
+    QSGTexture *removedFromAtlas(QRhiResourceUpdateBatch *resourceUpdates = nullptr) const override;
+
+    void commitTextureOperations(QRhi *rhi, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    bool updateTexture() override;
+
+signals:
+    void updateRequested();
+};
+
+#endif // QSGTEXTUREVIEW_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/renderer_manager.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/renderer_manager.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/shared_input_item.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/shared_input_item.hpp Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/ui_notifier.cpp Added

@@ -0,0 +1,45 @@
+/*****************************************************************************
+ * Copyright (C) 2025 the VideoLAN team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include "ui_notifier.hpp"
+
+#include "maininterface/mainctx.hpp"
+
+UINotifier::UINotifier(MainCtx *ctx, QObject *parent)
+    : QObject {parent}
+    , m_ctx {ctx}
+{
+    setupNotifications();
+}
+
+void UINotifier::setupNotifications()
+{
+    connect(m_ctx, &MainCtx::intfScaleFactorChanged, this, this()
+    {
+        const QString scale = QString::number(m_ctx->getIntfScaleFactor() * 100);
+        emit showNotification(Scale
+                              , qtr("Scale: %1%").arg(scale));
+    });
+
+    connect(m_ctx, &MainCtx::minimalViewChanged, this, this()
+    {
+        if (m_ctx->isMinimalView())
+            emit showNotification(MinimalView
+                                  , qtr("Minimal View"));
+    });
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/ui_notifier.hpp Added

@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (C) 2025 the VideoLAN team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef UI_NOTIFIER_HPP
+#define UI_NOTIFIER_HPP
+
+#include <QObject>
+
+class MainCtx;
+
+class UINotifier : public QObject
+{
+    Q_OBJECT
+public:
+    UINotifier(MainCtx *ctx, QObject *parent = nullptr);
+
+    enum ID
+    {
+        Scale,
+        MinimalView
+    };
+
+    Q_ENUM(ID)
+
+signals:
+    void showNotification(ID id, const QString &text);
+
+private:
+    void setupNotifications();
+
+    MainCtx *m_ctx;
+};
+
+#endif // UI_NOTIFIER_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/validators.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/validators.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/vlcaccess_image_provider.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/vlcaccess_image_provider.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/vlcaccess_image_provider.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/vlcaccess_image_provider.hpp Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/vlchotkeyconverter.cpp Added

@@ -0,0 +1,342 @@
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "vlchotkeyconverter.hpp"
+#include "qt.hpp"
+
+#include <QKeyEvent>
+#include <QWheelEvent>
+#include <QApplication>
+#include <vlc_actions.h>
+
+/***************************************************************************
+ * Hotkeys converters
+ ***************************************************************************/
+int qtKeyModifiersToVLC( const QInputEvent& e )
+{
+    int i_keyModifiers = 0;
+    if( e.modifiers() & Qt::ShiftModifier ) i_keyModifiers |= KEY_MODIFIER_SHIFT;
+    if( e.modifiers() & Qt::AltModifier ) i_keyModifiers |= KEY_MODIFIER_ALT;
+    if( e.modifiers() & Qt::ControlModifier ) i_keyModifiers |= KEY_MODIFIER_CTRL;
+    if( e.modifiers() & Qt::MetaModifier ) i_keyModifiers |= KEY_MODIFIER_META;
+    return i_keyModifiers;
+}
+
+typedef struct
+{
+    int      qt;
+    uint32_t vlc;
+} vlc_qt_key_t;
+
+static const vlc_qt_key_t keys =
+    {
+        { Qt::Key_Escape,                KEY_ESC },
+        { Qt::Key_Tab,                   '\t', },
+        // Qt::Key_Backtab
+        { Qt::Key_Backspace,             '\b' },
+        { Qt::Key_Return,                '\r' },
+        { Qt::Key_Enter,                 '\r' }, // numeric pad
+        { Qt::Key_Insert,                KEY_INSERT },
+        { Qt::Key_Delete,                KEY_DELETE },
+        { Qt::Key_Pause,                 KEY_PAUSE },
+        { Qt::Key_Print,                 KEY_PRINT },
+        // Qt::Key_SysReq
+        // Qt::Key_Clear
+        { Qt::Key_Home,                  KEY_HOME },
+        { Qt::Key_End,                   KEY_END },
+        { Qt::Key_Left,                  KEY_LEFT },
+        { Qt::Key_Up,                    KEY_UP },
+        { Qt::Key_Right,                 KEY_RIGHT },
+        { Qt::Key_Down,                  KEY_DOWN },
+        { Qt::Key_PageUp,                KEY_PAGEUP },
+        { Qt::Key_PageDown,              KEY_PAGEDOWN },
+        // Qt::Key_Shift
+        // Qt::Key_Control
+        // Qt::Key_Meta
+        // Qt::Key_Alt
+        // Qt::Key_CapsLock
+        // Qt::Key_NumLock
+        // Qt::Key_ScrollLock
+        /* F1 - F35 - Qt goes to F35, VLC stops at F12 */
+        { Qt::Key_F1,                    KEY_F1 },
+        { Qt::Key_F2,                    KEY_F2 },
+        { Qt::Key_F3,                    KEY_F3 },
+        { Qt::Key_F4,                    KEY_F4 },
+        { Qt::Key_F5,                    KEY_F5 },
+        { Qt::Key_F6,                    KEY_F6 },
+        { Qt::Key_F7,                    KEY_F7 },
+        { Qt::Key_F8,                    KEY_F8 },
+        { Qt::Key_F9,                    KEY_F9 },
+        { Qt::Key_F10,                   KEY_F10 },
+        { Qt::Key_F11,                   KEY_F11 },
+        { Qt::Key_F12,                   KEY_F12 },
+        { Qt::Key_F13,                   KEY_F(13) },
+        { Qt::Key_F14,                   KEY_F(14) },
+        { Qt::Key_F15,                   KEY_F(15) },
+        { Qt::Key_F16,                   KEY_F(16) },
+        { Qt::Key_F17,                   KEY_F(17) },
+        { Qt::Key_F18,                   KEY_F(18) },
+        { Qt::Key_F19,                   KEY_F(19) },
+        { Qt::Key_F20,                   KEY_F(20) },
+        { Qt::Key_F21,                   KEY_F(21) },
+        { Qt::Key_F22,                   KEY_F(22) },
+        { Qt::Key_F23,                   KEY_F(23) },
+        { Qt::Key_F24,                   KEY_F(24) },
+        { Qt::Key_F25,                   KEY_F(25) },
+        { Qt::Key_F26,                   KEY_F(26) },
+        { Qt::Key_F27,                   KEY_F(27) },
+        { Qt::Key_F28,                   KEY_F(28) },
+        { Qt::Key_F29,                   KEY_F(29) },
+        { Qt::Key_F30,                   KEY_F(30) },
+        { Qt::Key_F31,                   KEY_F(31) },
+        { Qt::Key_F32,                   KEY_F(32) },
+        { Qt::Key_F33,                   KEY_F(33) },
+        { Qt::Key_F34,                   KEY_F(34) },
+        { Qt::Key_F35,                   KEY_F(35) },
+
+        // Qt::Key_Super_L
+        // Qt::Key_Super_R
+        { Qt::Key_Menu,                  KEY_MENU },
+        // Qt::Key_Hyper_L
+        // Qt::Key_Hyper_R
+        // Qt::Key_Help
+        // Qt::Key_Direction_L
+        // Qt::Key_Direction_R
+
+        // Qt::Key_Multi_key
+        // Qt::Key_Codeinput
+        // Qt::Key_SingleCandidate
+        // Qt::Key_MultipleCandidate
+        // Qt::Key_PreviousCandidate
+        // Qt::Key_Mode_switch
+        // Qt::Key_Kanji
+        // Qt::Key_Muhenkan
+        // Qt::Key_Henkan
+        // Qt::Key_Romaji
+        // Qt::Key_Hiragana
+        // Qt::Key_Katakana
+        // Qt::Key_Hiragana_Katakana
+        // Qt::Key_Zenkaku
+        // Qt::Key_Hankaku
+        // Qt::Key_Zenkaku_Hankaku
+        // Qt::Key_Touroku
+        // Qt::Key_Massyo
+        // Qt::Key_Kana_Lock
+        // Qt::Key_Kana_Shift
+        // Qt::Key_Eisu_Shift
+        // Qt::Key_Eisu_toggle
+        // Qt::Key_Hangul
+        // Qt::Key_Hangul_Start
+        // Qt::Key_Hangul_End
+        // Qt::Key_Hangul_Hanja
+        // Qt::Key_Hangul_Jamo
+        // Qt::Key_Hangul_Romaja
+        // Qt::Key_Hangul_Jeonja
+        // Qt::Key_Hangul_Banja
+        // Qt::Key_Hangul_PreHanja
+        // Qt::Key_Hangul_PostHanja
+        // Qt::Key_Hangul_Special
+        // Qt::Key_Dead_Grave
+        // Qt::Key_Dead_Acute
+        // Qt::Key_Dead_Circumflex
+        // Qt::Key_Dead_Tilde
+        // Qt::Key_Dead_Macron
+        // Qt::Key_Dead_Breve
+        // Qt::Key_Dead_Abovedot
+        // Qt::Key_Dead_Diaeresis
+        // Qt::Key_Dead_Abovering
+        // Qt::Key_Dead_Doubleacute
+        // Qt::Key_Dead_Caron
+        // Qt::Key_Dead_Cedilla
+        // Qt::Key_Dead_Ogonek
+        // Qt::Key_Dead_Iota
+        // Qt::Key_Dead_Voiced_Sound
+        // Qt::Key_Dead_Semivoiced_Sound
+        // Qt::Key_Dead_Belowdot
+        // Qt::Key_Dead_Hook
+        // Qt::Key_Dead_Horn
+        { Qt::Key_Back,                  KEY_BROWSER_BACK },
+        { Qt::Key_Forward,               KEY_BROWSER_FORWARD },
+        { Qt::Key_Stop,                  KEY_BROWSER_STOP },
+        { Qt::Key_Refresh,               KEY_BROWSER_REFRESH },
+        { Qt::Key_VolumeDown,            KEY_VOLUME_DOWN },
+        { Qt::Key_VolumeMute,            KEY_VOLUME_MUTE },
+        { Qt::Key_VolumeUp,              KEY_VOLUME_UP },
+        // Qt::Key_BassBoost
+        // Qt::Key_BassUp
+        // Qt::Key_BassDown
+        // Qt::Key_TrebleUp
+        // Qt::Key_TrebleDown
+        { Qt::Key_MediaPlay,             KEY_MEDIA_PLAY_PAUSE },
+        { Qt::Key_MediaStop,             KEY_MEDIA_STOP },
+        { Qt::Key_MediaPrevious,         KEY_MEDIA_PREV_TRACK },
+        { Qt::Key_MediaNext,             KEY_MEDIA_NEXT_TRACK },
+        // Qt::Key_MediaRecord
+        { Qt::Key_HomePage,              KEY_BROWSER_HOME },
+        { Qt::Key_Favorites,             KEY_BROWSER_FAVORITES },
+        { Qt::Key_Search,                KEY_BROWSER_SEARCH },
+        // Qt::Key_Standby
+        // Qt::Key_OpenUrl
+        // Qt::Key_LaunchMail
+        // Qt::Key_LaunchMedia
+        /* Qt::Key_Launch0 through Qt::Key_LaunchF */
+        /* ... */
+        { Qt::Key_Reload,                KEY_BROWSER_REFRESH },
+        };
+
+static int keycmp( const void *a, const void *b )
+{
+    const int *q = (const int *)a;
+    const vlc_qt_key_t *m = (const vlc_qt_key_t *)b;
+
+    return *q - m->qt;
+}
+
+int qtEventToVLCKey( QKeyEvent *e )
+{
+    int qtk = e->key();
+    uint32_t i_vlck = 0;
+
+    if( qtk <= 0xff )
+    {
+        /* VLC and X11 use lowercase whereas Qt uses uppercase, this
+         * method should be equal to towlower in case of latin1 */
+        if( qtk >= 'A' && qtk <= 'Z' ) i_vlck = qtk+32;
+        else if( qtk >= 0xC0 && qtk <= 0xDE && qtk != 0xD7) i_vlck = qtk+32;
+        else i_vlck = qtk;
+    }
+    else
+    {
+        const vlc_qt_key_t *map;
+
+        map = (const vlc_qt_key_t *)
+            bsearch( &qtk, (const void *)keys, sizeof(keys)/sizeof(keys0),
+                    sizeof(*keys), keycmp );
+        if( map != NULL )
+            i_vlck = map->vlc;
+    }
+
+    /* Handle modifiers */
+    i_vlck |= qtKeyModifiersToVLC( *e );
+    return i_vlck;
+}
+
+Qt::Orientations WheelToVLCConverter::getWheelOrientation(int x, int y)
+{
+    const qreal v_cos_deadzone = 0.45; // ~63 degrees
+    const qreal h_cos_deadzone = 0.95; // ~15 degrees
+
+    if (x == 0 && y == 0)
+        return Qt::Orientations{};
+
+    qreal cos = qFabs(x)/qSqrt(x*x + y*y);
+    if (cos < v_cos_deadzone)
+        return Qt::Vertical;
+    else if (cos > h_cos_deadzone)
+        return Qt::Horizontal;
+    return Qt::Orientations{};
+}
+
+void WheelToVLCConverter::wheelEvent( const QWheelEvent* e )
+{
+    if (!e)
+        return;
+
+    const int deltaPerStep = QWheelEvent::DefaultDeltasPerStep;
+
+    if (e->modifiers() != m_modifiers)
+    {
+        m_scrollAmount = {};
+        m_modifiers = e->modifiers();
+    }
+    if (e->buttons() != m_buttons)
+    {
+        m_scrollAmount = {};
+        m_buttons = e->buttons();
+    }
+
+    QPoint p = e->angleDelta();
+    if (e->inverted())
+    {
+        const Qt::Orientations preliminaryOrientation = getWheelOrientation(p.x(), p.y());
+        if (preliminaryOrientation == Qt::Vertical)
+            p.setY(-p.y());
+        else if (preliminaryOrientation == Qt::Horizontal)
+            p.setX(-p.x());
+    }
+    p += m_scrollAmount;
+
+    if (p.isNull())
+        return;
+
+    int i_vlck = qtKeyModifiersToVLC(*e);  // Handle modifiers
+    Qt::Orientations orientation = getWheelOrientation(p.x(), p.y());
+    if (orientation == Qt::Vertical && qAbs(p.y()) >= deltaPerStep)
+    {
+        if (p.y() > 0)
+            i_vlck |= KEY_MOUSEWHEELUP;
+        else
+            i_vlck |= KEY_MOUSEWHEELDOWN;
+
+        const int steps = p.y() / deltaPerStep;
+
+        emit wheelUpDown(steps, e->modifiers());
+        //in practice this will emit once
+        for (int i = 0; i < qAbs(steps); i++)
+            emit vlcWheelKey(i_vlck);
+
+        m_scrollAmount.setX(0);
+        m_scrollAmount.setY(p.y() % deltaPerStep);
+
+    }
+    else if (orientation == Qt::Horizontal && qAbs(p.x()) >= deltaPerStep)
+    {
+        if (p.x() > 0)
+            i_vlck |= KEY_MOUSEWHEELLEFT;
+        else
+            i_vlck |= KEY_MOUSEWHEELRIGHT;
+
+        const int steps = p.x() / deltaPerStep;
+
+        emit wheelLeftRight(steps, e->modifiers());
+        //in practice this will emit once
+        for (int i = 0; i < qAbs(steps); i++)
+            emit vlcWheelKey(i_vlck);
+
+        m_scrollAmount.setY(0);
+        m_scrollAmount.setX(p.x() % deltaPerStep);
+    }
+    else
+    {
+        m_scrollAmount = p;
+    }
+}
+
+void WheelToVLCConverter::qmlWheelEvent( const QObject* e )
+{
+    assert(e);
+    assert(e->inherits("QQuickWheelEvent"));
+
+    QPoint pixelDelta = e->property("pixelDelta").toPoint();
+    QPoint angleDelta = e->property("angleDelta").toPoint();
+    auto buttons = Qt::MouseButtons::fromInt(e->property("buttons").toInt());
+    auto modifiers = Qt::KeyboardModifiers::fromInt(e->property("modifiers").toInt());
+    bool inverted = e->property("inverted").toBool();
+
+    QWheelEvent event({}, {}, pixelDelta, angleDelta, buttons, modifiers, Qt::ScrollPhase::NoScrollPhase, inverted);
+    wheelEvent(&event);
+}
+
+QString VLCKeyToString( unsigned val, bool locale )
+{
+    char *base = vlc_keycode2str (val, locale);
+    if (base == NULL)
+        return qfu( "" );
+
+    QString r = qfu( base );
+
+    free( base );
+    return r;
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/vlchotkeyconverter.hpp Added

@@ -0,0 +1,73 @@
+#ifndef VLC_HOTKEY_CONVERTER_HPP
+#define VLC_HOTKEY_CONVERTER_HPP
+
+#include <QObject>
+#include <QPoint>
+#include <QQmlEngine>
+
+/* VLC Key/Wheel hotkeys interactions */
+
+Q_MOC_INCLUDE("QKeyEvent")
+Q_MOC_INCLUDE("QWheelEvent")
+
+class QKeyEvent;
+class QWheelEvent;
+class QInputEvent;
+
+int qtKeyModifiersToVLC( const QInputEvent& e );
+int qtEventToVLCKey( QKeyEvent *e );
+int qtWheelEventToVLCKey( const QWheelEvent& e );
+QString VLCKeyToString( unsigned val, bool );
+
+/**
+ * @brief The WheelToVLCConverter class aggregates wheel events and
+ * emit a signal once it gathers a full scroll step, as VLC doesn't handle
+ * fractionnal scroll events
+ */
+class WheelToVLCConverter : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+public:
+    using QObject::QObject;
+
+public:
+    Q_INVOKABLE Qt::Orientations getWheelOrientation(int x, int y);
+
+signals:
+    /**
+     * @param vlcKey the VLC hotkey representation
+     */
+    void vlcWheelKey(int vlcKey);
+    /**
+     * @param steps: positive value indicated UP wheel events, negative DOWN wheel event
+     * @param modifiers are keyboard pressed modifiers
+     */
+    void wheelUpDown(int steps, Qt::KeyboardModifiers modifiers);
+    /**
+     * @param steps: positive value indicated UP wheel events, negative DOWN wheel event
+     * @param modifiers are keyboard pressed modifiers
+     */
+    void wheelLeftRight(int steps, Qt::KeyboardModifiers modifiers);
+
+public slots:
+    /**
+     * @brief qmlWheelEvent handles wheel events as emitted by QWidget
+     * @param e the wheel event
+     */
+    void wheelEvent(const QWheelEvent* e);
+
+    /**
+     * @brief qmlWheelEvent handles wheel events as emitted by QML
+     * @param wheelEvent qml wheel event
+     */
+    void qmlWheelEvent(const QObject* wheelEvent);
+
+private:
+    QPoint m_scrollAmount = {};
+    Qt::KeyboardModifiers m_modifiers = {};
+    Qt::MouseButtons m_buttons = {};
+};
+
+#endif // VLC_HOTKEY_CONVERTER_HPP

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/vlcqtmessagehandler.cpp Added

@@ -0,0 +1,107 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "vlcqtmessagehandler.hpp"
+
+#include <QtGlobal>
+#include <QString>
+#include <QLoggingCategory>
+
+#include <vlc_common.h>
+
+static vlc_object_t* g_intf = nullptr;
+static bool g_logQtMessages = false;
+static QtMessageHandler g_defaultMessageHandler = nullptr;
+
+static void vlcQtMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    //application logs from QML should be logged using vlc log system
+    //"qml" and "js" are the category used by for console.xxxx
+    //"default" is for qDebug(), most of our code logs using msg_Dbg but some parts will use qDebug,
+    //usually when they don't have access to the vlc_object. Qt itself uses categorised logger so it
+    //should be safe to assume that the default logger is only used by us.
+    if (g_logQtMessages
+        || qstrcmp(context.category, "default") == 0
+        || qstrcmp(context.category, "qml") == 0
+        || qstrcmp(context.category, "js") == 0)
+    {
+        const char *file = context.file ? context.file : "";
+        const char *function = context.function ? context.function : "";
+        int vlcLogLevel = 0;
+        switch (type)
+        {
+        case QtDebugMsg:
+            vlcLogLevel = VLC_MSG_DBG;
+            break;
+        case QtWarningMsg:
+            vlcLogLevel = VLC_MSG_WARN;
+            break;
+        case QtCriticalMsg:
+        case QtFatalMsg:
+            vlcLogLevel = VLC_MSG_ERR;
+            break;
+        case QtInfoMsg:
+            vlcLogLevel = VLC_MSG_INFO;
+            break;
+        default:
+            vlcLogLevel = VLC_MSG_DBG;
+        }
+
+        vlc_object_Log(g_intf, vlcLogLevel, vlc_module_name, file, context.line, function, "(%s) %s", context.category,  msg.toUtf8().constData());
+    }
+    else
+    {
+        g_defaultMessageHandler(type, context, msg);
+    }
+};
+
+void setupVlcQtMessageHandler(vlc_object_t* p_intf)
+{
+    assert(g_intf == nullptr);
+    assert(p_intf != nullptr);
+
+    g_intf = p_intf;
+    g_logQtMessages = var_InheritBool(p_intf, "qt-verbose");
+
+    g_defaultMessageHandler = qInstallMessageHandler(vlcQtMessageHandler);
+    qSetMessagePattern("qt (%{category}) %{message}");
+
+    QString filterRules;
+
+    if (g_logQtMessages)
+    {
+        filterRules = QStringLiteral("*=true\n"
+                                    "qt.*.debug=false\n" /* Qt's own debug messages are way too much verbose */
+                                    "qt.widgets.painting=false\n" /* Not necessary */);
+    }
+
+    QLoggingCategory::setFilterRules(filterRules);
+}
+
+void cleanupVlcQtMessageHandler()
+{
+    assert(g_intf != nullptr);
+
+    qInstallMessageHandler(nullptr);
+    g_defaultMessageHandler = nullptr;
+    g_intf = nullptr;
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/vlcqtmessagehandler.hpp Added

@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef VLC_QT_MESSAGE_HANDLER_HPP
+#define VLC_QT_MESSAGE_HANDLER_HPP
+
+extern "C" {
+typedef struct vlc_object_t vlc_object_t ;
+}
+
+void setupVlcQtMessageHandler(vlc_object_t* p_intf);
+void cleanupVlcQtMessageHandler();
+
+//(un)register qt message handler using RAII
+class VlcQtMessageHandlerRegisterer
+{
+public:
+    inline VlcQtMessageHandlerRegisterer(vlc_object_t* p_intf) {
+        setupVlcQtMessageHandler(p_intf);
+    }
+
+    inline ~VlcQtMessageHandlerRegisterer() {
+        cleanupVlcQtMessageHandler();
+    }
+};
+
+#endif /* VLC_QT_MESSAGE_HANDLER_HPP */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/vlctick.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/vlctick.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/util/vlctick.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/util/vlctick.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/native/customwidgets.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/native/customwidgets.cpp Changed

@@ -32,7 +32,6 @@
 #include <QKeyEvent>
 #include <QWheelEvent>
 #include <QApplication>
-#include <vlc_actions.h>
 
 #define SPINNER_SIZE 32
 
@@ -84,257 +83,6 @@
     painter.end();
 }
 
-/***************************************************************************
- * Hotkeys converters
- ***************************************************************************/
-int qtKeyModifiersToVLC( const QInputEvent& e )
-{
-    int i_keyModifiers = 0;
-    if( e.modifiers() & Qt::ShiftModifier ) i_keyModifiers |= KEY_MODIFIER_SHIFT;
-    if( e.modifiers() & Qt::AltModifier ) i_keyModifiers |= KEY_MODIFIER_ALT;
-    if( e.modifiers() & Qt::ControlModifier ) i_keyModifiers |= KEY_MODIFIER_CTRL;
-    if( e.modifiers() & Qt::MetaModifier ) i_keyModifiers |= KEY_MODIFIER_META;
-    return i_keyModifiers;
-}
-
-typedef struct
-{
-    int      qt;
-    uint32_t vlc;
-} vlc_qt_key_t;
-
-static const vlc_qt_key_t keys =
-{
-    { Qt::Key_Escape,                KEY_ESC },
-    { Qt::Key_Tab,                   '\t', },
-    // Qt::Key_Backtab
-    { Qt::Key_Backspace,             '\b' },
-    { Qt::Key_Return,                '\r' },
-    { Qt::Key_Enter,                 '\r' }, // numeric pad
-    { Qt::Key_Insert,                KEY_INSERT },
-    { Qt::Key_Delete,                KEY_DELETE },
-    { Qt::Key_Pause,                 KEY_PAUSE },
-    { Qt::Key_Print,                 KEY_PRINT },
-    // Qt::Key_SysReq
-    // Qt::Key_Clear
-    { Qt::Key_Home,                  KEY_HOME },
-    { Qt::Key_End,                   KEY_END },
-    { Qt::Key_Left,                  KEY_LEFT },
-    { Qt::Key_Up,                    KEY_UP },
-    { Qt::Key_Right,                 KEY_RIGHT },
-    { Qt::Key_Down,                  KEY_DOWN },
-    { Qt::Key_PageUp,                KEY_PAGEUP },
-    { Qt::Key_PageDown,              KEY_PAGEDOWN },
-    // Qt::Key_Shift
-    // Qt::Key_Control
-    // Qt::Key_Meta
-    // Qt::Key_Alt
-    // Qt::Key_CapsLock
-    // Qt::Key_NumLock
-    // Qt::Key_ScrollLock
-    /* F1 - F35 - Qt goes to F35, VLC stops at F12 */
-    { Qt::Key_F1,                    KEY_F1 },
-    { Qt::Key_F2,                    KEY_F2 },
-    { Qt::Key_F3,                    KEY_F3 },
-    { Qt::Key_F4,                    KEY_F4 },
-    { Qt::Key_F5,                    KEY_F5 },
-    { Qt::Key_F6,                    KEY_F6 },
-    { Qt::Key_F7,                    KEY_F7 },
-    { Qt::Key_F8,                    KEY_F8 },
-    { Qt::Key_F9,                    KEY_F9 },
-    { Qt::Key_F10,                   KEY_F10 },
-    { Qt::Key_F11,                   KEY_F11 },
-    { Qt::Key_F12,                   KEY_F12 },
-    { Qt::Key_F13,                   KEY_F(13) },
-    { Qt::Key_F14,                   KEY_F(14) },
-    { Qt::Key_F15,                   KEY_F(15) },
-    { Qt::Key_F16,                   KEY_F(16) },
-    { Qt::Key_F17,                   KEY_F(17) },
-    { Qt::Key_F18,                   KEY_F(18) },
-    { Qt::Key_F19,                   KEY_F(19) },
-    { Qt::Key_F20,                   KEY_F(20) },
-    { Qt::Key_F21,                   KEY_F(21) },
-    { Qt::Key_F22,                   KEY_F(22) },
-    { Qt::Key_F23,                   KEY_F(23) },
-    { Qt::Key_F24,                   KEY_F(24) },
-    { Qt::Key_F25,                   KEY_F(25) },
-    { Qt::Key_F26,                   KEY_F(26) },
-    { Qt::Key_F27,                   KEY_F(27) },
-    { Qt::Key_F28,                   KEY_F(28) },
-    { Qt::Key_F29,                   KEY_F(29) },
-    { Qt::Key_F30,                   KEY_F(30) },
-    { Qt::Key_F31,                   KEY_F(31) },
-    { Qt::Key_F32,                   KEY_F(32) },
-    { Qt::Key_F33,                   KEY_F(33) },
-    { Qt::Key_F34,                   KEY_F(34) },
-    { Qt::Key_F35,                   KEY_F(35) },
-
-    // Qt::Key_Super_L
-    // Qt::Key_Super_R
-    { Qt::Key_Menu,                  KEY_MENU },
-    // Qt::Key_Hyper_L
-    // Qt::Key_Hyper_R
-    // Qt::Key_Help
-    // Qt::Key_Direction_L
-    // Qt::Key_Direction_R
-
-    // Qt::Key_Multi_key
-    // Qt::Key_Codeinput
-    // Qt::Key_SingleCandidate
-    // Qt::Key_MultipleCandidate
-    // Qt::Key_PreviousCandidate
-    // Qt::Key_Mode_switch
-    // Qt::Key_Kanji
-    // Qt::Key_Muhenkan
-    // Qt::Key_Henkan
-    // Qt::Key_Romaji
-    // Qt::Key_Hiragana
-    // Qt::Key_Katakana
-    // Qt::Key_Hiragana_Katakana
-    // Qt::Key_Zenkaku
-    // Qt::Key_Hankaku
-    // Qt::Key_Zenkaku_Hankaku
-    // Qt::Key_Touroku
-    // Qt::Key_Massyo
-    // Qt::Key_Kana_Lock
-    // Qt::Key_Kana_Shift
-    // Qt::Key_Eisu_Shift
-    // Qt::Key_Eisu_toggle
-    // Qt::Key_Hangul
-    // Qt::Key_Hangul_Start
-    // Qt::Key_Hangul_End
-    // Qt::Key_Hangul_Hanja
-    // Qt::Key_Hangul_Jamo
-    // Qt::Key_Hangul_Romaja
-    // Qt::Key_Hangul_Jeonja
-    // Qt::Key_Hangul_Banja
-    // Qt::Key_Hangul_PreHanja
-    // Qt::Key_Hangul_PostHanja
-    // Qt::Key_Hangul_Special
-    // Qt::Key_Dead_Grave
-    // Qt::Key_Dead_Acute
-    // Qt::Key_Dead_Circumflex
-    // Qt::Key_Dead_Tilde
-    // Qt::Key_Dead_Macron
-    // Qt::Key_Dead_Breve
-    // Qt::Key_Dead_Abovedot
-    // Qt::Key_Dead_Diaeresis
-    // Qt::Key_Dead_Abovering
-    // Qt::Key_Dead_Doubleacute
-    // Qt::Key_Dead_Caron
-    // Qt::Key_Dead_Cedilla
-    // Qt::Key_Dead_Ogonek
-    // Qt::Key_Dead_Iota
-    // Qt::Key_Dead_Voiced_Sound
-    // Qt::Key_Dead_Semivoiced_Sound
-    // Qt::Key_Dead_Belowdot
-    // Qt::Key_Dead_Hook
-    // Qt::Key_Dead_Horn
-    { Qt::Key_Back,                  KEY_BROWSER_BACK },
-    { Qt::Key_Forward,               KEY_BROWSER_FORWARD },
-    { Qt::Key_Stop,                  KEY_BROWSER_STOP },
-    { Qt::Key_Refresh,               KEY_BROWSER_REFRESH },
-    { Qt::Key_VolumeDown,            KEY_VOLUME_DOWN },
-    { Qt::Key_VolumeMute,            KEY_VOLUME_MUTE },
-    { Qt::Key_VolumeUp,              KEY_VOLUME_UP },
-    // Qt::Key_BassBoost
-    // Qt::Key_BassUp
-    // Qt::Key_BassDown
-    // Qt::Key_TrebleUp
-    // Qt::Key_TrebleDown
-    { Qt::Key_MediaPlay,             KEY_MEDIA_PLAY_PAUSE },
-    { Qt::Key_MediaStop,             KEY_MEDIA_STOP },
-    { Qt::Key_MediaPrevious,         KEY_MEDIA_PREV_TRACK },
-    { Qt::Key_MediaNext,             KEY_MEDIA_NEXT_TRACK },
-    // Qt::Key_MediaRecord
-    { Qt::Key_HomePage,              KEY_BROWSER_HOME },
-    { Qt::Key_Favorites,             KEY_BROWSER_FAVORITES },
-    { Qt::Key_Search,                KEY_BROWSER_SEARCH },
-    // Qt::Key_Standby
-    // Qt::Key_OpenUrl
-    // Qt::Key_LaunchMail
-    // Qt::Key_LaunchMedia
-    /* Qt::Key_Launch0 through Qt::Key_LaunchF */
-    /* ... */
-    { Qt::Key_Reload,                KEY_BROWSER_REFRESH },
-};
-
-static int keycmp( const void *a, const void *b )
-{
-    const int *q = (const int *)a;
-    const vlc_qt_key_t *m = (const vlc_qt_key_t *)b;
-
-    return *q - m->qt;
-}
-
-int qtEventToVLCKey( QKeyEvent *e )
-{
-    int qtk = e->key();
-    uint32_t i_vlck = 0;
-
-    if( qtk <= 0xff )
-    {
-        /* VLC and X11 use lowercase whereas Qt uses uppercase, this
-         * method should be equal to towlower in case of latin1 */
-        if( qtk >= 'A' && qtk <= 'Z' ) i_vlck = qtk+32;
-        else if( qtk >= 0xC0 && qtk <= 0xDE && qtk != 0xD7) i_vlck = qtk+32;
-        else i_vlck = qtk;
-    }
-    else
-    {
-        const vlc_qt_key_t *map;
-
-        map = (const vlc_qt_key_t *)
-              bsearch( &qtk, (const void *)keys, sizeof(keys)/sizeof(keys0),
-                       sizeof(*keys), keycmp );
-        if( map != NULL )
-            i_vlck = map->vlc;
-    }
-
-    /* Handle modifiers */
-    i_vlck |= qtKeyModifiersToVLC( *e );
-    return i_vlck;
-}
-
-int qtWheelEventToVLCKey( const QWheelEvent& e )
-{
-    const qreal v_cos_deadzone = 0.45; // ~63 degrees
-    const qreal h_cos_deadzone = 0.95; // ~15 degrees
-
-    int i_vlck = qtKeyModifiersToVLC(e);  // Handle modifiers
-
-    QPoint p = e.angleDelta();
-    if (!p.isNull())
-    {
-        qreal cos = qFabs(p.x())/qSqrt(qPow(p.x(), 2) + qPow(p.y(), 2));
-
-        if (cos < v_cos_deadzone)
-        {
-            if (p.y() > 0) i_vlck |= KEY_MOUSEWHEELUP;
-            else           i_vlck |= KEY_MOUSEWHEELDOWN;
-        }
-        else if (cos > h_cos_deadzone)
-        {
-            if (p.x() > 0) i_vlck |= KEY_MOUSEWHEELLEFT;
-            else           i_vlck |= KEY_MOUSEWHEELRIGHT;
-        }
-    }
-
-    return i_vlck;
-}
-
-QString VLCKeyToString( unsigned val, bool locale )
-{
-    char *base = vlc_keycode2str (val, locale);
-    if (base == NULL)
-        return qfu( "" );
-
-    QString r = qfu( base );
-
-    free( base );
-    return r;
-}
-
 /* Animated Icon implementation */
 SpinningIcon::SpinningIcon( QWidget *parent ) : QLabel( parent )
 {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/native/customwidgets.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/native/customwidgets.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/native/qvlcframe.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/native/qvlcframe.cpp Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/native/textureprovideritem.cpp Added

@@ -0,0 +1,239 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#include "textureprovideritem.hpp"
+
+#include <QSGTextureProvider>
+#include <QRunnable>
+#include <QMutexLocker>
+
+class TextureProviderCleaner : public QRunnable
+{
+public:
+    explicit TextureProviderCleaner(QSGTextureProvider *textureProvider)
+        : m_textureProvider(textureProvider) { }
+
+    void run() override
+    {
+        delete m_textureProvider;
+    }
+
+private:
+    const QPointer<QSGTextureProvider> m_textureProvider;
+};
+
+TextureProviderItem::~TextureProviderItem()
+{
+    {
+        QMutexLocker lock(&m_textureProviderMutex);
+        if (m_textureProvider)
+        {
+            // https://doc.qt.io/qt-6/qquickitem.html#graphics-resource-handling
+
+            // `QQuickItem::releaseResources()` is called before the item is disassociated from its window:
+            // "This happens when the item is about to be removed from the window it was previously rendering to."
+            // Therefore, we can not have a texture provider during destruction, but not the window:
+            assert(window());
+            window()->scheduleRenderJob(new TextureProviderCleaner(m_textureProvider), QQuickWindow::BeforeSynchronizingStage);
+            m_textureProvider = nullptr;
+        }
+    }
+}
+
+bool TextureProviderItem::isTextureProvider() const
+{
+    return true;
+}
+
+QSGTextureProvider *TextureProviderItem::textureProvider() const
+{
+    // This method is called from the rendering thread.
+
+    QMutexLocker lock(&m_textureProviderMutex);
+    if (!m_textureProvider)
+    {
+        m_textureProvider = new QSGTextureViewProvider;
+
+        const auto adjustSource = provider = m_textureProvider(const QQuickItem *source) {
+            if (source)
+            {
+                assert(source->isTextureProvider() &&
+                       "TextureProviderItem: " \
+                       "TextureProviderItem's source item is not a texture provider. " \
+                       "Layering can be enabled for the source item in order to make " \
+                       "it a texture provider.");
+
+                provider->setTextureProvider(source->textureProvider());
+            }
+            else
+            {
+                provider->setTextureProvider(nullptr);
+            }
+        };
+
+        const auto adjustRect = provider = m_textureProvider(const QRect& rect) {
+            if (rect.isValid())
+                provider->setRect(rect);
+        };
+
+        connect(this, &TextureProviderItem::sourceChanged, m_textureProvider, adjustSource);
+        connect(this, &TextureProviderItem::rectChanged, m_textureProvider, adjustRect);
+
+        // Initial adjustments:
+        adjustSource(m_source);
+        adjustRect(m_rect);
+    }
+    return m_textureProvider;
+}
+
+void TextureProviderItem::invalidateSceneGraph()
+{
+    // https://doc.qt.io/qt-6/qquickitem.html#graphics-resource-handling
+
+    // This slot is called from the rendering thread.
+    {
+        QMutexLocker lock(&m_textureProviderMutex);
+        if (m_textureProvider)
+        {
+            delete m_textureProvider;
+        }
+    }
+}
+
+void TextureProviderItem::releaseResources()
+{
+    // https://doc.qt.io/qt-6/qquickitem.html#graphics-resource-handling
+
+    // This method is called from the GUI thread.
+
+    // QQuickItem::releaseResources() is guaranteed to have a valid window when it is called:
+    assert(window());
+    {
+        QMutexLocker lock(&m_textureProviderMutex);
+        if (m_textureProvider)
+        {
+            window()->scheduleRenderJob(new TextureProviderCleaner(m_textureProvider), QQuickWindow::BeforeSynchronizingStage);
+            m_textureProvider = nullptr;
+        }
+    }
+
+    QQuickItem::releaseResources();
+}
+
+void TextureProviderItem::itemChange(ItemChange change, const ItemChangeData &value)
+{
+    if (change == ItemDevicePixelRatioHasChanged)
+    {
+        emit dprChanged();
+    }
+
+    QQuickItem::itemChange(change, value);
+}
+
+void QSGTextureViewProvider::adjustTexture()
+{
+    if (m_textureProvider)
+        m_textureView.setTexture(m_textureProvider->texture());
+    else
+        m_textureView.setTexture(nullptr);
+
+    // `textureChanged()` is emitted implicitly, no need to emit here explicitly again.
+}
+
+QSGTextureViewProvider::QSGTextureViewProvider()
+    : QSGTextureProvider()
+{
+    connect(&m_textureView, &QSGTextureView::updateRequested, this, &QSGTextureProvider::textureChanged);
+}
+
+QSGTexture *QSGTextureViewProvider::texture() const
+{
+    if (m_textureProvider && m_textureView.texture())
+        return &m_textureView;
+    else
+        return nullptr;
+}
+
+void QSGTextureViewProvider::setTextureProvider(const QSGTextureProvider *textureProvider)
+{
+    if (m_textureProvider == textureProvider)
+        return;
+
+    if (m_textureProvider)
+        disconnect(m_textureProvider, &QSGTextureProvider::textureChanged, this, &QSGTextureViewProvider::adjustTexture);
+
+    m_textureProvider = textureProvider;
+
+    if (m_textureProvider)
+    {
+        connect(m_textureProvider, &QSGTextureProvider::textureChanged, this, &QSGTextureViewProvider::adjustTexture);
+        connect(m_textureProvider, &QObject::destroyed, this, this() { setTextureProvider(nullptr); });
+    }
+
+    adjustTexture();
+}
+
+void QSGTextureViewProvider::setRect(const QRect &rect)
+{
+    m_textureView.setRect(rect);
+    // `textureChanged()` is emitted implicitly, no need to emit here explicitly again
+}
+
+void QSGTextureViewProvider::setMipmapFiltering(QSGTexture::Filtering filter)
+{
+    if (m_textureView.mipmapFiltering() == filter)
+        return;
+
+    m_textureView.setMipmapFiltering(filter);
+    emit textureChanged();
+}
+
+void QSGTextureViewProvider::setFiltering(QSGTexture::Filtering filter)
+{
+    if (m_textureView.filtering() == filter)
+        return;
+
+    m_textureView.setFiltering(filter);
+    emit textureChanged();
+}
+
+void QSGTextureViewProvider::setAnisotropyLevel(QSGTexture::AnisotropyLevel level)
+{
+    if (m_textureView.anisotropyLevel() == level)
+        return;
+
+    m_textureView.setAnisotropyLevel(level);
+    emit textureChanged();
+}
+
+void QSGTextureViewProvider::setHorizontalWrapMode(QSGTexture::WrapMode hwrap)
+{
+    if (m_textureView.horizontalWrapMode() == hwrap)
+        return;
+
+    m_textureView.setHorizontalWrapMode(hwrap);
+    emit textureChanged();
+}
+
+void QSGTextureViewProvider::setVerticalWrapMode(QSGTexture::WrapMode vwrap)
+{
+    if (m_textureView.verticalWrapMode() == vwrap)
+        return;
+
+    m_textureView.setVerticalWrapMode(vwrap);
+    emit textureChanged();
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/native/textureprovideritem.hpp Added

@@ -0,0 +1,90 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef TEXTUREPROVIDERITEM_HPP
+#define TEXTUREPROVIDERITEM_HPP
+
+#include <QQuickItem>
+#include <QSGTextureProvider>
+#include <QMutex>
+
+#include "util/qsgtextureview.hpp"
+
+class QSGTextureViewProvider : public QSGTextureProvider
+{
+    Q_OBJECT
+
+    mutable QSGTextureView m_textureView;
+
+    const QSGTextureProvider* m_textureProvider = nullptr;
+
+private:
+    void adjustTexture();
+
+public:
+    QSGTextureViewProvider();
+
+    QSGTexture *texture() const override;
+
+    void setTextureProvider(const QSGTextureProvider *textureProvider);
+
+    void setRect(const QRect& rect);
+
+    void setMipmapFiltering(QSGTexture::Filtering filter);
+    void setFiltering(QSGTexture::Filtering filter);
+    void setAnisotropyLevel(QSGTexture::AnisotropyLevel level);
+    void setHorizontalWrapMode(QSGTexture::WrapMode hwrap);
+    void setVerticalWrapMode(QSGTexture::WrapMode vwrap);
+};
+
+class TextureProviderItem : public QQuickItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(const QQuickItem* source MEMBER m_source NOTIFY sourceChanged FINAL)
+    Q_PROPERTY(QRect textureSubRect MEMBER m_rect NOTIFY rectChanged FINAL)
+
+    QML_ELEMENT
+public:
+    TextureProviderItem() = default;
+    virtual ~TextureProviderItem();
+
+    bool isTextureProvider() const override;
+
+    QSGTextureProvider *textureProvider() const override;
+
+public slots:
+    void invalidateSceneGraph();
+
+signals:
+    void sourceChanged(const QQuickItem *source);
+    void rectChanged(const QRect& rect);
+    void dprChanged();
+
+protected:
+    void releaseResources() override;
+    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value) override;
+
+private:
+    QPointer<const QQuickItem> m_source;
+    QRect m_rect;
+
+    mutable QPointer<QSGTextureViewProvider> m_textureProvider;
+    mutable QMutex m_textureProviderMutex; // I'm not sure if this mutex is necessary
+};
+
+#endif // TEXTUREPROVIDERITEM_HPP

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/native/viewblockingrectangle.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/native/viewblockingrectangle.cpp Changed

@@ -122,15 +122,30 @@
 
     if (!oldNode)
     {
+        const auto observerNode = new MatrixChangeObserverNode(p = QPointer(this)(const QMatrix4x4& matrix) {
+            if (Q_LIKELY(p))
+            {
+                p->m_renderPosition = {matrix.row(0)3, // Viewport/scene X
+                                       matrix.row(1)3}; // Viewport/scene y
+                emit p->scenePositionHasChanged();
+            }
+        });
+        observerNode->setFlag(QSGNode::OwnedByParent);
+
+        // Initial position:
+        m_renderPosition = mapToScene(QPointF(0,0));
+
         if (softwareMode)
         {
             softwareRenderNode = new SoftwareRenderNode;
             softwareRenderNode->setWindow(window());
+            softwareRenderNode->appendChildNode(observerNode);
         }
         else
         {
             rectangleNode = window()->createRectangleNode();
             assert(rectangleNode);
+            rectangleNode->appendChildNode(observerNode);
 
             const auto material = rectangleNode->material();
             if (!material ||
@@ -149,6 +164,8 @@
 
     const auto rect = boundingRect();
 
+    m_renderSize = rect.size();
+
     if (softwareMode)
     {
         softwareRenderNode->setRect(rect);
@@ -177,3 +194,13 @@
         return rectangleNode;
     }
 }
+
+QSizeF ViewBlockingRectangle::renderSize() const
+{
+    return m_renderSize;
+}
+
+QPointF ViewBlockingRectangle::renderPosition() const
+{
+    return m_renderPosition;
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/native/viewblockingrectangle.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/native/viewblockingrectangle.hpp Changed

@@ -21,6 +21,45 @@
 
 #include <QQuickItem>
 #include <QColor>
+#include <QMatrix4x4>
+#include <QSGRenderNode>
+
+// WARNING: Do not use QSGTransformNode here with preprocess, Qt does not
+//          necessarily call preprocess when the combined matrix changes!
+class MatrixChangeObserverNode : public QSGRenderNode
+{
+public:
+    explicit MatrixChangeObserverNode(const std::function<void(const QMatrix4x4&)>& callback)
+        : m_callback(callback) { }
+
+    // Use prepare(), because matrix() returns dangling pointer when render() is called from Qt 6.2 to 6.5 (QTBUG-97589):
+    void prepare() override
+    {
+        QSGRenderNode::prepare(); // The documentation says that the default implementation is empty, but still call it just in case.
+
+        assert(matrix());
+        const QMatrix4x4 m = *matrix(); // matrix() is the combined matrix here
+        if (m_lastCombinedMatrix != m)
+        {
+            m_callback(m);
+            m_lastCombinedMatrix = m;
+        }
+    }
+
+    void render(const RenderState *) override
+    {
+        // We do not render anything in this node.
+    }
+
+    RenderingFlags flags() const override
+    {
+        // Enable all optimizations, as we are not actually rendering anything in this node:
+        return static_cast<RenderingFlags>(BoundedRectRendering | DepthAwareRendering | OpaqueRendering | NoExternalRendering);
+    }
+private:
+    std::function<void(const QMatrix4x4& newMatrix)> m_callback;
+    QMatrix4x4 m_lastCombinedMatrix;
+};
 
 class ViewBlockingRectangle : public QQuickItem
 {
@@ -29,16 +68,29 @@
     Q_PROPERTY(QColor color MEMBER m_color NOTIFY colorChanged FINAL)
 
 public:
-    ViewBlockingRectangle(QQuickItem *parent = nullptr);
+    explicit ViewBlockingRectangle(QQuickItem *parent = nullptr);
 
 protected:
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
+    // For now these are protected, but can be made public if necessary:
+    // These methods should only be called from the rendering thread.
+    QSizeF renderSize() const;
+    QPointF renderPosition() const;
+
 private:
     QColor m_color;
     bool m_windowChanged = false;
 
+    // Although these members belong to the class instance's thread, they
+    // are updated in the rendering thread:
+    QSizeF m_renderSize;
+    QPointF m_renderPosition {-1., -1.};
+
 signals:
+    // NOTE: `scenePositionHasChanged()` signal is emitted from the render thread,
+    //       and NOT during synchronization (meaning, GUI thread is not blocked):
+    void scenePositionHasChanged();
     void colorChanged();
 };

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/BannerCone.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/BannerCone.qml Changed

@@ -27,11 +27,10 @@
 Image {
     id: root
 
-    property var button: MainCtx.csdButtonModel.systemMenuButton
     required property color color
+    property alias csdMenuVisible: csdMenu.menuVisible
 
-    sourceSize.width: VLCStyle.icon_normal
-    sourceSize.height: VLCStyle.icon_normal
+    sourceSize: Qt.size(VLCStyle.icon_normal, VLCStyle.icon_normal)
 
     mipmap: MainCtx.useXmasCone()
     source: MainCtx.useXmasCone() ? "qrc:///logo/vlc48-xmas.png" // TODO: new xmas cone for designs?
@@ -39,41 +38,39 @@
 
     focus: false
 
-    Loader {
-        anchors.fill: root
-        enabled: MainCtx.clientSideDecoration && root.button
-
-        sourceComponent: MouseArea {
-            onClicked: { root.button.click() }
-            onDoubleClicked: { root.button.doubleClick() }
-
-            Connections {
-                // don't target MouseArea for position since we
-                // need position updates of cone, inresepect of BannerSources
-                // to correctly track cone's global position
-                target: root
-
-                // handles VLCStyle.scale changes
-                function onXChanged() { Qt.callLater(root.updateRect) }
-                function onYChanged() { Qt.callLater(root.updateRect) }
-                function onWidthChanged() { Qt.callLater(root.updateRect) }
-                function onHeightChanged() { Qt.callLater(root.updateRect) }
-            }
+    TapHandler {
+        enabled:  MainCtx.clientSideDecoration
+
+        gesturePolicy: TapHandler.WithinBounds
 
-            Connections {
-                target: VLCStyle
+        onSingleTapped: (eventPoint, button) => {
+            if (button === Qt.LeftButton){
+                doubleTapFilter.start()
+            }
+        }
 
-                // handle window resize
-                function onAppWidthChanged() { Qt.callLater(root.updateRect) }
-                function onAppHeightChanged() { Qt.callLater(root.updateRect) }
+        onDoubleTapped: (eventPoint, button) => {
+            if (button === Qt.LeftButton) {
+                doubleTapFilter.stop()
+                MainCtx.intfMainWindow.close()
             }
         }
     }
 
-    function updateRect() {
-        const rect = root.mapToItem(null, 0, 0, width, height)
+    CSDMenu {
+        id: csdMenu
+        ctx: MainCtx
+    }
+
+    //SingleTapped is always notified, perform the action only if the double tap doesn't occur
+    Timer {
+        id: doubleTapFilter
 
-        if (button)
-            button.rect = rect
+        interval: VLCStyle.duration_short
+
+        onTriggered: {
+            //popup below the widget
+            csdMenu.popup(root.mapToGlobal(0, root.height + VLCStyle.margin_xxsmall))
+        }
     }
 }

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/BlurEffect.qml Added

@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+import QtQuick
+import QtQuick.Effects
+
+MultiEffect {
+    id: effect
+
+    implicitWidth: source ? Math.min(source.paintedWidth ?? Number.MAX_VALUE, source.width) : 0
+    implicitHeight: source ? Math.min(source.paintedHeight ?? Number.MAX_VALUE, source.height) : 0
+
+    blurEnabled: true
+    blur: 1.0
+
+    // Avoid using padding, as Qt thinks that it needs to layering implicitly.
+    autoPaddingEnabled: false
+
+    property alias radius: effect.blurMax
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/ButtonExt.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/ButtonExt.qml Changed

@@ -50,13 +50,13 @@
 
     // Settings
 
-    width: implicitWidth
-    height: implicitHeight
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding)
 
-    implicitWidth: contentItem.implicitWidth
-    implicitHeight: contentItem.implicitHeight
-
-    padding: 0
+    padding: VLCStyle.margin_xsmall
+    spacing: VLCStyle.margin_xsmall
 
     font.pixelSize: VLCStyle.fontSize_normal
 
@@ -93,24 +93,22 @@
         enabled: theme.initialized && !control.extBackgroundAnimation
 
         color: theme.bg.primary
-        border.color: control.visualFocus ? control.colorFocus : "transparent"
+        border.color: control.visualFocus ? control.colorFocus : theme.border
     }
 
     contentItem: Item {
         implicitWidth: tabRow.implicitWidth
         implicitHeight: tabRow.implicitHeight
 
-        Row {
+        RowLayout {
             id: tabRow
 
             anchors.fill: parent
 
-            padding: VLCStyle.margin_xsmall
-            spacing: VLCStyle.margin_xsmall
+            spacing: control.spacing
 
             Item {
-                width: implicitWidth
-                height: implicitHeight
+                Layout.fillHeight: true
 
                 implicitWidth: VLCStyle.fontHeight_normal
                 implicitHeight: VLCStyle.fontHeight_normal
@@ -147,6 +145,12 @@
             }
 
             Widgets.ListLabel {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+
                 text: control.text
 
                 //button text is already exposed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/CSDTitlebarTapNDrapHandler.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/CSDTitlebarTapNDrapHandler.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/DefaultShadow.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/DefaultShadow.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/DoubleShadow.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/DoubleShadow.qml Changed

@@ -24,8 +24,9 @@
 
 // A convenience file to encapsulate two drop shadow images stacked on top
 // of each other
-ScaledImage {
-    id: root
+Item {
+    implicitWidth: image.implicitWidth
+    implicitHeight: image.implicitHeight
 
     property Item sourceItem: null
 
@@ -35,10 +36,10 @@
     property real viewportWidth: rectWidth + viewportHorizontalOffset
     property real viewportHeight: rectHeight + viewportVerticalOffset
 
-    property real rectWidth: sourceItem ? Math.min(sourceItem.paintedWidth ?? Number.MAX_VALUE, sourceItem.width) : 0
-    property real rectHeight: sourceItem ? Math.min(sourceItem.paintedHeight ?? Number.MAX_VALUE, sourceItem.height) : 0
-    property real xRadius: sourceItem?.radius ?? 0
-    property real yRadius: sourceItem?.radius ?? 0
+    property real rectWidth: sourceItem ? Math.min((sourceItem.paintedWidth ?? Number.MAX_VALUE) - Math.ceil(sourceItem.padding ?? 0) * 2, sourceItem.width) : 0
+    property real rectHeight: sourceItem ? Math.min((sourceItem.paintedHeight ?? Number.MAX_VALUE) - Math.ceil(sourceItem.padding ?? 0) * 2, sourceItem.height) : 0
+    property real xRadius: (sourceItem ? (sourceItem.effectiveRadius ?? sourceItem.radius) : 0) ?? 0
+    property real yRadius: (sourceItem ? (sourceItem.effectiveRadius ?? sourceItem.radius) : 0) ?? 0
 
     property color primaryColor: Qt.rgba(0, 0, 0, .18)
     property real primaryVerticalOffset: 0
@@ -50,45 +51,84 @@
     property real secondaryHorizontalOffset: 0
     property real secondaryBlurRadius: 0
 
+    property alias sourceSize: image.sourceSize
+    property alias cache: image.cache
+    property alias asynchronous: image.asynchronous
+    property alias fillMode: image.fillMode
+
+    z: -1
+
+    visible: (width > 0 && height > 0)
+
     //by default we request
     sourceSize: Qt.size(viewportWidth, viewportHeight)
 
-    cache: true
-    asynchronous: true
+    ScaledImage {
+        id: image
+
+        anchors.fill: parent
+
+        cache: true
+        asynchronous: true
+
+        visible: !visualDelegate.readyForVisibility
+
+        fillMode: Image.Stretch
+
+        onSourceSizeChanged: {
+            // Do not load the image when size is not valid:
+            if (sourceSize.width > 0 && sourceSize.height > 0)
+                source = Qt.binding(() => {
+                    return Effects.url(
+                        Effects.DoubleRoundedRectDropShadow,
+                        {
+                            "viewportWidth" : viewportWidth,
+                            "viewportHeight" :viewportHeight,
+
+                            "rectWidth": rectWidth,
+                            "rectHeight": rectHeight,
+                            "xRadius": xRadius,
+                            "yRadius": yRadius,
+
+                            "primaryColor": primaryColor,
+                            "primaryBlurRadius": primaryBlurRadius,
+                            "primaryXOffset": primaryHorizontalOffset,
+                            "primaryYOffset": primaryVerticalOffset,
+
+                            "secondaryColor": secondaryColor,
+                            "secondaryBlurRadius": secondaryBlurRadius,
+                            "secondaryXOffset": secondaryHorizontalOffset,
+                            "secondaryYOffset": secondaryVerticalOffset,
+                        })
+                })
+            else
+                source = ""
+        }
+    }
 
-    fillMode: Image.Stretch
+    ShaderEffect {
+        id: visualDelegate
 
-    visible: (width > 0 && height > 0)
+        anchors.centerIn: parent
+        anchors.alignWhenCentered: true
 
-    z: -1
+        implicitWidth: image.implicitWidth
+        implicitHeight: image.implicitHeight
+
+        width: image.paintedWidth
+        height: image.paintedHeight
+
+        visible: readyForVisibility
+
+        readonly property bool readyForVisibility: (GraphicsInfo.shaderType === GraphicsInfo.RhiShader)
+
+        supportsAtlasTextures: true
+        blending: true
+        // cullMode: ShaderEffect.BackFaceCulling
+
+        readonly property Image source: image
 
-    onSourceSizeChanged: {
-        // Do not load the image when size is not valid:
-        if (sourceSize.width > 0 && sourceSize.height > 0)
-            source = Qt.binding(() => {
-                return Effects.url(
-                    Effects.DoubleRoundedRectDropShadow,
-                    {
-                        "viewportWidth" : viewportWidth,
-                        "viewportHeight" :viewportHeight,
-
-                        "rectWidth": rectWidth,
-                        "rectHeight": rectHeight,
-                        "xRadius": xRadius,
-                        "yRadius": yRadius,
-
-                        "primaryColor": primaryColor,
-                        "primaryBlurRadius": primaryBlurRadius,
-                        "primaryXOffset": primaryHorizontalOffset,
-                        "primaryYOffset": primaryVerticalOffset,
-
-                        "secondaryColor": secondaryColor,
-                        "secondaryBlurRadius": secondaryBlurRadius,
-                        "secondaryXOffset": secondaryHorizontalOffset,
-                        "secondaryYOffset": secondaryVerticalOffset,
-                    })
-            })
-        else
-            source = ""
+        // TODO: Dithered texture is not necessary if theme is not dark.
+        fragmentShader: "qrc:///shaders/DitheredTexture.frag.qsb"
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/DragItem.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/DragItem.qml Changed

@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 import QtQuick
+import QtQuick.Window
 import QtQuick.Templates as T
 import QtQml.Models
 
@@ -452,7 +453,7 @@
             Rectangle {
                 id: bg
 
-                radius: coverRepeater.count > 1 ? dragItem.coverSize : VLCStyle.dp(2, VLCStyle.scale)
+                radius: coverRepeater.count > 1 ? dragItem.coverSize : 0.0
                 anchors.fill: parent
                 color: theme.bg.primary
 
@@ -463,7 +464,7 @@
                 }
             }
 
-            Widgets.RoundImage {
+            Widgets.ImageExt {
                 id: artworkCover
 
                 anchors.centerIn: parent
@@ -471,12 +472,15 @@
                 height: coverSize
                 radius: bg.radius
                 source: modelData.artwork ?? ""
-                sourceSize: dragItem.imageSourceSize ?? Qt.size(width, height)
+                sourceSize: dragItem.imageSourceSize ?? Qt.size(width * eDPR, height * eDPR)
+                fillMode: Image.PreserveAspectCrop
+
+                readonly property real eDPR: MainCtx.effectiveDevicePixelRatio(Window.window)
 
                 onStatusChanged: {
-                    if (status === Widgets.RoundImage.Ready)
+                    if (status === Image.Ready)
                         coverRepeater.notReadyCount -= 1
-                    else if (status === Widgets.RoundImage.Error) {
+                    else if (status === Image.Error) {
                         const fallbackSource = modelData.fallback ?? defaultCover
                         if (source === fallbackSource)
                             coverRepeater.notReadyCount -= 1

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/DropShadowImage.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/DropShadowImage.qml Changed

@@ -20,7 +20,9 @@
 
 import VLC.Util
 
-ScaledImage {
+Item {
+    implicitWidth: image.implicitWidth
+    implicitHeight: image.implicitHeight
 
     property Item sourceItem: null
 
@@ -30,41 +32,79 @@
     property real blurRadius: 0
     property color color
 
-    property real rectWidth: sourceItem ? Math.min(sourceItem.paintedWidth ?? Number.MAX_VALUE, sourceItem.width) : 0
-    property real rectHeight: sourceItem ? Math.min(sourceItem.paintedHeight ?? Number.MAX_VALUE, sourceItem.height) : 0
+    property real rectWidth: sourceItem ? Math.min((sourceItem.paintedWidth ?? Number.MAX_VALUE) - Math.ceil(sourceItem.padding ?? 0) * 2, sourceItem.width) : 0
+    property real rectHeight: sourceItem ? Math.min((sourceItem.paintedHeight ?? Number.MAX_VALUE) - Math.ceil(sourceItem.padding ?? 0) * 2, sourceItem.height) : 0
 
     property real xOffset: 0
     property real yOffset: 0
-    property real xRadius: sourceItem?.radius ?? 0
-    property real yRadius: sourceItem?.radius ?? 0
+    property real xRadius: (sourceItem ? (sourceItem.effectiveRadius ?? sourceItem.radius) : 0) ?? 0
+    property real yRadius: (sourceItem ? (sourceItem.effectiveRadius ?? sourceItem.radius) : 0) ?? 0
+
+    property alias sourceSize: image.sourceSize
+    property alias cache: image.cache
+    property alias asynchronous: image.asynchronous
+    property alias fillMode: image.fillMode
 
     sourceSize: Qt.size(viewportWidth, viewportHeight)
 
-    cache: true
-    asynchronous: true
-
-    fillMode: Image.Stretch
-
-    onSourceSizeChanged: {
-        // Do not load the image when size is not valid:
-        if (sourceSize.width > 0 && sourceSize.height > 0)
-            source = Qt.binding(function() {
-                return Effects.url((xRadius > 0 || yRadius > 0) ? Effects.RoundedRectDropShadow
-                                                                : Effects.RectDropShadow,
-                                   {
-                                    "viewportWidth" : viewportWidth,
-                                    "viewportHeight" :viewportHeight,
-
-                                    "blurRadius": blurRadius,
-                                    "color": color,
-                                    "rectWidth": rectWidth,
-                                    "rectHeight": rectHeight,
-                                    "xOffset": xOffset,
-                                    "yOffset": yOffset,
-                                    "xRadius": xRadius,
-                                    "yRadius": yRadius})
-            })
-        else
-            source = ""
+    Image {
+        id: image
+
+        cache: true
+        asynchronous: true
+
+        visible: !visualDelegate.readyForVisibility
+
+        fillMode: Image.Stretch
+
+        onSourceSizeChanged: {
+            // Do not load the image when size is not valid:
+            if (sourceSize.width > 0 && sourceSize.height > 0)
+                source = Qt.binding(function() {
+                    return Effects.url((xRadius > 0 || yRadius > 0) ? Effects.RoundedRectDropShadow
+                                                                    : Effects.RectDropShadow,
+                                       {
+                                        "viewportWidth" : viewportWidth,
+                                        "viewportHeight" :viewportHeight,
+
+                                        "blurRadius": blurRadius,
+                                        "color": color,
+                                        "rectWidth": rectWidth,
+                                        "rectHeight": rectHeight,
+                                        "xOffset": xOffset,
+                                        "yOffset": yOffset,
+                                        "xRadius": xRadius,
+                                        "yRadius": yRadius
+                                       })
+                })
+            else
+                source = ""
+        }
+    }
+
+    ShaderEffect {
+        id: visualDelegate
+
+        anchors.centerIn: parent
+        anchors.alignWhenCentered: true
+
+        implicitWidth: image.implicitWidth
+        implicitHeight: image.implicitHeight
+
+        width: image.paintedWidth
+        height: image.paintedHeight
+
+        visible: readyForVisibility
+
+        readonly property bool readyForVisibility: (GraphicsInfo.shaderType === GraphicsInfo.RhiShader)
+
+        supportsAtlasTextures: true
+        blending: true
+        // cullMode: ShaderEffect.BackFaceCulling
+
+        readonly property Image source: image
+
+        // TODO: Dithered texture is not necessary if theme is not dark.
+        fragmentShader: "qrc:///shaders/DitheredTexture.frag.qsb"
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/DynamicShadow.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/DynamicShadow.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/EmptyLabel.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/EmptyLabel.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/ExpandGridView.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/ExpandGridView.qml Changed

@@ -37,8 +37,8 @@
     //margin to apply
     property int bottomMargin: 0
     property int topMargin: 0
-    property int leftMargin: VLCStyle.margin_normal + leftPadding
-    property int rightMargin: VLCStyle.margin_normal + rightPadding
+    property int leftMargin: VLCStyle.layout_left_margin + leftPadding
+    property int rightMargin: VLCStyle.layout_right_margin + rightPadding
 
     property int leftPadding: 0
     property int rightPadding: 0
@@ -115,6 +115,12 @@
         property bool selected: false
     }
 
+    // extra margin taken in account for positionViewAtIndex
+    //
+    // this is required since delegates selection rect may occupy area outside of
+    // delegates, to make scrolling with selection better we add extra margins here
+    property real extraMarginForPositionView: verticalSpacing / 2
+
     property var _idChildrenList: 
     property var _unusedItemList: 
     property var _currentRange: 0,0
@@ -375,7 +381,13 @@
         const dirty = (Date.now() - _anchoredIdxUpdate) > VLCStyle.duration_veryLong
 
         if (dirty || (_anchoredIdx < 0) || (_anchoredIdx >= _count)) {
-            _anchoredIdx = _currentRange?.0 ?? 0
+            const range = _currentRange || 0, 0
+
+            if (expandIndex >= range0 && expandIndex < range1)
+                _anchoredIdx = expandIndex
+            else
+                _anchoredIdx = range0
+
             const item = _getItem(_anchoredIdx)
             _anchoredIdxFraction = (item.y - flickable.contentY) / cellHeight
         }
@@ -502,7 +514,8 @@
         const newContentY = Helpers.flickablePositionContaining(flickable,
                                                                 getItemPos(index)1
                                                                 , rowHeight
-                                                                , topMargin, bottomMargin)
+                                                                , topMargin + extraMarginForPositionView
+                                                                , bottomMargin + extraMarginForPositionView)
 
         if (newContentY !== flickable.contentY)
             animateFlickableContentY(newContentY)
@@ -771,10 +784,29 @@
 
         boundsBehavior: Flickable.StopAtBounds
 
-        ScrollBar.vertical: ScrollBar {
+        ScrollBar.vertical: ScrollBarExt {
             id: flickableScrollBar
         }
 
+        Component.onCompleted: {
+            // Flickable filters child mouse events for flicking (even when
+            // the delegate is grabbed). However, this is not a useful
+            // feature for non-touch cases, so disable it here and enable
+            // it if touch is detected through the hover handler:
+            MainCtx.setFiltersChildMouseEvents(this, false)
+        }
+
+        HoverHandler {
+            acceptedDevices: PointerDevice.TouchScreen
+
+            onHoveredChanged: {
+                if (hovered)
+                    MainCtx.setFiltersChildMouseEvents(flickable, true)
+                else
+                    MainCtx.setFiltersChildMouseEvents(flickable, false)
+            }
+        }
+
         TapHandler {
             acceptedButtons: Qt.LeftButton | Qt.RightButton

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/FadingEdge.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/FadingEdge.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/FadingEdgeForListView.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/FadingEdgeForListView.qml Changed

@@ -40,6 +40,9 @@
 
     readonly property bool transitionsRunning: (listView.add?.running ||
                                                 listView.addDisplaced?.running ||
+                                                listView.displaced?.running ||
+                                                listView.move?.running ||
+                                                listView.moveDisplaced?.running ||
                                                 listView.populate?.running ||
                                                 listView.remove?.running ||
                                                 listView.removeDisplaced?.running) ?? false
@@ -47,70 +50,95 @@
     // FIXME: Delegate with variable size
     readonly property Item delegateItem: (listView.count > 0) ? listView.itemAtIndex(0) : null
 
-    readonly property Item firstVisibleItem: {
-        if (transitionsRunning || !delegateItem)
-            return null
 
-        let margin = 0 // -root.beginningMargin
-        if (orientation === Qt.Vertical) {
-            // if (headerItem && headerItem.visible && headerPositioning === ListView.OverlayHeader)
-            //    margin += headerItem.height
+    readonly property bool _fadeRectEnoughSize: (orientation === Qt.Vertical ? listView.height
+                                                                             : listView.width) > (fadeSize * 2 + VLCStyle.dp(25))
 
-            return listView.itemAt(sourceX + (delegateItem.x + delegateItem.width / 2),
-                                   sourceY + margin - beginningMargin + listView.spacing)
-        } else {
-            // if (headerItem && headerItem.visible && headerPositioning === ListView.OverlayHeader)
-            //    margin += headerItem.width
+    readonly property rect _currentItemMappedRect: listView.currentItem ? Qt.rect(listView.currentItem.x - sourceX,
+                                                                                  listView.currentItem.y - sourceY,
+                                                                                  listView.currentItem.width,
+                                                                                  listView.currentItem.height)
+                                                                        : Qt.rect(-1, -1, -1, -1)
 
-            return listView.itemAt(sourceX + margin - beginningMargin + listView.spacing,
-                                   sourceY + (delegateItem.y + delegateItem.height / 2))
-        }
+    readonly property bool _disableBeginningFade: (!!listView.headerItem && (listView.headerPositioning !== ListView.InlineHeader)) ||
+                                                  !_fadeRectEnoughSize ||
+                                                  (orientation === Qt.Vertical ? listView.atYBeginning
+                                                                               : listView.atXBeginning) ||
+                                                  !Helpers.itemIntersects(beginningArea, _currentItemMappedRect)
+
+    readonly property bool _disableEndFade: (!!listView.footerItem && (listView.footerPositioning !== ListView.InlineFooter)) ||
+                                            !_fadeRectEnoughSize ||
+                                            (orientation === Qt.Vertical ? listView.atYEnd
+                                                                         : listView.atXEnd) ||
+                                            !Helpers.itemIntersects(endArea, _currentItemMappedRect)
+
+    Binding on enableBeginningFade {
+        // This explicit binding is to override `enableBeginningFade` when it is not feasible to have fading edge.
+        when: root._disableBeginningFade || beginningHoverHandler.hovered
+        value: false
     }
 
-    readonly property Item lastVisibleItem: {
-        if (transitionsRunning || !delegateItem)
-            return null
+    Binding on enableEndFade {
+        // This explicit binding is to override `enableEndFade` when it is not feasible to have fading edge.
+        when: root._disableEndFade || endHoverHandler.hovered
+        value: false
+    }
+
+    Item {
+        id: beginningArea
+
+        z: 99
+        parent: root.listView
+
+        visible: !root._disableBeginningFade
+
+        anchors {
+            top: parent.top
+            left: parent.left
+
+            topMargin: (orientation === Qt.Vertical) ? beginningMargin : undefined
+            leftMargin: (orientation === Qt.Horizontal) ? beginningMargin : undefined
 
-        let margin = 0 // -root.endMargin
-        if (orientation === Qt.Vertical) {
-            // if (footerItem && footerItem.visible && footerPositioning === ListView.OverlayFooter)
-            //    margin += footerItem.height
+            bottom: (orientation === Qt.Horizontal) ? parent.bottom : undefined
+            right: (orientation === Qt.Vertical) ? parent.right : undefined
+        }
+
+        implicitWidth: fadeSize
+        implicitHeight: fadeSize
 
-            return listView.itemAt(sourceX + (delegateItem.x + delegateItem.width / 2),
-                                   sourceY + listView.height - margin + endMargin - listView.spacing - 1)
-        } else {
-            // if (footerItem && footerItem.visible && footerPositioning === ListView.OverlayFooter)
-            //    margin += footerItem.width
+        HoverHandler {
+            id: beginningHoverHandler
 
-            return listView.itemAt(sourceX + listView.width - margin + endMargin - listView.spacing - 1,
-                                   sourceY + (delegateItem.y + delegateItem.height / 2))
+            grabPermissions: PointerHandler.ApprovesTakeOverByAnything
         }
     }
 
-    readonly property bool _fadeRectEnoughSize: (orientation === Qt.Vertical ? listView.height
-                                                                             : listView.width) > (fadeSize * 2 + VLCStyle.dp(25))
+    Item {
+        id: endArea
 
-    enableBeginningFade: _fadeRectEnoughSize &&
-                         (orientation === Qt.Vertical ? !listView.atYBeginning
-                                                      : !listView.atXBeginning) &&
-                         (!firstVisibleItem ||
-                         (!firstVisibleItem.activeFocus &&
-                          !(firstVisibleItem?.hovered ?? true)))
+        z: 99
+        parent: root.listView
 
-    enableEndFade: _fadeRectEnoughSize &&
-                   (orientation === Qt.Vertical ? !listView.atYEnd
-                                                : !listView.atXEnd) &&
-                   (!lastVisibleItem ||
-                   (!lastVisibleItem.activeFocus &&
-                    !(lastVisibleItem?.hovered ?? true)))
+        visible: !root._disableEndFade
 
-    Binding on enableBeginningFade {
-        when: !!listView.headerItem && (listView.headerPositioning !== ListView.InlineHeader)
-        value: false
-    }
+        anchors {
+            bottom: parent.bottom
+            right: parent.right
 
-    Binding on enableEndFade {
-        when: !!listView.footerItem && (listView.footerPositioning !== ListView.InlineFooter)
-        value: false
+            bottomMargin: (orientation === Qt.Vertical) ? beginningMargin : undefined
+            rightMargin: (orientation === Qt.Horizontal) ? beginningMargin : undefined
+
+            top: (orientation === Qt.Horizontal) ? parent.top : undefined
+            left: (orientation === Qt.Vertical) ? parent.left : undefined
+        }
+
+        implicitWidth: fadeSize
+        implicitHeight: fadeSize
+
+        HoverHandler {
+            id: endHoverHandler
+
+            grabPermissions: PointerHandler.ApprovesTakeOverByAnything
+        }
     }
 }

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/FloatingNotification.qml Added

@@ -0,0 +1,200 @@
+/*****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * Authors: Prince Gupta <guptaprince8832@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+import QtQuick
+
+import VLC.MainInterface
+import VLC.Style
+
+Column {
+    id: root
+
+    signal removeNotification(int index)
+
+    onRemoveNotification: function (index) {
+        model.remove(index, 1)
+    }
+
+    spacing: VLCStyle.margin_normal
+
+    Behavior on y {
+        NumberAnimation {
+            duration: VLCStyle.duration_short
+            easing.type: Easing.InOutQuad
+        }
+    }
+
+    Repeater {
+        id: repeater
+
+        model: ListModel {
+            id: model
+        }
+
+        delegate: Rectangle {
+            id: delegate
+
+            required property int index
+            required property string text
+
+            readonly property ColorContext colorContext: ColorContext {
+                id: theme
+
+                colorSet: ColorContext.Window
+            }
+
+            function resetLifetime() {
+                lifetime.restart()
+                state = "VISIBLE"
+            }
+
+            anchors.horizontalCenter: parent.horizontalCenter
+
+            color: theme.bg.primary
+
+            focus: false
+
+            width: notifText.implicitWidth
+            height: notifText.implicitHeight
+
+            radius: VLCStyle.dp(3, VLCStyle.scale)
+
+            scale: 0
+
+            state: "HIDDEN"
+
+            Component.onCompleted: state = "VISIBLE"
+
+            states: 
+                State {
+                    name: "VISIBLE"
+                    PropertyChanges {
+                        target: delegate
+                        visible: true
+                        scale: 1
+                    }
+                },
+                State {
+                    name: "HIDDEN"
+                    PropertyChanges {
+                        target: delegate
+                        visible: false
+                        scale: 0
+                    }
+                }
+            
+
+            transitions: 
+                Transition {
+                    from: "VISIBLE"
+                    to: "HIDDEN"
+
+                    SequentialAnimation {
+                        NumberAnimation {
+                            target: delegate
+                            property: "scale"
+                            duration: VLCStyle.duration_short
+                            easing.type: Easing.InOutQuad
+                        }
+
+                        PropertyAction {
+                            target: delegate
+                            property: "visible"
+                        }
+
+                        ScriptAction {
+                            script: if (!lifetime.running) root.removeNotification(delegate.index)
+                        }
+                    }
+                },
+
+                Transition {
+                    from: "HIDDEN"
+                    to: "VISIBLE"
+
+                    SequentialAnimation {
+                        PropertyAction {
+                            target: delegate
+                            property: "visible"
+                        }
+
+                        NumberAnimation {
+                            target: delegate
+                            property: "scale"
+                            duration: VLCStyle.duration_short
+                            easing.type: Easing.InOutQuad
+                        }
+                    }
+                }
+            
+
+            Timer {
+                id: lifetime
+
+                interval: VLCStyle.duration_humanMoment
+
+                running: true
+
+                onTriggered: delegate.state = "HIDDEN"
+            }
+
+            DefaultShadow {
+                anchors.centerIn: parent
+
+                sourceItem: parent
+            }
+
+            SubtitleLabel {
+                id: notifText
+
+                padding: VLCStyle.margin_small
+
+                color: theme.fg.primary
+
+                text: delegate.text
+            }
+        }
+    }
+
+    Connections {
+        target: UINotifier
+
+        function onShowNotification(id, text) {
+            let found = false
+            for (let i = 0; i < model.count; ++i) {
+                if (model.get(i).id === id) {
+                    found = true
+
+                    const del = repeater.itemAt(i)
+                    if (del.text !== text) {
+                        del.text = text
+                        del.resetLifetime()
+                    }
+
+                    break
+                }
+            }
+
+            if (!found) {
+                model.append({"id": id, "text": text})
+            }
+        }
+    }
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/FrostedGlassEffect.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/FrostedGlassEffect.qml Changed

@@ -17,36 +17,49 @@
  *****************************************************************************/
 
 import QtQuick
-import Qt5Compat.GraphicalEffects
 
 import VLC.Style
 import VLC.Util
+import VLC.Widgets as Widgets
 
 // This item can be used as a layer effect.
 // Make sure that the sampler name is set to "source" (default).
-FastBlur {
+Widgets.BlurEffect {
     id: root
 
     radius: 64
 
-    property bool blending: false
-
     property color tint: "transparent"
     property real tintStrength: Qt.colorEqual(tint, "transparent") ? 0.0 : 0.7
     property real noiseStrength: 0.02
-    property real exclusionStrength: 0.09
 
-    layer.enabled: true
-    layer.effect: ShaderEffect {
-        readonly property color tint: root.tint
-        readonly property real tintStrength: root.tintStrength
-        readonly property real noiseStrength: root.noiseStrength
-        readonly property real exclusionStrength: root.exclusionStrength
+    // Have a semi-opaque filter blended with the source.
+    // This is intended to act as both colorization (tint),
+    // and exclusion effects.
+    Rectangle {
+        id: filter
+
+        // Underlay for the blur effect:
+        parent: root.source?.sourceItem ?? root.source
+        anchors.fill: parent
+        z: 999
+
+        visible: root.tintStrength > 0.0
+
+        color: Qt.alpha(root.tint, root.tintStrength)
+    }
+
+    ShaderEffect {
+        id: noise
+
+        // Overlay for the blur effect:
+        anchors.fill: parent
+        z: 999
 
-        cullMode: ShaderEffect.BackFaceCulling
+        visible: root.noiseStrength > 0.0
 
-        blending: root.blending
+        readonly property real strength: root.noiseStrength
 
-        fragmentShader: "qrc:///shaders/FrostedGlass.frag.qsb"
+        fragmentShader: "qrc:///shaders/Noise.frag.qsb"
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/GridItem.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/GridItem.qml Changed

@@ -53,11 +53,15 @@
     property alias cacheImage: picture.cacheImage
     property alias fallbackImage: picture.fallbackImageSource
 
+    property alias fillMode: picture.fillMode
+
     property alias title: titleLabel.text
     property alias subtitle: subtitleTxt.text
+    property alias subtitleVisible: subtitleTxt.visible
     property alias playCoverShowPlay: picture.playCoverShowPlay
     property alias playIconSize: picture.playIconSize
     property alias pictureRadius: picture.radius
+    property alias effectiveRadius: picture.effectiveRadius
     property alias pictureOverlay: picture.imageOverlay
 
     property alias selectedShadow: selectedShadow
@@ -76,6 +80,9 @@
     implicitWidth: layout.implicitWidth
     implicitHeight: layout.implicitHeight
 
+    width: Math.round(implicitWidth)
+    height: Math.round(implicitHeight)
+
     highlighted: (hovered || visualFocus)
 
     Accessible.role: Accessible.Cell
@@ -296,12 +303,13 @@
 
                 sourceItem: parent
 
-                width: parent.width + viewportHorizontalOffset
-                height: parent.height + viewportVerticalOffset
+                width: picture.paintedWidth + viewportHorizontalOffset - Math.ceil(picture.padding) * 2
+                height: picture.paintedHeight + viewportVerticalOffset - Math.ceil(picture.padding) * 2
 
                 rectWidth: sourceSize.width
                 rectHeight: sourceSize.height
 
+                // TODO: Apply painted size's aspect ratio (constant) in source size
                 sourceSize: Qt.size(128, 128)
             }
 
@@ -315,12 +323,13 @@
 
                 sourceItem: parent
 
-                width: parent.width + viewportHorizontalOffset
-                height: parent.height + viewportVerticalOffset
+                width: picture.paintedWidth + viewportHorizontalOffset - Math.ceil(picture.padding) * 2
+                height: picture.paintedHeight + viewportVerticalOffset - Math.ceil(picture.padding) * 2
 
                 rectWidth: sourceSize.width
                 rectHeight: sourceSize.height
 
+                // TODO: Apply painted size's aspect ratio (constant) in source size
                 sourceSize: Qt.size(128, 128)
 
                 primaryVerticalOffset: VLCStyle.dp(6, VLCStyle.scale)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/IconToolButton.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/IconToolButton.qml Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/ImageExt.qml Added

@@ -0,0 +1,226 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+import QtQuick
+
+// NOTE: ImageExt behaves exactly like Image, except when at least one of these features are used:
+//       - `PreserveAspectCrop` fill mode without requiring a clip node.
+//       - Rounded rectangular shaping.
+//       - Background coloring.
+//       - Outlining (border).
+//       - TODO: Custom padding.
+// NOTE: Extra features are only available with the RHI graphics backend,
+//       particularly when shaders are supported.
+// NOTE: Do not use this type if none of the extra features are used.
+Item {
+    id: root
+
+    // Implicit size used to be overridden as readonly, but that needed
+    // binding width/height to the new properties which in turn caused
+    // problems with layouts.
+    implicitWidth: shaderEffect.readyForVisibility ? shaderEffect.implicitWidth : image.implicitWidth
+    implicitHeight: shaderEffect.readyForVisibility ? shaderEffect.implicitHeight : image.implicitHeight
+
+    // WARNING: We can not override QQuickItem's antialiasing
+    //          property as readonly because Qt 6.6 marks it
+    //          as `FINAL`...
+    // FIXME: The shader can be generated without
+    //        the define that enables antialiasing.
+    //        It should be done when the build system
+    //        starts supporting shader defines.
+    antialiasing: true
+
+    asynchronous: true
+
+    property alias asynchronous: image.asynchronous
+    property alias source: image.source
+    property alias sourceSize: image.sourceSize
+    property alias sourceClipRect: image.sourceClipRect
+    property alias status: image.status
+    property alias cache: image.cache
+
+    // Padding represents how much the content is shrunk. For now this is a readonly property.
+    // Currently it only takes the `softEdgeMax` into calculation, as that's what the shader
+    // uses to shrink to prevent "hard edges". Note that padding can only be calculated properly
+    // when the shader has custom softedge support (`CUSTOM_SOFTEDGE`), currently it is used
+    // at all times.
+    readonly property real padding: (shaderEffect.readyForVisibility && antialiasing) ? (Math.max(shaderEffect.width, shaderEffect.height) / 4 * shaderEffect.softEdgeMax)
+                                                                                      : 0.0
+
+    readonly property real paintedWidth: (shaderEffect.readyForVisibility) ? shaderEffect.width
+                                                                           : (image.clip ? image.width : image.paintedWidth)
+    readonly property real paintedHeight: (shaderEffect.readyForVisibility) ? shaderEffect.height
+                                                                            : (image.clip ? image.height : image.paintedHeight)
+
+    // NOTE: Fill mode is not guaranteed to be supported,
+    //       it is supported to the extent QQuickImage
+    //       provides properly filled texture, paintedWidth/Height,
+    //       and applies attributes such as tiling (QSGTexture::Repeat)
+    //       to the texture itself WHILE being invisible.
+    //       Invisible items usually are not requested to
+    //       update their paint node, so it is not clear if QQuickImage
+    //       would synchronize QSGTexture attributes with its
+    //       node when it is invisible (rounding is active).
+    // NOTE: Experiments show that preserve aspect ratio can
+    //       be supported, because QQuickImage provides
+    //       appropriate painted size when it is invisible,
+    //       and the generated texture is pre-filled. In
+    //       the future, Qt Quick may prefer doing this
+    //       within its shader, but for now, we should be
+    //       able to use it. Currently, as of Qt 6.8,
+    //       PreserveAspectCrop, PreserveAspectFit, and
+    //       Stretch can be considered supported.
+    // NOTE: If you need a more guaranteed way to preserve
+    //       the aspect ratio, you can use `sourceSize` with
+    //       only one dimension set. Currently `fillMode` is
+    //       preferred instead of `sourceSize` because we need
+    //       to have control over both width and height.
+    property alias fillMode: image.fillMode
+
+    // Unlike QQuickImage where it needs `clip: true` (clip node)
+    // for `PreserveAspectCrop`, with the custom shader we do not
+    // need that. This makes it feasible to use `PreserveAspectCrop`
+    // in delegate, where we want to have effective batching. Note
+    // that such option is still not free, because the fragment
+    // shader has to do additional calculations that way. Also note
+    // that a clip node is still necessary if radius is 0, as in
+    // that case the default image is used directly.
+    fillMode: Image.PreserveAspectFit
+
+    property real radius
+    property alias backgroundColor: shaderEffect.backgroundColor
+    readonly property real effectiveRadius: shaderEffect.readyForVisibility ? radius : 0.0
+    readonly property color effectiveBackgroundColor: shaderEffect.readyForVisibility ? backgroundColor : "transparent"
+
+    // Border:
+    // NOTE: The border is an overlay for the texture (the
+    //       texture does not shrink).
+    // NOTE: Border uses source-over blending. Therefore if
+    //       it is translucent, the image would get exposed.
+    // NOTE: The unit of width is not specified. It is
+    //       recommended to do only relative adjustments.
+    property color borderColor: "black"
+    property int borderWidth: 0
+    readonly property int effectiveBorderWidth: shaderEffect.readyForVisibility ? borderWidth : 0
+
+    // NOTE: Note the distinction between ShaderEffect and
+    //       ShaderEffectSource. ShaderEffect is no different
+    //       than any other item, including Image. ShaderEffectSource
+    //       on the other hand breaks batching, uses video memory
+    //       to store the texture of the source item that are
+    //       (re)rendered in a framebuffer or offscreen surface.
+    ShaderEffect {
+        id: shaderEffect
+
+        anchors.alignWhenCentered: true
+        anchors.centerIn: parent
+
+        implicitWidth: (image.status === Image.Ready) ? image.implicitWidth : 64
+        implicitHeight: (image.status === Image.Ready) ? image.implicitHeight : 64
+
+        width: ((image.status !== Image.Ready) || (image.fillMode === Image.PreserveAspectCrop)) ? root.width : image.paintedWidth
+        height: ((image.status !== Image.Ready) || (image.fillMode === Image.PreserveAspectCrop)) ? root.height : image.paintedHeight
+
+        visible: readyForVisibility
+
+        readonly property bool readyForVisibility: (GraphicsInfo.shaderType === GraphicsInfo.RhiShader) &&
+                                                   (root.radius > 0.0 || root.borderWidth > 0 || backgroundColor.a > 0.0 || root.fillMode === Image.PreserveAspectCrop)
+
+        smooth: root.smooth
+
+        supportsAtlasTextures: true
+
+        blending: true
+
+        antialiasing: root.antialiasing
+
+        // FIXME: Culling seems to cause issues, such as when the view is layered due to
+        //        fading edge effec, this is most likely a Qt bug.
+        // cullMode: ShaderEffect.BackFaceCulling
+
+        readonly property real radius: Math.min(1.0, Math.max(root.radius / (Math.min(width, height) / 2), 0.0))
+        readonly property real radiusTopRight: radius
+        readonly property real radiusBottomRight: radius
+        readonly property real radiusTopLeft: radius
+        readonly property real radiusBottomLeft: radius
+
+        property color backgroundColor: "transparent"
+
+        readonly property size size: Qt.size(width, height)
+
+        readonly property double softEdgeMin: -1. / Math.min(width, height)
+        readonly property double softEdgeMax: -softEdgeMin
+
+        readonly property size cropRate: {
+            let ret = Qt.size(0.0, 0.0)
+
+            // No need to calculate if PreserveAspectCrop is not used
+            if (root.fillMode !== Image.PreserveAspectCrop)
+                return ret
+
+            // No need to calculate if image is not ready
+            if (image.status !== Image.Ready)
+                return ret
+
+            const implicitScale = implicitWidth / implicitHeight
+            const scale = width / height
+
+            if (scale > implicitScale)
+                ret.height = (implicitHeight - implicitWidth) / 2 / implicitHeight
+            else if (scale < implicitScale)
+                ret.width = (implicitWidth - implicitHeight) / 2 / implicitWidth
+
+            return ret
+        }
+
+        // (2 / width) seems to be a good coefficient to make it similar to `Rectangle.border`:
+        readonly property double borderRange: (image.status === Image.Ready) ? (root.borderWidth / width * 2.) : 0.0 // no need for outlining if there is no image (nothing to outline)
+        readonly property color borderColor: root.borderColor
+
+        // QQuickImage as texture provider, no need for ShaderEffectSource.
+        // In this case, we simply ask the Image to provide its texture,
+        // so that we can make use of our custom shader.
+        readonly property Image source: image
+
+        fragmentShader: (cropRate.width > 0.0 || cropRate.height > 0.0) || (root.borderWidth > 0) ? "qrc:///shaders/SDFAARoundedTexture_cropsupport_bordersupport.frag.qsb"
+                                                                                                  : "qrc:///shaders/SDFAARoundedTexture.frag.qsb"
+
+    }
+
+    Image {
+        id: image
+
+        anchors.fill: parent
+
+        smooth: root.smooth
+
+        // Image should not be visible when there is rounding and RHI shader is supported.
+        // This is simply when the shader effect is invisible. However, Do not use `!shaderEffect.visible`,
+        // because the root item may be invisible (`grabToImage()` call on an invisible
+        // item case). In that case, shader effect would report invisible although it
+        // would appear in the grabbed image.
+        visible: !shaderEffect.readyForVisibility
+
+        // Clipping is not a big concern for rendering performance
+        // with the software or openvg scene graph adaptations.
+        // We can use clipping as QQuickImage suggests with
+        // PreserveAspectCrop in that case:
+        clip: (GraphicsInfo.shaderType !== GraphicsInfo.RhiShader) && (fillMode === Image.PreserveAspectCrop)
+
+        antialiasing: root.antialiasing
+    }
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/ListViewExt.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/ListViewExt.qml Changed

@@ -19,8 +19,6 @@
 import QtQuick.Controls
 import QtQuick.Window
 import QtQuick.Layouts
-import Qt5Compat.GraphicalEffects
-
 
 import VLC.MainInterface
 import VLC.Style
@@ -83,8 +81,8 @@
     keyNavigationEnabled: false
     keyNavigationWraps: false
 
-    ScrollBar.vertical: ScrollBar { }
-    ScrollBar.horizontal: ScrollBar { }
+    ScrollBar.vertical: ScrollBarExt { }
+    ScrollBar.horizontal: ScrollBarExt { }
 
     flickableDirection: Flickable.AutoFlickIfNeeded
 
@@ -121,6 +119,8 @@
         property var isDropAcceptable
         property var acceptDrop
 
+        property Item view
+
         readonly property point dragPosition: {
             let area = null
 
@@ -135,6 +135,21 @@
             return Qt.point(drag.x, drag.y)
         }
 
+        function commonDrop(targetIndex, drop) {
+            const promise = acceptDrop(targetIndex, drop)
+            if (view) {
+                MainCtx.setCursor(view, Qt.BusyCursor)
+                promise.then(() => {
+                    // NOTE: check view again for the unlikely case it is
+                    //       gone by the time the promise is resolved:
+                    if (view)
+                        MainCtx.unsetCursor(view)
+                })
+            }
+        }
+
+        // NOTE: Nested inline components are not supported in QML as of Qt 6.8
+
         DropArea {
             id: higherDropArea
 
@@ -155,7 +170,7 @@
 
             onDropped: (drop) => {
                 console.assert(acceptDrop)
-                acceptDrop(index, drop)
+                commonDrop(index, drop)
             }
         }
 
@@ -179,7 +194,7 @@
 
             onDropped: (drop) => {
                 console.assert(acceptDrop)
-                acceptDrop(index + 1, drop)
+                commonDrop(index + 1, drop)
             }
         }
     }
@@ -248,6 +263,13 @@
 
                 property bool dropOperationOngoing: false
 
+                onDropOperationOngoingChanged: {
+                    if (dropOperationOngoing)
+                        MainCtx.setCursor(root, Qt.BusyCursor)
+                    else
+                        MainCtx.unsetCursor(root)
+                }
+
                 onEntered: function(drag) {
                     if (!root.isDropAcceptableFunc || !root.isDropAcceptableFunc(drag, root.model.rowCount())
                             || !root.acceptDropFunc) {
@@ -277,19 +299,64 @@
             duration: VLCStyle.duration_long
             easing.type: Easing.OutSine
         }
+
+        onRunningChanged: {
+            if (!running) {
+                // This intends to clear the artifact (QTBUG-110969).
+                // Note that this does not help if items are not
+                // positioned correctly, for that x/y animation should
+                // not be used for add transitions.
+                const epsilon = 0.001
+                if (root.orientation === ListView.Vertical) {
+                    root.contentY -= epsilon
+                    root.contentY += epsilon
+                } else if (root.orientation === ListView.Horizontal) {
+                    root.contentX -= epsilon
+                    root.contentX += epsilon
+                }
+            }
+        }
     }
 
-    displaced: Transition {
+    // WARNING: Add displaced transition is disabled, because it is
+    //          often not executed properly, and causes items to have
+    //          incorrect positions. It is currently not possible to
+    //          recover from that situation. Fortunately move and
+    //          remove displaced seemingly are not affected from that
+    //          issue. See QTBUG-131106, QTBUG-89158, ...
+
+    moveDisplaced: Transition {
         NumberAnimation {
             // TODO: Use YAnimator >= Qt 6.0 (QTBUG-66475)
-            property: "y"
+            property: (root.orientation === ListView.Vertical) ? "y" : "x"
             duration: VLCStyle.duration_long
             easing.type: Easing.OutSine
         }
     }
 
+    removeDisplaced: moveDisplaced
+
     // Events
 
+    Component.onCompleted: {
+        // Flickable filters child mouse events for flicking (even when
+        // the delegate is grabbed). However, this is not a useful
+        // feature for non-touch cases, so disable it here and enable
+        // it if touch is detected through the hover handler:
+        MainCtx.setFiltersChildMouseEvents(root, false)
+    }
+
+    HoverHandler {
+        acceptedDevices: PointerDevice.TouchScreen
+
+        onHoveredChanged: {
+            if (hovered)
+                MainCtx.setFiltersChildMouseEvents(root, true)
+            else
+                MainCtx.setFiltersChildMouseEvents(root, false)
+        }
+    }
+
     // NOTE: We always want a valid 'currentIndex' by default.
     onCountChanged: if (count && currentIndex === -1) currentIndex = 0

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/MediaCover.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/MediaCover.qml Changed

@@ -17,16 +17,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 import QtQuick
+import QtQuick.Window
 import QtQuick.Controls
 
-
+import VLC.MainInterface
 import VLC.Widgets as Widgets
 import VLC.Style
 
 
-// NOTE: This rectangle is useful to discern the item against a similar background.
-// FIXME: Maybe we could refactor this to draw the background directly in the RoundImage.
-Rectangle {
+Item {
     id: root
 
     // Properties
@@ -35,8 +34,18 @@
 
     property bool playCoverShowPlay: true
 
+    readonly property real effectiveRadius: image.visible ? image.effectiveRadius
+                                                          : (fallbackImage.visible ? fallbackImage.effectiveRadius
+                                                                                   : 0.0)
+
+    readonly property real eDPR: MainCtx.effectiveDevicePixelRatio(Window.window)
+
     // Aliases
 
+    property alias radius: image.radius
+
+    property alias color: image.backgroundColor
+
     property alias source: image.source
 
     property alias cacheImage: image.cache
@@ -53,6 +62,13 @@
     required property int pictureWidth
     required property int pictureHeight
 
+    readonly property real padding: fallbackImage.visible ? fallbackImage.padding : image.padding
+
+    readonly property real paintedWidth: fallbackImage.visible ? fallbackImage.paintedWidth : image.paintedWidth
+    readonly property real paintedHeight: fallbackImage.visible ? fallbackImage.paintedHeight : image.paintedHeight
+
+    property alias fillMode: image.fillMode
+
     // Signals
 
     signal playIconClicked(var point)
@@ -75,45 +91,45 @@
         onTriggered: root._loadTimeout = true
     }
 
-    Widgets.RoundImage {
+    Widgets.ImageExt {
         id: image
 
         anchors.fill: parent
 
-        radius: root.radius
-
-        sourceSize.width: root.pictureWidth
-        sourceSize.height: root.pictureHeight
+        sourceSize: Qt.size(root.pictureWidth * root.eDPR,
+                            root.pictureHeight * root.eDPR)
 
         onStatusChanged: {
-            if (status === Widgets.RoundImage.Loading) {
+            if (status === Image.Loading) {
                 root._loadTimeout = false
                 timer.start()
             } else {
                 timer.stop()
             }
         }
-
-        cache: false
     }
 
-    Widgets.RoundImage {
+    Widgets.ImageExt {
         id: fallbackImage
 
         anchors.fill: parent
 
         radius: root.radius
 
+        backgroundColor: root.color
+
+        fillMode: root.fillMode
+
         visible: image.source.toString() === "" //RoundImage.source is a QUrl
-                 || image.status === Widgets.RoundImage.Error
-                 || (image.status === Widgets.RoundImage.Loading && root._loadTimeout)
+                 || image.status === Image.Error
+                 || (image.status === Image.Loading && root._loadTimeout)
 
         // we only keep this image till there is no main image
         // try to release the resources otherwise
         source: visible ? root.fallbackImageSource : ""
 
-        sourceSize.width: root.pictureWidth
-        sourceSize.height: root.pictureHeight
+        sourceSize: Qt.size(root.pictureWidth * root.eDPR,
+                            root.pictureHeight * root.eDPR)
 
         cache: true
     }
@@ -121,7 +137,11 @@
     Loader {
         id: overlay
 
-        anchors.fill: parent
+        anchors.centerIn: parent
+        anchors.alignWhenCentered: true
+
+        width: root.paintedWidth
+        height: root.paintedHeight
     }
 
     Loader {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/PointingTooltip.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/PointingTooltip.qml Changed

@@ -26,6 +26,9 @@
     margins: 0
     padding: VLCStyle.margin_xxsmall
 
+    height: implicitHeight + background.arrowHeight
+    bottomInset: height - implicitHeight
+
     x: _x
     y: pos.y - (implicitHeight + arrowArea.implicitHeight + VLCStyle.dp(7.5))
 
@@ -37,6 +40,8 @@
         color: pointingTooltip.colorContext.bg.primary
         radius: VLCStyle.dp(6, VLCStyle.scale)
 
+        readonly property real arrowHeight: arrow.implicitHeight + border.width
+
         Item {
             id: arrowArea
 
@@ -54,7 +59,8 @@
                 id: arrow
 
                 anchors.horizontalCenter: parent.horizontalCenter
-                anchors.horizontalCenterOffset: _x - pointingTooltip.x
+                anchors.horizontalCenterOffset: (pointingTooltip.popupType === 1 /* Popup.Window */) ? 0
+                                                                                                     : (pointingTooltip._x - pointingTooltip.x)
                 anchors.verticalCenter: parent.top
 
                 implicitWidth: VLCStyle.dp(10, VLCStyle.scale)

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/RectangularGlow.qml Added

@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ * Copyright (C) 2020 The Qt Company Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+import QtQuick
+
+Item {
+    id: rootItem
+
+    property real glowRadius: 0.0
+
+    property real spread: 0.0
+
+    property color color: "white"
+
+    property real cornerRadius: glowRadius
+
+    property alias blending: shaderItem.blending
+
+    property alias cullMode: shaderItem.cullMode
+
+    property bool hollow: false
+
+    ShaderEffect {
+        id: shaderItem
+
+        x: (parent.width - width) / 2.0
+        y: (parent.height - height) / 2.0
+        width: parent.width + rootItem.glowRadius * 2 + cornerRadius * 2
+        height: parent.height + rootItem.glowRadius * 2 + cornerRadius * 2
+
+        function clampedCornerRadius() {
+            var maxCornerRadius = Math.min(rootItem.width, rootItem.height) / 2 + glowRadius;
+            return Math.max(0, Math.min(rootItem.cornerRadius, maxCornerRadius))
+        }
+
+        property color color: rootItem.color
+        property real inverseSpread: 1.0 - rootItem.spread
+        property real relativeSizeX: ((inverseSpread * inverseSpread) * rootItem.glowRadius + cornerRadius * 2.0) / width
+        property real relativeSizeY: relativeSizeX * (width / height)
+        property real spread: rootItem.spread / 2.0
+        property real cornerRadius: clampedCornerRadius()
+
+        fragmentShader: rootItem.hollow ? "qrc:///shaders/HollowRectangularGlow.frag.qsb"
+                                        : "qrc:///shaders/RectangularGlow.frag.qsb"
+
+        cullMode: ShaderEffect.BackFaceCulling
+    }
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/ScaledImage.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/ScaledImage.qml Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/ScrollBarExt.qml Added

@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+import QtQuick
+import QtQuick.Templates as T
+
+import VLC.Style
+
+T.ScrollBar {
+    id: control
+
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding)
+
+    padding: VLCStyle.dp(2, VLCStyle.scale)
+    visible: policy !== T.ScrollBar.AlwaysOff
+    minimumSize: horizontal ? (height / width) : (width / height)
+
+    // We don't want to show anything is scrolling is not possible (content size less than
+    // or equal to flickable size), unless `ScrollBar.AlwaysOn` is used (not by default):
+    readonly property bool _shown: (policy === T.ScrollBar.AlwaysOn) || (control.size < 1.0)
+
+    // active is not used here, because it is set when the attached Flickable is moving.
+    // interacting is only set when the scroll bar itself is interacted.
+    readonly property bool interacting: (interactive && (control.hovered || control.pressed))
+
+    readonly property ColorContext colorContext: ColorContext {
+        id: theme
+        colorSet: ColorContext.Item
+
+        // focused: control.activeFocus // irrelevant
+        enabled: control.enabled
+
+        // Do not change the colors when pressed or hovered, similar to WinUI3:
+        pressed: false
+        hovered: true
+    }
+
+    component DefaultBehavior : Behavior {
+        // WARNING: Qt bug: OpacityAnimator is bugged
+        NumberAnimation {
+            easing.type: Easing.OutSine
+            duration: VLCStyle.duration_veryShort
+        }
+    }
+
+    background: Rectangle {
+        color: theme.bg.primary
+        radius: width / 2
+
+        opacity: (control._shown && control.interacting) ? 1.0 : 0.0
+
+        visible: (opacity > 0.0)
+
+        DefaultBehavior on opacity { }
+    }
+
+    contentItem: Rectangle {
+        implicitWidth: VLCStyle.dp(control.interacting ? 5 : 2, VLCStyle.scale)
+        implicitHeight: VLCStyle.dp(control.interacting ? 5 : 2, VLCStyle.scale)
+
+        radius: width / 2
+        color: theme.fg.secondary
+
+        visible: (opacity > 0.0)
+
+        opacity: control._shown ? 1.0 : 0.0
+
+        DefaultBehavior on opacity { }
+
+        component SizeBehavior : Behavior {
+            NumberAnimation {
+                easing.type: Easing.OutSine
+                duration: VLCStyle.duration_veryShort
+            }
+        }
+
+        SizeBehavior on implicitWidth {
+            enabled: control.vertical
+        }
+
+        SizeBehavior on implicitHeight {
+            enabled: control.horizontal
+        }
+    }
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/SearchBox.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/SearchBox.qml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/TableColumns.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/TableColumns.qml Changed

@@ -45,6 +45,13 @@
         return 
     }
 
+    // function (rowModel, colModel) -> string
+    // implement this function for providing custom text for title column
+    property var _titleTextProvider: function (rowModel, colModel) {
+        const text = rowModel?.colModel.criteria
+        return text || qsTr("Unknown Title")
+    }
+
     // this is called in reponse to user request to play
     // model is associated row data of delegate
     signal playClicked(var model)
@@ -132,61 +139,14 @@
                 onPlayIconClicked: root.playClicked(titleDel.rowModel)
             }
 
-            Column {
+            TitleText {
                 Layout.fillHeight: true
                 Layout.fillWidth: true
 
                 Layout.topMargin: VLCStyle.margin_xxsmall
                 Layout.bottomMargin: VLCStyle.margin_xxsmall
 
-                Widgets.TextAutoScroller {
-                    id: textRect
-
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-
-                    height: (root.showCriterias) ? Math.round(parent.height / 2)
-                                                 : parent.height
-
-                    visible: root.showTitleText
-                    enabled: visible
-
-                    clip: scrolling
-
-                    label: text
-
-                    forceScroll: titleDel.currentlyFocused
-
-                    Widgets.ListLabel {
-                        id: text
-
-                        anchors.verticalCenter: parent.verticalCenter
-                        text: (titleDel.rowModel && root.showTitleText)
-                              ? (titleDel.rowModeltitleDel.colModel.criteria || qsTr("Unknown Title"))
-                              : ""
-
-                        color: titleDel.selected
-                            ? titleDel.colorContext.fg.highlight
-                            : titleDel.colorContext.fg.primary
-
-                    }
-                }
-
-                Widgets.MenuCaption {
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-
-                    height: textRect.height
-
-                    visible: root.showCriterias
-                    enabled: visible
-
-                    text: (visible) ? root.getCriterias(titleDel.colModel, titleDel.rowModel) : ""
-
-                    color: titleDel.selected
-                        ? titleDel.colorContext.fg.highlight
-                        : titleDel.colorContext.fg.secondary
-                }
+                source: titleDel
             }
         }
     }
@@ -209,17 +169,12 @@
                 color: titleHeadDel.colorContext.fg.secondary
             }
 
-            Widgets.CaptionLabel {
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
+            TitleHeaderText {
                 height: parent.height
 
                 color: titleHeadDel.colorContext.fg.secondary
 
                 text: titleHeadDel.colModel.text ?? ""
-                visible: root.showTitleText
-
-                Accessible.ignored: true
             }
         }
     }
@@ -240,6 +195,28 @@
         }
     }
 
+    property Component titleTextDelegate: TableRowDelegate {
+        id: titleTextdel
+
+        TitleText {
+            anchors.fill: parent
+
+            source: titleTextdel
+        }
+    }
+
+    property Component titleTextHeaderDelegate: TableHeaderDelegate {
+        id: titleHeaderTextDel
+
+        TitleHeaderText {
+            height: parent.height
+
+            color: titleHeaderTextDel.colorContext.fg.secondary
+
+            text: titleHeaderTextDel.colModel.text ?? ""
+        }
+    }
+
     property Component timeColDelegate: TableRowDelegate {
         id: timeDel
 
@@ -266,4 +243,66 @@
         text: "000h00"
     }
 
+    component TitleHeaderText: Widgets.CaptionLabel {
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+
+        visible: root.showTitleText
+
+        Accessible.ignored: true
+    }
+
+    component TitleText: Column {
+        required property var source
+
+        Widgets.TextAutoScroller {
+            id: textRect
+
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            height: (root.showCriterias) ? Math.round(parent.height / 2)
+                                         : parent.height
+
+            visible: root.showTitleText
+            enabled: visible
+
+            clip: scrolling
+
+            label: text
+
+            forceScroll: source.currentlyFocused
+
+            Widgets.ListLabel {
+                id: text
+
+                anchors.verticalCenter: parent.verticalCenter
+                text: (source.rowModel && root.showTitleText)
+                      ? root._titleTextProvider(source.rowModel, source.colModel)
+                      : ""
+
+                color: source.selected
+                    ? source.colorContext.fg.highlight
+                    : source.colorContext.fg.primary
+
+            }
+        }
+
+        Widgets.MenuCaption {
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            height: textRect.height
+
+            visible: root.showCriterias
+            enabled: visible
+
+            text: (visible) ? root.getCriterias(source.colModel, source.rowModel) : ""
+
+            color: source.selected
+                ? source.colorContext.fg.highlight
+                : source.colorContext.fg.secondary
+        }
+    }
+
 }

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/TableViewDelegateExt.qml Added

@@ -0,0 +1,325 @@
+/*****************************************************************************
+ * Copyright (C) 2021 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Layouts
+
+import VLC.MainInterface
+import VLC.Widgets as Widgets
+import VLC.Style
+import VLC.Util
+
+T.Control {
+    id: delegate
+
+    // Properties
+    required property int index
+    required property var rowModel
+    required property var sortModel
+    required property bool selected
+    required property Widgets.DragItem dragItem
+
+    required property var contextMenu
+
+    readonly property bool topContainsDrag: dropAreaLayout.higherDropArea.containsDrag
+    readonly property bool bottomContainsDrag: dropAreaLayout.lowerDropArea.containsDrag
+    readonly property bool containsDrag: (topContainsDrag || bottomContainsDrag)
+
+    required property real fixedColumnWidth
+    required property real weightedColumnWidth
+
+    readonly property point dragPosition: mapFromItem(dropAreaLayout,
+                                                      dropAreaLayout.dragPosition.x,
+                                                      dropAreaLayout.dragPosition.y)
+
+    readonly property ItemSelectionModel selectionModel: delegate.ListView.view.selectionModel
+
+    // Optional, used to show the drop indicator
+    property alias isDropAcceptable: dropAreaLayout.isDropAcceptable
+
+    // Optional, but required to drop a drag
+    property alias acceptDrop: dropAreaLayout.acceptDrop
+
+    property int _modifiersOnLastPress: Qt.NoModifier
+
+    readonly property int _defaultContextMenuRequestID: index
+
+    property int _contextMenuRequestID: -1
+
+    signal rightClick(Item menuParent, var menuModel, point globalMousePos)
+    signal itemDoubleClicked(var index, var model)
+
+    signal selectAndFocus(int modifiers, int focusReason)
+
+    Connections {
+        target: contextMenu
+
+        function onVisibleChanged() {
+            if (!contextMenu.visible) _contextMenuRequestID = -1
+        }
+    }
+
+    property Component defaultDelegate: TableRowDelegate {
+        id: defaultDelId
+        Widgets.TextAutoScroller {
+
+            anchors.fill: parent
+
+            label: text
+            forceScroll: defaultDelId.currentlyFocused
+            clip: scrolling
+
+            Widgets.ListLabel {
+                id: text
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                width: parent.width
+
+                horizontalAlignment: defaultDelId.colModel.hCenterText ? Text.AlignHCenter : Text.AlignLeft
+
+                text: defaultDelId.rowModeldefaultDelId.colModel.criteria ?? ""
+
+                color: defaultDelId.selected
+                    ? defaultDelId.colorContext.fg.highlight
+                    : defaultDelId.colorContext.fg.primary
+            }
+        }
+    }
+    // Settings
+
+    hoverEnabled: true
+
+    ListView.delayRemove: dragHandler.active
+
+    Component.onCompleted: {
+        Keys.menuPressed.connect(contextButton.clicked)
+    }
+
+    // Childs
+
+    readonly property ColorContext colorContext: ColorContext {
+        id: theme
+        colorSet: ColorContext.Item
+
+        focused: delegate.visualFocus
+        hovered: delegate.hovered
+    }
+
+    // TODO: Qt bug 6.2: QTBUG-103604
+    DoubleClickIgnoringItem {
+        anchors.fill: parent
+
+        z: -1
+
+        DragHandler {
+            id: dragHandler
+
+            acceptedDevices: PointerDevice.AllDevices & ~(PointerDevice.TouchScreen)
+
+            target: null
+
+            grabPermissions: PointerHandler.CanTakeOverFromHandlersOfDifferentType | PointerHandler.ApprovesTakeOverByAnything
+
+            onActiveChanged: {
+                if (dragItem) {
+                    if (active) {
+                        if (!selected) {
+                            delegate.selectionModel.select(index, ItemSelectionModel.ClearAndSelect)
+                        }
+
+                        dragItem.Drag.active = true
+                    } else {
+                        dragItem.Drag.drop()
+                    }
+                }
+            }
+        }
+
+        TapHandler {
+            acceptedDevices: PointerDevice.AllDevices & ~(PointerDevice.TouchScreen)
+
+            acceptedButtons: Qt.LeftButton | Qt.RightButton
+
+            gesturePolicy: TapHandler.ReleaseWithinBounds // TODO: Qt 6.2 bug: Use TapHandler.DragThreshold
+
+            grabPermissions: TapHandler.CanTakeOverFromHandlersOfDifferentType | TapHandler.ApprovesTakeOverByAnything
+
+            onSingleTapped: (eventPoint, button) => {
+                initialAction()
+
+                if (!(delegate.selected && button === Qt.RightButton)) {
+                    const view = delegate.ListView.view
+                    delegate.selectionModel.updateSelection(point.modifiers, view.currentIndex, index)
+                    view.currentIndex = index
+                }
+
+                if (button === Qt.RightButton)
+                    delegate.rightClick(delegate, delegate.rowModel, parent.mapToGlobal(eventPoint.position.x, eventPoint.position.y))
+            }
+
+            onDoubleTapped: (point, button) => {
+                if (button === Qt.LeftButton)
+                    delegate.itemDoubleClicked(delegate.index, delegate.rowModel)
+            }
+
+            Component.onCompleted: {
+                canceled.connect(initialAction)
+            }
+
+            function initialAction() {
+                delegate.forceActiveFocus(Qt.MouseFocusReason)
+            }
+        }
+
+        TapHandler {
+            acceptedDevices: PointerDevice.TouchScreen
+
+            grabPermissions: TapHandler.CanTakeOverFromHandlersOfDifferentType | TapHandler.ApprovesTakeOverByAnything
+
+            onTapped: (eventPoint, button) => {
+                delegate.selectAndFocus(Qt.NoModifier, Qt.MouseFocusReason)
+                delegate.itemDoubleClicked(delegate.index, delegate.rowModel)
+            }
+
+            onLongPressed: {
+                delegate.rightClick(delegate, delegate.rowModel, parent.mapToGlobal(point.position.x, point.position.y))
+            }
+        }
+    }
+
+    background: AnimatedBackground {
+        animationDuration: VLCStyle.duration_short
+        enabled: theme.initialized
+        color: delegate.selected ? theme.bg.highlight : theme.bg.primary
+        border.color: visualFocus ? theme.visualFocus : "transparent"
+    }
+
+    contentItem: Row {
+        id: contentItemRow
+
+        leftPadding: VLCStyle.margin_xxxsmall
+        rightPadding: VLCStyle.margin_xxxsmall
+
+        spacing: VLCStyle.column_spacing
+
+        Repeater {
+            model: delegate.sortModel
+
+            //manually load the component as Loader is unable to pass initial/required properties
+            Item {
+                id: loader
+                required property var modelData
+                property TableRowDelegate item: null
+                width: {
+                    if (!!modelData.size)
+                        return modelData.size * delegate.fixedColumnWidth
+                    else if (!!modelData.weight)
+                        return modelData.weight * delegate.weightedColumnWidth
+                    else
+                        return 0
+                }
+                height: parent.height
+
+                Component.onCompleted: {
+                    const del = modelData.model.colDelegate || delegate.defaultDelegate
+                    item = del.createObject(loader, {
+                            width: Qt.binding(() => loader.width),
+                            height: Qt.binding(() => loader.height),
+                            rowModel: Qt.binding(() => delegate.rowModel),
+                            colModel: Qt.binding(() => loader.modelData.model),
+                            index: Qt.binding(() => delegate.index),
+                            currentlyFocused: Qt.binding(() => delegate.visualFocus),
+                            selected: Qt.binding(() => delegate.selected),
+                            containsMouse: Qt.binding(() => delegate.hovered),
+                            colorContext: Qt.binding(() => theme),
+                        }
+                    )
+                }
+                Component.onDestruction: {
+                    item?.destroy()
+                }
+            }
+        }
+
+        Item {
+            width: VLCStyle.contextButton_width
+
+            height: parent.height
+
+            visible: !!delegate.contextMenu
+
+            Widgets.IconToolButton {
+                id: contextButton
+
+                // place it at the end of the last column, we don't want spacing for this column
+                x: - contentItemRow.spacing + VLCStyle.contextButton_margin
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                text: VLCIcons.ellipsis
+
+                font.pixelSize: VLCStyle.icon_normal
+
+                description: qsTr("Menu")
+
+                visible: delegate.hovered
+                         || ((delegate.contextMenu?.currentRequest ?? delegate._defaultContextMenuRequestID)
+                                    === delegate._contextMenuRequestID
+                                && delegate.contextMenu.visible)
+
+                // NOTE: QTBUG-100543
+                // Hover handling in controls is blocking in Qt 6.2, meaning if this
+                // control handles the hover, delegate itself won't have its `hovered`
+                // set. Since this control is visible when delegate is hovered, there
+                // becomes an infinite loop of visibility when this control is hovered.
+
+                // 1) When delegate is hovered, delegate's hovered property becomes set.
+                // 2) This control becomes visible.
+                // 3) When this control is hovered, delegate's hovered property becomes unset.
+                // 4) This control becomes invisible. Delegate's hovered property becomes set.
+                // * Infinite loop *
+
+                // Disable hovering in this control to prevent twitching due to infinite loop:
+                hoverEnabled: MainCtx.qtQuickControlRejectsHoverEvents()
+
+                onClicked: {
+                    if (!delegate.selected)
+                        delegate.selectAndFocus(Qt.NoModifier, Qt.MouseFocusReason)
+
+                    const pos = contextButton.mapToGlobal(VLCStyle.margin_xsmall, contextButton.height / 2 + VLCStyle.fontHeight_normal)
+                    const selectionIndexes = delegate.ListView.view.selectionModel.selectedIndexes
+
+                    delegate._contextMenuRequestID
+                            = delegate.contextMenu.tableView_popup(delegate.index, selectionIndexes, pos)
+                                ?? delegate._defaultContextMenuRequestID
+                }
+
+                activeFocusOnTab: false
+            }
+        }
+    }
+
+    Widgets.ListViewExt.VerticalDropAreaLayout {
+        id: dropAreaLayout
+        anchors.fill: parent
+
+        view: delegate.ListView.view
+    }
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/TableViewExt.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/TableViewExt.qml Changed

@@ -19,8 +19,6 @@
 import QtQuick.Controls
 import QtQml.Models
 import QtQuick.Layouts
-import Qt5Compat.GraphicalEffects
-
 
 import VLC.MainInterface
 import VLC.Util
@@ -37,7 +35,7 @@
 
     property Component tableHeaderDelegate:  TableHeaderDelegate {
         Widgets.CaptionLabel {
-            horizontalAlignment: Text.AlignLeft
+            horizontalAlignment: colModel.hCenterText ? Text.AlignHCenter : Text.AlignLeft
             verticalAlignment: Text.AlignVCenter
 
             anchors.fill: parent
@@ -49,11 +47,35 @@
         }
     }
 
+    /*
+        Expects an object with the following properties:
+
+        // Determines if the menu is visible (optional)
+        bool visible
+
+        // The request ID associated with the currently displayed context menu (optional)
+        int currentRequest
+
+        // Displays the popup menu at the specified position (required)
+        // incase the function doesn't return request id TableViewExt will
+        // try to mimic behavior but it may have some caveats
+        //
+        // Parameters:
+        //    current    - calling row index
+        //    selectedIndexes - current item selection (all)
+        //    globalPos  - the global position where the popup should appear
+        //
+        // Returns:
+        //    int - the generated request ID
+        function tableView_popup(current, selectedIndexes, globalPos) -> int (request ID)
+    */
+    required property var rowContextMenu
+
     // NOTE: We want edge to edge backgrounds in our delegate and header, so we implement our own
     //       margins implementation like in ExpandGridView. The default values should be the same
     //       than ExpandGridView to respect the grid parti pris.
-    property int leftMargin: VLCStyle.margin_normal + leftPadding
-    property int rightMargin: VLCStyle.margin_normal + rightPadding
+    property int leftMargin: VLCStyle.layout_left_margin + leftPadding
+    property int rightMargin: VLCStyle.layout_right_margin + rightPadding
 
     property int leftPadding: 0
     property int rightPadding: 0
@@ -83,14 +105,22 @@
          return count
       }
 
-    readonly property int _availableSpaceForWeightedColumns: (width - (leftMargin + rightMargin + _totalSpacerSize + _fixedColumnSize))
+    readonly property int _availableSpaceForWeightedColumns: (availableRowWidth - ( _totalSpacerSize + _fixedColumnSize))
     readonly property int _weightedColumnsSize: _availableSpaceForWeightedColumns / _totalColumnWeights
 
     readonly property int _totalSpacerSize: VLCStyle.column_spacing * sortModel.length
 
     property Component header: null
     property Item headerItem: view.headerItem?.loadedHeader ?? null
-    property color headerColor: colorContext.bg.primary
+    // NOTE: Clipping is not used, so if header is not inline, it should have background to not expose the content.
+    // TODO: Investigate using clipping here, which makes more sense in general for views. Not using clipping
+    //       makes this view not suitable for using it in auxiliary places (non-main, which is not naturally
+    //       clipped by the window). In order to make use of clipping, the header should be placed outside of
+    //       the view (similar to play queue). This is already a requirement to prevent events reaching to
+    //       the delegate (such as, hovering over the header). As `clip: true` adjusts both the scene graph
+    //       viewport, and qt quick event delivery agent. Having a control as header and blocking the events
+    //       events reaching beneath is not a good behavior, as currently done here.
+    property color headerColor: (interactive && (headerPositioning !== ListView.InlineHeader)) ? colorContext.bg.primary : "transparent"
     property int headerTopPadding: 0
 
 
@@ -107,6 +137,8 @@
     property real _availabeRowWidthLastUpdateTime: Date.now()
 
     readonly property real _currentAvailableRowWidth: width - leftMargin - rightMargin
+                                                      // contextButton is implemented as fixed column
+                                                      - VLCStyle.contextButton_width - (VLCStyle.contextButton_margin * 2)
 
     // Aliases
 
@@ -157,7 +189,6 @@
 
     //forwarded from subview
     signal actionForSelection( var selection )
-    signal contextMenuButtonClicked(Item menuParent, var menuModel, point globalMousePos)
     signal rightClick(Item menuParent, var menuModel, point globalMousePos)
     signal itemDoubleClicked(var index, var model)
 
@@ -235,7 +266,6 @@
         id: view
 
         anchors.fill: parent
-
         focus: true
 
         headerPositioning: ListView.OverlayHeader
@@ -386,13 +416,13 @@
             color: root.colorContext.accent
         }
 
-        delegate: TableViewDelegate {
+        delegate: Widgets.TableViewDelegateExt {
             id: tableDelegate
 
             required property var model
 
             width: view.width
-            height: root.rowHeight
+            height: Math.round(root.rowHeight)
 
             fixedColumnWidth: root.baseColumnWidth
             weightedColumnWidth: root._weightedColumnsSize
@@ -402,14 +432,13 @@
 
             dragItem: root.dragItem
 
+            contextMenu: root.rowContextMenu
+
             rowModel: model
             sortModel: root.sortModel
 
             selected: selectionModel.selectedIndexesFlat.includes(index)
 
-            onContextMenuButtonClicked: (menuParent, menuModel, globalMousePos) => {
-                root.contextMenuButtonClicked(menuParent, menuModel, globalMousePos)
-            }
             onRightClick: (menuParent, menuModel, globalMousePos) => {
                 root.rightClick(menuParent, menuModel, globalMousePos)
             }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/ToolTipExt.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/ToolTipExt.qml Changed

@@ -19,6 +19,7 @@
 import QtQuick
 import QtQuick.Templates as T
 
+import VLC.MainInterface
 import VLC.Style
 
 T.ToolTip {
@@ -39,6 +40,30 @@
 
     closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent
 
+    Component.onCompleted: {
+        if (MainCtx.useTopLevelWindowForToolTip()) {
+            console.assert(typeof control.popupType === "number")
+            control.popupType = 1 // Popup.Window
+        }
+    }
+
+    // NOTE: The tool tip often moves around, particularly noticable
+    //       with the attached (global) tool tip, and pointing tool
+    //       tip. Ideally, we could override property `visible` and
+    //       call `QQuickPopup::open()` with `Qt.callLater()`, but
+    //       the property is marked as FINAL. At the same time,
+    //       Qt disables the timer when the delay is 0, ideally we
+    //       need a timer with 0 delay, but 1 millisecond should
+    //       not be a big deal.
+    // NOTE: Mispositioned tool tip upon being visible is observed
+    //       especially with the independent window (`Popup.Window`)
+    //       setting. We need to make sure that its position is
+    //       adjusted before the tool tip is shown. For that reason,
+    //       be careful to not use complex bindings for the position
+    //       and text, as they may not be resolved as soon as the
+    //       tool tip is shown (single event loop cycle).
+    delay: 1
+
     readonly property ColorContext colorContext: ColorContext {
         id: theme
         colorSet: ColorContext.Tooltip

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/VideoProgressBar.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/VideoProgressBar.qml Changed

@@ -37,6 +37,7 @@
     }
 
     Rectangle {
+        id: rectangle
 
         anchors.left: parent.left
         anchors.right: parent.right
@@ -49,25 +50,10 @@
         color: "white"
         radius: progressBar.radius
 
-        //use clipping again to delimit the viewed part as we want the accent section to follow the given as well
-        Item {
-            clip: true
-
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            width: progressBar.value * parent.width
-
-            Rectangle {
-                width: progressBar.width
-
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
-                anchors.left: parent.left
-
-                color: theme.fg.primary
-                radius: progressBar.radius
-            }
+        gradient: Gradient {
+            orientation: Gradient.Horizontal
+            GradientStop { position: progressBar.value; color: theme.fg.primary }
+            GradientStop { position: progressBar.value + (1. / rectangle.width); color: rectangle.color }
         }
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/qt/widgets/qml/ViewHeader.qml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/ViewHeader.qml Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/qt/widgets/qml/compat/BlurEffect.qml Added

@@ -0,0 +1,29 @@
+/*****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+import QtQuick
+import Qt5Compat.GraphicalEffects
+
+FastBlur {
+    id: effect
+
+    implicitWidth: source ? Math.min(source.paintedWidth ?? Number.MAX_VALUE, source.width) : 0
+    implicitHeight: source ? Math.min(source.paintedHeight ?? Number.MAX_VALUE, source.height) : 0
+
+    // Avoid using padding, as Qt thinks that it needs to layering implicitly.
+    transparentBorder: false
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/skins2/controls/ctrl_slider.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/skins2/controls/ctrl_slider.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/gui/skins2/controls/ctrl_slider.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/skins2/controls/ctrl_slider.hpp Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/gui/skins2/meson.build Added

@@ -0,0 +1,158 @@
+skins2_flags = 
+skins2_deps =  freetype_dep 
+
+fribidi_dep = dependency('fribidi', required: get_option('fribidi'))
+if fribidi_dep.found()
+    skins2_deps +=  fribidi_dep 
+    skins2_flags +=  '-DHAVE_FRIBIDI' 
+
+    harfbuzz_dep = dependency('harfbuzz', required: get_option('harfbuzz'))
+    if harfbuzz_dep.found()
+        skins2_deps +=  harfbuzz_dep 
+        skins2_flags +=  '-DHAVE_HARFBUZZ' 
+    endif
+endif
+
+if cc.has_function('lrintf', dependencies: m_lib)
+    cdata.set('HAVE_LRINTF', 1)
+    skins2_deps +=  m_lib 
+endif
+
+skins2_sources = files(
+    'commands/async_queue.cpp',
+    'commands/cmd_add_item.cpp',
+    'commands/cmd_audio.cpp',
+    'commands/cmd_dvd.cpp',
+    'commands/cmd_change_skin.cpp',
+    'commands/cmd_fullscreen.cpp',
+    'commands/cmd_input.cpp',
+    'commands/cmd_layout.cpp',
+    'commands/cmd_muxer.cpp',
+    'commands/cmd_on_top.cpp',
+    'commands/cmd_playlist.cpp',
+    'commands/cmd_playtree.cpp',
+    'commands/cmd_minimize.cpp',
+    'commands/cmd_quit.cpp',
+    'commands/cmd_resize.cpp',
+    'commands/cmd_snapshot.cpp',
+    'commands/cmd_vars.cpp',
+    'controls/ctrl_button.cpp',
+    'controls/ctrl_checkbox.cpp',
+    'controls/ctrl_generic.cpp',
+    'controls/ctrl_image.cpp',
+    'controls/ctrl_list.cpp',
+    'controls/ctrl_tree.cpp',
+    'controls/ctrl_move.cpp',
+    'controls/ctrl_resize.cpp',
+    'controls/ctrl_slider.cpp',
+    'controls/ctrl_radialslider.cpp',
+    'controls/ctrl_text.cpp',
+    'controls/ctrl_video.cpp',
+    'events/evt_input.cpp',
+    'events/evt_key.cpp',
+    'events/evt_mouse.cpp',
+    'events/evt_special.cpp',
+    'events/evt_scroll.cpp',
+    'parser/builder.cpp',
+    'parser/expr_evaluator.cpp',
+    'parser/interpreter.cpp',
+    'parser/skin_parser.cpp',
+    'parser/xmlparser.cpp',
+    'src/anchor.cpp',
+    'src/anim_bitmap.cpp',
+    'src/bitmap_font.cpp',
+    'src/dialogs.cpp',
+    'src/file_bitmap.cpp',
+    'src/art_manager.cpp',
+    'src/ft2_bitmap.cpp',
+    'src/ft2_font.cpp',
+    'src/ft2_err.c',
+    'src/generic_bitmap.cpp',
+    'src/generic_layout.cpp',
+    'src/generic_window.cpp',
+    'src/ini_file.cpp',
+    'src/logger.cpp',
+    'src/os_factory.cpp',
+    'src/popup.cpp',
+    'src/scaled_bitmap.cpp',
+    'src/skin_main.cpp',
+    'src/theme.cpp',
+    'src/theme_loader.cpp',
+    'src/theme_repository.cpp',
+    'src/tooltip.cpp',
+    'src/top_window.cpp',
+    'src/fsc_window.cpp',
+    'src/var_manager.cpp',
+    'src/vlcproc.cpp',
+    'src/vout_window.cpp',
+    'src/vout_manager.cpp',
+    'src/window_manager.cpp',
+    'utils/bezier.cpp',
+    'utils/fsm.cpp',
+    'utils/position.cpp',
+    'utils/ustring.cpp',
+    'utils/var_bool.cpp',
+    'utils/var_list.cpp',
+    'utils/var_percent.cpp',
+    'utils/var_text.cpp',
+    'utils/var_string.cpp',
+    'utils/var_tree.cpp',
+    'vars/equalizer.cpp',
+    'vars/playtree.cpp',
+    'vars/time.cpp',
+    'vars/volume.cpp',
+)
+
+
+if host_system == 'windows'
+skins2_flags +=  '-DWIN32_SKINS' 
+skins2_deps += 
+    cc.find_library('gdi32'),
+    cc.find_library('ole32'),
+    cc.find_library('uuid'),
+    cc.find_library('msimg32'),
+
+skins2_sources += files(
+    'win32/win32_dragdrop.cpp',
+    'win32/win32_factory.cpp',
+    'win32/win32_graphics.cpp',
+    'win32/win32_loop.cpp',
+    'win32/win32_popup.cpp',
+    'win32/win32_timer.cpp',
+    'win32/win32_tooltip.cpp',
+    'win32/win32_window.cpp',
+)
+endif
+
+if x11_dep.found()
+skins2_flags +=  '-DX11_SKINS' 
+skins2_sources += files(
+    'x11/x11_display.cpp',
+    'x11/x11_dragdrop.cpp',
+    'x11/x11_factory.cpp',
+    'x11/x11_graphics.cpp',
+    'x11/x11_loop.cpp',
+    'x11/x11_popup.cpp',
+    'x11/x11_timer.cpp',
+    'x11/x11_window.cpp',
+    'x11/x11_tooltip.cpp',
+)
+skins2_deps += 
+    x11_dep,
+    dependency('xpm', required: true),
+    dependency('xinerama', required: true),
+    dependency('xcursor', required: true),
+    dependency('xext', required: true),
+
+endif
+
+vlc_modules += {
+    'name' : 'skins2',
+    'sources' :  skins2_sources ,
+    'dependencies' :  skins2_deps ,
+    'c_args' : skins2_flags,
+    'cpp_args' : skins2_flags, '-O2', '-fno-rtti',
+    'enabled' : get_option('skins2')
+      .disable_auto_if(host_system != 'windows' and not x11_dep.found()).allowed() and
+      freetype_dep.found() and host_system != 'darwin'
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/amf/amf_helper.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/amf/amf_helper.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/d3d11/d3d11_filters.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/d3d11/d3d11_filters.c Changed

@@ -34,6 +34,7 @@
 #include <vlc_filter.h>
 #include <vlc_picture.h>
 #include <vlc_codec.h>
+#include <vlc_chroma_probe.h>
 
 #define COBJMACROS
 #include <d3d11.h>
@@ -543,6 +544,26 @@
     return VLC_EGENERIC;
 }
 
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+#define OUT_GPU_CHROMAS VLC_CODEC_D3D11_OPAQUE, VLC_CODEC_D3D11_OPAQUE_10B
+
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_D3D11_OPAQUE, VLC_CODEC_I420,
+        VLC_CODEC_YV12, VLC_CODEC_NV12);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_D3D11_OPAQUE_10B,
+        VLC_CODEC_I420_10L, VLC_CODEC_P010);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_D3D11_OPAQUE_RGBA,
+        VLC_CODEC_RGBA);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_D3D11_OPAQUE_BGRA,
+        VLC_CODEC_BGRA);
+
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_I420, OUT_GPU_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_I420_10L, OUT_GPU_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_YV12, OUT_GPU_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_NV12, OUT_GPU_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_P010, OUT_GPU_CHROMAS);
+}
+
 vlc_module_begin()
     set_description(N_("Direct3D11 adjust filter"))
     set_subcategory( SUBCAT_VIDEO_VFILTER )
@@ -589,4 +610,6 @@
     set_callbacks( D3D11OpenBlockDecoder, D3D11CloseBlockDecoder )
     set_capability( "video decoder", 90 )
 
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end()

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/d3d11/meson.build Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/d3d9/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/d3d9/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/d3d9/d3d9_filters.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/d3d9/d3d9_filters.c Changed

@@ -34,6 +34,7 @@
 #include <vlc_filter.h>
 #include <vlc_picture.h>
 #include <vlc_codec.h>
+#include <vlc_chroma_probe.h>
 
 #define COBJMACROS
 #include <initguid.h>
@@ -54,7 +55,6 @@
 
 typedef struct
 {
-    HINSTANCE                      hdecoder_dll;
     IDirectXVideoProcessor         *processor;
     IDirect3DSurface9              *hw_surface;
 
@@ -261,7 +261,6 @@
 
     IDirect3DSurface9_Release( sys->hw_surface );
     IDirectXVideoProcessor_Release( sys->processor );
-    FreeLibrary( sys->hdecoder_dll );
     vlc_video_context_Release(filter->vctx_out);
 
     free(sys);
@@ -274,7 +273,6 @@
 static int D3D9OpenAdjust(filter_t *filter)
 {
     filter_sys_t *sys = NULL;
-    HINSTANCE hdecoder_dll = NULL;
     HRESULT hr;
     GUID *processorGUIDs = NULL;
     GUID *processorGUID = NULL;
@@ -293,26 +291,11 @@
     if (unlikely(sys == NULL))
         return VLC_ENOMEM;
 
-    hdecoder_dll = LoadLibrary(TEXT("DXVA2.DLL"));
-    if (!hdecoder_dll)
-        goto error;
-
     d3d9_video_context_t *vtcx_sys = GetD3D9ContextPrivate( filter->vctx_in );
     D3DFORMAT format = vtcx_sys->format;
 
-    HRESULT (WINAPI *CreateVideoService)(IDirect3DDevice9 *,
-                                         REFIID riid,
-                                         void **ppService);
-    CreateVideoService =
-      (void *)GetProcAddress(hdecoder_dll, "DXVA2CreateVideoService");
-    if (CreateVideoService == NULL)
-    {
-        msg_Err(filter, "Can't create video service");
-        goto error;
-    }
-
     d3d9_decoder_device_t *d3d9_decoder = GetD3D9OpaqueContext(filter->vctx_in);
-    hr = CreateVideoService( d3d9_decoder->d3ddev.dev,
+    hr = DXVA2CreateVideoService( d3d9_decoder->d3ddev.dev,
                              &IID_IDirectXVideoProcessorService, &pv);
     if (FAILED(hr))
     {
@@ -459,8 +442,6 @@
     CoTaskMemFree(processorGUIDs);
     IDirectXVideoProcessorService_Release(processor);
 
-    sys->hdecoder_dll = hdecoder_dll;
-
     filter->ops = &filter_ops;
     filter->p_sys = sys;
     filter->vctx_out = vlc_video_context_Hold(filter->vctx_in);
@@ -472,13 +453,25 @@
         IDirectXVideoProcessor_Release( sys->processor );
     if (processor)
         IDirectXVideoProcessorService_Release(processor);
-    if (hdecoder_dll)
-        FreeLibrary(hdecoder_dll);
     free(sys);
 
     return VLC_EGENERIC;
 }
 
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+#define OUT_GPU_CHROMAS VLC_CODEC_D3D9_OPAQUE, VLC_CODEC_D3D9_OPAQUE_10B
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_D3D9_OPAQUE, VLC_CODEC_I420,
+        VLC_CODEC_YV12, VLC_CODEC_NV12);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_D3D9_OPAQUE_10B,
+        VLC_CODEC_I420_10L, VLC_CODEC_P010);
+
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_I420, OUT_GPU_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_YV12, OUT_GPU_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_I420_10L, OUT_GPU_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_P010, OUT_GPU_CHROMAS);
+}
+
 vlc_module_begin()
     set_description(N_("Direct3D9 adjust filter"))
     set_subcategory(SUBCAT_VIDEO_VFILTER)
@@ -515,4 +508,6 @@
     set_description(N_("Direct3D9"))
     set_callback_dec_device( D3D9OpenDecoderDevice, 10 )
     add_shortcut ("dxva2")
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/d3d9/dxva2_deinterlace.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/d3d9/dxva2_deinterlace.c Changed

@@ -42,7 +42,6 @@
 
 typedef struct
 {
-    HINSTANCE                      hdecoder_dll;
     IDirectXVideoProcessor         *processor;
     IDirect3DSurface9              *hw_surface;
 
@@ -329,7 +328,6 @@
     Flush(filter);
     IDirect3DSurface9_Release( sys->hw_surface );
     IDirectXVideoProcessor_Release( sys->processor );
-    FreeLibrary( sys->hdecoder_dll );
     vlc_video_context_Release(filter->vctx_out);
 
     free(sys);
@@ -342,7 +340,6 @@
 int D3D9OpenDeinterlace(filter_t *filter)
 {
     filter_sys_t *sys;
-    HINSTANCE hdecoder_dll = NULL;
     HRESULT hr;
     GUID *processorGUIDs = NULL;
     GUID *processorGUID = NULL;
@@ -361,22 +358,11 @@
     if (unlikely(sys == NULL))
         return VLC_ENOMEM;
 
-    hdecoder_dll = LoadLibrary(TEXT("DXVA2.DLL"));
-    if (!hdecoder_dll)
-        goto error;
-
     d3d9_video_context_t *vtcx_sys = GetD3D9ContextPrivate( filter->vctx_in );
 
     d3d9_decoder_device_t *d3d9_decoder = GetD3D9OpaqueContext( filter->vctx_in );
 
-    HRESULT (WINAPI *CreateVideoService)(IDirect3DDevice9 *,
-                                         REFIID riid,
-                                         void **ppService);
-    CreateVideoService =
-      (void *)GetProcAddress(hdecoder_dll, "DXVA2CreateVideoService");
-    if (CreateVideoService == NULL)
-        goto error;
-    hr = CreateVideoService( d3d9_decoder->d3ddev.dev,
+    hr = DXVA2CreateVideoService( d3d9_decoder->d3ddev.dev,
                              &IID_IDirectXVideoProcessorService, &pv );
     if (FAILED(hr))
         goto error;
@@ -493,7 +479,6 @@
         goto error;
     sys->Saturation = Range.DefaultValue.Value;
 
-    sys->hdecoder_dll = hdecoder_dll;
     sys->decoder_caps = best_caps;
 
     InitDeinterlacingContext( &sys->context );
@@ -532,8 +517,6 @@
         IDirectXVideoProcessor_Release( sys->processor );
     if (processor)
         IDirectXVideoProcessorService_Release(processor);
-    if (hdecoder_dll)
-        FreeLibrary(hdecoder_dll);
     free(sys);
 
     return VLC_EGENERIC;

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/d3d9/meson.build Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/meson.build Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/mmal/codec.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/mmal/codec.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/mmal/converter.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/mmal/converter.c Changed

@@ -32,6 +32,7 @@
 #include <vlc_codec.h>
 #include <vlc_filter.h>
 #include <vlc_plugin.h>
+#include <vlc_chroma_probe.h>
 
 #include <interface/mmal/mmal.h>
 #include <interface/mmal/util/mmal_util.h>
@@ -65,6 +66,20 @@
 
 static int OpenConverter(filter_t *);
 
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+#define OUT_CHROMAS \
+    VLC_CODEC_BGRX, VLC_CODEC_RGBX, VLC_CODEC_XBGR, \
+    VLC_CODEC_XRGB, VLC_CODEC_RGB565BE, VLC_CODEC_RGBA, \
+    VLC_CODEC_BGRA, VLC_CODEC_ARGB, VLC_CODEC_ABGR
+
+    vlc_chroma_conv_add_in_outlist(vec, 1, VLC_CODEC_I420_10L, OUT_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 1, VLC_CODEC_I420, OUT_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_MMAL_OPAQUE, OUT_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_I420_10L, VLC_CODEC_MMAL_OPAQUE);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_I420, VLC_CODEC_MMAL_OPAQUE);
+}
+
 vlc_module_begin()
     set_subcategory( SUBCAT_VIDEO_VFILTER )
     set_shortname(N_("MMAL resizer"))
@@ -75,6 +90,8 @@
         change_integer_list( pi_converter_modes, ppsz_converter_text )
 #endif
     set_callback_video_converter(OpenConverter, 900)
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end()
 
 #define MMAL_SLICE_HEIGHT 16
@@ -250,7 +267,8 @@
     filter_t * const p_filter = (filter_t *)port->userdata;
 
     if (buffer->cmd == MMAL_EVENT_ERROR) {
-        MMAL_STATUS_T status = *(uint32_t *)buffer->data;
+        MMAL_STATUS_T status;
+        memcpy(&status, buffer->data, sizeof(status));
 
         converter_sys_t * sys = p_filter->p_sys;
         sys->err_stream = status;
@@ -985,4 +1003,3 @@
 
     return ret;
 }
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/mmal/deinterlace.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/mmal/deinterlace.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/mmal/vout.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/mmal/vout.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/nvdec/chroma.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/nvdec/chroma.c Changed

@@ -28,17 +28,34 @@
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_codec.h>
+#include <vlc_chroma_probe.h>
 
 #include "nvdec_fmt.h"
 #include "nvdec_priv.h"
 
 static int OpenCUDAToCPU( filter_t * );
 
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_NVDEC_OPAQUE, VLC_CODEC_NV12,
+                        false);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_NVDEC_OPAQUE_10B, VLC_CODEC_P010,
+                        false);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_NVDEC_OPAQUE_16B, VLC_CODEC_P016,
+                        false);
+    vlc_chroma_conv_add_in_outlist(vec, 1.1, VLC_CODEC_NVDEC_OPAQUE_444,
+        VLC_CODEC_I444, VLC_CODEC_YUVA);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_NVDEC_OPAQUE_444_16B, VLC_CODEC_I444_16L,
+                        false);
+}
+
 vlc_module_begin()
     set_shortname(N_("CUDA converter"))
     set_description(N_("CUDA/NVDEC Chroma Converter filter"))
     set_subcategory(SUBCAT_VIDEO_VFILTER)
     set_callback_video_converter(OpenCUDAToCPU, 10)
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end()
 
 #define CALL_CUDA(func, ...) CudaCheckErr(VLC_OBJECT(p_filter), devsys->cudaFunctions, devsys->cudaFunctions->func(__VA_ARGS__), #func)

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/nvdec/meson.build Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/nvdec/nvdec.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/nvdec/nvdec.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/vaapi/chroma.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/vaapi/chroma.c Changed

@@ -111,9 +111,11 @@
         break;
     }
     case VA_FOURCC_P010:
+    case VA_FOURCC_P012:
         switch (dest->format.i_chroma)
         {
             case VLC_CODEC_P010:
+            case VLC_CODEC_P012:
                 Copy420_SP_to_SP(dest, src_planes, src_pitches, src_img->height,
                                  cache);
                 break;
@@ -121,6 +123,10 @@
                 Copy420_16_SP_to_P(dest, src_planes, src_pitches,
                                    src_img->height, 6, cache);
                 break;
+            case VLC_CODEC_I420_12L:
+                Copy420_16_SP_to_P(dest, src_planes, src_pitches,
+                                   src_img->height, 4, cache);
+                break;
             default:
                 vlc_assert_unreachable();
         }
@@ -230,9 +236,16 @@
         Copy420_16_P_to_SP(dest_pic, src_planes, src_pitches,
                            src->format.i_height, -6, cache);
         break;
+    case VLC_CODEC_I420_12L:
+        assert(dest_pic->format.i_chroma == VLC_CODEC_VAAPI_420_12BPP);
+        Copy420_16_P_to_SP(dest_pic, src_planes, src_pitches,
+                           src->format.i_height, -4, cache);
+        break;
     case VLC_CODEC_P010:
+    case VLC_CODEC_P012:
     {
-        assert(dest_pic->format.i_chroma == VLC_CODEC_VAAPI_420_10BPP);
+        assert(dest_pic->format.i_chroma == VLC_CODEC_VAAPI_420_10BPP
+            || dest_pic->format.i_chroma == VLC_CODEC_VAAPI_420_12BPP);
         Copy420_SP_to_SP(dest_pic,  src_planes, src_pitches,
                          src->format.i_height, cache);
         break;
@@ -327,6 +340,14 @@
                 return VLC_SUCCESS;
             }
             break;
+        case VLC_CODEC_VAAPI_420_12BPP:
+            if (out->i_chroma == VLC_CODEC_P012
+             || out->i_chroma == VLC_CODEC_I420_12L)
+            {
+                *pixel_bytes = 2;
+                return VLC_SUCCESS;
+            }
+            break;
     }
 
     *upload = true;
@@ -344,6 +365,14 @@
                 return VLC_SUCCESS;
             }
             break;
+        case VLC_CODEC_VAAPI_420_12BPP:
+            if (in->i_chroma == VLC_CODEC_P012
+             || in->i_chroma == VLC_CODEC_I420_12L)
+            {
+                *pixel_bytes = 2;
+                return VLC_SUCCESS;
+            }
+            break;
     }
     return VLC_EGENERIC;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/vaapi/filters.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/vaapi/filters.c Changed

@@ -30,6 +30,7 @@
 #include <vlc_common.h>
 #include <vlc_filter.h>
 #include <vlc_plugin.h>
+#include <vlc_chroma_probe.h>
 #include "filters.h"
 
 /********************************
@@ -231,39 +232,31 @@
                               filter_sys->va.dpy, filter_sys->va.buf))
         goto error;
 
-    if (vlc_vaapi_BeginPicture(VLC_OBJECT(filter),
-                               filter_sys->va.dpy, filter_sys->va.ctx,
-                               vlc_vaapi_PicGetSurface(dest)))
-        goto error;
-
     if (pf_prepare_render_surface)
         pf_prepare_render_surface(filter_sys->p_data);
 
-    VAProcPipelineParameterBuffer *     pipeline_params;
+    VAProcPipelineParameterBuffer pipeline_params = {
+        .surface = vlc_vaapi_PicGetSurface(src),
+        .filters = &filter_sys->va.buf,
+        .num_filters = 1,
+    };
+
+    if (filter_sys->b_pipeline_fast)
+        pipeline_params.pipeline_flags = VA_PROC_PIPELINE_FAST;
+    if (pf_update_pipeline_params)
+        pf_update_pipeline_params(filter_sys->p_data, &pipeline_params);
 
     pipeline_buf =
         vlc_vaapi_CreateBuffer(VLC_OBJECT(filter),
                                filter_sys->va.dpy, filter_sys->va.ctx,
                                VAProcPipelineParameterBufferType,
-                               sizeof(*pipeline_params), 1, NULL);
+                               sizeof(pipeline_params), 1, &pipeline_params);
     if (pipeline_buf == VA_INVALID_ID)
         goto error;
 
-    if (vlc_vaapi_MapBuffer(VLC_OBJECT(filter), filter_sys->va.dpy,
-                            pipeline_buf, (void **)&pipeline_params))
-        goto error;
-
-    *pipeline_params = (typeof(*pipeline_params)){0};
-    pipeline_params->surface = vlc_vaapi_PicGetSurface(src);
-    pipeline_params->filters = &filter_sys->va.buf;
-    pipeline_params->num_filters = 1;
-    if (filter_sys->b_pipeline_fast)
-        pipeline_params->pipeline_flags = VA_PROC_PIPELINE_FAST;
-    if (pf_update_pipeline_params)
-        pf_update_pipeline_params(filter_sys->p_data, pipeline_params);
-
-    if (vlc_vaapi_UnmapBuffer(VLC_OBJECT(filter),
-                              filter_sys->va.dpy, pipeline_buf))
+    if (vlc_vaapi_BeginPicture(VLC_OBJECT(filter),
+                               filter_sys->va.dpy, filter_sys->va.ctx,
+                               vlc_vaapi_PicGetSurface(dest)))
         goto error;
 
     if (vlc_vaapi_RenderPicture(VLC_OBJECT(filter),
@@ -1126,6 +1119,15 @@
  * Module descriptor *
  *********************/
 
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_VAAPI_420, VLC_CODEC_I420, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_VAAPI_420_10BPP, VLC_CODEC_P010, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_VAAPI_420_10BPP, VLC_CODEC_I420_10L, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_VAAPI_420_12BPP, VLC_CODEC_P012, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_VAAPI_420_12BPP, VLC_CODEC_I420_12L, true);
+}
+
 vlc_module_begin()
     set_shortname(N_("VAAPI filters"))
     set_description(N_("Video Accelerated API filters"))
@@ -1152,4 +1154,7 @@
 
     add_submodule()
     set_callback_video_converter(vlc_vaapi_OpenChroma, 10)
+
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/vaapi/vlc_vaapi.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/vaapi/vlc_vaapi.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/vaapi/vlc_vaapi.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/vaapi/vlc_vaapi.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/vdpau/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/vdpau/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/vdpau/avcodec.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/vdpau/avcodec.c Changed

@@ -131,21 +131,26 @@
     free(sys);
 }
 
-static const struct vlc_va_operations ops = { Lock, Close, };
+static const struct vlc_va_operations ops =
+{
+    .get = Lock,
+    .close = Close,
+};
 
 const struct vlc_video_context_operations vdpau_vctx_ops = {
     NULL,
 };
 
-static int Open(vlc_va_t *va, AVCodecContext *avctx, enum AVPixelFormat hwfmt, const AVPixFmtDescriptor *desc,
-                const es_format_t *fmt_in, vlc_decoder_device *dec_device,
-                video_format_t *fmt_out, vlc_video_context **vtcx_out)
+static int Open(vlc_va_t *va, struct vlc_va_cfg *cfg)
 {
+    AVCodecContext *avctx = cfg->avctx;
+    enum AVPixelFormat hwfmt = cfg->hwfmt;
+    vlc_decoder_device *dec_device = cfg->dec_device;
+    video_format_t *fmt_out = cfg->video_fmt_out;
+
     if ( hwfmt != AV_PIX_FMT_VDPAU || GetVDPAUOpaqueDevice(dec_device) == NULL)
         return VLC_EGENERIC;
 
-    (void) fmt_in;
-    (void) desc;
     void *func;
     VdpStatus err;
     VdpChromaType type, *chroma;
@@ -226,7 +231,7 @@
         return VLC_ENOMEM;
     }
 
-    *vtcx_out = sys->vctx;
+    cfg->vctx_out = sys->vctx;
     va->ops = &ops;
     return VLC_SUCCESS;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/hw/vdpau/chroma.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/hw/vdpau/chroma.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/isa/arm/neon/chroma_yuv.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/isa/arm/neon/chroma_yuv.c Changed

@@ -26,14 +26,35 @@
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
+#include <vlc_chroma_probe.h>
 #include <vlc_cpu.h>
 #include "chroma_neon.h"
 
 static int Open (filter_t *);
 
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+#define PACKED_CHROMAS VLC_CODEC_YUYV, VLC_CODEC_UYVY, VLC_CODEC_YVYU, VLC_CODEC_VYUY
+
+    vlc_chroma_conv_add_in_outlist(vec, 0.75, VLC_CODEC_I420, PACKED_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 0.75, VLC_CODEC_YV12, PACKED_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, 0.75, VLC_CODEC_I422, PACKED_CHROMAS);
+
+    vlc_chroma_conv_add_in_outlist(vec, 0.75, VLC_CODEC_NV12, VLC_CODEC_I420,
+        VLC_CODEC_YV12);
+    vlc_chroma_conv_add_in_outlist(vec, 0.75, VLC_CODEC_NV21, VLC_CODEC_I420,
+        VLC_CODEC_YV12);
+
+    vlc_chroma_conv_add(vec, 0.75, VLC_CODEC_NV24, VLC_CODEC_I444, false);
+
+    vlc_chroma_conv_add_out_inlist(vec, 0.75, VLC_CODEC_I422, VLC_CODEC_NV16,
+        PACKED_CHROMAS);
+}
 vlc_module_begin ()
     set_description (N_("ARM NEON video chroma conversions"))
     set_callback_video_converter(Open, 250)
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end ()
 
 #define DEFINE_PACK(pack, pict) \

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/isa/arm/neon/yuv_rgb.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/isa/arm/neon/yuv_rgb.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/keystore/file_crypt_win32.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/keystore/file_crypt_win32.c Changed

@@ -28,8 +28,17 @@
 #include <windows.h>
 #include <dpapi.h>
 
-typedef BOOL (WINAPI *ProcessFunc)(DATA_BLOB*, LPCWSTR, DATA_BLOB*, PVOID,
-                                   CRYPTPROTECT_PROMPTSTRUCT*, DWORD, DATA_BLOB*);
+typedef BOOL (*ProcessFunc)(DATA_BLOB*, DATA_BLOB*);
+
+static BOOL FuncProtect(DATA_BLOB *input_blob, DATA_BLOB *output_blob)
+{
+    return CryptProtectData( input_blob, NULL, NULL, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN, output_blob);
+}
+
+static BOOL FuncUnprotect(DATA_BLOB *input_blob, DATA_BLOB *output_blob)
+{
+    return CryptUnprotectData( input_blob, NULL, NULL, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN, output_blob);
+}
 
 static size_t Process(const uint8_t *p_src, size_t i_src_len, uint8_t **pp_dst, ProcessFunc pf_process)
 {
@@ -40,7 +49,7 @@
     };
     DATA_BLOB output_blob;
 
-    if (pf_process( &input_blob, NULL, NULL, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN, &output_blob) == FALSE)
+    if (pf_process( &input_blob, &output_blob) == FALSE)
         return 0;
     *pp_dst = malloc(output_blob.cbData);
     if( unlikely( *pp_dst == NULL ) )
@@ -58,10 +67,7 @@
 {
     VLC_UNUSED( p_keystore );
     VLC_UNUSED( p_ctx );
-    // Cast the function pointer to avoid an invalid parameter warning, regarding the "description"
-    // parameter. It's LPCWSTR in the case of CryptProtectData, and LPWSTR* in the case of CryptUnprotect
-    // Since we pass NULL anyway, we don't care
-    return Process( p_src, i_src_len, pp_dst, (ProcessFunc)&CryptUnprotectData );
+    return Process( p_src, i_src_len, pp_dst, FuncUnprotect );
 }
 
 static size_t Encrypt( vlc_keystore *p_keystore, void *p_ctx, const uint8_t *p_src,
@@ -69,7 +75,7 @@
 {
     VLC_UNUSED( p_keystore );
     VLC_UNUSED( p_ctx );
-    return Process( p_src, i_src_len, pp_dst, CryptProtectData );
+    return Process( p_src, i_src_len, pp_dst, FuncProtect );
 }
 
 int CryptInit(vlc_keystore *p_keystore, struct crypt *p_crypt)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/keystore/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/keystore/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/libtool_cargo.sh -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/libtool_cargo.sh Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/logger/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/logger/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/logger/json.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/logger/json.c Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/logger/telegraf-rs Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/logger/telegraf-rs/Cargo.toml Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/logger/telegraf-rs/src Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/logger/telegraf-rs/src/lib.rs Added

@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+// Copyright (C) 2024-2025 Alexandre Janniaux <ajanni@videolabs.io>
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+
+use std::{cell::UnsafeCell, ffi::CStr, sync::Mutex};
+use telegraf::{Client, IntoFieldData, Point};
+use vlcrs_core::tracer::{sys::vlc_tracer_value_type, TracerCapability, TracerModuleLoader};
+use vlcrs_macros::module;
+
+struct TraceField(vlcrs_core::tracer::TraceField);
+
+impl IntoFieldData for TraceField {
+    fn field_data(&self) -> telegraf::FieldData {
+        match self.0.kind() {
+            vlc_tracer_value_type::String => unsafe {
+                let value = CStr::from_ptr(self.0.value().string);
+                telegraf::FieldData::Str(value.to_str().unwrap().to_string())
+            },
+            vlc_tracer_value_type::Integer => unsafe {
+                telegraf::FieldData::Number(self.0.value().integer)
+            },
+            vlc_tracer_value_type::Unsigned => unsafe {
+                telegraf::FieldData::UNumber(self.0.value().unsigned)
+            },
+            vlc_tracer_value_type::Double => unsafe {
+                telegraf::FieldData::Float(self.0.value().double)
+            },
+            _ => unreachable!(),
+        }
+    }
+}
+
+struct TelegrafTracer {
+    endpoint: Mutex<UnsafeCell<telegraf::Client>>,
+}
+
+impl TracerCapability for TelegrafTracer {
+    fn open(_obj: &mut vlcrs_core::object::Object) -> Option<impl TracerCapability>
+    where
+        Self: Sized,
+    {
+        let endpoint_address =
+            std::env::var("VLC_TELEGRAF_ENDPOINT").unwrap_or(String::from("tcp://localhost:8094"));
+        let endpoint = Client::new(&endpoint_address)
+            .map(UnsafeCell::new)
+            .map(Mutex::new)
+            .unwrap();
+        Some(Self { endpoint })
+    }
+
+    fn trace(&self, _tick: vlcrs_core::tracer::Tick, entries: &'_ vlcrs_core::tracer::Trace) {
+        if !entries
+            .into_iter()
+            .any(|e| e.kind() != vlcrs_core::tracer::sys::vlc_tracer_value_type::String)
+        {
+            /* We cannot support events for now. */
+            return;
+        }
+        let tags: Vec<(String, String)> = entries
+            .into_iter()
+            .filter(|e| e.kind() == vlcrs_core::tracer::sys::vlc_tracer_value_type::String)
+            .map(|entry| unsafe {
+                let value = CStr::from_ptr(entry.value().string);
+                (
+                    String::from(entry.key()),
+                    String::from(value.to_str().unwrap()),
+                )
+            })
+            .collect();
+
+        let record: Vec<(String, Box<dyn IntoFieldData + 'static>)> = entries
+            .into_iter()
+            .filter(|e| e.kind() != vlcrs_core::tracer::sys::vlc_tracer_value_type::String)
+            .map(|entry| {
+                (
+                    String::from(entry.key()),
+                    Box::new(TraceField(entry)) as Box<dyn IntoFieldData>,
+                )
+            })
+            .collect();
+
+        let p = Point::new(
+            String::from("measurement"),
+            tags,
+            record,
+            None, //Some(tick.0 as u64),
+        );
+
+        let mut endpoint = self.endpoint.lock().unwrap();
+        if let Err(err) = endpoint.get_mut().write_point(&p) {
+            match err {
+                telegraf::TelegrafError::IoError(e) => eprintln!("TelegrafTracer: IO Error: {}", e),
+                telegraf::TelegrafError::ConnectionError(s) => {
+                    eprintln!("telegraf tracer: connection error: {}", s)
+                }
+                telegraf::TelegrafError::BadProtocol(_) => todo!(),
+            }
+        }
+    }
+}
+
+module! {
+    type: TelegrafTracer (TracerModuleLoader),
+    capability: "tracer" @ 0,
+    category: ADVANCED_MISC,
+    description: "Tracer module forwarding the traces to a Telegraf endpoint",
+    shortname: "Telegraf tracer",
+    shortcuts: "telegraf",
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/lua/libs/osd.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/lua/libs/osd.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/meson.build Changed

@@ -11,20 +11,17 @@
 # here that are used by multiple modules in the same subdirectory)
 
 # Check for X C bindings (XCB)
-if (host_system != 'darwin' and host_system != 'windows') or get_option('xcb').enabled()
-    xcb_dep = dependency('xcb', version: '>= 1.6', required: get_option('xcb'))
-    xcb_composite_dep = dependency('xcb-composite', required: get_option('xcb'))
-    xcb_randr_dep = dependency('xcb-randr', version: '>= 1.3', required: get_option('xcb'))
-    xcb_render_dep = dependency('xcb-render', required: get_option('xcb'))
-    xcb_shm_dep = dependency('xcb-shm', version: '>= 1.9.2', required: get_option('xcb'))
-    xcb_xkb_dep = dependency('xcb-xkb', required: get_option('xcb'))
-    xcb_keysyms_dep = dependency('xcb-keysyms', version: '>= 0.3.4', required: get_option('xcb'))
-    xproto_dep = dependency('xproto', required: get_option('xcb'))
-    xcb_damage_dep = dependency('xcb-damage', required: get_option('xcb'))
-    xcb_xfixes_dep = dependency('xcb-xfixes', required: get_option('xcb'))
-else
-    xcb_dep = dependency('', required: false)
-endif
+xcb_auto_option = get_option('xcb').disable_auto_if(host_system == 'darwin' or host_system == 'windows')
+xcb_dep = dependency('xcb', version: '>= 1.6', required: xcb_auto_option)
+xcb_composite_dep = dependency('xcb-composite', required: xcb_auto_option)
+xcb_randr_dep = dependency('xcb-randr', version: '>= 1.3', required: xcb_auto_option)
+xcb_render_dep = dependency('xcb-render', required: xcb_auto_option)
+xcb_shm_dep = dependency('xcb-shm', version: '>= 1.9.2', required: xcb_auto_option)
+xcb_xkb_dep = dependency('xcb-xkb', required: xcb_auto_option)
+xcb_keysyms_dep = dependency('xcb-keysyms', version: '>= 0.3.4', required: xcb_auto_option)
+xproto_dep = dependency('xproto', required: xcb_auto_option)
+xcb_damage_dep = dependency('xcb-damage', required: xcb_auto_option)
+xcb_xfixes_dep = dependency('xcb-xfixes', required: xcb_auto_option)
 
 # Check for Wayland
 if (host_system != 'darwin' and host_system != 'windows') or get_option('xcb').enabled()
@@ -194,13 +191,25 @@
 # rsvg, used by SVG codec and text renderer
 rsvg_dep = dependency('librsvg-2.0', version: '>= 2.9.0', required: get_option('rsvg'))
 
-# libgcrypt, used by rtp, access, stream_out
-libgcrypt_dep = dependency('libgcrypt',
-                            version: '>= 1.6.0',
-                            required: get_option('libgcrypt'))
 # Rust support
 cargo_bin = find_program('cargo', required: get_option('rust'))
 
+# hxxx common helper lib
+hxxxhelper_lib = static_library(
+    'hxxxhelper',
+    files(
+        'codec/hxxx_helper.c',
+        'packetizer/hxxx_nal.c',
+        'packetizer/hxxx_sei.c',
+        'packetizer/h264_slice.c',
+        'packetizer/h264_nal.c',
+        'packetizer/hevc_nal.c',
+    ),
+    include_directories: vlc_include_dirs,
+    pic: true,
+    install: false
+)
+
 # JSON library
 json_bison_files = bison_gen.process('demux/json/grammar.y')
 json_lex_files = flex_gen.process('demux/json/lexicon.l')
@@ -216,10 +225,46 @@
     pic: true
 )
 
+# deinterlace common helper lib
+deinterlacecommon_lib = static_library(
+    'deinterlace_common',
+    files('video_filter/deinterlace/common.c'),
+    include_directories: vlc_include_dirs,
+    pic: true,
+    install: false
+)
+
+
 # Array that holds all enabled VLC module dicts
 vlc_modules = 
 vlc_rust_modules = 
 
+libandroid_env = 
+libandroid_utils = 
+
+if host_system == 'android'
+libandroid_env = static_library(
+    'libvlc_android_env',
+    include_directories: vlc_include_dirs,
+    install: false,
+    pic: true,
+    sources: 
+        'video_output/android/env.c',
+        'video_output/android/env.h',
+    ,
+)
+libandroid_utils = static_library(
+    'libvlc_android_utils',
+    include_directories: vlc_include_dirs,
+    install: false,
+    pic: true,
+    sources: 
+        'video_output/android/utils.c',
+        'video_output/android/utils.h',
+    ,
+)
+endif
+
 # video chroma modules
 subdir('video_chroma')
 
@@ -271,6 +316,9 @@
 # stream output modules
 subdir('stream_out')
 
+# stream extractor modules
+subdir('stream_extractor')
+
 # stream filter modules
 subdir('stream_filter')
 
@@ -286,6 +334,9 @@
 # video output modules
 subdir('video_output')
 
+# hardware modules
+subdir('hw')
+
 # video splitter modules
 subdir('video_splitter')
 
@@ -295,6 +346,11 @@
 # lua module
 subdir('lua')
 
+# muxer modules
+if get_option('stream_outputs')
+    subdir('mux')
+endif
+
 # Qt check executable
 # This has to be declared here as it needs to end up
 # in the modules folder, not in gui/qt/ subfolder as
@@ -344,6 +400,7 @@
         'c_args',
         'cpp_args',
         'objc_args',
+        'nasm_args',
         'extra_files',
         'enabled',
     
@@ -354,6 +411,10 @@
         endif
     endforeach
 
+    vlc_plugins_manifest += {
+        module'name': module
+    }
+
     if not module.get('enabled', true)
         continue
     endif
@@ -380,6 +441,7 @@
         c_args: module.get('c_args', ), common_args,
         cpp_args: module.get('cpp_args', ), common_args,
         objc_args: module.get('objc_args', ), common_args,
+        nasm_args: module.get('nasm_args', ), ,
         extra_files: module.get('extra_files', ),
         build_by_default: true,
         install: true,
@@ -389,9 +451,6 @@
     vlc_plugins_targets += {
         module'name': vlc_plugin
     }
-    vlc_plugins_manifest += {
-        module'name': module
-    }
 endforeach
 
 # Rust/cargo common handling code

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/misc/medialibrary/Thumbnailer.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/misc/medialibrary/Thumbnailer.cpp Changed

@@ -24,67 +24,100 @@
 
 #include "medialibrary.h"
 
-#include <vlc_thumbnailer.h>
 #include <vlc_fs.h>
 #include <vlc_block.h>
 #include <vlc_url.h>
 #include <vlc_cxx_helpers.hpp>
+#include <vlc_preparser.h>
 
+#include <climits>
 #include <stdexcept>
 
 Thumbnailer::Thumbnailer( vlc_medialibrary_module_t* ml )
-    : m_ml( ml )
-    , m_currentContext( nullptr )
-    , m_thumbnailer( nullptr, &vlc_thumbnailer_Delete )
+    : m_currentContext( nullptr )
+    , m_thumbnailer( nullptr, &vlc_preparser_Delete )
 {
-    m_thumbnailer.reset( vlc_thumbnailer_Create( VLC_OBJECT( ml ),
-                                                  VLC_TICK_FROM_SEC( 3 ) ) );
+    const struct vlc_preparser_cfg cfg = {
+        struct vlc_preparser_cfg cfg{};
+        cfg.types = VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES;
+        cfg.timeout = VLC_TICK_FROM_SEC( 3 );
+        cfg.max_thumbnailer_threads = 1;
+        return cfg;
+    }();
+    m_thumbnailer.reset( vlc_preparser_New( VLC_OBJECT( ml ), &cfg ) );
     if ( unlikely( m_thumbnailer == nullptr ) )
-        throw std::runtime_error( "Failed to instantiate a vlc_thumbnailer_t" );
+        throw std::runtime_error( "Failed to instantiate a vlc_preparser_t" );
 }
 
-void Thumbnailer::onThumbnailComplete( picture_t* thumbnail, void *data )
+void Thumbnailer::onThumbnailToFilesComplete(input_item_t *, int ,
+                                             const bool *result_array,
+                                             size_t result_count, void *data)
 {
     ThumbnailerCtx* ctx = static_cast<ThumbnailerCtx*>( data );
 
     vlc::threads::mutex_locker lock( ctx->thumbnailer->m_mutex );
     ctx->done = true;
-    if (thumbnail != nullptr)
-        ctx->thumbnail = picture_Hold(thumbnail);
+    if (result_count != 1) {
+        ctx->error = true;
+    } else {
+        ctx->error = !result_array0;
+    }
     ctx->thumbnailer->m_currentContext = nullptr;
-    ctx->thumbnailer->m_cond.signal();
+    ctx->thumbnailer->m_cond.broadcast();
 }
 
 bool Thumbnailer::generate( const medialibrary::IMedia&, const std::string& mrl,
                             uint32_t desiredWidth, uint32_t desiredHeight,
                             float position, const std::string& dest )
 {
+#if INT_MAX < UINT32_MAX
+    assert(desiredWidth < (uint32_t)INT_MAX);
+    assert(desiredHeight < (uint32_t)INT_MAX);
+#endif
+
     ThumbnailerCtx ctx{};
+
     auto item = vlc::wrap_cptr( input_item_New( mrl.c_str(), nullptr ),
                                 &input_item_Release );
     if ( unlikely( item == nullptr ) )
         return false;
 
-    input_item_AddOption( item.get(), "no-hwdec", VLC_INPUT_OPTION_TRUSTED );
     ctx.done = false;
     ctx.thumbnailer = this;
+    ctx.error = true;
     {
         vlc::threads::mutex_locker lock( m_mutex );
         m_currentContext = &ctx;
-        struct vlc_thumbnailer_seek_arg seek_arg = {
-            .type = vlc_thumbnailer_seek_arg::VLC_THUMBNAILER_SEEK_POS,
-            .pos = position,
-            .speed = vlc_thumbnailer_seek_arg::VLC_THUMBNAILER_SEEK_FAST,
+        struct vlc_thumbnailer_arg thumb_arg = {
+            .seek = {
+                .type = vlc_thumbnailer_arg::seek::VLC_THUMBNAILER_SEEK_POS,
+                .pos = position,
+                .speed = vlc_thumbnailer_arg::seek::VLC_THUMBNAILER_SEEK_FAST,
+            },
+            .hw_dec = false,
         };
 
-        static const struct vlc_thumbnailer_cbs cbs = {
-            .on_ended = onThumbnailComplete,
+        struct vlc_thumbnailer_output thumb_out = {
+            .format = VLC_THUMBNAILER_FORMAT_JPEG,
+            .width = (int)desiredWidth,
+            .height = (int)desiredHeight,
+            .crop = true,
+            .file_path = dest.c_str(),
+            .creat_mode = 0600,
         };
-        vlc_thumbnailer_req_id requestId =
-            vlc_thumbnailer_Request( m_thumbnailer.get(), item.get(), &seek_arg,
-                                     &cbs, &ctx );
 
-        if (requestId == VLC_THUMBNAILER_REQ_ID_INVALID)
+        static const struct vlc_thumbnailer_to_files_cbs cbs = {
+            .on_ended = onThumbnailToFilesComplete,
+        };
+
+        vlc_preparser_req_id requestId;
+        requestId = vlc_preparser_GenerateThumbnailToFiles(m_thumbnailer.get(),
+                                                           item.get(),
+                                                           &thumb_arg,
+                                                           &thumb_out, 1,
+                                                           &cbs, &ctx);
+
+        if (requestId == VLC_PREPARSER_REQ_ID_INVALID)
         {
             m_currentContext = nullptr;
             return false;
@@ -94,29 +127,17 @@
         m_currentContext = nullptr;
     }
 
-    if ( ctx.thumbnail == nullptr )
-        return false;
-
-    block_t* block;
-    if ( picture_Export( VLC_OBJECT( m_ml ), &block, nullptr, ctx.thumbnail,
-                         VLC_CODEC_JPEG, desiredWidth, desiredHeight, true ) != VLC_SUCCESS )
-        return false;
-    auto blockPtr = vlc::wrap_cptr( block, &block_Release );
-
-    auto f = vlc::wrap_cptr( vlc_fopen( dest.c_str(), "wb" ), &fclose );
-    if ( f == nullptr )
-        return false;
-    if ( fwrite( block->p_buffer, block->i_buffer, 1, f.get() ) != 1 )
-        return false;
-    return true;
+    return !ctx.error;
 }
 
 void Thumbnailer::stop()
 {
+    vlc_preparser_Cancel(m_thumbnailer.get(), VLC_PREPARSER_REQ_ID_INVALID);
+
     vlc::threads::mutex_locker lock{ m_mutex };
     if ( m_currentContext != nullptr )
     {
-        m_currentContext->done = true;
-        m_cond.signal();
+        while (m_currentContext != nullptr && m_currentContext->done == false)
+            m_cond.wait( m_mutex );
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/misc/medialibrary/medialibrary.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/misc/medialibrary/medialibrary.h Changed

@@ -34,13 +34,14 @@
 #include <vlc_input.h>
 #include <vlc_media_library.h>
 #include <vlc_cxx_helpers.hpp>
+#include <vlc_preparser.h>
 
 #include <cstdarg>
 #include <type_traits>
 
 struct vlc_event_t;
 struct vlc_object_t;
-struct vlc_thumbnailer_t;
+struct vlc_preparser_t;
 
 class Logger;
 
@@ -120,14 +121,10 @@
 {
     struct ThumbnailerCtx
     {
-        ~ThumbnailerCtx()
-        {
-            if ( thumbnail != nullptr )
-                picture_Release( thumbnail );
-        }
         Thumbnailer* thumbnailer;
         bool done;
-        picture_t* thumbnail;
+        bool error;
+        vlc_preparser_req_id id;
     };
 public:
     Thumbnailer(vlc_medialibrary_module_t* ml);
@@ -137,14 +134,15 @@
     void stop() override;
 
 private:
-    static void onThumbnailComplete( picture_t* thumbnail, void* data );
+    static void onThumbnailToFilesComplete(input_item_t *item, int status,
+                                           const bool *result_array,
+                                           size_t result_count, void *data);
 
 private:
-    vlc_medialibrary_module_t* m_ml;
     vlc::threads::mutex m_mutex;
     vlc::threads::condition_variable m_cond;
     ThumbnailerCtx* m_currentContext;
-    std::unique_ptr<vlc_thumbnailer_t, void(*)(vlc_thumbnailer_t*)> m_thumbnailer;
+    std::unique_ptr<vlc_preparser_t, void(*)(vlc_preparser_t*)> m_thumbnailer;
 };
 
 class MediaLibrary : public medialibrary::IMediaLibraryCb

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/misc/stats.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/misc/stats.c Changed

@@ -52,19 +52,21 @@
     if( !p_pic )
         goto error;
 
+    vlc_tick_t tick;
     if( p_block->i_buffer == kBufferSize )
     {
+        memcpy(&tick, p_block->p_buffer, sizeof(vlc_tick_t));
         msg_Dbg( p_dec, "got %"PRIu64" ms",
-                 MS_FROM_VLC_TICK(*(vlc_tick_t *)p_block->p_buffer) );
+                 MS_FROM_VLC_TICK(tick) );
         msg_Dbg( p_dec, "got %"PRIu64" ms offset",
-                 MS_FROM_VLC_TICK(vlc_tick_now() - *(vlc_tick_t *)p_block->p_buffer) );
-        *(vlc_tick_t *)(p_pic->p->p_pixels) = *(vlc_tick_t *)p_block->p_buffer;
+                 MS_FROM_VLC_TICK(vlc_tick_now() - tick) );
     }
     else
     {
         msg_Dbg( p_dec, "got a packet not from stats demuxer" );
-        *(vlc_tick_t *)(p_pic->p->p_pixels) = vlc_tick_now();
+        tick = vlc_tick_now();
     }
+    memcpy(p_pic->p->p_pixels, &tick, sizeof(vlc_tick_t));
 
     p_pic->date = p_block->i_pts != VLC_TICK_INVALID ?
             p_block->i_pts : p_block->i_dts;
@@ -101,13 +103,14 @@
     (void)p_pict;
     block_t * p_block = block_Alloc( kBufferSize );
 
-    *(vlc_tick_t*)p_block->p_buffer = vlc_tick_now();
+    vlc_tick_t now = vlc_tick_now();
+    memcpy(p_block->p_buffer, &now, sizeof(vlc_tick_t));
     p_block->i_buffer = kBufferSize;
     p_block->i_length = kBufferSize;
     p_block->i_dts = p_pict->date;
 
     msg_Dbg( p_enc, "putting %"PRIu64"ms",
-             MS_FROM_VLC_TICK(*(vlc_tick_t*)p_block->p_buffer) );
+             MS_FROM_VLC_TICK(now) );
     return p_block;
 }
 
@@ -164,8 +167,10 @@
 
     p_block->i_dts = p_block->i_pts = date_Increment( &p_sys->pts, kBufferSize );
 
+    vlc_tick_t tick;
+    memcpy(&tick, p_block->p_buffer, sizeof(vlc_tick_t));
     msg_Dbg( p_demux, "demux got %"PRId64" ms offset",
-             MS_FROM_VLC_TICK(vlc_tick_now() - *(vlc_tick_t *)p_block->p_buffer) );
+             MS_FROM_VLC_TICK(vlc_tick_now() - tick) );
 
     //es_out_SetPCR( p_demux->out, p_block->i_pts );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/misc/webservices/musicbrainz.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/misc/webservices/musicbrainz.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/mux/asf.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/mux/asf.c Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/mux/meson.build Added

@@ -0,0 +1,66 @@
+# muxer modules
+
+vlc_modules += {
+    'name': 'mux_dummy',
+    'sources': files('dummy.c'),
+}
+
+vlc_modules += {
+    'name': 'mux_asf',
+    'sources': files('asf.c'),
+}
+
+vlc_modules += {
+    'name': 'mux_avi',
+    'sources': files('avi.c'),
+}
+
+vlc_modules += {
+    'name': 'mux_mp4',
+    'sources': files(
+        'mp4/mp4.c',
+        'mp4/libmp4mux.c',
+        'extradata.c',
+        '../packetizer/av1_obu.c'),
+    'link_with': hxxxhelper_lib,
+}
+
+vlc_modules += {
+    'name': 'mux_mpjpeg',
+    'sources': files('mpjpeg.c'),
+}
+
+vlc_modules += {
+    'name': 'mux_ogg',
+    'sources': files('ogg.c'),
+    'dependencies':  ogg_dep ,
+    'enabled': ogg_dep.found(),
+}
+
+vlc_modules += {
+    'name': 'mux_ps',
+    'sources': files(
+        'mpeg/pes.c',
+        'mpeg/repack.c',
+        'mpeg/ps.c'),
+}
+
+vlc_modules += {
+    'name': 'mux_ts',
+    'sources': files(
+        'mpeg/pes.c',
+        'mpeg/repack.c',
+        'mpeg/csa.c',
+        'mpeg/tables.c',
+        'mpeg/tsutil.c',
+        'mpeg/ts.c',
+    ),
+    'dependencies':  libdvbpsi_dep, libdvbcsa_dep ,
+    'enabled': libdvbpsi_dep.found(),
+}
+
+vlc_modules += {
+    'name': 'mux_wav',
+    'sources': files('wav.c'),
+}
+

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/mux/mp4/libmp4mux.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/mux/mp4/libmp4mux.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/mux/mpeg/tables.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/mux/mpeg/tables.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/mux/mpeg/ts.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/mux/mpeg/ts.c Changed

@@ -276,6 +276,12 @@
     block_ChainLastAppend( &c->pp_last, b );
 }
 
+static void BufferChainAppendCallback( void *opaque, block_t *b )
+{
+    sout_buffer_chain_t *c = opaque;
+    BufferChainAppend(c, b);
+}
+
 static inline block_t *BufferChainGet( sout_buffer_chain_t *c )
 {
     block_t *b = c->p_first;
@@ -1885,7 +1891,7 @@
     sout_mux_sys_t       *p_sys = p_mux->p_sys;
 
     BuildPAT( p_sys->p_dvbpsi,
-              c, (PEStoTSCallback)BufferChainAppend,
+              c, BufferChainAppendCallback,
               p_sys->i_tsid, p_sys->i_pat_version_number,
               &p_sys->pat,
               p_sys->i_num_pmt, p_sys->pmt, p_sys->i_pmt_program_number );
@@ -1913,7 +1919,7 @@
     }
 
     BuildPMT( p_sys->p_dvbpsi, VLC_OBJECT(p_mux), p_sys->standard,
-              c, (PEStoTSCallback)BufferChainAppend,
+              c, BufferChainAppendCallback,
               p_sys->i_tsid, p_sys->i_pmt_version_number,
               ((sout_input_sys_t *)p_sys->p_pcr_input->p_sys)->ts.i_pid,
               &p_sys->sdt,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/mux/ogg.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/mux/ogg.c Changed

@@ -1026,9 +1026,9 @@
                 p_stream->fmt.i_codec == VLC_CODEC_DAALA )
             {
                 /* First packet in order: vorbis/speex/opus/theora/daala info */
-                unsigned pi_sizeXIPH_MAX_HEADER_COUNT;
+                size_t pi_sizeXIPH_MAX_HEADER_COUNT;
                 const void *pp_dataXIPH_MAX_HEADER_COUNT;
-                unsigned i_count;
+                size_t i_count;
 
                 if( xiph_SplitHeaders( pi_size, pp_data, &i_count,
                                        p_input->p_fmt->i_extra, p_input->p_fmt->p_extra ) )
@@ -1193,9 +1193,9 @@
             p_stream->fmt.i_codec == VLC_CODEC_THEORA ||
             p_stream->fmt.i_codec == VLC_CODEC_DAALA )
         {
-            unsigned pi_sizeXIPH_MAX_HEADER_COUNT;
+            size_t pi_sizeXIPH_MAX_HEADER_COUNT;
             const void *pp_dataXIPH_MAX_HEADER_COUNT;
-            unsigned i_count;
+            size_t i_count;
 
             if( xiph_SplitHeaders( pi_size, pp_data, &i_count,
                                    p_input->p_fmt->i_extra, p_input->p_fmt->p_extra ) )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/av1.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/av1.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/flac.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/flac.h Changed

@@ -64,16 +64,16 @@
     stream_info->total_samples = GetQWBE(&p_buf4+6) & ((INT64_C(1)<<36)-1);
 }
 
-/* Will return INT64_MAX for an invalid utf-8 sequence */
-static inline int64_t read_utf8(const uint8_t *p_buf, unsigned i_buf, int *pi_read)
+/* Will return UINT64_MAX for an invalid utf-8 sequence */
+static inline uint64_t read_utf8(const uint8_t *p_buf, unsigned i_buf, int *pi_read)
 {
     /* Max coding bits is 56 - 8 */
     /* Value max precision is 36 bits */
-    int64_t i_result = 0;
+    uint64_t i_result = 0;
     unsigned i;
 
     if(i_buf < 1)
-        return INT64_MAX;
+        return UINT64_MAX;
 
     if (!(p_buf0 & 0x80)) { /* 0xxxxxxx */
         i_result = p_buf0;
@@ -97,15 +97,15 @@
         i_result = 0;
         i = 6;
     } else {
-        return INT64_MAX;
+        return UINT64_MAX;
     }
 
     if(i_buf < i + 1)
-        return INT64_MAX;
+        return UINT64_MAX;
 
     for (unsigned j = 1; j <= i; j++) {
         if (!(p_bufj & 0x80) || (p_bufj & 0x40)) { /* 10xxxxxx */
-            return INT64_MAX;
+            return UINT64_MAX;
         }
         i_result <<= 6;
         i_result |= (p_bufj & 0x3F);
@@ -239,8 +239,14 @@
 
     /* Check Sample/Frame number */
     int i_read;
-    int64_t i_fsnumber = read_utf8(&p_bufi_header++, i_buf - 4, &i_read);
-    if ( i_fsnumber == INT64_MAX )
+    uint64_t i_fsnumber = read_utf8(&p_bufi_header++, i_buf - 4, &i_read);
+
+    /* Invalid UTF-8 */
+    if (i_fsnumber == UINT64_MAX)
+        return 0;
+
+    /* Invalid Sample/Frame number */
+    if (stream_info->total_samples != 0 && i_fsnumber > stream_info->total_samples)
         return 0;
 
     i_header += i_read;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/h264_nal.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/h264_nal.c Changed

@@ -533,7 +533,7 @@
             bs_read_ue( p_bs ); /* log2 max mv h */
             bs_read_ue( p_bs ); /* log2 max mv v */
             p_sps->vui.i_max_num_reorder_frames = bs_read_ue( p_bs );
-            bs_read_ue( p_bs ); /* max dec frame buffering */
+            p_sps->vui.i_max_dec_frame_buffering = bs_read_ue( p_bs );
         }
     }
 
@@ -816,14 +816,11 @@
 }
 
 bool h264_get_dpb_values( const h264_sequence_parameter_set_t *p_sps,
-                          uint8_t *pi_depth, unsigned *pi_delay )
+                          uint8_t *pi_max_num_reorder, uint8_t *pi_max_dec_buffering )
 {
     uint8_t i_max_num_reorder_frames = p_sps->vui.i_max_num_reorder_frames;
-    if( p_sps->i_pic_order_cnt_type == 2 ) /* 8.2.1.3 */
-    {
-        i_max_num_reorder_frames = 0;
-    }
-    else if( !p_sps->vui.b_bitstream_restriction_flag )
+    uint8_t i_max_dec_frame_buffering = p_sps->vui.i_max_dec_frame_buffering;
+    if( !p_sps->vui.b_bitstream_restriction_flag )
     {
         switch( p_sps->i_profile ) /* E-2.1 */
         {
@@ -838,18 +835,23 @@
             case PROFILE_H264_HIGH_444_PREDICTIVE:
                 if( p_sps->i_constraint_set_flags & H264_CONSTRAINT_SET_FLAG(3) )
                 {
-                    i_max_num_reorder_frames = 0; /* all IDR */
+                    i_max_num_reorder_frames =
+                    i_max_dec_frame_buffering = 0; /* all IDR */
                     break;
                 }
                 /* fallthrough */
             default:
-                i_max_num_reorder_frames = h264_get_max_dpb_frames( p_sps );
+                i_max_num_reorder_frames =
+                i_max_dec_frame_buffering = h264_get_max_dpb_frames( p_sps );
                 break;
         }
     }
 
-    *pi_depth = i_max_num_reorder_frames;
-    *pi_delay = 0;
+    if( i_max_num_reorder_frames > i_max_dec_frame_buffering )
+        i_max_num_reorder_frames = i_max_dec_frame_buffering;
+
+    *pi_max_num_reorder = i_max_num_reorder_frames;
+    *pi_max_dec_buffering = i_max_dec_frame_buffering;
 
     return true;
 }
@@ -878,13 +880,6 @@
     return true;
 }
 
-bool h264_get_constraints_set( const h264_sequence_parameter_set_t *p_sps,
-                               uint8_t *pi_constraints )
-{
-    *pi_constraints = p_sps->i_constraint_set_flags;
-    return true;
-}
-
 bool h264_get_picture_size( const h264_sequence_parameter_set_t *p_sps,
                             unsigned *p_ox, unsigned *p_oy,
                             unsigned *p_w, unsigned *p_h,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/h264_nal.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/h264_nal.h Changed

@@ -154,6 +154,7 @@
         /* restrictions */
         uint8_t b_bitstream_restriction_flag;
         uint8_t i_max_num_reorder_frames;
+        uint8_t i_max_dec_frame_buffering;
     } vui;
 };
 
@@ -209,7 +210,7 @@
                                    size_t *pi_result, uint8_t *pi_nal_length_size );
 
 bool h264_get_dpb_values( const h264_sequence_parameter_set_t *,
-                          uint8_t *pi_depth, unsigned *pi_delay );
+                          uint8_t *pi_max_num_reorder, uint8_t *pi_max_dec_buffering );
 
 unsigned h264_get_max_frame_num( const h264_sequence_parameter_set_t * );
 bool h264_is_frames_only( const h264_sequence_parameter_set_t * );
@@ -217,8 +218,6 @@
 
 bool h264_get_sps_profile_tier_level( const h264_sequence_parameter_set_t *,
                                      uint8_t *pi_profile, uint8_t *pi_level );
-bool h264_get_constraints_set( const h264_sequence_parameter_set_t *p_sps,
-                               uint8_t *pi_constraints );
 bool h264_get_picture_size( const h264_sequence_parameter_set_t *,
                             unsigned *p_ox, unsigned *p_oy,
                             unsigned *p_w, unsigned *p_h,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/hevc.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/hevc.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/mpeg4audio.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/mpeg4audio.c Changed

@@ -57,62 +57,6 @@
 /*****************************************************************************
  * decoder_sys_t : decoder descriptor
  *****************************************************************************/
-typedef struct
-{
-    enum mpeg4_audioObjectType i_object_type;
-    unsigned i_samplerate;
-    uint8_t i_channel_configuration;
-    int8_t i_sbr;          // 0: no sbr, 1: sbr, -1: unknown
-    int8_t i_ps;           // 0: no ps,  1: ps,  -1: unknown
-
-    struct
-    {
-        enum mpeg4_audioObjectType i_object_type;
-        unsigned i_samplerate;
-        uint8_t i_channel_configuration;
-    } extension;
-
-    /* GASpecific */
-    unsigned i_frame_length;   // 1024 or 960
-
-} mpeg4_asc_t;
-
-#define LATM_MAX_EXTRA_SIZE 64
-typedef struct
-{
-    uint8_t i_program;
-    uint8_t i_layer;
-
-    unsigned i_frame_length;         // type 1
-    uint8_t i_frame_length_type;
-    uint8_t i_frame_length_index;   // type 3 4 5 6 7
-
-    mpeg4_asc_t cfg;
-
-    /* Raw configuration */
-    size_t i_extra;
-    uint8_t extraLATM_MAX_EXTRA_SIZE;
-
-} latm_stream_t;
-
-#define LATM_MAX_LAYER (8)
-#define LATM_MAX_PROGRAM (16)
-typedef struct
-{
-    bool b_same_time_framing;
-    uint8_t i_sub_frames;
-    uint8_t i_programs;
-
-    uint8_t pi_layersLATM_MAX_PROGRAM;
-
-    uint8_t pi_streamLATM_MAX_PROGRAMLATM_MAX_LAYER;
-
-    uint8_t i_streams;
-    latm_stream_t streamLATM_MAX_PROGRAM*LATM_MAX_LAYER;
-
-    uint32_t i_other_data;
-    int16_t  i_crc;  /* -1 if not set */
-} latm_mux_t;
 
 typedef struct
 {
@@ -140,7 +84,7 @@
 
     /* LOAS */
     bool b_latm_cfg;
-    latm_mux_t latm;
+    MPEG4_streammux_config_t latm;
 
     int i_warnings;
 } decoder_sys_t;
@@ -167,13 +111,6 @@
     TYPE_LOAS
 };
 
-static const int pi_sample_rates16 =
-{
-    96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
-    16000, 12000, 11025, 8000,  7350,  0,     0,     0
-};
-
-
 static int ChannelConfigurationToVLC(uint8_t i_channel)
 {
     if (i_channel == 7)
@@ -187,17 +124,17 @@
 {
     switch(i_object_type)
     {
-        case AOT_AAC_MAIN:
-        case AOT_AAC_LC:
-        case AOT_AAC_SSR:
-        case AOT_AAC_LTP:
-        case AOT_AAC_SBR:
-        case AOT_AAC_SC:
-        case AOT_ER_AAC_LD:
-        case AOT_AAC_PS:
-        case AOT_ER_AAC_ELD:
+        case MPEG4_AOT_AAC_MAIN:
+        case MPEG4_AOT_AAC_LC:
+        case MPEG4_AOT_AAC_SSR:
+        case MPEG4_AOT_AAC_LTP:
+        case MPEG4_AOT_AAC_SBR:
+        case MPEG4_AOT_AAC_SC:
+        case MPEG4_AOT_ER_AAC_LD:
+        case MPEG4_AOT_AAC_PS:
+        case MPEG4_AOT_ER_AAC_ELD:
             {
-            static_assert(AOT_AAC_MAIN == AAC_PROFILE_MAIN + 1,
+            static_assert(MPEG4_AOT_AAC_MAIN == AAC_PROFILE_MAIN + 1,
                           "invalid profile to object mapping");
             return i_object_type - 1;
             }
@@ -218,8 +155,6 @@
 static block_t *Packetize    (decoder_t *, block_t **);
 static void     Flush( decoder_t * );
 
-static int Mpeg4ReadAudioSpecificConfig(bs_t *s, mpeg4_asc_t *p_cfg, bool);
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -299,10 +234,10 @@
 
     if(p_dec->fmt_in->i_extra)
     {
-        mpeg4_asc_t asc;
+        MPEG4_asc_t asc;
         bs_t s;
         bs_init(&s, p_dec->fmt_in->p_extra, p_dec->fmt_in->i_extra);
-        if(Mpeg4ReadAudioSpecificConfig(&s, &asc, true) == VLC_SUCCESS)
+        if(MPEG4_read_AudioSpecificConfig(&s, &asc, true) == VLC_SUCCESS)
         {
             p_dec->fmt_out.audio.i_rate = asc.i_samplerate;
             p_dec->fmt_out.audio.i_frame_length = asc.i_frame_length;
@@ -493,443 +428,6 @@
     return ((p_header1 & 0x1f) << 8) + p_header2;
 }
 
-static int Mpeg4GAProgramConfigElement(bs_t *s)
-{
-    /* TODO compute channels count ? */
-    int i_tag = bs_read(s, 4);
-    if (i_tag != 0x05)
-        return -1;
-    bs_skip(s, 2 + 4); // object type + sampling index
-    int i_num_front = bs_read(s, 4);
-    int i_num_side = bs_read(s, 4);
-    int i_num_back = bs_read(s, 4);
-    int i_num_lfe = bs_read(s, 2);
-    int i_num_assoc_data = bs_read(s, 3);
-    int i_num_valid_cc = bs_read(s, 4);
-
-    if (bs_read1(s))
-        bs_skip(s, 4); // mono downmix
-    if (bs_read1(s))
-        bs_skip(s, 4); // stereo downmix
-    if (bs_read1(s))
-        bs_skip(s, 2+1); // matrix downmix + pseudo_surround
-
-    bs_skip(s, i_num_front * (1+4));
-    bs_skip(s, i_num_side * (1+4));
-    bs_skip(s, i_num_back * (1+4));
-    bs_skip(s, i_num_lfe * (4));
-    bs_skip(s, i_num_assoc_data * (4));
-    bs_skip(s, i_num_valid_cc * (5));
-    bs_align(s);
-    int i_comment = bs_read(s, 8);
-    bs_skip(s, i_comment * 8);
-    return 0;
-}
-
-static int Mpeg4GASpecificConfig(mpeg4_asc_t *p_cfg, bs_t *s)
-{
-    p_cfg->i_frame_length = bs_read1(s) ? 960 : 1024;
-    if(p_cfg->i_object_type == AOT_ER_AAC_LD) /* 14496-3 4.5.1.1 */
-        p_cfg->i_frame_length >>= 1;
-    else if(p_cfg->i_object_type == AOT_AAC_SSR)
-        p_cfg->i_frame_length = 256;
-
-    if (bs_read1(s))     // depend on core coder
-        bs_skip(s, 14);   // core coder delay
-
-    int i_extension_flag = bs_read1(s);
-    if (p_cfg->i_channel_configuration == 0)
-        Mpeg4GAProgramConfigElement(s);
-    if (p_cfg->i_object_type == AOT_AAC_SC ||
-        p_cfg->i_object_type == AOT_ER_AAC_SC)
-        bs_skip(s, 3);    // layer
-
-    if (i_extension_flag) {
-        if (p_cfg->i_object_type == AOT_ER_BSAC)
-            bs_skip(s, 5 + 11);   // numOfSubFrame + layer length
-        if (p_cfg->i_object_type == AOT_ER_AAC_LC ||
-            p_cfg->i_object_type == AOT_ER_AAC_LTP ||
-            p_cfg->i_object_type == AOT_ER_AAC_SC ||
-            p_cfg->i_object_type == AOT_ER_AAC_LD)
-            bs_skip(s, 1+1+1);    // ER data : section scale spectral */
-        if (bs_read1(s))     // extension 3
-            fprintf(stderr, "Mpeg4GASpecificConfig: error 1\n");
-    }
-    return 0;
-}
-
-static int Mpeg4ELDSpecificConfig(mpeg4_asc_t *p_cfg, bs_t *s)
-{
-    p_cfg->i_frame_length = bs_read1(s) ? 480 : 512;
-
-    /* ELDSpecificConfig Table 4.180 */
-
-    bs_skip(s, 3);
-    if(bs_read1(s)) /* ldSbrPresentFlag */
-    {
-        bs_skip(s, 2);
-        /* ld_sbr_header(channelConfiguration) Table 4.181 */
-        unsigned numSbrHeader;
-        switch(p_cfg->i_channel_configuration)
-        {
-            case 1: case 2:
-                numSbrHeader = 1;
-                break;
-            case 3:
-                numSbrHeader = 2;
-                break;
-            case 4: case 5: case 6:
-                numSbrHeader = 3;
-                break;
-            case 7:
-                numSbrHeader = 4;
-                break;
-            default:
-                numSbrHeader = 0;
-                break;
-        }
-        for( ; numSbrHeader; numSbrHeader-- )
-        {
-            /* sbr_header() Table 4.63 */
-            bs_read(s, 14);
-            bool header_extra_1 = bs_read1(s);
-            bool header_extra_2 = bs_read1(s);
-            if(header_extra_1)
-                bs_read(s, 5);
-            if(header_extra_2)
-                bs_read(s, 6);
-        }
-    }
-
-    for(unsigned eldExtType = bs_read(s, 4);
-        eldExtType != 0x0 /* ELDEXT_TERM */;
-        eldExtType = bs_read(s, 4))
-    {
-        unsigned eldExtLen = bs_read(s, 4);
-        unsigned eldExtLenAdd = 0;
-        if(eldExtLen == 15)
-        {
-            eldExtLenAdd = bs_read(s, 8);
-            eldExtLen += eldExtLenAdd;
-        }
-        if(eldExtLenAdd == 255)
-            eldExtLen += bs_read(s, 16);
-        /* reserved extensions */
-        for(; eldExtLen; eldExtLen--)
-            bs_skip(s, 8);
-    }
-
-    return 0;
-}
-
-static enum mpeg4_audioObjectType Mpeg4ReadAudioObjectType(bs_t *s)
-{
-    int i_type = bs_read(s, 5);
-    if (i_type == 31)
-        i_type = 32 + bs_read(s, 6);
-    return i_type;
-}
-
-static unsigned Mpeg4ReadAudioSamplerate(bs_t *s)
-{
-    int i_index = bs_read(s, 4);
-    if (i_index != 0x0f)
-        return pi_sample_ratesi_index;
-    return bs_read(s, 24);
-}
-
-static int Mpeg4ReadAudioSpecificConfig(bs_t *s, mpeg4_asc_t *p_cfg, bool b_withext)
-{
-    p_cfg->i_object_type = Mpeg4ReadAudioObjectType(s);
-    p_cfg->i_samplerate = Mpeg4ReadAudioSamplerate(s);
-    p_cfg->i_channel_configuration = bs_read(s, 4);
-
-    p_cfg->i_sbr = -1;
-    p_cfg->i_ps  = -1;
-    p_cfg->extension.i_object_type = 0;
-    p_cfg->extension.i_samplerate = 0;
-    p_cfg->extension.i_channel_configuration = 0;
-    p_cfg->i_frame_length = 0;
-
-    if (p_cfg->i_object_type == AOT_AAC_SBR ||
-        p_cfg->i_object_type == AOT_AAC_PS) {
-        p_cfg->i_sbr = 1;
-        if (p_cfg->i_object_type == AOT_AAC_PS)
-           p_cfg->i_ps = 1;
-        p_cfg->extension.i_object_type = AOT_AAC_SBR;
-        p_cfg->extension.i_samplerate = Mpeg4ReadAudioSamplerate(s);
-
-        p_cfg->i_object_type = Mpeg4ReadAudioObjectType(s);
-        if(p_cfg->i_object_type == AOT_ER_BSAC)
-            p_cfg->extension.i_channel_configuration = bs_read(s, 4);
-    }
-
-    switch(p_cfg->i_object_type)
-    {
-    case AOT_AAC_MAIN:
-    case AOT_AAC_LC:
-    case AOT_AAC_SSR:
-    case AOT_AAC_LTP:
-    case AOT_AAC_SC:
-    case AOT_TWINVQ:
-    case AOT_ER_AAC_LC:
-    case AOT_ER_AAC_LTP:
-    case AOT_ER_AAC_SC:
-    case AOT_ER_TWINVQ:
-    case AOT_ER_BSAC:
-    case AOT_ER_AAC_LD:
-        Mpeg4GASpecificConfig(p_cfg, s);
-        break;
-    case AOT_CELP:
-        // CelpSpecificConfig();
-    case AOT_HVXC:
-        // HvxcSpecificConfig();
-    case AOT_TTSI:
-        // TTSSSpecificConfig();
-    case AOT_MAIN_SYNTHETIC:
-    case AOT_WAVETABLES:
-    case AOT_GENERAL_MIDI:
-    case AOT_ALGORITHMIC:
-        // StructuredAudioSpecificConfig();
-    case AOT_ER_CELP:
-        // ERCelpSpecificConfig();
-    case AOT_ER_HXVC:
-        // ERHvxcSpecificConfig();
-    case AOT_ER_HILN:
-    case AOT_ER_Parametric:
-        // ParametricSpecificConfig();
-    case AOT_SSC:
-        // SSCSpecificConfig();
-    case AOT_LAYER1:
-    case AOT_LAYER2:
-    case AOT_LAYER3:
-        // MPEG_1_2_SpecificConfig();
-    case AOT_DST:
-        // DSTSpecificConfig();
-    case AOT_ALS:
-        // ALSSpecificConfig();
-    case AOT_SLS:
-    case AOT_SLS_NON_CORE:
-        // SLSSpecificConfig();
-    case AOT_ER_AAC_ELD:
-        Mpeg4ELDSpecificConfig(p_cfg, s);
-        break;
-    case AOT_SMR_SIMPLE:
-    case AOT_SMR_MAIN:
-        // SymbolicMusicSpecificConfig();
-    default:
-        // error
-        return VLC_EGENERIC;
-    }
-
-    switch(p_cfg->i_object_type)
-    {
-    case AOT_ER_AAC_LC:
-    case AOT_ER_AAC_LTP:
-    case AOT_ER_AAC_SC:
-    case AOT_ER_TWINVQ:
-    case AOT_ER_BSAC:
-    case AOT_ER_AAC_LD:
-    case AOT_ER_CELP:
-    case AOT_ER_HXVC:
-    case AOT_ER_HILN:
-    case AOT_ER_Parametric:
-    case AOT_ER_AAC_ELD:
-    {
-        int epConfig = bs_read(s, 2);
-        if (epConfig == 2 || epConfig == 3)
-            //ErrorProtectionSpecificConfig();
-        if (epConfig == 3)
-            if (bs_read1(s)) {
-                // TODO : directMapping
-            }
-        break;
-    }
-    default:
-        break;
-    }
-
-    if (b_withext && p_cfg->extension.i_object_type != AOT_AAC_SBR &&
-        !bs_eof(s) && bs_read(s, 11) == 0x2b7)
-    {
-        p_cfg->extension.i_object_type = Mpeg4ReadAudioObjectType(s);
-        if (p_cfg->extension.i_object_type == AOT_AAC_SBR)
-        {
-            p_cfg->i_sbr  = bs_read1(s);
-            if (p_cfg->i_sbr == 1) {
-                p_cfg->extension.i_samplerate = Mpeg4ReadAudioSamplerate(s);
-                if (bs_read(s, 11) == 0x548)
-                   p_cfg->i_ps = bs_read1(s);
-            }
-        }
-        else if (p_cfg->extension.i_object_type == AOT_ER_BSAC)
-        {
-            p_cfg->i_sbr  = bs_read1(s);
-            if(p_cfg->i_sbr)
-                p_cfg->extension.i_samplerate = Mpeg4ReadAudioSamplerate(s);
-            p_cfg->extension.i_channel_configuration = bs_read(s, 4);
-        }
-    }
-
-#if 0
-    static const char *ppsz_otype = {
-        "NULL",
-        "AAC Main", "AAC LC", "AAC SSR", "AAC LTP", "SBR", "AAC Scalable",
-        "TwinVQ",
-        "CELP", "HVXC",
-        "Reserved", "Reserved",
-        "TTSI",
-        "Main Synthetic", "Wavetables Synthesis", "General MIDI",
-        "Algorithmic Synthesis and Audio FX",
-        "ER AAC LC",
-        "Reserved",
-        "ER AAC LTP", "ER AAC Scalable", "ER TwinVQ", "ER BSAC", "ER AAC LD",
-        "ER CELP", "ER HVXC", "ER HILN", "ER Parametric",
-        "SSC",
-        "PS", "MPEG Surround", "Escape",
-        "Layer 1", "Layer 2", "Layer 3",
-        "DST", "ALS", "SLS", "SLS non-core", "ELD",
-        "SMR Simple", "SMR Main",
-    };
-
-    fprintf(stderr, "Mpeg4ReadAudioSpecificInfo: t=%s(%d)f=%d c=%d sbr=%d\n",
-            ppsz_otypep_cfg->i_object_type, p_cfg->i_object_type,
-            p_cfg->i_samplerate, p_cfg->i_channel, p_cfg->i_sbr);
-#endif
-    return bs_error(s) ? VLC_EGENERIC : VLC_SUCCESS;
-}
-
-static uint32_t LatmGetValue(bs_t *s)
-{
-    uint32_t v = 0;
-    for (int i = 1 + bs_read(s, 2); i > 0; i--)
-        v = (v << 8) + bs_read(s, 8);
-    return v;
-}
-
-static size_t AudioSpecificConfigBitsToBytes(bs_t *s, uint32_t i_bits, uint8_t *p_data)
-{
-    size_t i_extra = __MIN((i_bits + 7) / 8, LATM_MAX_EXTRA_SIZE);
-    for (size_t i = 0; i < i_extra; i++) {
-        const uint32_t i_read = __MIN(8, i_bits - 8*i);
-        p_datai = bs_read(s, i_read) << (8-i_read);
-    }
-    return i_extra;
-}
-
-static int LatmReadStreamMuxConfiguration(latm_mux_t *m, bs_t *s)
-{
-    int i_mux_version;
-    int i_mux_versionA;
-
-    i_mux_version = bs_read(s, 1);
-    i_mux_versionA = 0;
-    if (i_mux_version)
-        i_mux_versionA = bs_read(s, 1);
-
-    if (i_mux_versionA != 0) /* support only A=0 */
-        return -1;
-
-    memset(m, 0, sizeof(*m));
-
-    if (i_mux_versionA == 0)
-        if (i_mux_version == 1)
-            LatmGetValue(s); /* taraBufferFullness */
-
-    if(bs_eof(s))
-        return -1;
-
-    m->b_same_time_framing = bs_read1(s);
-    m->i_sub_frames = 1 + bs_read(s, 6);
-    m->i_programs = 1 + bs_read(s, 4);
-
-    for (uint8_t i_program = 0; i_program < m->i_programs; i_program++) {
-        if(bs_eof(s))
-            return -1;
-        m->pi_layersi_program = 1+bs_read(s, 3);
-
-        for (uint8_t i_layer = 0; i_layer < m->pi_layersi_program; i_layer++) {
-            latm_stream_t *st = &m->streamm->i_streams;
-            bool b_previous_cfg;
-
-            m->pi_streami_programi_layer = m->i_streams;
-            st->i_program = i_program;
-            st->i_layer = i_layer;
-
-            b_previous_cfg = false;
-            if (i_program != 0 || i_layer != 0)
-                b_previous_cfg = bs_read1(s);
-
-            if (b_previous_cfg) {
-                assert(m->i_streams > 0);
-                st->cfg = m->streamm->i_streams-1.cfg;
-            } else {
-                uint32_t asc_size = 0;
-                if(i_mux_version > 0)
-                    asc_size = LatmGetValue(s);
-                bs_t asc_bs = *s;
-                Mpeg4ReadAudioSpecificConfig(&asc_bs, &st->cfg, i_mux_version > 0);
-                if (i_mux_version == 0)
-                    asc_size = bs_pos(&asc_bs) - bs_pos(s);
-                asc_bs = *s;
-                st->i_extra = AudioSpecificConfigBitsToBytes(&asc_bs, asc_size, st->extra);
-                bs_skip(s, asc_size);
-            }
-
-            st->i_frame_length_type = bs_read(s, 3);
-            switch(st->i_frame_length_type)
-            {
-            case 0:
-            {
-                bs_skip(s, 8); /* latmBufferFullnes */
-                if (!m->b_same_time_framing)
-                    if (st->cfg.i_object_type == AOT_AAC_SC ||
-                        st->cfg.i_object_type == AOT_CELP ||
-                        st->cfg.i_object_type == AOT_ER_AAC_SC ||
-                        st->cfg.i_object_type == AOT_ER_CELP)
-                        bs_skip(s, 6); /* eFrameOffset */
-                break;
-            }
-            case 1:
-                st->i_frame_length = bs_read(s, 9);
-                break;
-            case 3: case 4: case 5:
-                st->i_frame_length_index = bs_read(s, 6); // celp
-                break;
-            case 6: case 7:
-                st->i_frame_length_index = bs_read(s, 1); // hvxc
-            default:
-                break;
-            }
-            /* Next stream */
-            m->i_streams++;
-        }
-    }
-
-    if(bs_error(s) || bs_eof(s))
-        return -1;
-
-    /* other data */
-    if (bs_read1(s)) {
-        if (i_mux_version == 1)
-            m->i_other_data = LatmGetValue(s);
-        else {
-            int b_continue;
-            do {
-                b_continue = bs_read1(s);
-                m->i_other_data = (m->i_other_data << 8) + bs_read(s, 8);
-            } while (b_continue);
-        }
-    }
-
-    /* crc */
-    m->i_crc = -1;
-    if (bs_read1(s))
-        m->i_crc = bs_read(s, 8);
-
-    return bs_error(s) ? -1 : 0;
-}
-
 static int LOASParse(decoder_t *p_dec, uint8_t *p_buffer, int i_buffer)
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
@@ -939,9 +437,9 @@
     bs_init(&s, p_buffer, i_buffer);
 
     /* Read the stream mux configuration if present */
-    if (!bs_read1(&s) && !LatmReadStreamMuxConfiguration(&p_sys->latm, &s) &&
+    if (!bs_read1(&s) && !MPEG4_parse_StreamMuxConfig(&s, &p_sys->latm) &&
             p_sys->latm.i_streams > 0) {
-        const latm_stream_t *st = &p_sys->latm.stream0;
+        const MPEG4_audio_stream_t *st = &p_sys->latm.stream0;
 
         if(st->cfg.i_samplerate == 0 || st->cfg.i_frame_length == 0 ||
            ChannelConfigurationToVLC(st->cfg.i_channel_configuration) == 0)
@@ -996,12 +494,12 @@
         msg_Err(p_dec, "latm sub frames not yet supported, please send a sample");
 
     for (uint8_t i_sub = 0; i_sub < p_sys->latm.i_sub_frames; i_sub++) {
-        unsigned pi_payloadLATM_MAX_PROGRAMLATM_MAX_LAYER;
+        unsigned pi_payloadMPEG4_STREAMMUX_MAX_PROGRAMMPEG4_STREAMMUX_MAX_LAYER;
         if (p_sys->latm.b_same_time_framing) {
             /* Payload length */
             for (uint8_t i_program = 0; i_program < p_sys->latm.i_programs; i_program++) {
                 for (uint8_t i_layer = 0; i_layer < p_sys->latm.pi_layersi_program; i_layer++) {
-                    latm_stream_t *st = &p_sys->latm.streamp_sys->latm.pi_streami_programi_layer;
+                    MPEG4_audio_stream_t *st = &p_sys->latm.streamp_sys->latm.pi_streami_programi_layer;
                     if (st->i_frame_length_type == 0) {
                         unsigned i_payload = 0;
                         for (;;) {
@@ -1055,7 +553,7 @@
 
             for (int i_chunk = 0; i_chunk < i_chunks; i_chunk++) {
                 const int streamIndex = bs_read(&s, 4);
-                latm_stream_t *st = &p_sys->latm.streamstreamIndex;
+                MPEG4_audio_stream_t *st = &p_sys->latm.streamstreamIndex;
                 const int i_program = st->i_program;
                 const int i_layer = st->i_layer;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/mpeg4audio.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/mpeg4audio.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************************
- * mpeg4audio.h: MPEG 4 audio definitions
+ * mpeg4audio.h: ISO/IEC 14496-3 audio definitions
  *****************************************************************************
- * Copyright (C) 2001-2017 VLC authors and VideoLAN
+ * Copyright (C) 2001-2024 VLC authors, VideoLAN and VideoLabs
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
@@ -17,68 +17,71 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-enum mpeg4_audioObjectType /* ISO/IEC 14496-3:2009 1.5.1 */
+#include <vlc_bits.h>
+
+enum MPEG4_audioObjectType /* ISO/IEC 14496-3:2009 1.5.1 */
 {
-    AOT_AAC_MAIN        = 1,
-    AOT_AAC_LC          = 2,
-    AOT_AAC_SSR         = 3,
-    AOT_AAC_LTP         = 4,
-    AOT_AAC_SBR         = 5,
-    AOT_AAC_SC          = 6,
-    AOT_TWINVQ          = 7,
-    AOT_CELP            = 8,
-    AOT_HVXC            = 9,
-    AOT_RESERVED10      = 10,
-    AOT_RESERVED11      = 11,
-    AOT_TTSI            = 12,
-    AOT_MAIN_SYNTHETIC  = 13,
-    AOT_WAVETABLES      = 14,
-    AOT_GENERAL_MIDI    = 15,
-    AOT_ALGORITHMIC     = 16,
-    AOT_ER_AAC_LC       = 17,
-    AOT_RESERVED18      = 18,
-    AOT_ER_AAC_LTP      = 19,
-    AOT_ER_AAC_SC       = 20,
-    AOT_ER_TWINVQ       = 21,
-    AOT_ER_BSAC         = 22,
-    AOT_ER_AAC_LD       = 23,
-    AOT_ER_CELP         = 24,
-    AOT_ER_HXVC         = 25,
-    AOT_ER_HILN         = 26,
-    AOT_ER_Parametric   = 27,
-    AOT_SSC             = 28,
-    AOT_AAC_PS          = 29,
-    AOT_MPEG_SURROUND   = 30,
-    AOT_ESCAPE          = 31,
-    AOT_LAYER1          = 32,
-    AOT_LAYER2          = 33,
-    AOT_LAYER3          = 34,
-    AOT_DST             = 35,
-    AOT_ALS             = 36,
-    AOT_SLS             = 37,
-    AOT_SLS_NON_CORE    = 38,
-    AOT_ER_AAC_ELD      = 39,
-    AOT_SMR_SIMPLE      = 40,
-    AOT_SMR_MAIN        = 41,
+    MPEG4_AOT_NULL            = 0,
+    MPEG4_AOT_AAC_MAIN        = 1,
+    MPEG4_AOT_AAC_LC          = 2,
+    MPEG4_AOT_AAC_SSR         = 3,
+    MPEG4_AOT_AAC_LTP         = 4,
+    MPEG4_AOT_AAC_SBR         = 5,
+    MPEG4_AOT_AAC_SC          = 6,
+    MPEG4_AOT_TWINVQ          = 7,
+    MPEG4_AOT_CELP            = 8,
+    MPEG4_AOT_HVXC            = 9,
+    MPEG4_AOT_RESERVED10      = 10,
+    MPEG4_AOT_RESERVED11      = 11,
+    MPEG4_AOT_TTSI            = 12,
+    MPEG4_AOT_MAIN_SYNTHETIC  = 13,
+    MPEG4_AOT_WAVETABLES      = 14,
+    MPEG4_AOT_GENERAL_MIDI    = 15,
+    MPEG4_AOT_ALGORITHMIC     = 16,
+    MPEG4_AOT_ER_AAC_LC       = 17,
+    MPEG4_AOT_RESERVED18      = 18,
+    MPEG4_AOT_ER_AAC_LTP      = 19,
+    MPEG4_AOT_ER_AAC_SC       = 20,
+    MPEG4_AOT_ER_TWINVQ       = 21,
+    MPEG4_AOT_ER_BSAC         = 22,
+    MPEG4_AOT_ER_AAC_LD       = 23,
+    MPEG4_AOT_ER_CELP         = 24,
+    MPEG4_AOT_ER_HXVC         = 25,
+    MPEG4_AOT_ER_HILN         = 26,
+    MPEG4_AOT_ER_Parametric   = 27,
+    MPEG4_AOT_SSC             = 28,
+    MPEG4_AOT_AAC_PS          = 29,
+    MPEG4_AOT_MPEG_SURROUND   = 30,
+    MPEG4_AOT_ESCAPE          = 31,
+    MPEG4_AOT_LAYER1          = 32,
+    MPEG4_AOT_LAYER2          = 33,
+    MPEG4_AOT_LAYER3          = 34,
+    MPEG4_AOT_DST             = 35,
+    MPEG4_AOT_ALS             = 36,
+    MPEG4_AOT_SLS             = 37,
+    MPEG4_AOT_SLS_NON_CORE    = 38,
+    MPEG4_AOT_ER_AAC_ELD      = 39,
+    MPEG4_AOT_SMR_SIMPLE      = 40,
+    MPEG4_AOT_SMR_MAIN        = 41,
 };
 
 enum
 {
-    AAC_PROFILE_MAIN = AOT_AAC_MAIN - 1,
+    AAC_PROFILE_MAIN = MPEG4_AOT_AAC_MAIN - 1,
     AAC_PROFILE_LC,
     AAC_PROFILE_SSR,
     AAC_PROFILE_LTP,
     AAC_PROFILE_HE,
-    AAC_PROFILE_LD   = AOT_ER_AAC_LD - 1,
-    AAC_PROFILE_HEv2 = AOT_AAC_PS - 1,
-    AAC_PROFILE_ELD  = AOT_ER_AAC_ELD - 1,
+    AAC_PROFILE_LD   = MPEG4_AOT_ER_AAC_LD - 1,
+    AAC_PROFILE_HEv2 = MPEG4_AOT_AAC_PS - 1,
+    AAC_PROFILE_ELD  = MPEG4_AOT_ER_AAC_ELD - 1,
     /* Similar shift signaling as avcodec, as signaling should have been
        done in ADTS header. Values defaults to MPEG4 */
     AAC_PROFILE_MPEG2_LC = AAC_PROFILE_LC + 128,
     AAC_PROFILE_MPEG2_HE = AAC_PROFILE_HE + 128,
 };
 
-static const uint32_t mpeg4_asc_channelsbyindex =
+static const uint32_t MPEG4_asc_channelsbyindex =
 {
     0 = 0, /* Set later */
 
@@ -110,4 +113,505 @@
     8 = 0,
 };
 
-#define MPEG4_ASC_MAX_INDEXEDPOS ARRAY_SIZE(mpeg4_asc_channelsbyindex)
+#define MPEG4_ASC_MAX_INDEXEDPOS ARRAY_SIZE(MPEG4_asc_channelsbyindex)
+
+typedef struct
+{
+    enum MPEG4_audioObjectType i_object_type;
+    unsigned i_samplerate;
+    uint8_t i_channel_configuration;
+    int8_t i_sbr;          // 0: no sbr, 1: sbr, -1: unknown
+    int8_t i_ps;           // 0: no ps,  1: ps,  -1: unknown
+
+    struct
+    {
+        enum MPEG4_audioObjectType i_object_type;
+        unsigned i_samplerate;
+        uint8_t i_channel_configuration;
+    } extension;
+
+    /* GASpecific */
+    unsigned i_frame_length;   // 1024 or 960
+
+} MPEG4_asc_t;
+
+static inline int MPEG4_read_GAProgramConfigElement(bs_t *s)
+{
+    /* TODO compute channels count ? */
+    int i_tag = bs_read(s, 4);
+    if (i_tag != 0x05)
+        return -1;
+    bs_skip(s, 2 + 4); // object type + sampling index
+    int i_num_front = bs_read(s, 4);
+    int i_num_side = bs_read(s, 4);
+    int i_num_back = bs_read(s, 4);
+    int i_num_lfe = bs_read(s, 2);
+    int i_num_assoc_data = bs_read(s, 3);
+    int i_num_valid_cc = bs_read(s, 4);
+
+    if (bs_read1(s))
+        bs_skip(s, 4); // mono downmix
+    if (bs_read1(s))
+        bs_skip(s, 4); // stereo downmix
+    if (bs_read1(s))
+        bs_skip(s, 2+1); // matrix downmix + pseudo_surround
+
+    bs_skip(s, i_num_front * (1+4));
+    bs_skip(s, i_num_side * (1+4));
+    bs_skip(s, i_num_back * (1+4));
+    bs_skip(s, i_num_lfe * (4));
+    bs_skip(s, i_num_assoc_data * (4));
+    bs_skip(s, i_num_valid_cc * (5));
+    bs_align(s);
+    int i_comment = bs_read(s, 8);
+    bs_skip(s, i_comment * 8);
+    return 0;
+}
+
+static inline int MPEG4_read_GASpecificConfig(MPEG4_asc_t *p_cfg, bs_t *s)
+{
+    p_cfg->i_frame_length = bs_read1(s) ? 960 : 1024;
+    if(p_cfg->i_object_type == MPEG4_AOT_ER_AAC_LD) /* 14496-3 4.5.1.1 */
+        p_cfg->i_frame_length >>= 1;
+    else if(p_cfg->i_object_type == MPEG4_AOT_AAC_SSR)
+        p_cfg->i_frame_length = 256;
+
+    if (bs_read1(s))     // depend on core coder
+        bs_skip(s, 14);   // core coder delay
+
+    int i_extension_flag = bs_read1(s);
+    if (p_cfg->i_channel_configuration == 0)
+        MPEG4_read_GAProgramConfigElement(s);
+    if (p_cfg->i_object_type == MPEG4_AOT_AAC_SC ||
+        p_cfg->i_object_type == MPEG4_AOT_ER_AAC_SC)
+        bs_skip(s, 3);    // layer
+
+    if (i_extension_flag) {
+        if (p_cfg->i_object_type == MPEG4_AOT_ER_BSAC)
+            bs_skip(s, 5 + 11);   // numOfSubFrame + layer length
+        if (p_cfg->i_object_type == MPEG4_AOT_ER_AAC_LC ||
+            p_cfg->i_object_type == MPEG4_AOT_ER_AAC_LTP ||
+            p_cfg->i_object_type == MPEG4_AOT_ER_AAC_SC ||
+            p_cfg->i_object_type == MPEG4_AOT_ER_AAC_LD)
+            bs_skip(s, 1+1+1);    // ER data : section scale spectral */
+        if (bs_read1(s))     // extension 3
+            fprintf(stderr, "MPEG4GASpecificConfig: error 1\n");
+    }
+    return 0;
+}
+
+static inline int MPEG4_read_ELDSpecificConfig(MPEG4_asc_t *p_cfg, bs_t *s)
+{
+    p_cfg->i_frame_length = bs_read1(s) ? 480 : 512;
+
+    /* ELDSpecificConfig Table 4.180 */
+
+    bs_skip(s, 3);
+    if(bs_read1(s)) /* ldSbrPresentFlag */
+    {
+        bs_skip(s, 2);
+        /* ld_sbr_header(channelConfiguration) Table 4.181 */
+        unsigned numSbrHeader;
+        switch(p_cfg->i_channel_configuration)
+        {
+        case 1: case 2:
+            numSbrHeader = 1;
+            break;
+        case 3:
+            numSbrHeader = 2;
+            break;
+        case 4: case 5: case 6:
+            numSbrHeader = 3;
+            break;
+        case 7:
+            numSbrHeader = 4;
+            break;
+        default:
+            numSbrHeader = 0;
+            break;
+        }
+        for( ; numSbrHeader; numSbrHeader-- )
+        {
+            /* sbr_header() Table 4.63 */
+            bs_read(s, 14);
+            bool header_extra_1 = bs_read1(s);
+            bool header_extra_2 = bs_read1(s);
+            if(header_extra_1)
+                bs_read(s, 5);
+            if(header_extra_2)
+                bs_read(s, 6);
+        }
+    }
+
+    for(unsigned eldExtType = bs_read(s, 4);
+         eldExtType != 0x0 /* ELDEXT_TERM */;
+         eldExtType = bs_read(s, 4))
+    {
+        unsigned eldExtLen = bs_read(s, 4);
+        unsigned eldExtLenAdd = 0;
+        if(eldExtLen == 15)
+        {
+            eldExtLenAdd = bs_read(s, 8);
+            eldExtLen += eldExtLenAdd;
+        }
+        if(eldExtLenAdd == 255)
+            eldExtLen += bs_read(s, 16);
+        /* reserved extensions */
+        for(; eldExtLen; eldExtLen--)
+            bs_skip(s, 8);
+    }
+
+    return 0;
+}
+
+static inline enum MPEG4_audioObjectType MPEG4_read_AudioObjectType(bs_t *s)
+{
+    int i_type = bs_read(s, 5);
+    if (i_type == 31)
+        i_type = 32 + bs_read(s, 6);
+    return (enum MPEG4_audioObjectType) i_type;
+}
+
+static const int pi_sample_rates16 =
+    {
+        96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
+        16000, 12000, 11025, 8000,  7350,  0,     0,     0
+};
+
+static inline unsigned MPEG4_read_AudioSamplerate(bs_t *s)
+{
+    int i_index = bs_read(s, 4);
+    if (i_index != 0x0f)
+        return pi_sample_ratesi_index;
+    return bs_read(s, 24);
+}
+
+static inline int MPEG4_read_AudioSpecificConfig(bs_t *s, MPEG4_asc_t *p_cfg, bool b_withext)
+{
+    p_cfg->i_object_type = MPEG4_read_AudioObjectType(s);
+    p_cfg->i_samplerate = MPEG4_read_AudioSamplerate(s);
+    p_cfg->i_channel_configuration = bs_read(s, 4);
+
+    p_cfg->i_sbr = -1;
+    p_cfg->i_ps  = -1;
+    p_cfg->extension.i_object_type = MPEG4_AOT_NULL;
+    p_cfg->extension.i_samplerate = 0;
+    p_cfg->extension.i_channel_configuration = 0;
+    p_cfg->i_frame_length = 0;
+
+    if (p_cfg->i_object_type == MPEG4_AOT_AAC_SBR ||
+        p_cfg->i_object_type == MPEG4_AOT_AAC_PS) {
+        p_cfg->i_sbr = 1;
+        if (p_cfg->i_object_type == MPEG4_AOT_AAC_PS)
+            p_cfg->i_ps = 1;
+        p_cfg->extension.i_object_type = MPEG4_AOT_AAC_SBR;
+        p_cfg->extension.i_samplerate = MPEG4_read_AudioSamplerate(s);
+
+        p_cfg->i_object_type = MPEG4_read_AudioObjectType(s);
+        if(p_cfg->i_object_type == MPEG4_AOT_ER_BSAC)
+            p_cfg->extension.i_channel_configuration = bs_read(s, 4);
+    }
+
+    switch(p_cfg->i_object_type)
+    {
+    case MPEG4_AOT_AAC_MAIN:
+    case MPEG4_AOT_AAC_LC:
+    case MPEG4_AOT_AAC_SSR:
+    case MPEG4_AOT_AAC_LTP:
+    case MPEG4_AOT_AAC_SC:
+    case MPEG4_AOT_TWINVQ:
+    case MPEG4_AOT_ER_AAC_LC:
+    case MPEG4_AOT_ER_AAC_LTP:
+    case MPEG4_AOT_ER_AAC_SC:
+    case MPEG4_AOT_ER_TWINVQ:
+    case MPEG4_AOT_ER_BSAC:
+    case MPEG4_AOT_ER_AAC_LD:
+        MPEG4_read_GASpecificConfig(p_cfg, s);
+        break;
+    case MPEG4_AOT_CELP:
+        // CelpSpecificConfig();
+    case MPEG4_AOT_HVXC:
+        // HvxcSpecificConfig();
+    case MPEG4_AOT_TTSI:
+        // TTSSSpecificConfig();
+    case MPEG4_AOT_MAIN_SYNTHETIC:
+    case MPEG4_AOT_WAVETABLES:
+    case MPEG4_AOT_GENERAL_MIDI:
+    case MPEG4_AOT_ALGORITHMIC:
+        // StructuredAudioSpecificConfig();
+    case MPEG4_AOT_ER_CELP:
+        // ERCelpSpecificConfig();
+    case MPEG4_AOT_ER_HXVC:
+        // ERHvxcSpecificConfig();
+    case MPEG4_AOT_ER_HILN:
+    case MPEG4_AOT_ER_Parametric:
+        // ParametricSpecificConfig();
+    case MPEG4_AOT_SSC:
+        // SSCSpecificConfig();
+    case MPEG4_AOT_LAYER1:
+    case MPEG4_AOT_LAYER2:
+    case MPEG4_AOT_LAYER3:
+        // MPEG_1_2_SpecificConfig();
+    case MPEG4_AOT_DST:
+        // DSTSpecificConfig();
+    case MPEG4_AOT_ALS:
+        // ALSSpecificConfig();
+    case MPEG4_AOT_SLS:
+    case MPEG4_AOT_SLS_NON_CORE:
+        // SLSSpecificConfig();
+    case MPEG4_AOT_ER_AAC_ELD:
+        MPEG4_read_ELDSpecificConfig(p_cfg, s);
+        break;
+    case MPEG4_AOT_SMR_SIMPLE:
+    case MPEG4_AOT_SMR_MAIN:
+        // SymbolicMusicSpecificConfig();
+    default:
+        // error
+        return VLC_EGENERIC;
+    }
+
+    switch(p_cfg->i_object_type)
+    {
+    case MPEG4_AOT_ER_AAC_LC:
+    case MPEG4_AOT_ER_AAC_LTP:
+    case MPEG4_AOT_ER_AAC_SC:
+    case MPEG4_AOT_ER_TWINVQ:
+    case MPEG4_AOT_ER_BSAC:
+    case MPEG4_AOT_ER_AAC_LD:
+    case MPEG4_AOT_ER_CELP:
+    case MPEG4_AOT_ER_HXVC:
+    case MPEG4_AOT_ER_HILN:
+    case MPEG4_AOT_ER_Parametric:
+    case MPEG4_AOT_ER_AAC_ELD:
+    {
+        int epConfig = bs_read(s, 2);
+        if (epConfig == 2 || epConfig == 3)
+            //ErrorProtectionSpecificConfig();
+            if (epConfig == 3)
+                if (bs_read1(s)) {
+                    // TODO : directMapping
+                }
+        break;
+    }
+    default:
+        break;
+    }
+
+    if (b_withext && p_cfg->extension.i_object_type != MPEG4_AOT_AAC_SBR &&
+        !bs_eof(s) && bs_read(s, 11) == 0x2b7)
+    {
+        p_cfg->extension.i_object_type = MPEG4_read_AudioObjectType(s);
+        if (p_cfg->extension.i_object_type == MPEG4_AOT_AAC_SBR)
+        {
+            p_cfg->i_sbr  = bs_read1(s);
+            if (p_cfg->i_sbr == 1) {
+                p_cfg->extension.i_samplerate = MPEG4_read_AudioSamplerate(s);
+                if (bs_read(s, 11) == 0x548)
+                    p_cfg->i_ps = bs_read1(s);
+            }
+        }
+        else if (p_cfg->extension.i_object_type == MPEG4_AOT_ER_BSAC)
+        {
+            p_cfg->i_sbr  = bs_read1(s);
+            if(p_cfg->i_sbr)
+                p_cfg->extension.i_samplerate = MPEG4_read_AudioSamplerate(s);
+            p_cfg->extension.i_channel_configuration = bs_read(s, 4);
+        }
+    }
+
+#if 0
+    static const char *ppsz_otype = {
+        "NULL",
+        "AAC Main", "AAC LC", "AAC SSR", "AAC LTP", "SBR", "AAC Scalable",
+        "TwinVQ",
+        "CELP", "HVXC",
+        "Reserved", "Reserved",
+        "TTSI",
+        "Main Synthetic", "Wavetables Synthesis", "General MIDI",
+        "Algorithmic Synthesis and Audio FX",
+        "ER AAC LC",
+        "Reserved",
+        "ER AAC LTP", "ER AAC Scalable", "ER TwinVQ", "ER BSAC", "ER AAC LD",
+        "ER CELP", "ER HVXC", "ER HILN", "ER Parametric",
+        "SSC",
+        "PS", "MPEG Surround", "Escape",
+        "Layer 1", "Layer 2", "Layer 3",
+        "DST", "ALS", "SLS", "SLS non-core", "ELD",
+        "SMR Simple", "SMR Main",
+    };
+
+    fprintf(stderr, "MPEG4ReadAudioSpecificInfo: t=%s(%d)f=%d c=%d sbr=%d\n",
+            ppsz_otypep_cfg->i_object_type, p_cfg->i_object_type,
+            p_cfg->i_samplerate, p_cfg->i_channel, p_cfg->i_sbr);
+#endif
+    return bs_error(s) ? VLC_EGENERIC : VLC_SUCCESS;
+}
+
+#define MPEG4_STREAM_MAX_EXTRADATA 64
+typedef struct
+{
+    uint8_t i_program;
+    uint8_t i_layer;
+
+    unsigned i_frame_length;         // type 1
+    uint8_t i_frame_length_type;
+    uint8_t i_frame_length_index;   // type 3 4 5 6 7
+
+    MPEG4_asc_t cfg;
+
+    /* Raw configuration */
+    size_t i_extra;
+    uint8_t extraMPEG4_STREAM_MAX_EXTRADATA;
+
+} MPEG4_audio_stream_t;
+
+#define MPEG4_STREAMMUX_MAX_LAYER   8
+#define MPEG4_STREAMMUX_MAX_PROGRAM 16
+typedef struct
+{
+    bool b_same_time_framing;
+    uint8_t i_sub_frames;
+    uint8_t i_programs;
+
+    uint8_t pi_layersMPEG4_STREAMMUX_MAX_PROGRAM;
+
+    uint8_t pi_streamMPEG4_STREAMMUX_MAX_PROGRAMMPEG4_STREAMMUX_MAX_LAYER;
+
+    uint8_t i_streams;
+    MPEG4_audio_stream_t streamMPEG4_STREAMMUX_MAX_PROGRAM*MPEG4_STREAMMUX_MAX_LAYER;
+
+    uint32_t i_other_data;
+    int16_t  i_crc;  /* -1 if not set */
+} MPEG4_streammux_config_t;
+
+static inline uint32_t MPEG4_LatmGetValue(bs_t *s)
+{
+    uint32_t v = 0;
+    for (int i = 1 + bs_read(s, 2); i > 0; i--)
+        v = (v << 8) + bs_read(s, 8);
+    return v;
+}
+
+static inline size_t AudioSpecificConfigBitsToBytes(bs_t *s, uint32_t i_bits, uint8_t *p_data)
+{
+    size_t i_extra = __MIN((i_bits + 7) / 8, MPEG4_STREAM_MAX_EXTRADATA);
+    for (size_t i = 0; i < i_extra; i++) {
+        const uint32_t i_read = __MIN(8, i_bits - 8*i);
+        p_datai = bs_read(s, i_read) << (8-i_read);
+    }
+    return i_extra;
+}
+
+static inline int MPEG4_parse_StreamMuxConfig(bs_t *s, MPEG4_streammux_config_t *m)
+{
+    int i_mux_version;
+    int i_mux_versionA;
+
+    i_mux_version = bs_read(s, 1);
+    i_mux_versionA = 0;
+    if (i_mux_version)
+        i_mux_versionA = bs_read(s, 1);
+
+    if (i_mux_versionA != 0) /* support only A=0 */
+        return -1;
+
+    memset(m, 0, sizeof(*m));
+
+    if (i_mux_versionA == 0)
+        if (i_mux_version == 1)
+            MPEG4_LatmGetValue(s); /* taraBufferFullness */
+
+    if(bs_eof(s))
+        return -1;
+
+    m->b_same_time_framing = bs_read1(s);
+    m->i_sub_frames = 1 + bs_read(s, 6);
+    m->i_programs = 1 + bs_read(s, 4);
+
+    for (uint8_t i_program = 0; i_program < m->i_programs; i_program++) {
+        if(bs_eof(s))
+            return -1;
+        m->pi_layersi_program = 1+bs_read(s, 3);
+
+        for (uint8_t i_layer = 0; i_layer < m->pi_layersi_program; i_layer++) {
+            MPEG4_audio_stream_t *st = &m->streamm->i_streams;
+            bool b_previous_cfg;
+
+            m->pi_streami_programi_layer = m->i_streams;
+            st->i_program = i_program;
+            st->i_layer = i_layer;
+
+            b_previous_cfg = false;
+            if (i_program != 0 || i_layer != 0)
+                b_previous_cfg = bs_read1(s);
+
+            if (b_previous_cfg) {
+                assert(m->i_streams > 0);
+                st->cfg = m->streamm->i_streams-1.cfg;
+            } else {
+                uint32_t asc_size = 0;
+                if(i_mux_version > 0)
+                    asc_size = MPEG4_LatmGetValue(s);
+                bs_t asc_bs = *s;
+                MPEG4_read_AudioSpecificConfig(&asc_bs, &st->cfg, i_mux_version > 0);
+                if (i_mux_version == 0)
+                    asc_size = bs_pos(&asc_bs) - bs_pos(s);
+                asc_bs = *s;
+                st->i_extra = AudioSpecificConfigBitsToBytes(&asc_bs, asc_size, st->extra);
+                bs_skip(s, asc_size);
+            }
+
+            st->i_frame_length_type = bs_read(s, 3);
+            switch(st->i_frame_length_type)
+            {
+            case 0:
+            {
+                bs_skip(s, 8); /* latmBufferFullnes */
+                if (!m->b_same_time_framing)
+                    if (st->cfg.i_object_type == MPEG4_AOT_AAC_SC ||
+                        st->cfg.i_object_type == MPEG4_AOT_CELP ||
+                        st->cfg.i_object_type == MPEG4_AOT_ER_AAC_SC ||
+                        st->cfg.i_object_type == MPEG4_AOT_ER_CELP)
+                        bs_skip(s, 6); /* eFrameOffset */
+                break;
+            }
+            case 1:
+                st->i_frame_length = bs_read(s, 9);
+                break;
+            case 3: case 4: case 5:
+                st->i_frame_length_index = bs_read(s, 6); // celp
+                break;
+            case 6: case 7:
+                st->i_frame_length_index = bs_read(s, 1); // hvxc
+            default:
+                break;
+            }
+            /* Next stream */
+            m->i_streams++;
+        }
+    }
+
+    if(bs_error(s) || bs_eof(s))
+        return -1;
+
+    /* other data */
+    if (bs_read1(s)) {
+        if (i_mux_version == 1)
+            m->i_other_data = MPEG4_LatmGetValue(s);
+        else {
+            int b_continue;
+            do {
+                b_continue = bs_read1(s);
+                m->i_other_data = (m->i_other_data << 8) + bs_read(s, 8);
+            } while (b_continue);
+        }
+    }
+
+    /* crc */
+    m->i_crc = -1;
+    if (bs_read1(s))
+        m->i_crc = bs_read(s, 8);
+
+    return bs_error(s) ? -1 : 0;
+}
+

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/mpeg4systems.h Added

@@ -0,0 +1,213 @@
+/*****************************************************************************
+ * mpeg4systems.h: MPEG4 ISO-14496-1 definitions
+ *****************************************************************************
+ * Copyright (C) 2001-2024 VLC authors, VideoLAN and VideoLabs
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef MP4_MPEG4SYSTEMS_H
+#define MP4_MPEG4SYSTEMS_H
+
+#include <vlc_codec.h>
+#include "dts_header.h"
+
+/* See 14496-1 and http://mp4ra.org/#/object_types */
+
+enum MPEG4_objectTypeIndication
+{
+    MPEG4_OT_FORBIDDEN                              = 0x00,
+    MPEG4_OT_SYSTEMS_14496_1                        = 0x01,
+    MPEG4_OT_SYSTEMS_14496_1_BIFS_V2                = 0x02,
+    MPEG4_OT_INTERACTION_STREAM                     = 0x03,
+    MPEG4_OT_EXTENDED_BIFS_CONFIGURATION            = 0x04,
+    MPEG4_OT_AFX                                    = 0x05,
+    MPEG4_OT_FONT_DATA_STREAM                       = 0x06,
+    MPEG4_OT_SYNTHESIZED_TEXTURE_STREAM             = 0x07,
+    MPEG4_OT_STREAMING_TEXT_STREAM                  = 0x08,
+    MPEG4_OT_LASER_STREAM                           = 0x09,
+    MPEG4_OT_SAF_STREAM                             = 0x0A,
+    // RESERVED_FOR_ISO                               0x0B-0x1F
+    MPEG4_OT_VISUAL_ISO_IEC_14496_2                 = 0x20,
+    MPEG4_OT_VISUAL_ISO_IEC_14496_10_H264           = 0x21,
+    MPEG4_OT_ISO_IEC_14496_10_H264_PARAMETER_SETS   = 0x22,
+    MPEG4_OT_VISUAL_ISO_IEC_23008_2_H265            = 0x23,
+    // RESERVED_FOR_ISO                               0x24-0x3F
+    MPEG4_OT_AUDIO_ISO_IEC_14496_3                  = 0x40,
+    // RESERVED_FOR_ISO                               0x41-0x5F
+    MPEG4_OT_VISUAL_ISO_IEC_13818_2_SIMPLE_PROFILE  = 0x60,
+    MPEG4_OT_VISUAL_ISO_IEC_13818_2_MAIN_PROFILE    = 0x61,
+    MPEG4_OT_VISUAL_ISO_IEC_13818_2_SNR_PROFILE     = 0x62,
+    MPEG4_OT_VISUAL_ISO_IEC_13818_2_SPATIAL_PROFILE = 0x63,
+    MPEG4_OT_VISUAL_ISO_IEC_13818_2_HIGH_PROFILE    = 0x64,
+    MPEG4_OT_VISUAL_ISO_IEC_13818_2_422_PROFILE     = 0x65,
+    MPEG4_OT_AUDIO_ISO_IEC_13818_7_MAIN_PROFILE     = 0x66,
+    MPEG4_OT_AUDIO_ISO_IEC_13818_7_LC_PROFILE       = 0x67,
+    MPEG4_OT_AUDIO_ISO_IEC_13818_7_SSR_PROFILE      = 0x68,
+    MPEG4_OT_AUDIO_ISO_IEC_13818_3                  = 0x69,
+    MPEG4_OT_VISUAL_ISO_IEC_11172_2                 = 0x6A,
+    MPEG4_OT_AUDIO_ISO_IEC_11172_3                  = 0x6B,
+    MPEG4_OT_VISUAL_ISO_IEC_10918_1_JPEG            = 0x6C,
+    MPEG4_OT_PORTABLE_NETWORK_GRAPHICS              = 0x6D,
+    MPEG4_OT_VISUAL_ISO_IEC_15444_1_JPEG2000        = 0x6E,
+    // RESERVED_FOR_ISO                               0x6F-0x9F
+    MPEG4_OT_3GPP2_EVRC_VOICE                       = 0xA0,
+    MPEG4_OT_3GPP2_SMV_VOICE                        = 0xA1,
+    MPEG4_OT_3GPP2_COMPACT_MULTIMEDIA_FORMAT        = 0xA2,
+    MPEG4_OT_SMPTE_VC1_VIDEO                        = 0xA3,
+    MPEG4_OT_DIRAC_VIDEO_CODER                      = 0xA4,
+    MPEG4_OT_DEPRECATED_AC3                         = 0xA5,
+    MPEG4_OT_DEPRECATED_EAC3                        = 0xA6,
+    MPEG4_OT_DRA_AUDIO                              = 0xA7,
+    MPEG4_OT_ITU_G719_AUDIO                         = 0xA8,
+    MPEG4_OT_DTSHD_CORE_SUBSTREAM                   = 0xA9,
+    MPEG4_OT_DTSHD_CORE_SUBSTREAM_PLUS_EXTENSION    = 0xAA,
+    MPEG4_OT_DTSHD_EXTENSION_SUBSTREAM_ONLY_XLL     = 0xAB,
+    MPEG4_OT_DTSHD_EXTENSION_SUBSTREAM_ONLY_LBR     = 0xAC,
+    MPEG4_OT_OPUS_AUDIO                             = 0xAD,
+    MPEG4_OT_DEPRECATED_AC4                         = 0xAE,
+    MPEG4_OT_AURO_CX_D3_AUDIO                       = 0xAF,
+    MPEG4_OT_REALVIDEO_CODEC_11                     = 0xB0,
+    MPEG4_OT_VP9_VIDEO                              = 0xB1,
+    MPEG4_OT_DTSUHD_PROFILE_2                       = 0xB2,
+    MPEG4_OT_DTSUHD_PROFILE_3_OR_HIGHER             = 0xB3,
+    // RESERVED_FOR_REGISTRATION                      0xB4-0xBF
+    // USER_PRIVATE                                   0xC0-0xE0
+    MPEG4_OT_3GPP2_13K_VOICE                        = 0xE1,
+    // USER_PRIVATE                                   0xE2-0xFE
+    MPEG4_OT_NO_OBJECT_TYPE_SPECIFIED               = 0xFF,
+};
+
+enum MPEG4_streamType
+{
+    MPEG4_ST_FORBIDDEN                              = 0x00,
+    MPEG4_ST_OBJECT_DESCRIPTOR_STREAM               = 0X01,
+    MPEG4_ST_CLOCK_REFERENCE_STREAM                 = 0X02,
+    MPEG4_ST_SCENE_DESCRIPTION_STREAM               = 0X03,
+    MPEG4_ST_VISUAL_STREAM                          = 0X04,
+    MPEG4_ST_AUDIO_STREAM                           = 0X05,
+    MPEG4_ST_MPEG7_STREAM                           = 0X06,
+    MPEG4_ST_IPMP_STREAM                            = 0X07,
+    MPEG4_ST_OBJECT_CONTENT_INFO_STREAM             = 0X08,
+    MPEG4_ST_MPEG_J_STREAM                          = 0X09,
+    MPEG4_ST_INTERACTION_STREAM                     = 0X0A,
+    MPEG4_ST_IPMP_TOOL_STREAM                       = 0X0B,
+    MPEG4_ST_FONT_DATA_STREAM                       = 0X0C,
+    MPEG4_ST_STREAMING_TEXT                         = 0X0D,
+    // USER_PRIVATE                                   0x20-0x3F
+};
+
+static inline bool MPEG4_get_codec_by_ObjectType(uint8_t oti,
+                                                 const uint8_t *p_dsi,
+                                                 size_t i_dsi,
+                                                 vlc_fourcc_t *pi_codec,
+                                                 int *pi_profile)
+{
+    switch(oti)
+    {
+    case MPEG4_OT_VISUAL_ISO_IEC_14496_2: /* MPEG4 VIDEO */
+        *pi_codec = VLC_CODEC_MP4V;
+        break;
+    case MPEG4_OT_VISUAL_ISO_IEC_14496_10_H264: /* H.264 */
+        *pi_codec = VLC_CODEC_H264;
+        break;
+    case MPEG4_OT_VISUAL_ISO_IEC_23008_2_H265: /* H.265 */
+        *pi_codec = VLC_CODEC_HEVC;
+        break;
+    case 0x33: /* H.266 */
+        *pi_codec = VLC_CODEC_VVC;
+        break;
+    case MPEG4_OT_AUDIO_ISO_IEC_14496_3:
+    case 0x41:
+        *pi_codec = VLC_CODEC_MP4A;
+        if(i_dsi >= 2 && p_dsi0 == 0xF8 && (p_dsi1&0xE0)== 0x80)
+            *pi_codec = VLC_CODEC_ALS;
+        break;
+         /* MPEG2 video */
+    case MPEG4_OT_VISUAL_ISO_IEC_13818_2_SIMPLE_PROFILE:
+    case MPEG4_OT_VISUAL_ISO_IEC_13818_2_MAIN_PROFILE:
+    case MPEG4_OT_VISUAL_ISO_IEC_13818_2_SNR_PROFILE:
+    case MPEG4_OT_VISUAL_ISO_IEC_13818_2_SPATIAL_PROFILE:
+    case MPEG4_OT_VISUAL_ISO_IEC_13818_2_HIGH_PROFILE:
+    case MPEG4_OT_VISUAL_ISO_IEC_13818_2_422_PROFILE:
+        *pi_codec = VLC_CODEC_MPGV;
+        break;
+        /* Theses are MPEG2-AAC */
+    case MPEG4_OT_AUDIO_ISO_IEC_13818_7_MAIN_PROFILE: /* main profile */
+    case MPEG4_OT_AUDIO_ISO_IEC_13818_7_LC_PROFILE: /* Low complexity profile */
+    case MPEG4_OT_AUDIO_ISO_IEC_13818_7_SSR_PROFILE: /* Scalable Sampling rate profile */
+        *pi_codec = VLC_CODEC_MP4A;
+        break;
+        /* True MPEG 2 audio */
+    case MPEG4_OT_AUDIO_ISO_IEC_13818_3:
+        *pi_codec = VLC_CODEC_MPGA;
+        break;
+    case MPEG4_OT_VISUAL_ISO_IEC_11172_2: /* MPEG1 video */
+        *pi_codec = VLC_CODEC_MPGV;
+        break;
+    case MPEG4_OT_AUDIO_ISO_IEC_11172_3: /* MPEG1 audio */
+        *pi_codec = VLC_CODEC_MPGA;
+        break;
+    case MPEG4_OT_VISUAL_ISO_IEC_10918_1_JPEG: /* jpeg */
+        *pi_codec = VLC_CODEC_JPEG;
+        break;
+    case MPEG4_OT_PORTABLE_NETWORK_GRAPHICS: /* png */
+        *pi_codec = VLC_CODEC_PNG;
+        break;
+    case MPEG4_OT_VISUAL_ISO_IEC_15444_1_JPEG2000: /* jpeg2000 */
+        *pi_codec = VLC_FOURCC('M','J','2','C');
+        break;
+    case MPEG4_OT_SMPTE_VC1_VIDEO: /* vc-1 */
+        *pi_codec = VLC_CODEC_VC1;
+        break;
+    case MPEG4_OT_DIRAC_VIDEO_CODER:
+        *pi_codec = VLC_CODEC_DIRAC;
+        break;
+    case MPEG4_OT_DEPRECATED_AC3:
+        *pi_codec = VLC_CODEC_A52;
+        break;
+    case MPEG4_OT_DEPRECATED_EAC3:
+        *pi_codec = VLC_CODEC_EAC3;
+        break;
+    case MPEG4_OT_DTSHD_CORE_SUBSTREAM: /* DTS */
+        *pi_codec = VLC_CODEC_DTS;
+        break;
+    case MPEG4_OT_DTSHD_CORE_SUBSTREAM_PLUS_EXTENSION: /* DTS-HD HRA */
+    case MPEG4_OT_DTSHD_EXTENSION_SUBSTREAM_ONLY_XLL:  /* DTS-HD Master Audio */
+        *pi_profile = PROFILE_DTS_HD;
+        *pi_codec = VLC_CODEC_DTS;
+        break;
+    case MPEG4_OT_DTSHD_EXTENSION_SUBSTREAM_ONLY_LBR:
+        *pi_profile = PROFILE_DTS_EXPRESS;
+        *pi_codec = VLC_CODEC_DTS;
+        break;
+    case MPEG4_OT_OPUS_AUDIO:
+        *pi_codec = VLC_CODEC_OPUS;
+        break;
+    case MPEG4_OT_VP9_VIDEO:
+        *pi_codec = VLC_CODEC_VP9;
+        break;
+    case 0xDD:
+        *pi_codec = VLC_CODEC_VORBIS;
+        break;
+    case MPEG4_OT_3GPP2_13K_VOICE:
+        *pi_codec = VLC_CODEC_QCELP;
+        break;
+    default:
+        return false;
+    }
+    return true;
+}
+
+#endif

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/mpeg4video.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/mpeg4video.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/startcode_helper.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/startcode_helper.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/packetizer/vc1.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/packetizer/vc1.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/services_discovery/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/services_discovery/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/services_discovery/bonjour.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/services_discovery/bonjour.m Changed

@@ -30,6 +30,7 @@
 #include <vlc_modules.h>
 #include <vlc_services_discovery.h>
 #include <vlc_renderer_discovery.h>
+#include <vlc_network.h>
 
 #import <Foundation/Foundation.h>
 #import <arpa/inet.h>
@@ -130,24 +131,18 @@
         return returnValue;
     }
 
-    typedef union {
-        struct sockaddr sa;
-        struct sockaddr_in ipv4;
-        struct sockaddr_in6 ipv6;
-    } ip_socket_address;
-
-    ip_socket_address *socketAddress = (ip_socket_address *)data bytes;
+    const vlc_sockaddr *socketAddress = (const vlc_sockaddr *)data bytes;
 
     if (socketAddress) {
         const char *addressStr = NULL;
         if (socketAddress->sa.sa_family == AF_INET) {
             addressStr = inet_ntop(socketAddress->sa.sa_family,
-                                           (void *)&(socketAddress->ipv4.sin_addr),
+                                           &(socketAddress->sin.sin_addr),
                                            addressBuffer,
                                            sizeof(addressBuffer));
         } else if (socketAddress->sa.sa_family == AF_INET6) {
             addressStr = inet_ntop(socketAddress->sa.sa_family,
-                                           (void *)&(socketAddress->ipv6.sin6_addr),
+                                           &(socketAddress->sin6.sin6_addr),
                                            addressBuffer,
                                            sizeof(addressBuffer));
         }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/services_discovery/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/services_discovery/meson.build Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/services_discovery/pipewire.c Added

@@ -0,0 +1,305 @@
+/*****************************************************************************
+ * @file pipewire.c
+ * @brief List of PipeWire sources for VLC media player
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * Authors: Ayush Dey <deyayush6@gmail.com>
+ *          Thomas Guillem <tguillem@videolan.org>
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <search.h>
+#include <assert.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_services_discovery.h>
+#include <pipewire/pipewire.h>
+#include "audio_output/vlc_pipewire.h"
+
+struct services_discovery_sys_t
+{
+    struct vlc_pw_context *context;
+    struct spa_hook listener;
+    void *nodes;
+    void *root_card;
+};
+
+struct vlc_pw_node
+{
+    uint32_t id;
+    uint64_t serial;
+    input_item_t *item;
+    services_discovery_t *sd;
+};
+
+struct card
+{
+    input_item_t *item;
+    services_discovery_t *sd;
+    char name;
+};
+
+static void DestroySource (void *data)
+{
+    struct vlc_pw_node *node = data;
+
+    services_discovery_RemoveItem (node->sd, node->item);
+    input_item_Release (node->item);
+    free (node);
+}
+
+static void DestroyCard(void *data)
+{
+    struct card *c = data;
+
+    services_discovery_RemoveItem(c->sd, c->item);
+    input_item_Release(c->item);
+    free(c);
+}
+
+/**
+ * Compares two nodes by ID (to support binary search).
+ */
+static int node_by_id(const void *a, const void *b)
+{
+    const struct vlc_pw_node *na = a, *nb = b;
+
+    if (na->id > nb->id)
+        return 1;
+    if (na->id < nb->id)
+        return -1;
+    return 0;
+}
+
+static int cmpcard (const void *a, const void *b)
+{
+    const struct card *ca = a, *cb = b;
+    return strcmp(ca->name, cb->name);
+}
+
+static input_item_t *AddCard (services_discovery_t *sd, const struct spa_dict *props)
+{
+    struct services_discovery_sys_t *sys = sd->p_sys;
+
+    const char *card_name = spa_dict_lookup(props, PW_KEY_NODE_NAME);
+    if (unlikely(card_name == NULL))
+        card_name = N_("Generic");
+
+    struct card *c = malloc(sizeof(*c) + strlen(card_name) + 1);
+    if (unlikely(c == NULL))
+        return NULL;
+    strcpy(c->name, card_name);
+
+    void **cp = tsearch(c, &sys->root_card, cmpcard);
+    if (cp == NULL) /* Out-of-memory */
+    {
+        free(c);
+        return NULL;
+    }
+    if (*cp != c)
+    {
+        free(c);
+        c = *cp;
+        assert(c->item != NULL);
+        return c->item;
+    }
+
+    c->item = input_item_NewExt("vlc://nop", c->name,
+                                INPUT_DURATION_INDEFINITE,
+                                ITEM_TYPE_NODE, ITEM_LOCAL);
+
+    if (unlikely(c->item == NULL))
+    {
+        tdelete(c, &sys->root_card, cmpcard);
+        free(c);
+        return NULL;
+    }
+    services_discovery_AddItem(sd, c->item);
+    c->sd = sd;
+
+    return c->item;
+}
+
+static void registry_node(services_discovery_t *sd, uint32_t id, uint32_t perms,
+                          uint32_t version, const struct spa_dict *props)
+{
+    struct services_discovery_sys_t *sys = sd->p_sys;
+    uint64_t serial;
+    char *mrl;
+
+    if (props == NULL)
+        return;
+
+    const char *class = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS);
+    if (class == NULL)
+        return;
+    
+    if (strstr(class, "Source") == NULL)
+        return; /* Not a source */
+    
+    if (!spa_atou64(spa_dict_lookup(props, PW_KEY_OBJECT_SERIAL), &serial, 0))
+        return;
+
+    const char *name = spa_dict_lookup(props, PW_KEY_NODE_NAME);
+    if (unlikely(name == NULL))
+        return;
+
+    if (unlikely(asprintf (&mrl, "pipewire://%s", name) == -1))
+        return;
+
+    const char *desc = spa_dict_lookup(props, PW_KEY_NODE_DESCRIPTION);
+    if (unlikely(desc == NULL))
+        desc = "???";
+
+    vlc_pw_debug(sys->context, "adding %s (%s)", name, desc);
+    input_item_t *item = input_item_NewCard (mrl, desc);
+    free (mrl);
+    if (unlikely(item == NULL))
+        return;
+
+    struct vlc_pw_node *node = malloc(sizeof (*node));
+    if (unlikely(node == NULL))
+    {
+        input_item_Release (item);
+        return;
+    }
+
+    node->id = id;
+    node->serial = serial;
+    node->item = item;
+
+    struct vlc_pw_node **pp = tsearch(node, &sys->nodes, node_by_id);
+    if (unlikely(pp == NULL))
+    { /* Memory allocation error in the tree */
+        free(node);
+        input_item_Release (item);
+        return;
+    }
+    if (*pp != node)
+    { /* Existing node, update it */
+        free(node);
+        node = *pp;
+        input_item_SetURI (node->item, item->psz_uri);
+        input_item_SetName (node->item, item->psz_name);
+        input_item_Release (item);
+        return;
+    }
+
+    input_item_t *card = AddCard(sd, props);
+    services_discovery_AddSubItem(sd, card, item);
+    node->sd = sd;
+    return;
+}
+
+/**
+ * Global callback.
+ *
+ * This gets called for every initial, then every new object from the PipeWire
+ * server. We can find the usable sources through this.
+ */
+static void registry_global(void *data, uint32_t id, uint32_t perms,
+                            const char *name, uint32_t version,
+                            const struct spa_dict *props)
+{
+    services_discovery_t *sd = data;
+
+    if (strcmp(name, PW_TYPE_INTERFACE_Node) == 0)
+        registry_node(sd, id, perms, version, props);
+}
+
+/**
+ * Global removal callback.
+ *
+ * This gets called when an object disappers. We can detect when a source is unplugged here.
+ */
+static void registry_global_remove(void *data, uint32_t id)
+{
+    services_discovery_t *sd = data;
+    struct services_discovery_sys_t *sys = sd->p_sys;
+    struct vlc_pw_node key = { .id = id };
+    struct vlc_pw_node **pp = tfind(&key, &sys->nodes, node_by_id);
+    if (pp == NULL)
+        return;
+
+    struct vlc_pw_node *node = *pp;
+    tdelete(node, &sys->nodes, node_by_id);
+    DestroySource (node);
+}
+
+static const struct pw_registry_events events = {
+    PW_VERSION_REGISTRY_EVENTS,
+    .global = registry_global,
+    .global_remove =  registry_global_remove
+};
+
+static int Open (vlc_object_t *obj)
+{
+    services_discovery_t *sd = (services_discovery_t *)obj;
+    
+    struct services_discovery_sys_t *sys = malloc(sizeof (*sys));
+    if (unlikely(sys == NULL))
+        return VLC_ENOMEM;
+
+    sys->context = vlc_pw_connect(obj, "services discovery");
+    if (sys->context == NULL)
+    {
+        free(sys);
+        return VLC_EGENERIC;
+    }
+
+    sd->p_sys = sys;
+    sd->description = _("Audio and Video capture");
+    sys->nodes = NULL;
+    sys->root_card = NULL;
+    sys->listener = (struct spa_hook){ };
+
+    vlc_pw_lock(sys->context);
+    /* Subscribe for source events */
+    vlc_pw_registry_listen(sys->context, &sys->listener, &events, sd);
+    vlc_pw_roundtrip_unlocked(sys->context); /* Enumerate existing sources */
+    vlc_pw_unlock(sys->context);
+    return VLC_SUCCESS;
+}
+
+static void Close (vlc_object_t *obj)
+{
+    services_discovery_t *sd = (services_discovery_t *)obj;
+    struct services_discovery_sys_t *sys = sd->p_sys;
+
+    vlc_pw_disconnect(sys->context);
+    tdestroy(sys->nodes, DestroySource);
+    tdestroy(sys->root_card, DestroyCard);
+    free (sys);
+}
+
+VLC_SD_PROBE_HELPER("pipewire", N_("Audio and Video capture"), SD_CAT_DEVICES);
+
+vlc_module_begin ()
+    set_shortname (N_("Audio and Video capture"))
+    set_description (N_("Audio and Video capture (PipeWire)"))
+    set_subcategory (SUBCAT_PLAYLIST_SD)
+    set_capability ("services_discovery", 0)
+    set_callbacks (Open, Close)
+    add_shortcut ("pipewire", "pw")
+
+    VLC_SD_PROBE_SUBMODULE
+vlc_module_end ()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/services_discovery/udisks.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/services_discovery/udisks.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/services_discovery/upnp-wrapper.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/services_discovery/upnp-wrapper.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/spu/audiobargraph_v.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/spu/audiobargraph_v.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/spu/dynamicoverlay/dynamicoverlay.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/spu/dynamicoverlay/dynamicoverlay.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/spu/logo.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/spu/logo.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/spu/marq.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/spu/marq.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/spu/mosaic.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/spu/mosaic.c Changed

@@ -197,7 +197,7 @@
     add_integer_with_range( CFG_PREFIX "width", 100, 0, UINT_MAX,
                  WIDTH_TEXT, WIDTH_LONGTEXT )
 
-    add_integer_with_range( CFG_PREFIX "align", 5, 0, 10,
+    add_integer_with_range( CFG_PREFIX "align", SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT, 0, 10,
                  ALIGN_TEXT, ALIGN_LONGTEXT)
         change_integer_list( pi_align_values, ppsz_align_descriptions )
 
@@ -326,8 +326,9 @@
     GET_VAR( position );
 #undef GET_VAR
 
-    if( p_sys->i_align == 3 || p_sys->i_align == 7 )
-        p_sys->i_align = 5;
+    if( p_sys->i_align == (SUBPICTURE_ALIGN_RIGHT|SUBPICTURE_ALIGN_LEFT) ||
+        p_sys->i_align == (SUBPICTURE_ALIGN_RIGHT|SUBPICTURE_ALIGN_LEFT|SUBPICTURE_ALIGN_TOP) )
+        p_sys->i_align = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT;
 
     i_command = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "delay" );
     p_sys->i_delay = VLC_TICK_FROM_MS( i_command );
@@ -656,7 +657,7 @@
             return NULL;
         }
 
-        p_region->b_absolute = false;
+        p_region->b_absolute = false; p_region->b_in_window = false;
         if( p_es->i_x >= 0 && p_es->i_y >= 0 )
         {
             p_region->i_x = p_es->i_x;
@@ -772,8 +773,9 @@
     {
         int i_old = 0, i_new = 0;
         vlc_mutex_lock( &p_sys->lock );
-        if( newval.i_int == 3 || newval.i_int == 7 )
-            newval.i_int = 5;
+        if( newval.i_int == (SUBPICTURE_ALIGN_RIGHT|SUBPICTURE_ALIGN_LEFT) ||
+            newval.i_int == (SUBPICTURE_ALIGN_RIGHT|SUBPICTURE_ALIGN_LEFT|SUBPICTURE_ALIGN_TOP) )
+            newval.i_int = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT;
         while( pi_align_valuesi_old != p_sys->i_align ) i_old++;
         while( pi_align_valuesi_new != newval.i_int ) i_new++;
         msg_Dbg( p_this, "changing alignment from %d (%s) to %d (%s)",

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/spu/rss.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/spu/rss.c Changed

@@ -343,7 +343,6 @@
 {
     filter_sys_t *p_sys = p_filter->p_sys;
     subpicture_t *p_spu;
-    subpicture_region_t *p_region;
 
     int i_item;
     rss_feed_t *p_feed;
@@ -484,12 +483,12 @@
     if( p_sys->i_pos < 0 )
     {   /*  set to an absolute xy */
         region->i_align = SUBPICTURE_ALIGN_LEFT | SUBPICTURE_ALIGN_TOP;
-        region->b_absolute = true;
+        region->b_absolute = true; region->b_in_window = false;
     }
     else
     {   /* set to one of the 9 relative locations */
         region->i_align = p_sys->i_pos;
-        region->b_absolute = false;
+        region->b_absolute = false; region->b_in_window = false;
     }
     region->i_x = p_sys->i_xoff;
     region->i_y = p_sys->i_yoff;
@@ -501,12 +500,8 @@
         /* Display the feed's image */
         picture_t *p_pic = p_feed->p_pic;
 
-        p_region = subpicture_region_ForPicture( NULL, p_pic );
-        if( !p_region )
-        {
-            msg_Err( p_filter, "cannot allocate SPU region" );
-        }
-        else
+        subpicture_region_t *p_region = subpicture_region_ForPicture( NULL, p_pic );
+        if( likely(p_region) )
         {
             p_region->i_x = region->i_x;
             p_region->i_y = region->i_y;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/spu/subsdelay.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/spu/subsdelay.c Changed

@@ -136,6 +136,10 @@
 
     int i_last_region_align;
 
+    bool b_last_region_absolute;
+
+    bool b_last_region_in_window;
+
     bool b_last_region_saved;
 };
 
@@ -214,10 +218,7 @@
  * Subpicture functions
  *****************************************************************************/
 
-static void SubpicUpdateWrapper( subpicture_t *p_subpic,
-                                 const video_format_t *prev_src, const video_format_t *p_fmt_src,
-                                 const video_format_t *prev_dst, const video_format_t *p_fmt_dst,
-                                 vlc_tick_t i_ts );
+static void SubpicUpdateWrapper( subpicture_t *, const struct vlc_spu_updater_configuration * );
 
 static void SubpicDestroyWrapper( subpicture_t *p_subpic );
 
@@ -705,6 +706,8 @@
     p_entry->i_last_region_x = 0;
     p_entry->i_last_region_y = 0;
     p_entry->i_last_region_align = 0;
+    p_entry->b_last_region_absolute = false;
+    p_entry->b_last_region_in_window = false;
 
     return p_entry;
 }
@@ -917,12 +920,9 @@
  * SubpicUpdateWrapper: Subpicture update callback wrapper
  *****************************************************************************/
 static void SubpicUpdateWrapper( subpicture_t *p_subpic,
-                                 const video_format_t *prev_src, const video_format_t *p_fmt_src,
-                                 const video_format_t *prev_dst, const video_format_t *p_fmt_dst,
-                                 vlc_tick_t i_ts )
+                                 const struct vlc_spu_updater_configuration *cfg )
 {
     subsdelay_heap_entry_t *p_entry;
-    vlc_tick_t i_new_ts;
 
     p_entry = p_subpic->updater.sys;
     if( !p_entry )
@@ -940,6 +940,8 @@
         p_entry->i_last_region_x = p_region->i_x;
         p_entry->i_last_region_y = p_region->i_y;
         p_entry->i_last_region_align = p_region->i_align;
+        p_entry->b_last_region_absolute = p_region->b_absolute;
+        p_entry->b_last_region_in_window = p_region->b_in_window;
 
         p_entry->b_last_region_saved = true;
     }
@@ -947,20 +949,19 @@
     vlc_spu_regions_Clear( &p_subpic->regions );
 
     /* call source update */
-    i_new_ts = p_entry->p_source->i_start +
-                ( (double)( p_entry->p_source->i_stop - p_entry->p_source->i_start ) * ( i_ts - p_entry->p_source->i_start ) ) /
+    struct vlc_spu_updater_configuration new_cfg = *cfg;
+    new_cfg.pts = p_entry->p_source->i_start +
+                ( (double)( p_entry->p_source->i_stop - p_entry->p_source->i_start ) * ( cfg->pts - p_entry->p_source->i_start ) ) /
                 ( p_entry->i_new_stop - p_entry->p_source->i_start );
 
     p_entry->p_source->regions = p_entry->p_subpic->regions;
 
     subpicture_updater_t *updater = &p_entry->p_source->updater;
-    updater->ops->update( p_entry->p_source,
-                          prev_src, p_fmt_src,
-                          prev_dst, p_fmt_dst, i_new_ts );
+    updater->ops->update( p_entry->p_source, &new_cfg );
 
     p_entry->p_subpic->regions = p_entry->p_source->regions;
 
-    SubpicLocalUpdate( p_subpic, i_ts );
+    SubpicLocalUpdate( p_subpic, cfg->pts );
 }
 
 /*****************************************************************************
@@ -1051,7 +1052,7 @@
     {
         if( p_region )
         {
-            p_region->b_absolute = false;
+            p_region->b_absolute = false; p_region->b_in_window = false;
             p_region->i_x = 0;
             p_region->i_y = 10;
             p_region->i_align = ( p_region->i_align & ( ~SUBPICTURE_ALIGN_MASK ) )
@@ -1064,7 +1065,8 @@
     {
         if( p_region )
         {
-            p_region->b_absolute = true;
+            p_region->b_absolute = p_entry->b_last_region_absolute;
+            p_region->b_in_window = p_entry->b_last_region_in_window;
             p_region->i_x = p_entry->i_last_region_x;
             p_region->i_y = p_entry->i_last_region_y;
             p_region->i_align = p_entry->i_last_region_align;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_extractor/archive.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_extractor/archive.c Changed

@@ -81,6 +81,9 @@
 
     libarchive_callback_t** pp_callback_data;
     size_t i_callback_data;
+
+    const uint8_t *last_arcbuf;
+    size_t last_arcsize;
 };
 
 struct libarchive_callback_t {
@@ -187,8 +190,8 @@
     stream_t*  p_source = p_cb->p_source;
     private_sys_t* p_sys = p_cb->p_sys;
 
-    ssize_t i_ret = vlc_stream_Read( p_source, &p_sys->buffer,
-      sizeof( p_sys->buffer ) );
+    ssize_t i_ret = vlc_stream_Read( p_source, p_sys->buffer,
+                                     sizeof( p_sys->buffer ) );
 
     if( i_ret < 0 )
     {
@@ -399,6 +402,8 @@
     p_sys->i_offset = 0;
     p_sys->b_eof = false;
     p_sys->b_dead = false;
+    p_sys->last_arcbuf = NULL;
+    p_sys->last_arcsize = 0;
     return VLC_SUCCESS;
 }
 
@@ -424,6 +429,8 @@
 
     p_sys->source = source;
     p_sys->p_obj = obj;
+    p_sys->last_arcbuf = NULL;
+    p_sys->last_arcsize = 0;
 
     return p_sys;
 
@@ -530,6 +537,7 @@
     vlc_readdir_helper_init( &rdh, p_directory, p_node);
     struct archive_entry* entry;
     int archive_status;
+    unsigned item_count = 0;
 
     while( !( archive_status = archive_read_next_header( p_arc, &entry ) ) )
     {
@@ -564,6 +572,7 @@
             int64_t size = archive_entry_size( entry );
             if( size >= 0 )
                 input_item_AddStat( p_item, "size", size );
+            item_count++;
         }
         free( mrl );
 
@@ -571,14 +580,14 @@
             break;
     }
 
-    vlc_readdir_helper_finish( &rdh, archive_status == ARCHIVE_EOF );
-    return archive_status == ARCHIVE_EOF ? VLC_SUCCESS : VLC_EGENERIC;
+    bool success = item_count > 0 || archive_status == ARCHIVE_EOF;
+
+    vlc_readdir_helper_finish( &rdh, success );
+    return success ? VLC_SUCCESS : VLC_EGENERIC;
 }
 
 static ssize_t Read( stream_extractor_t *p_extractor, void* p_data, size_t i_size )
 {
-    char dummy_buffer 8192 ;
-
     private_sys_t* p_sys = p_extractor->p_sys;
     libarchive_t* p_arc = p_sys->p_archive;
     ssize_t       i_ret;
@@ -589,12 +598,39 @@
     if( p_sys->b_eof )
         return 0;
 
-    i_ret = archive_read_data( p_arc,
-      p_data ? p_data :                        dummy_buffer,
-      p_data ? i_size : __MIN( i_size, sizeof( dummy_buffer ) ) );
+    const void *arcbuf = NULL;
+    size_t arcsize = 0;
+    la_int64_t arcoffset = 0;
+    if( p_sys->last_arcbuf == NULL )
+    {
+        i_ret = archive_read_data_block( p_arc, &arcbuf, &arcsize, &arcoffset);
+        assert(arcoffset == (la_int64_t) p_sys->i_offset); (void)arcoffset;
+    }
+    else
+    {
+        i_ret = ARCHIVE_OK;
+        arcbuf = p_sys->last_arcbuf;
+        arcsize = p_sys->last_arcsize;
+    }
 
     switch( i_ret )
     {
+        case ARCHIVE_OK:
+        case ARCHIVE_EOF:
+            if( i_size >= arcsize )
+            {
+                i_size = arcsize;
+                p_sys->last_arcbuf = NULL;
+                p_sys->last_arcsize = 0;
+            }
+            else
+            {
+                p_sys->last_arcbuf = (uint8_t *)arcbuf + i_size;
+                p_sys->last_arcsize = arcsize - i_size;
+            }
+            if( p_data != NULL)
+                memcpy( p_data, arcbuf, i_size );
+            break;
         case ARCHIVE_RETRY:
         case ARCHIVE_FAILED:
             msg_Dbg( p_extractor, "libarchive: %s", archive_error_string( p_arc ) );
@@ -609,8 +645,8 @@
             goto fatal_error;
     }
 
-    p_sys->i_offset += i_ret;
-    return i_ret;
+    p_sys->i_offset += i_size;
+    return i_size;
 
 fatal_error:
     p_sys->b_dead = true;
@@ -650,6 +686,7 @@
     }
 
     p_sys->b_eof = false;
+    int ret = VLC_SUCCESS;
 
     if( !p_sys->b_seekable_archive || p_sys->b_dead
       || archive_seek_data( p_sys->p_archive, i_req, SEEK_SET ) < 0 )
@@ -660,29 +697,47 @@
 
         uint64_t i_skip = i_req - p_sys->i_offset;
 
-        /* RECREATE LIBARCHIVE HANDLE IF WE ARE SEEKING BACKWARDS */
 
-        if( i_req < p_sys->i_offset )
+        /* The 1st try is the original skip.
+         * The 2nd try is to go back to the previous position in case of
+         * failure. */
+        uint64_t preskip_offset = p_sys->i_offset;
+        for (unsigned i = 0; i < 2; ++i)
         {
-            if( archive_extractor_reset( p_extractor ) )
+            if( i_req < p_sys->i_offset )
             {
-                msg_Err( p_extractor, "unable to reset libarchive handle" );
-                return VLC_EGENERIC;
+                /* RECREATE LIBARCHIVE HANDLE IF WE ARE SEEKING BACKWARDS */
+                if( archive_extractor_reset( p_extractor ) )
+                {
+                    msg_Err( p_extractor, "unable to reset libarchive handle" );
+                    return VLC_EGENERIC;
+                }
+
+                i_skip = i_req;
             }
 
-            i_skip = i_req;
-        }
-        if( archive_skip_decompressed( p_extractor, &i_skip ) )
-        {
-            msg_Warn( p_extractor, "failed to skip to seek position %" PRIu64 "/%" PRId64,
-                      i_req, archive_entry_size( p_sys->p_entry ) );
-            p_sys->i_offset += i_skip;
-            return VLC_EGENERIC;
+            if( archive_skip_decompressed( p_extractor, &i_skip ) == 0 )
+                break; /* Success */
+            msg_Warn( p_extractor, "failed to skip to seek position %"
+                      PRIu64 "/%" PRId64, i_req,
+                      archive_entry_size( p_sys->p_entry ) );
+            ret = VLC_EGENERIC;
+
+            /* Seek back to the original offset before failure */
+            i_req = preskip_offset;
+            if( i_req == p_sys->i_offset )
+                break; /* no data was skipped, no need for a 2nd try */
+            assert( i_req < p_sys->i_offset );
         }
     }
+    else
+    {
+        p_sys->last_arcbuf = NULL;
+        p_sys->last_arcsize = 0;
+    }
 
     p_sys->i_offset = i_req;
-    return VLC_SUCCESS;
+    return ret;
 }

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_extractor/meson.build Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_filter/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_filter/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/chromecast/chromecast_demux.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/chromecast/chromecast_demux.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/chromecast/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/chromecast/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/hls/codecs.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/hls/codecs.c Changed

@@ -25,7 +25,7 @@
 
 #include <vlc_memstream.h>
 
-#include "../../codec/hxxx_helper.h"
+#include "../../packetizer/h264_nal.h"
 #include "../../packetizer/hevc_nal.h"
 #include "../../packetizer/hxxx_ep3b.h"
 #include "../../packetizer/hxxx_nal.h"
@@ -34,17 +34,29 @@
 static int FormatAVC(struct vlc_memstream *ms, const es_format_t *fmt)
 {
     /* Parse the h264 constraint flag. */
-    uint8_t constraints = 0;
-    uint8_t profile = 0;
-    uint8_t level = 0;
-    struct hxxx_helper hh;
-    hxxx_helper_init(&hh, NULL, fmt->i_codec, 0, 0);
-    if (hxxx_helper_set_extra(&hh, fmt->p_extra, fmt->i_extra) == VLC_SUCCESS)
+    hxxx_iterator_ctx_t it;
+    hxxx_iterator_init(&it, fmt->p_extra, fmt->i_extra, 0);
+    const uint8_t *nal = NULL;
+    size_t nal_size;
+    if (hxxx_annexb_iterate_next(&it, &nal, &nal_size))
     {
-        h264_helper_get_constraint_flag(&hh, &constraints);
-        hxxx_helper_get_current_profile_level(&hh, &profile, &level);
+        switch (h264_getNALType(nal))
+        {
+        case H264_NAL_SPS:
+            break;
+        default:
+            nal = NULL;
+            break;
+        }
     }
-    hxxx_helper_clean(&hh);
+
+    /* NAL units aren't provisioned. Codec description will be minimal. */
+    if (unlikely(nal == NULL || nal_size<4))
+        return VLC_SUCCESS;
+
+    uint8_t profile = nal1;
+    uint8_t constraints = nal2;
+    uint8_t level = nal3;
 
     const int written = vlc_memstream_printf(
         ms, "avc1.%02X%02X%02X", profile, constraints, level);

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/hls/meson.build Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/meson.build Changed

@@ -135,8 +135,7 @@
         'rtcp.c',
         'rtsp.c',
     ),
-    'dependencies' : socket_libs
-    # TODO: Add optional GCrypt dependency
+    'dependencies' : socket_libs, srtp_dep
 }
 
 # Chromaprint module
@@ -148,5 +147,38 @@
     'enabled' : libchromaprint_dep.found(),
 }
 
+
+vlc_modules += {
+    'name' : 'stream_out_sdi',
+    'sources' : files(
+        'sdi/sdiout.cpp',
+        'sdi/sdiout.hpp',
+        'sdi/Ancillary.cpp',
+        'sdi/Ancillary.hpp',
+        'sdi/AES3Audio.cpp',
+        'sdi/AES3Audio.hpp',
+        'sdi/DBMHelper.cpp',
+        'sdi/DBMHelper.hpp',
+        'sdi/DBMSDIOutput.cpp',
+        'sdi/DBMSDIOutput.hpp',
+        'sdi/SDIAudioMultiplex.cpp',
+        'sdi/SDIAudioMultiplex.hpp',
+        'sdi/SDIGenerator.cpp',
+        'sdi/SDIGenerator.hpp',
+        'sdi/SDIOutput.cpp',
+        'sdi/SDIOutput.hpp',
+        'sdi/SDIStream.cpp',
+        'sdi/SDIStream.hpp',
+        'sdi/V210.cpp',
+        'sdi/V210.hpp'
+    ),
+    'dependencies' : dl_lib, decklink_dep,
+    'cpp_args' : decklink_cpp_args,
+    'enabled' : decklink_dep.found(),
+}
+
 # Chromecast module
 subdir('chromecast')
+
+# HLS module
+subdir('hls')

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/rtp.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/rtp.c Changed

@@ -733,7 +733,7 @@
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
     struct vlc_memstream sdp;
-    struct sockaddr_storage dst;
+    vlc_sockaddr dst;
     char *psz_sdp = NULL;
     socklen_t dstlen;
     int i;
@@ -763,13 +763,11 @@
         inclport = true;
 
         /* Oh boy, this is really ugly! */
-        dstlen = sizeof( dst );
+        dstlen = sizeof( dst.ss );
         if( p_sys->es0->listen.fd != NULL )
-            getsockname( p_sys->es0->listen.fd0,
-                         (struct sockaddr *)&dst, &dstlen );
+            getsockname( p_sys->es0->listen.fd0, &dst.sa, &dstlen );
         else
-            getpeername( p_sys->es0->sinkv0.rtp_fd,
-                         (struct sockaddr *)&dst, &dstlen );
+            getpeername( p_sys->es0->sinkv0.rtp_fd, &dst.sa, &dstlen );
     }
     else
     {
@@ -783,14 +781,14 @@
         dstlen = ipv6 ? sizeof( struct sockaddr_in6 )
                       : sizeof( struct sockaddr_in );
         memset (&dst, 0, dstlen);
-        dst.ss_family = ipv6 ? AF_INET6 : AF_INET;
+        dst.ss.ss_family = ipv6 ? AF_INET6 : AF_INET;
 #ifdef HAVE_SA_LEN
-        dst.ss_len = dstlen;
+        dst.ss.ss_len = dstlen;
 #endif
     }
 
     if( vlc_sdp_Start( &sdp, VLC_OBJECT( p_stream ), SOUT_CFG_PREFIX,
-                       NULL, 0, (struct sockaddr *)&dst, dstlen ) )
+                       NULL, 0, &dst.sa, dstlen ) )
         goto out;
 
     /* TODO: a=source-filter */
@@ -1223,8 +1221,15 @@
             id->b_first_packet = false;
             if (!strcmp(id->rtp_fmt.ptname, "vorbis") ||
                 !strcmp(id->rtp_fmt.ptname, "theora"))
-                rtp_packetize_xiph_config(id, id->rtp_fmt.fmtp,
-                                          p_buffer->i_pts);
+            {
+                int ret = rtp_packetize_xiph_config(id, id->rtp_fmt.fmtp, p_buffer->i_pts);
+                if (ret)
+                {
+                    /* Since we're returning early, this module owns the remaining blocks */
+                    block_ChainRelease(p_buffer);
+                    return ret;
+                }
+            }
         }
 
         if( id->rtp_fmt.pf_packetize( id, p_buffer ) )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/rtpfmt.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/rtpfmt.c Changed

@@ -75,9 +75,9 @@
                                  uint8_t **p_buffer, size_t *i_buffer,
                                  uint8_t *theora_pixel_fmt)
 {
-    unsigned packet_sizeXIPH_MAX_HEADER_COUNT;
+    size_t packet_sizeXIPH_MAX_HEADER_COUNT;
     const void *packetXIPH_MAX_HEADER_COUNT;
-    unsigned packet_count;
+    size_t packet_count;
 
     if (xiph_SplitHeaders(packet_size, packet, &packet_count,
                                 i_extra, p_extra))
@@ -725,8 +725,8 @@
     size_t len = end - start;
 
     char *b64 = malloc(len + 1);
-    if(!b64)
-        return VLC_EGENERIC;
+    if (unlikely(b64 == NULL))
+        return VLC_ENOMEM;
 
     memcpy(b64, start, len);
     b64len = '\0';
@@ -752,6 +752,11 @@
     {
         int           i_payload = __MIN( i_max, i_data );
         block_t *out = block_Alloc( 18 + i_payload );
+        if (unlikely(out == NULL))
+        {
+            free(p_orig);
+            return VLC_ENOMEM;
+        }
 
         unsigned fragtype, numpkts;
         if (i_count == 1)
@@ -806,6 +811,11 @@
     {
         int           i_payload = __MIN( i_max, i_data );
         block_t *out = block_Alloc( 18 + i_payload );
+        if (unlikely(out == NULL))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
 
         unsigned fragtype, numpkts;
         if (i_count == 1)
@@ -862,6 +872,11 @@
     {
         int           i_payload = __MIN( i_max, i_data );
         block_t *out = block_Alloc( 16 + i_payload );
+        if (unlikely(out == NULL))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
 
         /* rtp common header */
         rtp_packetize_common( id, out, (i == i_count - 1)?1:0, in->i_pts );
@@ -940,6 +955,12 @@
     {
         int           i_payload = __MIN( i_max, i_data );
         block_t *out = block_Alloc( 16 + i_payload );
+        if (unlikely(out == NULL))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
+
         /* MBZ:5 T:1 TR:10 AN:1 N:1 S:1 B:1 E:1 P:3 FBV:1 BFC:3 FFV:1 FFC:3 */
         uint32_t      h = ( i_temporal_ref << 16 )|
                           ( b_sequence_start << 13 )|
@@ -992,6 +1013,11 @@
     {
         int           i_payload = __MIN( i_max, i_data );
         block_t *out = block_Alloc( 14 + i_payload );
+        if (unlikely(out == NULL))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
 
         /* rtp common header */
         rtp_packetize_common( id, out, (i == i_count - 1)?1:0, in->i_pts );
@@ -1023,6 +1049,11 @@
         bool last = i == (frag_count - 1);
         size_t len = last ? in->i_buffer : mtu;
         block_t *out = block_Alloc(14 + len);
+        if (unlikely(out == NULL))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
 
         rtp_packetize_common(id, out, false, in->i_pts);
         out->p_buffer12 = frame_type;
@@ -1065,6 +1096,11 @@
     {
         int           i_payload = __MIN( i_max, i_data );
         block_t *out = block_Alloc( 12 + i_payload );
+        if (unlikely(out == NULL))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
 
         /* rtp common header */
         rtp_packetize_common( id, out, (i == i_count - 1),
@@ -1166,6 +1202,11 @@
         if( i != 0 )
             latmhdrsize = 0;
         out = block_Alloc( 12 + latmhdrsize + i_payload );
+        if (unlikely(out == NULL))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
 
         /* rtp common header */
         rtp_packetize_common( id, out, ((i == i_count - 1) ? 1 : 0),
@@ -1275,6 +1316,11 @@
     {
         int      i_payload = __MIN( i_max, i_data );
         block_t *out = block_Alloc( RTP_H263_PAYLOAD_START + i_payload );
+        if (unlikely(out == NULL))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
         b_p_bit = (i == 0) ? 1 : 0;
         h = ( b_p_bit << 10 )|
             ( b_v_bit << 9  )|
@@ -1324,6 +1370,10 @@
     {
         /* Single NAL unit packet */
         block_t *out = block_Alloc( 12 + i_data );
+        if (unlikely(out == NULL))
+        {
+            return VLC_ENOMEM;
+        }
         out->i_dts    = i_dts;
         out->i_length = i_length;
 
@@ -1347,6 +1397,10 @@
         {
             const int i_payload = __MIN( i_data, i_max-2 );
             block_t *out = block_Alloc( 12 + 2 + i_payload );
+            if (unlikely(out == NULL))
+            {
+                return VLC_ENOMEM;
+            }
             out->i_dts    = i_dts + i * i_length / i_count;
             out->i_length = i_length / i_count;
 
@@ -1378,9 +1432,13 @@
     while( hxxx_annexb_iterate_next( &it, &p_nal, &i_nal ) )
     {
         /* TODO add STAP-A to remove a lot of overhead with small slice/sei/... */
-        rtp_packetize_h264_nal( id, p_nal, i_nal,
+        if (rtp_packetize_h264_nal( id, p_nal, i_nal,
                 (in->i_pts != VLC_TICK_INVALID ? in->i_pts : in->i_dts), in->i_dts,
-                it.p_head + 3 >= it.p_tail, in->i_length * i_nal / in->i_buffer );
+                it.p_head + 3 >= it.p_tail, in->i_length * i_nal / in->i_buffer ))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
     }
 
     block_Release(in);
@@ -1403,6 +1461,10 @@
     {
         /* Single NAL unit packet */
         block_t *out = block_Alloc( 12 + i_data );
+        if (unlikely(out == NULL))
+        {
+            return VLC_ENOMEM;
+        }
         out->i_dts    = i_dts;
         out->i_length = i_length;
 
@@ -1428,6 +1490,10 @@
         {
             const size_t i_payload = __MIN( i_data, i_max-3 );
             block_t *out = block_Alloc( 12 + 3 + i_payload );
+            if (unlikely(out == NULL))
+            {
+                return VLC_ENOMEM;
+            }
             out->i_dts    = i_dts + i * i_length / i_count;
             out->i_length = i_length / i_count;
 
@@ -1459,9 +1525,13 @@
     size_t i_nal;
     while( hxxx_annexb_iterate_next( &it, &p_nal, &i_nal ) )
     {
-        rtp_packetize_h265_nal( id, p_nal, i_nal,
+        if (rtp_packetize_h265_nal( id, p_nal, i_nal,
                 (in->i_pts != VLC_TICK_INVALID ? in->i_pts : in->i_dts), in->i_dts,
-                it.p_head + 3 >= it.p_tail, in->i_length * i_nal / in->i_buffer );
+                it.p_head + 3 >= it.p_tail, in->i_length * i_nal / in->i_buffer ))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
     }
 
     block_Release(in);
@@ -1482,6 +1552,11 @@
     {
         int           i_payload = __MIN( i_max, i_data );
         block_t *out = block_Alloc( 14 + i_payload );
+        if (unlikely(out == NULL))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
 
         /* rtp common header */
         rtp_packetize_common( id, out, ((i == i_count - 1)?1:0),
@@ -1592,6 +1667,11 @@
       Allow for 12 extra bytes of RTP header.
     */
     p_out = block_Alloc( 12 + i_payload_size );
+    if (unlikely(p_out == NULL))
+    {
+        block_Release(in);
+        return VLC_ENOMEM;
+    }
 
     if ( i_payload_padding )
     {
@@ -1648,6 +1728,11 @@
     {
         int           i_payload = __MIN( i_max, i_data );
         block_t *out = block_Alloc( 12 + i_payload );
+        if (unlikely(out == NULL))
+        {
+            block_Release(in);
+            return VLC_ENOMEM;
+        }
 
         /* rtp common header */
         rtp_packetize_common( id, out, 0,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/sdi/DBMHelper.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/sdi/DBMHelper.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/sdi/DBMHelper.hpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/sdi/DBMHelper.hpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/sdi/DBMSDIOutput.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/sdi/DBMSDIOutput.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/transcode/spu.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/transcode/spu.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/stream_out/udp.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/stream_out/udp.c Changed

@@ -83,31 +83,27 @@
 
 static session_descriptor_t *CreateSDP(vlc_object_t *obj, int fd)
 {
-    union {
-        struct sockaddr addr;
-        struct sockaddr_in in;
-        struct sockaddr_in6 in6;
-    } src, dst;
-    socklen_t srclen = sizeof (srclen), dstlen = sizeof (dst);
+    vlc_sockaddr src, dst;
+    socklen_t srclen = sizeof (src), dstlen = sizeof (dst);
     char dhostINET6_ADDRSTRLEN;
     unsigned short dport;
 
-    if (getsockname(fd, &src.addr, &srclen)
-     || getpeername(fd, &dst.addr, &dstlen)) {
+    if (getsockname(fd, &src.sa, &srclen)
+     || getpeername(fd, &dst.sa, &dstlen)) {
         int val = errno;
 
         msg_Err(obj, "cannot format SDP: %s", vlc_strerror_c(val));
         return NULL;
     }
 
-    switch (dst.addr.sa_family) {
+    switch (dst.sa.sa_family) {
         case AF_INET:
-            inet_ntop(AF_INET, &dst.in.sin_addr, dhost, sizeof (dhost));
-            dport = dst.in.sin_port;
+            inet_ntop(AF_INET, &dst.sin.sin_addr, dhost, sizeof (dhost));
+            dport = dst.sin.sin_port;
             break;
         case AF_INET6:
-            inet_ntop(AF_INET6, &dst.in6.sin6_addr, dhost, sizeof (dhost));
-            dport = dst.in6.sin6_port;
+            inet_ntop(AF_INET6, &dst.sin6.sin6_addr, dhost, sizeof (dhost));
+            dport = dst.sin6.sin6_port;
             break;
         default:
             return NULL;
@@ -116,7 +112,7 @@
     struct vlc_memstream sdp;
 
     if (vlc_sdp_Start(&sdp, obj, SOUT_CFG_PREFIX,
-                      &src.addr, srclen, &dst.addr, dstlen))
+                      &src.sa, srclen, &dst.sa, dstlen))
         return NULL;
 
     vlc_memstream_printf(&sdp, "m=video %d udp mpeg\r\n", ntohs(dport));

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/text_renderer/freetype/freetype.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/text_renderer/freetype/freetype.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/text_renderer/freetype/platform_fonts.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/text_renderer/freetype/platform_fonts.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/text_renderer/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/text_renderer/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/text_renderer/sapi.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/text_renderer/sapi.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/text_renderer/svg.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/text_renderer/svg.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/chain.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/chain.c Changed

@@ -33,6 +33,7 @@
 #include <vlc_filter.h>
 #include <vlc_mouse.h>
 #include <vlc_picture.h>
+#include <vlc_chroma_probe.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -66,75 +67,6 @@
                                const es_format_t *p_base,
                                const es_format_t *p_size );
 
-#define ALLOWED_CHROMAS_YUV10 \
-    VLC_CODEC_I420_10L, \
-    VLC_CODEC_I420_10B, \
-    VLC_CODEC_I420_16L \
-
-static const vlc_fourcc_t pi_allowed_chromas_yuv = {
-    VLC_CODEC_I420,
-    VLC_CODEC_I422,
-    ALLOWED_CHROMAS_YUV10,
-    VLC_CODEC_XRGB,
-    VLC_CODEC_BGRX,
-    VLC_CODEC_RGB24,
-    VLC_CODEC_BGR24,
-    VLC_CODEC_BGRA,
-    0
-};
-
-static const vlc_fourcc_t pi_allowed_chromas_yuv10 = {
-    ALLOWED_CHROMAS_YUV10,
-    VLC_CODEC_I420,
-    VLC_CODEC_I422,
-    VLC_CODEC_XRGB,
-    VLC_CODEC_BGRX,
-    VLC_CODEC_RGB24,
-    VLC_CODEC_BGR24,
-    VLC_CODEC_BGRA,
-    0
-};
-
-static const vlc_fourcc_t pi_allowed_chromas_yuv444 = {
-    VLC_CODEC_RGBA,
-    VLC_CODEC_BGRA,
-    VLC_CODEC_I422,
-    VLC_CODEC_I420,
-    0
-};
-
-static const vlc_fourcc_t pi_allowed_chromas_yuv444_10 = {
-    VLC_CODEC_RGBA10LE,
-    VLC_CODEC_RGBA64,
-    ALLOWED_CHROMAS_YUV10,
-    VLC_CODEC_I422,
-    VLC_CODEC_I420,
-    0
-};
-
-static const vlc_fourcc_t *get_allowed_chromas( filter_t *p_filter )
-{
-    switch (p_filter->fmt_out.video.i_chroma)
-    {
-        case VLC_CODEC_I420_10L:
-        case VLC_CODEC_I420_10B:
-        case VLC_CODEC_I420_16L:
-        case VLC_CODEC_CVPX_P010:
-        case VLC_CODEC_D3D9_OPAQUE_10B:
-        case VLC_CODEC_D3D11_OPAQUE_10B:
-        case VLC_CODEC_VAAPI_420_10BPP:
-            return pi_allowed_chromas_yuv10;
-        case VLC_CODEC_I444:
-            return pi_allowed_chromas_yuv444;
-        case VLC_CODEC_I444_10L:
-        case VLC_CODEC_I444_12L:
-        case VLC_CODEC_I444_16L:
-            return pi_allowed_chromas_yuv444_10;
-        default:
-            return pi_allowed_chromas_yuv;
-    }
-}
-
 typedef struct
 {
     filter_chain_t *p_chain;
@@ -207,21 +139,7 @@
         return VLC_EGENERIC;
     }
 
-    int type = VLC_VAR_INTEGER;
-    if( var_Type( vlc_object_parent(p_filter), "chain-level" ) != 0 )
-        type |= VLC_VAR_DOINHERIT;
-
-    var_Create( p_filter, "chain-level", type );
-    /* Note: atomicity is not actually needed here. */
-    var_IncInteger( p_filter, "chain-level" );
-
-    int level = var_GetInteger( p_filter, "chain-level" );
-    if( level < 0 || level > CHAIN_LEVEL_MAX )
-        msg_Err( p_filter, "Too high level of recursion (%d)", level );
-    else
-        i_ret = pf_build( p_filter );
-
-    var_Destroy( p_filter, "chain-level" );
+    i_ret = pf_build( p_filter );
 
     if( i_ret )
     {
@@ -258,9 +176,16 @@
     if( !b_chroma && !b_chroma_resize && !b_transform)
         return VLC_EGENERIC;
 
-    return Activate( p_filter, b_transform ? BuildTransformChain :
-                               b_chroma_resize ? BuildChromaResize :
-                               BuildChromaChain );
+    if( var_Type( vlc_object_parent(p_filter), "chain-level" ) != 0 )
+        return VLC_EGENERIC;
+    var_Create( p_filter, "chain-level", VLC_VAR_INTEGER );
+
+    int ret = Activate( p_filter, b_transform ? BuildTransformChain :
+                        b_chroma_resize ? BuildChromaResize :
+                        BuildChromaChain );
+
+    var_Destroy( p_filter, "chain-level" );
+    return ret;
 }
 
 static int ActivateFilter( filter_t *p_filter )
@@ -268,14 +193,14 @@
     if( !p_filter->b_allow_fmt_out_change || p_filter->psz_name == NULL )
         return VLC_EGENERIC;
 
-    if( var_Type( vlc_object_parent(p_filter), "chain-filter-level" ) != 0 )
+    if( var_Type( vlc_object_parent(p_filter), "chain-level" ) != 0 )
         return VLC_EGENERIC;
+    var_Create( p_filter, "chain-level", VLC_VAR_INTEGER );
 
-    var_Create( p_filter, "chain-filter-level", VLC_VAR_INTEGER );
-    int i_ret = Activate( p_filter, BuildFilterChain );
-    var_Destroy( p_filter, "chain-filter-level" );
+    int ret = Activate( p_filter, BuildFilterChain );
 
-    return i_ret;
+    var_Destroy( p_filter, "chain-level" );
+    return ret;
 }
 
 static void Destroy( filter_t *p_filter )
@@ -356,33 +281,66 @@
     return VLC_EGENERIC;
 }
 
-static int BuildChromaChain( filter_t *p_filter )
+static int AppendChromaChain( filter_t *p_filter, const vlc_fourcc_t *chromas,
+                              size_t chroma_count )
 {
+    filter_sys_t *p_sys = p_filter->p_sys;
     es_format_t fmt_mid;
-    int i_ret = VLC_EGENERIC;
 
-    /* Now try chroma format list */
-    const vlc_fourcc_t *pi_allowed_chromas = get_allowed_chromas( p_filter );
-    for( int i = 0; pi_allowed_chromasi; i++ )
+    for( size_t i = 0; i < chroma_count; ++i )
     {
-        const vlc_fourcc_t i_chroma = pi_allowed_chromasi;
-        if( i_chroma == p_filter->fmt_in.i_codec ||
-            i_chroma == p_filter->fmt_out.i_codec )
-            continue;
-
-        msg_Dbg( p_filter, "Trying to use chroma %4.4s as middle man",
-                 (char*)&i_chroma );
-
         es_format_Copy( &fmt_mid, &p_filter->fmt_in );
-        fmt_mid.i_codec        =
-        fmt_mid.video.i_chroma = i_chroma;
+        fmt_mid.i_codec = fmt_mid.video.i_chroma = chromasi;
 
-        i_ret = CreateChain( p_filter, &fmt_mid );
+        int i_ret = filter_chain_AppendConverter( p_sys->p_chain, &fmt_mid );
         es_format_Clean( &fmt_mid );
+        if ( i_ret != VLC_SUCCESS )
+            return i_ret;
+    }
+
+    return VLC_SUCCESS;
+}
+
+static int BuildChromaChain( filter_t *p_filter )
+{
+    filter_sys_t *p_sys = p_filter->p_sys;
+    int i_ret = VLC_EGENERIC;
 
+    size_t res_count;
+    struct vlc_chroma_conv_result *results =
+        vlc_chroma_conv_Probe( p_filter->fmt_in.video.i_chroma,
+                               p_filter->fmt_out.video.i_chroma,
+                               p_filter->fmt_in.video.i_width,
+                               p_filter->fmt_in.video.i_height, 1,
+                               0, &res_count );
+    if( results == NULL )
+        return i_ret;
+
+    /* Now try chroma format list */
+    for( size_t i = 0; i < res_count; ++i )
+    {
+        const struct vlc_chroma_conv_result *res = &resultsi;
+        char *res_str = vlc_chroma_conv_result_ToString( res );
+        if( res_str == NULL )
+        {
+            i_ret = VLC_ENOMEM;
+            break;
+        }
+        msg_Info( p_filter, "Trying to use chroma_chain: %s...", res_str);
+        free(res_str);
+
+        filter_chain_Reset( p_sys->p_chain, &p_filter->fmt_in, p_filter->vctx_in,
+                            &p_filter->fmt_out );
+
+        i_ret = AppendChromaChain( p_filter, &res->chain1, res->chain_count - 1);
         if( i_ret == VLC_SUCCESS )
+        {
+            p_filter->vctx_out = filter_chain_GetVideoCtxOut( p_sys->p_chain );
+            msg_Info( p_filter, "success");
             break;
+        }
     }
+    free( results );
 
     return i_ret;
 }
@@ -394,54 +352,91 @@
     return filter_chain_MouseFilter( p_sys->p_chain, p_mouse, p_old );
 }
 
+static bool
+CheckFilterChroma( filter_t *p_filter, vlc_fourcc_t chroma, const char *name )
+{
+    filter_t *test = vlc_object_create( p_filter, sizeof(filter_t) );
+    if (test == NULL)
+        return false;
+
+    es_format_t fmt = p_filter->fmt_out;
+    fmt.i_codec = fmt.video.i_chroma = chroma;
+    test->fmt_in = fmt;
+    test->fmt_out = fmt;
+
+    test->p_module = vlc_filter_LoadModule( test, "video filter", name, true );
+    bool success = test->p_module != NULL;
+    vlc_filter_Delete( test );
+    return success;
+}
+
 static int BuildFilterChain( filter_t *p_filter )
 {
-    es_format_t fmt_mid;
-    es_format_Init(&fmt_mid, p_filter->fmt_in.i_cat, p_filter->fmt_in.i_codec);
+    filter_sys_t *p_sys = p_filter->p_sys;
     int i_ret = VLC_EGENERIC;
 
-    filter_sys_t *p_sys = p_filter->p_sys;
+    assert( p_filter->b_allow_fmt_out_change );
 
-    /* Now try chroma format list */
-    const vlc_fourcc_t *pi_allowed_chromas = get_allowed_chromas( p_filter );
-    for( int i = 0; pi_allowed_chromasi; i++ )
-    {
-        filter_chain_Reset( p_sys->p_chain, &p_filter->fmt_in, p_filter->vctx_in, &p_filter->fmt_out );
+    /* Search for in -> x conversion */
+    size_t res_count;
+    struct vlc_chroma_conv_result *results =
+        vlc_chroma_conv_Probe( p_filter->fmt_in.video.i_chroma, 0,
+                               p_filter->fmt_in.video.i_width,
+                               p_filter->fmt_in.video.i_height, 1,
+                               0, &res_count );
+    if( results == NULL )
+        return i_ret;
 
-        const vlc_fourcc_t i_chroma = pi_allowed_chromasi;
-        if( i_chroma == p_filter->fmt_in.i_codec ||
-            i_chroma == p_filter->fmt_out.i_codec )
+    for( size_t i = 0; i < res_count; ++i )
+    {
+        const struct vlc_chroma_conv_result *res = &resultsi;
+        assert(res->chain_count >= 2);
+
+        /* Check first if the filter could accept the new output format. This
+         * might be faster to fail now than failing after creating the whole
+         * chroma chain */
+        if( !CheckFilterChroma( p_filter, res->chainres->chain_count - 1,
+                                p_filter->psz_name ) )
             continue;
 
-        msg_Dbg( p_filter, "Trying to use chroma %4.4s as middle man in chain (%p)",
-                 (char*)&i_chroma, (void*)p_sys->p_chain );
+        char *res_str = vlc_chroma_conv_result_ToString( res );
+        if( res_str == NULL )
+        {
+            i_ret = VLC_ENOMEM;
+            break;
+        }
 
-        es_format_Clean( &fmt_mid );
-        es_format_Copy( &fmt_mid, &p_filter->fmt_in );
-        fmt_mid.i_codec        =
-        fmt_mid.video.i_chroma = i_chroma;
+        msg_Info( p_filter, "Trying to use chain: %s -> %s",
+                  res_str, p_filter->psz_name );
 
-        if( filter_chain_AppendConverter( p_sys->p_chain,
-                                          &fmt_mid ) != VLC_SUCCESS )
+        free( res_str );
+
+        filter_chain_Reset( p_sys->p_chain, &p_filter->fmt_in, p_filter->vctx_in,
+                            &p_filter->fmt_out );
+
+        i_ret = AppendChromaChain( p_filter, &res->chain1,
+                                   res->chain_count - 1 );
+        if( i_ret != VLC_SUCCESS )
             continue;
 
         p_sys->p_video_filter =
             filter_chain_AppendFilter( p_sys->p_chain,
                                        p_filter->psz_name, p_filter->p_cfg,
-                                       &fmt_mid );
+                                       filter_chain_GetFmtOut( p_sys->p_chain ) );
         if( p_sys->p_video_filter == NULL)
+        {
+            i_ret = VLC_EGENERIC;
             continue;
+        }
 
         filter_AddProxyCallbacks( p_filter,
                                   p_sys->p_video_filter,
                                   RestartFilterCallback );
 
-        i_ret = VLC_SUCCESS;
         p_filter->vctx_out = filter_chain_GetVideoCtxOut( p_sys->p_chain );
         break;
     }
-
-    es_format_Clean( &fmt_mid );
+    free( results );
 
     if( i_ret != VLC_SUCCESS )
         filter_chain_Reset( p_sys->p_chain, &p_filter->fmt_in, p_filter->vctx_in, &p_filter->fmt_out );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/copy.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/copy.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/cvpx.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/cvpx.c Changed

@@ -33,6 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
+#include <vlc_chroma_probe.h>
 #include <vlc_modules.h>
 #include "../codec/vt_utils.h"
 #include "../video_chroma/copy.h"
@@ -64,6 +65,31 @@
     };
 } filter_sys_t;
 
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_BGRA, VLC_CODEC_CVPX_I420, true);
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_BGRA, VLC_CODEC_CVPX_NV12, true);
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_BGRA, VLC_CODEC_CVPX_P010, true);
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_BGRA, VLC_CODEC_CVPX_UYVY, true);
+
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_I420, VLC_CODEC_CVPX_NV12, true);
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_I420, VLC_CODEC_CVPX_P010, true);
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_I420, VLC_CODEC_CVPX_UYVY, true);
+
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_NV12, VLC_CODEC_CVPX_P010, true);
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_NV12, VLC_CODEC_CVPX_UYVY, true);
+
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_P010, VLC_CODEC_CVPX_UYVY, true);
+
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_CVPX_NV12, VLC_CODEC_NV12, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_CVPX_NV12, VLC_CODEC_I420, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_CVPX_P010, VLC_CODEC_P010, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_CVPX_P010, VLC_CODEC_I420_10L, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_CVPX_UYVY, VLC_CODEC_UYVY, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_CVPX_I420, VLC_CODEC_I420, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_CVPX_BGRA, VLC_CODEC_BGRA, true);
+}
+
 vlc_module_begin ()
     set_description("Conversions from/to CoreVideo buffers")
     set_callback_video_converter(Open, 10)
@@ -76,6 +102,8 @@
     set_description("Fast CoreVideo resize+conversion")
     set_callback_video_converter(Open_chain_CVPX, 11)
 #endif
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end ()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/d3d11_fmt.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/d3d11_fmt.cpp Changed

@@ -20,6 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <process.h>
 #include <winapifamily.h>
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 #define BUILD_FOR_UAP 0
@@ -328,7 +329,7 @@
 struct dxgi_debug_handle_t
 {
     HINSTANCE                 dxgidebug_dll;
-    HRESULT (WINAPI * pf_DXGIGetDebugInterface)(const GUID *riid, void **ppDebug);
+    HRESULT (WINAPI * pf_DXGIGetDebugInterface)(REFIID, void **ppDebug);
 
     void Init()
     {
@@ -336,7 +337,7 @@
         pf_DXGIGetDebugInterface = nullptr;
         if (IsDebuggerPresent())
         {
-            dxgidebug_dll = LoadLibrary(TEXT("DXGIDEBUG.DLL"));
+            dxgidebug_dll = LoadLibraryExA("DXGIDEBUG.DLL", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
             if (dxgidebug_dll)
             {
                 pf_DXGIGetDebugInterface =
@@ -361,7 +362,7 @@
         if (pf_DXGIGetDebugInterface)
         {
             IDXGIDebug *pDXGIDebug;
-            if (SUCCEEDED(pf_DXGIGetDebugInterface(&IID_GRAPHICS_PPV_ARGS(&pDXGIDebug))))
+            if (SUCCEEDED(pf_DXGIGetDebugInterface(IID_GRAPHICS_PPV_ARGS(&pDXGIDebug))))
             {
                 pDXGIDebug->ReportLiveObjects(DXGI_DEBUG_ALL, DXGI_DEBUG_RLO_ALL);
                 pDXGIDebug->Release();
@@ -473,7 +474,7 @@
 #if !defined(NDEBUG) && !defined(BUILD_FOR_UAP)
     if (IsDebuggerPresent())
     {
-        HINSTANCE sdklayer_dll = LoadLibraryW(L"d3d11_1sdklayers.dll");
+        HINSTANCE sdklayer_dll = LoadLibraryExA("d3d11_1sdklayers.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
         if (sdklayer_dll) {
             creationFlags |= D3D11_CREATE_DEVICE_DEBUG;
             FreeLibrary(sdklayer_dll);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/d3d9_fmt.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/d3d9_fmt.c Changed

@@ -98,11 +98,6 @@
        IDirect3D9_Release(hd3d->obj);
        hd3d->obj = NULL;
     }
-    if (hd3d->hdll)
-    {
-        FreeLibrary(hd3d->hdll);
-        hd3d->hdll = NULL;
-    }
 }
 
 /**
@@ -110,37 +105,17 @@
  */
 static int D3D9_Create(vlc_object_t *o, d3d9_handle_t *hd3d)
 {
-    hd3d->hdll = LoadLibrary(TEXT("D3D9.DLL"));
-    if (!hd3d->hdll) {
-        msg_Warn(o, "cannot load d3d9.dll, aborting");
-        return VLC_EGENERIC;
-    }
-
-    IDirect3D9 *(WINAPI *OurDirect3DCreate9)(UINT SDKVersion);
-    OurDirect3DCreate9 =
-        (void *)GetProcAddress(hd3d->hdll, "Direct3DCreate9");
-    if (!OurDirect3DCreate9) {
-        msg_Err(o, "Cannot locate reference to Direct3DCreate9 ABI in DLL");
-        goto error;
-    }
-
-    HRESULT (WINAPI *OurDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **ppD3D);
-    OurDirect3DCreate9Ex =
-        (void *)GetProcAddress(hd3d->hdll, "Direct3DCreate9Ex");
-
     /* Create the D3D object. */
     hd3d->use_ex = false;
-    if (OurDirect3DCreate9Ex) {
-        HRESULT hr = OurDirect3DCreate9Ex(D3D_SDK_VERSION, &hd3d->objex);
-        if(!FAILED(hr)) {
-            msg_Dbg(o, "Using Direct3D9 Extended API!");
-            hd3d->use_ex = true;
-        }
+    HRESULT hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &hd3d->objex);
+    if(!FAILED(hr)) {
+        msg_Dbg(o, "Using Direct3D9 Extended API!");
+        hd3d->use_ex = true;
     }
 
     if (!hd3d->obj)
     {
-        hd3d->obj = OurDirect3DCreate9(D3D_SDK_VERSION);
+        hd3d->obj = Direct3DCreate9(D3D_SDK_VERSION);
         if (!hd3d->obj) {
             msg_Err(o, "Could not create Direct3D9 instance.");
             goto error;
@@ -156,7 +131,6 @@
 {
     hd3d->obj = dev;
     IDirect3D9_AddRef( hd3d->obj );
-    hd3d->hdll = NULL;
 
     void *pv = NULL;
     hd3d->use_ex = SUCCEEDED(IDirect3D9_QueryInterface(dev, &IID_IDirect3D9Ex, &pv));

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/d3d9_fmt.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/d3d9_fmt.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/grey_yuv.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/grey_yuv.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/gst_mem.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/gst_mem.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/i420_nv12.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/i420_nv12.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/i420_rgb.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/i420_rgb.c Changed

@@ -34,6 +34,7 @@
 #include <vlc_filter.h>
 #include <vlc_picture.h>
 #include <vlc_cpu.h>
+#include <vlc_chroma_probe.h>
 
 #include "i420_rgb.h"
 #include "../video_filter/filter_picture.h"
@@ -58,6 +59,28 @@
 static int  Activate   ( filter_t * );
 static void Deactivate ( filter_t * );
 
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+#define OUT_CHROMAS_COMMON VLC_CODEC_RGB565, VLC_CODEC_RGB555, VLC_CODEC_XRGB, \
+    VLC_CODEC_RGBX, VLC_CODEC_BGRX, VLC_CODEC_XBGR
+
+#ifndef PLUGIN_PLAIN
+#define OUT_CHROMAS OUT_CHROMAS_COMMON
+#else
+#define OUT_CHROMAS OUT_CHROMAS_COMMON, VLC_CODEC_RGB233, VLC_CODEC_RGB332, \
+    VLC_CODEC_BGR233, VLC_CODEC_BGR565, VLC_CODEC_BGR555
+#endif
+
+#if defined (PLUGIN_SSE2)
+#define COST 0.75
+#else
+#define COST 1
+#endif
+
+    vlc_chroma_conv_add_in_outlist(vec, COST, VLC_CODEC_YV12, OUT_CHROMAS);
+    vlc_chroma_conv_add_in_outlist(vec, COST, VLC_CODEC_I420, OUT_CHROMAS);
+}
+
 vlc_module_begin ()
 #if defined (PLUGIN_SSE2)
     set_description( N_( "SSE2 I420,IYUV,YV12 to "
@@ -70,6 +93,8 @@
     set_callback_video_converter( Activate, 80 )
 # define vlc_CPU_capable() (true)
 #endif
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end ()
 
 #ifndef PLUGIN_PLAIN

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/i420_yuy2.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/i420_yuy2.c Changed

@@ -33,6 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
+#include <vlc_chroma_probe.h>
 #include <vlc_cpu.h>
 
 #if defined (PLUGIN_ALTIVEC) && defined(HAVE_ALTIVEC_H)
@@ -46,13 +47,16 @@
 #if defined (PLUGIN_SSE2)
 #    define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422"
 #    define VLC_TARGET VLC_SSE
+#    define COST 0.75
 #elif defined (PLUGIN_ALTIVEC)
 #    define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422"
 #    define VLC_TARGET VLC_ALTIVEC
+#    define COST 0.75
 #else
 #    define PLUGIN_PLAIN
 #    define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,Y211"
 #    define VLC_TARGET
+#    define COST 1
 #endif
 
 /*****************************************************************************
@@ -63,6 +67,15 @@
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+    vlc_chroma_conv_add_in_outlist(vec, COST, VLC_CODEC_I420, VLC_CODEC_YUYV,
+        VLC_CODEC_YVYU, VLC_CODEC_UYVY);
+#ifdef PLUGIN_PLAIN
+    vlc_chroma_conv_add(vec, COST, VLC_CODEC_I420, VLC_CODEC_Y211, false);
+#endif
+}
+
 vlc_module_begin ()
 #if defined (PLUGIN_PLAIN)
     set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
@@ -77,6 +90,8 @@
     set_callback_video_converter( Activate, 250 )
 # define vlc_CPU_capable() vlc_CPU_ALTIVEC()
 #endif
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end ()
 
 VIDEO_FILTER_WRAPPER( I420_YUY2 )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/i422_i420.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/i422_i420.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/i422_yuy2.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/i422_yuy2.c Changed

@@ -33,6 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
+#include <vlc_chroma_probe.h>
 #include <vlc_cpu.h>
 
 #include "i422_yuy2.h"
@@ -40,8 +41,10 @@
 #define SRC_FOURCC  "I422"
 #if !defined (PLUGIN_SSE2)
 #    define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,Y211"
+#    define COST 0.75
 #else
 #    define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422"
+#    define COST 1
 #endif
 
 /*****************************************************************************
@@ -52,6 +55,15 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+    vlc_chroma_conv_add_in_outlist(vec, COST, VLC_CODEC_I422, VLC_CODEC_YUYV,
+        VLC_CODEC_YVYU, VLC_CODEC_UYVY);
+#ifdef PLUGIN_PLAIN
+    vlc_chroma_conv_add(vec, COST, VLC_CODEC_I422, VLC_CODEC_Y211, false);
+#endif
+}
+
 vlc_module_begin ()
 #if defined (PLUGIN_SSE2)
     set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) )
@@ -65,6 +77,8 @@
 # define vlc_CPU_capable() (true)
 # define VLC_TARGET
 #endif
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end ()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/meson.build Changed

@@ -109,6 +109,39 @@
     'sources' : files('orient.c'),
 }
 
+d3d11_common_lib = 
+d3d9_common_lib = 
+if host_system == 'windows'
+    d3d11_common_lib = static_library('d3d11_common',
+        files(
+            'd3d11_fmt.cpp',
+            'dxgi_fmt.c',
+            ),
+        include_directories: vlc_include_dirs,
+        cpp_args : libcom_cppflags,
+        pic: true,
+        install: false,
+        dependencies: 
+            cc.find_library('dxguid'),
+            cc.find_library('wbemuuid'),
+            cc.find_library('uuid'),
+            cc.find_library('d3d11'),
+        
+    )
+    if have_win_desktop
+    d3d9_common_lib = static_library('d3d9_common',
+        files(
+            'd3d9_fmt.c',
+            'dxgi_fmt.c',
+            ),
+        include_directories: vlc_include_dirs,
+        dependencies:  cc.find_library('d3d9') ,
+        pic: true,
+        install: false,
+    )
+    endif
+endif
+
 # CVPX chroma converter
 # TODO: Set minimum versions for tvOS and iOS
 vlc_modules += {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/rv32.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/rv32.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/swscale.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/swscale.c Changed

@@ -33,6 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
+#include <vlc_chroma_probe.h>
 #include <vlc_cpu.h>
 
 #include <libswscale/swscale.h>
@@ -60,6 +61,57 @@
   N_("Area"), N_("Luma bicubic / chroma bilinear"), N_("Gauss"),
   N_("SincR"), N_("Lanczos"), N_("Bicubic spline") };
 
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+#define COST_FACTOR 1
+    size_t count;
+    const struct vlc_chroma_ffmpeg *table = GetVlcChromaFfmpegTable(&count);
+    assert(table != NULL && count > 0);
+
+    for (size_t i = 0; i < count; i++)
+    {
+        vlc_fourcc_t cur_chroma = tablei.i_chroma;
+        enum AVPixelFormat cur_avpf = tablei.i_chroma_id;
+        bool cur_supported_input = sws_isSupportedInput(cur_avpf);
+        bool cur_supported_output = sws_isSupportedOutput(cur_avpf);
+
+        if (!cur_supported_input && !cur_supported_output)
+            continue;
+
+        for (size_t j = i + 1; j < count; j++)
+        {
+            vlc_fourcc_t next_chroma = tablej.i_chroma;
+
+            if (next_chroma == cur_chroma)
+                continue;
+
+            enum AVPixelFormat next_avpf = tablej.i_chroma_id;
+            bool next_supported_input = sws_isSupportedInput(next_avpf);
+            bool next_supported_output = sws_isSupportedOutput(next_avpf);
+
+            if (!next_supported_input && !next_supported_output)
+                continue;
+
+            if (cur_supported_input && cur_supported_output
+             && next_supported_input && next_supported_output)
+            {
+                /* Likely case: add in <-> out two way conversion */
+                vlc_chroma_conv_add(vec, COST_FACTOR, cur_chroma, next_chroma,
+                                    true);
+            }
+            else
+            {
+                if (cur_supported_input && next_supported_output)
+                    vlc_chroma_conv_add(vec, COST_FACTOR, cur_chroma, next_chroma,
+                                        false);
+                else if (cur_supported_output && next_supported_input)
+                    vlc_chroma_conv_add(vec, COST_FACTOR, next_chroma, cur_chroma,
+                                        false);
+            }
+        }
+    }
+}
+
 vlc_module_begin ()
     set_description( N_("Video scaling filter") )
     set_shortname( N_("Swscale" ) )
@@ -67,6 +119,8 @@
     set_callback_video_converter( OpenScaler, 150 )
     add_integer( "swscale-mode", 2, SCALEMODE_TEXT, SCALEMODE_LONGTEXT )
         change_integer_list( pi_mode_values, ppsz_mode_descriptions )
+    add_submodule()
+        set_callback_chroma_conv_probe(ProbeChroma)
 vlc_module_end ()
 
 /* Version checking */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/yuvp.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/yuvp.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/yuy2_i420.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/yuy2_i420.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_chroma/yuy2_i422.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_chroma/yuy2_i422.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_filter/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_filter/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_filter/deinterlace/merge.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_filter/deinterlace/merge.c Changed

@@ -49,7 +49,7 @@
     const uint8_t *p_s2 = _p_s2;
 
     for( ; i_bytes > 0; i_bytes-- )
-        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
+        *p_dest++ = ( *p_s1++ + *p_s2++ + 1) >> 1;
 }
 
 void Merge16BitGeneric( void *_p_dest, const void *_p_s1,
@@ -60,7 +60,7 @@
     const uint16_t *p_s2 = _p_s2;
 
     for( size_t i_words = i_bytes / 2; i_words > 0; i_words-- )
-        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
+        *p_dest++ = ( *p_s1++ + *p_s2++ + 1) >> 1;
 }
 
 #if defined(CAN_COMPILE_SSE2)
@@ -73,7 +73,7 @@
     const uint8_t *p_s2 = _p_s2;
 
     for( ; i_bytes > 0 && ((uintptr_t)p_s1 & 15); i_bytes-- )
-        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
+        *p_dest++ = ( *p_s1++ + *p_s2++ + 1) >> 1;
 
     for( ; i_bytes >= 16; i_bytes -= 16 )
     {
@@ -88,7 +88,7 @@
     }
 
     for( ; i_bytes > 0; i_bytes-- )
-        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
+        *p_dest++ = ( *p_s1++ + *p_s2++ + 1) >> 1;
 }
 
 VLC_SSE
@@ -101,7 +101,7 @@
 
     size_t i_words = i_bytes / 2;
     for( ; i_words > 0 && ((uintptr_t)p_s1 & 15); i_words-- )
-        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
+        *p_dest++ = ( *p_s1++ + *p_s2++ + 1) >> 1;
 
     for( ; i_words >= 8; i_words -= 8 )
     {
@@ -116,7 +116,7 @@
     }
 
     for( ; i_words > 0; i_words-- )
-        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
+        *p_dest++ = ( *p_s1++ + *p_s2++ + 1) >> 1;
 }
 
 #endif
@@ -134,7 +134,7 @@
     /* Use C until the first 16-bytes aligned destination pixel */
     while( (uintptr_t)p_dest & 0xF )
     {
-        *p_dest++ = ( (uint16_t)(*p_s1++) + (uint16_t)(*p_s2++) ) >> 1;
+        *p_dest++ = ( (uint16_t)(*p_s1++) + (uint16_t)(*p_s2++) + 1) >> 1;
     }
 
     if( ( (int)p_s1 & 0xF ) | ( (int)p_s2 & 0xF ) )
@@ -186,7 +186,7 @@
     p_end += 15;
 
     while( p_dest < p_end )
-        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
+        *p_dest++ = ( *p_s1++ + *p_s2++ + 1) >> 1;
 }
 #endif

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_filter/deinterlace/yadif_x86.asm -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_filter/deinterlace/yadif_x86.asm Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_filter/egl_pbuffer.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_filter/egl_pbuffer.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_filter/egl_surfacetexture.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_filter/egl_surfacetexture.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_filter/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_filter/meson.build Changed

@@ -36,6 +36,36 @@
     'sources' : files('antiflicker.c')
 }
 
+if host_system == 'windows'
+    vlc_modules += {
+        'name' : 'amf_frc',
+        'sources' : files(
+                'amf_frc.c',
+                '../hw/amf/amf_helper.c',
+            ),
+        'link_with':  d3d11_common_lib ,
+        'dependencies':  contrib_dep, cc.find_library('d3d11'),
+        'enabled' : get_option('amf_frc').allowed() \
+                    and cc.find_library('d3d11').found() \
+                    and cc.check_header('AMF/core/PropertyStorage.h', args: contrib_inc_args) \
+                    and cc.check_header('AMF/components/FRC.h', args: contrib_inc_args),
+    }
+
+    vlc_modules += {
+        'name' : 'amf_vqenhancer',
+        'sources' : files(
+                'amf_vqenhancer.c',
+                '../hw/amf/amf_helper.c',
+            ),
+        'link_with':  d3d11_common_lib ,
+        'dependencies':  contrib_dep, cc.find_library('d3d11') ,
+        'enabled' : get_option('amf_vqenhancer').allowed() \
+                    and cc.find_library('d3d11').found() \
+                    and cc.check_header('AMF/core/PropertyStorage.h', args: contrib_inc_args) \
+                    and cc.check_header('AMF/components/VQEnhancer.h', args: contrib_inc_args),
+    }
+endif
+
 # Ball filter
 vlc_modules += {
     'name' : 'ball',
@@ -259,19 +289,8 @@
     'enabled' : host_system == 'darwin',
 }
 
-# deinterlace common helper lib
-deinterlacecommon_lib = static_library(
-    'deinterlace_common',
-    files('deinterlace/common.c'),
-    include_directories: vlc_include_dirs,
-    pic: true,
-    install: false
-)
-
 # deinterlace filter
-vlc_modules += {
-    'name' : 'deinterlace',
-    'sources' : files(
+deinterlace_sources = files(
         'deinterlace/deinterlace.c',
         'deinterlace/merge.c',
         'deinterlace/helpers.c',
@@ -280,19 +299,29 @@
         'deinterlace/algo_yadif.c',
         'deinterlace/algo_phosphor.c',
         'deinterlace/algo_ivtc.c',
-    ),
-    # Inline ASM doesn't build with -O0
-    # bring back if needed when inline ASM is supported 'c_args' : '-O2',
+    )
+if cdata.has('HAVE_X86ASM')
+    deinterlace_sources+=files('deinterlace/yadif_x86.asm')
+endif
+vlc_modules += {
+    'name' : 'deinterlace',
+    'sources' : deinterlace_sources,
+    'include_directories' : include_directories('../../extras/include/x86'),
     'link_with' : deinterlacecommon_lib
 }
 
 # Postproc filter
 postproc_dep = dependency('libpostproc', required: get_option('postproc'))
+postproc_c_args = 
 if postproc_dep.found()
+    if cc.check_header('postproc/postprocess.h', dependencies: postproc_dep)
+        postproc_c_args += '-DHAVE_POSTPROC_POSTPROCESS_H'
+    endif
     vlc_modules += {
     'name' : 'postproc',
     'sources' : files('postproc.c'),
-    'dependencies' : m_lib, postproc_dep
+    'dependencies' : m_lib, postproc_dep,
+    'c_args' : postproc_c_args,
     }
 endif

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_filter/puzzle/puzzle_pce.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_filter/puzzle/puzzle_pce.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/Makefile.am Changed

@@ -1,5 +1,9 @@
 voutdir = $(pluginsdir)/video_output
 vout_LTLIBRARIES =
+# Install the pkglib/pkglibexec first before relinking the modules.
+# This ensures libtool re-linking is not racy.
+installvoutLTLIBRARIES = install-voutLTLIBRARIES
+$(installvoutLTLIBRARIES): install-pkglibLTLIBRARIES
 
 EXTRA_DIST += video_output/README
 
@@ -58,13 +62,15 @@
 
 libvout_macosx_plugin_la_SOURCES = video_output/macosx.m \
 	$(OPENGL_VOUT_COMMONSOURCES)
-libvout_macosx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DHAVE_GL_CORE_SYMBOLS
+libvout_macosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
+libvout_macosx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DHAVE_GL_CORE_SYMBOLS -DGL_SILENCE_DEPRECATION
 libvout_macosx_plugin_la_LIBADD = libvlc_opengl.la
 libvout_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 	-Wl,-framework,OpenGL,-framework,Cocoa
 
 libcaopengllayer_plugin_la_SOURCES = video_output/caopengllayer.m \
 	$(OPENGL_VOUT_COMMONSOURCES)
+libcaopengllayer_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
 libcaopengllayer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)  -DHAVE_GL_CORE_SYMBOLS -DGL_SILENCE_DEPRECATION
 libcaopengllayer_plugin_la_LIBADD = libvlc_opengl.la
 libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
@@ -189,13 +195,13 @@
 	video_output/win32/events.c video_output/win32/events.h \
 	video_output/win32/builtin_shaders.h \
 	video_output/win32/win32touch.c video_output/win32/win32touch.h
-libdirect3d9_plugin_la_LIBADD = libchroma_copy.la libd3d9_common.la -lgdi32 -luser32 $(LIBCOM) -luuid
+libdirect3d9_plugin_la_LIBADD = libchroma_copy.la libd3d9_common.la -ld3d9 -lgdi32 -luser32 $(LIBCOM) -luuid -ldxva2
 libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 
 libglinterop_dxva2_plugin_la_SOURCES = video_output/opengl/interop_dxva2.c \
 	video_output/opengl/interop.h
 libglinterop_dxva2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
-libglinterop_dxva2_plugin_la_LIBADD = libd3d9_common.la -lopengl32
+libglinterop_dxva2_plugin_la_LIBADD = libd3d9_common.la -ld3d9 -lopengl32 -ldxva2
 
 if HAVE_WIN32_DESKTOP
 vout_LTLIBRARIES += $(LTLIBdirect3d9)
@@ -211,22 +217,20 @@
  video_output/win32/d3d11_shaders.cpp video_output/win32/d3d11_shaders.h \
  video_output/win32/d3d11_tonemap.cpp video_output/win32/d3d11_tonemap.h \
  video_output/win32/d3d_shaders.c video_output/win32/d3d_shaders.h \
- video_output/win32/d3d_dynamic_shader.c video_output/win32/d3d_dynamic_shader.h \
- video_output/win32/common.c video_output/win32/common.h
+ video_output/win32/d3d_dynamic_shader.c video_output/win32/d3d_dynamic_shader.h
 libdirect3d11_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBCOMCXXFLAGS)
-libdirect3d11_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la $(LIBCOM) -luuid -ldxgi -ld3d11
+libdirect3d11_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la $(LIBCOM) -luuid -ldxgi -ld3d11 -ld3dcompiler
 libdirect3d11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 if !HAVE_WINSTORE
 libdirect3d11_plugin_la_CPPFLAGS += -DHAVE_WIN32_SENSORS
 libdirect3d11_plugin_la_SOURCES += video_output/win32/events.c \
  video_output/win32/events.h \
+ video_output/win32/common.c video_output/win32/common.h \
  video_output/win32/d3d11_swapchain.cpp video_output/win32/d3d11_swapchain.h \
  video_output/win32/dxgi_swapchain.cpp video_output/win32/dxgi_swapchain.h \
  video_output/win32/sensors.cpp \
  video_output/win32/win32touch.c video_output/win32/win32touch.h
 libdirect3d11_plugin_la_LIBADD += -lgdi32 -luser32
-else
-libdirect3d11_plugin_la_LIBADD += -ld3dcompiler_47
 endif
 if HAVE_NVDEC
 libdirect3d11_plugin_la_SOURCES += hw/nvdec/nvdec_fmt.h

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/android/display.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/android/display.c Changed

@@ -62,6 +62,7 @@
 struct sys
 {
     AWindowHandler *awh;
+    bool can_set_video_layout;
     android_video_context_t *avctx;
     struct subpicture sub;
 };
@@ -327,6 +328,9 @@
     if (sub->renderer == NULL)
         goto delete_interop;
 
+    vlc_gl_sub_renderer_SetOutputSize(sub->renderer, vd->cfg->display.width,
+                                      vd->cfg->display.height);
+
     vlc_gl_ReleaseCurrent(sub->gl);
 
     static const vlc_fourcc_t gl_subpicture_chromas = {
@@ -377,6 +381,8 @@
 static void SetVideoLayout(vout_display_t *vd)
 {
     struct sys *sys = vd->sys;
+    if (!sys->can_set_video_layout)
+        return;
 
     video_format_t rot_fmt;
     video_format_ApplyRotation(&rot_fmt, vd->source);
@@ -425,7 +431,8 @@
 {
     struct sys *sys = vd->sys;
 
-    AWindowHandler_setVideoLayout(sys->awh, 0, 0, 0, 0, 0, 0);
+    if (sys->can_set_video_layout)
+        AWindowHandler_setVideoLayout(sys->awh, 0, 0, 0, 0, 0, 0);
 
     if (sys->sub.window != NULL)
         subpicture_CloseDisplay(vd);
@@ -441,11 +448,14 @@
 
     if (embed->type != VLC_WINDOW_TYPE_ANDROID_NATIVE
      || fmtp->i_chroma != VLC_CODEC_ANDROID_OPAQUE
-     || context == NULL
-     || !AWindowHandler_canSetVideoLayout(awh))
+     || context == NULL)
         return VLC_EGENERIC;
 
-    if (!vd->obj.force && fmtp->projection_mode != PROJECTION_MODE_RECTANGULAR)
+    bool can_set_video_layout = AWindowHandler_getCapabilities(awh)
+                                & AWH_CAPS_SET_VIDEO_LAYOUT;
+    if (!vd->obj.force
+     && (fmtp->projection_mode != PROJECTION_MODE_RECTANGULAR
+      || !can_set_video_layout))
     {
         /* Let the gles2 vout handle projection */
         return VLC_EGENERIC;
@@ -457,6 +467,7 @@
         return VLC_ENOMEM;
 
     sys->awh = awh;
+    sys->can_set_video_layout = can_set_video_layout;
     sys->avctx = vlc_video_context_GetPrivate(context, VLC_VIDEO_CONTEXT_AWINDOW);
     assert(sys->avctx);
     if (sys->avctx->texture != NULL)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/android/utils.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/android/utils.c Changed

@@ -40,6 +40,7 @@
 
 typedef ANativeWindow* (*ptr_ANativeWindow_fromSurface)(JNIEnv*, jobject);
 typedef ANativeWindow* (*ptr_ANativeWindow_fromSurfaceTexture)(JNIEnv*, jobject);
+typedef void (*ptr_ANativeWindow_acquire)(ANativeWindow*);
 typedef void (*ptr_ANativeWindow_release)(ANativeWindow*);
 
 typedef void (*ptr_ASurfaceTexture_getTransformMatrix)
@@ -103,6 +104,7 @@
           jmethodID init_iz;
           jmethodID init_z;
           jmethodID updateTexImage;
+          jmethodID release;
           jmethodID releaseTexImage;
           jmethodID getTransformMatrix;
           jmethodID detachFromGLContext;
@@ -129,6 +131,7 @@
 
     void *p_anw_dl;
     ptr_ANativeWindow_fromSurface pf_winFromSurface;
+    ptr_ANativeWindow_acquire pf_winAcquire;
     ptr_ANativeWindow_release pf_winRelease;
     native_window_api_t anw_api;
 
@@ -138,7 +141,7 @@
     struct {
         awh_events_t cb;
     } event;
-    bool b_has_video_layout_listener;
+    int capabilities;
 
     struct {
         jfloatArray jtransform_mtx_array;
@@ -320,6 +323,7 @@
 LoadNativeSurfaceAPI(AWindowHandler *p_awh)
 {
     p_awh->pf_winFromSurface = NativeSurface_fromSurface;
+    p_awh->pf_winAcquire = NULL;
     p_awh->pf_winRelease = NativeSurface_release;
     p_awh->anw_api.winLock = NativeSurface_lock;
     p_awh->anw_api.unlockAndPost = NativeSurface_unlockAndPost;
@@ -374,6 +378,9 @@
     if (!p_env)
         return;
 
+    (*p_env)->CallVoidMethod(p_env, handle->jtexture,
+                             handle->awh->jfields.SurfaceTexture.release);
+
     if (handle->surface.window)
         handle->awh->pf_winRelease(handle->surface.window);
 
@@ -497,6 +504,9 @@
     if (!p_env)
         return;
 
+    (*p_env)->CallVoidMethod(p_env, handle->jtexture,
+                             handle->awh->jfields.SurfaceTexture.release);
+
     if (handle->surface.window)
         handle->awh->pf_winRelease(handle->surface.window);
     if (handle->surface.jsurface)
@@ -567,12 +577,13 @@
     }
 
     p_awh->pf_winFromSurface = dlsym(p_library, "ANativeWindow_fromSurface");
+    p_awh->pf_winAcquire = dlsym(p_library, "ANativeWindow_acquire");
     p_awh->pf_winRelease = dlsym(p_library, "ANativeWindow_release");
     p_awh->anw_api.winLock = dlsym(p_library, "ANativeWindow_lock");
     p_awh->anw_api.unlockAndPost = dlsym(p_library, "ANativeWindow_unlockAndPost");
     p_awh->anw_api.setBuffersGeometry = dlsym(p_library, "ANativeWindow_setBuffersGeometry");
 
-    if (p_awh->pf_winFromSurface && p_awh->pf_winRelease
+    if (p_awh->pf_winFromSurface && p_awh->pf_winAcquire && p_awh->pf_winRelease
      && p_awh->anw_api.winLock && p_awh->anw_api.unlockAndPost
      && p_awh->anw_api.setBuffersGeometry)
     {
@@ -677,6 +688,9 @@
     GET_METHOD(SurfaceTexture, getTransformMatrix,
                "getTransformMatrix", "(F)V", true);
 
+    GET_METHOD(SurfaceTexture, release,
+               "release", "()V", true);
+
     GET_METHOD(SurfaceTexture, releaseTexImage,
                "releaseTexImage", "()V", false);
 
@@ -734,6 +748,8 @@
 static JNIEnv*
 AWindowHandler_getEnv(AWindowHandler *p_awh)
 {
+    if (p_awh->p_jvm == NULL)
+        return NULL;
     return android_getEnvCommon(NULL, p_awh->p_jvm, "AWindowHandler");
 }
 
@@ -810,10 +826,12 @@
     }
     LoadNativeWindowAPI(p_awh);
 
-    p_awh->b_has_video_layout_listener =
-        wnd && flags & AWINDOW_REGISTER_FLAGS_HAS_VIDEO_LAYOUT_LISTENER;
+    p_awh->capabilities = 0;
+
+    if (wnd && flags & AWINDOW_REGISTER_FLAGS_HAS_VIDEO_LAYOUT_LISTENER)
+        p_awh->capabilities |= AWH_CAPS_SET_VIDEO_LAYOUT;
 
-    if (p_awh->b_has_video_layout_listener && p_events != NULL)
+    if (p_awh->capabilities & AWH_CAPS_SET_VIDEO_LAYOUT && p_events != NULL)
     {
         /* XXX: HACK: force mediacodec to setup an OpenGL surface when the vout
          * is forced to gles2. Indeed, setting b_has_video_layout_listener to
@@ -823,13 +841,47 @@
         if (vout_modules
          && (strncmp(vout_modules, "gles2", sizeof("gles2") - 1) == 0
           || strncmp(vout_modules, "opengles2", sizeof("opengles2") - 1) == 0))
-            p_awh->b_has_video_layout_listener = false;
+            p_awh->capabilities &= ~AWH_CAPS_SET_VIDEO_LAYOUT;
         free(vout_modules);
     }
 
+    p_awh->capabilities |= AWH_CAPS_SURFACE_VIEW;
+
     return p_awh;
 }
 
+AWindowHandler *
+AWindowHandler_newFromANWs(vlc_object_t *obj, ANativeWindow *video,
+                           ANativeWindow *subtitle)
+{
+    (void) obj;
+    AWindowHandler *awh = calloc(1, sizeof(AWindowHandler));
+    if (!awh)
+        return NULL;
+
+    awh->p_jvm = NULL;
+    awh->jobj = NULL;
+    awh->jfields = (struct vlc_android_jfields) { .AWindow.clazz = NULL };
+    awh->wnd = NULL;
+
+    LoadNativeWindowAPI(awh);
+    if (awh->pf_winAcquire == NULL)
+    {
+        free(awh);
+        return NULL;
+    }
+
+    awh->viewsAWindow_Video.p_anw = video;
+    awh->pf_winAcquire(video);
+    awh->capabilities = 0;
+
+    awh->viewsAWindow_Subtitles.p_anw = subtitle;
+    if (subtitle != NULL)
+        awh->pf_winAcquire(subtitle);
+
+    return awh;
+}
+
 static void
 AWindowHandler_releaseANativeWindowEnv(AWindowHandler *p_awh, JNIEnv *p_env,
                                        enum AWindow_ID id)
@@ -842,7 +894,7 @@
         p_awh->viewsid.p_anw = NULL;
     }
 
-    if (p_awh->viewsid.jsurface)
+    if (p_env != NULL && p_awh->viewsid.jsurface)
     {
         (*p_env)->DeleteGlobalRef(p_env, p_awh->viewsid.jsurface);
         p_awh->viewsid.jsurface = NULL;
@@ -864,16 +916,20 @@
 
         if (p_awh->jobj)
             JNI_ANWCALL(CallVoidMethod, unregisterNative);
-        AWindowHandler_releaseANativeWindowEnv(p_awh, p_env, AWindow_Video);
-        AWindowHandler_releaseANativeWindowEnv(p_awh, p_env, AWindow_Subtitles);
+    }
+
+    AWindowHandler_releaseANativeWindowEnv(p_awh, p_env, AWindow_Video);
+    AWindowHandler_releaseANativeWindowEnv(p_awh, p_env, AWindow_Subtitles);
+
+    if (p_env != NULL)
+    {
         if (p_awh->jobj)
             (*p_env)->DeleteGlobalRef(p_env, p_awh->jobj);
+        (*p_env)->DeleteGlobalRef(p_env, p_awh->stex.jtransform_mtx_array);
     }
 
     if (p_awh->p_anw_dl)
         dlclose(p_awh->p_anw_dl);
-
-    (*p_env)->DeleteGlobalRef(p_env, p_awh->stex.jtransform_mtx_array);
     free(p_awh);
 }
 
@@ -1098,6 +1154,8 @@
 struct vlc_asurfacetexture *
 vlc_asurfacetexture_New(AWindowHandler *p_awh, bool single_buffer)
 {
+    if (p_awh->p_jvm == NULL)
+        return NULL;
     JNIEnv *p_env = android_getEnvCommon(NULL, p_awh->p_jvm, "SurfaceTexture");
     struct vlc_asurfacetexture_priv *surfacetexture =
         CreateSurfaceTexture(p_awh, p_env, single_buffer);
@@ -1140,12 +1198,10 @@
 {
     assert(id < AWindow_Max);
 
-    JNIEnv *p_env;
-
     if (p_awh->viewsid.p_anw)
         return p_awh->viewsid.p_anw;
 
-    p_env = AWindowHandler_getEnv(p_awh);
+    JNIEnv *p_env = AWindowHandler_getEnv(p_awh);
     if (!p_env)
         return NULL;
 
@@ -1177,8 +1233,7 @@
                                          enum AWindow_ID id)
 {
     JNIEnv *p_env = AWindowHandler_getEnv(p_awh);
-    if (p_env)
-        AWindowHandler_releaseANativeWindowEnv(p_awh, p_env, id);
+    AWindowHandler_releaseANativeWindowEnv(p_awh, p_env, id);
 }
 
 static inline AWindowHandler *jlong_AWindowHandler(jlong handle)
@@ -1208,10 +1263,10 @@
         p_awh->event.cb.on_new_window_size(p_awh->wnd, width, height);
 }
 
-bool
-AWindowHandler_canSetVideoLayout(AWindowHandler *p_awh)
+int
+AWindowHandler_getCapabilities(AWindowHandler *p_awh)
 {
-    return p_awh->b_has_video_layout_listener && p_awh->wnd != NULL;
+    return p_awh->capabilities;
 }
 
 int
@@ -1220,7 +1275,7 @@
                               int i_visible_width, int i_visible_height,
                               int i_sar_num, int i_sar_den)
 {
-    assert(p_awh->b_has_video_layout_listener);
+    assert(p_awh->capabilities & AWH_CAPS_SET_VIDEO_LAYOUT);
     JNIEnv *p_env = AWindowHandler_getEnv(p_awh);
     if (!p_env)
         return VLC_EGENERIC;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/android/utils.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/android/utils.h Changed

@@ -33,6 +33,11 @@
 #include <vlc_vout_display.h>
 #include <vlc_common.h>
 
+/* AWH using a VideoLAN AWindow helpers */
+#define AWH_CAPS_SET_VIDEO_LAYOUT 0x1
+/* AWH backed by a Android SurfaceView */
+#define AWH_CAPS_SURFACE_VIEW 0x2
+
 typedef struct AWindowHandler AWindowHandler;
 typedef struct ASurfaceTexture ASurfaceTexture;
 
@@ -125,6 +130,10 @@
 AWindowHandler *AWindowHandler_new(vlc_object_t *obj, vlc_window_t *wnd, awh_events_t *p_events);
 void AWindowHandler_destroy(AWindowHandler *p_awh);
 
+AWindowHandler *
+AWindowHandler_newFromANWs(vlc_object_t *obj, ANativeWindow *video,
+                           ANativeWindow *subtitle);
+
 /**
  * Get the public native window API
  *
@@ -156,15 +165,12 @@
 void AWindowHandler_releaseANativeWindow(AWindowHandler *p_awh,
                                          enum AWindow_ID id);
 
-/**
- * Returns true if the video layout can be changed
- */
-bool AWindowHandler_canSetVideoLayout(AWindowHandler *p_awh);
+int AWindowHandler_getCapabilities(AWindowHandler *p_awh);
 
 /**
  * Set the video layout
  *
- * Should be called only if AWindowHandler_canSetVideoLayout() returned true
+ * Should be called only if AWindowHandler_getCapabilities() has AWH_CAPS_SET_VIDEO_LAYOUT
  */
 int AWindowHandler_setVideoLayout(AWindowHandler *p_awh,
                                   int i_width, int i_height,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/android/window.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/android/window.c Changed

@@ -33,6 +33,9 @@
 #include <vlc_window.h>
 #include <vlc_codec.h>
 
+#include <vlc/libvlc.h>
+#include <vlc/libvlc_media_player.h>
+
 #include <dlfcn.h>
 #include <jni.h>
 
@@ -44,6 +47,12 @@
     vlc_wasync_resize_compressor_t compressor;
 } vout_window_sys_t;
 
+struct vout_window_sys_cb
+{
+    void *opaque;
+    libvlc_video_output_cleanup_cb cleanup_cb;
+};
+
 static void OnNewWindowSize(vlc_window_t *wnd,
                             unsigned i_width, unsigned i_height)
 {
@@ -108,6 +117,76 @@
     return VLC_SUCCESS;
 }
 
+static void DestroyCallback(vlc_window_t *wnd)
+{
+    struct vout_window_sys_cb *sys = wnd->sys;
+    if (sys->cleanup_cb != NULL)
+        sys->cleanup_cb(sys->opaque);
+}
+
+static int OpenCallback(vlc_window_t *wnd)
+{
+    static const struct vlc_window_operations ops = {
+        .destroy = DestroyCallback,
+    };
+
+    libvlc_video_engine_t engine = var_InheritInteger(wnd, "vout-cb-type");
+    if (engine != libvlc_video_engine_anw)
+        return VLC_EGENERIC;
+
+    struct vout_window_sys_cb *sys = vlc_obj_malloc(VLC_OBJECT(wnd), sizeof (*sys));
+    if (sys == NULL)
+        return VLC_ENOMEM;
+
+    sys->opaque = var_InheritAddress(wnd, "vout-cb-opaque");
+    libvlc_video_output_setup_cb setup_cb = var_InheritAddress(wnd, "vout-cb-setup");
+    libvlc_video_update_output_cb update_cb = var_InheritAddress(wnd, "vout-cb-update-output");
+    sys->cleanup_cb = var_InheritAddress(wnd, "vout-cb-cleanup");
+
+    if (update_cb == NULL)
+        return VLC_EGENERIC;
+
+    if (setup_cb != NULL)
+    {
+        const libvlc_video_setup_device_cfg_t cfg = {
+            .hardware_decoding = true,
+        };
+        libvlc_video_setup_device_info_t out;
+        bool success = setup_cb(&sys->opaque, &cfg, &out);
+        if (!success)
+            return VLC_EGENERIC;
+        (void) out; /* Ignored on Android */
+    }
+
+    /* Default values, parameters are overridden by the producer */
+    const libvlc_video_render_cfg_t render_cfg = {
+        .width = 1,
+        .height = 1,
+    };
+    libvlc_video_output_cfg_t out = { .anw = { NULL, NULL } };
+    bool success = update_cb(sys->opaque, &render_cfg, &out);
+    if (!success)
+        goto error;
+    assert(out.anw.video != NULL);
+
+    AWindowHandler *awh =
+        AWindowHandler_newFromANWs(VLC_OBJECT(wnd), out.anw.video, out.anw.subtitle);
+    if (awh == NULL)
+        goto error;
+
+    wnd->sys = sys;
+    wnd->type = VLC_WINDOW_TYPE_ANDROID_NATIVE;
+    wnd->display.anativewindow = awh;
+    wnd->handle.android_id = AWindow_Video;
+    wnd->ops = &ops;
+
+    return VLC_SUCCESS;
+error:
+    if (sys->cleanup_cb != NULL)
+        sys->cleanup_cb(sys->opaque);
+    return VLC_EGENERIC;
+}
+
 static int
 OpenDecDevice(vlc_decoder_device *device, vlc_window_t *window)
 {
@@ -141,6 +220,9 @@
     set_capability("vout window", 10)
     set_callback(Open)
     add_submodule ()
+        set_capability("vout window", 11)
+        set_callback(OpenCallback)
+    add_submodule ()
         set_callback_dec_device(OpenDecDevice, 1)
         add_shortcut("android")
 vlc_module_end()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/apple/VLCCVOpenGLProvider.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/apple/VLCCVOpenGLProvider.m Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/apple/VLCDrawable.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/apple/VLCDrawable.h Changed

@@ -45,7 +45,8 @@
 
 /// Called by picture in picture to seek with time offset
 /// - Parameter offset: offset duration in milliseconds
-- (void)seekBy:(int64_t)offset;
+/// - Parameter completion: block to call as soon as seek is finished
+- (void)seekBy:(int64_t)offset completion:(dispatch_block_t)completion;
 
 /// Called by picture in picture to get the current media duration
 /// - Returns Must return media duration in milliseconds
@@ -55,6 +56,10 @@
 /// - Returns Must return current media time in milliseconds
 - (int64_t)mediaTime;
 
+/// Called by picture in picture to figure out if media is seekable
+/// - Returns Must return YES if media is seekable, else return NO
+- (BOOL)isMediaSeekable;
+
 /// Called by picture in picture to get the media playback status
 /// - Returns Must return YES if media is playing, else return NO
 - (BOOL)isMediaPlaying;
@@ -66,6 +71,10 @@
  */
 @protocol VLCPictureInPictureWindowControlling <NSObject>
 
+/// Property to set the event handler block that will notify when the picture
+/// in picture is started or stopped
+@property (nonatomic) void(^stateChangeEventHandler)(BOOL isStarted);
+
 /// Call to present the display in picture in picture mode
 - (void)startPictureInPicture;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/apple/VLCPictureInPictureController.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/apple/VLCPictureInPictureController.m Changed

@@ -41,11 +41,13 @@
 API_AVAILABLE(ios(15.0), tvos(15.0), macosx(12.0))
 @interface VLCPictureInPictureController: NSObject
     <AVPictureInPictureSampleBufferPlaybackDelegate, 
-     AVPictureInPictureControllerDelegate>
+     AVPictureInPictureControllerDelegate,
+     VLCPictureInPictureWindowControlling>
 
 @property (nonatomic, readonly) NSObject *avPipController;
 @property (nonatomic, readonly) pip_controller_t *pipcontroller;
 @property (nonatomic, readonly, weak) id<VLCPictureInPictureDrawable> drawable;
+@property (nonatomic) void(^stateChangeEventHandler)(BOOL isStarted);
 
 - (instancetype)initWithPipController:(pip_controller_t *)pipcontroller;
 - (void)invalidatePlaybackState;
@@ -87,6 +89,9 @@
         AVPictureInPictureController alloc
             initWithContentSource:avPipSource
     ;
+    void *mediaController = (__bridge void*)_drawable.mediaController;
+    BOOL isMediaSeekable = (BOOL)_pipcontroller->media_cbs->is_media_seekable(mediaController);
+    avPipController.requiresLinearPlayback = !isMediaSeekable;
     avPipController.delegate = self;
 #if TARGET_OS_IOS
     // Not sure if it's mandatory, its usefulness isn't obvious and 
@@ -100,24 +105,8 @@
                        forKeyPath:@"isPictureInPicturePossible"
                           options:NSKeyValueObservingOptionInitial|NSKeyValueObservingOptionNew
                           context:NULL;
-}
-
-- (void)startPictureInPicture {
-    AVPictureInPictureController *avPipController =
-        (AVPictureInPictureController *)_avPipController;
-    avPipController startPictureInPicture;
-}
 
-- (void)stopPictureInPicture {
-    AVPictureInPictureController *avPipController =
-        (AVPictureInPictureController *)_avPipController;
-    avPipController stopPictureInPicture;
-}
-
-- (void)invalidatePlaybackState {
-    AVPictureInPictureController *avPipController =
-        (AVPictureInPictureController *)_avPipController;
-    avPipController invalidatePlaybackState;
+    _drawable.pictureInPictureReady(self);
 }
 
 - (void)close {
@@ -169,8 +158,7 @@
     
     void *mediaController = (__bridge void*)_drawable.mediaController;
     int64_t offset = time_sec * 1e3;
-    _pipcontroller->media_cbs->seek_by(offset, mediaController);
-    completionHandler();
+    _pipcontroller->media_cbs->seek_by(offset, completionHandler, mediaController);
 }
 
 - (BOOL)pictureInPictureControllerIsPlaybackPaused:(AVPictureInPictureController *)pictureInPictureController {
@@ -213,44 +201,47 @@
     self invalidatePlaybackState;
 }
 
-@end
+- (void)pictureInPictureControllerDidStartPictureInPicture:(AVPictureInPictureController *)pictureInPictureController {
+    if (_stateChangeEventHandler)
+        _stateChangeEventHandler(YES);
+}
 
-static void SetDisplayLayer( pip_controller_t *pipcontroller, void *layer) {
-    if (@available(macOS 12.0, iOS 15.0, tvos 15.0, *)) {
-        VLCPictureInPictureController *sys = 
-            (__bridge VLCPictureInPictureController*)pipcontroller->p_sys;
-        
-        AVSampleBufferDisplayLayer *displayLayer =
-            (__bridge AVSampleBufferDisplayLayer *)layer;
-        
-        sys prepare:displayLayer;
-    }
+- (void)pictureInPictureControllerDidStopPictureInPicture:(AVPictureInPictureController *)pictureInPictureController {
+    if(_stateChangeEventHandler)
+        _stateChangeEventHandler(NO);
 }
 
-static void StartPictureInPicture( pip_controller_t *pipcontroller) {
-    if (@available(macOS 12.0, iOS 15.0, tvos 15.0, *)) {
-        VLCPictureInPictureController *sys = 
-            (__bridge VLCPictureInPictureController*)pipcontroller->p_sys;
-        
-        sys startPictureInPicture;
-    }
+#pragma mark - VLCDisplayPictureInPictureControlling
+
+- (void)startPictureInPicture {
+    AVPictureInPictureController *avPipController =
+        (AVPictureInPictureController *)_avPipController;
+    avPipController startPictureInPicture;
 }
 
-static void StopPictureInPicture( pip_controller_t *pipcontroller) {
-    if (@available(macOS 12.0, iOS 15.0, tvos 15.0, *)) {
-        VLCPictureInPictureController *sys = 
-            (__bridge VLCPictureInPictureController*)pipcontroller->p_sys;
+- (void)stopPictureInPicture {
+    AVPictureInPictureController *avPipController =
+        (AVPictureInPictureController *)_avPipController;
+    avPipController stopPictureInPicture;
+}
 
-        sys stopPictureInPicture;
-    }
+- (void)invalidatePlaybackState {
+    AVPictureInPictureController *avPipController =
+        (AVPictureInPictureController *)_avPipController;
+    avPipController invalidatePlaybackState;
 }
 
-static void InvalidatePictureInPicture( pip_controller_t *pipcontroller) {
+@end
+
+static void SetDisplayLayer( pip_controller_t *pipcontroller, void *layer) {
     if (@available(macOS 12.0, iOS 15.0, tvos 15.0, *)) {
         VLCPictureInPictureController *sys = 
             (__bridge VLCPictureInPictureController*)pipcontroller->p_sys;
         
-        sys invalidatePlaybackState;
+        AVSampleBufferDisplayLayer *displayLayer =
+            (__bridge AVSampleBufferDisplayLayer *)layer;
+        
+        sys prepare:displayLayer;
     }
 }
 
@@ -266,10 +257,10 @@
     mediaController pause;
 }
 
-static void PipControllerMediaSeekBy(vlc_tick_t time, void *opaque) {
+static void PipControllerMediaSeekBy(vlc_tick_t time, dispatch_block_t completion, void *opaque) {
     id<VLCPictureInPictureMediaControlling> mediaController;
     mediaController = (__bridge id<VLCPictureInPictureMediaControlling>)opaque;
-    mediaController seekBy:time;
+    mediaController seekBy:time completion:completion;
 }
 
 static vlc_tick_t PipControllerMediaGetLength(void *opaque) {
@@ -284,6 +275,12 @@
     return mediaController mediaTime;
 }
 
+static bool PipControllerMediaIsSeekable(void *opaque) {
+    id<VLCPictureInPictureMediaControlling> mediaController;
+    mediaController = (__bridge id<VLCPictureInPictureMediaControlling>)opaque;
+    return (bool)mediaController isMediaSeekable;
+}
+
 static bool PipControllerMediaIsPlaying(void *opaque) {
     id<VLCPictureInPictureMediaControlling> mediaController;
     mediaController = (__bridge id<VLCPictureInPictureMediaControlling>)opaque;
@@ -306,9 +303,6 @@
 {
     static const struct pip_controller_operations ops = {
         SetDisplayLayer, 
-        StartPictureInPicture, 
-        StopPictureInPicture, 
-        InvalidatePictureInPicture, 
         CloseController
     };
 
@@ -320,6 +314,7 @@
         PipControllerMediaSeekBy,
         PipControllerMediaGetLength,
         PipControllerMediaGetTime,
+        PipControllerMediaIsSeekable,
         PipControllerMediaIsPlaying
     };

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/apple/VLCSampleBufferDisplay.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/apple/VLCSampleBufferDisplay.m Changed

@@ -418,7 +418,7 @@
 }
 
 static filter_t *
-CreateCVPXConverter(vout_display_t *vd)
+CreateCVPXConverter(vout_display_t *vd, const video_format_t *fmt)
 {
     filter_t *converter = vlc_object_create(vd, sizeof(filter_t));
     if (!converter)
@@ -432,8 +432,8 @@
     converter->owner.video = &cbs;
     converter->owner.sys = vd;
 
-    es_format_InitFromVideo( &converter->fmt_in,  vd->fmt );
-    es_format_InitFromVideo( &converter->fmt_out,  vd->fmt );
+    es_format_InitFromVideo(&converter->fmt_in, fmt);
+    es_format_InitFromVideo(&converter->fmt_out, fmt);
 
     converter->fmt_out.video.i_chroma =
     converter->fmt_out.i_codec = VLC_CODEC_CVPX_BGRA;
@@ -473,6 +473,7 @@
 @property (nonatomic, weak) VLCSampleBufferSubpicture *subpicture;
 @property (nonatomic) CGRect backingFrame;
 @property (nonatomic) CGImageRef image;
+@property (nonatomic) CGFloat    alpha;
 @end
 
 @implementation VLCSampleBufferSubpictureRegion
@@ -551,6 +552,7 @@
 #else
         CGRect regionFrame = region.backingFrame;
 #endif
+        CGContextSetAlpha(cgCtx, region.alpha);
         CGContextDrawImage(cgCtx, regionFrame, region.image);
     }
 #if TARGET_OS_IPHONE
@@ -639,14 +641,13 @@
 
 #pragma mark -
 
-@interface VLCSampleBufferDisplay: NSObject <VLCPictureInPictureWindowControlling>
+@interface VLCSampleBufferDisplay: NSObject
 {
     @public
     vout_display_place_t place;
     filter_t *converter;
 }
     @property (nonatomic, readonly, weak) VLCView *window;
-    @property (nonatomic, readonly, weak) id drawable;
     @property (nonatomic, readonly) vout_display_t *vd;
     @property (nonatomic) VLCSampleBufferDisplayView *displayView;
     @property (nonatomic) AVSampleBufferDisplayLayer *displayLayer;
@@ -694,8 +695,6 @@
 
     _window = window;
 
-    _drawable = (__bridge id)var_InheritAddress (vd, "drawable-nsobject");
-
     _pipcontroller = CreatePipController(vd, (__bridge void *)self);
 
     _vd = vd;
@@ -713,13 +712,6 @@
             (__bridge void*)_displayView.displayLayer
         );
     }
-    
-    if ( !_drawable conformsToProtocol:@protocol(VLCPictureInPictureDrawable) )
-        return;
-    
-    id<VLCPictureInPictureDrawable> drawable = (id<VLCPictureInPictureDrawable>)_drawable;
-    
-    drawable.pictureInPictureReady(self);
 }
 
 - (void)prepareDisplay {
@@ -763,35 +755,7 @@
         sys.spuView removeFromSuperview;
     });
     DeletePipController(_pipcontroller);
-}
-
-#pragma mark - VLCDisplayPictureInPictureControlling
-
-- (void)startPictureInPicture {
-    if ( _pipcontroller
-            && _pipcontroller->ops->start_pip ) {
-        _pipcontroller->ops->start_pip(
-            _pipcontroller
-        );
-    }
-}
-
-- (void)stopPictureInPicture {
-    if ( _pipcontroller
-            && _pipcontroller->ops->stop_pip ) {
-        _pipcontroller->ops->stop_pip(
-            _pipcontroller
-        );
-    }
-}
-
-- (void)invalidatePlaybackState {
-    if ( _pipcontroller
-            && _pipcontroller->ops->invalidate_pip ) {
-        _pipcontroller->ops->invalidate_pip(
-            _pipcontroller
-        );
-    }
+    _pipcontroller = NULL;
 }
 
 @end
@@ -972,6 +936,7 @@
         region = VLCSampleBufferSubpictureRegion new;
         region.subpicture = sys.subpicture;
         region.image = image;
+        region.alpha = r->i_alpha / 255.f;
 
         region.backingFrame = RegionBackingFrame(vd->cfg->display.height, r);
         regions addObject:region;
@@ -1136,9 +1101,30 @@
     vlc_object_delete(pip_controller);
 }
 
+static int UpdateFormat(vout_display_t *vd, const video_format_t *fmt,
+                        vlc_video_context *vctx)
+{
+    VLCSampleBufferDisplay *sys = (__bridge VLCSampleBufferDisplay*)vd->sys;
+
+    // Display will only work with CVPX video context
+    filter_t *converter = NULL;
+    if (!vlc_video_context_GetPrivate(vctx, VLC_VIDEO_CONTEXT_CVPX)) {
+        converter = CreateCVPXConverter(vd, fmt);
+        if (!converter)
+            return VLC_EGENERIC;
+    }
+
+    DeleteCVPXConverter(sys->converter);
+    sys->converter = converter;
+    return VLC_SUCCESS;
+}
+
 static int Open (vout_display_t *vd,
                  video_format_t *fmt, vlc_video_context *context)
 {
+    if (var_InheritBool(vd, "force-darwin-legacy-display")) {
+        return VLC_EGENERIC;
+    }
     // Display isn't compatible with 360 content hence opening with this kind
     // of projection should fail if display use isn't forced
     if (!vd->obj.force && fmt->projection_mode != PROJECTION_MODE_RECTANGULAR) {
@@ -1148,7 +1134,7 @@
     // Display will only work with CVPX video context
     filter_t *converter = NULL;
     if (!vlc_video_context_GetPrivate(context, VLC_VIDEO_CONTEXT_CVPX)) {
-        converter = CreateCVPXConverter(vd);
+        converter = CreateCVPXConverter(vd, fmt);
         if (!converter)
             return VLC_EGENERIC;
     }
@@ -1167,7 +1153,11 @@
         vd->sys = (__bridge_retained void*)sys;
 
         static const struct vlc_display_operations ops = {
-            Close, Prepare, Display, Control, NULL, NULL, NULL,
+            .close = Close,
+            .prepare = Prepare,
+            .display = Display,
+            .control = Control,
+            .update_format = UpdateFormat,
         };
         
         vd->ops = &ops;
@@ -1186,8 +1176,25 @@
 /*
  * Module descriptor
  */
+
+#define FORCE_LEGACY_DISPLAY_TEXT N_("Force fallback to legacy display")
+#define FORCE_LEGACY_DISPLAY_LONGTEXT N_( \
+    "Triggers an initialization failure to allow fallback to any other legacy display.")
+
+#define HELP_TEXT N_("This display handles hardware decoded pixel buffers "\
+                     "and renders them in a view/layer. "\
+                     "It can also convert and display software decoded frame buffers. "\
+                     "This is the default display for Apple platforms. "\
+                     "--force-darwin-legacy-display option can be used to abort the "\
+                     "display's initialization and allows fallback to legacy displays like "\
+                     "other OpenGL/ES based video outputs.")
+
 vlc_module_begin()
     set_description(N_("CoreMedia sample buffers based video output display"))
     set_subcategory(SUBCAT_VIDEO_VOUT)
+    add_bool("force-darwin-legacy-display", false,
+             FORCE_LEGACY_DISPLAY_TEXT, FORCE_LEGACY_DISPLAY_LONGTEXT)
+        change_volatile()
+    set_help(HELP_TEXT)
     set_callback_display(Open, 600)
 vlc_module_end()

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/apple/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/apple/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/apple/vlc_pip_controller.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/apple/vlc_pip_controller.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/caopengllayer.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/caopengllayer.m Changed

@@ -6,6 +6,7 @@
  * Authors: David Fuhrmann <david dot fuhrmann at googlemail dot com>
  *          Felix Paul Kühne <fkuehne at videolan dot org>
  *          Pierre d'Herbemont <pdherbemont at videolan dot org>
+ *          Alexandre Janniaux <ajanni@videolabs.io>
  *
  * Some of the code is based on mpv's video_layer.swift by "der richter"
  *
@@ -46,17 +47,6 @@
 #include "opengl/renderer.h"
 #include "opengl/vout_helper.h"
 
-/*****************************************************************************
- * Vout interface
- *****************************************************************************/
-static int Open(vout_display_t *vd, video_format_t *fmt, vlc_video_context *context);
-static void Close(vout_display_t *vd);
-
-static void PictureRender   (vout_display_t *vd, picture_t *pic, const vlc_render_subpicture *subpicture,
-                             vlc_tick_t date);
-static void PictureDisplay  (vout_display_t *vd, picture_t *pic);
-static int Control          (vout_display_t *vd, int);
-
 /**
  * Protocol declaration that drawable-nsobject should follow
  */
@@ -71,14 +61,18 @@
 @interface VLCCAOpenGLLayer : CAOpenGLLayer
 {
     NSLock *_displayLock;
-    vout_display_t *_voutDisplay; // All accesses to this must be @synchronized(self)
-                                  // unless you can be sure it won't be called in teardown
+    vlc_gl_t *_gl; // All accesses to this must be @synchronized(self)
+                   // unless you can be sure it won't be called in teardown
     CGLContextObj _glContext;
+    atomic_bool _is_ready;
 }
 
-- (instancetype)initWithVoutDisplay:(vout_display_t *)vd;
+@property (nonatomic, copy) void (^render)(NSSize displaySize);
+
+- (instancetype)init:(vlc_gl_t *)gl context:(CGLContextObj)context;
 - (void)displayFromVout;
 - (void)vlcClose;
+- (void)markReady;
 @end
 
 /**
@@ -93,27 +87,32 @@
 @interface VLCVideoLayerView : NSView <CALayerDelegate, NSViewLayerContentScaleDelegate>
 #endif
 {
-    vout_display_t *_vlc_vd; // All accesses to this must be @synchronized(self)
+    vlc_gl_t *_gl; // All accesses to this must be @synchronized(self)
+    id _container;
+
+    CGLContextObj _context; // The CGL context managed by us
+    CGLContextObj _context_previous; // The previously current CGL context, if any
 }
 
-- (instancetype)initWithVoutDisplay:(vout_display_t *)vd;
+- (instancetype)init:(vlc_gl_t *)gl;
 - (void)vlcClose;
+
+- (int)lockContext;
+- (void)unlockContext;
+- (void)swap;
 @end
 
 typedef struct vout_display_sys_t {
 
-    id<VLCOpenGLVideoViewEmbedding> container;
-
-    VLCVideoLayerView *videoView; // Layer-backed view that creates videoLayer
-    VLCCAOpenGLLayer *videoLayer; // Backing layer of videoView
-
     vlc_gl_t *gl;
     vout_display_opengl_t *vgl;
 
     vout_display_place_t place;
     vout_display_cfg_t cfg;
 
-    atomic_bool is_ready;
+    bool change_projection;
+    video_projection_mode_t projection;
+    vlc_viewpoint_t viewpoint;
 } vout_display_sys_t;
 
 #pragma mark -
@@ -188,7 +187,7 @@
  * one that works on the given hardware.
  * \return CGLContextObj or NULL in case of error
  */
-CGLContextObj vlc_CreateCGLContext()
+static CGLContextObj vlc_CreateCGLContext(void)
 {
     CGLError err;
     GLint npix = 0;
@@ -234,26 +233,25 @@
     return ctx;
 }
 
-struct vlc_gl_sys
-{
-    CGLContextObj cgl; // The CGL context managed by us
-    CGLContextObj cgl_prev; // The previously current CGL context, if any
-};
-
 static int SetViewpoint(vout_display_t *vd, const vlc_viewpoint_t *vp)
 {
     vout_display_sys_t *sys = vd->sys;
     if (vlc_gl_MakeCurrent(sys->gl) != VLC_SUCCESS)
         return VLC_EGENERIC;
 
+    sys->viewpoint = *vp;
     int ret = vout_display_opengl_SetViewpoint(sys->vgl, vp);
     vlc_gl_ReleaseCurrent(sys->gl);
     return ret;
 }
 
-static const struct vlc_display_operations ops = {
-    Close, PictureRender, PictureDisplay, Control, NULL, SetViewpoint, NULL,
-};
+static int ChangeSourceProjection(vout_display_t *vd, video_projection_mode_t projection)
+{
+    vout_display_sys_t *sys = vd->sys;
+    sys->projection = projection;
+    sys->change_projection = true;
+    return VLC_SUCCESS;
+}
 
 /**
  * Flush the OpenGL context
@@ -262,11 +260,8 @@
  */
 static void gl_cb_Swap(vlc_gl_t *vlc_gl)
 {
-    struct vlc_gl_sys *sys = vlc_gl->sys;
-    // Copies a double-buffered contexts back buffer to front buffer, calling
-    // glFlush before this is not needed and discouraged for performance reasons.
-    // An implicit glFlush happens before CGLFlushDrawable returns.
-    CGLFlushDrawable(sys->cgl);
+    VLCVideoLayerView *view = (__bridge VLCVideoLayerView *)vlc_gl->sys;
+    view swap;
 }
 
 /**
@@ -276,26 +271,8 @@
  */
 static int gl_cb_MakeCurrent(vlc_gl_t *vlc_gl)
 {
-    CGLError err;
-    struct vlc_gl_sys *sys = vlc_gl->sys;
-
-    sys->cgl_prev = CGLGetCurrentContext();
-
-    if (sys->cgl_prev != sys->cgl) {
-        err = CGLSetCurrentContext(sys->cgl);
-        if (err != kCGLNoError) {
-            msg_Err(vlc_gl, "Failure setting current CGLContext: %s", CGLErrorString(err));
-            return VLC_EGENERIC;
-        }
-    }
-
-    err = CGLLockContext(sys->cgl);
-    if (err != kCGLNoError) {
-        msg_Err(vlc_gl, "Failure locking CGLContext: %s", CGLErrorString(err));
-        return VLC_EGENERIC;
-    }
-
-    return VLC_SUCCESS;
+    VLCVideoLayerView *view = (__bridge VLCVideoLayerView *)vlc_gl->sys;
+    return view lockContext;
 }
 
 /**
@@ -304,26 +281,8 @@
  */
 static void gl_cb_ReleaseCurrent(vlc_gl_t *vlc_gl)
 {
-    CGLError err;
-    struct vlc_gl_sys *sys = vlc_gl->sys;
-
-    assert(CGLGetCurrentContext() == sys->cgl);
-
-    err = CGLUnlockContext(sys->cgl);
-    if (err != kCGLNoError) {
-        msg_Err(vlc_gl, "Failure unlocking CGLContext: %s", CGLErrorString(err));
-        abort();
-    }
-
-    if (sys->cgl_prev != sys->cgl) {
-        err = CGLSetCurrentContext(sys->cgl_prev);
-        if (err != kCGLNoError) {
-            msg_Err(vlc_gl, "Failure restoring previous CGLContext: %s", CGLErrorString(err));
-            abort();
-        }
-    }
-
-    sys->cgl_prev = NULL;
+    VLCVideoLayerView *view = (__bridge VLCVideoLayerView *)vlc_gl->sys;
+    view unlockContext;
 }
 
 /**
@@ -336,149 +295,55 @@
     return dlsym(RTLD_DEFAULT, name);
 }
 
-
-#pragma mark -
-#pragma mark Module functions
-
-/*****************************************************************************
- * Open: This function allocates and initializes the OpenGL vout method.
- *****************************************************************************/
-static int Open (vout_display_t *vd,
-                 video_format_t *fmt, vlc_video_context *context)
+static void CloseOpenGL(vlc_gl_t *gl)
 {
-    vout_display_sys_t *sys;
-    if (vd->cfg->window->type != VLC_WINDOW_TYPE_NSOBJECT)
-        return VLC_EGENERIC;
-
-    @autoreleasepool {
-        vout_display_sys_t *sys;
-
-        vd->sys = sys = vlc_obj_calloc(vd, 1, sizeof(*sys));
-        if (sys == NULL)
-            return VLC_ENOMEM;
-
-        // Only use this video output on macOS 10.14 or higher
-        // currently, as it has some issues on at least macOS 10.7
-        // and the old NSView based output still works fine on old
-        // macOS versions.
-        if (@available(macOS 10.14, *)) {
-            // This is intentionally left empty, as the check
-            // can not be negated or combined with other conditions!
-        } else {
-            if (!vd->obj.force)
-                return VLC_EGENERIC;
-        }
-
-        id container = vd->cfg->window->handle.nsobject;
-        if (!container) {
-            msg_Err(vd, "No drawable-nsobject found!");
-            goto error;
-        }
-
-        // Retain container, released in Close
-        sys->container = container retain;
-
-        // Create the CGL context
-        CGLContextObj cgl_ctx = vlc_CreateCGLContext();
-        if (cgl_ctx == NULL) {
-            msg_Err(vd, "Failure to create CGL context!");
-            goto error;
-        }
-
-        // Create a pseudo-context object which provides needed callbacks
-        // for VLC to deal with the CGL context. Usually this should be done
-        // by a proper opengl provider module, but we do not have that currently.
-        sys->gl = vlc_object_create(vd, sizeof(*sys->gl));
-        if (unlikely(!sys->gl))
-            goto error;
+    VLCVideoLayerView *view = (__bridge_transfer VLCVideoLayerView *)gl->sys;
+    view vlcClose;
+    view = nil;
 
-        static const struct vlc_gl_operations gl_ops =
-        {
-            .make_current = gl_cb_MakeCurrent,
-            .release_current = gl_cb_ReleaseCurrent,
-            .swap = gl_cb_Swap,
-            .get_proc_address = gl_cb_GetProcAddress,
-        };
-        sys->gl->ops = &gl_ops;
-        sys->gl->api_type = VLC_OPENGL;
-
-        struct vlc_gl_sys *glsys = sys->gl->sys = malloc(sizeof(*glsys));
-        if (unlikely(!glsys)) {
-            Close(vd);
-            return VLC_ENOMEM;
-        }
-        glsys->cgl = cgl_ctx;
-        glsys->cgl_prev = NULL;
-
-        dispatch_sync(dispatch_get_main_queue(), ^{
-           sys->cfg = *vd->cfg;
-
-            // Create video view
-            sys->videoView = VLCVideoLayerView alloc initWithVoutDisplay:vd;
-            sys->videoLayer = (VLCCAOpenGLLayer*)sys->videoView layer retain;
-            // Add video view to container
-            if (container respondsToSelector:@selector(addVoutSubview:)) {
-                container addVoutSubview:sys->videoView;
-            } else if (container isKindOfClass:NSView class) {
-                NSView *containerView = container;
-                containerView addSubview:sys->videoView;
-                sys->videoView setFrame:containerView.bounds;
-            } else {
-                sys->videoView release;
-                sys->videoLayer release;
-                sys->videoView = nil;
-                sys->videoLayer = nil;
-            }
-
-            vout_display_PlacePicture(&sys->place, vd->source, &vd->cfg->display);
-            // Reverse vertical alignment as the GL tex are Y inverted
-            sys->place.y = vd->cfg->display.height - (sys->place.y + sys->place.height);
-        });
-
-        if (sys->videoView == nil) {
-            msg_Err(vd,
-                    "Invalid drawable-nsobject object, must either be an NSView "
-                    "or comply with the VLCOpenGLVideoViewEmbedding protocol");
-            goto error;
-        }
-
-
-        // Initialize OpenGL video display
-        const vlc_fourcc_t *spu_chromas;
-
-        if (vlc_gl_MakeCurrent(sys->gl))
-            goto error;
+}
 
-        sys->vgl = vout_display_opengl_New(fmt, &spu_chromas, sys->gl,
-                                           &vd->cfg->viewpoint, context);
-        vlc_gl_ReleaseCurrent(sys->gl);
+static int OpenOpenGL(vlc_gl_t *gl, unsigned width, unsigned height,
+                      const struct vlc_gl_cfg *cfg)
+{
+    id container = (__bridge id)gl->surface->handle.nsobject;
+    if (!container) {
+        msg_Err(gl, "No drawable-nsobject found!");
+        return VLC_ENOTSUP;
+    }
 
-        if (sys->vgl == NULL) {
-            msg_Err(vd, "Error while initializing OpenGL display");
-            goto error;
+    dispatch_sync(dispatch_get_main_queue(), ^{
+        @autoreleasepool {
+            VLCVideoLayerView *videoView = VLCVideoLayerView alloc init:gl;
+            if (videoView == nil)
+                return;
+            gl->sys = (__bridge_retained void*)videoView;
         }
+    });
 
-        vd->info.subpicture_chromas = spu_chromas;
-
-        vd->ops = &ops;
+    if (unlikely(gl->sys == NULL))
+        return VLC_ENOMEM;
 
-        atomic_init(&sys->is_ready, false);
-        return VLC_SUCCESS;
+    static const struct vlc_gl_operations gl_ops =
+    {
+        .make_current = gl_cb_MakeCurrent,
+        .release_current = gl_cb_ReleaseCurrent,
+        .swap = gl_cb_Swap,
+        .get_proc_address = gl_cb_GetProcAddress,
+    };
+    gl->ops = &gl_ops;
+    gl->api_type = VLC_OPENGL;
 
-    error:
-        Close(vd);
-        return VLC_EGENERIC;
-    }
+    return VLC_SUCCESS;
 }
 
+#pragma mark -
+#pragma mark Module functions
+
 static void Close(vout_display_t *vd)
 {
     vout_display_sys_t *sys = vd->sys;
 
-    atomic_store(&sys->is_ready, false);
-    sys->videoLayer vlcClose;
-    sys->videoView vlcClose;
-
     if (sys->vgl && !vlc_gl_MakeCurrent(sys->gl)) {
         vout_display_opengl_Delete(sys->vgl);
         vlc_gl_ReleaseCurrent(sys->gl);
@@ -486,35 +351,9 @@
 
 
     if (sys->gl) {
-        struct vlc_gl_sys *glsys = sys->gl->sys;
-
-        // It should never happen that the context is destroyed and we
-        // still have a previous context set, as it would mean non-balanced
-        // calls to MakeCurrent/ReleaseCurrent.
-        assert(glsys->cgl_prev == NULL);
-
-        CGLReleaseContext(glsys->cgl);
+        CloseOpenGL(sys->gl);
         vlc_object_delete(sys->gl);
-        free(glsys);
     }
-
-    // Copy pointers out of sys, as sys can be gone already
-    // when the dispatch_async block is run!
-    id container = sys->container;
-    VLCVideoLayerView *videoView = sys->videoView;
-    VLCCAOpenGLLayer *videoLayer = sys->videoLayer;
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        // Remove vout subview from container
-        if (container respondsToSelector:@selector(removeVoutSubview:)) {
-            container removeVoutSubview:videoView;
-        }
-        videoView removeFromSuperview;
-
-        videoView release;
-        container release;
-        videoLayer release;
-    });
 }
 
 static void PictureRender (vout_display_t *vd, picture_t *pic,
@@ -526,10 +365,21 @@
 
     if (vlc_gl_MakeCurrent(sys->gl) == VLC_SUCCESS)
     {
+        if (sys->change_projection)
+        {
+            vout_display_opengl_ChangeProjection(sys->vgl, sys->projection);
+            vout_display_opengl_Viewport(sys->vgl, sys->place.x, sys->place.y,
+                                        sys->place.width, sys->place.height);
+            vout_display_opengl_SetOutputSize(sys->vgl, sys->cfg.display.width, sys->cfg.display.height);
+
+            sys->change_projection = false;
+        }
         vout_display_opengl_Prepare(sys->vgl, pic, subpicture);
         vlc_gl_ReleaseCurrent(sys->gl);
 
-        atomic_store(&sys->is_ready, true);
+        VLCVideoLayerView *view = (__bridge VLCVideoLayerView *)sys->gl->sys;
+        VLCCAOpenGLLayer *layer = (VLCCAOpenGLLayer *)view layer;
+        layer markReady;
     }
 }
 
@@ -538,8 +388,9 @@
     vout_display_sys_t *sys = vd->sys;
     VLC_UNUSED(pic);
 
-
-    sys->videoLayer displayFromVout;
+    VLCVideoLayerView *view = (__bridge VLCVideoLayerView *)sys->gl->sys;
+    VLCCAOpenGLLayer *layer = (VLCCAOpenGLLayer *)view layer;
+    layer displayFromVout;
 }
 
 static int Control (vout_display_t *vd, int query)
@@ -549,6 +400,9 @@
     if (!vd->sys)
         return VLC_EGENERIC;
 
+    VLCVideoLayerView *view = (__bridge VLCVideoLayerView *)sys->gl->sys;
+    VLCCAOpenGLLayer *layer = (VLCCAOpenGLLayer *)view layer;
+
     switch (query)
     {
         case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
@@ -558,7 +412,7 @@
         case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
         case VOUT_DISPLAY_CHANGE_SOURCE_PLACE:
         {
-            @synchronized(sys->videoLayer)
+            @synchronized(layer)
             {
                 vout_display_cfg_t cfg = *vd->cfg;
                 cfg.display.width = sys->cfg.display.width;
@@ -587,23 +441,220 @@
     return VLC_SUCCESS;
 }
 
+/*****************************************************************************
+ * Open: This function allocates and initializes the OpenGL vout method.
+ *****************************************************************************/
+static int Open (vout_display_t *vd,
+                 video_format_t *fmt, vlc_video_context *context)
+{
+    vout_display_sys_t *sys;
+    if (vd->cfg->window->type != VLC_WINDOW_TYPE_NSOBJECT)
+        return VLC_EGENERIC;
+
+    @autoreleasepool {
+        vout_display_sys_t *sys;
+
+        // Only use this video output on macOS 10.14 or higher
+        // currently, as it has some issues on at least macOS 10.7
+        // and the old NSView based output still works fine on old
+        // macOS versions.
+        if (@available(macOS 10.14, *)) {
+            // This is intentionally left empty, as the check
+            // can not be negated or combined with other conditions!
+        } else if (!vd->obj.force) {
+            return VLC_EGENERIC;
+        }
+
+        vd->sys = sys = calloc(1, sizeof(*sys));
+        if (sys == NULL)
+            return VLC_ENOMEM;
+        sys->projection = vd->cfg->projection;
+        sys->change_projection = false;
+
+        id container = (__bridge id)vd->cfg->window->handle.nsobject;
+        if (!container) {
+            msg_Err(vd, "No drawable-nsobject found!");
+            Close(vd);
+            return VLC_EGENERIC;
+        }
+
+        // Create a pseudo-context object which provides needed callbacks
+        // for VLC to deal with the CGL context. Usually this should be done
+        // by a proper opengl provider module, but we do not have that currently.
+        sys->gl = vlc_object_create(vd, sizeof(*sys->gl));
+        if (unlikely(!sys->gl))
+        {
+            Close(vd);
+            return VLC_ENOMEM;
+        }
+        sys->gl->surface = vd->cfg->window;
+
+        const struct vlc_gl_cfg gl_cfg = {
+            .need_alpha = false,
+        };
+
+        int ret = OpenOpenGL(sys->gl, vd->cfg->display.width, vd->cfg->display.height, &gl_cfg);
+        if (ret != VLC_SUCCESS) {
+            Close(vd);
+            return ret;
+        }
+
+        dispatch_sync(dispatch_get_main_queue(), ^{
+
+            __weak VLCVideoLayerView *view = (__bridge VLCVideoLayerView *)sys->gl->sys;
+            __weak VLCCAOpenGLLayer *layer = (VLCCAOpenGLLayer *)view layer;
+            sys->cfg = *vd->cfg;
+
+            vout_display_PlacePicture(&sys->place, vd->source, &vd->cfg->display);
+            // Reverse vertical alignment as the GL tex are Y inverted
+            sys->place.y = vd->cfg->display.height - (sys->place.y + sys->place.height);
+
+            @synchronized(layer) {
+                layer.render = ^(NSSize displaySize){
+                    @synchronized(layer)
+                    {
+                        sys->cfg.display.width = displaySize.width;
+                        sys->cfg.display.height = displaySize.height;
+
+                        vout_display_PlacePicture(&sys->place, vd->source, &sys->cfg.display);
+                    }
+
+                    // Ensure viewport and aspect ratio is correct
+                    vout_display_opengl_Viewport(sys->vgl, sys->place.x, sys->place.y,
+                                                sys->place.width, sys->place.height);
+                    vout_display_opengl_SetOutputSize(sys->vgl, sys->cfg.display.width, sys->cfg.display.height);
+
+                    vout_display_opengl_Display(sys->vgl);
+
+                };
+            }
+        });
+
+
+        // Initialize OpenGL video display
+        const vlc_fourcc_t *spu_chromas;
+
+        if (vlc_gl_MakeCurrent(sys->gl))
+        {
+            Close(vd);
+            return VLC_EGENERIC;
+        }
+
+        sys->viewpoint = vd->cfg->viewpoint;
+        sys->vgl = vout_display_opengl_New(fmt, &spu_chromas, sys->gl,
+                                           &vd->cfg->viewpoint, context);
+        vlc_gl_ReleaseCurrent(sys->gl);
+
+        if (sys->vgl == NULL) {
+            msg_Err(vd, "Error while initializing OpenGL display");
+            Close(vd);
+            return VLC_EGENERIC;
+        }
+
+        vd->info.subpicture_chromas = spu_chromas;
+
+        static const struct vlc_display_operations ops = {
+            .close = Close,
+            .prepare = PictureRender,
+            .display = PictureDisplay,
+            .control = Control,
+            .set_viewpoint = SetViewpoint,
+            .change_source_projection = ChangeSourceProjection,
+        };
+        vd->ops = &ops;
+
+        return VLC_SUCCESS;
+    }
+}
+
 #pragma mark -
 #pragma mark VLCVideoLayerView
 
 @implementation VLCVideoLayerView
 
-- (instancetype)initWithVoutDisplay:(vout_display_t *)vd
+- (instancetype)init:(vlc_gl_t *)gl
 {
     self = super init;
-    if (self) {
-        _vlc_vd = vd;
+    if (self == nil)
+        return nil;
+    _gl = gl;
+
+    _context = vlc_CreateCGLContext();
+    if (_context == NULL) {
+        msg_Err(_gl, "Failure to create CGL context!");
+        return nil;
+    }
 
-        self.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
-        self.wantsLayer = YES;
+    _container = (__bridge id)gl->surface->handle.nsobject;
+    assert(_container != nil);
+
+    // Add video view to container
+    if (_container respondsToSelector:@selector(addVoutSubview:)) {
+        _container addVoutSubview:self;
+    } else if (_container isKindOfClass:NSView class) {
+        NSView *containerView = _container;
+        containerView addSubview:self;
+        self setFrame:containerView.bounds;
+    } else {
+        CGLReleaseContext(_context);
+        _context = NULL;
+        return nil;
     }
+
+    self.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+    self.wantsLayer = YES;
     return self;
 }
 
+- (int)lockContext {
+    _context_previous = CGLGetCurrentContext();
+
+    CGLError err;
+    if (_context_previous != _context) {
+        err = CGLSetCurrentContext(_context);
+        if (err != kCGLNoError) {
+            msg_Err(_gl, "Failure setting current CGLContext: %s", CGLErrorString(err));
+            return VLC_EGENERIC;
+        }
+    }
+
+    err = CGLLockContext(_context);
+    if (err != kCGLNoError) {
+        msg_Err(_gl, "Failure locking CGLContext: %s", CGLErrorString(err));
+        return VLC_EGENERIC;
+    }
+    return VLC_SUCCESS;
+}
+
+- (void)unlockContext {
+    CGLError err;
+
+    assert(CGLGetCurrentContext() == _context);
+
+    err = CGLUnlockContext(_context);
+    if (err != kCGLNoError) {
+        msg_Err(_gl, "Failure unlocking CGLContext: %s", CGLErrorString(err));
+        abort();
+    }
+
+    if (_context_previous != _context) {
+        err = CGLSetCurrentContext(_context_previous);
+        if (err != kCGLNoError) {
+            msg_Err(_gl, "Failure restoring previous CGLContext: %s", CGLErrorString(err));
+            abort();
+        }
+    }
+
+    _context_previous = NULL;
+}
+
+- (void)swap {
+    // Copies a double-buffered contexts back buffer to front buffer, calling
+    // glFlush before this is not needed and discouraged for performance reasons.
+    // An implicit glFlush happens before CGLFlushDrawable returns.
+    CGLFlushDrawable(_context);
+}
+
 /**
  * Invalidates VLC objects (notably _vlc_vd)
  * This method must be called in VLCs module Close (or indirectly by the View)
@@ -616,9 +667,26 @@
  */
 - (void)vlcClose
 {
-    @synchronized (self) {
-        _vlc_vd = NULL;
+    VLCCAOpenGLLayer *layer = (VLCCAOpenGLLayer *)self layer;
+    layer vlcClose;
+
+    @synchronized (layer) {
+        _gl = NULL;
+
+        // It should never happen that the context is destroyed and we
+        // still have a previous context set, as it would mean non-balanced
+        // calls to MakeCurrent/ReleaseCurrent.
+        assert(_context_previous == NULL);
     }
+    CGLReleaseContext(_context);
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        // Remove vout subview from container
+        if (_container respondsToSelector:@selector(removeVoutSubview:)) {
+            _container removeVoutSubview:self;
+        }
+        self removeFromSuperview;
+    });
 }
 
 - (void)viewWillStartLiveResize
@@ -634,11 +702,12 @@
 - (CALayer *)makeBackingLayer
 {
     @synchronized(self) {
-        NSAssert(_vlc_vd != NULL, @"Cannot create backing layer without vout display!");
+        NSAssert(_gl != NULL, @"Cannot create backing layer without vout display!");
 
-        VLCCAOpenGLLayer *layer = VLCCAOpenGLLayer alloc initWithVoutDisplay:_vlc_vd;
+        assert(_context != NULL);
+        VLCCAOpenGLLayer *layer = VLCCAOpenGLLayer alloc init:_gl context:_context;
         layer.delegate = self;
-        return layer autorelease;
+        return layer;
     }
 }
 
@@ -669,16 +738,17 @@
 
 @implementation VLCCAOpenGLLayer
 
-- (instancetype)initWithVoutDisplay:(vout_display_t *)vd
+- (instancetype)init:(vlc_gl_t *)gl context:(CGLContextObj)context
 {
     self = super init;
     if (self) {
         _displayLock = NSLock alloc init;
-        _voutDisplay = vd;
+        _gl = gl;
 
-        vout_display_sys_t *sys = vd->sys;
-        struct vlc_gl_sys *glsys = sys->gl->sys;
-        _glContext = CGLRetainContext(glsys->cgl);
+        _glContext = CGLRetainContext(context);
+        assert(_glContext != NULL);
+
+        atomic_init(&_is_ready, false);
 
         CATransaction lock;
         self.needsDisplayOnBoundsChange = YES;
@@ -692,6 +762,10 @@
     return self;
 }
 
+- (void)markReady {
+    atomic_store(&_is_ready, true);
+}
+
 /**
  * Invalidates VLC objects (notably _voutDisplay)
  * This method must be called in VLCs module Close (or indirectly by the View).
@@ -699,15 +773,14 @@
 - (void)vlcClose
 {
     @synchronized (self) {
-        _voutDisplay = NULL;
+        atomic_store(&_is_ready, false);
+        _gl = NULL;
     }
 }
 
 - (void)dealloc
 {
     CGLReleaseContext(_glContext);
-    _displayLock release;
-    super dealloc;
 }
 
 - (void)display
@@ -741,11 +814,9 @@
                 displayTime:(const CVTimeStamp *)timeStamp
 {
     @synchronized(self) {
-        if (!_voutDisplay)
+        if (!_gl)
             return NO;
-         vout_display_sys_t *sys = _voutDisplay->sys;
-
-        return (atomic_load(&sys->is_ready));
+        return _is_ready;
     }
 }
 
@@ -755,12 +826,10 @@
              displayTime:(const CVTimeStamp *)timeStamp
 {
     @synchronized(self) {
-        if (!_voutDisplay)
+        if (!_gl)
             return;
 
-        vout_display_sys_t *sys = _voutDisplay->sys;
-
-        if (vlc_gl_MakeCurrent(sys->gl))
+        if (vlc_gl_MakeCurrent(_gl))
             return;
 
         GLint dims4 = { 0, 0, 0, 0 };
@@ -774,22 +843,11 @@
             newSize.height *= scale;
         }
 
-        @synchronized(sys->videoView)
-        {
-            sys->cfg.display.width = newSize.width;
-            sys->cfg.display.height = newSize.height;
+        if (self.render != nil)
+            self.render(newSize);
 
-            vout_display_PlacePicture(&sys->place, _voutDisplay->source, &sys->cfg.display);
-        }
-
-        // Ensure viewport and aspect ratio is correct
-        vout_display_opengl_Viewport(sys->vgl, sys->place.x, sys->place.y,
-                                     sys->place.width, sys->place.height);
-        vout_display_opengl_SetOutputSize(sys->vgl, sys->cfg.display.width, sys->cfg.display.height);
-
-        vout_display_opengl_Display(sys->vgl);
-        vlc_gl_ReleaseCurrent(sys->gl);
-        vlc_gl_Swap(sys->gl);
+        vlc_gl_ReleaseCurrent(_gl);
+        vlc_gl_Swap(_gl);
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/decklink.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/decklink.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/drm/planes.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/drm/planes.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/kva.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/kva.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/libplacebo/display.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/libplacebo/display.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/libplacebo/instance_opengl.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/libplacebo/instance_opengl.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/libplacebo/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/libplacebo/meson.build Changed

@@ -1,7 +1,7 @@
 # Libplacebo-based video outputs
 
 vlc_modules += {
-    'name' : 'libplacebo',
+    'name' : 'placebo',
     'sources' : files('instance.c', 'display.c'),
     'link_with' : libplacebo_utils,
     'dependencies' : libplacebo_dep,
@@ -14,7 +14,7 @@
 
 if vulkan_dep.found()
     vlc_modules += {
-        'name' : 'libplacebo_vk',
+        'name' : 'placebo_vk',
         'sources' : files('../vulkan/platform.c', 'instance_vulkan.c'),
         'link_with' : libplacebo_utils,
         'dependencies' : libplacebo_dep,
@@ -24,7 +24,7 @@
 ## OpenGL
 if opengl_dep.found()
     vlc_modules += {
-        'name' : 'libplacebo_gl',
+        'name' : 'placebo_gl',
         'sources' : files('instance_opengl.c'),
         'link_with' : libplacebo_utils,
         'dependencies' : libplacebo_dep,
@@ -33,7 +33,7 @@
 
 if opengles2_dep.found()
     vlc_modules += {
-        'name' : 'libplacebo_gles2',
+        'name' : 'placebo_gles2',
         'sources' : files('instance_opengl.c'),
         'link_with' : libplacebo_utils,
         'c_args' : '-DUSE_OPENGL_ES2',

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/macosx.m -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/macosx.m Changed

@@ -145,32 +145,35 @@
     if (vd->cfg->window->type != VLC_WINDOW_TYPE_NSOBJECT)
         return VLC_EGENERIC;
 
-    vout_display_sys_t *sys = vlc_obj_calloc (vd, 1, sizeof(*sys));
+    vout_display_sys_t *sys = calloc(1, sizeof(*sys));
 
     if (!sys)
         return VLC_ENOMEM;
     sys->cfg = *vd->cfg;
+    sys->has_first_frame = false;
+    sys->current = NULL;
+    sys->vgl = NULL;
+    sys->gl = NULL;
 
     @autoreleasepool {
         if (!CGDisplayUsesOpenGLAcceleration (kCGDirectMainDisplay))
             msg_Err (vd, "no OpenGL hardware acceleration found. this can lead to slow output and unexpected results");
 
         vd->sys = sys;
-        sys->vgl = NULL;
-        sys->gl = NULL;
 
         /* Get the drawable object */
-        id container = vd->cfg->window->handle.nsobject;
+        id container = (__bridge id)vd->cfg->window->handle.nsobject;
         assert(container != nil);
 
         /* This will be released in Close(), on
          * main thread, after we are done using it. */
-        sys->container = container retain;
+        sys->container = container;
 
         /* Get our main view*/
-        VLCOpenGLVideoView performSelectorOnMainThread:@selector(getNewView:)
-                                             withObject:NSValue valueWithPointer:&sys->glView
-                                          waitUntilDone:YES;
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            sys->glView = VLCOpenGLVideoView alloc init;
+        });
+
         if (!sys->glView) {
             msg_Err(vd, "Initialization of open gl view failed");
             goto error;
@@ -181,18 +184,17 @@
         /* We don't wait, that means that we'll have to be careful about releasing
          * container.
          * That's why we'll release on main thread in Close(). */
-        if ((id)container respondsToSelector:@selector(addVoutSubview:))
-            (id)container performSelectorOnMainThread:@selector(addVoutSubview:)
-                                            withObject:sys->glView
-                                         waitUntilDone:NO;
+        if (container respondsToSelector:@selector(addVoutSubview:)) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                container addVoutSubview: sys->glView;
+            });
+        }
         else if (container isKindOfClass:NSView class) {
-            NSView *parentView = container;
-            parentView performSelectorOnMainThread:@selector(addSubview:)
-                                         withObject:sys->glView
-                                      waitUntilDone:NO;
-            sys->glView performSelectorOnMainThread:@selector(setFrameToBoundsOfView:)
-                                          withObject:NSValue valueWithPointer:parentView
-                                       waitUntilDone:NO;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                NSView *parentView = container;
+                parentView addSubview:sys->glView;
+                sys->glView setFrame:parentView bounds;
+            });
         } else {
             msg_Err(vd, "Invalid drawable-nsobject object. drawable-nsobject must either be an NSView or comply to the @protocol VLCVideoViewEmbedding.");
             goto error;
@@ -274,18 +276,17 @@
             vlc_object_delete(sys->gl);
         }
 
-        VLCOpenGLVideoView *glView = sys->glView;
-        id<VLCVideoViewEmbedding> viewContainer = sys->container;
         dispatch_async(dispatch_get_main_queue(), ^{
-            if (viewContainer respondsToSelector:@selector(removeVoutSubview:)) {
+            if (sys->container respondsToSelector:@selector(removeVoutSubview:)) {
                 /* This will retain sys->glView */
-                viewContainer removeVoutSubview:sys->glView;
+                sys->container removeVoutSubview:sys->glView;
             }
 
             /* release on main thread as explained in Open() */
-            viewContainer release;
-            glView removeFromSuperview;
-            glView release;
+            sys->container = nil;
+            sys->glView removeFromSuperview;
+            sys->glView = nil;
+            free(sys);
         });
     }
 }
@@ -320,11 +321,10 @@
         {
             sys->glView render;
             vlc_gl_ReleaseCurrent(sys->gl);
-            vlc_gl_Swap(sys->gl);
         }
         sys->glView setVoutFlushing:NO;
+        sys->has_first_frame = true;
     }
-    sys->has_first_frame = true;
 }
 
 static void UpdatePlace (vout_display_t *vd, const vout_display_cfg_t *cfg)
@@ -417,13 +417,6 @@
 
 #define VLCAssertMainThread() assert(NSThread currentThread isMainThread)
 
-
-+ (void)getNewView:(NSValue *)value
-{
-    id *ret = value pointerValue;
-    *ret = self alloc init;
-}
-
 /**
  * Gets called by the Open() method.
  */
@@ -451,7 +444,6 @@
         return nil;
 
     self = super initWithFrame:NSMakeRect(0,0,10,10) pixelFormat:fmt;
-    fmt release;
 
     if (!self)
         return nil;
@@ -489,16 +481,6 @@
 - (void)dealloc
 {
     NSNotificationCenter.defaultCenter removeObserver:self;
-    super dealloc;
-}
-
-/**
- * Gets called by the Open() method.
- */
-- (void)setFrameToBoundsOfView:(NSValue *)value
-{
-    NSView *parentView = value pointerValue;
-    self setFrame:parentView bounds;
 }
 
 /**

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/meson.build Changed

@@ -93,6 +93,22 @@
     'sources' : files('vgl.c')
 }
 
+vlc_modules += {
+    'name' : 'decklinkoutput',
+    'sources' : files('decklink.cpp',
+                    '../stream_out/sdi/Ancillary.cpp',
+                    '../stream_out/sdi/Ancillary.hpp',
+                    '../stream_out/sdi/DBMHelper.cpp',
+                    '../stream_out/sdi/DBMHelper.hpp',
+                    '../stream_out/sdi/SDIGenerator.cpp',
+                    '../stream_out/sdi/SDIGenerator.hpp',
+                    '../stream_out/sdi/V210.cpp',
+                    '../stream_out/sdi/V210.hpp'),
+    'dependencies' : dl_lib, decklink_dep,
+    'cpp_args' : decklink_cpp_args,
+    'enabled' : decklink_dep.found(),
+}
+
 # Kernel Mode Setting
 drm_dep = dependency('libdrm', version: '>= 2.4.83', required: get_option('drm'))
 if drm_dep.found()
@@ -105,12 +121,15 @@
 
 # Coloured ASCII art (Caca)
 caca_dep = dependency('caca', version: '>= 0.99.beta14', required: get_option('caca'))
+caca_deps =  caca_dep 
+if not (host_system in 'windows', 'darwin')
+    caca_deps += x11_dep
+endif
 if caca_dep.found()
     vlc_modules += {
         'name' : 'caca',
         'sources' : files('caca.c'),
-        'dependencies' : caca_dep, x11_dep
-        # TODO: Properly conditonalize X11 dependency
+        'dependencies' : caca_deps,
     }
 endif

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/display.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/display.c Changed

@@ -78,6 +78,12 @@
     vout_display_place_t place;
     bool place_changed;
     bool is_dirty;
+    bool restart_renderer;
+
+    struct {
+        vlc_stereoscopic_mode_t mode;
+        bool changed;
+    } stereo;
 
     struct {
         PFNGLFLUSHPROC Flush;
@@ -116,26 +122,11 @@
     /* Force to recompute the viewport on next picture */
     sys->place_changed = true;
 
-    /* Restore viewpoint */
-    int vp_ret = vout_display_opengl_SetViewpoint(sys->vgl, &sys->viewpoint);
-    /* The viewpoint previously applied is necessarily valid */
-    assert(vp_ret == VLC_SUCCESS);
-    (void) vp_ret;
-
     vlc_gl_ReleaseCurrent(sys->gl);
 
     return ret;
 }
 
-static const struct vlc_display_operations ops = {
-    .close = Close,
-    .prepare = PictureRender,
-    .display = PictureDisplay,
-    .control = Control,
-    .set_viewpoint = SetViewpoint,
-    .update_format = UpdateFormat,
-};
-
 static void PlacePicture(vout_display_t *vd, vout_display_place_t *place,
                          struct vout_display_placement dp)
 {
@@ -173,6 +164,41 @@
     video_format_Clean(&source);
 }
 
+static void UpdateConfig(vout_display_t *vd)
+{
+    vout_display_sys_t *sys = vd->sys;
+    PlacePicture(vd, &sys->place, vd->cfg->display);
+    sys->place_changed = true;
+}
+
+static int ChangeSourceProjection(vout_display_t *vd, video_projection_mode_t projection)
+{
+    vout_display_sys_t *sys = vd->sys;
+    UpdateConfig(vd);
+    sys->restart_renderer = true;
+    return VLC_SUCCESS;
+}
+
+static int SetStereoMode(vout_display_t *vd, vlc_stereoscopic_mode_t mode)
+{
+    vout_display_sys_t *sys = vd->sys;
+    UpdateConfig(vd);
+    sys->stereo.mode = mode;
+    sys->stereo.changed = true;
+    return VLC_SUCCESS;
+}
+
+static const struct vlc_display_operations ops = {
+    .close = Close,
+    .prepare = PictureRender,
+    .display = PictureDisplay,
+    .control = Control,
+    .set_viewpoint = SetViewpoint,
+    .update_format = UpdateFormat,
+    .change_source_projection = ChangeSourceProjection,
+    .set_stereo = SetStereoMode,
+};
+
 /**
  * Allocates a surface and an OpenGL context for video output.
  */
@@ -226,6 +252,7 @@
     struct vout_display_placement dp = vd->cfg->display;
     PlacePicture(vd, &sys->place, dp);
     sys->place_changed = true;
+    sys->stereo.changed = false;
     vlc_gl_Resize (sys->gl, vd->cfg->display.width, vd->cfg->display.height);
 
     /* Initialize video display */
@@ -287,8 +314,18 @@
 
     if (vlc_gl_MakeCurrent (sys->gl) == VLC_SUCCESS)
     {
-        vout_display_opengl_Prepare (sys->vgl, pic, subpicture);
-        sys->vt.Flush();
+        if (sys->stereo.changed)
+        {
+            vout_display_opengl_ChangeStereoMode(sys->vgl, sys->stereo.mode);
+            sys->stereo.changed = false;
+        }
+
+        if (sys->restart_renderer)
+        {
+            vout_display_opengl_ChangeProjection(sys->vgl, vd->cfg->projection);
+            sys->restart_renderer = false;
+        }
+
         if (sys->place_changed)
         {
             vout_display_opengl_SetOutputSize(sys->vgl, vd->cfg->display.width,
@@ -297,7 +334,10 @@
                                          sys->place.width, sys->place.height);
             sys->place_changed = false;
         }
+
+        vout_display_opengl_Prepare (sys->vgl, pic, subpicture);
         vout_display_opengl_Display(sys->vgl);
+
         sys->vt.Flush();
         vlc_gl_ReleaseCurrent (sys->gl);
         sys->is_dirty = true;
@@ -321,21 +361,24 @@
     switch (query)
     {
 
-      case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
-        vlc_gl_Resize (sys->gl, vd->cfg->display.width, vd->cfg->display.height);
-        // fallthrough
-      case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
-      case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
-      case VOUT_DISPLAY_CHANGE_SOURCE_PLACE:
-      {
-        struct vout_display_placement dp = vd->cfg->display;
-
-        PlacePicture(vd, &sys->place, dp);
-        sys->place_changed = true;
-        return VLC_SUCCESS;
-      }
-      default:
-        msg_Err (vd, "Unknown request %d", query);
+        case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
+            UpdateConfig(vd);
+            vlc_gl_Resize (sys->gl, vd->cfg->display.width, vd->cfg->display.height);
+            // fallthrough
+        case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
+        case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
+        case VOUT_DISPLAY_CHANGE_SOURCE_PLACE:
+        {
+            struct vout_display_placement dp = vd->cfg->display;
+
+            PlacePicture(vd, &sys->place, dp);
+            sys->place_changed = true;
+            UpdateConfig(vd);
+            return VLC_SUCCESS;
+        }
+
+        default:
+            msg_Err (vd, "Unknown request %d", query);
     }
     return VLC_EGENERIC;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/egl.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/egl.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/filters.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/filters.c Changed

@@ -4,6 +4,8 @@
  * Copyright (C) 2020 VLC authors and VideoLAN
  * Copyright (C) 2020 Videolabs
  *
+ * Authors: Alexandre Janniaux <ajanni@videolabs.io>
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or
@@ -206,6 +208,84 @@
     free(filters);
 }
 
+static struct vlc_gl_filter_priv *
+vlc_gl_filters_CreateNewFilter(struct vlc_gl_filters *filters,
+                               struct vlc_gl_filter_priv *prev_filter,
+                               const char *name,
+                               const config_chain_t *config)
+{
+    struct vlc_gl_filter *filter = vlc_gl_filter_New(filters->gl, filters->api);
+    if (!filter)
+        return NULL;
+    filter->gl = filters->gl;
+
+    struct vlc_gl_filter_priv *priv = vlc_gl_filter_PRIV(filter);
+    vlc_list_init(&priv->blend_subfilters);
+
+    struct vlc_gl_tex_size size_in;
+    struct vlc_gl_format *glfmt = &priv->glfmt_in;
+
+    if (!prev_filter)
+    {
+        size_in.width = filters->interop->fmt_out.i_visible_width;
+        size_in.height = filters->interop->fmt_out.i_visible_height;
+
+        assert(filters->importer);
+        *glfmt = filters->importer->glfmt;
+    }
+    else
+    {
+        size_in = prev_filter->size_out;
+
+        /* If the previous filter operated on planes, then its output chroma is
+         * the same as its input chroma. Otherwise, it's RGBA. */
+        vlc_fourcc_t chroma = prev_filter->filter.config.filter_planes
+                            ? prev_filter->glfmt_in.fmt.i_chroma
+                            : VLC_CODEC_RGBA;
+
+        video_format_t *fmt = &glfmt->fmt;
+        video_format_Init(fmt, chroma);
+        fmt->i_width = fmt->i_visible_width = prev_filter->size_out.width;
+        fmt->i_height = fmt->i_visible_height = prev_filter->size_out.height;
+
+        glfmt->tex_target = GL_TEXTURE_2D;
+        glfmt->tex_count = prev_filter->plane_count;
+
+        size_t size = glfmt->tex_count * sizeof(GLsizei);
+        memcpy(glfmt->tex_widths, prev_filter->plane_widths, size);
+        memcpy(glfmt->tex_heights, prev_filter->plane_heights, size);
+    }
+
+    /* By default, the output size is the same as the input size. The filter
+     * may change it during its Open(). */
+    priv->size_out = size_in;
+
+    int ret = vlc_gl_filter_LoadModule(filters->gl, name, filter, config,
+                                       glfmt, &priv->size_out);
+    if (ret != VLC_SUCCESS)
+    {
+        /* Creation failed, do not call close() */
+        msg_Err(filters->gl, "Could not load OpenGL filter '%s'", name);
+        filter->ops = NULL;
+        vlc_gl_filter_Delete(filter);
+        return NULL;
+    }
+
+    /* A blend filter may not change its output size. */
+    assert(!filter->config.blend
+           || (priv->size_out.width == size_in.width
+            && priv->size_out.height == size_in.height));
+
+    /* A filter operating on planes may not blend. */
+    assert(!filter->config.filter_planes || !filter->config.blend);
+
+    /* A filter operating on planes may not use anti-aliasing. */
+    assert(!filter->config.filter_planes || !filter->config.msaa_level);
+    vlc_gl_filter_InitPlaneSizes(filter);
+
+    return priv;
+}
+
 struct vlc_gl_filter *
 vlc_gl_filters_Append(struct vlc_gl_filters *filters, const char *name,
                       const config_chain_t *config)
@@ -313,6 +393,36 @@
     return filter;
 }
 
+struct vlc_gl_filter *
+vlc_gl_filters_Replace(struct vlc_gl_filters *filters, struct vlc_gl_filter *old_filter,
+                       const char *name, const config_chain_t *config)
+{
+    struct vlc_gl_filter_priv *old_priv = vlc_gl_filter_PRIV(old_filter);
+    struct vlc_gl_filter *prev_filter = NULL;
+    struct vlc_gl_filter_priv *priv_prev = vlc_gl_filter_PRIV(prev_filter);
+
+    struct vlc_gl_filter_priv *new_filter = vlc_gl_filters_CreateNewFilter(filters, priv_prev, name, config);
+    if (new_filter == NULL)
+        return NULL;
+
+    assert(!new_filter->filter.config.blend && !old_filter->config.blend);
+    vlc_gl_filter_InitPlaneSizes(old_filter);
+
+    /* Move previous subfilter to the new filter */
+    struct vlc_gl_filter_priv *subfilter;
+    vlc_list_foreach(subfilter, &old_priv->blend_subfilters, node)
+    {
+        vlc_list_remove(&subfilter->node);
+        vlc_list_append(&subfilter->node, &new_filter->blend_subfilters);
+    }
+
+    /* Append to the main filter list */
+    vlc_list_replace(&old_priv->node, &new_filter->node);
+    vlc_gl_filter_Delete(old_filter);
+
+    return &new_filter->filter;
+}
+
 int
 vlc_gl_filters_InitFramebuffers(struct vlc_gl_filters *filters)
 {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/filters.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/filters.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/gl_common.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/gl_common.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/importer.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/importer.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/interop.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/interop.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/interop_android.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/interop_android.c Changed

@@ -180,7 +180,10 @@
     struct priv *priv = interop->priv;
 
     if (priv->previous_texture)
+    {
         SurfaceTexture_detachFromGLContext(priv->previous_texture);
+        SurfaceTexture_releaseTexImage(priv->previous_texture);
+    }
 
     if (priv->current_picture)
         picture_Release(priv->current_picture);
@@ -238,8 +241,22 @@
     interop->ops = &ops;
 
     interop->tex_target = GL_TEXTURE_EXTERNAL_OES;
-    interop->fmt_out.i_chroma = VLC_CODEC_RGBA;
-    interop->fmt_out.space = COLOR_SPACE_UNDEF;
+    if (vlc_gl_HasExtension(&extension_vt, "GL_EXT_YUV_target"))
+    {
+        msg_Warn(&interop->obj, "GL_EXT_YUV_target is available,"
+                " using it.");
+        /* We represent as Packed YUV 4:4:4 since there is a single
+         * texture target available. */
+        interop->fmt_out.i_chroma = VLC_CODEC_V308;
+        interop->fmt_out.space = interop->fmt_in.space;
+        interop->fmt_out.primaries = interop->fmt_in.primaries;
+        interop->fmt_out.transfer = interop->fmt_in.transfer;
+    }
+    else
+    {
+        interop->fmt_out.i_chroma = VLC_CODEC_RGBA;
+        interop->fmt_out.space = COLOR_SPACE_UNDEF;
+    }
 
     interop->tex_count = 1;
     interop->texs0 = (struct vlc_gl_tex_cfg) {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/interop_dxva2.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/interop_dxva2.c Changed

@@ -75,7 +75,6 @@
 
     /* range converter */
     struct {
-        HMODULE                 dll;
         IDXVAHD_VideoProcessor *proc;
     } processor;
 };
@@ -183,6 +182,7 @@
 static void
 GLConvDeallocateTextures(const struct vlc_gl_interop *interop, uint32_t textures)
 {
+    (void)textures;
     struct glpriv *priv = interop->priv;
 
     if (priv->gl_handle_d3d && priv->gl_render)
@@ -205,7 +205,6 @@
     if (priv->processor.proc)
     {
         IDXVAHD_VideoProcessor_Release(priv->processor.proc);
-        FreeLibrary(priv->processor.dll);
     }
 
     if (priv->dx_render)
@@ -272,28 +271,10 @@
 
     HRESULT hr;
 
-    sys->processor.dll = LoadLibrary(TEXT("DXVA2.DLL"));
-    if (unlikely(!sys->processor.dll))
-    {
-        msg_Err(interop, "Failed to load DXVA2.DLL");
-        return VLC_EGENERIC;
-    }
-
     D3DFORMAT *formatsList = NULL;
     DXVAHD_VPCAPS *capsList = NULL;
     IDXVAHD_Device *hd_device = NULL;
 
-#ifdef __MINGW64_VERSION_MAJOR
-    typedef HRESULT (WINAPI* PDXVAHD_CreateDevice)(IDirect3DDevice9Ex *,const DXVAHD_CONTENT_DESC *,DXVAHD_DEVICE_USAGE,PDXVAHDSW_Plugin,IDXVAHD_Device **);
-#endif
-    PDXVAHD_CreateDevice CreateDevice;
-    CreateDevice = (PDXVAHD_CreateDevice)GetProcAddress(sys->processor.dll, "DXVAHD_CreateDevice");
-    if (CreateDevice == NULL)
-    {
-        msg_Err(interop, "Can't create HD device (not Windows 7+)");
-        goto error;
-    }
-
     DXVAHD_CONTENT_DESC desc;
     desc.InputFrameFormat = DXVAHD_FRAME_FORMAT_PROGRESSIVE;
     GetFrameRate( &desc.InputFrameRate, &interop->fmt_in );
@@ -303,7 +284,7 @@
     desc.OutputWidth      = interop->fmt_in.i_visible_width;
     desc.OutputHeight     = interop->fmt_in.i_visible_height;
 
-    hr = CreateDevice(devex, &desc, DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL, NULL, &hd_device);
+    hr = DXVAHD_CreateDevice(devex, &desc, DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL, NULL, &hd_device);
     if (FAILED(hr))
     {
         msg_Dbg(interop, "Failed to create the device (error 0x%lX)", hr);
@@ -404,7 +385,6 @@
     free(formatsList);
     if (hd_device)
         IDXVAHD_Device_Release(hd_device);
-    FreeLibrary(sys->processor.dll);
     return VLC_EGENERIC;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/interop_sw.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/interop_sw.c Changed

@@ -47,7 +47,9 @@
 {
     bool   has_gl_3;
     bool   has_texture_rg;
+    bool   has_texture_integer;
     bool   has_unpack_subimage;
+    bool   unsigned_sampler;
     void * texture_temp_buf;
     size_t texture_temp_buf_size;
     struct {
@@ -70,7 +72,8 @@
         X(PFNGLBUFFERSUBDATAPROC,   BufferSubData) \
         X(PFNGLDELETEBUFFERSPROC,   DeleteBuffers) \
         X(PFNGLGENBUFFERSPROC,      GenBuffers) \
-        X(PFNGLPIXELSTOREIPROC,     PixelStorei)
+        X(PFNGLPIXELSTOREIPROC,     PixelStorei) \
+        X(PFNGLTEXPARAMETERIPROC,   TexParameteri)
     struct {
 #define DECLARE_SYMBOL(type, name) type name;
         OPENGL_VTABLE_F(DECLARE_SYMBOL)
@@ -246,6 +249,14 @@
         priv->gl.TexImage2D(interop->tex_target, 0, interop->texsi.internal,
                                 tex_widthi, tex_heighti, 0, interop->texsi.format,
                                 interop->texsi.type, NULL);
+
+        /* Integer textures cannot be filtered using GL_LINEAR. They must use
+         * GL_NEAREST. */
+        if (priv->unsigned_sampler)
+        {
+            priv->gl.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+            priv->gl.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        }
         GL_ASSERT_NOERROR(&priv->gl);
     }
     return VLC_SUCCESS;
@@ -368,67 +379,135 @@
         r->den *= 2;
 }
 
-static bool fixGLFormat(struct vlc_gl_interop *interop, GLint* intfmt, GLint* fmt)
+static bool fixGLFormat(struct vlc_gl_interop *interop, unsigned pixel_size,
+                        GLint* intfmt, GLint* fmt, GLint *type)
 {
     struct priv *priv = interop->priv;
     if (*intfmt == 0)
         return true;
 
-    //GLES 3.0, OpenGL 3.0 and OpenGL with GL_ARB_texture_rg
-    //don't need transformations
-    if (priv->has_gl_3
-        || (priv->has_texture_rg && interop->gl->api_type == VLC_OPENGL))
-        return true;
+    bool gles2, gles3, gl2, gl3;
+    if (priv->has_gl_3)
+    {
+        gl3 = interop->gl->api_type == VLC_OPENGL;
+        gl2 = false;
+        gles3 = interop->gl->api_type == VLC_OPENGL_ES2;
+        gles2 = false;
+    }
+    else
+    {
+        gl3 = false;
+        gl2 = interop->gl->api_type == VLC_OPENGL;
+        gles3 = false;
+        gles2 = interop->gl->api_type == VLC_OPENGL_ES2;
+    }
+    assert(gl3 || gl2 || gles3 || gles2);
 
-    //for GLES2 GL_EXT_texture_rg we need to use GL_RED/GL_RG as internal format
-    if (priv->has_texture_rg)
+    if (gles3)
     {
         switch (*intfmt) {
         case GL_R8:
+        case GL_RG8:
+            break;
+        case GL_R16:
+            if (priv->has_texture_integer)
+            {
+                msg_Dbg(interop->gl, "fallback to GL_R16UI");
+                *intfmt = GL_R16UI;
+                *fmt = GL_RED_INTEGER;
+            }
+
+            /* Android is unlikely to support GL_R16UI or GL_R16: */
+            if (vlc_gl_interop_GetTexFormatSize(interop, GL_TEXTURE_2D, *fmt,
+                                                *intfmt, *type) != 16)
+            {
+                /* XXX: Quality loss with 12 and 16bits since half float has
+                 * 10bits of mantissa */
+                msg_Dbg(interop->gl, "fallback to GL_R16F");
+                *intfmt = GL_R16F;
+                *fmt = GL_RED;
+                *type = GL_HALF_FLOAT;
+            }
+            break;
+        case GL_RG16:
+            if (priv->has_texture_integer)
+            {
+                msg_Dbg(interop->gl, "fallback to GL_R1G6UI ?");
+                *intfmt = GL_RG16UI;
+                *fmt = GL_RED_INTEGER;
+            }
+            /* XXX Is GL_RG16F possible with semi planar ? */
+            break;
+        default:
+            vlc_assert_unreachable();
+        }
+    }
+    else if (gles2 && priv->has_texture_rg)
+    {
+        //for GLES2 GL_EXT_texture_rg we need to use GL_RED/GL_RG as internal format
+        switch (*intfmt) {
+        case GL_R8:
+            msg_Dbg(interop->gl, "fallback to GL_GED");
             *intfmt = GL_RED;
             *fmt = GL_RED;
             break;
         case GL_RG8:
+            msg_Dbg(interop->gl, "fallback to GL_RG8");
             *intfmt = GL_RG;
             *fmt = GL_RG;
             break;
-        case GL_R16UI:
-        case GL_RG16UI:
+        case GL_R16:
+        case GL_RG16:
             return false;
         default:
             vlc_assert_unreachable();
         }
-
-        return true;
     }
+    else if (gles2 || (gl2 && !priv->has_texture_rg))
+    {
+        //fallback to GL_LUMINANCE / GL_LUMINANCE_ALPHA
+        switch (*intfmt) {
+        case GL_R8:
+            msg_Dbg(interop->gl, "fallback to GL_LUMINANCE");
+            *intfmt = GL_LUMINANCE;
+            *fmt = GL_LUMINANCE;
+            break;
+        case GL_R16:
+            if (gles2)
+                return false;
 
-    //fallback to GL_LUMINANCE / GL_LUMINANCE_ALPHA
-    switch (*intfmt) {
-    case GL_R8:
-        *intfmt = GL_LUMINANCE;
-        *fmt = GL_LUMINANCE;
-        break;
-    case GL_R16UI:
-        if (interop->gl->api_type == VLC_OPENGL_ES2)
-            return false;
-
-        *intfmt = GL_LUMINANCE16;
-        *fmt = GL_LUMINANCE;
-        break;
-    case GL_RG8:
-        *intfmt = GL_LUMINANCE_ALPHA;
-        *fmt = GL_LUMINANCE_ALPHA;
-        break;
-    case GL_RG16UI:
-        if (interop->gl->api_type == VLC_OPENGL_ES2)
-            return false;
+            msg_Dbg(interop->gl, "fallback to GL_LUMINANCE16");
+            *intfmt = GL_LUMINANCE16;
+            *fmt = GL_LUMINANCE;
+            break;
+        case GL_RG8:
+            msg_Dbg(interop->gl, "fallback to GL_LUMINANCE_ALPHA");
+            *intfmt = GL_LUMINANCE_ALPHA;
+            *fmt = GL_LUMINANCE_ALPHA;
+            break;
+        case GL_RG16:
+            if (gles2)
+                return false;
 
-        *intfmt = GL_LUMINANCE16_ALPHA16;
-        *fmt = GL_LUMINANCE_ALPHA;
-        break;
-    default:
-        vlc_assert_unreachable();
+            msg_Dbg(interop->gl, "fallback to GL_LUMINANCE16_ALPHA16");
+            *intfmt = GL_LUMINANCE16_ALPHA16;
+            *fmt = GL_LUMINANCE_ALPHA;
+            break;
+        default:
+            vlc_assert_unreachable();
+        }
+    }
+    else
+    {
+        //OpenGL 3.0 and OpenGL with GL_ARB_texture_rg
+        //don't need transformations
+        assert(gl3 || (gl2 && priv->has_texture_rg));
     }
+
+    if (pixel_size == 2
+     && vlc_gl_interop_GetTexFormatSize(interop, GL_TEXTURE_2D, *fmt,
+                                        *intfmt, *type) != 16)
+        return false;
     return true;
 }
 
@@ -449,12 +528,12 @@
             // 8 bits pixels
             { GL_R8, GL_RED, 0, 0, GL_UNSIGNED_BYTE, 0 },
             // 16 bits pixels
-            { GL_R16UI, GL_RED, 0, 0, GL_UNSIGNED_SHORT, 0 },
+            { GL_R16, GL_RED, 0, 0, GL_UNSIGNED_SHORT, 0 },
         // 2 planes
             // 8 bits pixels
             { GL_R8, GL_RED, GL_RG8, GL_RG, GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE },
             // 16 bits pixels
-            { GL_R16UI, GL_RED, GL_RG16UI, GL_RG_INTEGER, GL_UNSIGNED_SHORT, GL_UNSIGNED_SHORT },
+            { GL_R16, GL_RED, GL_RG16, GL_RG, GL_UNSIGNED_SHORT, GL_UNSIGNED_SHORT },
         // 1 plane is a special case that will be handled explicitly
     };
 
@@ -481,17 +560,18 @@
          * #26712. */
         GLint intfmt = GL_RG8;
         GLint fmt = GL_RG;
-        if (!fixGLFormat(interop, &intfmt, &fmt))
+        GLint type = GL_UNSIGNED_BYTE;
+        if (!fixGLFormat(interop, desc->pixel_size, &intfmt, &fmt, &type))
             return VLC_EGENERIC;
 
         interop->tex_count = 2;
         interop->texs0 = (struct vlc_gl_tex_cfg) {
             { 1, 1 }, { 1, 1 },
-            intfmt, fmt, GL_UNSIGNED_BYTE
+            intfmt, fmt, type
         };
         interop->texs1 = (struct vlc_gl_tex_cfg) {
             { 1, 2 }, { 1, 1 },
-            GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE
+            GL_RGBA, GL_RGBA, type
         };
         return VLC_SUCCESS;
     }
@@ -527,27 +607,23 @@
 
     GLint plane1_intfmt = format->intfmt;
     GLint plane1_fmt = format->fmt;
-    if (!fixGLFormat(interop, &plane1_intfmt, &plane1_fmt))
+    GLint plane1_type = format->type;
+    if (!fixGLFormat(interop, desc->pixel_size, &plane1_intfmt, &plane1_fmt,
+                     &plane1_type))
         return VLC_EGENERIC;
 
     GLint plane2_intfmt = format->plane2_intfmt;
     GLint plane2_fmt = format->plane2_fmt;
-    if (!fixGLFormat(interop, &plane2_intfmt, &plane2_fmt))
+    GLint plane2_type = format->plane2_type;
+    if (!fixGLFormat(interop, desc->pixel_size, &plane2_intfmt, &plane2_fmt,
+                     &plane2_type))
         return VLC_EGENERIC;
 
     msg_Dbg(interop, "Using format at index %u", format_index);
     msg_Dbg(interop, "Plane1: fmt=%#x intfmt=%#x type=%#x", plane1_fmt,
-            plane1_intfmt, format->type);
+            plane1_intfmt, plane1_type);
     msg_Dbg(interop, "Plane2: fmt=%#x intfmt=%#x type=%#x", plane2_fmt,
-            plane2_intfmt, format->plane2_type);
-
-
-    if (desc->pixel_size == 2)
-    {
-        if (vlc_gl_interop_GetTexFormatSize(interop, GL_TEXTURE_2D, format->fmt,
-                                            format->intfmt, GL_UNSIGNED_SHORT) != 16)
-            return VLC_EGENERIC;
-    }
+            plane2_intfmt, plane2_type);
 
     if (desc->plane_count >= 3)
     {
@@ -557,7 +633,7 @@
             interop->texsi = (struct vlc_gl_tex_cfg) {
                 { desc->pi.w.num, desc->pi.w.den },
                 { desc->pi.h.num, desc->pi.h.den },
-                plane1_intfmt, plane1_fmt, format->type
+                plane1_intfmt, plane1_fmt, plane1_type
             };
         }
     }
@@ -565,22 +641,15 @@
     {
         interop->tex_count = 2;
 
-        if (desc->pixel_size == 2 &&
-            vlc_gl_interop_GetTexFormatSize(interop, GL_TEXTURE_2D, format->plane2_fmt,
-                format->plane2_intfmt, format->plane2_type) != 16)
-        {
-            return VLC_EGENERIC;
-        }
-
         interop->texs0 = (struct vlc_gl_tex_cfg) {
             { desc->p0.w.num, desc->p0.w.den },
             { desc->p0.h.num, desc->p0.h.den },
-            plane1_intfmt, plane1_fmt, format->type
+            plane1_intfmt, plane1_fmt, plane1_type
         };
         interop->texs1 = (struct vlc_gl_tex_cfg) {
             { desc->p1.w.num, desc->p1.w.den },
             { desc->p1.h.num, desc->p1.h.den },
-            plane2_intfmt, plane2_fmt, format->plane2_type
+            plane2_intfmt, plane2_fmt, plane2_type
         };
 
         /*
@@ -655,7 +724,7 @@
 {
     const vlc_chroma_description_t *desc =
         vlc_fourcc_GetChromaDescription(chroma);
-    if (!desc)
+    if (!desc || desc->plane_count == 0)
         return VLC_EGENERIC;
 
     assert(!interop->fmt_out.p_palette);
@@ -718,8 +787,11 @@
         || (interop->gl->api_type == VLC_OPENGL_ES2
             && vlc_gl_HasExtension(&extension_vt, "GL_EXT_texture_rg"));
 
+    priv->has_texture_integer = priv->has_gl_3 &&
+        (interop->gl->api_type == VLC_OPENGL
+        || vlc_gl_HasExtension(&extension_vt, "GL_EXT_texture_integer"));
+
     video_color_space_t space;
-    const vlc_fourcc_t *list;
     const bool is_yup = vlc_fourcc_IsYUV(interop->fmt_in.i_chroma);
 
     if (is_yup)
@@ -729,19 +801,10 @@
         if (max_texture_units < 3)
             goto error;
 
-        list = vlc_fourcc_GetYUVFallback(interop->fmt_in.i_chroma);
         space = interop->fmt_in.space;
     }
-    else if (interop->fmt_in.i_chroma == VLC_CODEC_XYZ_12B)
-    {
-        list = NULL;
-        space = COLOR_SPACE_UNDEF;
-    }
     else
-    {
-        list = vlc_fourcc_GetRGBFallback(interop->fmt_in.i_chroma);
         space = COLOR_SPACE_UNDEF;
-    }
 
     /* The pictures are uploaded upside-down */
     video_format_TransformBy(&interop->fmt_out, TRANSFORM_VFLIP);
@@ -760,20 +823,30 @@
             goto interop_init;
     }
 
+    vlc_fourcc_t *list = NULL;
+    if (is_yup)
+        list = vlc_fourcc_GetYUVFallback(interop->fmt_in.i_chroma);
+    else if (interop->fmt_in.i_chroma != VLC_CODEC_XYZ_12B)
+        list = vlc_fourcc_GetRGBFallback(interop->fmt_in.i_chroma);
+
     if (list == NULL)
         goto error;
 
     /* Check whether any fallback for the chroma is translatable to OpenGL. */
-    while (*list)
+    for (const vlc_fourcc_t *fcc = list; *fcc; fcc++)
     {
-        ret = opengl_interop_init(interop, *list, space);
+        ret = opengl_interop_init(interop, *fcc, space);
         if (ret == VLC_SUCCESS)
         {
-            i_chroma = *list;
+            i_chroma = *fcc;
+            msg_Warn(interop->gl, "direct rendering failed for %4.4s, "
+                     "fallback to %4.4s",
+                     (const char *)&interop->fmt_in.i_chroma,
+                     (const char *)&i_chroma);
             goto interop_init;
         }
-        list++;
     }
+    free(list);
 
     goto error;
 
@@ -790,6 +863,17 @@
     };
     interop->ops = &ops;
 
+    switch (interop->texs0.format)
+    {
+        case GL_RED_INTEGER:
+        case GL_RG_INTEGER:
+            priv->unsigned_sampler = true;
+            break;
+        default:
+            priv->unsigned_sampler = false;
+            break;
+    }
+
     if (allow_dr && priv->has_unpack_subimage)
     {
         /* Ensure we do direct rendering / PBO with OpenGL 3.0 or higher. */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/interop_vaapi.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/interop_vaapi.c Changed

@@ -126,8 +126,6 @@
 static void
 vaegl_release_last_pic(const struct vlc_gl_interop *interop, struct priv *priv)
 {
-    vlc_object_t *o = VLC_OBJECT(interop->gl);
-
     for (unsigned i = 0; i < priv->last.num_planes; ++i)
         vaegl_image_destroy(interop, priv->last.egl_imagesi);
 
@@ -152,36 +150,10 @@
             priv->drm_fourccs1 = VLC_FOURCC('G', 'R', '8', '8');
             break;
         case VA_FOURCC_P010:
+        case VA_FOURCC_P012:
             priv->drm_fourccs0 = VLC_FOURCC('R', '1', '6', ' ');
             priv->drm_fourccs1 = VLC_FOURCC('G', 'R', '3', '2');
             break;
-#if 0
-        /* TODO: the following fourcc are not handled for now */
-        case VA_FOURCC_RGBA:
-            priv->drm_fourccs0 = VLC_FOURCC('G', 'R', '3', '2');
-            break;
-        case VA_FOURCC_BGRA:
-            priv->drm_fourccs0 = VLC_FOURCC('G', 'R', '3', '2');
-            break;
-        case VA_FOURCC_YV12:
-            priv->drm_fourccs0 = VLC_FOURCC('R', '8', ' ', ' ');
-            priv->drm_fourccs1 = VLC_FOURCC('R', '8', ' ', ' ');
-            priv->drm_fourccs2 = VLC_FOURCC('R', '8', ' ', ' ');
-            break;
-        case VA_FOURCC_422H:
-            priv->drm_fourccs0 = VLC_FOURCC('R', '8', ' ', ' ');
-            priv->drm_fourccs1 = VLC_FOURCC('R', '8', ' ', ' ');
-            priv->drm_fourccs2 = VLC_FOURCC('R', '8', ' ', ' ');
-            break;
-        case VA_FOURCC_UYVY:
-            priv->drm_fourccs0 = VLC_FOURCC('R', '1', '6', ' ');
-            break;
-        case VA_FOURCC_444P:
-            priv->drm_fourccs0 = VLC_FOURCC('R', '1', '6', ' ');
-            priv->drm_fourccs1 = VLC_FOURCC('R', '1', '6', ' ');
-            priv->drm_fourccs2 = VLC_FOURCC('R', '1', '6', ' ');
-            break;
-#endif
         default: return VLC_EGENERIC;
     }
     priv->fourcc = va_fourcc;
@@ -196,6 +168,21 @@
     (void) plane_offset;
     struct priv *priv = interop->priv;
     vlc_object_t *o = VLC_OBJECT(interop->gl);
+
+    if (pic == priv->last.pic)
+    {
+#if VA_CHECK_VERSION(1, 1, 0)
+        for (unsigned i = 0; i < priv->last.va_surface_descriptor.num_layers; ++i)
+#else
+        for (unsigned i = 0; i < priv->last.va_image.num_planes; ++i)
+#endif
+        {
+            priv->gl.BindTexture(interop->tex_target, texturesi);
+            priv->glEGLImageTargetTexture2DOES(interop->tex_target, priv->last.egl_imagesi);
+        }
+        return VLC_SUCCESS;
+    }
+
 #if VA_CHECK_VERSION(1, 1, 0)
     VADRMPRIMESurfaceDescriptor va_surface_descriptor;
 #else
@@ -206,43 +193,30 @@
     bool release_image = false, release_buffer_info = false;
     unsigned num_planes = 0;
 
-    if (pic == priv->last.pic)
-    {
-#if VA_CHECK_VERSION(1, 1, 0)
-        va_surface_descriptor = priv->last.va_surface_descriptor;
-#else
-        va_image = priv->last.va_image;
-#endif
-        for (unsigned i = 0; i < priv->last.num_planes; ++i)
-            egl_imagesi = priv->last.egl_imagesi;
-    }
-    else
-    {
 #if VA_CHECK_VERSION(1, 1, 0)
-        VA_CALL(o, vaSyncSurface, priv->vadpy, vlc_vaapi_PicGetSurface(pic));
-        if (vlc_vaapi_ExportSurfaceHandle(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic),
-                                          VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
-                                          VA_EXPORT_SURFACE_READ_ONLY | VA_EXPORT_SURFACE_SEPARATE_LAYERS,
-                                          &va_surface_descriptor))
-            goto error;
-        release_image = true;
+    VA_CALL(o, vaSyncSurface, priv->vadpy, vlc_vaapi_PicGetSurface(pic));
+    if (vlc_vaapi_ExportSurfaceHandle(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic),
+                                      VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
+                                      VA_EXPORT_SURFACE_READ_ONLY | VA_EXPORT_SURFACE_SEPARATE_LAYERS,
+                                      &va_surface_descriptor))
+        goto error;
+    release_image = true;
 #else
-        if (vlc_vaapi_DeriveImage(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic),
-                                  &va_image))
-            goto error;
-        release_image = true;
+    if (vlc_vaapi_DeriveImage(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic),
+                              &va_image))
+        goto error;
+    release_image = true;
 
-        assert(va_image.format.fourcc == priv->fourcc);
+    assert(va_image.format.fourcc == priv->fourcc);
 
-        va_buffer_info = (VABufferInfo) {
-            .mem_type = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME
-        };
-        if (vlc_vaapi_AcquireBufferHandle(o, priv->vadpy, va_image.buf,
-                                          &va_buffer_info))
-            goto error;
+    va_buffer_info = (VABufferInfo) {
+        .mem_type = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME
+    };
+    if (vlc_vaapi_AcquireBufferHandle(o, priv->vadpy, va_image.buf,
+                                      &va_buffer_info))
+        goto error;
 #endif
-        release_buffer_info = true;
-    }
+    release_buffer_info = true;
 
 #if VA_CHECK_VERSION(1, 1, 0)
     num_planes = va_surface_descriptor.num_layers;
@@ -282,22 +256,19 @@
     }
 #endif
 
-    if (pic != priv->last.pic)
-    {
-        if (priv->last.pic != NULL)
-            vaegl_release_last_pic(interop, priv);
-        priv->last.pic = picture_Hold(pic);
+    if (priv->last.pic != NULL)
+        vaegl_release_last_pic(interop, priv);
+    priv->last.pic = picture_Hold(pic);
 #if VA_CHECK_VERSION(1, 1, 0)
-        priv->last.va_surface_descriptor = va_surface_descriptor;
+    priv->last.va_surface_descriptor = va_surface_descriptor;
 #else
-        priv->last.va_image = va_image;
-        priv->last.va_buffer_info = va_buffer_info;
+    priv->last.va_image = va_image;
+    priv->last.va_buffer_info = va_buffer_info;
 #endif
-        priv->last.num_planes = num_planes;
+    priv->last.num_planes = num_planes;
 
-        for (unsigned i = 0; i < num_planes; ++i)
-            priv->last.egl_imagesi = egl_imagesi;
-    }
+    for (unsigned i = 0; i < num_planes; ++i)
+        priv->last.egl_imagesi = egl_imagesi;
 
     return VLC_SUCCESS;
 
@@ -370,7 +341,8 @@
 }
 
 static int
-tc_va_check_derive_image(const struct vlc_gl_interop *interop)
+tc_va_check_derive_image(const struct vlc_gl_interop *interop,
+                         vlc_fourcc_t sw_chroma)
 {
     vlc_object_t *o = VLC_OBJECT(interop->gl);
     struct priv *priv = interop->priv;
@@ -390,7 +362,8 @@
     assert(va_image.format.fourcc == priv->fourcc);
 
     const vlc_chroma_description_t *image_desc =
-        vlc_fourcc_GetChromaDescription(va_image.format.fourcc);
+        vlc_fourcc_GetChromaDescription(sw_chroma);
+    assert(image_desc != NULL);
     assert(image_desc->plane_count == va_image.num_planes);
 
     VABufferInfo va_buffer_info = (VABufferInfo) {
@@ -435,6 +408,29 @@
     return ret;
 }
 
+static void
+GetChromaVaFourcc(vlc_fourcc_t opaque_chroma, int *va_fourcc,
+                  vlc_fourcc_t *sw_chroma)
+{
+    switch (opaque_chroma)
+    {
+        case VLC_CODEC_VAAPI_420:
+            *va_fourcc = VA_FOURCC_NV12;
+            *sw_chroma = VLC_CODEC_NV12;
+            break;
+        case VLC_CODEC_VAAPI_420_10BPP:
+            *va_fourcc = VA_FOURCC_P010;
+            *sw_chroma = VLC_CODEC_P010;
+            break;
+        case VLC_CODEC_VAAPI_420_12BPP:
+            *va_fourcc = VA_FOURCC_P012;
+            *sw_chroma = VLC_CODEC_P012;
+            break;
+        default:
+            vlc_assert_unreachable();
+    }
+}
+
 static int
 Open(struct vlc_gl_interop *interop)
 {
@@ -461,13 +457,11 @@
     priv->fourcc = 0;
 
     int va_fourcc;
-    int vlc_sw_chroma;
+    vlc_fourcc_t vlc_sw_chroma;
+    GetChromaVaFourcc(interop->fmt_in.i_chroma, &va_fourcc, &vlc_sw_chroma);
     switch (interop->fmt_in.i_chroma)
     {
-        case VLC_CODEC_VAAPI_420:
-            va_fourcc = VA_FOURCC_NV12;
-            vlc_sw_chroma = VLC_CODEC_NV12;
-
+        case VLC_CODEC_VAAPI_420: /* VLC_CODEC_NV12 */
             interop->tex_count = 2;
             interop->texs0 = (struct vlc_gl_tex_cfg) {
                 .w = {1, 1},
@@ -485,10 +479,8 @@
             };
 
             break;
-        case VLC_CODEC_VAAPI_420_10BPP:
-            va_fourcc = VA_FOURCC_P010;
-            vlc_sw_chroma = VLC_CODEC_P010;
-
+        case VLC_CODEC_VAAPI_420_10BPP: /* VLC_CODEC_P010 */
+        case VLC_CODEC_VAAPI_420_12BPP: /* VLC_CODEC_P012 */
             if (vlc_gl_interop_GetTexFormatSize(interop, GL_TEXTURE_2D, GL_RG,
                                                 GL_RG16, GL_UNSIGNED_SHORT) != 16)
                 goto error;
@@ -499,14 +491,14 @@
                 .h = {1, 1},
                 .internal = GL_R16,
                 .format = GL_RED,
-                .type = GL_UNSIGNED_BYTE,
+                .type = GL_UNSIGNED_SHORT,
             };
             interop->texs1 = (struct vlc_gl_tex_cfg) {
                 .w = {1, 2},
                 .h = {1, 2},
                 .internal = GL_RG16,
                 .format = GL_RG,
-                .type = GL_UNSIGNED_BYTE,
+                .type = GL_UNSIGNED_SHORT,
             };
 
             break;
@@ -560,7 +552,7 @@
     if (tc_va_check_interop_blacklist(interop, priv->vadpy))
         goto error;
 
-    if (tc_va_check_derive_image(interop))
+    if (tc_va_check_derive_image(interop, vlc_sw_chroma))
         goto error;
 
     /* The pictures are uploaded upside-down */

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/meson.build Changed

@@ -1,3 +1,8 @@
+opengl_headers_c_args = 
+if host_system == 'android'
+    opengl_headers_c_args += '-DUSE_OPENGL_ES2'
+endif
+
 gl_common_dep = declare_dependency(
     link_with: libplacebo_utils,
     sources: files(
@@ -10,6 +15,7 @@
         'picture.c',
         'sampler.c',
         ),
+    compile_args: opengl_headers_c_args,
     include_directories: vlc_include_dirs,
     dependencies: contrib_dep,
 )
@@ -20,24 +26,27 @@
     'vout_helper.c',
 )
 
-if opengl_dep.found() and not (have_ios or have_tvos)
+libvlc_opengl = 
+if opengl_dep.found() and not (have_ios or have_tvos or host_system == 'android')
     libvlc_opengl = static_library('vlc_opengl',
                                    dependencies: 
                                     gl_common_dep,
                                     m_lib,
                                    )
-
-    vlc_modules += {
-        'name' : 'libgl',
-        'sources' : 
-                files('display.c'),
-                opengl_vout_commonsources
-            ,
-        'link_with' : libvlc_opengl,
-        'dependencies' : gl_common_dep, m_lib
-    }
 endif
 
+vlc_modules += {
+    'name' : 'gl',
+    'sources' : 
+            files('display.c'),
+            opengl_vout_commonsources
+        ,
+    'link_with' : libvlc_opengl,
+    'dependencies' : gl_common_dep, m_lib,
+    'enabled' : opengl_dep.found() and not (have_ios or have_tvos or host_system == 'android')
+}
+
+libvlc_opengles = 
 if opengles2_dep.found()
     libvlc_opengles = static_library('libvlc_opengles',
                                      dependencies: gl_common_dep, m_lib,
@@ -45,40 +54,38 @@
 endif
 
 # interop_sw
+interop_sw_deps = gl_common_dep, m_lib
+interop_sw_libs = 
+interop_sw_cargs = 
 if host_system in 'darwin', 'android' or opengl_dep.found() or opengles2_dep.found()
-    interop_sw_deps = gl_common_dep, m_lib
-    interop_sw_libs = 
-    interop_sw_cargs = 
-
     if have_osx and opengl_dep.found()
         interop_sw_libs += libvlc_opengl
     elif host_system in 'darwin', 'android' and opengles2_dep.found()
         interop_sw_libs += libvlc_opengles
     endif
 
-    if opengles2_dep.found()
+    if opengles2_dep.found() or host_system == 'android'
         interop_sw_cargs += '-DUSE_OPENGL_ES2'
     endif
-
-    vlc_modules += {
-        'name' : 'interop_sw',
-        'sources' : files('interop_sw.c'),
-        'dependencies' : interop_sw_deps,
-        'c_args' : interop_sw_cargs,
-        'link_with' : interop_sw_libs,
-    }
 endif
 
+vlc_modules += {
+    'name' : 'glinterop_sw',
+    'sources' : files('interop_sw.c'),
+    'dependencies' : interop_sw_deps,
+    'c_args' : interop_sw_cargs,
+    'link_with' : interop_sw_libs,
+    'enabled' : host_system in 'darwin', 'android' or opengl_dep.found() or opengles2_dep.found(),
+}
+
 # interop_dxva2
-if have_win_desktop
-    opengl32_lib = cc.find_library('opengl32', required: false)
-    if opengl32_lib.found() and not missing_win_glew
-        vlc_modules += {
-            'name' : 'interop_dxva2',
-            'sources' : files('interop_dxva2.c'),
-            'c_args' :  contrib_inc_args ,
-            'dependencies' :  opengl32_lib ,
-            'link_with' :  d3d9_common_lib 
-        }
-    endif
-endif
+opengl32_lib = cc.find_library('opengl32', required: false)
+dxva2_dep = cc.find_library('dxva2', required: false)
+vlc_modules += {
+    'name' : 'interop_dxva2',
+    'sources' : files('interop_dxva2.c'),
+    'c_args' :  contrib_inc_args ,
+    'dependencies' :  opengl32_lib, dxva2_dep ,
+    'link_with' :  d3d9_common_lib ,
+    'enabled' : have_win_desktop and opengl32_lib.found() and dxva2_dep.found() and not missing_win_glew,
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/picture.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/picture.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/renderer.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/renderer.c Changed

@@ -38,9 +38,9 @@
 #include <vlc_es.h>
 #include <vlc_picture.h>
 #include <vlc_opengl_filter.h>
+#include <vlc_configuration.h>
 
 #include "gl_util.h"
-#include "vout_helper.h"
 #include "sampler.h"
 #include "picture.h"
 
@@ -79,8 +79,9 @@
 static void getViewpointMatrixes(struct vlc_gl_renderer *renderer,
                                  video_projection_mode_t projection_mode)
 {
-    if (projection_mode == PROJECTION_MODE_EQUIRECTANGULAR
+    if ((projection_mode == PROJECTION_MODE_EQUIRECTANGULAR
         || projection_mode == PROJECTION_MODE_CUBEMAP_LAYOUT_STANDARD)
+        && renderer->multiview_mode == renderer->sampler->glfmt.fmt.multiview_mode)
     {
         getProjectionMatrix(renderer->f_sar, renderer->f_fovy,
                             renderer->var.ProjectionMatrix);
@@ -103,6 +104,7 @@
 
 static void
 InitStereoMatrix(GLfloat matrix_outstatic 3*3,
+                 vlc_stereoscopic_mode_t stereo_mode,
                  video_multiview_mode_t multiview_mode)
 {
     /*
@@ -111,10 +113,6 @@
      *
      * This 2D transformation is affine, so the matrix is 3x3 and applies to 3D
      * vectors in the form (x, y, 1).
-     *
-     * Note that since for now, we always crop the left eye, in practice the
-     * offset is always 0, so the transform is actually linear (a 2x2 matrix
-     * would be sufficient).
      */
 
     memcpy(matrix_out, MATRIX3_IDENTITY, sizeof(MATRIX3_IDENTITY));
@@ -122,6 +120,11 @@
 #define COL(x) (x*3)
 #define ROW(x) (x)
 
+    if (stereo_mode == VIDEO_STEREO_OUTPUT_SIDE_BY_SIDE)
+        return;
+    assert(stereo_mode == VIDEO_STEREO_OUTPUT_LEFT_ONLY ||
+           stereo_mode == VIDEO_STEREO_OUTPUT_RIGHT_ONLY);
+
     switch (multiview_mode)
     {
         case MULTIVIEW_STEREO_SBS:
@@ -141,6 +144,8 @@
              *            \ 0    0    1 /
              */
             matrix_outCOL(0) + ROW(0) = 0.5;
+            if (stereo_mode == VIDEO_STEREO_OUTPUT_RIGHT_ONLY)
+                matrix_outCOL(2) + ROW(0) = 0.5;
             break;
         case MULTIVIEW_STEREO_TB:
             /*
@@ -164,6 +169,8 @@
              *            \ 0    0    1 /
              */
             matrix_outCOL(1) + ROW(1) = 0.5;
+            if (stereo_mode == VIDEO_STEREO_OUTPUT_RIGHT_ONLY)
+                matrix_outCOL(2) + ROW(1) = 0.5;
             break;
         default:
             break;
@@ -356,8 +363,7 @@
         UpdateFOVy(renderer);
         UpdateZ(renderer);
     }
-    const video_format_t *fmt = &renderer->sampler->glfmt.fmt;
-    getViewpointMatrixes(renderer, fmt->projection_mode);
+    getViewpointMatrixes(renderer, renderer->projection_mode);
 
     return VLC_SUCCESS;
 }
@@ -377,8 +383,7 @@
     UpdateFOVy(renderer);
     UpdateZ(renderer);
 
-    const video_format_t *fmt = &renderer->sampler->glfmt.fmt;
-    getViewpointMatrixes(renderer, fmt->projection_mode);
+    getViewpointMatrixes(renderer, renderer->projection_mode);
 }
 
 static int
@@ -674,8 +679,12 @@
     GLushort *indices;
     unsigned nbVertices, nbIndices;
 
+    video_projection_mode_t projection_mode = renderer->projection_mode;
+    if (renderer->multiview_mode != renderer->sampler->glfmt.fmt.multiview_mode)
+        projection_mode = PROJECTION_MODE_RECTANGULAR;
+
     int i_ret;
-    switch (fmt->projection_mode)
+    switch (projection_mode)
     {
     case PROJECTION_MODE_RECTANGULAR:
         i_ret = BuildRectangle(&vertexCoord, &textureCoord, &nbVertices,
@@ -797,21 +806,26 @@
                      const struct vlc_gl_format *glfmt,
                      struct vlc_gl_tex_size *size_out)
 {
-    (void) config;
     (void) size_out;
 
+    const char * const options = { "projection-mode", "video-stereo-mode", NULL };
+    config_ChainParse(filter, "", options, config);
+
     const opengl_vtable_t *vt = &filter->api->vt;
 
     struct vlc_gl_sampler *sampler =
         vlc_gl_sampler_New(filter->gl, filter->api, glfmt, false);
     if (!sampler)
+    {
+        msg_Dbg(&filter->obj, "Could not create sampler for renderer");
         return VLC_EGENERIC;
+    }
 
     struct vlc_gl_renderer *renderer = calloc(1, sizeof(*renderer));
     if (!renderer)
     {
         vlc_gl_sampler_Delete(sampler);
-        return VLC_EGENERIC;
+        return VLC_ENOMEM;
     }
 
     static const struct vlc_gl_filter_ops filter_ops = {
@@ -828,17 +842,56 @@
     renderer->vt = vt;
     renderer->dump_shaders = var_InheritInteger(filter, "verbose") >= 4;
 
+    int projection_mode = var_InheritInteger(filter, "projection-mode");
+    switch (projection_mode)
+    {
+        case PROJECTION_MODE_RECTANGULAR:
+            renderer->projection_mode = projection_mode;
+            break;
+        default:
+        case -1:
+            renderer->projection_mode = sampler->glfmt.fmt.projection_mode;
+            break;
+    }
+
+    int stereo_mode = var_InheritInteger(filter, "video-stereo-mode");
+    if (stereo_mode > VIDEO_STEREO_OUTPUT_AUTO && stereo_mode <= VIDEO_STEREO_OUTPUT_MAX)
+        renderer->stereo_mode = stereo_mode;
+
+    if (sampler->glfmt.fmt.multiview_mode == MULTIVIEW_2D)
+    {
+        renderer->stereo_mode = VIDEO_STEREO_OUTPUT_SIDE_BY_SIDE;
+        renderer->multiview_mode = MULTIVIEW_2D;
+    }
+    else switch (stereo_mode)
+    {
+        case VIDEO_STEREO_OUTPUT_LEFT_ONLY:
+        case VIDEO_STEREO_OUTPUT_RIGHT_ONLY:
+        case VIDEO_STEREO_OUTPUT_AUTO:
+            /* multiview_mode != MULTIVIEW_2D */
+            renderer->multiview_mode = sampler->glfmt.fmt.multiview_mode;
+            if (stereo_mode == VIDEO_STEREO_OUTPUT_AUTO)
+                renderer->stereo_mode = VIDEO_STEREO_OUTPUT_LEFT_ONLY;
+            break;
+        case VIDEO_STEREO_OUTPUT_SIDE_BY_SIDE:
+        case VIDEO_STEREO_OUTPUT_STEREO: /* stereo mode is not supported yet */
+        default:
+            renderer->multiview_mode = MULTIVIEW_2D; /* Enforce the planar view */
+            renderer->stereo_mode = VIDEO_STEREO_OUTPUT_SIDE_BY_SIDE;
+            break;
+    }
+
     int ret = opengl_link_program(filter);
     if (ret != VLC_SUCCESS)
     {
+        msg_Dbg(&filter->obj, "Could not link shaders");
         free(renderer);
         return ret;
     }
 
-    const video_format_t *fmt = &sampler->glfmt.fmt;
-    InitStereoMatrix(renderer->var.StereoMatrix, fmt->multiview_mode);
+    InitStereoMatrix(renderer->var.StereoMatrix, renderer->stereo_mode, renderer->multiview_mode);
 
-    getViewpointMatrixes(renderer, fmt->projection_mode);
+    getViewpointMatrixes(renderer, renderer->projection_mode);
 
     vt->GenBuffers(1, &renderer->vertex_buffer_object);
     vt->GenBuffers(1, &renderer->index_buffer_object);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/renderer.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/renderer.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/sampler.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/sampler.c Changed

@@ -57,6 +57,7 @@
     } uloc;
 
     bool yuv_color;
+    bool unsigned_sampler;
     GLfloat conv_matrix4*4;
 
 #ifdef HAVE_LIBPLACEBO_GL
@@ -186,9 +187,18 @@
     float *matrix = priv->conv_matrix;
     init_conv_matrix(matrix, yuv_space, range);
 
+    /* If using half_float, we multiply the conversion matrix by 255.  Reason:
+     * half-float YUV planes store values in 0..1. Multiplying by 255
+     * compensates for that.
+     */
+    if (sampler->glfmt.half_float)
+        for (int i = 0; i < 4*3; ++i)
+            matrixi *= 255;
+
     if (desc->pixel_size == 2)
     {
-        if (desc->fcc != VLC_CODEC_P010 && desc->fcc != VLC_CODEC_P016) {
+        if (desc->fcc != VLC_CODEC_P010 && desc->fcc != VLC_CODEC_P012
+         && desc->fcc != VLC_CODEC_P016) {
             /* Do a bit shift if samples are stored on LSB. */
             float yuv_range_correction = (float)((1 << 16) - 1)
                                          / ((1 << desc->pixel_bits) - 1);
@@ -515,6 +525,10 @@
                 swizzle_per_tex0 = "r";
                 swizzle_per_tex1 = "ag";
                 break;
+            case VLC_CODEC_V308:
+                swizzle_per_tex0 = "rgb";
+                assert(sampler->glfmt.tex_count == 1);
+                break;
             default:
                 assert(!"missing chroma");
                 return VLC_EGENERIC;
@@ -533,14 +547,16 @@
         (priv->gl->api_type == VLC_OPENGL && priv->glsl_version >= 130) ||
         (priv->gl->api_type == VLC_OPENGL_ES2 && priv->glsl_version >= 300);
 
+    const bool is_yuv = vlc_fourcc_IsYUV(sampler->glfmt.fmt.i_chroma);
+
     switch (tex_target)
     {
         case GL_TEXTURE_EXTERNAL_OES:
-            *glsl_sampler = "samplerExternalOES";
+            *glsl_sampler = is_yuv ? "__samplerExternal2DY2YEXT" : "samplerExternalOES";
             *texture = has_texture_func ? "texture" : "texture2D";
             break;
         case GL_TEXTURE_2D:
-            *glsl_sampler = "sampler2D";
+            *glsl_sampler = priv->unsigned_sampler ? "usampler2D" : "sampler2D";
             *texture = has_texture_func ? "texture" : "texture2D";
             break;
         case GL_TEXTURE_RECTANGLE:
@@ -556,14 +572,21 @@
 InitShaderExtensions(struct vlc_gl_sampler *sampler, GLenum tex_target)
 {
     struct vlc_gl_sampler_priv *priv = PRIV(sampler);
+    const bool is_yuv = vlc_fourcc_IsYUV(sampler->glfmt.fmt.i_chroma);
 
     const char *image_external = priv->glsl_version >= 300
         ? "#extension GL_OES_EGL_image_external_essl3 : require\n"
         : "#extension GL_OES_EGL_image_external : require\n";
 
+    const char *ext_yuv_target =
+        "#extension GL_EXT_YUV_target : require\n";
+
     if (tex_target == GL_TEXTURE_EXTERNAL_OES)
     {
-        sampler->shader.extensions = strdup(image_external);
+        if (is_yuv)
+            sampler->shader.extensions = strdup(ext_yuv_target);
+        else
+            sampler->shader.extensions = strdup(image_external);
         if (!sampler->shader.extensions)
             return VLC_EGENERIC;
     }
@@ -730,7 +753,10 @@
 
     const vlc_chroma_description_t *desc = vlc_fourcc_GetChromaDescription(chroma);
     if (desc == NULL)
+    {
+        msg_Dbg(priv->gl, "opengl sampler: unknown chroma description %4.4s", (const char *)&chroma);
         return VLC_EGENERIC;
+    }
 
     unsigned tex_count = glfmt->tex_count;
 
@@ -745,10 +771,16 @@
     {
         ret = sampler_yuv_base_init(sampler, desc, yuv_space);
         if (ret != VLC_SUCCESS)
+        {
+            msg_Dbg(priv->gl, "opengl sampler: could not initialize YUV shaders for %4.4s", (const char *)&chroma);
             return ret;
+        }
         ret = opengl_init_swizzle(sampler, swizzle_per_tex, desc);
         if (ret != VLC_SUCCESS)
+        {
+            msg_Dbg(priv->gl, "opengl sampler: could not determine swizzle for %4.4s", (const char *)&chroma);
             return ret;
+        }
     }
 
     const char *glsl_sampler, *lookup;
@@ -879,6 +911,21 @@
 
     unsigned color_count;
     if (is_yuv) {
+
+        if (priv->unsigned_sampler)
+        {
+            /* One extra integer -> float step will be needed */
+            for (unsigned i = 0; i < tex_count; ++i)
+            {
+                if (tex_target == GL_TEXTURE_RECTANGLE)
+                    ADDF(" uvec4 t%u = %s(Textures%u, TexSizes%u * tex_coords);\n",
+                         i, lookup, i, i);
+                else
+                    ADDF(" uvec4 t%u = %s(Textures%u, tex_coords);\n",
+                         i, lookup, i);
+            }
+        }
+
         ADD(" vec4 pixel = vec4(\n");
         color_count = 0;
         for (unsigned i = 0; i < tex_count; ++i)
@@ -889,7 +936,13 @@
             assert(color_count < PICTURE_PLANE_MAX);
             if (i > 0)
                 ADD("  ,");
-            if (tex_target == GL_TEXTURE_RECTANGLE)
+
+            if (priv->unsigned_sampler)
+            {
+                /* Integer -> float */
+                ADDF("  float(t%u.%s) / 65535.0\n", i, swizzle);
+            }
+            else if (tex_target == GL_TEXTURE_RECTANGLE)
             {
                 /* The coordinates are in texels values, not normalized */
                 ADDF("  %s(Textures%u, TexSizes%u * tex_coords).%s\n", lookup, i, i, swizzle);
@@ -990,9 +1043,30 @@
     sampler->shader.extensions = NULL;
     sampler->shader.body = NULL;
 
+    switch (sampler->glfmt.formats0)
+    {
+        case GL_RED_INTEGER:
+        case GL_RG_INTEGER:
+            priv->unsigned_sampler = true;
+            break;
+        default:
+            priv->unsigned_sampler = false;
+            break;
+    }
+
     int glsl_version;
     if (api->is_gles) {
-        sampler->shader.precision = "precision highp float;\n";
+#define GLES_COMMON_PRECISION \
+            "precision highp float;\n" \
+            "precision highp sampler2D;\n" \
+            "precision highp sampler3D;\n"
+
+        if (priv->unsigned_sampler)
+            sampler->shader.precision = GLES_COMMON_PRECISION
+                "precision highp usampler2D;\n";
+        else
+            sampler->shader.precision = GLES_COMMON_PRECISION;
+
         if (api->glsl_version >= 300) {
             sampler->shader.version = strdup("#version 300 es\n");
             glsl_version = 300;
@@ -1040,6 +1114,7 @@
     priv->pl_opengl = pl_opengl_create(priv->pl_log, &gl_params);
     if (!priv->pl_opengl)
     {
+        msg_Dbg(gl, "opengl sampler: could not initialize libplacebo");
         vlc_gl_sampler_Delete(sampler);
         return NULL;
     }
@@ -1057,7 +1132,10 @@
 
     int ret = opengl_fragment_shader_init(sampler, expose_planes);
     if (ret != VLC_SUCCESS)
+    {
+        msg_Dbg(gl, "opengl sampler: could not initialize shaders");
         goto error;
+    }
 
     return sampler;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/vout_helper.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/vout_helper.c Changed

@@ -10,6 +10,7 @@
  *          Adrien Maglo <magsoft at videolan dot org>
  *          Felix Paul Kühne <fkuehne at videolan dot org>
  *          Pierre d'Herbemont <pdherbemont at videolan dot org>
+ *          Alexandre Janniaux <ajanni@videolabs.io>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
@@ -55,11 +56,16 @@
 
     struct vlc_gl_interop *interop;
     struct vlc_gl_renderer *renderer; /**< weak reference */
+    struct vlc_gl_filter *renderer_filter; /**< weak reference */
 
     struct vlc_gl_filters *filters;
 
     struct vlc_gl_interop *sub_interop;
     struct vlc_gl_sub_renderer *sub_renderer;
+
+    vlc_viewpoint_t viewpoint;
+    video_projection_mode_t projection;
+    vlc_stereoscopic_mode_t stereo_mode;
 };
 
 static const vlc_fourcc_t gl_subpicture_chromas = {
@@ -99,7 +105,7 @@
 static struct vlc_gl_filters *
 CreateFilters(vlc_gl_t *gl, const struct vlc_gl_api *api,
               struct vlc_gl_interop *interop,
-              struct vlc_gl_renderer **out_renderer)
+              struct vlc_gl_filter **out_renderer)
 {
     struct vlc_gl_filters *filters = vlc_gl_filters_New(gl, api, interop, gl->orientation);
     if (!filters)
@@ -166,7 +172,7 @@
 
     /* The renderer is a special filter: we need its concrete instance to
      * forward SetViewpoint() */
-    *out_renderer = renderer_filter->sys;
+    *out_renderer = renderer_filter;
 
     return filters;
 
@@ -175,6 +181,95 @@
     return NULL;
 }
 
+struct renderer_config
+{
+    video_projection_mode_t projection;
+    vlc_stereoscopic_mode_t stereo_mode;
+};
+
+static int RestartRenderer(vout_display_opengl_t *vgl,
+                           const struct renderer_config *config)
+{
+    config_chain_t chain_projection = {
+        .psz_name = strdup("projection-mode"),
+        .psz_value = strdup(config->projection == PROJECTION_MODE_RECTANGULAR ? "0" : "-1"),
+    };
+
+    config_chain_t chain_stereo = {
+        .psz_name = strdup("video-stereo-mode"),
+        .p_next = &chain_projection,
+    };
+    if (chain_projection.psz_name == NULL ||
+        chain_projection.psz_value == NULL ||
+        chain_stereo.psz_name == NULL ||
+        asprintf(&chain_stereo.psz_value, "%d", (int)config->stereo_mode) == -1)
+    {
+        free(chain_projection.psz_name);
+        free(chain_projection.psz_value);
+        free(chain_stereo.psz_name);
+        free(chain_stereo.psz_value);
+        return VLC_ENOMEM;
+    }
+
+    struct vlc_gl_filter *new_renderer =
+        vlc_gl_filters_Replace(vgl->filters, vgl->renderer_filter, "renderer", &chain_stereo);
+    free(chain_projection.psz_name);
+    free(chain_projection.psz_value);
+    free(chain_stereo.psz_name);
+    free(chain_stereo.psz_value);
+    if (new_renderer == NULL)
+    {
+        msg_Err(vgl->gl, "Could not re-create renderer filter for projection=%d stereo_mode=%d",
+                (int)config->projection, (int)config->stereo_mode);
+        return VLC_EGENERIC;
+    }
+
+    int ret = vlc_gl_filters_InitFramebuffers(vgl->filters);
+    if (ret != VLC_SUCCESS)
+    {
+        msg_Err(vgl->gl, "Could not init filters framebuffers");
+        return VLC_EGENERIC;
+    }
+
+    vgl->renderer_filter = new_renderer;
+    vgl->renderer = new_renderer->sys;
+
+    vlc_gl_renderer_SetViewpoint(vgl->renderer, &vgl->viewpoint);
+    return VLC_SUCCESS;
+}
+
+int vout_display_opengl_ChangeProjection(vout_display_opengl_t *vgl,
+                                         video_projection_mode_t projection)
+{
+    struct renderer_config config = {
+        .projection = projection,
+        .stereo_mode = vgl->stereo_mode,
+    };
+    int ret = RestartRenderer(vgl, &config);
+    if (ret != VLC_SUCCESS)
+        return ret;
+
+    vgl->projection = projection;
+    msg_Dbg(vgl->gl, "Changed to projection mode %d", projection);
+    return VLC_SUCCESS;
+}
+
+int vout_display_opengl_ChangeStereoMode(vout_display_opengl_t *vgl,
+                                         vlc_stereoscopic_mode_t stereo_mode)
+{
+    struct renderer_config config = {
+        .projection = vgl->projection,
+        .stereo_mode = stereo_mode,
+    };
+    int ret = RestartRenderer(vgl, &config);
+    if (ret != VLC_SUCCESS)
+        return ret;
+
+    vgl->stereo_mode = stereo_mode;
+    msg_Dbg(vgl->gl, "Changed to stereo mode %d", stereo_mode);
+    return VLC_SUCCESS;
+}
+
 vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
                                                const vlc_fourcc_t **subpicture_chromas,
                                                vlc_gl_t *gl,
@@ -221,12 +316,13 @@
     }
     GL_ASSERT_NOERROR(vt);
 
-    vgl->filters = CreateFilters(gl, api, vgl->interop, &vgl->renderer);
+    vgl->filters = CreateFilters(gl, api, vgl->interop, &vgl->renderer_filter);
     if (!vgl->filters)
     {
         msg_Err(gl, "Could not create filters");
         goto delete_interop;
     }
+    vgl->renderer = vgl->renderer_filter->sys;
     GL_ASSERT_NOERROR(vt);
 
     vgl->sub_interop = vlc_gl_interop_NewForSubpictures(gl);
@@ -247,10 +343,25 @@
 
     GL_ASSERT_NOERROR(vt);
 
+    vlc_viewpoint_init(&vgl->viewpoint);
     if (fmt->projection_mode != PROJECTION_MODE_RECTANGULAR
      && vout_display_opengl_SetViewpoint(vgl, viewpoint) != VLC_SUCCESS)
         msg_Err(gl, "Could not set viewpoint");
 
+    int projection_mode = var_InheritInteger(gl, "projection-mode");
+    if (projection_mode == PROJECTION_MODE_RECTANGULAR ||
+        projection_mode == PROJECTION_MODE_EQUIRECTANGULAR ||
+        projection_mode == PROJECTION_MODE_CUBEMAP_LAYOUT_STANDARD)
+        vgl->projection = projection_mode;
+    else
+        vgl->projection = fmt->projection_mode;
+
+    int stereo_mode = var_InheritInteger(gl, "video-stereo-mode");
+    if (stereo_mode > 0 && stereo_mode <= VIDEO_STEREO_OUTPUT_MAX)
+        vgl->stereo_mode = stereo_mode;
+    else
+        vgl->stereo_mode = VIDEO_STEREO_OUTPUT_AUTO;
+
     /* Forward to the core the changes to the input format requested by the
      * interop */
     video_format_Clean(fmt);
@@ -286,25 +397,24 @@
     const struct vlc_gl_api *api = &vgl->api;
 
     assert(!fmt->p_palette);
-    video_format_t in_fmt = *fmt;
 
-    struct vlc_gl_interop *interop = vlc_gl_interop_New(gl, vctx, &in_fmt);
+    struct vlc_gl_interop *interop = vlc_gl_interop_New(gl, vctx, fmt);
     if (!interop)
     {
         msg_Err(gl, "Could not create interop");
         return VLC_EGENERIC;
     }
 
-    if ( !video_format_IsSameChroma( &in_fmt, fmt ) )
+    if ( !video_format_IsSameChroma( &interop->fmt_in, fmt ) )
     {
         msg_Warn(gl, "Could not update format, the interop changed the "
                      "requested chroma from %4.4s to %4.4s\n",
-                     (char *) &fmt->i_chroma, (char *) &in_fmt.i_chroma);
+                     (char *) &fmt->i_chroma, (char *) &interop->fmt_in.i_chroma);
         vlc_gl_interop_Delete(interop);
         return VLC_EGENERIC;
     }
 
-    struct vlc_gl_renderer *renderer;
+    struct vlc_gl_filter *renderer;
     struct vlc_gl_filters *filters = CreateFilters(gl, api, interop, &renderer);
     if (!filters)
     {
@@ -319,7 +429,10 @@
 
     vgl->interop = interop;
     vgl->filters = filters;
-    vgl->renderer = renderer;
+    vgl->renderer = renderer->sys;
+    vgl->renderer_filter = renderer;
+
+    vlc_gl_renderer_SetViewpoint(vgl->renderer, &vgl->viewpoint);
 
     return VLC_SUCCESS;
 }
@@ -348,7 +461,10 @@
 int vout_display_opengl_SetViewpoint(vout_display_opengl_t *vgl,
                                      const vlc_viewpoint_t *p_vp)
 {
-    return vlc_gl_renderer_SetViewpoint(vgl->renderer, p_vp);
+    int ret = vlc_gl_renderer_SetViewpoint(vgl->renderer, p_vp);
+    if (ret == VLC_SUCCESS)
+        vgl->viewpoint = *p_vp;
+    return ret;
 }
 
 void vout_display_opengl_SetOutputSize(vout_display_opengl_t *vgl,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/opengl/vout_helper.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/opengl/vout_helper.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/vulkan/platform_android.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/vulkan/platform_android.c Changed

@@ -44,22 +44,22 @@
         return VLC_EGENERIC;
 
     vk->platform_ext = VK_KHR_ANDROID_SURFACE_EXTENSION_NAME;
-    vk->platform_ops = &platform_ops;
+    vk->ops = &platform_ops;
     return VLC_SUCCESS;
 }
 
 static void ClosePlatform(vlc_vk_platform_t *vk)
 {
-    AWindowHandler_releaseANativeWindow(vk->window->handle.anativewindow,
-                                        AWindow_Video);
+    AWindowHandler_releaseANativeWindow(vk->window->display.anativewindow,
+                                        vk->window->handle.android_id);
 }
 
 static int CreateSurface(vlc_vk_platform_t *vk, const vlc_vk_instance_t *inst,
                          VkSurfaceKHR *surface_out)
 {
     ANativeWindow *anw =
-        AWindowHandler_getANativeWindow(vk->window->handle.anativewindow,
-                                        AWindow_Video);
+        AWindowHandler_getANativeWindow(vk->window->display.anativewindow,
+                                        vk->window->handle.android_id);
     PFN_vkCreateAndroidSurfaceKHR CreateAndroidSurfaceKHR = (PFN_vkCreateAndroidSurfaceKHR)
         inst->get_proc_address(inst->instance, "vkCreateAndroidSurfaceKHR");

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/common.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/common.c Changed

@@ -41,93 +41,40 @@
 #include "common.h"
 #include "../../video_chroma/copy.h"
 
-void CommonInit(display_win32_area_t *area, const video_format_t *src_fmt)
-{
-    ZeroMemory(&area->place, sizeof(area->place));
-    area->place_changed = false;
-    area->src_fmt = src_fmt;
-}
-
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 /* */
-int CommonWindowInit(vout_display_t *vd, display_win32_area_t *area,
+int CommonWindowInit(vout_display_t *vd, struct event_thread_t **event,
                      bool projection_gestures)
 {
+    *event = NULL;
     if (unlikely(vd->cfg->window == NULL))
         return VLC_EGENERIC;
 
     /* */
-    area->event = EventThreadCreate(VLC_OBJECT(vd), vd->cfg->window,
-                                    &vd->cfg->display,
-                                    projection_gestures ? &vd->owner : NULL);
-    if (!area->event)
+    *event = EventThreadCreate(VLC_OBJECT(vd), vd->cfg->window,
+                               &vd->cfg->display,
+                               projection_gestures ? &vd->owner : NULL);
+    if (!*event)
         return VLC_EGENERIC;
 
     return VLC_SUCCESS;
 }
 
-HWND CommonVideoHWND(const display_win32_area_t *area)
-{
-    return EventThreadVideoHWND(area->event);
-}
-#endif /* WINAPI_PARTITION_DESKTOP */
-
-/*****************************************************************************
-* UpdateRects: update clipping rectangles
-*****************************************************************************
-* This function is called when the window position or size are changed, and
-* its job is to update the source and destination RECTs used to display the
-* picture.
-*****************************************************************************/
-void CommonPlacePicture(vout_display_t *vd, display_win32_area_t *area)
+HWND CommonVideoHWND(const struct event_thread_t *event)
 {
-    /* Update the window position and size */
-    vout_display_place_t before_place = area->place;
-    vout_display_PlacePicture(&area->place, area->src_fmt, &vd->cfg->display);
-
-    /* Signal the change in size/position */
-    if (!vout_display_PlaceEquals(&before_place, &area->place))
-    {
-        area->place_changed |= true;
-
-#ifndef NDEBUG
-        msg_Dbg(vd, "UpdateRects source offset: %i,%i visible: %ix%i decoded: %ix%i",
-            area->src_fmt->i_x_offset, area->src_fmt->i_y_offset,
-            area->src_fmt->i_visible_width, area->src_fmt->i_visible_height,
-            area->src_fmt->i_width, area->src_fmt->i_height);
-        msg_Dbg(vd, "UpdateRects image_dst coords: %i,%i %ix%i",
-            area->place.x, area->place.y, area->place.width, area->place.height);
-#endif
-    }
+    return EventThreadVideoHWND(event);
 }
 
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 /* */
-void CommonWindowClean(display_win32_area_t *sys)
+void CommonWindowClean(struct event_thread_t *event)
 {
-    EventThreadDestroy(sys->event);
+    EventThreadDestroy(event);
 }
-#endif /* WINAPI_PARTITION_DESKTOP */
 
-void CommonControl(vout_display_t *vd, display_win32_area_t *area, int query)
+void CommonDisplaySizeChanged(struct event_thread_t *event)
 {
-    switch (query) {
-    case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-        // Update dimensions
-        if (area->event != NULL)
-        {
-            EventThreadUpdateSize(area->event);
-        }
-#endif /* WINAPI_PARTITION_DESKTOP */
-        // fallthrough
-    case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
-    case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
-    case VOUT_DISPLAY_CHANGE_SOURCE_PLACE:
-        CommonPlacePicture(vd, area);
-        break;
-
-    default:
-        vlc_assert_unreachable();
+    // Update dimensions
+    if (event != NULL)
+    {
+        EventThreadUpdateSize(event);
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/common.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/common.h Changed

@@ -30,37 +30,21 @@
 extern "C" {
 #endif// __cplusplus
 
-/*****************************************************************************
- * event_thread_t: event thread
- *****************************************************************************/
-
-typedef struct display_win32_area_t
-{
-    /* Coordinates of dest images (used when blitting to display) */
-    vout_display_place_t  place;
-    bool                  place_changed;
-    struct event_thread_t *event; // only use if sys.event is not NULL
-
-    const video_format_t  *src_fmt;
-} display_win32_area_t;
-
 #define RECTWidth(r)   (LONG)((r).right - (r).left)
 #define RECTHeight(r)  (LONG)((r).bottom - (r).top)
 
+struct event_thread_t;
+
 /*****************************************************************************
- * Prototypes from common.c
+ * event_thread_t: event thread
  *****************************************************************************/
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-int  CommonWindowInit(vout_display_t *, display_win32_area_t *,
-                      bool projection_gestures);
-void CommonWindowClean(display_win32_area_t *);
-HWND CommonVideoHWND(const display_win32_area_t *);
-#endif /* WINAPI_PARTITION_DESKTOP */
-void CommonControl(vout_display_t *, display_win32_area_t *, int );
 
-void CommonPlacePicture (vout_display_t *, display_win32_area_t *);
+int  CommonWindowInit(vout_display_t *, struct event_thread_t **,
+                      bool projection_gestures);
+void CommonWindowClean(struct event_thread_t *);
+HWND CommonVideoHWND(const struct event_thread_t *);
+void CommonDisplaySizeChanged(struct event_thread_t *);
 
-void CommonInit(display_win32_area_t *, const video_format_t *);
 # ifdef __cplusplus
 }
 # endif

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/d3d11_quad.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/d3d11_quad.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/d3d11_quad.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/d3d11_quad.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/d3d11_scaler.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/d3d11_scaler.cpp Changed

@@ -232,7 +232,8 @@
 
 int D3D11_UpscalerUpdate(vlc_object_t *vd, d3d11_scaler *scaleProc, d3d11_device_t*d3d_dev,
                          const video_format_t *fmt, video_format_t *quad_fmt,
-                         const vout_display_placement *cfg)
+                         unsigned display_width, unsigned display_height,
+                         const vout_display_place_t *video_place)
 {
     HRESULT hr;
     ID3D11Texture2D *_upscaledDXGI_MAX_SHADER_VIEW;
@@ -242,14 +243,9 @@
     black.RGBA.A = 1.f;
     bool upscale = false;
 
-    vout_display_place_t place{};
-    auto display = *cfg;
-    display.fitting = VLC_VIDEO_FIT_SMALLER;
-    vout_display_PlacePicture(&place, fmt, &display);
-
     unsigned out_width, out_height;
-    out_width  = (display.width + (scaleProc->d3d_fmt->widthDenominator-1)) & ~(scaleProc->d3d_fmt->widthDenominator-1);
-    out_height = (display.height + (scaleProc->d3d_fmt->heightDenominator-1)) & ~(scaleProc->d3d_fmt->heightDenominator-1);
+    out_width  = (display_width + (scaleProc->d3d_fmt->widthDenominator-1)) & ~(scaleProc->d3d_fmt->widthDenominator-1);
+    out_height = (display_height + (scaleProc->d3d_fmt->heightDenominator-1)) & ~(scaleProc->d3d_fmt->heightDenominator-1);
 
     quad_fmt->i_x_offset = 0;
     quad_fmt->i_width = quad_fmt->i_visible_width = out_width;
@@ -259,10 +255,10 @@
     quad_fmt->i_sar_den = 1;
 
     if (scaleProc->Width == out_width && scaleProc->Height == out_height &&
-        vout_display_PlaceEquals(&scaleProc->place, &place))
+        vout_display_PlaceEquals(&scaleProc->place, video_place))
         // do nothing
         return VLC_SUCCESS;
-    scaleProc->place = place;
+    scaleProc->place = *video_place;
 
     scaleProc->usable = false;
 
@@ -405,7 +401,8 @@
             res = scaleProc->amf_scaler->SetProperty(AMF_HQ_SCALER_FROM_SRGB, 0);
             res = scaleProc->amf_scaler->SetProperty(AMF_HQ_SCALER_SHARPNESS, 0.5);
             res = scaleProc->amf_scaler->SetProperty(AMF_HQ_SCALER_FILL, 1);
-            AMFColor black{0,0,0,255};
+            AMFColor black{};
+            black.a = 255;
             res = scaleProc->amf_scaler->SetProperty(AMF_HQ_SCALER_FILL_COLOR, black);
             // res = scaleProc->amf_scaler->SetProperty(AMF_HQ_SCALER_FRAME_RATE, oFrameRate);
             auto amf_fmt = DXGIToAMF(scaleProc->d3d_fmt->formatTexture);
@@ -438,10 +435,10 @@
     srcRect.bottom = srcRect.top  + fmt->i_visible_height;
 
     RECT dstRect;
-    dstRect.left   = place.x;
-    dstRect.top    = place.y;
-    dstRect.right  = dstRect.left + place.width;
-    dstRect.bottom = dstRect.top  + place.height;
+    dstRect.left   = video_place->x;
+    dstRect.top    = video_place->y;
+    dstRect.right  = dstRect.left + video_place->width;
+    dstRect.bottom = dstRect.top  + video_place->height;
 
     d3d11_device_lock(d3d_dev);
     scaleProc->d3dvidctx->VideoProcessorSetStreamSourceRect(scaleProc->processor.Get(),
@@ -456,8 +453,8 @@
     if (scaleProc->super_res)
     {
         // only use super resolution when source is smaller than display
-        upscale = fmt->i_visible_width < place.width
-               || fmt->i_visible_height < place.height;
+        upscale = fmt->i_visible_width < video_place->width
+               || fmt->i_visible_height < video_place->height;
 
         if (d3d_dev->adapterDesc.VendorId == GPU_MANUFACTURER_NVIDIA)
         {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/d3d11_scaler.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/d3d11_scaler.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/d3d11_shaders.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/d3d11_shaders.cpp Changed

@@ -33,7 +33,7 @@
 
 using Microsoft::WRL::ComPtr;
 
-HRESULT (D3D11_CompilePixelShaderBlob)(vlc_object_t *o, const d3d_shader_compiler_t *compiler,
+HRESULT (D3D11_CompilePixelShaderBlob)(vlc_object_t *o,
                                    d3d11_device_t *d3d_dev,
                                    const display_info_t *display,
                                    video_transfer_func_t transfer,
@@ -41,7 +41,7 @@
                                    const d3d11_quad_t *quad, d3d_shader_blob pPSBlobDXGI_MAX_RENDER_TARGET)
 {
     size_t shader_viewsDXGI_MAX_RENDER_TARGET;
-    return D3D_CompilePixelShader(o, compiler, d3d_dev->feature_level,
+    return D3D_CompilePixelShader(o, d3d_dev->feature_level,
                                   display, transfer,
                                   src_full_range, quad->generic.textureFormat, pPSBlob, shader_views);
 }
@@ -168,8 +168,8 @@
     shader->shader.Reset();
 }
 
-HRESULT D3D11_CompileVertexShaderBlob(vlc_object_t *obj, const d3d_shader_compiler_t *compiler,
+HRESULT D3D11_CompileVertexShaderBlob(vlc_object_t *obj,
                                       d3d11_device_t *d3d_dev, bool flat, d3d_shader_blob *pVSBlob)
 {
-    return D3D_CompileVertexShader(obj, compiler, d3d_dev->feature_level, flat, pVSBlob);
+    return D3D_CompileVertexShader(obj, d3d_dev->feature_level, flat, pVSBlob);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/d3d11_shaders.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/d3d11_shaders.h Changed

@@ -70,18 +70,18 @@
     VS_PROJECTION_CONST       vConstants;
 };
 
-HRESULT D3D11_CompilePixelShaderBlob(vlc_object_t *, const d3d_shader_compiler_t *,
+HRESULT D3D11_CompilePixelShaderBlob(vlc_object_t *,
                                  d3d11_device_t *, const display_info_t *,
                                  video_transfer_func_t,
                                  bool src_full_range,
                                  const d3d11_quad_t *, d3d_shader_blob pPSBlobDXGI_MAX_RENDER_TARGET);
-#define D3D11_CompilePixelShaderBlob(a,b,c,d,e,f,g,h) \
-    D3D11_CompilePixelShaderBlob(VLC_OBJECT(a),b,c,d,e,f,g,h)
+#define D3D11_CompilePixelShaderBlob(a,b,c,d,e,f,g) \
+    D3D11_CompilePixelShaderBlob(VLC_OBJECT(a),b,c,d,e,f,g)
 HRESULT D3D11_SetQuadPixelShader(vlc_object_t *, d3d11_device_t *,
                                  bool sharp,
                                  d3d11_quad_t *quad, d3d_shader_blob pPSBlobDXGI_MAX_RENDER_TARGET);
 
-HRESULT D3D11_CompileVertexShaderBlob(vlc_object_t *, const d3d_shader_compiler_t *,
+HRESULT D3D11_CompileVertexShaderBlob(vlc_object_t *,
                                       d3d11_device_t *, bool flat, d3d_shader_blob *);
 
 HRESULT D3D11_CreateVertexShader(vlc_object_t *, d3d_shader_blob *, d3d11_device_t *, d3d11_vertex_shader_t *);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/d3d_dynamic_shader.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/d3d_dynamic_shader.c Changed

@@ -35,12 +35,6 @@
 #include "d3d_shaders.h"
 #include "d3d_dynamic_shader.h"
 
-struct d3d_shader_compiler_t
-{
-    HINSTANCE                 compiler_dll; /* handle of the opened d3dcompiler dll */
-    pD3DCompile               OurD3DCompile;
-};
-
 static const char globPixelShaderDefault = "\
 #pragma warning( disable: 3571 )\n\
 cbuffer PS_CONSTANT_BUFFER : register(b0)\n\
@@ -323,7 +317,7 @@
 }
 
 
-static HRESULT CompileShader(vlc_object_t *obj, const d3d_shader_compiler_t *compiler,
+static HRESULT CompileShader(vlc_object_t *obj,
                              D3D_FEATURE_LEVEL feature_level,
                              const char *psz_shader, bool pixelShader,
                              const D3D_SHADER_MACRO *defines,
@@ -332,10 +326,7 @@
     ID3D10Blob* pShaderBlob = NULL, *pErrBlob = NULL;
 
     UINT compileFlags = 0;
-#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-    VLC_UNUSED(compiler);
-#else
-# define D3DCompile(a,b,c,d,e,f,g,h,i,j,k)    compiler->OurD3DCompile(a,b,c,d,e,f,g,h,i,j,k)
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 # if !defined(NDEBUG)
     if (IsDebuggerPresent())
         compileFlags += D3DCOMPILE_DEBUG;
@@ -389,7 +380,7 @@
     return S_OK;
 }
 
-static HRESULT CompilePixelShaderBlob(vlc_object_t *o, const d3d_shader_compiler_t *compiler,
+static HRESULT CompilePixelShaderBlob(vlc_object_t *o,
                                    D3D_FEATURE_LEVEL feature_level,
                                    const char *psz_sampler,
                                    const char *psz_shader_resource_views,
@@ -418,11 +409,11 @@
     }
 #endif
 
-    return CompileShader(o, compiler, feature_level, globPixelShaderDefault, true,
+    return CompileShader(o, feature_level, globPixelShaderDefault, true,
                          defines, pPSBlob);
 }
 
-HRESULT (D3D_CompilePixelShader)(vlc_object_t *o, const d3d_shader_compiler_t *compiler,
+HRESULT (D3D_CompilePixelShader)(vlc_object_t *o,
                                  D3D_FEATURE_LEVEL feature_level,
                                  const display_info_t *display,
                                  video_transfer_func_t transfer,
@@ -637,7 +628,7 @@
     }
 
     HRESULT hr;
-    hr = CompilePixelShaderBlob(o, compiler, feature_level,
+    hr = CompilePixelShaderBlob(o, feature_level,
                                 psz_sampler0, psz_shader_resource_views0,
                                 psz_src_to_linear,
                                 psz_linear_to_display,
@@ -645,7 +636,7 @@
                                 &pPSBlob0);
     if (SUCCEEDED(hr) && psz_sampler1)
     {
-        hr = CompilePixelShaderBlob(o, compiler, feature_level,
+        hr = CompilePixelShaderBlob(o, feature_level,
                                     psz_sampler1,  psz_shader_resource_views1,
                                     psz_src_to_linear,
                                     psz_linear_to_display,
@@ -658,7 +649,7 @@
     return hr;
 }
 
-HRESULT D3D_CompileVertexShader(vlc_object_t *obj, const d3d_shader_compiler_t *compiler,
+HRESULT D3D_CompileVertexShader(vlc_object_t *obj,
                                 D3D_FEATURE_LEVEL feature_level, bool flat,
                                 d3d_shader_blob *blob)
 {
@@ -666,44 +657,5 @@
          { "HAS_PROJECTION", flat ? "0" : "1" },
          { NULL, NULL },
     };
-    return CompileShader(obj, compiler, feature_level, globVertexShader, false, defines, blob);
-}
-
-
-int D3D_CreateShaderCompiler(vlc_object_t *obj, d3d_shader_compiler_t **compiler)
-{
-    *compiler = calloc(1, sizeof(d3d_shader_compiler_t));
-    if (unlikely(*compiler == NULL))
-        return VLC_ENOMEM;
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-    /* d3dcompiler_47 is the latest on windows 10 */
-    for (int i = 47; i > 41; --i)
-    {
-        WCHAR filename19;
-        _snwprintf(filename, ARRAY_SIZE(filename), TEXT("D3DCOMPILER_%d.dll"), i);
-        (*compiler)->compiler_dll = LoadLibrary(filename);
-        if ((*compiler)->compiler_dll) break;
-    }
-    if ((*compiler)->compiler_dll)
-        (*compiler)->OurD3DCompile = (pD3DCompile)((void*)GetProcAddress((*compiler)->compiler_dll, "D3DCompile"));
-
-    if (!(*compiler)->OurD3DCompile) {
-        msg_Err(obj, "Cannot locate reference to D3DCompile in d3dcompiler DLL");
-        FreeLibrary((*compiler)->compiler_dll);
-        free(*compiler);
-        return VLC_EGENERIC;
-    }
-#endif // WINAPI_PARTITION_DESKTOP
-
-    return VLC_SUCCESS;
+    return CompileShader(obj, feature_level, globVertexShader, false, defines, blob);
 }
-
-void D3D_ReleaseShaderCompiler(d3d_shader_compiler_t *compiler)
-{
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-    if (compiler->compiler_dll)
-        FreeLibrary(compiler->compiler_dll);
-#endif // WINAPI_PARTITION_DESKTOP
-    free(compiler);
-}
-

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/d3d_dynamic_shader.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/d3d_dynamic_shader.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/direct3d11.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/direct3d11.cpp Changed

@@ -5,6 +5,7 @@
  *
  * Authors: Martell Malone <martellmalone@gmail.com>
  *          Steve Lhomme <robux4@gmail.com>
+ *          Alexandre Janniaux <ajanni@videolabs.io>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
@@ -48,14 +49,12 @@
 #include "d3d11_tonemap.h"
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 #include "d3d11_swapchain.h"
+#include "common.h"
 #endif
 
-#include "common.h"
 #include "../../video_chroma/copy.h"
 
-#ifdef HAVE_DXGI1_6_H
-# include <dxgi1_6.h>
-#endif
+#include <dxgi1_6.h>
 
 using Microsoft::WRL::ComPtr;
 
@@ -120,7 +119,10 @@
 
 typedef struct vout_display_sys_t
 {
-    display_win32_area_t     area = {};
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+    struct event_thread_t    *video_wnd = nullptr;
+#endif
+    bool                     place_changed = false;
 
     int                      log_level = 1;
 
@@ -128,12 +130,9 @@
 
     d3d11_device_t           *d3d_dev = NULL;
     d3d11_decoder_device_t   *local_d3d_dev = NULL; // when opened without a video context
-    d3d_shader_compiler_t    *shaders = nullptr;
     d3d11_quad_t             picQuad = {};
 
-#ifdef HAVE_D3D11_4_H
     d3d11_gpu_fence          fence = {};
-#endif
 
     bool                     use_staging_texture = false;
     picture_sys_d3d11_t      stagingSys = {};
@@ -148,7 +147,7 @@
         ComPtr<ID3D11VideoProcessorOutputView>  outputView;
     } old_feature;
 
-
+    video_projection_mode_t  projection_mode;
     d3d11_vertex_shader_t    projectionVShader = {};
     d3d11_vertex_shader_t    flatVShader = {};
 
@@ -169,6 +168,7 @@
     // upscaling
     enum d3d11_upscale       upscaleMode = upscale_LinearSampler;
     d3d11_scaler             *scaleProc = nullptr;
+    vout_display_place_t     scalePlace;
 
     // HDR mode
     enum d3d11_hdr           hdrMode = hdr_Auto;
@@ -269,7 +269,9 @@
     if (sys->upscaleMode == upscale_VideoProcessor || sys->upscaleMode == upscale_SuperResolution)
     {
         D3D11_UpscalerUpdate(VLC_OBJECT(vd), sys->scaleProc, sys->d3d_dev,
-                             vd->source, &sys->picQuad.quad_fmt, &vd->cfg->display);
+                             vd->source, &sys->picQuad.quad_fmt,
+                             vd->cfg->display.width, vd->cfg->display.height,
+                             vd->place);
 
         if (D3D11_UpscalerUsed(sys->scaleProc))
         {
@@ -283,7 +285,12 @@
             sys->picQuad.generic.i_width = sys->picQuad.quad_fmt.i_width;
             sys->picQuad.generic.i_height = sys->picQuad.quad_fmt.i_height;
 
-            CommonPlacePicture(vd, &sys->area);
+            vout_display_place_t before_place = sys->scalePlace;
+            sys->scalePlace.x = 0;
+            sys->scalePlace.y = 0;
+            sys->scalePlace.width = sys->picQuad.quad_fmt.i_width;
+            sys->scalePlace.height = sys->picQuad.quad_fmt.i_height;
+            sys->place_changed |= !vout_display_PlaceEquals(&before_place, &sys->scalePlace);
         }
     }
 
@@ -340,12 +347,17 @@
 static void UpdateSize(vout_display_t *vd)
 {
     vout_display_sys_t *sys = static_cast<vout_display_sys_t *>(vd->sys);
-    msg_Dbg(vd, "Detected size change %dx%d", sys->area.place.width,
-            sys->area.place.height);
+    msg_Dbg(vd, "Detected size change %dx%d", vd->cfg->display.width,
+            vd->cfg->display.height);
 
     UpdateDisplayFormat(vd, vd->fmt);
 
-    sys->picQuad.UpdateViewport( &sys->area.place, sys->display.pixelFormat );
+    const vout_display_place_t *quad_place;
+    if (sys->scaleProc && D3D11_UpscalerUsed(sys->scaleProc))
+        quad_place = &sys->scalePlace;
+    else
+        quad_place = vd->place;
+    sys->picQuad.UpdateViewport( quad_place, sys->display.pixelFormat );
 
     d3d11_device_lock( sys->d3d_dev );
 
@@ -357,6 +369,8 @@
 
     d3d11_device_unlock( sys->d3d_dev );
 
+    sys->place_changed = false;
+
 #ifndef NDEBUG
     msg_Dbg( vd, "picQuad position (%.02f,%.02f) %.02fx%.02f",
              sys->picQuad.cropViewport0.TopLeftX, sys->picQuad.cropViewport0.TopLeftY,
@@ -452,7 +466,6 @@
     if (sys->hdrMode != hdr_Fake)
         return;
 
-#ifdef HAVE_DXGI1_6_H
     { // check the main display is in HDR mode
     HRESULT hr;
 
@@ -485,7 +498,6 @@
         goto error;
     }
     }
-#endif
 
     sys->tonemapProc = D3D11_TonemapperCreate(VLC_OBJECT(vd), sys->d3d_dev, fmt_in);
     if (sys->tonemapProc != NULL)
@@ -499,6 +511,13 @@
     msg_Dbg(vd, "failed to create the tone mapper, using default HDR mode");
 }
 
+static int ChangeSourceProjection(vout_display_t *vd, video_projection_mode_t projection)
+{
+    vout_display_sys_t *sys = static_cast<vout_display_sys_t *>(vd->sys);
+    sys->projection_mode = projection;
+    return Direct3D11CreateFormatResources(vd, vd->source);
+}
+
 static const auto ops = {
     struct vlc_display_operations ops {};
     ops.close = Close;
@@ -506,12 +525,17 @@
     ops.display = Display;
     ops.control = Control;
     ops.set_viewpoint = SetViewpoint;
+    ops.change_source_projection = ChangeSourceProjection;
     return ops;
 }();
 
 static int Open(vout_display_t *vd,
                 video_format_t *fmtp, vlc_video_context *context)
 {
+    if (vd->cfg->window->type != VLC_WINDOW_TYPE_HWND &&
+        vd->cfg->window->type != VLC_WINDOW_TYPE_DCOMP)
+        return VLC_ENOTSUP;
+
     vout_display_sys_t *sys = new (std::nothrow) vout_display_sys_t();
     if (!sys)
         return VLC_ENOMEM;
@@ -523,12 +547,6 @@
 
     d3d11_decoder_device_t *dev_sys = NULL;
 
-    int ret = D3D_CreateShaderCompiler(VLC_OBJECT(vd), &sys->shaders);
-    if (ret != VLC_SUCCESS)
-        goto error;
-
-    CommonInit(&sys->area, &sys->picQuad.quad_fmt);
-
     sys->outside_opaque = var_InheritAddress( vd, "vout-cb-opaque" );
     sys->updateOutputCb      = (libvlc_video_update_output_cb)var_InheritAddress( vd, "vout-cb-update-output" );
     sys->swapCb              = (libvlc_video_swap_cb)var_InheritAddress( vd, "vout-cb-swap" );
@@ -548,6 +566,7 @@
         dev_sys = sys->local_d3d_dev;
     }
     sys->d3d_dev = &dev_sys->d3d_dev;
+    sys->projection_mode = vd->cfg->projection;
 
     InitTonemapProcessor(vd, vd->source);
 
@@ -559,21 +578,19 @@
 #else // WINAPI_PARTITION_DESKTOP
         if (vd->cfg->window->type == VLC_WINDOW_TYPE_HWND)
         {
-            if (CommonWindowInit(vd, &sys->area,
-                       vd->source->projection_mode != PROJECTION_MODE_RECTANGULAR))
+            if (CommonWindowInit(vd, &sys->video_wnd,
+                       sys->projection_mode != PROJECTION_MODE_RECTANGULAR))
                 goto error;
         }
 
         /* use our internal swapchain callbacks */
         dxgi_swapchain *swap = nullptr;
-#if defined(HAVE_DCOMP_H)
         if (vd->cfg->window->type == VLC_WINDOW_TYPE_DCOMP)
             swap = DXGI_CreateLocalSwapchainHandleDComp(VLC_OBJECT(vd),
                                                         vd->cfg->window->display.dcomp_device,
                                                         vd->cfg->window->handle.dcomp_visual);
         else
-#endif //HAVE_DCOMP_H
-            swap = DXGI_CreateLocalSwapchainHandleHwnd(VLC_OBJECT(vd), CommonVideoHWND(&sys->area));
+            swap = DXGI_CreateLocalSwapchainHandleHwnd(VLC_OBJECT(vd), CommonVideoHWND(sys->video_wnd));
         if (unlikely(swap == NULL))
             goto error;
 
@@ -625,9 +642,8 @@
 static void Close(vout_display_t *vd)
 {
     vout_display_sys_t *sys = static_cast<vout_display_sys_t *>(vd->sys);
-    D3D_ReleaseShaderCompiler(sys->shaders);
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-    CommonWindowClean(&sys->area);
+    CommonWindowClean(sys->video_wnd);
 #endif
     Direct3D11Close(vd);
     delete sys;
@@ -640,7 +656,9 @@
     if (sys->upscaleMode == upscale_VideoProcessor || sys->upscaleMode == upscale_SuperResolution)
     {
         D3D11_UpscalerUpdate(VLC_OBJECT(vd), sys->scaleProc, sys->d3d_dev,
-                             vd->source, &sys->picQuad.quad_fmt, &vd->cfg->display);
+                             vd->source, &sys->picQuad.quad_fmt,
+                             vd->cfg->display.width, vd->cfg->display.height,
+                             vd->place);
 
         if (sys->scaleProc && D3D11_UpscalerUsed(sys->scaleProc))
         {
@@ -668,12 +686,32 @@
         sys->picQuad.quad_fmt.i_visible_height = vd->source->i_visible_height;
     }
 
-    CommonControl( vd, &sys->area, query );
+    switch (query) {
+    case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+        CommonDisplaySizeChanged(sys->video_wnd);
+#endif /* WINAPI_PARTITION_DESKTOP */
+        break;
+    case VOUT_DISPLAY_CHANGE_SOURCE_PLACE:
+        sys->place_changed = true;
+        // fallthrough
+    case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
+    case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
+    if (use_scaler)
+    {
+        vout_display_place_t before_place = sys->scalePlace;
+        sys->scalePlace.x = 0;
+        sys->scalePlace.y = 0;
+        sys->scalePlace.width = sys->picQuad.quad_fmt.i_width;
+        sys->scalePlace.height = sys->picQuad.quad_fmt.i_height;
+        sys->place_changed |= !vout_display_PlaceEquals(&before_place, &sys->scalePlace);
+        break;
+    }
+    }
 
-    if ( sys->area.place_changed )
+    if ( sys->place_changed )
     {
         UpdateSize(vd);
-        sys->area.place_changed =false;
     }
 
     return VLC_SUCCESS;
@@ -861,7 +899,6 @@
                 sys->picQuad.generic.i_width  = sys->picQuad.quad_fmt.i_width;
                 sys->picQuad.generic.i_height = sys->picQuad.quad_fmt.i_height;
 
-                CommonPlacePicture(vd, &sys->area);
                 UpdateSize(vd);
             }
         }
@@ -898,7 +935,7 @@
         renderSrc = p_sys->renderSrc;
     }
     D3D11_RenderQuad(sys->d3d_dev, &sys->picQuad,
-                     vd->source->projection_mode == PROJECTION_MODE_RECTANGULAR ? &sys->flatVShader : &sys->projectionVShader,
+                     sys->projection_mode == PROJECTION_MODE_RECTANGULAR ? &sys->flatVShader : &sys->projectionVShader,
                      renderSrc, SelectRenderPlane, sys);
 
     if (subpicture) {
@@ -913,7 +950,6 @@
         }
     }
 
-#ifdef HAVE_D3D11_4_H
     if (sys->log_level >= 4)
     {
         vlc_tick_t render_start = vlc_tick_now();
@@ -924,7 +960,6 @@
     {
         D3D11_WaitFence(sys->fence);
     }
-#endif
 }
 
 static void Prepare(vout_display_t *vd, picture_t *picture,
@@ -1052,14 +1087,18 @@
 #endif
                 )
         {
-            const vlc_fourcc_t *list = vlc_fourcc_GetFallback(vd->source->i_chroma);
-            for (unsigned i = 0; listi != 0; i++) {
-                if (listi == vd->source->i_chroma)
-                    continue;
-                fmt.i_chroma = listi;
-                err = SetupOutputFormat(vd, &fmt, nullptr, &sys->picQuad.quad_fmt);
-                if (err == VLC_SUCCESS)
-                    break;
+            vlc_fourcc_t *list = vlc_fourcc_GetFallback(vd->source->i_chroma);
+            if (list != NULL)
+            {
+                for (unsigned i = 0; listi != 0; i++) {
+                    if (listi == vd->source->i_chroma)
+                        continue;
+                    fmt.i_chroma = listi;
+                    err = SetupOutputFormat(vd, &fmt, nullptr, &sys->picQuad.quad_fmt);
+                    if (err == VLC_SUCCESS)
+                        break;
+                }
+                free(list);
             }
         }
         if (err != VLC_SUCCESS)
@@ -1108,7 +1147,11 @@
 
     InitScaleProcessor(vd);
 
-    CommonPlacePicture(vd, &sys->area);
+    sys->scalePlace.x = 0;
+    sys->scalePlace.y = 0;
+    sys->scalePlace.width = vd->cfg->display.width;
+    sys->scalePlace.height = vd->cfg->display.height;
+    sys->place_changed = true;
 
     err = UpdateDisplayFormat(vd, &sys->picQuad.quad_fmt);
     if (err != VLC_SUCCESS) {
@@ -1349,7 +1392,7 @@
     if (vctx)
     {
         d3d11_video_context_t *vtcx_sys = GetD3D11ContextPrivate(vctx);
-        if (sys->picQuad.generic.textureFormat->formatTexture != vtcx_sys->format)
+        if (vtcx_sys && sys->picQuad.generic.textureFormat->formatTexture != vtcx_sys->format)
         {
             HRESULT hr;
             // check the input format can be used as input of a VideoProcessor
@@ -1414,7 +1457,7 @@
         sys->use_staging_texture = false;
 
     d3d_shader_blob pPSBlobDXGI_MAX_RENDER_TARGET = { };
-    hr = D3D11_CompilePixelShaderBlob(vd, sys->shaders, sys->d3d_dev,
+    hr = D3D11_CompilePixelShaderBlob(vd, sys->d3d_dev,
                                   &sys->display, fmt->transfer,
                                   fmt->color_range == COLOR_RANGE_FULL,
                                   &sys->picQuad, pPSBlob);
@@ -1431,7 +1474,7 @@
         return VLC_EGENERIC;
     }
 
-    if (D3D11_AllocateQuad(vd, sys->d3d_dev, sys->picQuad.quad_fmt.projection_mode, &sys->picQuad) != VLC_SUCCESS)
+    if (D3D11_AllocateQuad(vd, sys->d3d_dev, sys->projection_mode, &sys->picQuad) != VLC_SUCCESS)
     {
         msg_Err(vd, "Could not allocate quad buffers.");
        return VLC_EGENERIC;
@@ -1450,8 +1493,8 @@
         return VLC_EGENERIC;
     }
 
-    if ( vd->source->projection_mode == PROJECTION_MODE_EQUIRECTANGULAR ||
-         vd->source->projection_mode == PROJECTION_MODE_CUBEMAP_LAYOUT_STANDARD )
+    if ( sys->projection_mode == PROJECTION_MODE_EQUIRECTANGULAR ||
+         sys->projection_mode == PROJECTION_MODE_CUBEMAP_LAYOUT_STANDARD )
         D3D11_UpdateViewpoint( vd, sys->d3d_dev, &sys->picQuad, &vd->cfg->viewpoint,
                                (float) vd->cfg->display.width / vd->cfg->display.height );
 
@@ -1470,13 +1513,11 @@
     vout_display_sys_t *sys = static_cast<vout_display_sys_t *>(vd->sys);
     HRESULT hr;
 
-#ifdef HAVE_D3D11_4_H
     hr = D3D11_InitFence(*sys->d3d_dev, sys->fence);
     if (SUCCEEDED(hr))
     {
         msg_Dbg(vd, "using GPU render fence");
     }
-#endif
 
     ComPtr<ID3D11BlendState> pSpuBlendState;
     D3D11_BLEND_DESC spuBlendDesc = { };
@@ -1512,7 +1553,7 @@
     if (sys->regionQuad.generic.textureFormat != NULL)
     {
         d3d_shader_blob pPSBlobDXGI_MAX_RENDER_TARGET = { };
-        hr = D3D11_CompilePixelShaderBlob(vd, sys->shaders, sys->d3d_dev,
+        hr = D3D11_CompilePixelShaderBlob(vd, sys->d3d_dev,
                                       &sys->display, TRANSFER_FUNC_SRGB, true,
                                       &sys->regionQuad, pPSBlob);
         if (FAILED(hr))
@@ -1530,7 +1571,7 @@
     }
 
     d3d_shader_blob VSBlob = { };
-    hr = D3D11_CompileVertexShaderBlob(VLC_OBJECT(vd), sys->shaders, sys->d3d_dev, true, &VSBlob);
+    hr = D3D11_CompileVertexShaderBlob(VLC_OBJECT(vd), sys->d3d_dev, true, &VSBlob);
     if(FAILED(hr)) {
       msg_Err(vd, "Failed to compile the flat vertex shader. (hr=0x%lX)", hr);
       return VLC_EGENERIC;
@@ -1542,7 +1583,7 @@
     }
 
 
-    hr = D3D11_CompileVertexShaderBlob(VLC_OBJECT(vd), sys->shaders, sys->d3d_dev, false, &VSBlob);
+    hr = D3D11_CompileVertexShaderBlob(VLC_OBJECT(vd), sys->d3d_dev, false, &VSBlob);
     if(FAILED(hr)) {
       msg_Err(vd, "Failed to compile the 360 vertex shader. (hr=0x%lX)", hr);
       return VLC_EGENERIC;
@@ -1553,7 +1594,12 @@
       return VLC_EGENERIC;
     }
 
-    sys->picQuad.UpdateViewport( &sys->area.place, sys->display.pixelFormat );
+    const vout_display_place_t *quad_place;
+    if (sys->scaleProc && D3D11_UpscalerUsed(sys->scaleProc))
+        quad_place = &sys->scalePlace;
+    else
+        quad_place = vd->place;
+    sys->picQuad.UpdateViewport( quad_place, sys->display.pixelFormat );
 
 #ifndef NDEBUG
     msg_Dbg( vd, "picQuad position (%.02f,%.02f) %.02fx%.02f",
@@ -1593,9 +1639,7 @@
     D3D11_ReleaseVertexShader(&sys->flatVShader);
     D3D11_ReleaseVertexShader(&sys->projectionVShader);
 
-#ifdef HAVE_D3D11_4_H
     D3D11_ReleaseFence(sys->fence);
-#endif
 
     msg_Dbg(vd, "Direct3D11 resources destroyed");
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/direct3d9.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/direct3d9.c Changed

@@ -119,7 +119,8 @@
 
 typedef struct vout_display_sys_t
 {
-    display_win32_area_t     area;
+    struct event_thread_t    *video_wnd;
+    bool                     place_changed;
 
     bool allow_hw_yuv;    /* Should we use hardware YUV->RGB conversions */
 
@@ -158,7 +159,6 @@
 
     /* range converter */
     struct {
-        HMODULE                 dll;
         IDXVAHD_VideoProcessor *proc;
     } processor;
 } vout_display_sys_t;
@@ -186,9 +186,9 @@
 {
     HINSTANCE instance = NULL;
     for (int i = 43; i > 23; --i) {
-        WCHAR filename16;
-        _snwprintf(filename, ARRAY_SIZE(filename), TEXT("D3dx9_%d.dll"), i);
-        instance = LoadLibrary(filename);
+        char filename16;
+        _snprintf(filename, ARRAY_SIZE(filename), "D3dx9_%d.dll", i);
+        instance = LoadLibraryExA(filename, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
         if (instance)
             break;
     }
@@ -413,7 +413,7 @@
     /* */
     region->texture = sys->sceneTexture;
     Direct3D9SetupVertices(region->vertex, &texture_visible_rect, vd->source,
-                           &sys->area.place, 255, vd->source->orientation);
+                           vd->place, 255, vd->source->orientation);
     return VLC_SUCCESS;
 }
 
@@ -667,7 +667,7 @@
 {
     vout_display_sys_t *sys = vd->sys;
 
-    HRESULT (WINAPI * OurD3DXCompileShader)(
+    typedef HRESULT (WINAPI * OurD3DXCompileShader_ptr)(
             LPCSTR pSrcData,
             UINT srcDataLen,
             const D3DXMACRO *pDefines,
@@ -679,7 +679,8 @@
             LPD3DXBUFFER *ppErrorMsgs,
             LPD3DXCONSTANTTABLE *ppConstantTable);
 
-    OurD3DXCompileShader = (void*)GetProcAddress(sys->hxdll, "D3DXCompileShader");
+    OurD3DXCompileShader_ptr OurD3DXCompileShader;
+    OurD3DXCompileShader = (OurD3DXCompileShader_ptr)GetProcAddress(sys->hxdll, "D3DXCompileShader");
     if (!OurD3DXCompileShader) {
         msg_Warn(vd, "Cannot locate reference to D3DXCompileShader; pixel shading will be disabled");
         return VLC_EGENERIC;
@@ -1107,12 +1108,12 @@
     vout_display_sys_t *sys = vd->sys;
 
     /* Position Change */
-    if (sys->area.place_changed) {
+    if (sys->place_changed) {
 #if 0 /* need that when bicubic filter is available */
         RECT rect;
         UINT width, height;
 
-        GetClientRect(CommonVideoHWND(&sys->area), &rect);
+        GetClientRect(CommonVideoHWND(sys->video_wnd), &rect);
         width  = RECTWidth(rect);
         height = RECTHeight(rect);
 
@@ -1127,7 +1128,7 @@
         UpdateOutput(vd, vd->fmt, NULL);
 
         sys->clear_scene = true;
-        sys->area.place_changed = false;
+        sys->place_changed = false;
     }
 
     d3d9_device_t *p_d3d9_dev = &sys->d3d9_device->d3ddev;
@@ -1241,9 +1242,9 @@
 
     HRESULT hr;
     if (sys->d3d9_device->hd3d.use_ex) {
-        hr = IDirect3DDevice9Ex_PresentEx(p_d3d9_dev->devex, &src, &src, CommonVideoHWND(&sys->area), NULL, 0);
+        hr = IDirect3DDevice9Ex_PresentEx(p_d3d9_dev->devex, &src, &src, CommonVideoHWND(sys->video_wnd), NULL, 0);
     } else {
-        hr = IDirect3DDevice9_Present(p_d3d9_dev->dev, &src, &src, CommonVideoHWND(&sys->area), NULL);
+        hr = IDirect3DDevice9_Present(p_d3d9_dev->dev, &src, &src, CommonVideoHWND(sys->video_wnd), NULL);
     }
     if (FAILED(hr)) {
         msg_Dbg(vd, "Failed Present: 0x%lX", hr);
@@ -1269,7 +1270,6 @@
     if (sys->processor.proc)
     {
         IDXVAHD_VideoProcessor_Release(sys->processor.proc);
-        FreeLibrary(sys->processor.dll);
     }
     if (sys->dec_device)
         vlc_decoder_device_Release(sys->dec_device);
@@ -1351,7 +1351,8 @@
         msg_Warn( vd, "Disabling hardware chroma conversion due to odd dimensions" );
 
     for (unsigned pass = 0; pass < 2; pass++) {
-        const vlc_fourcc_t *list;
+        const vlc_fourcc_t *list = NULL;
+        vlc_fourcc_t *fallback_list = NULL;
         const vlc_fourcc_t dxva_chroma = {fmt->i_chroma, 0};
         D3DFORMAT decoder_format = D3DFMT_UNKNOWN;
 
@@ -1364,10 +1365,11 @@
             msg_Dbg(vd, "favor decoder format: %4.4s (%d)", (const char*)&decoder_format, decoder_format);
         }
         else if (pass == 0 && hardware_scale_ok && sys->allow_hw_yuv && vlc_fourcc_IsYUV(fmt->i_chroma))
-            list = vlc_fourcc_GetYUVFallback(fmt->i_chroma);
+            list = fallback_list = vlc_fourcc_GetYUVFallback(fmt->i_chroma);
         else if (pass == 1)
-            list = vlc_fourcc_GetRGBFallback(fmt->i_chroma);
-        else
+            list = fallback_list = vlc_fourcc_GetRGBFallback(fmt->i_chroma);
+
+        if (list == NULL)
             continue;
 
         for (unsigned i = 0; listi != 0; i++) {
@@ -1381,9 +1383,13 @@
 
                 msg_Dbg(vd, "trying surface pixel format: %s", format->name);
                 if (!Direct3D9CheckConversion(vd, format->format))
+                {
+                    free(fallback_list);
                     return format;
+                }
             }
         }
+        free(fallback_list);
     }
     return NULL;
 }
@@ -1447,28 +1453,10 @@
 
     HRESULT hr;
 
-    sys->processor.dll = LoadLibrary(TEXT("DXVA2.DLL"));
-    if (unlikely(!sys->processor.dll))
-    {
-        msg_Err(vd, "Failed to load DXVA2.DLL");
-        return VLC_EGENERIC;
-    }
-
     D3DFORMAT *formatsList = NULL;
     DXVAHD_VPCAPS *capsList = NULL;
     IDXVAHD_Device *hd_device = NULL;
 
-#ifdef __MINGW64_VERSION_MAJOR
-    typedef HRESULT (WINAPI* PDXVAHD_CreateDevice)(IDirect3DDevice9Ex *,const DXVAHD_CONTENT_DESC *,DXVAHD_DEVICE_USAGE,PDXVAHDSW_Plugin,IDXVAHD_Device **);
-#endif
-    PDXVAHD_CreateDevice CreateDevice;
-    CreateDevice = (PDXVAHD_CreateDevice)GetProcAddress(sys->processor.dll, "DXVAHD_CreateDevice");
-    if (CreateDevice == NULL)
-    {
-        msg_Err(vd, "Can't create HD device (not Windows 7+)");
-        goto error;
-    }
-
     DXVAHD_CONTENT_DESC desc;
     desc.InputFrameFormat = DXVAHD_FRAME_FORMAT_PROGRESSIVE;
     GetFrameRate( &desc.InputFrameRate, vd->source );
@@ -1478,7 +1466,7 @@
     desc.OutputWidth      = vd->source->i_visible_width;
     desc.OutputHeight     = vd->source->i_visible_height;
 
-    hr = CreateDevice(sys->d3d9_device->d3ddev.devex, &desc, DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL, NULL, &hd_device);
+    hr = DXVAHD_CreateDevice(sys->d3d9_device->d3ddev.devex, &desc, DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL, NULL, &hd_device);
     if (FAILED(hr))
     {
         msg_Dbg(vd, "Failed to create the device (error 0x%lX)", hr);
@@ -1579,7 +1567,6 @@
     free(formatsList);
     if (hd_device)
         IDXVAHD_Device_Release(hd_device);
-    FreeLibrary(sys->processor.dll);
     return VLC_EGENERIC;
 }
 
@@ -1663,7 +1650,17 @@
 static int Control(vout_display_t *vd, int query)
 {
     vout_display_sys_t *sys = vd->sys;
-    CommonControl(vd, &sys->area, query);
+    switch (query) {
+    case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
+        CommonDisplaySizeChanged(sys->video_wnd);
+        break;
+    case VOUT_DISPLAY_CHANGE_SOURCE_PLACE:
+        sys->place_changed = true;
+        break;
+    case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
+    case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
+        break;
+    }
     return VLC_SUCCESS;
 }
 
@@ -1759,7 +1756,8 @@
     if (!sys)
         return VLC_ENOMEM;
 
-    CommonInit(&sys->area, vd->source);
+    sys->place_changed = false;
+    sys->video_wnd = NULL;
 
     sys->outside_opaque = var_InheritAddress( vd, "vout-cb-opaque" );
     sys->updateOutputCb      = var_InheritAddress( vd, "vout-cb-update-output" );
@@ -1769,7 +1767,7 @@
     if ( sys->swapCb == NULL || sys->startEndRenderingCb == NULL || sys->updateOutputCb == NULL )
     {
         /* use our own callbacks, since there isn't any external ones */
-        if (CommonWindowInit(vd, &sys->area, false))
+        if (CommonWindowInit(vd, &sys->video_wnd, false))
             goto error;
 
         sys->outside_opaque = vd;
@@ -1778,8 +1776,6 @@
         sys->startEndRenderingCb = NULL;
     }
 
-    CommonPlacePicture(vd, &sys->area);
-
     sys->dec_device = context ? vlc_video_context_HoldDevice(context) : NULL;
     sys->d3d9_device = GetD3D9OpaqueDevice(sys->dec_device);
     if ( sys->d3d9_device == NULL )
@@ -1846,7 +1842,7 @@
     return VLC_SUCCESS;
 error:
     Direct3D9Close(vd);
-    CommonWindowClean(&sys->area);
+    CommonWindowClean(sys->video_wnd);
     Direct3D9Destroy(sys);
     free(vd->sys);
     return VLC_EGENERIC;
@@ -1861,7 +1857,7 @@
 
     Direct3D9Close(vd);
 
-    CommonWindowClean(&sys->area);
+    CommonWindowClean(sys->video_wnd);
 
     Direct3D9Destroy(sys);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/dxgi_swapchain.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/dxgi_swapchain.cpp Changed

@@ -30,16 +30,12 @@
 #include <vlc_es.h>
 
 #include <windows.h>
-#if defined(HAVE_DCOMP_H)
-# include <dcomp.h>
-#endif
+#include <dcomp.h>
 
 #include <initguid.h>
 #include "dxgi_swapchain.h"
 
-#ifdef HAVE_DXGI1_6_H
-# include <dxgi1_6.h>
-#endif
+#include <dxgi1_6.h>
 
 #include "../../video_chroma/dxgi_fmt.h"
 
@@ -79,12 +75,10 @@
     swapchain_surface_type  swapchainSurfaceType;
     union {
         HWND                hwnd;
-#if defined(HAVE_DCOMP_H)
         struct {
             IDCompositionDevice  *device;
             IDCompositionVisual  *visual;
         } dcomp;
-#endif // HAVE_DCOMP_H
     } swapchainSurface;
 
     ComPtr<IDXGISwapChain1> dxgiswapChain;   /* DXGI 1.2 swap chain */
@@ -134,7 +128,6 @@
 #undef DXGIMAP
 };
 
-#ifdef HAVE_DXGI1_6_H
 static bool canHandleConversion(const dxgi_color_space *src, const dxgi_color_space *dst)
 {
     if (src == dst)
@@ -145,7 +138,6 @@
         return true; /* we can handle anything to 709 */
     return false; /* let Windows do the rest */
 }
-#endif
 
 void DXGI_SelectSwapchainColorspace(dxgi_swapchain *display, const libvlc_video_render_cfg_t *cfg, bool match_display)
 {
@@ -198,7 +190,6 @@
 
     display->dxgiswapChain.As(&display->dxgiswapChain4);
 
-#ifdef HAVE_DXGI1_6_H
     if (match_display)
     if (SUCCEEDED(display->dxgiswapChain->GetContainingOutput(&dxgiOutput)))
     {
@@ -229,7 +220,6 @@
             }
         }
     }
-#endif
 
     hr = dxgiswapChain3->SetColorSpace1(color_spacesbest.dxgi);
     if (SUCCEEDED(hr))
@@ -255,25 +245,33 @@
     out->Format = display->pixelFormat->formatTexture;
     //out->Flags = 512; // DXGI_SWAP_CHAIN_FLAG_YUV_VIDEO;
 
+#if (_WIN32_WINNT < _WIN32_WINNT_WIN10)
     bool isWin10OrGreater = false;
     HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32.dll"));
     if (likely(hKernel32 != NULL))
         isWin10OrGreater = GetProcAddress(hKernel32, "GetSystemCpuSetInformation") != NULL;
     if (isWin10OrGreater)
+#endif // !_WIN32_WINNT_WIN10
         out->SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD;
+#if (_WIN32_WINNT < _WIN32_WINNT_WIN10)
     else
     {
-        bool isWin80OrGreater = false;
+#if (_WIN32_WINNT < _WIN32_WINNT_WIN8)
+        bool isWin8OrGreater = false;
         if (likely(hKernel32 != NULL))
-            isWin80OrGreater = GetProcAddress(hKernel32, "CheckTokenCapability") != NULL;
-        if (isWin80OrGreater)
+            isWin8OrGreater = GetProcAddress(hKernel32, "GetCurrentThreadStackLimits") != NULL;
+        if (isWin8OrGreater)
+#endif // !_WIN32_WINNT_WIN8
             out->SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
+#if (_WIN32_WINNT < _WIN32_WINNT_WIN8)
         else
         {
             out->SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
             out->BufferCount = 1;
         }
+#endif // !_WIN32_WINNT_WIN8
     }
+#endif // !_WIN32_WINNT_WIN10
 }
 
 static void DXGI_CreateSwapchainHwnd(dxgi_swapchain *display,
@@ -314,7 +312,6 @@
     }
 }
 
-#if defined(HAVE_DCOMP_H)
 static void DXGI_CreateSwapchainDComp(dxgi_swapchain *display,
                                IDXGIAdapter *dxgiadapter, IUnknown *pFactoryDevice,
                                UINT width, UINT height)
@@ -355,7 +352,6 @@
         msg_Err(display->obj, "Could not create the SwapChain. (hr=0x%lX)", hr);
     }
 }
-#endif /* HAVE_DCOMP_H */
 
 void DXGI_LocalSwapchainSwap( dxgi_swapchain *display )
 {
@@ -411,7 +407,6 @@
     return display;
 }
 
-#if defined(HAVE_DCOMP_H)
 dxgi_swapchain *DXGI_CreateLocalSwapchainHandleDComp(vlc_object_t *o, void* dcompDevice, void* dcompVisual)
 {
     dxgi_swapchain *display = new (std::nothrow) dxgi_swapchain();
@@ -425,7 +420,6 @@
 
     return display;
 }
-#endif
 
 void DXGI_LocalSwapchainCleanupDevice( dxgi_swapchain *display )
 {
@@ -462,12 +456,10 @@
     {
         display->pixelFormat = newPixelFormat;
 
-#if defined(HAVE_DCOMP_H)
         if (display->swapchainSurfaceType == SWAPCHAIN_SURFACE_DCOMP)
             DXGI_CreateSwapchainDComp(display, dxgiadapter, pFactoryDevice,
                                       width, height);
         else // SWAPCHAIN_TARGET_HWND
-#endif // HAVE_DCOMP_H
             DXGI_CreateSwapchainHwnd(display, dxgiadapter, pFactoryDevice,
                                      width, height);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/dxgi_swapchain.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/dxgi_swapchain.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/glwin32.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/glwin32.c Changed

@@ -62,7 +62,8 @@
  *****************************************************************************/
 typedef struct vout_display_sys_t
 {
-    display_win32_area_t     area;
+    struct event_thread_t    *video_wnd;
+    bool                     place_changed;
 
     vlc_gl_t              *gl;
     vout_display_opengl_t *vgl;
@@ -85,7 +86,17 @@
 static int Control(vout_display_t *vd, int query)
 {
     vout_display_sys_t *sys = vd->sys;
-    CommonControl(vd, &sys->area, query);
+    switch (query) {
+    case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
+        CommonDisplaySizeChanged(sys->video_wnd);
+        break;
+    case VOUT_DISPLAY_CHANGE_SOURCE_PLACE:
+        sys->place_changed = true;
+        break;
+    case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
+    case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
+        break;
+    }
     return VLC_SUCCESS;
 }
 
@@ -102,7 +113,7 @@
         return NULL;
 
     wnd->type = VLC_WINDOW_TYPE_HWND;
-    wnd->handle.hwnd = CommonVideoHWND(&sys->area);
+    wnd->handle.hwnd = CommonVideoHWND(sys->video_wnd);
     wnd->ops = &embedVideoWindow_Ops;
     return wnd;
 }
@@ -120,7 +131,7 @@
     ret = vout_display_opengl_UpdateFormat(sys->vgl, fmt, vctx);
 
     // /* Force to recompute the viewport on next picture */
-    sys->area.place_changed = true;
+    sys->place_changed = true;
 
     /* Restore viewpoint */
     int vp_ret = vout_display_opengl_SetViewpoint(sys->vgl, &sys->viewpoint);
@@ -160,11 +171,10 @@
         return VLC_ENOMEM;
 
     /* */
-    CommonInit(&sys->area, vd->source);
-    if (CommonWindowInit(vd, &sys->area,
+    sys->place_changed = true;
+    if (CommonWindowInit(vd, &sys->video_wnd,
                    vd->source->projection_mode != PROJECTION_MODE_RECTANGULAR))
         goto error;
-    CommonPlacePicture(vd, &sys->area);
 
     vlc_window_SetTitle(vd->cfg->window, VOUT_TITLE " (OpenGL output)");
 
@@ -228,7 +238,7 @@
         vlc_object_delete(surface);
     }
 
-    CommonWindowClean(&sys->area);
+    CommonWindowClean(sys->video_wnd);
 
     free(sys);
 }
@@ -243,7 +253,7 @@
 
     if (vlc_gl_MakeCurrent (sys->gl) != VLC_SUCCESS)
         return;
-    if (sys->area.place_changed)
+    if (sys->place_changed)
     {
         vout_display_place_t place = *vd->place;
 
@@ -253,7 +263,7 @@
         vlc_gl_Resize (sys->gl, place.width, place.height);
         vout_display_opengl_SetOutputSize(sys->vgl, vd->cfg->display.width, vd->cfg->display.height);
         vout_display_opengl_Viewport(sys->vgl, place.x, place.y, place.width, place.height);
-        sys->area.place_changed = false;
+        sys->place_changed = false;
     }
     vout_display_opengl_Prepare (sys->vgl, picture, subpicture);
     vlc_gl_ReleaseCurrent (sys->gl);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/meson.build Changed

@@ -5,43 +5,52 @@
 # Direct3D11 video output
 d3d11_sources = files('direct3d11.cpp', 'd3d11_quad.cpp', 'd3d11_scaler.cpp',
                       'd3d11_shaders.cpp', 'd3d11_tonemap.cpp',
-                      'd3d_shaders.c', 'd3d_dynamic_shader.c', 'common.c')
-d3d11_link_with =  d3d11_common_lib 
+                      'd3d_shaders.c', 'd3d_dynamic_shader.c')
+d3d11_link_with =  d3d11_common_lib, chroma_copy_lib 
 d3d11_cargs = 
 d3d11_cxxargs =  libcom_cppflags 
-d3d11_deps =  cc.find_library('dxgi'), cc.find_library('d3d11') 
-if get_option('winstore_app')
-    d3d11_deps += 
-        cc.find_library('d3dcompiler_47')
-    
-else
-    d3d11_sources += files('d3d11_swapchain.cpp', 'dxgi_swapchain.cpp', 'events.c', 'sensors.cpp', 'win32touch.c')
-    d3d11_link_with +=  chroma_copy_lib 
+d3d11_deps =  cc.find_library('dxgi'), cc.find_library('d3d11'), cc.find_library('d3dcompiler') 
+if not have_win_store
+    d3d11_sources += files('d3d11_swapchain.cpp', 'dxgi_swapchain.cpp', 'common.c', 'events.c', 'sensors.cpp', 'win32touch.c')
     d3d11_cargs += '-DHAVE_WIN32_SENSORS'
     d3d11_deps += 
         cc.find_library('user32')
     
 endif
+if get_option('amf_scaler').allowed()
+    if cc.check_header('AMF/core/PropertyStorage.h', args: contrib_inc_args) \
+    and cc.check_header('AMF/components/HQScaler.h', args: contrib_inc_args)
+        cdata.set('HAVE_AMF_SCALER', 1)
+        d3d11_sources += files('../../hw/amf/amf_helper.c')
+        d3d11_cxxargs += contrib_inc_args
+        d3d11_cargs += contrib_inc_args
+    endif
+endif
 
-vlc_modules += {
-    'name' : 'direct3d11',
-    'sources' : d3d11_sources,
-    'link_with' : d3d11_link_with,
-    'c_args' : d3d11_cargs,
-    'cpp_args' : d3d11_cxxargs,
-    'dependencies' : d3d11_deps
-}
-
-if have_win_desktop
-    # Direct3D9 video output
+if get_option('directx').allowed()
     vlc_modules += {
-        'name' : 'direct3d9',
-        'sources' : files('direct3d9.c', 'common.c', 'events.c', 'sensors.cpp', 'win32touch.c'),
-        'link_with' :  d3d9_common_lib, chroma_copy_lib ,
-        'dependencies' : 
-            cc.find_library('user32')
-        
+        'name' : 'direct3d11',
+        'sources' : d3d11_sources,
+        'link_with' : d3d11_link_with,
+        'c_args' : d3d11_cargs,
+        'cpp_args' : d3d11_cxxargs,
+        'dependencies' : d3d11_deps
     }
+endif
+
+if have_win_desktop
+    if get_option('directx').allowed()
+        # Direct3D9 video output
+        vlc_modules += {
+            'name' : 'direct3d9',
+            'sources' : files('direct3d9.c', 'common.c', 'events.c', 'sensors.cpp', 'win32touch.c'),
+            'link_with' :  d3d9_common_lib, chroma_copy_lib ,
+            'dependencies' : 
+                cc.find_library('user32'),
+                cc.find_library('dxva2'),
+            
+        }
+    endif
 
     # GDI video output
     vlc_modules += {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/sensors.cpp -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/sensors.cpp Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/wgl.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/wgl.c Changed

@@ -175,12 +175,17 @@
 
     sys->hvideownd = wnd->handle.hwnd;
     sys->hGLDC = GetDC(sys->hvideownd);
-    sys->hOpengl = LoadLibraryA("opengl32.dll");
     if (sys->hGLDC == NULL)
     {
         msg_Err(gl, "Could not get the device context");
         goto error;
     }
+    sys->hOpengl = GetModuleHandleA("opengl32.dll");
+    if (unlikely(sys->hOpengl == NULL))
+    {
+        msg_Err(gl, "Could not get the opengl32 DLL");
+        goto error;
+    }
 
     /* Set the pixel format for the DC */
     PIXELFORMATDESCRIPTOR pfd = VLC_PFD_INITIALIZER;
@@ -252,8 +257,6 @@
         wglDeleteContext(sys->hGLRC);
     if (sys->hGLDC)
         ReleaseDC(sys->hvideownd, sys->hGLDC);
-    if (sys->hOpengl)
-        FreeLibrary(sys->hOpengl);
 
     DestroyGPUAffinityDC(gl);
 
@@ -271,11 +274,11 @@
     vout_display_sys_t *sys = gl->sys;
 
     /* See https://www.khronos.org/opengl/wiki/Load_OpenGL_Functions */
-    void *f= (void *)wglGetProcAddress(name);
+    PROC f= wglGetProcAddress(name);
     if(f == 0 || (f == (void*)0x1) || (f == (void*)0x2) ||
       (f == (void*)0x3) || (f == (void*)-1) )
     {
-        f = (void *)GetProcAddress(sys->hOpengl, name);
+        f = GetProcAddress(sys->hOpengl, name);
     }
     return f;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/win32/wingdi.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/win32/wingdi.c Changed

@@ -59,7 +59,9 @@
  *****************************************************************************/
 typedef struct vout_display_sys_t
 {
-    display_win32_area_t     area;
+    struct event_thread_t    *video_wnd;
+    bool                     size_changed;
+    bool                     place_changed;
 
     /* Our offscreen bitmap and its framebuffer */
     HDC        off_dc;
@@ -75,10 +77,8 @@
 static int            Init(vout_display_t *, video_format_t *);
 static void           Clean(vout_display_t *);
 
-static int ChangeSize(vout_display_t *vd, HDC hdc)
+static bool ChangeSize(vout_display_t *vd, HDC hdc)
 {
-    vout_display_sys_t *sys = vd->sys;
-
     // clear the background, even if creating the writable buffer fails
     RECT display = {
         .left   = 0,
@@ -86,7 +86,12 @@
         .top    = 0,
         .bottom = vd->cfg->display.height,
     };
-    FillRect(hdc, &display, GetStockObject(BLACK_BRUSH));
+    return FillRect(hdc, &display, GetStockObject(BLACK_BRUSH)) == 0;
+}
+
+static bool ChangePlace(vout_display_t *vd, HDC hdc)
+{
+    vout_display_sys_t *sys = vd->sys;
 
     video_format_t fmt_rot;
     video_format_ApplyRotation(&fmt_rot, vd->source);
@@ -106,7 +111,7 @@
                                            DIB_RGB_COLORS,
                                            &p_pic_buffer, NULL, 0);
         if (unlikely(sys->off_bitmap == NULL))
-            return VLC_EINVAL;
+            return true;
         sys->pic_buf.p_pixels = p_pic_buffer;
         sys->pic_buf.i_pixel_pitch = (bih->biBitCount + 7) / 8;
         sys->pic_buf.i_pitch = sys->pic_buf.i_visible_pitch =
@@ -114,7 +119,7 @@
         sys->pic_buf.i_lines = sys->pic_buf.i_visible_lines =
             fmt_rot.i_visible_height;
     }
-    return VLC_SUCCESS;
+    return false;
 }
 
 static void Prepare(vout_display_t *vd, picture_t *picture,
@@ -125,16 +130,22 @@
     VLC_UNUSED(date);
     vout_display_sys_t *sys = vd->sys;
 
-    if (sys->area.place_changed)
+    if (sys->place_changed || sys->size_changed)
     {
-        HDC hdc = GetDC(CommonVideoHWND(&sys->area));
-        int err = ChangeSize(vd, hdc);
-        ReleaseDC(CommonVideoHWND(&sys->area), hdc);
-
-        if (unlikely(err != VLC_SUCCESS))
+        bool err = false;
+        HWND hwnd = CommonVideoHWND(sys->video_wnd);
+        HDC hdc = GetDC(hwnd);
+        if (sys->size_changed)
+            err |= ChangeSize(vd, hdc);
+        if (sys->place_changed)
+            err |= ChangePlace(vd, hdc);
+        ReleaseDC(hwnd, hdc);
+
+        if (unlikely(err))
             return;
 
-        sys->area.place_changed = false;
+        sys->place_changed = false;
+        sys->size_changed = false;
     }
 
     assert((LONG)picture->format.i_visible_width  == sys->bmiInfo.bmiHeader.biWidth &&
@@ -146,7 +157,18 @@
 static int Control(vout_display_t *vd, int query)
 {
     vout_display_sys_t *sys = vd->sys;
-    CommonControl(vd, &sys->area, query);
+    switch (query) {
+    case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
+        CommonDisplaySizeChanged(sys->video_wnd);
+        sys->size_changed = true;
+        break;
+    case VOUT_DISPLAY_CHANGE_SOURCE_PLACE:
+        sys->place_changed = true;
+        break;
+    case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
+    case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
+        break;
+    }
     return VLC_SUCCESS;
 }
 
@@ -171,10 +193,10 @@
     if (!sys)
         return VLC_ENOMEM;
 
-    CommonInit(&sys->area, vd->source);
-    if (CommonWindowInit(vd, &sys->area, false))
+    sys->size_changed = true;
+    sys->place_changed = true;
+    if (CommonWindowInit(vd, &sys->video_wnd, false))
         goto error;
-    CommonPlacePicture(vd, &sys->area);
 
     /* */
     if (Init(vd, fmtp))
@@ -198,7 +220,7 @@
 
     Clean(vd);
 
-    CommonWindowClean(&sys->area);
+    CommonWindowClean(sys->video_wnd);
 
     free(sys);
 }
@@ -208,33 +230,33 @@
     vout_display_sys_t *sys = vd->sys;
     VLC_UNUSED(picture);
 
-    HDC hdc = GetDC(CommonVideoHWND(&sys->area));
+    HDC hdc = GetDC(CommonVideoHWND(sys->video_wnd));
 
     SelectObject(sys->off_dc, sys->off_bitmap);
 
     video_format_t fmt_rot;
     video_format_ApplyRotation(&fmt_rot, vd->source);
 
-    if (sys->area.place.width  != fmt_rot.i_visible_width ||
-        sys->area.place.height != fmt_rot.i_visible_height) {
+    if (vd->place->width  != fmt_rot.i_visible_width ||
+        vd->place->height != fmt_rot.i_visible_height) {
         SetStretchBltMode(hdc, COLORONCOLOR);
 
-        StretchBlt(hdc, sys->area.place.x, sys->area.place.y,
-                   sys->area.place.width, sys->area.place.height,
+        StretchBlt(hdc, vd->place->x, vd->place->y,
+                   vd->place->width, vd->place->height,
                    sys->off_dc,
                    fmt_rot.i_x_offset, fmt_rot.i_y_offset,
                    fmt_rot.i_x_offset + fmt_rot.i_visible_width,
                    fmt_rot.i_y_offset + fmt_rot.i_visible_height,
                    SRCCOPY);
     } else {
-        BitBlt(hdc, sys->area.place.x, sys->area.place.y,
-               sys->area.place.width, sys->area.place.height,
+        BitBlt(hdc, vd->place->x, vd->place->y,
+               vd->place->width, vd->place->height,
                sys->off_dc,
                fmt_rot.i_x_offset, fmt_rot.i_y_offset,
                SRCCOPY);
     }
 
-    ReleaseDC(CommonVideoHWND(&sys->area), hdc);
+    ReleaseDC(CommonVideoHWND(sys->video_wnd), hdc);
 }
 
 static int Init(vout_display_t *vd, video_format_t *fmt)
@@ -244,7 +266,7 @@
     /* Initialize an offscreen bitmap for direct buffer operations. */
 
     /* */
-    HDC window_dc = GetDC(CommonVideoHWND(&sys->area));
+    HDC window_dc = GetDC(CommonVideoHWND(sys->video_wnd));
 
     /* */
     int i_depth = GetDeviceCaps(window_dc, PLANES) *
@@ -276,7 +298,7 @@
         break;
     default:
         msg_Err(vd, "screen depth %i not supported", i_depth);
-        ReleaseDC(CommonVideoHWND(&sys->area), window_dc);
+        ReleaseDC(CommonVideoHWND(sys->video_wnd), window_dc);
         return VLC_EGENERIC;
     }
 
@@ -294,7 +316,7 @@
     if (err != VLC_SUCCESS)
         DeleteDC(sys->off_dc);
 
-    ReleaseDC(CommonVideoHWND(&sys->area), window_dc);
+    ReleaseDC(CommonVideoHWND(sys->video_wnd), window_dc);
 
     return err;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_output/xcb/xkb.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_output/xcb/xkb.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/video_splitter/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/video_splitter/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/visualization/goom.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/visualization/goom.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/modules/visualization/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/modules/visualization/meson.build Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/po/POTFILES.in -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/po/POTFILES.in Changed

@@ -544,24 +544,24 @@
 modules/gui/macosx/panels/dialogs/VLCResumeDialogController.m
 modules/gui/macosx/panels/dialogs/VLCTextfieldPanelController.h
 modules/gui/macosx/panels/dialogs/VLCTextfieldPanelController.m
-modules/gui/macosx/playlist/VLCPlaybackContinuityController.h
-modules/gui/macosx/playlist/VLCPlaybackContinuityController.m
-modules/gui/macosx/playlist/VLCPlaylistController.h
-modules/gui/macosx/playlist/VLCPlaylistController.m
-modules/gui/macosx/playlist/VLCPlaylistDataSource.h
-modules/gui/macosx/playlist/VLCPlaylistDataSource.m
-modules/gui/macosx/playlist/VLCPlaylistItem.h
-modules/gui/macosx/playlist/VLCPlaylistItem.m
-modules/gui/macosx/playlist/VLCPlaylistMenuController.h
-modules/gui/macosx/playlist/VLCPlaylistMenuController.m
-modules/gui/macosx/playlist/VLCPlaylistModel.h
-modules/gui/macosx/playlist/VLCPlaylistModel.m
-modules/gui/macosx/playlist/VLCPlaylistSortingMenuController.h
-modules/gui/macosx/playlist/VLCPlaylistSortingMenuController.m
-modules/gui/macosx/playlist/VLCPlaylistTableCellView.h
-modules/gui/macosx/playlist/VLCPlaylistTableCellView.m
-modules/gui/macosx/playlist/VLCPlaylistTableView.h
-modules/gui/macosx/playlist/VLCPlaylistTableView.m
+modules/gui/macosx/playqueue/VLCPlaybackContinuityController.h
+modules/gui/macosx/playqueue/VLCPlaybackContinuityController.m
+modules/gui/macosx/playqueue/VLCPlayQueueController.h
+modules/gui/macosx/playqueue/VLCPlayQueueController.m
+modules/gui/macosx/playqueue/VLCPlayQueueDataSource.h
+modules/gui/macosx/playqueue/VLCPlayQueueDataSource.m
+modules/gui/macosx/playqueue/VLCPlayQueueItem.h
+modules/gui/macosx/playqueue/VLCPlayQueueItem.m
+modules/gui/macosx/playqueue/VLCPlayQueueMenuController.h
+modules/gui/macosx/playqueue/VLCPlayQueueMenuController.m
+modules/gui/macosx/playqueue/VLCPlayQueueModel.h
+modules/gui/macosx/playqueue/VLCPlayQueueModel.m
+modules/gui/macosx/playqueue/VLCPlayQueueSortingMenuController.h
+modules/gui/macosx/playqueue/VLCPlayQueueSortingMenuController.m
+modules/gui/macosx/playqueue/VLCPlayQueueTableCellView.h
+modules/gui/macosx/playqueue/VLCPlayQueueTableCellView.m
+modules/gui/macosx/playqueue/VLCPlayQueueTableView.h
+modules/gui/macosx/playqueue/VLCPlayQueueTableView.m
 modules/gui/macosx/preferences/VLCHotkeyChangeWindow.h
 modules/gui/macosx/preferences/VLCHotkeyChangeWindow.m
 modules/gui/macosx/preferences/VLCSimplePrefsController.h
@@ -582,12 +582,6 @@
 modules/gui/macosx/views/VLCDefaultValueSliderCell.m
 modules/gui/macosx/views/VLCDragDropView.h
 modules/gui/macosx/views/VLCDragDropView.m
-modules/gui/macosx/views/VLCHUDOutlineView.h
-modules/gui/macosx/views/VLCHUDOutlineView.m
-modules/gui/macosx/views/VLCHUDTableCornerView.h
-modules/gui/macosx/views/VLCHUDTableCornerView.m
-modules/gui/macosx/views/VLCHUDTableView.h
-modules/gui/macosx/views/VLCHUDTableView.m
 modules/gui/macosx/views/VLCImageButton.h
 modules/gui/macosx/views/VLCImageButton.m
 modules/gui/macosx/views/VLCImageView.h
@@ -610,8 +604,6 @@
 modules/gui/macosx/views/VLCVolumeSlider.m
 modules/gui/macosx/views/VLCVolumeSliderCell.h
 modules/gui/macosx/views/VLCVolumeSliderCell.m
-modules/gui/macosx/views/VLCWrappableTextField.h
-modules/gui/macosx/views/VLCWrappableTextField.m
 modules/gui/macosx/windows/VLCAboutWindowController.h
 modules/gui/macosx/windows/VLCAboutWindowController.m
 modules/gui/macosx/windows/VLCDetachedAudioWindow.h
@@ -715,8 +707,6 @@
 modules/gui/qt/dialogs/open/openurl.hpp
 modules/gui/qt/dialogs/playlists/playlists.cpp
 modules/gui/qt/dialogs/playlists/playlists.hpp
-modules/gui/qt/dialogs/plugins/addons_manager.cpp
-modules/gui/qt/dialogs/plugins/addons_manager.hpp
 modules/gui/qt/dialogs/plugins/plugins.cpp
 modules/gui/qt/dialogs/plugins/plugins.hpp
 modules/gui/qt/dialogs/podcast/podcast_configuration.cpp
@@ -815,6 +805,7 @@
 modules/gui/qt/menus/qml/Menubar.qml
 modules/gui/qt/menus/qml_menu_wrapper.cpp
 modules/gui/qt/menus/qml_menu_wrapper.hpp
+modules/gui/qt/network/addonsmodel.cpp
 modules/gui/qt/network/standardpathmodel.cpp
 modules/gui/qt/network/standardpathmodel.hpp
 modules/gui/qt/network/qml/BrowseDeviceView.qml
@@ -883,13 +874,14 @@
 modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml
 modules/gui/qt/playlist/qml/PlaylistDelegate.qml
 modules/gui/qt/playlist/qml/PlaylistDetachedWindow.qml
-modules/gui/qt/playlist/qml/PlaylistListView.qml
+modules/gui/qt/playlist/qml/PlaylistPane.qml
 modules/gui/qt/playlist/qml/PlaylistToolbar.qml
 modules/gui/qt/qt.cpp
 modules/gui/qt/qt.hpp
 modules/gui/qt/util/color_scheme_model.cpp
 modules/gui/qt/util/covergenerator.cpp
 modules/gui/qt/util/covergenerator.hpp
+modules/gui/qt/util/csdmenu.cpp
 modules/gui/qt/util/imagehelper.cpp
 modules/gui/qt/util/imagehelper.hpp
 modules/gui/qt/util/qt_dirs.cpp
@@ -897,6 +889,7 @@
 modules/gui/qt/util/registry.cpp
 modules/gui/qt/util/registry.hpp
 modules/gui/qt/util/singleton.hpp
+modules/gui/qt/util/ui_notifier.cpp
 modules/gui/qt/util/validators.cpp
 modules/gui/qt/util/validators.hpp
 modules/gui/qt/util/vlctick.cpp
@@ -917,6 +910,7 @@
 modules/gui/qt/widgets/qml/SortControl.qml
 modules/gui/qt/widgets/qml/TableColumns.qml
 modules/gui/qt/widgets/qml/ViewHeader.qml
+modules/gui/qt/widgets/qml/TableViewDelegateExt.qml
 modules/gui/skins2/commands/async_queue.cpp
 modules/gui/skins2/commands/async_queue.hpp
 modules/gui/skins2/commands/cmd_add_item.cpp
@@ -1392,7 +1386,7 @@
 share/lua/http/mobile_browse.html
 share/lua/http/mobile_equalizer.html
 share/lua/http/mobile_view.html
-share/vlc.appdata.xml.in.in
+share/org.videolan.vlc.appdata.xml.in.in
 
 
 # qt .ui files

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/rust-toolchain.toml Added

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/share/.gitignore -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/share/.gitignore Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/share/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/share/Makefile.am Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/share/org.videolan.vlc.appdata.xml.in.in Added

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<component type="desktop-application">
+    <id>org.videolan.vlc</id>
+    <launchable type="desktop-id">vlc.desktop</launchable>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>VLC</name>
+    <summary>VLC media player, the open-source multimedia player</summary>
+    <description>
+        <p>
+            VLC is a free and open source cross-platform multimedia player and
+            framework that plays most multimedia files as well as DVDs, Audio CDs,
+            VCDs, and various streaming protocols.
+        </p>
+    </description>
+    <url type="homepage">https://www.videolan.org/vlc/</url>
+    <url type="bugtracker">https://trac.videolan.org/vlc/</url>
+    <url type="donation">https://www.videolan.org/contribute.html</url>
+    <releases>
+        <release version="@VERSION@" />
+    </releases>
+    <provides>
+        <library>libvlc.so.5</library>
+    </provides>
+    <project_group>VideoLAN</project_group>
+    <project_license>GPL-2.0+</project_license>
+    <developer_name>VideoLAN et al.</developer_name>
+    <update_contact>vlc-devel -- videolan.org</update_contact>
+    <screenshots>
+        <screenshot type="default">
+            <image>https://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-poney.jpg</image>
+        </screenshot>
+        <screenshot>
+            <image>https://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-open.jpg</image>
+        </screenshot>
+        <screenshot>
+            <image>https://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg</image>
+        </screenshot>
+    </screenshots>
+    <content_rating type="oars-1.1" />
+</component>

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/Makefile.am Changed

@@ -43,6 +43,7 @@
 	../include/vlc_configuration.h \
 	../include/vlc_cpu.h \
 	../include/vlc_clock.h \
+	../include/vlc_chroma_probe.h \
 	../include/vlc_decoder.h \
 	../include/vlc_demux.h \
 	../include/vlc_dialog.h \
@@ -96,6 +97,7 @@
 	../include/vlc_queue.h \
 	../include/vlc_rand.h \
 	../include/vlc_renderer_discovery.h \
+	../include/vlc_replay_gain.h \
 	../include/vlc_services_discovery.h \
 	../include/vlc_sort.h \
 	../include/vlc_sout.h \
@@ -107,7 +109,6 @@
 	../include/vlc_subpicture.h \
 	../include/vlc_text_style.h \
 	../include/vlc_threads.h \
-	../include/vlc_thumbnailer.h \
 	../include/vlc_tick.h \
 	../include/vlc_timestamp_helper.h \
 	../include/vlc_tls.h \
@@ -290,6 +291,7 @@
 	input/meta.c \
 	input/attachment.c \
 	input/parse.c \
+	input/replay_gain.c \
 	player/player.c \
 	player/player.h \
 	player/input.c \
@@ -327,7 +329,6 @@
 	input/stream_filter.c \
 	input/stream_memory.c \
 	input/subtitles.c \
-	input/thumbnailer.c \
 	input/var.c \
 	audio_output/aout_internal.h \
 	audio_output/common.c \
@@ -382,6 +383,7 @@
 	misc/actions.c \
 	misc/ancillary.h \
 	misc/ancillary.c \
+	misc/chroma_probe.c \
 	misc/executor.c \
 	misc/md5.c \
 	misc/probe.c \
@@ -492,6 +494,17 @@
 	freebsd/thread.c
 endif
 
+if HAVE_NETBSD
+libvlccore_la_SOURCES += \
+        netbsd/thread.c
+endif
+
+if HAVE_OPENBSD
+libvlccore_la_SOURCES += \
+        openbsd/cpu.c \
+        openbsd/thread.c
+endif
+
 if HAVE_LINUX
 libvlccore_la_SOURCES += \
 	linux/cpu.c \
@@ -519,12 +532,16 @@
 libvlccore_la_SOURCES += posix/wait.c
 endif
 if !HAVE_ANDROID
-if !HAVE_EMSCRIPTEN
+if HAVE_QSORT_R
 libvlccore_la_SOURCES += posix/sort.c
 endif
 libvlccore_la_SOURCES += \
 	posix/thread.c
 libvlccore_la_LIBADD += $(LIBEXECINFO)
+if HAVE_OSX
+libvlccore_la_SOURCES += \
+	posix/spawn.c
+endif
 if !HAVE_DARWIN
 if !HAVE_EMSCRIPTEN
 libvlccore_la_SOURCES += posix/netconf.c
@@ -705,6 +722,12 @@
 	clock/input_clock.c clock/input_clock.h
 check_PROGRAMS += test_input_es_out
 
+test_input_clock_SOURCES = clock/test/input_clock.c \
+	clock/input_clock.c clock/input_clock.h \
+	clock/clock_internal.c clock/clock_internal.h \
+	clock/clock.c clock/clock.h
+check_PROGRAMS += test_input_clock
+
 LDADD = libvlccore.la \
 	../compat/libcompat.la

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/android/thread.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/android/thread.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/audio_output/dec.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/audio_output/dec.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/audio_output/filters.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/audio_output/filters.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/audio_output/output.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/audio_output/output.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/audio_output/volume.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/audio_output/volume.c Changed

@@ -28,10 +28,11 @@
 #include <math.h>
 
 #include <vlc_common.h>
-#include <libvlc.h>
+#include "../libvlc.h"
 #include <vlc_modules.h>
 #include <vlc_aout.h>
 #include <vlc_aout_volume.h>
+#include <vlc_replay_gain.h>
 #include "aout_internal.h"
 
 struct aout_volume
@@ -134,63 +135,12 @@
     return 0;
 }
 
-/*** Replay gain ***/
-static float aout_ReplayGainSelect(vlc_object_t *obj, const char *str,
-                                   const audio_replay_gain_t *replay_gain)
-{
-    unsigned mode = AUDIO_REPLAY_GAIN_MAX;
-
-    if (likely(str != NULL))
-    {   /* Find selectrf mode */
-        if (!strcmp (str, "track"))
-            mode = AUDIO_REPLAY_GAIN_TRACK;
-        else
-        if (!strcmp (str, "album"))
-            mode = AUDIO_REPLAY_GAIN_ALBUM;
-    }
-
-    /* */
-    float multiplier;
-
-    if (mode == AUDIO_REPLAY_GAIN_MAX)
-    {
-        multiplier = 1.f;
-    }
-    else
-    {
-        float gain;
-
-        /* If the selectrf mode is not available, prefer the other one */
-        if (!replay_gain->pb_gainmode && replay_gain->pb_gain!mode)
-            mode = !mode;
-
-        if (replay_gain->pb_gainmode)
-            gain = replay_gain->pf_gainmode
-                 + var_InheritFloat (obj, "audio-replay-gain-preamp");
-        else
-            gain = var_InheritFloat (obj, "audio-replay-gain-default");
-
-        multiplier = powf (10.f, gain / 20.f);
-
-        if (var_InheritBool (obj, "audio-replay-gain-peak-protection"))
-            multiplier = fminf (multiplier, replay_gain->pb_peakmode
-                                            ? 1.f / replay_gain->pf_peakmode
-                                            : 1.f);
-    }
-
-    /* Command line / configuration gain */
-    multiplier *= var_InheritFloat (obj, "gain");
-
-    return multiplier;
-}
-
 static int ReplayGainCallback (vlc_object_t *obj, char const *var,
                                vlc_value_t oldval, vlc_value_t val, void *data)
 {
     aout_volume_t *vol = data;
-    float multiplier = aout_ReplayGainSelect(obj, val.psz_string,
-                                             &vol->replay_gain);
+    float multiplier = replay_gain_CalcMultiplier(obj, &vol->replay_gain);
     atomic_store_explicit(&vol->gain_factor, multiplier, memory_order_relaxed);
-    VLC_UNUSED(var); VLC_UNUSED(oldval);
+    VLC_UNUSED(var); VLC_UNUSED(oldval); VLC_UNUSED(val);
     return VLC_SUCCESS;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/clock/clock.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/clock/clock.c Changed

@@ -172,13 +172,15 @@
 
 static inline void TraceRender(struct vlc_tracer *tracer, const char *type,
                                const char *id, vlc_tick_t now, vlc_tick_t pts,
-                               vlc_tick_t drift)
+                               vlc_tick_t drift, uint32_t clock_id)
 {
     if (now != VLC_TICK_MAX && now != VLC_TICK_INVALID)
     {
         vlc_tracer_TraceWithTs(tracer, vlc_tick_now(),
                                VLC_TRACE("type", type),
                                VLC_TRACE("id", id),
+                               VLC_TRACE("mode", "realtime"),
+                               VLC_TRACE("clock_id", (int64_t)clock_id),
                                VLC_TRACE_TICK_NS("pts", pts),
                                VLC_TRACE_TICK_NS("render_ts", now),
                                VLC_TRACE_TICK_NS("drift", drift),
@@ -186,6 +188,7 @@
         vlc_tracer_TraceWithTs(tracer, now,
                                VLC_TRACE("type", type),
                                VLC_TRACE("id", id),
+                               VLC_TRACE("mode", "representative"),
                                VLC_TRACE_TICK_NS("render_pts", pts),
                                VLC_TRACE_TICK_NS("drift", drift),
                                VLC_TRACE_END);
@@ -367,7 +370,7 @@
     if (main_clock->tracer != NULL && clock->track_str_id != NULL &&
         system_now != VLC_TICK_INVALID && system_now != VLC_TICK_MAX)
         TraceRender(main_clock->tracer, "RENDER", clock->track_str_id,
-                    system_now, ts, drift);
+                    system_now, ts, drift, clock->context ? clock->context->clock_id : 0);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/clock/input_clock.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/clock/input_clock.c Changed

@@ -3,6 +3,7 @@
  *****************************************************************************
  * Copyright (C) 1999-2018 VLC authors and VideoLAN
  * Copyright (C) 2008 Laurent Aimar
+ * Copyright (C) 2023-2025 Alexandre Janniaux <ajanni@videolabs.io>
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Laurent Aimar < fenrir _AT_ videolan _DOT_ org >
@@ -103,6 +104,7 @@
 /* */
 struct input_clock_t
 {
+    struct vlc_logger *logger;
     struct {
         const struct vlc_input_clock_cbs *cbs;
         void *opaque;
@@ -162,11 +164,12 @@
 /*****************************************************************************
  * input_clock_New: create a new clock
  *****************************************************************************/
-input_clock_t *input_clock_New( float rate )
+input_clock_t *input_clock_New(struct vlc_logger *logger, float rate)
 {
     input_clock_t *cl = malloc( sizeof(*cl) );
     if( !cl )
         return NULL;
+    cl->logger = logger;
     cl->listener.cbs = NULL;
     cl->listener.opaque = NULL;
 
@@ -219,7 +222,7 @@
  *  i_ck_stream: date in stream clock
  *  i_ck_system: date in system clock
  *****************************************************************************/
-vlc_tick_t input_clock_Update( input_clock_t *cl, vlc_object_t *p_log,
+vlc_tick_t input_clock_Update( input_clock_t *cl,
                          bool b_can_pace_control, bool b_buffering,
                          bool b_extra_buffering_allowed,
                          vlc_tick_t i_ck_stream, vlc_tick_t i_ck_system )
@@ -254,12 +257,12 @@
             /* Stream discontinuity, for which we haven't received a
              * warning from the stream control facilities (dd-edited
              * stream ?). */
-            msg_Warn(p_log, "clock gap, unexpected stream discontinuity: "
+            vlc_warning(cl->logger, "clock gap, unexpected stream discontinuity: "
                      "system_diff: %"PRId64" stream_diff: %"PRId64,
                      system_diff, stream_diff);
 
             /* */
-            msg_Warn(p_log, "feeding synchro with a new reference point trying"
+            vlc_warning(cl->logger, "feeding synchro with a new reference point trying"
                      " to recover from clock gap");
             b_reset_reference= true;
             discontinuity = true;
@@ -275,8 +278,7 @@
 
         /* Feed synchro with a new reference point. */
         cl->b_has_reference = true;
-        cl->ref = clock_point_Create( __MAX( CR_MEAN_PTS_GAP, i_ck_system ),
-                                      i_ck_stream );
+        cl->ref = clock_point_Create(i_ck_system, i_ck_stream);
     }
 
     /* Compute the drift between the stream clock and the system clock
@@ -314,7 +316,7 @@
     /* It does not take the decoder latency into account but it is not really
      * the goal of the clock here */
     const vlc_tick_t i_system_expected = ClockStreamToSystem( cl, i_ck_stream + AvgGet( &cl->drift ) );
-    const vlc_tick_t i_late = __MAX(0, ( i_ck_system - cl->i_pts_delay ) - i_system_expected);
+    const vlc_tick_t i_late = (i_ck_system - cl->i_pts_delay ) - i_system_expected;
     if( i_late > 0 )
     {
         cl->late.pi_valuecl->late.i_index = i_late;
@@ -420,6 +422,31 @@
     return VLC_SUCCESS;
 }
 
+int input_clock_GetBufferingDuration(
+    const input_clock_t *clock,
+    vlc_tick_t *stream_duration,
+    vlc_tick_t *system_duration
+){
+    if (!clock->b_has_reference)
+        return VLC_EGENERIC;
+
+    *stream_duration = clock->last.stream - clock->ref.stream;
+    *system_duration = clock->last.system - clock->ref.system;
+
+    return VLC_SUCCESS;
+}
+
+vlc_tick_t input_clock_GetSystemDuration(
+    const input_clock_t *clock,
+    vlc_tick_t system_reference
+){
+    if (!clock->b_has_reference)
+        return 0;
+
+    vlc_tick_t system_start = clock->ref.system;
+    return system_reference - system_start;
+}
+
 void input_clock_ChangeSystemOrigin( input_clock_t *cl, vlc_tick_t i_system )
 {
     assert( cl->b_has_reference );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/clock/input_clock.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/clock/input_clock.h Changed

@@ -3,6 +3,7 @@
  *****************************************************************************
  * Copyright (C) 2008-2018 VLC authors and VideoLAN
  * Copyright (C) 2008 Laurent Aimar
+ * Copyright (C) 2023-2025 Alexandre Janniaux <ajanni@videolabs.io>
  *
  * Authors: Laurent Aimar < fenrir _AT_ videolan _DOT_ org >
  *
@@ -71,7 +72,7 @@
  *
  * You must use input_clock_Delete to delete it once unused.
  */
-input_clock_t *input_clock_New( float rate );
+input_clock_t *input_clock_New(struct vlc_logger *logger, float rate);
 
 /**
  * This function attach a clock listener to the input clock
@@ -98,7 +99,6 @@
  * It will also tell if the clock point is late regarding our buffering.
  *
  * \param clock the input clock object to update with the new point
- * \param p_log the logger object to use
  * \param b_can_pace_control whether the input can control the speed of playback
  * \param b_buffering whether the input is buffering
  * \param b_extra_buffering_allowed tells if we are allowed to bufferize more
@@ -108,7 +108,7 @@
  *
  * \return clock update delay
  */
-vlc_tick_t input_clock_Update( input_clock_t *clock, vlc_object_t *p_log,
+vlc_tick_t input_clock_Update(input_clock_t *clock,
                             bool b_can_pace_control, bool b_buffering,
                             bool b_extra_buffering_allowed,
                             vlc_tick_t i_clock, vlc_tick_t i_system );
@@ -155,6 +155,27 @@
                           vlc_tick_t *pi_stream_duration, vlc_tick_t *pi_system_duration );
 
 /**
+ * Return the duration of stream buffered as well as for how long the
+ * buffering has been started.
+ *
+ * @param clock An input clock with valid references
+ * @param stream_duration the available buffering duration
+ * @param system_duration the time spent in buffering
+ */
+int input_clock_GetBufferingDuration(
+    const input_clock_t *clock,
+    vlc_tick_t *stream_duration,
+    vlc_tick_t *system_duration);
+
+/**
+ * Return for how long the buffering would be running up to the system
+ * reference given.
+ */
+vlc_tick_t input_clock_GetSystemDuration(
+    const input_clock_t *clock,
+    vlc_tick_t system_reference);
+
+/**
  * This function allows the set the minimal configuration for the jitter estimation algo.
  */
 void input_clock_SetJitter( input_clock_t *,

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/clock/test Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/clock/test/input_clock.c Added

@@ -0,0 +1,151 @@
+/*****************************************************************************
+ * input_clock.c: tests for the input buffering code
+ *****************************************************************************
+ * Copyright (C) 2023-2025 Alexandre Janniaux <ajanni@videolabs.io>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_modules.h>
+#include <vlc_messages.h>
+#include <vlc_tick.h>
+
+#include <vlc/libvlc.h>
+
+#include "../../../src/clock/input_clock.h"
+#include "../../../src/clock/clock.h"
+#include "../../../src/clock/clock_internal.h"
+
+const char vlc_module_name = "test_input_clock";
+
+static void LoggerLog(void *data, int type, const vlc_log_t *item,
+        const char *fmt, va_list args)
+{
+    (void)data; (void)type; (void)item;
+    vfprintf(stderr, fmt, args);
+}
+
+static const struct vlc_logger_operations logger_ops =
+{
+    .log = LoggerLog,
+};
+static struct vlc_logger logger = { &logger_ops };
+
+static void test_clock_update(void)
+{
+    input_clock_t *clock = input_clock_New(&logger, 1.f);
+    assert(clock != NULL);
+
+    {
+        vlc_tick_t system_now = VLC_TICK_0;
+        vlc_tick_t system_duration = input_clock_GetSystemDuration(clock, system_now);
+        assert(system_duration == 0);
+    }
+
+    bool can_pace_control = true;
+    bool buffering_allowed = true;
+    vlc_tick_t date_stream = VLC_TICK_0;
+    vlc_tick_t date_system = VLC_TICK_0;
+    input_clock_Update(clock, can_pace_control, buffering_allowed, false, date_stream, date_system);
+
+    vlc_tick_t stream_duration, system_duration;
+    input_clock_GetBufferingDuration(clock, &stream_duration, &system_duration);
+    fprintf(stderr, "system_duration=%" PRId64 " stream_duration=%" PRId64 "\n",
+            system_duration, stream_duration);
+    assert(stream_duration == 0);
+    assert(system_duration == 0);
+
+    vlc_tick_t system_now = VLC_TICK_0;
+    system_duration = input_clock_GetSystemDuration(clock, system_now);
+    assert(system_duration == 0);
+
+    /* Reset drift */
+    input_clock_Reset(clock);
+    input_clock_Delete(clock);
+}
+
+static void clock_update_abort(
+    vlc_tick_t system_ts, vlc_tick_t ts, double rate,
+    unsigned frame_rate, unsigned frame_rate_base, void *data)
+{
+    (void)system_ts; (void)ts; (void)rate;
+    (void)frame_rate; (void)frame_rate_base;
+    (void)data;
+    assert(!"No clock update should happen");
+}
+
+static const struct vlc_clock_cbs clock_abort_ops =
+{
+    .on_update = clock_update_abort,
+};
+
+struct clock_validate {
+    bool validate;
+    struct {
+        vlc_tick_t system;
+        vlc_tick_t stream;
+    } expected;
+};
+
+static void clock_update_validate(
+    vlc_tick_t system_ts, vlc_tick_t ts, double rate,
+    unsigned frame_rate, unsigned frame_rate_base, void *data)
+{
+    (void)system_ts; (void)ts; (void)rate;
+    (void)frame_rate; (void)frame_rate_base;
+
+    struct clock_validate *validate = data;
+    fprintf(stderr, "%s: system=%" PRId64 " stream=%" PRId64
+            ", checking against system=%"PRId64 " stream=%" PRId64 "\n",
+            __func__, system_ts, ts, validate->expected.system, validate->expected.stream);
+    validate->validate = true;
+    assert(validate->expected.system == system_ts);
+    assert(validate->expected.stream == ts);
+}
+static const struct vlc_clock_cbs clock_validate_ops =
+{
+    .on_update = clock_update_validate,
+};
+
+struct clock_listener_switch {
+    const struct vlc_clock_cbs *cbs;
+    void *opaque;
+};
+
+static void clock_update_switch(
+    vlc_tick_t system_ts, vlc_tick_t ts, double rate,
+    unsigned frame_rate, unsigned frame_rate_base, void *data)
+{
+    struct clock_listener_switch *listener = data;
+    listener->cbs->on_update(system_ts, ts, rate, frame_rate, frame_rate_base, listener->opaque);
+}
+
+static const struct vlc_clock_cbs clock_switch_ops = {
+    .on_update = clock_update_switch,
+};
+
+
+
+int main(void)
+{
+    fprintf(stderr, "test_clock_update:\n");
+    test_clock_update();
+    return 0;
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/config/chain.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/config/chain.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/config/help.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/config/help.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/freebsd/cpu.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/freebsd/cpu.c Changed

@@ -22,22 +22,77 @@
 # include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <sys/sysctl.h>
+#include <sys/auxv.h>
+#ifdef __powerpc__
+#include <machine/cpu.h>
+#endif
 
 #include <vlc_common.h>
 #include <vlc_cpu.h>
 
-#if defined (__powerpc__) /* both 32- and 64-bit */
+#if defined (__aarch64__)
+unsigned vlc_CPU_raw(void)
+{
+    unsigned int flags = 0;
+    unsigned long hwcap = 0;
+    //unsigned long hwcap2 = 0; // TODO: SVE2
+
+    elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
+    // elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap2)); // TODO: SVE2
+
+    /* HWCAP_FP (HAVE_FPU) is statically assumed. */
+    if (hwcap & HWCAP_ASIMD)
+        flags |= VLC_CPU_ARM_NEON;
+    if (hwcap & HWCAP_SVE)
+        flags |= VLC_CPU_ARM_SVE;
+
+    return flags;
+}
+
+#elif defined (__arm__)
+unsigned vlc_CPU_raw(void)
+{
+    unsigned int flags = 0;
+    unsigned long hwcap = 0;
+
+    elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
+
+    /* TLS implies ARMv6, Thumb-EE and VFP imply ARMv7 */
+    if (hwcap & (HWCAP_TLS|HWCAP_THUMBEE|HWCAP_VFP))
+        flags |= VLC_CPU_ARMv6; /* SIMD */
+    if (hwcap & HWCAP_NEON)
+        flags |= VLC_CPU_ARM_NEON; /* Advanced SIMD */
+
+    return flags;
+}
+
+#elif defined (__powerpc__) /* both 32- and 64-bit */
 unsigned vlc_CPU_raw(void)
 {
     unsigned int flags = 0;
-    int opt;
-    size_t optlen = sizeof (opt);
+    unsigned long hwcap = 0;
 
-    if (sysctlbyname("hw.altivec", &opt, &optlen, NULL, 0) == 0 && opt != 0)
+    elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
+
+    if (hwcap & PPC_FEATURE_HAS_ALTIVEC)
         flags |= VLC_CPU_ALTIVEC;
 
     return flags;
 }
+
+#elif defined (__riscv)
+# define HWCAP_RV(letter) (1LU << ((letter) - 'A'))
+
+unsigned vlc_CPU_raw(void)
+{
+    unsigned int flags = 0;
+    unsigned long hwcap = 0;
+
+    elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
+
+    if (hwcap & HWCAP_RV('V'))
+        flags |= VLC_CPU_RV_V;
+
+    return flags;
+}
 #endif

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/decoder.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/decoder.c Changed

@@ -45,6 +45,7 @@
 #include <vlc_picture_pool.h>
 #include <vlc_tracer.h>
 #include <vlc_list.h>
+#include <vlc_replay_gain.h>
 
 #include "audio_output/aout_internal.h"
 #include "stream_output/stream_output.h"
@@ -52,7 +53,7 @@
 #include "input_internal.h"
 #include "decoder.h"
 #include "resource.h"
-#include "libvlc.h"
+#include "../libvlc.h"
 
 #include "../video_output/vout_internal.h"
 
@@ -121,6 +122,8 @@
     vlc_clock_t     *p_clock;
     const char *psz_id;
 
+    bool hw_dec;
+
     const struct vlc_input_decoder_callbacks *cbs;
     void *cbs_userdata;
 
@@ -493,20 +496,6 @@
 /*****************************************************************************
  * Buffers allocation callbacks for the decoders
  *****************************************************************************/
-static bool aout_replaygain_changed( const audio_replay_gain_t *a,
-                                     const audio_replay_gain_t *b )
-{
-    for( size_t i=0; i<AUDIO_REPLAY_GAIN_MAX; i++ )
-    {
-        if( a->pb_gaini != b->pb_gaini ||
-            a->pb_peaki != b->pb_peaki ||
-            (a->pb_gaini && a->pf_gaini != b->pf_gaini) ||
-            (a->pb_peaki && a->pf_peaki != b->pf_peaki) )
-            return true;
-    }
-    return false;
-}
-
 static int ModuleThread_UpdateAudioFormat( decoder_t *p_dec )
 {
     vlc_input_decoder_t *p_owner = dec_get_owner( p_dec );
@@ -530,8 +519,8 @@
     }
 
     /* Check if only replay gain has changed */
-    if( aout_replaygain_changed( &p_dec->fmt_in->audio_replay_gain,
-                                 &p_owner->fmt.audio_replay_gain ) )
+    if( replay_gain_Compare( &p_dec->fmt_in->audio_replay_gain,
+                             &p_owner->fmt.audio_replay_gain ) )
     {
         p_dec->fmt_out.audio_replay_gain = p_dec->fmt_in->audio_replay_gain;
         if( p_owner->p_aout )
@@ -816,7 +805,7 @@
     vlc_input_decoder_t *p_owner = dec_get_owner( p_dec );
 
     /* Requesting a decoder device will automatically enable hw decoding */
-    if( !var_InheritBool( p_dec, "hw-dec" ) )
+    if (!p_owner->hw_dec)
         return NULL;
 
     int created_vout = CreateVoutIfNeeded(p_owner);
@@ -1036,16 +1025,27 @@
 
 static int DecoderWaitUnblock( vlc_input_decoder_t *p_owner )
 {
+    struct vlc_tracer *tracer = vlc_object_get_tracer(VLC_OBJECT(&p_owner->dec));
     vlc_fifo_Assert(p_owner->p_fifo);
 
     if( p_owner->b_waiting )
     {
+        if (tracer != NULL)
+            vlc_tracer_TraceEvent(tracer, "DEC", p_owner->psz_id, "start wait");
         p_owner->b_has_data = true;
         vlc_cond_signal( &p_owner->wait_acknowledge );
     }
 
+    bool did_wait = false;
     while (p_owner->b_waiting && p_owner->b_has_data && !p_owner->flushing)
+    {
         vlc_fifo_WaitCond(p_owner->p_fifo, &p_owner->wait_request);
+        /* We should not start the clock if we ended up flushing. */
+        did_wait = !p_owner->flushing;
+    }
+
+    if (tracer != NULL && did_wait)
+        vlc_tracer_TraceEvent(tracer, "DEC", p_owner->psz_id, "stop wait");
 
     if (p_owner->flushing)
     {
@@ -1951,6 +1951,7 @@
     p_owner->p_clock = cfg->clock;
     p_owner->i_preroll_end = PREROLL_NONE;
     p_owner->p_resource = cfg->resource;
+    p_owner->hw_dec = cfg->hw_dec;
     p_owner->cbs = cfg->cbs;
     p_owner->cbs_userdata = cfg->cbs_data;
     p_owner->p_aout = NULL;
@@ -2051,19 +2052,7 @@
     /* Copy ourself the input replay gain */
     if( fmt->i_cat == AUDIO_ES )
     {
-        for( unsigned i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
-        {
-            if( !p_dec->fmt_out.audio_replay_gain.pb_peaki )
-            {
-                p_dec->fmt_out.audio_replay_gain.pb_peaki = fmt->audio_replay_gain.pb_peaki;
-                p_dec->fmt_out.audio_replay_gain.pf_peaki = fmt->audio_replay_gain.pf_peaki;
-            }
-            if( !p_dec->fmt_out.audio_replay_gain.pb_gaini )
-            {
-                p_dec->fmt_out.audio_replay_gain.pb_gaini = fmt->audio_replay_gain.pb_gaini;
-                p_dec->fmt_out.audio_replay_gain.pf_gaini = fmt->audio_replay_gain.pf_gaini;
-            }
-        }
+        replay_gain_Merge( &p_dec->fmt_out.audio_replay_gain, &fmt->audio_replay_gain );
     }
 
     /* */
@@ -2277,6 +2266,7 @@
         .resource = p_resource,
         .sout = NULL,
         .input_type = INPUT_TYPE_PLAYBACK,
+        .hw_dec = var_InheritBool( p_parent, "hw-dec" ),
         .cbs = NULL, .cbs_data = NULL,
     };
     return decoder_New( p_parent, &cfg );
@@ -2459,6 +2449,20 @@
     vlc_fifo_QueueUnlocked( p_owner->p_fifo, frame );
     if (status != NULL)
         GetStatusLocked(p_owner, status);
+
+    struct vlc_tracer *tracer = vlc_object_get_tracer(&p_owner->dec.obj);
+    if (tracer != NULL)
+    {
+        size_t fifo_size = vlc_fifo_GetBytes(p_owner->p_fifo);
+        size_t fifo_count = vlc_fifo_GetCount(p_owner->p_fifo);
+        vlc_tracer_Trace(tracer,
+                         VLC_TRACE("id", p_owner->psz_id),
+                         VLC_TRACE("fifo_size", (uint64_t)fifo_size),
+                         VLC_TRACE("fifo_count", (uint64_t)fifo_count),
+                         VLC_TRACE_END);
+    }
+
+
     vlc_fifo_Unlock( p_owner->p_fifo );
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/decoder.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/decoder.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/decoder_device.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/decoder_device.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/decoder_helpers.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/decoder_helpers.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/demux.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/demux.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/es_out.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/es_out.c Changed

@@ -44,6 +44,7 @@
 #include <vlc_decoder.h>
 #include <vlc_memstream.h>
 #include <vlc_tracer.h>
+#include <vlc_replay_gain.h>
 
 #include "input_internal.h"
 #include "./source.h"
@@ -136,6 +137,7 @@
     char        *psz_language_code;
     char        *psz_title;
     bool        b_terminated;
+    bool        forced;
 
     vlc_input_decoder_t   *p_dec;
     vlc_input_decoder_t   *p_dec_record;
@@ -157,6 +159,7 @@
 
     vlc_mouse_event mouse_event_cb;
     void* mouse_event_userdata;
+    vlc_mouse_t oldmouse;
 };
 
 typedef struct
@@ -228,6 +231,7 @@
     vlc_tick_t  i_buffering_extra_initial;
     vlc_tick_t  i_buffering_extra_stream;
     vlc_tick_t  i_buffering_extra_system;
+    bool        b_draining;
 
     /* Record */
     sout_stream_t *p_sout_record;
@@ -260,6 +264,7 @@
 static void EsOutProgramChangePause(es_out_sys_t *out, bool b_paused, vlc_tick_t i_date);
 static void EsOutProgramsChangeRate(es_out_sys_t *out);
 static void EsOutDecodersStopBuffering(es_out_sys_t *out, bool b_forced);
+static void EsOutDrainDecoder(es_out_sys_t *p_sys, es_out_id_t *es, bool wait);
 static void EsOutGlobalMeta(es_out_sys_t *p_out, const vlc_meta_t *p_meta);
 static void EsOutMeta(es_out_sys_t *p_out, const vlc_meta_t *p_meta, const vlc_meta_t *p_progmeta);
 static int EsOutEsUpdateFmt(es_out_id_t *es, const es_format_t *fmt);
@@ -325,6 +330,35 @@
     for( int fetes_i=0; fetes_i<2; fetes_i++ ) \
         vlc_list_foreach( pos, (!fetes_i ? &p_sys->es : &p_sys->es_slaves), node )
 
+static void MouseEventCb(const vlc_mouse_t *newmouse, void *userdata)
+{
+    es_out_id_t *id = userdata;
+    struct vlc_input_es_out *out = id->out;
+    es_out_sys_t *p_sys = PRIV(&out->out);
+
+    if(!p_sys->p_input)
+        return;
+
+    /* player event is disabled when a filter is listening to mouse events */
+    if(!newmouse || vlc_mouse_HasMouseFilter(newmouse))
+    {
+        vlc_mouse_Init(&id->oldmouse);
+        return;
+    }
+
+    struct vlc_input_event_mouse event = {
+        .oldmouse = id->oldmouse,
+        .newmouse = *newmouse
+    };
+
+    input_SendEvent(p_sys->p_input, &(struct vlc_input_event) {
+        .type = INPUT_EVENT_MOUSE,
+        .mouse_data = event,
+    });
+
+    id->oldmouse = *newmouse;
+}
+
 static void
 decoder_on_vout_started(vlc_input_decoder_t *decoder, vout_thread_t *vout,
                       enum vlc_vout_order order, void *userdata)
@@ -664,19 +698,13 @@
     return input_clock_GetWakeup( p_sys->p_pgrm->p_input_clock );
 }
 
-static es_out_id_t es_catDATA_ES;
 
-static bool EsOutDecodersIsEmpty(es_out_sys_t *p_sys)
+static bool EsOutIsEmpty(es_out_sys_t *p_sys)
 {
-    es_out_id_t *es;
-
-    if( p_sys->b_buffering && p_sys->p_pgrm )
-    {
-        EsOutDecodersStopBuffering(p_sys, true);
-        if( p_sys->b_buffering )
-            return true;
-    }
+    if( p_sys->b_buffering )
+        return true;
 
+    es_out_id_t *es;
     foreach_es_then_es_slaves(es)
     {
         if( es->p_dec && !vlc_input_decoder_IsEmpty( es->p_dec ) )
@@ -687,6 +715,30 @@
     return true;
 }
 
+static int EsOutDrain(es_out_sys_t *p_sys)
+{
+    if( p_sys->p_pgrm == NULL ) /* Nothing to drain, assume es_out is empty */
+        return VLC_SUCCESS;
+
+    if( p_sys->b_buffering )
+    {
+        EsOutDecodersStopBuffering(p_sys, true);
+        if( p_sys->b_buffering )
+            return VLC_EGENERIC;
+    }
+
+    if( !p_sys->b_draining )
+    {
+        es_out_id_t *id;
+        foreach_es_then_es_slaves(id)
+            if (id->p_dec != NULL)
+                EsOutDrainDecoder(p_sys, id, false);
+        p_sys->b_draining = true;
+    }
+
+    return VLC_SUCCESS;
+}
+
 static void EsOutUpdateDelayJitter(es_out_sys_t *p_sys)
 {
     /* Update the clock pts delay only if the extra tracks delay changed */
@@ -804,6 +856,7 @@
             .resource = input_priv(p_input)->p_resource,
             .sout = p_sys->p_sout_record,
             .input_type = INPUT_TYPE_PLAYBACK,
+            .hw_dec = input_priv(p_input)->hw_dec,
             .cc_decoder = p_sys->cc_decoder,
             .cbs = &decoder_cbs,
             .cbs_data = p_es,
@@ -914,6 +967,7 @@
     p_sys->i_buffering_extra_initial = 0;
     p_sys->i_buffering_extra_stream = 0;
     p_sys->i_buffering_extra_system = 0;
+    p_sys->b_draining = false;
     p_sys->i_preroll_end = -1;
     p_sys->i_prev_stream_level = -1;
 }
@@ -933,8 +987,16 @@
     vlc_tick_t i_system_start;
     vlc_tick_t i_stream_duration;
     vlc_tick_t i_system_duration;
-    if (input_clock_GetState( p_sys->p_pgrm->p_input_clock,
-                                  &i_stream_start, &i_system_start,
+
+    /* TODO: We still need input_clock_GetState for the preroll computation
+     *       for now. */
+    if (input_clock_GetState(p_sys->p_pgrm->p_input_clock,
+                             &i_stream_start, &i_system_start,
+                             &i_stream_duration, &i_system_duration))
+        return;
+    (void)i_system_start;
+
+    if (input_clock_GetBufferingDuration( p_sys->p_pgrm->p_input_clock,
                                   &i_stream_duration, &i_system_duration ))
         return;
 
@@ -1163,18 +1225,15 @@
 }
 static vlc_tick_t EsOutGetBuffering(es_out_sys_t *p_sys)
 {
-    vlc_tick_t i_stream_duration, i_system_start;
-
     if( !p_sys->p_pgrm )
         return 0;
 
-    vlc_tick_t i_stream_start, i_system_duration;
+    vlc_tick_t i_stream_duration, i_system_duration;
 
     /* If the input_clock is not ready, we don't have a reference point
      * which means that buffering has not started, continue waiting. */
-    if (input_clock_GetState(p_sys->p_pgrm->p_input_clock,
-                             &i_stream_start, &i_system_start,
-                             &i_stream_duration, &i_system_duration))
+    if (input_clock_GetBufferingDuration(p_sys->p_pgrm->p_input_clock,
+                                         &i_stream_duration, &i_system_duration))
         return 0;
 
     vlc_tick_t i_delay;
@@ -1187,13 +1246,16 @@
     {
         if( p_sys->b_paused )
         {
-            i_system_duration = p_sys->i_pause_date  - i_system_start;
+            i_system_duration = input_clock_GetSystemDuration(p_sys->p_pgrm->p_input_clock,
+                                          p_sys->i_pause_date);
             if( p_sys->i_buffering_extra_initial > 0 )
                 i_system_duration += p_sys->i_buffering_extra_system - p_sys->i_buffering_extra_initial;
         }
         else
         {
-            i_system_duration = vlc_tick_now() - i_system_start;
+            i_system_duration = input_clock_GetSystemDuration(p_sys->p_pgrm->p_input_clock,
+                                          vlc_tick_now());
+
         }
 
         const vlc_tick_t i_consumed = i_system_duration * p_sys->rate - i_stream_duration;
@@ -1302,10 +1364,10 @@
             /* Fall-through */
         case VLC_CLOCK_MASTER_INPUT:
         {
-            vlc_clock_main_Lock(p_sys->p_pgrm->clocks.main);
+            vlc_clock_main_Lock(p_pgrm->clocks.main);
             p_pgrm->clocks.input =
                 vlc_clock_main_CreateInputMaster(p_pgrm->clocks.main);
-            vlc_clock_main_Unlock(p_sys->p_pgrm->clocks.main);
+            vlc_clock_main_Unlock(p_pgrm->clocks.main);
 
             if (p_pgrm->clocks.input == NULL)
                 break;
@@ -1493,7 +1555,7 @@
         return NULL;
     }
 
-    p_pgrm->p_input_clock = input_clock_New( p_sys->rate );
+    p_pgrm->p_input_clock = input_clock_New(vlc_object_logger(p_input), p_sys->rate);
     if( !p_pgrm->p_input_clock )
     {
         vlc_clock_main_Delete(p_pgrm->clocks.main);
@@ -1984,22 +2046,10 @@
         audio_replay_gain_t rg;
         memset( &rg, 0, sizeof(rg) );
         vlc_mutex_lock( &input_priv(p_input)->p_item->lock );
-        vlc_audio_replay_gain_MergeFromMeta( &rg, input_priv(p_input)->p_item->p_meta );
+        vlc_replay_gain_CopyFromMeta( &rg, input_priv(p_input)->p_item->p_meta );
         vlc_mutex_unlock( &input_priv(p_input)->p_item->lock );
+        replay_gain_Merge( &fmt->audio_replay_gain, &rg );
 
-        for( int i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
-        {
-            if( !fmt->audio_replay_gain.pb_peaki )
-            {
-                fmt->audio_replay_gain.pb_peaki = rg.pb_peaki;
-                fmt->audio_replay_gain.pf_peaki = rg.pf_peaki;
-            }
-            if( !fmt->audio_replay_gain.pb_gaini )
-            {
-                fmt->audio_replay_gain.pb_gaini = rg.pb_gaini;
-                fmt->audio_replay_gain.pf_gaini = rg.pf_gaini;
-            }
-        }
         break;
     }
 
@@ -2159,6 +2209,7 @@
 
     es->b_scrambled = false;
     es->b_terminated = false;
+    es->forced = false;
 
     switch( es->fmt.i_cat )
     {
@@ -2189,8 +2240,9 @@
     es->master = false;
     vlc_vector_init(&es->sub_es_vec);
     es->p_master = p_master;
-    es->mouse_event_cb = NULL;
-    es->mouse_event_userdata = NULL;
+    vlc_mouse_Init(&es->oldmouse);
+    es->mouse_event_cb = MouseEventCb;
+    es->mouse_event_userdata = es;
     es->i_pts_level = VLC_TICK_INVALID;
     es->delay = VLC_TICK_MAX;
 
@@ -2300,6 +2352,7 @@
         .resource = priv->p_resource,
         .sout = priv->p_sout,
         .input_type = p_sys->input_type,
+        .hw_dec = priv->hw_dec,
         .cc_decoder = p_sys->cc_decoder,
         .cbs = &decoder_cbs,
         .cbs_data = p_es,
@@ -2332,6 +2385,7 @@
                 .resource = priv->p_resource,
                 .sout = p_sys->p_sout_record,
                 .input_type = INPUT_TYPE_PLAYBACK,
+                .hw_dec = priv->hw_dec,
                 .cc_decoder = p_sys->cc_decoder,
                 .cbs = &decoder_cbs,
                 .cbs_data = p_es,
@@ -2507,6 +2561,7 @@
         EsOutStopNextFrame(p_sys);
 
     EsOutDestroyDecoder(p_sys, es);
+    es->forced = false;
 
     if( !b_update )
         return;
@@ -2519,7 +2574,10 @@
                                          const es_out_id_t *es )
 {
     if( p_esprops->p_main_es != NULL )
-        return es->fmt.i_priority > p_esprops->p_main_es->fmt.i_priority;
+    {
+        return !p_esprops->p_main_es->forced &&
+               es->fmt.i_priority > p_esprops->p_main_es->fmt.i_priority;
+    }
 
     return es->fmt.i_priority > ES_PRIORITY_NOT_DEFAULTABLE;
 }
@@ -2701,6 +2759,9 @@
         }
     }
 
+    if( b_force )
+        es->forced = true;
+
     /* FIXME TODO handle priority here */
     if( p_esprops && p_sys->i_mode == ES_OUT_MODE_AUTO && EsIsSelected( es ) )
         p_esprops->p_main_es = es;
@@ -2884,6 +2945,7 @@
     }
 
     vlc_mutex_lock( &p_sys->lock );
+    assert( !p_sys->b_draining );
 
     /* Shift all slaves timestamps with the main source normal time. This will
      * allow to synchronize 2 demuxers with different time bases. Remove the
@@ -3200,28 +3262,21 @@
     case ES_OUT_SET_ES:
     case ES_OUT_RESTART_ES:
     {
-#define IGNORE_ES DATA_ES
         es_out_id_t *es = va_arg( args, es_out_id_t * ), *other;
 
         enum es_format_category_e i_cat;
         if( es == NULL )
             i_cat = UNKNOWN_ES;
-        else if( es == es_cat + AUDIO_ES )
-            i_cat = AUDIO_ES;
-        else if( es == es_cat + VIDEO_ES )
-            i_cat = VIDEO_ES;
-        else if( es == es_cat + SPU_ES )
-            i_cat = SPU_ES;
         else
         {
             if (es->b_terminated)
                 return VLC_EGENERIC;
-            i_cat = IGNORE_ES;
+            i_cat = es->fmt.i_cat;
         }
 
         foreach_es_then_es_slaves(other)
         {
-            if (i_cat == IGNORE_ES && es == other)
+            if (es == other)
             {
                 if (i_query == ES_OUT_RESTART_ES && es->p_dec != NULL)
                 {
@@ -3286,18 +3341,6 @@
             /*p_sys->i_default_audio_id = -1;*/
             p_sys->sub.i_demux_id = -1;
         }
-        else if( es == es_cat + AUDIO_ES )
-        {
-            /*p_sys->i_default_video_id = -1;*/
-        }
-        else if( es == es_cat + VIDEO_ES )
-        {
-            /*p_sys->i_default_audio_id = -1;*/
-        }
-        else if( es == es_cat + SPU_ES )
-        {
-            p_sys->sub.i_demux_id = -1;
-        }
         else
         {
             /*if( es->fmt.i_cat == VIDEO_ES )
@@ -3364,11 +3407,20 @@
         const bool b_low_delay = priv->b_low_delay;
         bool b_extra_buffering_allowed = !b_low_delay && EsOutIsExtraBufferingAllowed(p_sys);
         vlc_tick_t i_late = input_clock_Update(
-                            p_pgrm->p_input_clock, VLC_OBJECT(p_sys->p_input),
+                            p_pgrm->p_input_clock,
                             input_CanPaceControl(p_sys->p_input), p_sys->b_buffering,
                             b_extra_buffering_allowed,
                             i_pcr, vlc_tick_now() );
 
+        if (tracer != NULL)
+        {
+            vlc_tracer_Trace(tracer,
+                             VLC_TRACE("type", "DEMUX"),
+                             VLC_TRACE("id", "input"),
+                             VLC_TRACE_TICK_NS("buffering", -i_late),
+                             VLC_TRACE_END);
+        }
+
         if( !p_sys->p_pgrm )
             return VLC_SUCCESS;
 
@@ -3575,10 +3627,13 @@
         return VLC_SUCCESS;
     }
 
-    case ES_OUT_GET_EMPTY:
+    case ES_OUT_DRAIN:
+        return EsOutDrain(p_sys);
+
+    case ES_OUT_IS_EMPTY:
     {
         bool *pb = va_arg( args, bool* );
-        *pb = EsOutDecodersIsEmpty(p_sys);
+        *pb = EsOutIsEmpty( p_sys );
         return VLC_SUCCESS;
     }
 
@@ -3602,6 +3657,13 @@
         p_es->mouse_event_cb = va_arg( args, vlc_mouse_event );
         p_es->mouse_event_userdata = va_arg( args, void * );
 
+        if ( !p_es->mouse_event_cb )
+        {
+            /* fallback to player event */
+            p_es->mouse_event_cb = MouseEventCb;
+            p_es->mouse_event_userdata = p_es;
+        }
+
         if( p_es->p_dec )
             vlc_input_decoder_SetVoutMouseEvent( p_es->p_dec,
                 p_es->mouse_event_cb, p_es->mouse_event_userdata );
@@ -3728,6 +3790,15 @@
     {
         vlc_tick_t *pi_wakeup = va_arg( args, vlc_tick_t* );
         *pi_wakeup = EsOutGetWakeup(p_sys);
+
+        struct vlc_tracer *tracer = vlc_object_get_tracer( &p_sys->p_input->obj );
+        if (tracer != NULL)
+        {
+            vlc_tracer_Trace(tracer,
+                             VLC_TRACE("id", "es_out"),
+                             VLC_TRACE_TICK_NS("wakeup_delay", *pi_wakeup == 0 ? 0 : *pi_wakeup - vlc_tick_now()),
+                             VLC_TRACE_END);
+        }
         return VLC_SUCCESS;
     }
     case ES_OUT_PRIV_SET_ES_LIST:
@@ -3926,10 +3997,7 @@
     }
     case ES_OUT_PRIV_SET_EOS:
     {
-        es_out_id_t *id;
-        foreach_es_then_es_slaves(id)
-            if (id->p_dec != NULL)
-                EsOutDrainDecoder(p_sys, id, false);
+        EsOutDrain(p_sys);
         return VLC_SUCCESS;
     }
     case ES_OUT_PRIV_SET_VBI_PAGE:
@@ -4061,6 +4129,7 @@
     p_sys->rate = rate;
 
     p_sys->b_buffering = true;
+    p_sys->b_draining = false;
     p_sys->i_preroll_end = -1;
     p_sys->i_prev_stream_level = -1;
 
@@ -4501,12 +4570,15 @@
            info_category_AddInfo( p_cat, _("Projection"), "%s",
                                   vlc_gettext(psz_loc_name) );
 
+           float yaw, pitch, roll;
+           vlc_viewpoint_to_euler(&fmt->video.pose, &yaw, &pitch, &roll);
+
            info_category_AddInfo( p_cat, vlc_pgettext("ViewPoint", "Yaw"),
-                                  "%.2f", fmt->video.pose.yaw );
+                                  "%.2f", yaw );
            info_category_AddInfo( p_cat, vlc_pgettext("ViewPoint", "Pitch"),
-                                  "%.2f", fmt->video.pose.pitch );
+                                  "%.2f", pitch );
            info_category_AddInfo( p_cat, vlc_pgettext("ViewPoint", "Roll"),
-                                  "%.2f", fmt->video.pose.roll );
+                                  "%.2f", roll );
            info_category_AddInfo( p_cat,
                                   vlc_pgettext("ViewPoint", "Field of view"),
                                   "%.2f", fmt->video.pose.fov );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/es_out.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/es_out.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/es_out_timeshift.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/es_out_timeshift.c Changed

@@ -43,7 +43,6 @@
 #include <vlc_mouse.h>
 #include <vlc_es_out.h>
 #include <vlc_block.h>
-#include <vlc_subpicture.h> // vlc_spu_highlight_t
 #include "input_internal.h"
 #ifdef _WIN32
 #  include <vlc_charset.h> // FromWide
@@ -492,16 +491,16 @@
 }
 
 static int
-ControlLockedGetEmpty(struct es_out_timeshift *p_sys,
-                      input_source_t *in,
-                      bool *pb_empty )
+ControlLockedIsEmpty(struct es_out_timeshift *p_sys, input_source_t *in,
+                     bool *pb_empty)
 {
     if( p_sys->b_delayed && TsHasCmd( p_sys->p_ts ) )
         *pb_empty = false;
     else
     {
-        int ret = es_out_in_Control( p_sys->p_out, in, ES_OUT_GET_EMPTY, pb_empty );
-        assert( ret == VLC_SUCCESS );
+        int ret = es_out_in_Control( p_sys->p_out, in, ES_OUT_IS_EMPTY,
+                                     pb_empty );
+        assert( !ret );
     }
 
     return VLC_SUCCESS;
@@ -655,6 +654,7 @@
     case ES_OUT_SET_ES_STATE:
     case ES_OUT_SET_ES_CAT_POLICY:
     case ES_OUT_SET_ES_FMT:
+    case ES_OUT_DRAIN:
     {
         ts_cmd_control_t cmd;
         if( CmdInitControl( &cmd, in, i_query, args, p_sys->b_delayed ) )
@@ -707,15 +707,15 @@
     case ES_OUT_SPU_SET_HIGHLIGHT:
     {
         es_out_id_t *p_es = va_arg( args, es_out_id_t * );
-        const vlc_spu_highlight_t *p_hl = va_arg( args, const vlc_spu_highlight_t * );
+        const struct vlc_spu_highlight_t *p_hl = va_arg( args, const struct vlc_spu_highlight_t * );
         return es_out_in_Control( p_sys->p_out, in, ES_OUT_SPU_SET_HIGHLIGHT,
                                   p_es->p_es, p_hl );
     }
     /* Special internal input control */
-    case ES_OUT_GET_EMPTY:
+    case ES_OUT_IS_EMPTY:
     {
         bool *pb_empty = va_arg( args, bool* );
-        return ControlLockedGetEmpty(p_sys, in, pb_empty);
+        return ControlLockedIsEmpty(p_sys, in, pb_empty);
     }
 
     case ES_OUT_POST_SUBNODE:
@@ -1616,6 +1616,7 @@
         p_cmd->u.es_bool.b_bool = (bool)va_arg( args, int );
         break;
 
+    case ES_OUT_DRAIN:
     case ES_OUT_RESET_PCR:           /* no arg */
         break;
 
@@ -1747,6 +1748,7 @@
         return es_out_in_Control( p_sys->p_out, in, i_query, p_cmd->u.int_i64.i_int,
                                   p_cmd->u.int_i64.i_i64 );
 
+    case ES_OUT_DRAIN:
     case ES_OUT_RESET_PCR:           /* no arg */
         return es_out_in_Control( p_sys->p_out, in, i_query );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/input.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/input.c Changed

@@ -249,6 +249,21 @@
     input_item_ApplyOptions( VLC_OBJECT(p_input), p_item );
 
     /* Init Common fields */
+
+    switch (cfg->hw_dec)
+    {
+        case INPUT_CFG_HW_DEC_DEFAULT:
+            priv->hw_dec = var_InheritBool(p_input, "hw-dec");
+            break;
+        case INPUT_CFG_HW_DEC_DISABLED:
+            priv->hw_dec = false;
+            break;
+        case INPUT_CFG_HW_DEC_ENABLED:
+            priv->hw_dec = true;
+            break;
+        default: vlc_assert_unreachable();
+    }
+
     priv->cbs = cfg->cbs;
     priv->cbs_data = cfg->cbs_data;
     priv->type = cfg->type;
@@ -316,7 +331,10 @@
     vlc_interrupt_init(&priv->interrupt);
 
     /* Create Object Variables for private use only */
-    input_ConfigVarInit( p_input );
+
+    vlc_object_InitInputConfig(VLC_OBJECT(p_input),
+                               input_priv(p_input)->type != INPUT_TYPE_PREPARSING,
+                               true);
 
     priv->b_low_delay = var_InheritBool( p_input, "low-delay" );
     priv->i_jitter_max = VLC_TICK_FROM_MS(var_InheritInteger( p_input, "clock-jitter" ));
@@ -610,6 +628,8 @@
 static void MainLoop( input_thread_t *p_input, bool b_interactive )
 {
     vlc_tick_t i_intf_update = 0;
+    vlc_tick_t i_inf_update_delay =
+        VLC_TICK_FROM_MS(var_InheritInteger( p_input, "stats-min-report-interval" ));
     vlc_tick_t i_last_seek_mdate = 0;
 
     if( b_interactive && var_InheritBool( p_input, "start-paused" ) )
@@ -650,7 +670,7 @@
 
                 b_paused_at_eof = false;
             }
-            else if( !es_out_GetEmpty( input_priv(p_input)->p_es_out ) )
+            else if( !es_out_IsEmpty( input_priv(p_input)->p_es_out ) )
             {
                 msg_Dbg( p_input, "waiting decoder fifos to empty" );
                 i_wakeup = vlc_tick_now() + INPUT_IDLE_SLEEP;
@@ -682,7 +702,7 @@
             if( now >= i_intf_update )
             {
                 MainLoopStatistics( p_input );
-                i_intf_update = now + VLC_TICK_FROM_MS(250);
+                i_intf_update = now + i_inf_update_delay;
             }
         }
 
@@ -1489,9 +1509,14 @@
         }
         else if ( i_ct == INPUT_CONTROL_UPDATE_VIEWPOINT )
         {
-            c->param.viewpoint.yaw += prev_control->param.viewpoint.yaw;
-            c->param.viewpoint.pitch += prev_control->param.viewpoint.pitch;
-            c->param.viewpoint.roll += prev_control->param.viewpoint.roll;
+            float yaw1, pitch1, roll1;
+            float yaw2, pitch2, roll2;
+            vlc_viewpoint_to_euler(&prev_control->param.viewpoint, &yaw1, &pitch1, &roll1);
+            vlc_viewpoint_to_euler(&c->param.viewpoint, &yaw2, &pitch2, &roll2);
+            vlc_viewpoint_from_euler(&c->param.viewpoint,
+                                     yaw1 + yaw2,
+                                     pitch1 + pitch2,
+                                     roll1 + roll2);
             c->param.viewpoint.fov += prev_control->param.viewpoint.fov;
             return sys->i_control - 1;
         }
@@ -2145,10 +2170,18 @@
             else
             {
                 priv->viewpoint_changed = true;
-                priv->viewpoint.yaw   += param.viewpoint.yaw;
-                priv->viewpoint.pitch += param.viewpoint.pitch;
-                priv->viewpoint.roll  += param.viewpoint.roll;
-                priv->viewpoint.fov   += param.viewpoint.fov;
+                float previous3, update3;
+                vlc_viewpoint_to_euler(&priv->viewpoint, &previous0,
+                                       &previous1, &previous2);
+                vlc_viewpoint_to_euler(&param.viewpoint, &update0,
+                                       &update1, &update2);
+
+                /* Clip the pitch to avoid glitches at singularity points. */
+                vlc_viewpoint_from_euler(&priv->viewpoint,
+                        previous0 + update0,
+                        VLC_CLIP(previous1 + update1, -85.f, 85.f),
+                        previous2 + update2);
+                priv->viewpoint.fov += param.viewpoint.fov;
             }
 
             ViewpointApply( p_input );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/input_interface.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/input_interface.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/input_internal.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/input_internal.h Changed

@@ -25,6 +25,7 @@
 
 #include <vlc_demux.h>
 #include <vlc_input.h>
+#include <vlc_mouse.h>
 #include "input_interface.h"
 #include "../misc/interrupt.h"
 #include "./source.h"
@@ -149,6 +150,9 @@
 
     /* The demux is not able to navigate */
     INPUT_EVENT_NAV_FAILED,
+
+    /* Mouse event */
+    INPUT_EVENT_MOUSE,
 } input_event_type_e;
 
 #define VLC_INPUT_CAPABILITIES_SEEKABLE (1<<0)
@@ -271,6 +275,12 @@
     size_t count;
 };
 
+struct vlc_input_event_mouse
+{
+    vlc_mouse_t oldmouse;
+    vlc_mouse_t newmouse;
+};
+
 struct vlc_input_event
 {
     input_event_type_e type;
@@ -318,6 +328,8 @@
         struct vlc_input_event_attachments attachments;
         /* INPUT_EVENT_NAV_FAILED */
         int nav_type;
+        /* INPUT_EVENT_MOUSE */
+        struct vlc_input_event_mouse mouse_data;
     };
 };
 
@@ -330,6 +342,12 @@
 struct vlc_input_thread_cfg
 {
     enum input_type type;
+    enum
+    {
+        INPUT_CFG_HW_DEC_DEFAULT,
+        INPUT_CFG_HW_DEC_DISABLED,
+        INPUT_CFG_HW_DEC_ENABLED,
+    } hw_dec;
     input_resource_t *resource;
     vlc_renderer_item_t *renderer;
     const struct vlc_input_thread_callbacks *cbs;
@@ -446,6 +464,7 @@
     void *cbs_data;
 
     enum input_type type;
+    bool hw_dec;
     bool preparse_subitems;
 
     /* Current state */
@@ -681,16 +700,13 @@
 
 /* var.c */
 
-void input_ConfigVarInit ( input_thread_t * );
+void vlc_object_InitInputConfig(vlc_object_t *obj,
+                                bool playback, bool do_inherit);
 
 /* Subtitles */
 int subtitles_Detect( input_thread_t *, char *, const char *, input_item_slave_t ***, int * );
 int subtitles_Filter( const char *);
 
-/* meta.c */
-void vlc_audio_replay_gain_MergeFromMeta( audio_replay_gain_t *p_dst,
-                                          const vlc_meta_t *p_meta );
-
 /* stats.c */
 typedef struct input_rate_t
 {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/meta.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/meta.c Changed

@@ -320,39 +320,3 @@
     vlc_object_delete(p_export);
     return VLC_EGENERIC;
 }
-
-void vlc_audio_replay_gain_MergeFromMeta( audio_replay_gain_t *p_dst,
-                                          const vlc_meta_t *p_meta )
-{
-    const char * psz_value;
-
-    if( !p_meta )
-        return;
-
-    if( (psz_value = vlc_meta_GetExtra(p_meta, "REPLAYGAIN_TRACK_GAIN")) ||
-        (psz_value = vlc_meta_GetExtra(p_meta, "RG_RADIO")) )
-    {
-        p_dst->pb_gainAUDIO_REPLAY_GAIN_TRACK = true;
-        p_dst->pf_gainAUDIO_REPLAY_GAIN_TRACK = vlc_atof_c( psz_value );
-    }
-
-    if( (psz_value = vlc_meta_GetExtra(p_meta, "REPLAYGAIN_TRACK_PEAK" )) ||
-             (psz_value = vlc_meta_GetExtra(p_meta, "RG_PEAK" )) )
-    {
-        p_dst->pb_peakAUDIO_REPLAY_GAIN_TRACK = true;
-        p_dst->pf_peakAUDIO_REPLAY_GAIN_TRACK = vlc_atof_c( psz_value );
-    }
-
-    if( (psz_value = vlc_meta_GetExtra(p_meta, "REPLAYGAIN_ALBUM_GAIN" )) ||
-             (psz_value = vlc_meta_GetExtra(p_meta, "RG_AUDIOPHILE" )) )
-    {
-        p_dst->pb_gainAUDIO_REPLAY_GAIN_ALBUM = true;
-        p_dst->pf_gainAUDIO_REPLAY_GAIN_ALBUM = vlc_atof_c( psz_value );
-    }
-
-    if( (psz_value = vlc_meta_GetExtra(p_meta, "REPLAYGAIN_ALBUM_PEAK" )) )
-    {
-        p_dst->pb_peakAUDIO_REPLAY_GAIN_ALBUM = true;
-        p_dst->pf_peakAUDIO_REPLAY_GAIN_ALBUM = vlc_atof_c( psz_value );
-    }
-}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/parse.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/parse.c Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/replay_gain.c Added

@@ -0,0 +1,199 @@
+/*****************************************************************************
+ * replay_gain.c : common replay gain code
+ *****************************************************************************
+ * Copyright © 2002-2004 VLC authors and VideoLAN
+ * Copyright © 2011-2012 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <math.h>
+
+#include <vlc_replay_gain.h>
+#include <vlc_meta.h>
+#include <vlc_charset.h>
+#include <vlc_variables.h>
+
+int vlc_replay_gain_CopyFromMeta( audio_replay_gain_t *p_dst, const vlc_meta_t *p_meta )
+{
+    if( !p_dst || !p_meta )
+        return VLC_EINVAL;
+
+    /* replay gain presence flags */
+    enum audio_replay_gain_flags {
+        TRACK_GAIN = 0x01,
+        TRACK_PEAK = 0x02,
+        ALBUM_GAIN = 0x04,
+        ALBUM_PEAK = 0x08,
+        FLAGS_MASK = 0x0F,
+        GAINS_MASK = TRACK_GAIN | ALBUM_GAIN,
+    };
+
+    static const struct {
+        int mode;
+        enum audio_replay_gain_flags flag;
+        const char *tags2;
+    } rg_meta4 = {
+        { AUDIO_REPLAY_GAIN_TRACK, TRACK_GAIN,
+            { "REPLAYGAIN_TRACK_GAIN", "replaygain_track_gain" }
+        },
+        { AUDIO_REPLAY_GAIN_TRACK, TRACK_PEAK,
+            { "REPLAYGAIN_TRACK_PEAK", "replaygain_track_peak" }
+        },
+        { AUDIO_REPLAY_GAIN_ALBUM, ALBUM_GAIN,
+            { "REPLAYGAIN_ALBUM_GAIN", "replaygain_album_gain" }
+        },
+        { AUDIO_REPLAY_GAIN_ALBUM, ALBUM_PEAK,
+            { "REPLAYGAIN_ALBUM_PEAK", "replaygain_album_peak" }
+        }
+    };
+
+    enum audio_replay_gain_flags found = 0;
+
+    for( size_t i = 0; i < ARRAY_SIZE( rg_meta ) && found != FLAGS_MASK; i++ )
+    {
+        if( found & rg_metai.flag )
+            continue;
+
+        for( size_t j = 0; j < ARRAY_SIZE( rg_metai.tags ); j++ )
+        {
+            const char *psz_meta = vlc_meta_GetExtra( p_meta, rg_metai.tagsj );
+            if( psz_meta )
+            {
+                float f_value = vlc_strtof_c( psz_meta, NULL );
+
+                if( rg_metai.flag & GAINS_MASK )
+                {
+                    p_dst->pb_gainrg_metai.mode = true;
+                    p_dst->pf_gainrg_metai.mode = f_value;
+                }
+                else
+                {
+                    p_dst->pb_peakrg_metai.mode = true;
+                    p_dst->pf_peakrg_metai.mode = f_value;
+                }
+
+                found |= rg_metai.flag;
+                break;
+            }
+        }
+    }
+
+    static const char *rg_loudness2 = {
+        "REPLAYGAIN_REFERENCE_LOUDNESS",
+        "replaygain_reference_loudness"
+    };
+    /* Only look for reference loudness if a track or album gain was found */
+    for( size_t i = 0; i < ARRAY_SIZE( rg_loudness ) && ( found & GAINS_MASK ); i++ )
+    {
+        const char *psz_meta = vlc_meta_GetExtra( p_meta, rg_loudnessi );
+        if( psz_meta )
+        {
+            p_dst->pb_reference_loudness = true;
+            p_dst->pf_reference_loudness = vlc_strtof_c( psz_meta, NULL );
+            break;
+        }
+    }
+
+    /* Success if either a track or album gain was found. Peak defaults to 1.0 when absent */
+    return ( found & GAINS_MASK ) ? VLC_SUCCESS : VLC_EGENERIC;
+}
+
+float replay_gain_CalcMultiplier( vlc_object_t *p_obj, const audio_replay_gain_t *p_rg )
+{
+    unsigned mode = AUDIO_REPLAY_GAIN_MAX;
+
+    char *psz_mode = var_InheritString( p_obj, "audio-replay-gain-mode" );
+    if( likely(psz_mode != NULL) )
+    {   /* Find selected mode */
+        if (!strcmp (psz_mode, "track"))
+            mode = AUDIO_REPLAY_GAIN_TRACK;
+        else if( !strcmp( psz_mode, "album" ) )
+            mode = AUDIO_REPLAY_GAIN_ALBUM;
+        free( psz_mode );
+    }
+
+    /* Command line / configuration gain */
+    const float config_gain = var_InheritFloat( p_obj, "gain" );
+
+    if( mode == AUDIO_REPLAY_GAIN_MAX )
+        return config_gain;
+
+    const float preamp_gain = var_InheritFloat( p_obj, "audio-replay-gain-preamp" );
+    const float default_gain = var_InheritFloat( p_obj, "audio-replay-gain-default" );
+    const bool peak_protection = var_InheritBool( p_obj, "audio-replay-gain-peak-protection" );
+
+    /* If the selected mode is not available, prefer the other one */
+    if( !p_rg->pb_gainmode && p_rg->pb_gain!mode )
+        mode = !mode;
+
+    float gain;
+    if( p_rg->pb_gainmode )
+    {
+        /* replay gain uses -18 LUFS as the reference level */
+        const float rg_ref_lufs = -18.f;
+        float rg_ref_lufs_delta =   0.f;
+
+        if( p_rg->pb_reference_loudness )
+            rg_ref_lufs_delta = rg_ref_lufs - p_rg->pf_reference_loudness;
+
+        gain = p_rg->pf_gainmode + preamp_gain + rg_ref_lufs_delta;
+        msg_Dbg( p_obj, "replay gain: mode %s, gain %.2f dB, pre-amp %.2f dB, reference loudness %.2f LUFS",
+                        mode ? "album" : "track",
+                        p_rg->pf_gainmode,
+                        preamp_gain,
+                        rg_ref_lufs - rg_ref_lufs_delta );
+    }
+    else
+    {
+        gain = default_gain;
+        msg_Dbg( p_obj, "replay gain: mode default, gain %.2f dB", gain );
+    }
+
+    float multiplier = powf( 10.f, gain / 20.f );
+
+    /* Skip peak protection for default gain case, as the default peak value of 1.0 would limit gains greater than 0 dB */
+    if( p_rg->pb_gainmode && peak_protection )
+    {
+        /* Use peak of 1.0 if peak value is missing or invalid */
+        float peak = p_rg->pb_peakmode && p_rg->pf_peakmode > 0.f ? p_rg->pf_peakmode : 1.f;
+        float peak_limit = 1.f / peak;
+
+        /* To avoid clipping, max gain multiplier must be <= 1.0 / peak
+         * e.g.: peak of 0.5 -> max gain +6.02 dB (can double)
+         * e.g.: peak of 1.0 -> max gain  0    dB (unity gain)
+         * e.g.: peak of 1.5 -> max gain -3.52 dB (reduce by third)
+         * e.g.: peak of 2.0 -> max gain -6.02 dB (reduce by half)
+         */
+        if( multiplier > peak_limit )
+        {
+            multiplier = peak_limit;
+            msg_Dbg( p_obj, "replay gain: peak protection reducing gain from %.2f dB to %.2f dB (peak %.6f)",
+                            gain,
+                            20.f * log10f( multiplier ),
+                            peak );
+        }
+    }
+
+    /* apply configuration gain */
+    multiplier *= config_gain;
+    msg_Dbg( p_obj, "replay gain: applying %.2f dB", 20.f * log10f( multiplier ) );
+
+    return multiplier;
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/stream.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/stream.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/stream_extractor.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/stream_extractor.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/stream_filter.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/stream_filter.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/test/es_out.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/test/es_out.c Changed

@@ -299,12 +299,6 @@
     return NULL;
 }
 
-void vlc_audio_replay_gain_MergeFromMeta(audio_replay_gain_t *p_dst,
-                                         const struct vlc_meta_t *p_meta)
-{
-    (void)p_dst; (void)p_meta;
-}
-
 static input_source_t *InputSourceNew(void)
 {
     input_source_t *in = calloc(1, sizeof(*in));
@@ -335,11 +329,7 @@
     .log = LogText,
 };
 
-struct vlc_logger {
-    const struct vlc_logger_operations *ops;
-};
-
-int main(void)
+static void test_playback(void)
 {
     vlc_list_init(&opened_decoders);
     struct vlc_logger logger = { .ops = &test_logger_operations };
@@ -447,5 +437,96 @@
     vlc_object_delete(&input->obj);
     vlc_object_delete(root);
 
-    return VLC_SUCCESS;
+}
+
+static void test_multiple_programs(void)
+{
+    vlc_list_init(&opened_decoders);
+    struct vlc_logger logger = { .ops = &test_logger_operations };
+    libvlc_priv_t *libvlc = (vlc_object_create)(NULL, sizeof(*libvlc));
+    vlc_object_t *root = &libvlc->public_data.obj;
+    root->logger = &logger;
+
+    var_Create(root, "clock-master", VLC_VAR_STRING);
+    var_SetString(root, "clock-master", "auto");
+
+    var_Create(root, "captions", VLC_VAR_INTEGER);
+    var_SetInteger(root, "captions", 608);
+
+    input_item_t *item = input_item_NewStream("mock://", "mock", 0);
+
+    input_thread_private_t *priv = vlc_object_create(root, sizeof(*priv));
+    assert(priv != NULL);
+    priv->p_item = item;
+
+    input_thread_t *input = &priv->input;
+    var_Create(input, "video", VLC_VAR_BOOL);
+    var_SetBool(input, "video", true);
+    var_Create(input, "audio", VLC_VAR_BOOL);
+    var_SetBool(input, "audio", true);
+
+    input_source_t *source = InputSourceNew();
+
+    struct vlc_input_es_out *out =
+        input_EsOutNew(input, source, 1.f, INPUT_TYPE_PLAYBACK);
+    assert(out != NULL);
+
+    es_out_SetMode(out, ES_OUT_MODE_AUTO);
+
+    vlc_tick_t pts_delay = VLC_TICK_FROM_MS(300);
+    es_out_SetJitter(out, pts_delay, 0, 40 * pts_delay / DEFAULT_PTS_DELAY);
+
+    es_format_t video_fmt;
+    es_format_Init(&video_fmt, VIDEO_ES, VLC_CODEC_RGBA);
+    video_fmt.i_id = 1;
+    video_fmt.i_group = 1;
+    video_format_Init(&video_fmt.video, VLC_CODEC_RGBA);
+    video_fmt.video.i_width = video_fmt.video.i_visible_width = 64;
+    video_fmt.video.i_height = video_fmt.video.i_visible_height = 64;
+    es_out_id_t *video_track = es_out_Add(&out->out, &video_fmt);
+    assert(video_track != NULL);
+    es_format_Clean(&video_fmt);
+
+    es_format_t audio_fmt;
+    es_format_Init(&audio_fmt, AUDIO_ES, VLC_CODEC_F32L);
+    audio_fmt.i_id = 2;
+    video_fmt.i_group = 2;
+    audio_fmt.audio.i_format = VLC_CODEC_F32L;
+    audio_fmt.audio.i_rate = 44100;
+    audio_fmt.audio.i_physical_channels = 2;
+    audio_fmt.audio.i_channels = 2;
+    es_out_id_t *audio_track = es_out_Add(&out->out, &audio_fmt);
+    assert(audio_track != NULL);
+    es_format_Clean(&audio_fmt);
+
+    block_t *block = block_Alloc(10);
+    assert(block);
+    es_out_Send(&out->out, video_track, block);
+
+    block = block_Alloc(10);
+    assert(block);
+    es_out_Send(&out->out, audio_track, block);
+
+    es_out_Control(&out->out, ES_OUT_SET_GROUP_PCR, 1, VLC_TICK_0);
+    es_out_Control(&out->out, ES_OUT_SET_GROUP_PCR, 1, VLC_TICK_0 + VLC_TICK_FROM_MS(100));
+    es_out_Control(&out->out, ES_OUT_SET_GROUP_PCR, 2, VLC_TICK_0 + VLC_TICK_FROM_MS(200));
+    es_out_Control(&out->out, ES_OUT_SET_GROUP_PCR, 2, VLC_TICK_0 + VLC_TICK_FROM_MS(300) - 1);
+
+    es_out_Del(&out->out, audio_track);
+    es_out_Del(&out->out, video_track);
+
+    es_out_SetMode(out, ES_OUT_MODE_END);
+    es_out_Delete(&out->out);
+
+    input_source_Release(source);
+    input_item_Release(item);
+    vlc_object_delete(&input->obj);
+    vlc_object_delete(root);
+}
+
+int main(void)
+{
+    test_playback();
+    test_multiple_programs();
+    return 0;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/input/var.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/input/var.c Changed

@@ -36,93 +36,95 @@
  * input_ConfigVarInit:
  *  Create all config object variables
  *****************************************************************************/
-void input_ConfigVarInit ( input_thread_t *p_input )
+void vlc_object_InitInputConfig(vlc_object_t *obj,
+                                bool playback, bool do_inherit)
 {
     /* Create Object Variables for private use only */
+    int inherit_flag = do_inherit ? VLC_VAR_DOINHERIT : 0;
 
-    if( input_priv(p_input)->type != INPUT_TYPE_PREPARSING )
+    if (playback)
     {
-        var_Create( p_input, "video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "spu", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "video-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "audio-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "audio-language",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-language",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "menu-language",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "video-track-id",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "audio-track-id",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-track-id",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "sub-file", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL |
-                    VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-autodetect-path", VLC_VAR_STRING |
-                    VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-autodetect-fuzzy", VLC_VAR_INTEGER |
-                    VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "sout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sout-all",   VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sout-audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sout-video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sout-spu", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sout-keep",  VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "input-repeat",
-                    VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "start-time", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "stop-time", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "run-time", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "input-fast-seek", VLC_VAR_BOOL|VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "input-slave",
-                    VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "audio-desync",
-                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "cr-average",
-                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "clock-synchro",
-                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-
-        var_Create( p_input, "bookmarks", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "programs", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "program", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "rate", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+        var_Create(obj, "video", VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "audio", VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "spu", VLC_VAR_BOOL | inherit_flag);
+
+        var_Create(obj, "video-track", VLC_VAR_INTEGER|inherit_flag);
+        var_Create(obj, "audio-track", VLC_VAR_INTEGER|inherit_flag);
+        var_Create(obj, "sub-track", VLC_VAR_INTEGER|inherit_flag);
+
+        var_Create(obj, "audio-language",
+                    VLC_VAR_STRING|inherit_flag);
+        var_Create(obj, "sub-language",
+                    VLC_VAR_STRING|inherit_flag);
+        var_Create(obj, "menu-language",
+                    VLC_VAR_STRING|inherit_flag);
+
+        var_Create(obj, "video-track-id",
+                    VLC_VAR_STRING|inherit_flag);
+        var_Create(obj, "audio-track-id",
+                    VLC_VAR_STRING|inherit_flag);
+        var_Create(obj, "sub-track-id",
+                    VLC_VAR_STRING|inherit_flag);
+
+        var_Create(obj, "sub-file", VLC_VAR_STRING | inherit_flag);
+        var_Create(obj, "sub-autodetect-file", VLC_VAR_BOOL |
+                    inherit_flag);
+        var_Create(obj, "sub-autodetect-path", VLC_VAR_STRING |
+                    inherit_flag);
+        var_Create(obj, "sub-autodetect-fuzzy", VLC_VAR_INTEGER |
+                    inherit_flag);
+
+        var_Create(obj, "sout", VLC_VAR_STRING | inherit_flag);
+        var_Create(obj, "sout-all",   VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "sout-audio", VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "sout-video", VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "sout-spu", VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "sout-keep",  VLC_VAR_BOOL | inherit_flag);
+
+        var_Create(obj, "input-repeat",
+                    VLC_VAR_INTEGER|inherit_flag);
+        var_Create(obj, "start-time", VLC_VAR_FLOAT|inherit_flag);
+        var_Create(obj, "stop-time", VLC_VAR_FLOAT|inherit_flag);
+        var_Create(obj, "run-time", VLC_VAR_FLOAT|inherit_flag);
+        var_Create(obj, "input-fast-seek", VLC_VAR_BOOL|inherit_flag);
+
+        var_Create(obj, "input-slave",
+                    VLC_VAR_STRING | inherit_flag);
+
+        var_Create(obj, "audio-desync",
+                    VLC_VAR_INTEGER | inherit_flag);
+        var_Create(obj, "cr-average",
+                    VLC_VAR_INTEGER | inherit_flag);
+        var_Create(obj, "clock-synchro",
+                    VLC_VAR_INTEGER | inherit_flag);
+
+        var_Create(obj, "bookmarks", VLC_VAR_STRING | inherit_flag);
+        var_Create(obj, "programs", VLC_VAR_STRING | inherit_flag);
+        var_Create(obj, "program", VLC_VAR_INTEGER | inherit_flag);
+        var_Create(obj, "rate", VLC_VAR_FLOAT | inherit_flag);
     }
 
     /* */
-    var_Create( p_input, "input-record-native", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+    var_Create(obj, "input-record-native", VLC_VAR_BOOL | inherit_flag);
 
     /* */
-    var_Create( p_input, "demux", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "demux-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "stream-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_Create(obj, "demux", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "demux-filter", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "stream-filter", VLC_VAR_STRING | inherit_flag);
 
     /* Meta */
-    var_Create( p_input, "meta-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "meta-author", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "meta-artist", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "meta-genre", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "meta-copyright", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
-    var_Create( p_input, "meta-description", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
-    var_Create( p_input, "meta-date", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "meta-url", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_Create(obj, "meta-title", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-author", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-artist", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-genre", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-copyright", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-description", VLC_VAR_STRING|inherit_flag);
+    var_Create(obj, "meta-date", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-url", VLC_VAR_STRING | inherit_flag);
 
     /* Inherited by demux/subtitle.c */
-    var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT );
+    var_Create(obj, "sub-original-fps", VLC_VAR_FLOAT);
 
     /* used by Medialibrary */
-    var_Create( p_input, "save-recentplay", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+    var_Create(obj, "save-recentplay", VLC_VAR_BOOL | inherit_flag);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/interface/dialog.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/interface/dialog.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/interface/interface.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/interface/interface.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/libvlc-module.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/libvlc-module.c Changed

@@ -36,6 +36,7 @@
 #include <vlc_plugin.h>
 #include <vlc_cpu.h>
 #include <vlc_vout_display.h>
+#include <vlc_subpicture.h>
 #include "libvlc.h"
 #include "modules/modules.h"
 
@@ -336,6 +337,10 @@
 #define FULLSCREEN_LONGTEXT N_( \
     "Start video in fullscreen mode" )
 
+#define PROJECTION_MODE_TEXT N_("360 videos projection mode")
+#define PROJECTION_MODE_LONGTEXT N_( \
+    "Change the 360 video projection mode.")
+
 #define VIDEO_ON_TOP_TEXT N_("Always on top")
 #define VIDEO_ON_TOP_LONGTEXT N_( \
     "Always place the video window on top of other windows." )
@@ -386,7 +391,30 @@
 #define DEINTERLACE_FILTER_TEXT N_("Deinterlace filter")
 #define DEINTERLACE_FILTER_LONGTEXT N_("Deinterlace module to use.")
 
-static const int pi_pos_values = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+#define VIDEO_STEREO_FORMAT_TEXT N_("Video Stereo 3D mode")
+#define VIDEO_STEREO_FORMAT_TEXT_LONGTEXT  N_("Set the Video Stereo 3D mode.")
+
+static const int video_stereo_formats = {
+    VIDEO_STEREO_OUTPUT_AUTO, VIDEO_STEREO_OUTPUT_STEREO,
+    VIDEO_STEREO_OUTPUT_LEFT_ONLY, VIDEO_STEREO_OUTPUT_RIGHT_ONLY,
+    VIDEO_STEREO_OUTPUT_SIDE_BY_SIDE,
+};
+static const char *const video_stereo_formats_text = {
+    N_("Auto"), N_("Stereo"), N_("Left Only"), N_("Right Only"),
+    N_("Side-by-Side"),
+};
+
+static const int pi_pos_values = {
+    0,
+    SUBPICTURE_ALIGN_LEFT,
+    SUBPICTURE_ALIGN_RIGHT,
+    SUBPICTURE_ALIGN_TOP,
+    SUBPICTURE_ALIGN_BOTTOM,
+    SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT,
+    SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_RIGHT,
+    SUBPICTURE_ALIGN_BOTTOM | SUBPICTURE_ALIGN_LEFT,
+    SUBPICTURE_ALIGN_BOTTOM | SUBPICTURE_ALIGN_RIGHT,
+};
 static const char *const ppsz_pos_descriptions =
 { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
   N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
@@ -1115,6 +1143,10 @@
 #define STATS_LONGTEXT N_( \
      "Collect miscellaneous local statistics about the playing media.")
 
+#define STATSFREQ_TEXT N_("Statistics collection frequency")
+#define STATSFREQ_LONGTEXT N_( \
+     "Collection frequency of the statistics in ms.")
+
 #define ONEINSTANCE_TEXT N_("Allow only one running instance")
 #define ONEINSTANCE_LONGTEXT N_( \
     "Allowing only one running instance of VLC can sometimes be useful, " \
@@ -1585,6 +1617,8 @@
                  VOLUME_STEP_LONGTEXT )
         change_float_range( 1., AOUT_VOLUME_DEFAULT )
     add_bool( "volume-save", true, VOLUME_SAVE_TEXT, NULL )
+    add_bool( "audio-time-stretch", true, AUDIO_TIME_STRETCH_TEXT,
+                AUDIO_TIME_STRETCH_LONGTEXT )
 #if defined(__ANDROID__) || defined(__APPLE__) || defined(_WIN32)
     add_bool( "spdif", false, SPDIF_TEXT, SPDIF_LONGTEXT )
 #else
@@ -1601,7 +1635,7 @@
                  DESYNC_LONGTEXT )
         change_safe ()
 
-    /* FIXME TODO create a subcat replay gain ? */
+    set_section( N_("Replay gain") , NULL )
     add_string( "audio-replay-gain-mode", ppsz_replay_gain_mode0, AUDIO_REPLAY_GAIN_MODE_TEXT,
                 AUDIO_REPLAY_GAIN_MODE_LONGTEXT )
         change_string_list( ppsz_replay_gain_mode, ppsz_replay_gain_mode_text )
@@ -1612,9 +1646,6 @@
     add_bool( "audio-replay-gain-peak-protection", true,
               AUDIO_REPLAY_GAIN_PEAK_PROTECTION_TEXT, AUDIO_REPLAY_GAIN_PEAK_PROTECTION_LONGTEXT )
 
-    add_bool( "audio-time-stretch", true,
-              AUDIO_TIME_STRETCH_TEXT, AUDIO_TIME_STRETCH_LONGTEXT )
-
     set_subcategory( SUBCAT_AUDIO_AOUT )
     add_module("aout", "audio output", "any", AOUT_TEXT, AOUT_LONGTEXT)
         change_short('A')
@@ -1645,6 +1676,9 @@
     add_bool( "fullscreen", false, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT )
         change_short('f')
         change_safe ()
+    add_integer("projection-mode", -1, PROJECTION_MODE_TEXT, PROJECTION_MODE_LONGTEXT)
+        change_volatile ()
+        change_safe ()
     add_bool( "embedded-video", true, EMBEDDED_TEXT, EMBEDDED_LONGTEXT )
     add_bool( "xlib", true, "", "" )
         change_private ()
@@ -1667,10 +1701,14 @@
     add_bool( "video-title-show", true, VIDEO_TITLE_SHOW_TEXT,
               VIDEO_TITLE_SHOW_LONGTEXT )
         change_safe()
+    add_integer ("video-stereo-mode", VIDEO_STEREO_OUTPUT_AUTO, VIDEO_STEREO_FORMAT_TEXT,
+                 VIDEO_STEREO_FORMAT_TEXT_LONGTEXT)
+        change_safe()
+        change_integer_list (video_stereo_formats, video_stereo_formats_text)
     add_integer( "video-title-timeout", 5000, VIDEO_TITLE_TIMEOUT_TEXT,
                  VIDEO_TITLE_TIMEOUT_LONGTEXT )
         change_safe()
-    add_integer( "video-title-position", 8, VIDEO_TITLE_POSITION_TEXT,
+    add_integer( "video-title-position", SUBPICTURE_ALIGN_BOTTOM, VIDEO_TITLE_POSITION_TEXT,
                  VIDEO_TITLE_POSITION_LONGTEXT )
         change_safe()
         change_integer_list( pi_pos_values, ppsz_pos_descriptions )
@@ -2220,6 +2258,9 @@
               INTERACTION_LONGTEXT )
 
     add_bool ( "stats", true, STATS_TEXT, STATS_LONGTEXT )
+    add_integer( "stats-min-report-interval", 250,
+                        STATSFREQ_TEXT, STATSFREQ_LONGTEXT );
+        change_integer_range( 0, INT32_MAX )
 
     set_subcategory( SUBCAT_INTERFACE_MAIN )
     add_module_cat("intf", SUBCAT_INTERFACE_MAIN, NULL,
@@ -2290,6 +2331,7 @@
 #   define KEY_RATE_SLOWER_FINE   NULL
 #   define KEY_NEXT               "Command+Right"
 #   define KEY_PREV               "Command+Left"
+#   define KEY_PROJECTION_TOGGLE  NULL
 #   define KEY_STOP               "Command+."
 #   define KEY_POSITION           "t"
 #   define KEY_JUMP_MEXTRASHORT   "Command+Ctrl+Left"
@@ -2423,6 +2465,7 @@
 #   define KEY_PREV               "p\tMedia Prev Track"
 #   define KEY_STOP               "s\tMedia Stop"
 #endif
+#   define KEY_PROJECTION_TOGGLE  NULL
 #   define KEY_POSITION           "t"
 #   define KEY_JUMP_MEXTRASHORT   "Shift+Left"
 #   define KEY_JUMP_PEXTRASHORT   "Shift+Right"
@@ -2563,6 +2606,7 @@
             RATE_SLOWER_FINE_KEY_TEXT, RATE_SLOWER_FINE_KEY_LONGTEXT)
     add_key("key-next", KEY_NEXT, NEXT_KEY_TEXT, NEXT_KEY_LONGTEXT)
     add_key("key-prev", KEY_PREV, PREV_KEY_TEXT, PREV_KEY_LONGTEXT)
+    add_key("key-projection-toggle", KEY_PROJECTION_TOGGLE, "", "")
     add_key("key-stop", KEY_STOP, STOP_KEY_TEXT, STOP_KEY_LONGTEXT)
     add_key("key-position", KEY_POSITION, POSITION_KEY_TEXT,
              POSITION_KEY_LONGTEXT)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/libvlccore.sym -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/libvlccore.sym Changed

@@ -58,6 +58,8 @@
 vlc_frame_Realloc
 vlc_frame_Release
 vlc_frame_TryRealloc
+vlc_chroma_conv_Probe
+vlc_chroma_conv_result_ToString
 config_AddIntf
 config_ChainCreate
 config_ChainDestroy
@@ -125,6 +127,7 @@
 filter_chain_GetFmtOut
 filter_chain_GetVideoCtxOut
 filter_chain_IsEmpty
+filter_chain_HasMouseFilter
 filter_chain_MouseFilter
 filter_chain_NewVideo
 filter_chain_Reset
@@ -589,7 +592,6 @@
 vlc_fourcc_GetCodecFromString
 vlc_fourcc_GetDescription
 vlc_fourcc_GetChromaDescription
-vlc_fourcc_IsYUV
 vlc_fourcc_GetRGBFallback
 vlc_fourcc_GetYUVFallback
 vlc_fourcc_GetFallback
@@ -830,11 +832,6 @@
 vlc_es_id_GetStrId
 vlc_es_id_IsStrIdStable
 vlc_encoder_Destroy
-vlc_thumbnailer_Create
-vlc_thumbnailer_Request
-vlc_thumbnailer_Cancel
-vlc_thumbnailer_Delete
-vlc_thumbnailer_SetTimeout
 vlc_player_AddAssociatedMedia
 vlc_player_AddListener
 vlc_player_AddMetadataListener
@@ -926,6 +923,9 @@
 vlc_player_SelectTracksByStringIds
 vlc_player_SetAssociatedSubsFPS
 vlc_player_SetAtoBLoop
+vlc_player_SetAtoBLoopTime
+vlc_player_SetAtoBLoopPosition
+vlc_player_ResetAtoBLoop
 vlc_player_GetAtoBLoop
 vlc_player_SetCategoryDelay
 vlc_player_SetCurrentMedia
@@ -1004,6 +1004,7 @@
 vlc_playlist_Resume
 vlc_playlist_Export
 vlc_playlist_SetMediaStoppedAction
+vlc_replay_gain_CopyFromMeta
 vlc_intf_GetMainPlaylist
 vlc_media_source_Hold
 vlc_media_source_Release
@@ -1026,6 +1027,8 @@
 vlc_media_tree_Preparse
 vlc_viewpoint_to_4x4
 vlc_viewpoint_from_orientation
+vlc_viewpoint_from_euler
+vlc_viewpoint_to_euler
 vlc_video_context_Create
 vlc_video_context_Release
 vlc_video_context_GetType
@@ -1042,7 +1045,10 @@
 vlc_input_attachment_Hold
 vlc_preparser_New
 vlc_preparser_Push
+vlc_preparser_CheckThumbnailerFormat
+vlc_preparser_GetBestThumbnailerFormat
+vlc_preparser_GenerateThumbnail
+vlc_preparser_GenerateThumbnailToFiles
 vlc_preparser_Cancel
 vlc_preparser_Delete
-vlc_preparser_Deactivate
 vlc_preparser_SetTimeout

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/linux/dirs.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/linux/dirs.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/media_source/media_source.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/media_source/media_source.c Changed

@@ -29,7 +29,7 @@
 #include <vlc_playlist.h>
 #include <vlc_services_discovery.h>
 #include <vlc_vector.h>
-#include "libvlc.h"
+#include "../libvlc.h"
 
 #ifdef TEST_MEDIA_SOURCE
 #define vlc_module_name "test"
@@ -40,7 +40,7 @@
     vlc_media_source_t public_data;
 
     services_discovery_t *sd;
-    vlc_atomic_rc_t rc;
+    size_t rc;
     vlc_media_source_provider_t *owner;
     struct vlc_list node;
     char name;
@@ -111,7 +111,7 @@
     if (unlikely(!priv))
         return NULL;
 
-    vlc_atomic_rc_init(&priv->rc);
+    priv->rc = 1;
 
     vlc_media_source_t *ms = &priv->public_data;
 
@@ -147,20 +147,12 @@
     return ms;
 }
 
-static void
-vlc_media_source_provider_Remove(vlc_media_source_provider_t *provider,
-                                 vlc_media_source_t *ms)
-{
-    vlc_mutex_lock(&provider->lock);
-    vlc_list_remove(&ms_priv(ms)->node);
-    vlc_mutex_unlock(&provider->lock);
-}
 
 static void
 vlc_media_source_Delete(vlc_media_source_t *ms)
 {
     media_source_private_t *priv = ms_priv(ms);
-    vlc_media_source_provider_Remove(priv->owner, ms);
+
     vlc_sd_Destroy(priv->sd);
     vlc_media_tree_Release(ms->tree);
     free(priv);
@@ -170,15 +162,31 @@
 vlc_media_source_Hold(vlc_media_source_t *ms)
 {
     media_source_private_t *priv = ms_priv(ms);
-    vlc_atomic_rc_inc(&priv->rc);
+    vlc_media_source_provider_t *provider = priv->owner;
+    vlc_mutex_lock(&provider->lock);
+    vlc_assert(priv->rc != 0);
+    priv->rc++;
+    vlc_mutex_unlock(&provider->lock);
 }
 
 void
 vlc_media_source_Release(vlc_media_source_t *ms)
 {
     media_source_private_t *priv = ms_priv(ms);
-    if (vlc_atomic_rc_dec(&priv->rc))
-        vlc_media_source_Delete(ms);
+    vlc_media_source_provider_t *provider = priv->owner;
+
+    vlc_mutex_lock(&provider->lock);
+    vlc_assert(priv->rc != 0);
+    priv->rc--;
+    if (priv->rc != 0)
+    {
+        vlc_mutex_unlock(&provider->lock);
+        return;
+    }
+    vlc_list_remove(&priv->node);
+    vlc_mutex_unlock(&provider->lock);
+
+    vlc_media_source_Delete(ms);
 }
 
 static vlc_media_source_t *
@@ -262,7 +270,11 @@
     vlc_mutex_lock(&provider->lock);
     vlc_media_source_t *ms = vlc_media_source_provider_Find(provider, name);
     if (ms)
-        vlc_media_source_Hold(ms);
+    {
+        media_source_private_t *priv = ms_priv(ms);
+        vlc_assert(priv->rc != 0);
+        priv->rc++;
+    }
     else
         ms = vlc_media_source_provider_Add(provider, name);
     vlc_mutex_unlock(&provider->lock);

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/media_source/media_tree.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/media_source/media_tree.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/meson.build Changed

@@ -168,6 +168,7 @@
     'input/input_interface.h',
     'input/vlm_internal.h',
     'input/vlm_event.h',
+    'input/replay_gain.c',
     'input/resource.h',
     'input/resource.c',
     'input/services_discovery.c',
@@ -178,7 +179,6 @@
     'input/stream_filter.c',
     'input/stream_memory.c',
     'input/subtitles.c',
-    'input/thumbnailer.c',
     'input/var.c',
     'audio_output/aout_internal.h',
     'audio_output/common.c',
@@ -232,6 +232,7 @@
     'text/iso-639_def.h',
     'misc/actions.c',
     'misc/ancillary.c',
+    'misc/chroma_probe.c',
     'misc/executor.c',
     'misc/md5.c',
     'misc/probe.c',
@@ -319,6 +320,11 @@
         'posix/thread.c',
         'posix/wait.c',
     
+    if have_osx
+        libvlccore_sources += 
+            'posix/spawn.c',
+        
+    endif
     libvlccore_link_args += '-Wl,-U,_vlc_static_modules'
 elif host_system == 'windows'
     libvlccore_sources += 
@@ -343,31 +349,91 @@
             'win32/spawn.c',
         
     endif
-elif host_system == 'linux'
+else
     libvlccore_sources += 
-        'posix/dirs.c',
-        'posix/error.c',
-        'posix/netconf.c',
-        'posix/spawn.c',
-        'posix/picture.c',
-        'posix/specific.c',
-        'posix/thread.c',
         'posix/filesystem.c',
         'posix/plugin.c',
         'posix/rand.c',
         'posix/timer.c',
-        'posix/sort.c',
-        'linux/cpu.c',
-        'linux/dirs.c',
-        'linux/filesystem.c',
-        'linux/thread.c',
     
 
-    if anl_lib.found()
-        libvlccore_sources += 'linux/getaddrinfo.c'
-    else
-        libvlccore_sources += 'posix/getaddrinfo.c'
+    if host_system != 'android'
+        libvlccore_sources += 
+            'posix/dirs.c',
+            'posix/error.c',
+            'posix/netconf.c',
+            'posix/spawn.c',
+            'posix/picture.c',
+            'posix/specific.c',
+            'posix/thread.c',
+        
+    endif
+
+    if cdata.get('HAVE_QSORT_R', 0) == 1
+        libvlccore_sources += 'posix/sort.c'
+    endif
+
+    if host_system not in 'android', 'linux', 'freebsd'
+        libvlccore_sources += 'posix/wait.c'
+    endif
+
+    if host_system == 'android'
+        libvlccore_sources += 
+            'android/error.c',
+            'android/specific.c',
+            'android/thread.c',
+
+            'linux/cpu.c',
+            'linux/dirs.c',
+            'linux/thread.c',
+        
+    endif
+
+    if host_system == 'linux'
+        libvlccore_sources += 
+            'linux/cpu.c',
+            'linux/dirs.c',
+            'linux/filesystem.c',
+            'linux/thread.c',
+        
     endif
+
+    if host_system == 'freebsd'
+        libvlccore_sources += 
+            'freebsd/cpu.c',
+            'freebsd/thread.c',
+        
+    endif
+
+    if host_system == 'netbsd'
+        libvlccore_sources += 
+            'netbsd/thread.c',
+        
+    endif
+
+    if host_system == 'openbsd'
+        libvlccore_sources += 
+            'openbsd/cpu.c',
+            'openbsd/thread.c',
+        
+    endif
+
+    if host_system != 'android'
+        if anl_lib.found()
+            libvlccore_sources += 'linux/getaddrinfo.c'
+        else
+            libvlccore_sources += 'posix/getaddrinfo.c'
+        endif
+    endif
+endif
+
+if get_option('update-check').allowed()
+    if not gcrypt_dep.found()
+        error('libgcrypt is required for update checking system')
+    endif
+    libvlccore_sources +=  'misc/update.c', 'misc/update_crypto.c' 
+    vlccore_cargs += '-DUPDATE_CHECK'
+    libvlccore_deps += gcrypt_dep
 endif
 
 libvlccore = library(
@@ -383,3 +449,41 @@
 )
 
 libvlccore_dep = declare_dependency(link_with: libvlccore, sources: vlc_about)
+
+vlc_tests += {
+    'name' : 'input_es_out',
+    'sources' : files(
+        'input/test/es_out.c',
+        'input/es_out.c',
+        'input/es_out.h',
+        'input/source.c',
+        'input/source.h',
+        'input/item.c',
+        'input/item.h',
+        'clock/clock.c',
+        'clock/clock.h',
+        'text/strings.c',
+        'clock/clock_internal.c',
+        'clock/clock_internal.h',
+        'clock/input_clock.c',
+        'clock/input_clock.h',
+  ),
+  'suite' : 'src',
+  'link_with' : libvlccore,
+  'include_directories' : include_directories('.'),
+}
+
+vlc_tests += {
+    'name' : 'input_clock',
+    'sources' : files('clock/test/input_clock.c',
+        'clock/input_clock.c',
+        'clock/input_clock.h',
+        'clock/clock_internal.c',
+        'clock/clock_internal.h',
+        'clock/clock.c',
+        'clock/clock.h',
+    ),
+    'suite' : 'src',
+    'link_with' : libvlccore,
+}
+

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/actions.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/actions.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/addons.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/addons.c Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/chroma_probe.c Added

@@ -0,0 +1,475 @@
+/*****************************************************************************
+ * chroma_probe.c: chroma conversion probing
+ *****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_chroma_probe.h>
+#include <vlc_fourcc.h>
+#include <vlc_threads.h>
+#include <vlc_modules.h>
+#include <vlc_sort.h>
+#include <vlc_memstream.h>
+
+static int
+modules_Probe(vlc_chroma_conv_vec *chroma_table)
+{
+    module_t **mods;
+    ssize_t total = vlc_module_match("chroma probe", NULL, false, &mods, NULL);
+    if (total == -1)
+        return -ENOENT;
+
+    for (ssize_t i = 0; i < total; ++i)
+    {
+        vlc_chroma_conv_probe fn = vlc_module_map(NULL, modsi);
+        if (fn == NULL)
+            continue;
+        fn(chroma_table);
+    }
+    free(mods);
+    return 0;
+}
+
+/* Breadth First Search (BFS) node */
+struct bfs_node
+{
+    vlc_fourcc_t chainVLC_CHROMA_CONV_CHAIN_COUNT_MAX;
+    unsigned depth; /* Max deep is VLC_CHROMA_CONV_CHAIN_COUNT_MAX -1 */
+    float cost_factor;
+};
+typedef struct VLC_VECTOR(struct bfs_node) bfs_queue_vec;
+
+static int
+bfs_Run(vlc_fourcc_t chroma_from, vlc_fourcc_t chroma_to, unsigned max_depth,
+        const vlc_chroma_conv_vec *chroma_table, int flags,
+        bfs_queue_vec *queue)
+{
+    struct bfs_node start = {
+        .chain0 = chroma_from,
+        .cost_factor = 1,
+        .depth = 0,
+    };
+    bool success = vlc_vector_push(queue, start);
+    if (!success)
+        return -ENOMEM;
+
+    for (size_t queue_idx = 0; queue_idx < queue->size; queue_idx++)
+    {
+        const struct bfs_node current = queue->dataqueue_idx;
+        vlc_fourcc_t current_chroma = current.chaincurrent.depth;
+
+        if (chroma_to != 0 && current_chroma == chroma_to)
+            continue; /* Found a path to 'chroma_to' */
+
+        if (current.depth == max_depth)
+            continue;
+
+        /* Enqueue neighbors */
+        for (size_t chroma_idx = 0; chroma_idx < chroma_table->size; chroma_idx++)
+        {
+            struct vlc_chroma_conv_entry *entry = &chroma_table->datachroma_idx;
+            vlc_fourcc_t from = entry->in;
+            vlc_fourcc_t to = entry->out;
+            float cost_factor = entry->cost_factor;
+
+            if (from == current_chroma)
+            {
+                vlc_fourcc_t next_chroma = to;
+
+                /* Apply filters from flags */
+                if (flags & VLC_CHROMA_CONV_FLAG_ONLY_YUV)
+                {
+                    if (!vlc_fourcc_IsYUV(next_chroma))
+                        continue;
+                }
+                else if (flags & VLC_CHROMA_CONV_FLAG_ONLY_RGB)
+                {
+                    const vlc_chroma_description_t *desc =
+                        vlc_fourcc_GetChromaDescription(next_chroma);
+                    if (desc == NULL || desc->subtype != VLC_CHROMA_SUBTYPE_RGB)
+                        continue;
+                }
+
+                /* If next_chroma is already in the chain at any previous step,
+                 * we've encountered a cycle or a duplicate. */
+                bool already_visited = false;
+                for (size_t i = 0; i < current.depth; ++i)
+                    if (current.chaini == next_chroma)
+                    {
+                        already_visited = true;
+                        break;
+                    }
+                if (already_visited)
+                    continue;
+
+                struct bfs_node next = current;
+                next.depth = current.depth + 1;
+                next.cost_factor = current.cost_factor * cost_factor;
+
+                next.chainnext.depth = next_chroma;
+                success = vlc_vector_push(queue, next);
+                if (!success)
+                    return -ENOMEM;
+            }
+        }
+    }
+    return 0;
+}
+
+static uint64_t
+GetChromaBits(const vlc_chroma_description_t *desc,
+              unsigned width, unsigned height)
+{
+    if (desc->plane_count == 0)
+    {
+        /* Fallback to the size of the subtype */
+        switch (desc->subtype)
+        {
+            case VLC_CHROMA_SUBTYPE_OTHER:
+                return 0;
+            case VLC_CHROMA_SUBTYPE_YUV444:
+                return width * height * 3 * desc->color_bits;
+            case VLC_CHROMA_SUBTYPE_YUV440:
+            case VLC_CHROMA_SUBTYPE_YUV422:
+                return width * height * 2 * desc->color_bits;
+            case VLC_CHROMA_SUBTYPE_YUV420:
+            case VLC_CHROMA_SUBTYPE_YUV411:
+                return width * height * 1.5 * desc->color_bits;
+            case VLC_CHROMA_SUBTYPE_YUV410:
+                return width * height * 1.125 * desc->color_bits;
+            case VLC_CHROMA_SUBTYPE_YUV211:
+            case VLC_CHROMA_SUBTYPE_GREY:
+                return width * height * desc->color_bits;
+            case VLC_CHROMA_SUBTYPE_RGB:
+                return width * height * 4 * desc->color_bits;
+            default:
+                vlc_assert_unreachable();
+        }
+    }
+
+    uint64_t total_bits = 0;
+    for (unsigned i = 0; i < desc->plane_count; i++)
+    {
+        const vlc_rational_t rw = desc->pi.w;
+        const vlc_rational_t rh = desc->pi.h;
+
+        unsigned plane_width = width * rw.num / rw.den;
+        unsigned plane_height = height * rh.num / rh.den;
+
+        uint64_t plane_pixels = plane_width * plane_height;
+        uint64_t plane_bits = plane_pixels * desc->pixel_bits;
+
+        total_bits += plane_bits;
+    }
+
+    return total_bits;
+}
+
+static float
+GetColorRatio(enum vlc_chroma_subtype subtype)
+{
+    switch (subtype)
+    {
+        case VLC_CHROMA_SUBTYPE_YUV444:
+        case VLC_CHROMA_SUBTYPE_RGB:
+            return 1.f;
+        case VLC_CHROMA_SUBTYPE_YUV422:
+            return 0.67;
+        case VLC_CHROMA_SUBTYPE_YUV440:
+            return 0.5; /* should be like YUV422, but it is less common */
+        case VLC_CHROMA_SUBTYPE_YUV420:
+            return 0.5;
+        case VLC_CHROMA_SUBTYPE_YUV411:
+            return 0.33;
+        case VLC_CHROMA_SUBTYPE_YUV410:
+            return 0.25;
+        case VLC_CHROMA_SUBTYPE_YUV211:
+        case VLC_CHROMA_SUBTYPE_OTHER:
+            return 0.2;
+        case VLC_CHROMA_SUBTYPE_GREY:
+            return 0.1;
+        default:
+            vlc_assert_unreachable();
+    }
+}
+
+static float
+CompareDescs(const vlc_chroma_description_t *in_desc,
+             const vlc_chroma_description_t *out_desc)
+{
+    /* Compare color bits */
+    float bits_ratio;
+    if (in_desc->color_bits == 0 || out_desc->color_bits == 0)
+        bits_ratio = 1.f;
+    else
+    {
+        bits_ratio = out_desc->color_bits / in_desc->color_bits;
+        if (bits_ratio > 1.f)
+            bits_ratio = 1.f;
+    }
+
+    /* Compare color ratios, favor same or near subtype */
+    if (in_desc->subtype == out_desc->subtype)
+        return bits_ratio;
+
+    float color_ratio = GetColorRatio(out_desc->subtype)
+                      / GetColorRatio(in_desc->subtype);
+    if (color_ratio > 1.f)
+        color_ratio = 1.f;
+
+    /* Malus for CPU YUV <-> Other. Favor staying in the same color model. */
+    bool in_is_yuv = vlc_chroma_description_IsYUV(in_desc);
+    bool out_is_yuv = vlc_chroma_description_IsYUV(out_desc);
+    if ((in_desc->plane_count != 0 && out_desc->plane_count != 0)
+     && (in_is_yuv || out_is_yuv) && (in_is_yuv != out_is_yuv))
+        color_ratio *= 0.9;
+
+    return color_ratio * bits_ratio;
+}
+
+static void
+vlc_chroma_conv_result_FromNode(struct vlc_chroma_conv_result *res,
+                                const struct bfs_node *node,
+                                unsigned width, unsigned height)
+{
+    res->chain_count = node->depth + 1;
+    res->cost = 0;
+
+    uint64_t total_cost = 0;
+    float total_quality = 1.f;
+    for (size_t i = 0; i < res->chain_count; ++i)
+    {
+        res->chaini = node->chaini;
+
+        if (i > 0)
+        {
+            const vlc_chroma_description_t *from_desc =
+                vlc_fourcc_GetChromaDescription(res->chaini - 1);
+            const vlc_chroma_description_t *to_desc =
+                vlc_fourcc_GetChromaDescription(res->chaini);
+
+            if (from_desc == NULL || to_desc == NULL)
+            {
+                /* Unlikely, fallback for a big cost */
+                total_cost += width * height * 4 * 8 * node->cost_factor;
+                continue;
+            }
+
+            uint64_t from_bits = GetChromaBits(from_desc, width, height);
+            uint64_t to_bits = GetChromaBits(to_desc, width, height);
+
+            /* Unlikely case */
+            if (from_bits == 0) /* OTHER -> ANY */
+                from_bits = to_bits;
+            else if (to_bits == 0) /* ANY -> OTHER */
+                to_bits = from_bits;
+
+            total_cost += (from_bits + to_bits) * node->cost_factor;
+
+            float quality = CompareDescs(from_desc, to_desc);
+            assert(quality > 0.f && quality <= 1.f);
+
+            total_quality *= quality;
+        }
+    }
+    res->cost = total_cost / width / height;
+    res->quality = 100 * total_quality;
+}
+
+static int
+SortResults(const void *a, const void *b, void *arg)
+{
+    const struct vlc_chroma_conv_result *ra = a;
+    const struct vlc_chroma_conv_result *rb = b;
+    bool *sort_by_quality = arg;
+
+    int cost_score = 0, quality_score = 0;
+
+    /* Lower cost is better */
+    if (ra->cost < rb->cost)
+        cost_score = -1;
+    else if (ra->cost > rb->cost)
+        cost_score = 1;
+
+    /* Higher Quality is better */
+    if (ra->quality > rb->quality)
+        quality_score = -1;
+    else if (ra->quality < rb->quality)
+        quality_score = 1;
+
+    /* Fallback to secondary score in same score */
+    if (*sort_by_quality)
+        return quality_score != 0 ? quality_score : cost_score;
+    else
+        return cost_score != 0 ? cost_score : quality_score;
+}
+
+static bool
+bfs_node_IsResult(const struct bfs_node *node, vlc_fourcc_t to)
+{
+    vlc_fourcc_t current_chroma = node->chainnode->depth;
+    return to == 0 || current_chroma == to;
+}
+
+static bool
+vlc_chroma_conv_result_Equals(struct vlc_chroma_conv_result *a,
+                              struct vlc_chroma_conv_result *b)
+{
+    if (a->chain_count != b->chain_count)
+        return false;
+    if (a->quality != b->quality)
+        return false;
+    /* Don't check cost since we want to merge results with different costs */
+    for (size_t i = 0; i < a->chain_count; ++i)
+        if (a->chaini != b->chaini)
+            return false;
+    return true;
+}
+
+struct vlc_chroma_conv_result *
+vlc_chroma_conv_Probe(vlc_fourcc_t from, vlc_fourcc_t to,
+                      unsigned width, unsigned height,
+                      unsigned max_indirect_steps, int flags, size_t *count)
+{
+    assert(from != 0);
+    assert(max_indirect_steps <= VLC_CHROMA_CONV_MAX_INDIRECT_STEPS);
+    vlc_chroma_conv_vec chroma_table;
+    vlc_vector_init(&chroma_table);
+
+    if (width == 0 || height == 0)
+    {
+        width = 3840;
+        height = 2160;
+    }
+
+    if (max_indirect_steps > 0)
+    {
+        /* Allow indirect steps only when converting from/to a GPU chroma */
+        bool from_cpu = vlc_fourcc_GetChromaBPP(from) != 0;
+        bool to_cpu = to == 0 ? true : vlc_fourcc_GetChromaBPP(to) != 0;
+        if (from_cpu && to_cpu)
+            max_indirect_steps--;
+    }
+
+    /* Probe modules */
+    int ret = modules_Probe(&chroma_table);
+    if (ret != 0 || chroma_table.size == 0)
+    {
+        vlc_vector_destroy(&chroma_table);
+        return NULL;
+    }
+
+    /* Run tree search */
+    bfs_queue_vec bfs_queue;
+    vlc_vector_init(&bfs_queue);
+    ret = bfs_Run(from, to, max_indirect_steps + 1 , &chroma_table, flags,
+                  &bfs_queue);
+
+    vlc_vector_destroy(&chroma_table);
+
+    size_t result_count = 0;
+    for (size_t i = 1 /* skip start node */; i < bfs_queue.size; ++i)
+        if (bfs_node_IsResult(&bfs_queue.datai, to))
+            result_count++;
+
+    if (unlikely(ret != 0) || result_count == 0)
+    {
+        vlc_vector_destroy(&bfs_queue);
+        return NULL;
+    }
+
+    /* Allocate the result array */
+    struct VLC_VECTOR(struct vlc_chroma_conv_result) result_vec =
+        VLC_VECTOR_INITIALIZER;
+    bool success = vlc_vector_push_hole(&result_vec, result_count);
+    if (!success)
+    {
+        vlc_vector_destroy(&bfs_queue);
+        return NULL;
+    }
+
+    /* Fill the result from the tree search */
+    size_t res_idx = 0;
+    for (size_t i = 1 /* skip start node */; i < bfs_queue.size; ++i)
+    {
+        const struct bfs_node *node = &bfs_queue.datai;
+        if (!bfs_node_IsResult(node, to))
+            continue;
+
+        assert(res_idx < result_count);
+        struct vlc_chroma_conv_result *res = &result_vec.datares_idx++;
+        vlc_chroma_conv_result_FromNode(res, node, width, height);
+    }
+    assert(res_idx == result_count);
+
+    vlc_vector_destroy(&bfs_queue);
+
+    /* Sort */
+    bool sort_by_quality = (flags & VLC_CHROMA_CONV_FLAG_SORT_COST) == 0;
+    vlc_qsort(result_vec.data, result_count,
+              sizeof(struct vlc_chroma_conv_result), SortResults,
+              &sort_by_quality);
+
+    /* Remove duplicate entries, it can happen when more the 2 modules probe
+     * the same conversion. They are not necessarily one after the other as
+     * they might have different quality. */
+    for (size_t i = 0; i < result_vec.size - 1; ++ i)
+    {
+        struct vlc_chroma_conv_result *cur = &result_vec.datai;
+
+        size_t j = i + 1;
+        while (j < result_vec.size)
+        {
+            struct vlc_chroma_conv_result *next = &result_vec.dataj;
+            if (vlc_chroma_conv_result_Equals(cur, next))
+            {
+                /* Keep the lowest cost */
+                if (next->cost < cur->cost)
+                    cur->cost = next->cost;
+                vlc_vector_remove(&result_vec, j);
+            }
+            else
+                j++;
+        }
+    }
+
+    *count = result_vec.size;
+    return result_vec.data;
+}
+
+char *
+vlc_chroma_conv_result_ToString(const struct vlc_chroma_conv_result *res)
+{
+    struct vlc_memstream ms;
+    int ret = vlc_memstream_open(&ms);
+    if (ret != 0)
+        return NULL;
+    vlc_memstream_printf(&ms, "c=%u|q=%u ", res->cost, res->quality);
+
+    for (size_t i = 0; i < res->chain_count; ++i)
+    {
+        vlc_memstream_printf(&ms, "%4.4s", (const char *) &res->chaini);
+        if (i != res->chain_count - 1)
+            vlc_memstream_puts(&ms, " -> ");
+    }
+    ret = vlc_memstream_close(&ms);
+    return ret == 0 ? ms.ptr : NULL;
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/cpu.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/cpu.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/executor.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/executor.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/exit.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/exit.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/fifo.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/fifo.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/filter.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/filter.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/filter_chain.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/filter_chain.c Changed

@@ -30,7 +30,7 @@
 #include <vlc_modules.h>
 #include <vlc_mouse.h>
 #include <vlc_spu.h>
-#include <libvlc.h>
+#include "../libvlc.h"
 #include <assert.h>
 
 module_t *vlc_filter_LoadModule(filter_t *p_filter, const char *capability,
@@ -351,6 +351,7 @@
     msg_Dbg( chain->obj, "Filter '%s' (%p) appended to chain (%p)",
              (name != NULL) ? name : module_GetShortName(filter->p_module),
              (void *)filter, (void *)chain );
+    free(name_chained);
     return filter;
 
 error:
@@ -358,6 +359,7 @@
         msg_Err( chain->obj, "Failed to create %s '%s'", capability, name );
     else
         msg_Err( chain->obj, "Failed to create %s", capability );
+    free(name_chained);
     vlc_objres_clear(&filter->obj);
     es_format_Clean( &filter->fmt_out );
     es_format_Clean( &filter->fmt_in );
@@ -465,6 +467,19 @@
     return vlc_list_is_empty( &chain->filter_list );
 }
 
+bool filter_chain_HasMouseFilter( const filter_chain_t *chain )
+{
+    const chained_filter_t *f;
+    vlc_list_foreach_const( f, &chain->filter_list, node )
+    {
+        const filter_t *p_filter = &f->filter;
+
+        if( p_filter->ops->video_mouse )
+            return true;
+    }
+    return false;
+}
+
 const es_format_t *filter_chain_GetFmtOut( const filter_chain_t *p_chain )
 {
     chained_filter_t *last =

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/fingerprinter.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/fingerprinter.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/fourcc.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/fourcc.c Changed

@@ -31,6 +31,7 @@
 #include <vlc_common.h>
 #include <vlc_fourcc.h>
 #include <vlc_es.h>
+#include <vlc_chroma_probe.h>
 #include <assert.h>
 
 #include "fourcc_tables.h"
@@ -206,638 +207,236 @@
     return LookupCat(fourcc, &ret, cat) ? ret : "";
 }
 
-
-/* */
-#define VLC_CODEC_YUV_PLANAR_420 \
-    VLC_CODEC_I420, VLC_CODEC_YV12
-
-#define VLC_CODEC_YUV_SEMIPLANAR_420 \
-    VLC_CODEC_NV12, VLC_CODEC_NV21
-
-#define VLC_CODEC_YUV_PLANAR_420_16 \
-    VLC_CODEC_I420_16L, VLC_CODEC_I420_16B, VLC_CODEC_I420_12L, VLC_CODEC_I420_12B, VLC_CODEC_I420_10L, VLC_CODEC_I420_10B, VLC_CODEC_I420_9L, VLC_CODEC_I420_9B
-
-#define VLC_CODEC_YUV_SEMIPLANAR_420_16 \
-    VLC_CODEC_P010, VLC_CODEC_P016
-
-#define VLC_CODEC_YUV_SEMIPLANAR_422 \
-    VLC_CODEC_NV16, VLC_CODEC_NV61
-
-#define VLC_CODEC_YUV_PLANAR_422_16 \
-    VLC_CODEC_I422_12L, VLC_CODEC_I422_12B, VLC_CODEC_I422_10L, VLC_CODEC_I422_10B, VLC_CODEC_I422_9L, VLC_CODEC_I422_9B
-
-#define VLC_CODEC_YUV_PLANAR_444_ALPHA \
-    VLC_CODEC_YUVA, VLC_CODEC_YUVA_444_10L, VLC_CODEC_YUVA_444_10B, VLC_CODEC_YUVA_444_12L, VLC_CODEC_YUVA_444_12B
-
-#define VLC_CODEC_YUV_SEMIPLANAR_444 \
-    VLC_CODEC_NV24, VLC_CODEC_NV42
-
-#define VLC_CODEC_YUV_PLANAR_444_16 \
-    VLC_CODEC_I444_10L, VLC_CODEC_I444_10B, VLC_CODEC_I444_9L, VLC_CODEC_I444_9B, \
-    VLC_CODEC_I444_16L, VLC_CODEC_I444_16B, VLC_CODEC_I444_12L, VLC_CODEC_I444_12B
-
-#define VLC_CODEC_YUV_PACKED \
-    VLC_CODEC_YUYV, VLC_CODEC_YVYU, \
-    VLC_CODEC_UYVY, VLC_CODEC_VYUY, \
-    VLC_CODEC_VUYA, VLC_CODEC_Y210, \
-    VLC_CODEC_Y410
-
-#define VLC_CODEC_FALLBACK_420 \
-    VLC_CODEC_I422, VLC_CODEC_YUV_PACKED, \
-    VLC_CODEC_I444, VLC_CODEC_I440, \
-    VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211
-
-static const vlc_fourcc_t p_I420_fallback = {
-    VLC_CODEC_I420, VLC_CODEC_YV12, VLC_CODEC_FALLBACK_420, 0
-};
-static const vlc_fourcc_t p_YV12_fallback = {
-    VLC_CODEC_YV12, VLC_CODEC_I420, VLC_CODEC_FALLBACK_420, 0
-};
-static const vlc_fourcc_t p_NV12_fallback = {
-    VLC_CODEC_NV12, VLC_CODEC_I420, VLC_CODEC_FALLBACK_420, 0
-};
-
-#define VLC_CODEC_FALLBACK_420_16 \
-    VLC_CODEC_I420, VLC_CODEC_YV12, VLC_CODEC_FALLBACK_420
-
-static const vlc_fourcc_t p_I420_9L_fallback = {
-    VLC_CODEC_I420_9L, VLC_CODEC_I420_9B, VLC_CODEC_FALLBACK_420_16, 0
-};
-static const vlc_fourcc_t p_I420_9B_fallback = {
-    VLC_CODEC_I420_9B, VLC_CODEC_I420_9L, VLC_CODEC_FALLBACK_420_16, 0
-};
-static const vlc_fourcc_t p_I420_10L_fallback = {
-    VLC_CODEC_I420_10L, VLC_CODEC_I420_10B, VLC_CODEC_FALLBACK_420_16, 0
-};
-static const vlc_fourcc_t p_I420_10B_fallback = {
-    VLC_CODEC_I420_10B, VLC_CODEC_I420_10L, VLC_CODEC_FALLBACK_420_16, 0
-};
-static const vlc_fourcc_t p_I420_12L_fallback = {
-    VLC_CODEC_I420_12L, VLC_CODEC_I420_12B, VLC_CODEC_FALLBACK_420_16, 0
-};
-static const vlc_fourcc_t p_I420_12B_fallback = {
-    VLC_CODEC_I420_12B, VLC_CODEC_I420_12L, VLC_CODEC_FALLBACK_420_16, 0
-};
-static const vlc_fourcc_t p_I420_16L_fallback = {
-    VLC_CODEC_I420_16L, VLC_CODEC_I420_16B, VLC_CODEC_FALLBACK_420_16, 0
-};
-static const vlc_fourcc_t p_I420_16B_fallback = {
-    VLC_CODEC_I420_16B, VLC_CODEC_I420_16L, VLC_CODEC_FALLBACK_420_16, 0
-};
-static const vlc_fourcc_t p_P010_fallback = {
-    VLC_CODEC_P010, VLC_CODEC_FALLBACK_420_16, 0
-};
-
-
-#define VLC_CODEC_FALLBACK_422 \
-    VLC_CODEC_YUV_PACKED, VLC_CODEC_YUV_PLANAR_420, \
-    VLC_CODEC_I444, VLC_CODEC_I440, \
-    VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211
-
-static const vlc_fourcc_t p_I422_fallback = {
-    VLC_CODEC_I422, VLC_CODEC_FALLBACK_422, 0
-};
-
-#define VLC_CODEC_FALLBACK_422_16 \
-    VLC_CODEC_I422, VLC_CODEC_FALLBACK_422
-
-static const vlc_fourcc_t p_I422_9L_fallback = {
-    VLC_CODEC_I422_9L, VLC_CODEC_I422_9B, VLC_CODEC_FALLBACK_422_16, 0
-};
-static const vlc_fourcc_t p_I422_9B_fallback = {
-    VLC_CODEC_I422_9B, VLC_CODEC_I422_9L, VLC_CODEC_FALLBACK_422_16, 0
-};
-static const vlc_fourcc_t p_I422_10L_fallback = {
-    VLC_CODEC_I422_10L, VLC_CODEC_I422_10B, VLC_CODEC_FALLBACK_422_16, 0
-};
-static const vlc_fourcc_t p_I422_10B_fallback = {
-    VLC_CODEC_I422_10B, VLC_CODEC_I422_10L, VLC_CODEC_FALLBACK_422_16, 0
-};
-static const vlc_fourcc_t p_I422_12L_fallback = {
-    VLC_CODEC_I422_12L, VLC_CODEC_I422_12B, VLC_CODEC_FALLBACK_422_16, 0
-};
-static const vlc_fourcc_t p_I422_12B_fallback = {
-    VLC_CODEC_I422_12B, VLC_CODEC_I422_12L, VLC_CODEC_FALLBACK_422_16, 0
-};
-
-#define VLC_CODEC_FALLBACK_444 \
-    VLC_CODEC_I422, VLC_CODEC_YUV_PACKED, \
-    VLC_CODEC_YUV_PLANAR_420, VLC_CODEC_I440, \
-    VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211
-
-static const vlc_fourcc_t p_I444_fallback = {
-    VLC_CODEC_I444, VLC_CODEC_FALLBACK_444, 0
-};
-
-#define VLC_CODEC_FALLBACK_444_16 \
-    VLC_CODEC_I444, VLC_CODEC_FALLBACK_444
-
-static const vlc_fourcc_t p_I444_9L_fallback = {
-    VLC_CODEC_I444_9L, VLC_CODEC_I444_9B, VLC_CODEC_FALLBACK_444_16, 0
-};
-static const vlc_fourcc_t p_I444_9B_fallback = {
-    VLC_CODEC_I444_9B, VLC_CODEC_I444_9L, VLC_CODEC_FALLBACK_444_16, 0
-};
-static const vlc_fourcc_t p_I444_10L_fallback = {
-    VLC_CODEC_I444_10L, VLC_CODEC_I444_10B, VLC_CODEC_FALLBACK_444_16, 0
-};
-static const vlc_fourcc_t p_I444_10B_fallback = {
-    VLC_CODEC_I444_10B, VLC_CODEC_I444_10L, VLC_CODEC_FALLBACK_444_16, 0
-};
-static const vlc_fourcc_t p_I444_12L_fallback = {
-    VLC_CODEC_I444_12L, VLC_CODEC_I444_12B, VLC_CODEC_FALLBACK_444_16, 0
-};
-static const vlc_fourcc_t p_I444_12B_fallback = {
-    VLC_CODEC_I444_12B, VLC_CODEC_I444_12L, VLC_CODEC_FALLBACK_444_16, 0
-};
-static const vlc_fourcc_t p_I444_16L_fallback = {
-    VLC_CODEC_I444_16L, VLC_CODEC_I444_16B, VLC_CODEC_FALLBACK_444_16, 0
-};
-static const vlc_fourcc_t p_I444_16B_fallback = {
-    VLC_CODEC_I444_16B, VLC_CODEC_I444_16L, VLC_CODEC_FALLBACK_444_16, 0
-};
-
-
-/* Fallbacks for cvpx */
-static const vlc_fourcc_t p_CVPX_VIDEO_NV12_fallback = {
-    VLC_CODEC_CVPX_NV12, VLC_CODEC_NV12, VLC_CODEC_I420, 0,
-};
-static const vlc_fourcc_t p_CVPX_VIDEO_UYVY_fallback = {
-    VLC_CODEC_CVPX_UYVY, VLC_CODEC_UYVY, 0,
-};
-static const vlc_fourcc_t p_CVPX_VIDEO_I420_fallback = {
-    VLC_CODEC_CVPX_I420, VLC_CODEC_I420, 0,
-};
-static const vlc_fourcc_t p_CVPX_VIDEO_BGRA_fallback = {
-    VLC_CODEC_CVPX_BGRA, VLC_CODEC_BGRA, 0,
-};
-static const vlc_fourcc_t p_CVPX_VIDEO_P010_fallback = {
-    VLC_CODEC_CVPX_P010, VLC_CODEC_P010, VLC_CODEC_I420_10L, 0
-};
-
-static const vlc_fourcc_t p_VAAPI_420_fallback = {
-    VLC_CODEC_VAAPI_420, VLC_CODEC_I420, 0,
-};
-
-static const vlc_fourcc_t p_VAAPI_420_10BPP_fallback = {
-    VLC_CODEC_VAAPI_420_10BPP, VLC_CODEC_P010, VLC_CODEC_I420_10L, 0,
-};
-
-static const vlc_fourcc_t p_D3D9_OPAQUE_fallback = {
-    VLC_CODEC_D3D9_OPAQUE, VLC_CODEC_I420, 0,
-};
-
-static const vlc_fourcc_t p_D3D9_OPAQUE_10B_fallback = {
-    VLC_CODEC_D3D9_OPAQUE_10B, VLC_CODEC_P010, VLC_CODEC_I420_10L, 0,
-};
-
-static const vlc_fourcc_t p_D3D11_OPAQUE_fallback = {
-    VLC_CODEC_D3D11_OPAQUE, VLC_CODEC_NV12, 0,
-};
-
-static const vlc_fourcc_t p_D3D11_OPAQUE_10B_fallback = {
-    VLC_CODEC_D3D11_OPAQUE_10B, VLC_CODEC_P010, VLC_CODEC_I420_10L, 0,
-};
-
-static const vlc_fourcc_t p_D3D11_OPAQUE_RGBA_fallback = {
-    VLC_CODEC_D3D11_OPAQUE_RGBA, VLC_CODEC_RGBA, 0,
-};
-
-static const vlc_fourcc_t p_NVDEC_OPAQUE_fallback = {
-    VLC_CODEC_NVDEC_OPAQUE, VLC_CODEC_NV12, 0,
-};
-
-static const vlc_fourcc_t p_NVDEC_OPAQUE_10B_fallback = {
-    VLC_CODEC_NVDEC_OPAQUE_10B,
-    VLC_CODEC_P010,
-    VLC_CODEC_I420_10L, 0,
-};
-
-static const vlc_fourcc_t p_NVDEC_OPAQUE_16B_fallback = {
-    VLC_CODEC_NVDEC_OPAQUE_16B,
-    VLC_CODEC_P016, VLC_CODEC_P010,
-    VLC_CODEC_I420_16L, VLC_CODEC_I420_12L, VLC_CODEC_I420_10L, 0,
-};
-
-static const vlc_fourcc_t p_I440_fallback = {
-    VLC_CODEC_I440,
-    VLC_CODEC_YUV_PLANAR_420,
-    VLC_CODEC_I422,
-    VLC_CODEC_I444,
-    VLC_CODEC_YUV_PACKED,
-    VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211, 0
-};
-
-#define VLC_CODEC_FALLBACK_PACKED \
-    VLC_CODEC_I422, VLC_CODEC_YUV_PLANAR_420, \
-    VLC_CODEC_I444, VLC_CODEC_I440, \
-    VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211
-
-static const vlc_fourcc_t p_YUYV_fallback = {
-    VLC_CODEC_YUYV,
-    VLC_CODEC_YVYU,
-    VLC_CODEC_UYVY,
-    VLC_CODEC_VYUY,
-    VLC_CODEC_FALLBACK_PACKED, 0
-};
-static const vlc_fourcc_t p_YVYU_fallback = {
-    VLC_CODEC_YVYU,
-    VLC_CODEC_YUYV,
-    VLC_CODEC_UYVY,
-    VLC_CODEC_VYUY,
-    VLC_CODEC_FALLBACK_PACKED, 0
-};
-static const vlc_fourcc_t p_UYVY_fallback = {
-    VLC_CODEC_UYVY,
-    VLC_CODEC_VYUY,
-    VLC_CODEC_YUYV,
-    VLC_CODEC_YVYU,
-    VLC_CODEC_FALLBACK_PACKED, 0
-};
-static const vlc_fourcc_t p_VYUY_fallback = {
-    VLC_CODEC_VYUY,
-    VLC_CODEC_UYVY,
-    VLC_CODEC_YUYV,
-    VLC_CODEC_YVYU,
-    VLC_CODEC_FALLBACK_PACKED, 0
-};
-
-static const vlc_fourcc_t *const pp_YUV_fallback = {
-    p_YV12_fallback,
-    p_I420_fallback,
-    p_I420_9L_fallback,
-    p_I420_9B_fallback,
-    p_I420_10L_fallback,
-    p_I420_10B_fallback,
-    p_I420_12L_fallback,
-    p_I420_12B_fallback,
-    p_I420_16L_fallback,
-    p_I420_16B_fallback,
-    p_I422_fallback,
-    p_I422_9L_fallback,
-    p_I422_9B_fallback,
-    p_I422_10L_fallback,
-    p_I422_10B_fallback,
-    p_I422_12L_fallback,
-    p_I422_12B_fallback,
-    p_I444_fallback,
-    p_I444_9L_fallback,
-    p_I444_9B_fallback,
-    p_I444_10L_fallback,
-    p_I444_10B_fallback,
-    p_I444_12L_fallback,
-    p_I444_12B_fallback,
-    p_I444_16L_fallback,
-    p_I444_16B_fallback,
-    p_I440_fallback,
-    p_YUYV_fallback,
-    p_YVYU_fallback,
-    p_UYVY_fallback,
-    p_VYUY_fallback,
-    p_NV12_fallback,
-    p_P010_fallback,
-    p_CVPX_VIDEO_NV12_fallback,
-    p_CVPX_VIDEO_UYVY_fallback,
-    p_CVPX_VIDEO_I420_fallback,
-    p_CVPX_VIDEO_P010_fallback,
-    p_VAAPI_420_fallback,
-    p_VAAPI_420_10BPP_fallback,
-    p_D3D9_OPAQUE_fallback,
-    p_D3D9_OPAQUE_10B_fallback,
-    p_D3D11_OPAQUE_fallback,
-    p_D3D11_OPAQUE_10B_fallback,
-    p_NVDEC_OPAQUE_fallback,
-    p_NVDEC_OPAQUE_10B_fallback,
-    p_NVDEC_OPAQUE_16B_fallback,
-    NULL,
-};
-
-static const vlc_fourcc_t p_list_YUV = {
-    VLC_CODEC_YUV_PLANAR_420,
-    VLC_CODEC_YUV_SEMIPLANAR_420,
-    VLC_CODEC_I422,
-    VLC_CODEC_YUV_SEMIPLANAR_422,
-    VLC_CODEC_I440,
-    VLC_CODEC_I444,
-    VLC_CODEC_YUV_PLANAR_444_ALPHA,
-    VLC_CODEC_YUV_SEMIPLANAR_444,
-    VLC_CODEC_YUV_PACKED,
-    VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211,
-    VLC_CODEC_YUV_PLANAR_420_16,
-    VLC_CODEC_YUV_SEMIPLANAR_420_16,
-    VLC_CODEC_YUV_PLANAR_422_16,
-    VLC_CODEC_YUV_PLANAR_444_16,
-    VLC_CODEC_VDPAU_VIDEO,
-    VLC_CODEC_CVPX_NV12,
-    VLC_CODEC_CVPX_UYVY,
-    VLC_CODEC_CVPX_I420,
-    VLC_CODEC_CVPX_P010,
-    VLC_CODEC_VAAPI_420,
-    VLC_CODEC_VAAPI_420_10BPP,
-    VLC_CODEC_D3D9_OPAQUE,
-    VLC_CODEC_D3D9_OPAQUE_10B,
-    VLC_CODEC_D3D11_OPAQUE,
-    VLC_CODEC_D3D11_OPAQUE_10B,
-    VLC_CODEC_D3D11_OPAQUE_ALPHA,
-    VLC_CODEC_NVDEC_OPAQUE,
-    VLC_CODEC_NVDEC_OPAQUE_10B,
-    VLC_CODEC_NVDEC_OPAQUE_16B,
-    VLC_CODEC_NVDEC_OPAQUE_444,
-    VLC_CODEC_NVDEC_OPAQUE_444_16B,
-    VLC_CODEC_YUV420A,
-    VLC_CODEC_YUV422A,
-    0,
-};
-
-/* */
-static const vlc_fourcc_t p_RGB32_fallback = {
-    VLC_CODEC_XRGB,
-    VLC_CODEC_BGRX,
-    VLC_CODEC_RGB24,
-    VLC_CODEC_BGR24,
-    VLC_CODEC_RGB565LE,
-    VLC_CODEC_RGB555LE,
-    VLC_CODEC_RGB233,
-    VLC_CODEC_BGR233,
-    VLC_CODEC_RGB332,
-    0,
-};
-static const vlc_fourcc_t p_RGB24_fallback = {
-    VLC_CODEC_RGB24,
-    VLC_CODEC_BGR24,
-    VLC_CODEC_XRGB,
-    VLC_CODEC_BGRX,
-    VLC_CODEC_RGB565LE,
-    VLC_CODEC_RGB555LE,
-    VLC_CODEC_RGB233,
-    VLC_CODEC_BGR233,
-    VLC_CODEC_RGB332,
-    0,
-};
-static const vlc_fourcc_t p_RGB16_fallback = {
-    VLC_CODEC_RGB565LE,
-    VLC_CODEC_RGB24,
-    VLC_CODEC_BGR24,
-    VLC_CODEC_XRGB,
-    VLC_CODEC_BGRX,
-    VLC_CODEC_RGB555LE,
-    VLC_CODEC_RGB233,
-    VLC_CODEC_BGR233,
-    VLC_CODEC_RGB332,
-    0,
-};
-static const vlc_fourcc_t p_RGB15_fallback = {
-    VLC_CODEC_RGB555LE,
-    VLC_CODEC_RGB565LE,
-    VLC_CODEC_RGB24,
-    VLC_CODEC_BGR24,
-    VLC_CODEC_XRGB,
-    VLC_CODEC_BGRX,
-    VLC_CODEC_RGB233,
-    VLC_CODEC_BGR233,
-    VLC_CODEC_RGB332,
-    0,
-};
-static const vlc_fourcc_t p_RGB8_fallback = {
-    VLC_CODEC_RGB233,
-    VLC_CODEC_BGR233,
-    VLC_CODEC_RGB332,
-    VLC_CODEC_RGB555LE,
-    VLC_CODEC_RGB565LE,
-    VLC_CODEC_RGB24,
-    VLC_CODEC_BGR24,
-    VLC_CODEC_XRGB,
-    VLC_CODEC_BGRX,
-    0,
-};
-static const vlc_fourcc_t *const pp_RGB_fallback = {
-    p_RGB32_fallback,
-    p_RGB24_fallback,
-    p_RGB16_fallback,
-    p_RGB15_fallback,
-    p_RGB8_fallback,
-    p_CVPX_VIDEO_BGRA_fallback,
-    p_D3D11_OPAQUE_RGBA_fallback,
-
-    NULL,
-};
-
-
-/* */
-static const vlc_fourcc_t *GetFallback( vlc_fourcc_t i_fourcc,
-                                        const vlc_fourcc_t *const *pp_fallback,
-                                        const vlc_fourcc_t p_list )
+static vlc_fourcc_t *GetFallback( vlc_fourcc_t i_fourcc, int flags )
 {
-    for( unsigned i = 0; pp_fallbacki; i++ )
+    size_t count;
+    struct vlc_chroma_conv_result *results =
+        vlc_chroma_conv_Probe(i_fourcc, 0, 0, 0, 0, flags, &count);
+    if (results == NULL)
+        return NULL;
+
+    vlc_fourcc_t *list = vlc_alloc(count + 1, sizeof(vlc_fourcc_t));
+    if (list == NULL)
     {
-        if( pp_fallbacki0 == i_fourcc )
-            return pp_fallbacki;
+        free(results);
+        return NULL;
     }
-    return p_list;
+
+    for (size_t i = 0; i < count; ++i)
+    {
+        struct vlc_chroma_conv_result *res = &resultsi;
+        assert(res->chain_count == 2);
+
+        listi = res->chain1;
+    }
+    listcount = 0;
+    free(results);
+    return list;
 }
 
-const vlc_fourcc_t *vlc_fourcc_GetYUVFallback( vlc_fourcc_t i_fourcc )
+vlc_fourcc_t *vlc_fourcc_GetYUVFallback( vlc_fourcc_t i_fourcc )
 {
-    return GetFallback( i_fourcc, pp_YUV_fallback, p_list_YUV );
+    return GetFallback( i_fourcc, VLC_CHROMA_CONV_FLAG_ONLY_YUV );
 }
-const vlc_fourcc_t *vlc_fourcc_GetRGBFallback( vlc_fourcc_t i_fourcc )
+vlc_fourcc_t *vlc_fourcc_GetRGBFallback( vlc_fourcc_t i_fourcc )
 {
-    return GetFallback( i_fourcc, pp_RGB_fallback, p_RGB32_fallback );
+    return GetFallback( i_fourcc, VLC_CHROMA_CONV_FLAG_ONLY_RGB );
 }
 
-const vlc_fourcc_t *vlc_fourcc_GetFallback( vlc_fourcc_t i_fourcc )
+vlc_fourcc_t *vlc_fourcc_GetFallback( vlc_fourcc_t i_fourcc )
 {
     return vlc_fourcc_IsYUV( i_fourcc)
             ? vlc_fourcc_GetYUVFallback( i_fourcc )
             : vlc_fourcc_GetRGBFallback( i_fourcc );
 }
 
-bool vlc_fourcc_IsYUV(vlc_fourcc_t fcc)
-{
-    for( unsigned i = 0; p_list_YUVi; i++ )
-    {
-        if( p_list_YUVi == fcc )
-            return true;
-    }
-    return false;
-}
-
-#define PLANAR(n, w_den, h_den, bits) \
+#define PLANAR(subtype_, n, w_den, h_den, bits) \
+      .subtype = VLC_CHROMA_SUBTYPE_##subtype_, \
       .plane_count = n, \
       .p = { {.w = {1,    1}, .h = {1,    1}}, \
              {.w = {1,w_den}, .h = {1,h_den}}, \
              {.w = {1,w_den}, .h = {1,h_den}}, \
              {.w = {1,    1}, .h = {1,    1}} }, \
       .pixel_size = ((bits + 7) / 8), \
-      .pixel_bits = bits
+      .pixel_bits = bits, \
+      .color_bits = bits
 
-#define PLANAR_8(n, w_den, h_den)        PLANAR(n, w_den, h_den, 8)
-#define PLANAR_16(n, w_den, h_den, bits) PLANAR(n, w_den, h_den, bits)
+#define PLANAR_8(subtype_, n, w_den, h_den) PLANAR(subtype_, n, w_den, h_den, 8)
+#define PLANAR_16(subtype_, n, w_den, h_den, bits) PLANAR(subtype_, n, w_den, h_den, bits)
 
-#define SEMIPLANAR(w_den, h_den, bits) \
+#define SEMIPLANAR(subtype_, w_den, h_den, bits) \
+      .subtype = VLC_CHROMA_SUBTYPE_##subtype_, \
       .plane_count = 2, \
       .p = { {.w = {1,    1}, .h = {1,    1}}, \
              {.w = {2,w_den}, .h = {1,h_den}} }, \
       .pixel_size = ((bits + 7) / 8), \
-      .pixel_bits = bits
+      .pixel_bits = bits, \
+      .color_bits = bits
 
-#define PACKED_FMT(size, bits) \
+#define PACKED_FMT(subtype_, size, bits, color_bits_) \
+      .subtype = VLC_CHROMA_SUBTYPE_##subtype_, \
       .plane_count = 1, \
       .p = { {.w = {1,1}, .h = {1,1}} }, \
       .pixel_size = size, \
-      .pixel_bits = bits
+      .pixel_bits = bits, \
+      .color_bits = color_bits_
 
 /* Zero planes for hardware picture handles. Cannot be manipulated directly. */
-#define FAKE_FMT() \
+#define GPU_FMT(subtype_, color_bits_) \
+      .subtype = VLC_CHROMA_SUBTYPE_##subtype_, \
       .plane_count = 0, \
       .p = { {.w = {1,1}, .h = {1,1}} }, \
       .pixel_size = 0, \
-      .pixel_bits = 0
+      .pixel_bits = 0, \
+      .color_bits = color_bits_
 
 static const vlc_chroma_description_t p_list_chroma_description = {
-    { VLC_CODEC_I411,                  PLANAR_8(3, 4, 1) },
-    { VLC_CODEC_I410,                  PLANAR_8(3, 4, 4) },
-    { VLC_CODEC_I420,                  PLANAR_8(3, 2, 2) },
-    { VLC_CODEC_YV12,                  PLANAR_8(3, 2, 2) },
-    { VLC_CODEC_NV12,                  SEMIPLANAR(2, 2, 8) },
-    { VLC_CODEC_NV21,                  SEMIPLANAR(2, 2, 8) },
-    { VLC_CODEC_I422,                  PLANAR_8(3, 2, 1) },
-    { VLC_CODEC_NV16,                  SEMIPLANAR(2, 1, 8) },
-    { VLC_CODEC_NV61,                  SEMIPLANAR(2, 1, 8) },
-    { VLC_CODEC_I440,                  PLANAR_8(3, 1, 2) },
-    { VLC_CODEC_I444,                  PLANAR_8(3, 1, 1) },
-    { VLC_CODEC_NV24,                  SEMIPLANAR(1, 1, 8) },
-    { VLC_CODEC_NV42,                  SEMIPLANAR(1, 1, 8) },
-    { VLC_CODEC_YUVA,                  PLANAR_8(4, 1, 1) },
-    { VLC_CODEC_YUV420A,               PLANAR_8(4, 2, 2) },
-    { VLC_CODEC_YUV422A,               PLANAR_8(4, 2, 1) },
-
-    { VLC_CODEC_GBR_PLANAR,            PLANAR_8(3, 1, 1) },
-    { VLC_CODEC_GBR_PLANAR_9L,         PLANAR_16(3, 1, 1, 9) },
-    { VLC_CODEC_GBR_PLANAR_9B,         PLANAR_16(3, 1, 1, 9) },
-    { VLC_CODEC_GBR_PLANAR_10L,        PLANAR_16(3, 1, 1, 10) },
-    { VLC_CODEC_GBR_PLANAR_10B,        PLANAR_16(3, 1, 1, 10) },
-    { VLC_CODEC_GBR_PLANAR_12L,        PLANAR_16(3, 1, 1, 12) },
-    { VLC_CODEC_GBR_PLANAR_12B,        PLANAR_16(3, 1, 1, 12) },
-    { VLC_CODEC_GBR_PLANAR_14L,        PLANAR_16(3, 1, 1, 14) },
-    { VLC_CODEC_GBR_PLANAR_14B,        PLANAR_16(3, 1, 1, 14) },
-    { VLC_CODEC_GBR_PLANAR_16L,        PLANAR_16(3, 1, 1, 16) },
-    { VLC_CODEC_GBR_PLANAR_16B,        PLANAR_16(3, 1, 1, 16) },
-    { VLC_CODEC_GBRA_PLANAR,           PLANAR_8(4, 1, 1) },
-    { VLC_CODEC_GBRA_PLANAR_10L,       PLANAR_16(4, 1, 1, 10) },
-    { VLC_CODEC_GBRA_PLANAR_10B,       PLANAR_16(4, 1, 1, 10) },
-    { VLC_CODEC_GBRA_PLANAR_12L,       PLANAR_16(4, 1, 1, 12) },
-    { VLC_CODEC_GBRA_PLANAR_12B,       PLANAR_16(4, 1, 1, 12) },
-    { VLC_CODEC_GBRA_PLANAR_16L,       PLANAR_16(4, 1, 1, 16) },
-    { VLC_CODEC_GBRA_PLANAR_16B,       PLANAR_16(4, 1, 1, 16) },
-
-    { VLC_CODEC_I420_16L,              PLANAR_16(3, 2, 2, 16) },
-    { VLC_CODEC_I420_16B,              PLANAR_16(3, 2, 2, 16) },
-    { VLC_CODEC_I420_12L,              PLANAR_16(3, 2, 2, 12) },
-    { VLC_CODEC_I420_12B,              PLANAR_16(3, 2, 2, 12) },
-    { VLC_CODEC_I420_10L,              PLANAR_16(3, 2, 2, 10) },
-    { VLC_CODEC_I420_10B,              PLANAR_16(3, 2, 2, 10) },
-    { VLC_CODEC_I420_9L,               PLANAR_16(3, 2, 2,  9) },
-    { VLC_CODEC_I420_9B,               PLANAR_16(3, 2, 2,  9) },
-    { VLC_CODEC_I422_16L,              PLANAR_16(3, 2, 1, 16) },
-    { VLC_CODEC_I422_16B,              PLANAR_16(3, 2, 1, 16) },
-    { VLC_CODEC_I422_12L,              PLANAR_16(3, 2, 1, 12) },
-    { VLC_CODEC_I422_12B,              PLANAR_16(3, 2, 1, 12) },
-    { VLC_CODEC_I422_10L,              PLANAR_16(3, 2, 1, 10) },
-    { VLC_CODEC_I422_10B,              PLANAR_16(3, 2, 1, 10) },
-    { VLC_CODEC_I422_9L,               PLANAR_16(3, 2, 1,  9) },
-    { VLC_CODEC_I422_9B,               PLANAR_16(3, 2, 1,  9) },
-    { VLC_CODEC_I444_12L,              PLANAR_16(3, 1, 1, 12) },
-    { VLC_CODEC_I444_12B,              PLANAR_16(3, 1, 1, 12) },
-    { VLC_CODEC_I444_10L,              PLANAR_16(3, 1, 1, 10) },
-    { VLC_CODEC_I444_10B,              PLANAR_16(3, 1, 1, 10) },
-    { VLC_CODEC_I444_9L,               PLANAR_16(3, 1, 1,  9) },
-    { VLC_CODEC_I444_9B,               PLANAR_16(3, 1, 1,  9) },
-    { VLC_CODEC_I444_16L,              PLANAR_16(3, 1, 1, 16) },
-    { VLC_CODEC_I444_16B,              PLANAR_16(3, 1, 1, 16) },
-    { VLC_CODEC_YUVA_444_10L,          PLANAR_16(4, 1, 1, 10) },
-    { VLC_CODEC_YUVA_444_10B,          PLANAR_16(4, 1, 1, 10) },
-    { VLC_CODEC_YUVA_444_12L,          PLANAR_16(4, 1, 1, 12) },
-    { VLC_CODEC_YUVA_444_12B,          PLANAR_16(4, 1, 1, 12) },
-    { VLC_CODEC_P010,                  SEMIPLANAR(2, 2, 10) },
-    { VLC_CODEC_P016,                  SEMIPLANAR(2, 2, 16) },
-
-    { VLC_CODEC_YUYV,                  PACKED_FMT(2, 16) },
-    { VLC_CODEC_YVYU,                  PACKED_FMT(2, 16) },
-    { VLC_CODEC_UYVY,                  PACKED_FMT(2, 16) },
-    { VLC_CODEC_VYUY,                  PACKED_FMT(2, 16) },
-    { VLC_CODEC_YUV2,                  PACKED_FMT(2, 16) },
-    { VLC_CODEC_RGB233,                PACKED_FMT(1, 8) },
-    { VLC_CODEC_BGR233,                PACKED_FMT(1, 8) },
-    { VLC_CODEC_RGB332,                PACKED_FMT(1, 8) },
-    { VLC_CODEC_YUVP,                  PACKED_FMT(1, 8) },
-    { VLC_CODEC_RGBP,                  PACKED_FMT(1, 8) },
-    { VLC_CODEC_GREY,                  PACKED_FMT(1, 8) },
-    { VLC_CODEC_GREY_10L,              PACKED_FMT(2, 10) },
-    { VLC_CODEC_GREY_10B,              PACKED_FMT(2, 10) },
-    { VLC_CODEC_GREY_12L,              PACKED_FMT(2, 12) },
-    { VLC_CODEC_GREY_12B,              PACKED_FMT(2, 12) },
-    { VLC_CODEC_GREY_16L,              PACKED_FMT(2, 16) },
-    { VLC_CODEC_GREY_16B,              PACKED_FMT(2, 16) },
-
-    { VLC_CODEC_RGB555BE,              PACKED_FMT(2, 15) },
-    { VLC_CODEC_RGB555LE,              PACKED_FMT(2, 15) },
-    { VLC_CODEC_BGR555LE,              PACKED_FMT(2, 15) },
-    { VLC_CODEC_BGR555BE,              PACKED_FMT(2, 15) },
-    { VLC_CODEC_RGB565LE,              PACKED_FMT(2, 16) },
-    { VLC_CODEC_RGB565BE,              PACKED_FMT(2, 16) },
-    { VLC_CODEC_BGR565LE,              PACKED_FMT(2, 16) },
-    { VLC_CODEC_BGR565BE,              PACKED_FMT(2, 16) },
-    { VLC_CODEC_RGB24,                 PACKED_FMT(3, 24) },
-    { VLC_CODEC_BGR24,                 PACKED_FMT(3, 24) },
-    { VLC_CODEC_RGBX,                  PACKED_FMT(4, 24) },
-    { VLC_CODEC_XRGB,                  PACKED_FMT(4, 24) },
-    { VLC_CODEC_BGRX,                  PACKED_FMT(4, 24) },
-    { VLC_CODEC_XBGR,                  PACKED_FMT(4, 24) },
-    { VLC_CODEC_RGBA,                  PACKED_FMT(4, 32) },
-    { VLC_CODEC_ARGB,                  PACKED_FMT(4, 32) },
-    { VLC_CODEC_BGRA,                  PACKED_FMT(4, 32) },
-    { VLC_CODEC_ABGR,                  PACKED_FMT(4, 32) },
-    { VLC_CODEC_RGBA10LE,              PACKED_FMT(4, 32) },
-    { VLC_CODEC_RGBA64,                PACKED_FMT(8, 64) },
-    { VLC_CODEC_VUYA,                  PACKED_FMT(4, 32) },
-    { VLC_CODEC_Y210,                  PACKED_FMT(4, 32) },
-    { VLC_CODEC_Y410,                  PACKED_FMT(4, 32) },
-
-    { VLC_CODEC_Y211,                 1, { {{1,4}, {1,1}} }, 4, 32 },
-    { VLC_CODEC_XYZ_12L,               PACKED_FMT(6, 48) },
-    { VLC_CODEC_XYZ_12B,               PACKED_FMT(6, 48) },
-
-    { VLC_CODEC_VDPAU_VIDEO,           FAKE_FMT() },
-    { VLC_CODEC_VDPAU_OUTPUT,          FAKE_FMT() },
-    { VLC_CODEC_ANDROID_OPAQUE,        FAKE_FMT() },
-    { VLC_CODEC_MMAL_OPAQUE,           FAKE_FMT() },
-    { VLC_CODEC_D3D9_OPAQUE,           FAKE_FMT() },
-    { VLC_CODEC_D3D11_OPAQUE,          FAKE_FMT() },
-    { VLC_CODEC_D3D9_OPAQUE_10B,       FAKE_FMT() },
-    { VLC_CODEC_D3D11_OPAQUE_10B,      FAKE_FMT() },
-    { VLC_CODEC_D3D11_OPAQUE_RGBA,     FAKE_FMT() },
-    { VLC_CODEC_D3D11_OPAQUE_BGRA,     FAKE_FMT() },
-    { VLC_CODEC_D3D11_OPAQUE_ALPHA,    FAKE_FMT() },
-
-    { VLC_CODEC_NVDEC_OPAQUE_16B,      FAKE_FMT() },
-    { VLC_CODEC_NVDEC_OPAQUE_10B,      FAKE_FMT() },
-    { VLC_CODEC_NVDEC_OPAQUE,          FAKE_FMT() },
-
-    { VLC_CODEC_NVDEC_OPAQUE_444,      FAKE_FMT() },
-    { VLC_CODEC_NVDEC_OPAQUE_444_16B,  FAKE_FMT() },
-
-    { VLC_CODEC_CVPX_NV12,             FAKE_FMT() },
-    { VLC_CODEC_CVPX_UYVY,             FAKE_FMT() },
-    { VLC_CODEC_CVPX_I420,             FAKE_FMT() },
-    { VLC_CODEC_CVPX_BGRA,             FAKE_FMT() },
-
-    { VLC_CODEC_CVPX_P010,             FAKE_FMT() },
-
-    { VLC_CODEC_GST_MEM_OPAQUE,        FAKE_FMT() },
-
-    { VLC_CODEC_VAAPI_420,             FAKE_FMT() },
-    { VLC_CODEC_VAAPI_420_10BPP,       FAKE_FMT() },
+    { VLC_CODEC_I411,                  PLANAR_8(YUV411, 3, 4, 1) },
+    { VLC_CODEC_I410,                  PLANAR_8(YUV411, 3, 4, 4) },
+    { VLC_CODEC_I420,                  PLANAR_8(YUV420, 3, 2, 2) },
+    { VLC_CODEC_YV12,                  PLANAR_8(YUV420, 3, 2, 2) },
+    { VLC_CODEC_NV12,                  SEMIPLANAR(YUV420, 2, 2, 8) },
+    { VLC_CODEC_NV21,                  SEMIPLANAR(YUV420, 2, 2, 8) },
+    { VLC_CODEC_I422,                  PLANAR_8(YUV422, 3, 2, 1) },
+    { VLC_CODEC_NV16,                  SEMIPLANAR(YUV422, 2, 1, 8) },
+    { VLC_CODEC_NV61,                  SEMIPLANAR(YUV422, 2, 1, 8) },
+    { VLC_CODEC_I440,                  PLANAR_8(YUV440, 3, 1, 2) },
+    { VLC_CODEC_I444,                  PLANAR_8(YUV444, 3, 1, 1) },
+    { VLC_CODEC_NV24,                  SEMIPLANAR(YUV444, 1, 1, 8) },
+    { VLC_CODEC_NV42,                  SEMIPLANAR(YUV444, 1, 1, 8) },
+    { VLC_CODEC_YUVA,                  PLANAR_8(YUV444, 4, 1, 1) },
+    { VLC_CODEC_YUV420A,               PLANAR_8(YUV420, 4, 2, 2) },
+    { VLC_CODEC_YUV422A,               PLANAR_8(YUV422, 4, 2, 1) },
+
+    { VLC_CODEC_GBR_PLANAR,            PLANAR_8(RGB, 3, 1, 1) },
+    { VLC_CODEC_GBR_PLANAR_9L,         PLANAR_16(RGB, 3, 1, 1, 9) },
+    { VLC_CODEC_GBR_PLANAR_9B,         PLANAR_16(RGB, 3, 1, 1, 9) },
+    { VLC_CODEC_GBR_PLANAR_10L,        PLANAR_16(RGB, 3, 1, 1, 10) },
+    { VLC_CODEC_GBR_PLANAR_10B,        PLANAR_16(RGB, 3, 1, 1, 10) },
+    { VLC_CODEC_GBR_PLANAR_12L,        PLANAR_16(RGB, 3, 1, 1, 12) },
+    { VLC_CODEC_GBR_PLANAR_12B,        PLANAR_16(RGB, 3, 1, 1, 12) },
+    { VLC_CODEC_GBR_PLANAR_14L,        PLANAR_16(RGB, 3, 1, 1, 14) },
+    { VLC_CODEC_GBR_PLANAR_14B,        PLANAR_16(RGB, 3, 1, 1, 14) },
+    { VLC_CODEC_GBR_PLANAR_16L,        PLANAR_16(RGB, 3, 1, 1, 16) },
+    { VLC_CODEC_GBR_PLANAR_16B,        PLANAR_16(RGB, 3, 1, 1, 16) },
+    { VLC_CODEC_GBRA_PLANAR,           PLANAR_8(RGB, 4, 1, 1) },
+    { VLC_CODEC_GBRA_PLANAR_10L,       PLANAR_16(RGB, 4, 1, 1, 10) },
+    { VLC_CODEC_GBRA_PLANAR_10B,       PLANAR_16(RGB, 4, 1, 1, 10) },
+    { VLC_CODEC_GBRA_PLANAR_12L,       PLANAR_16(RGB, 4, 1, 1, 12) },
+    { VLC_CODEC_GBRA_PLANAR_12B,       PLANAR_16(RGB, 4, 1, 1, 12) },
+    { VLC_CODEC_GBRA_PLANAR_16L,       PLANAR_16(RGB, 4, 1, 1, 16) },
+    { VLC_CODEC_GBRA_PLANAR_16B,       PLANAR_16(RGB, 4, 1, 1, 16) },
+
+    { VLC_CODEC_I420_16L,              PLANAR_16(YUV420, 3, 2, 2, 16) },
+    { VLC_CODEC_I420_16B,              PLANAR_16(YUV420, 3, 2, 2, 16) },
+    { VLC_CODEC_I420_12L,              PLANAR_16(YUV420, 3, 2, 2, 12) },
+    { VLC_CODEC_I420_12B,              PLANAR_16(YUV420, 3, 2, 2, 12) },
+    { VLC_CODEC_I420_10L,              PLANAR_16(YUV420, 3, 2, 2, 10) },
+    { VLC_CODEC_I420_10B,              PLANAR_16(YUV420, 3, 2, 2, 10) },
+    { VLC_CODEC_I420_9L,               PLANAR_16(YUV420, 3, 2, 2,  9) },
+    { VLC_CODEC_I420_9B,               PLANAR_16(YUV420, 3, 2, 2,  9) },
+    { VLC_CODEC_I422_16L,              PLANAR_16(YUV422, 3, 2, 1, 16) },
+    { VLC_CODEC_I422_16B,              PLANAR_16(YUV422, 3, 2, 1, 16) },
+    { VLC_CODEC_I422_12L,              PLANAR_16(YUV422, 3, 2, 1, 12) },
+    { VLC_CODEC_I422_12B,              PLANAR_16(YUV422, 3, 2, 1, 12) },
+    { VLC_CODEC_I422_10L,              PLANAR_16(YUV422, 3, 2, 1, 10) },
+    { VLC_CODEC_I422_10B,              PLANAR_16(YUV422, 3, 2, 1, 10) },
+    { VLC_CODEC_I422_9L,               PLANAR_16(YUV422, 3, 2, 1,  9) },
+    { VLC_CODEC_I422_9B,               PLANAR_16(YUV422, 3, 2, 1,  9) },
+    { VLC_CODEC_I444_12L,              PLANAR_16(YUV444, 3, 1, 1, 12) },
+    { VLC_CODEC_I444_12B,              PLANAR_16(YUV444, 3, 1, 1, 12) },
+    { VLC_CODEC_I444_10L,              PLANAR_16(YUV444, 3, 1, 1, 10) },
+    { VLC_CODEC_I444_10B,              PLANAR_16(YUV444, 3, 1, 1, 10) },
+    { VLC_CODEC_I444_9L,               PLANAR_16(YUV444, 3, 1, 1,  9) },
+    { VLC_CODEC_I444_9B,               PLANAR_16(YUV444, 3, 1, 1,  9) },
+    { VLC_CODEC_I444_16L,              PLANAR_16(YUV444, 3, 1, 1, 16) },
+    { VLC_CODEC_I444_16B,              PLANAR_16(YUV444, 3, 1, 1, 16) },
+    { VLC_CODEC_YUVA_444_10L,          PLANAR_16(YUV444, 4, 1, 1, 10) },
+    { VLC_CODEC_YUVA_444_10B,          PLANAR_16(YUV444, 4, 1, 1, 10) },
+    { VLC_CODEC_YUVA_444_12L,          PLANAR_16(YUV444, 4, 1, 1, 12) },
+    { VLC_CODEC_YUVA_444_12B,          PLANAR_16(YUV444, 4, 1, 1, 12) },
+    { VLC_CODEC_P010,                  SEMIPLANAR(YUV420, 2, 2, 10) },
+    { VLC_CODEC_P012,                  SEMIPLANAR(YUV420, 2, 2, 12) },
+    { VLC_CODEC_P016,                  SEMIPLANAR(YUV420, 2, 2, 16) },
+
+    { VLC_CODEC_V308,                  PACKED_FMT(YUV444, 1, 24, 8) },
+    { VLC_CODEC_YUYV,                  PACKED_FMT(YUV422, 2, 16, 8) },
+    { VLC_CODEC_YVYU,                  PACKED_FMT(YUV422, 2, 16, 8) },
+    { VLC_CODEC_UYVY,                  PACKED_FMT(YUV422, 2, 16, 8) },
+    { VLC_CODEC_VYUY,                  PACKED_FMT(YUV422, 2, 16, 8) },
+    { VLC_CODEC_YUV2,                  PACKED_FMT(YUV422, 2, 16, 8) },
+    { VLC_CODEC_RGB233,                PACKED_FMT(RGB, 1, 8, 2.6) },
+    { VLC_CODEC_BGR233,                PACKED_FMT(RGB, 1, 8, 2.6) },
+    { VLC_CODEC_RGB332,                PACKED_FMT(RGB, 1, 8, 2.6) },
+    { VLC_CODEC_YUVP,                  PACKED_FMT(OTHER, 1, 8, 0) },
+    { VLC_CODEC_RGBP,                  PACKED_FMT(OTHER, 1, 8, 0) },
+    { VLC_CODEC_GREY,                  PACKED_FMT(GREY, 1, 8, 8) },
+    { VLC_CODEC_GREY_10L,              PACKED_FMT(GREY, 2, 10, 10) },
+    { VLC_CODEC_GREY_10B,              PACKED_FMT(GREY, 2, 10, 10) },
+    { VLC_CODEC_GREY_12L,              PACKED_FMT(GREY, 2, 12, 12) },
+    { VLC_CODEC_GREY_12B,              PACKED_FMT(GREY, 2, 12, 12) },
+    { VLC_CODEC_GREY_16L,              PACKED_FMT(GREY, 2, 16, 16) },
+    { VLC_CODEC_GREY_16B,              PACKED_FMT(GREY, 2, 16, 16) },
+
+    { VLC_CODEC_RGB555BE,              PACKED_FMT(RGB, 2, 15, 5) },
+    { VLC_CODEC_RGB555LE,              PACKED_FMT(RGB, 2, 15, 5) },
+    { VLC_CODEC_BGR555LE,              PACKED_FMT(RGB, 2, 15, 5) },
+    { VLC_CODEC_BGR555BE,              PACKED_FMT(RGB, 2, 15, 5) },
+    { VLC_CODEC_RGB565LE,              PACKED_FMT(RGB, 2, 16, 5.3) },
+    { VLC_CODEC_RGB565BE,              PACKED_FMT(RGB, 2, 16, 5.3) },
+    { VLC_CODEC_BGR565LE,              PACKED_FMT(RGB, 2, 16, 5.3), },
+    { VLC_CODEC_BGR565BE,              PACKED_FMT(RGB, 2, 16, 5.3) },
+    { VLC_CODEC_RGB24,                 PACKED_FMT(RGB, 3, 24, 8) },
+    { VLC_CODEC_BGR24,                 PACKED_FMT(RGB, 3, 24, 8) },
+    { VLC_CODEC_RGBX,                  PACKED_FMT(RGB, 4, 24, 8) },
+    { VLC_CODEC_XRGB,                  PACKED_FMT(RGB, 4, 24, 8) },
+    { VLC_CODEC_BGRX,                  PACKED_FMT(RGB, 4, 24, 8) },
+    { VLC_CODEC_XBGR,                  PACKED_FMT(RGB, 4, 24, 8) },
+    { VLC_CODEC_RGBA,                  PACKED_FMT(RGB, 4, 32, 8) },
+    { VLC_CODEC_ARGB,                  PACKED_FMT(RGB, 4, 32, 8) },
+    { VLC_CODEC_BGRA,                  PACKED_FMT(RGB, 4, 32, 8) },
+    { VLC_CODEC_ABGR,                  PACKED_FMT(RGB, 4, 32, 8) },
+    { VLC_CODEC_RGBA10LE,              PACKED_FMT(RGB, 4, 32, 10) },
+    { VLC_CODEC_RGBA64,                PACKED_FMT(RGB, 8, 64, 16) },
+    { VLC_CODEC_VUYA,                  PACKED_FMT(YUV444, 4, 32, 8) },
+    { VLC_CODEC_Y210,                  PACKED_FMT(YUV422, 4, 32, 10) },
+    { VLC_CODEC_Y410,                  PACKED_FMT(YUV444, 4, 32, 10) },
+
+    { VLC_CODEC_Y211, VLC_CHROMA_SUBTYPE_YUV211,1, { {{1,4}, {1,1}} }, 4, 32, 8 },
+    { VLC_CODEC_XYZ_12L,               PACKED_FMT(OTHER, 6, 48, 12) },
+    { VLC_CODEC_XYZ_12B,               PACKED_FMT(OTHER, 6, 48, 12) },
+
+    { VLC_CODEC_VDPAU_VIDEO,           GPU_FMT(YUV420, 8) },
+    { VLC_CODEC_VDPAU_OUTPUT,          GPU_FMT(RGB, 8) },
+    { VLC_CODEC_ANDROID_OPAQUE,        GPU_FMT(OTHER, 0) },
+    { VLC_CODEC_MMAL_OPAQUE,           GPU_FMT(OTHER, 0) },
+    { VLC_CODEC_D3D9_OPAQUE,           GPU_FMT(YUV420, 8) },
+    { VLC_CODEC_D3D11_OPAQUE,          GPU_FMT(YUV420, 8) },
+    { VLC_CODEC_D3D9_OPAQUE_10B,       GPU_FMT(YUV420, 10) },
+    { VLC_CODEC_D3D11_OPAQUE_10B,      GPU_FMT(YUV420, 10) },
+    { VLC_CODEC_D3D11_OPAQUE_RGBA,     GPU_FMT(RGB, 8) },
+    { VLC_CODEC_D3D11_OPAQUE_BGRA,     GPU_FMT(RGB, 8) },
+    { VLC_CODEC_D3D11_OPAQUE_ALPHA,    GPU_FMT(YUV420, 8) },
+
+    { VLC_CODEC_NVDEC_OPAQUE_16B,      GPU_FMT(YUV420, 16) },
+    { VLC_CODEC_NVDEC_OPAQUE_10B,      GPU_FMT(YUV420, 10) },
+    { VLC_CODEC_NVDEC_OPAQUE,          GPU_FMT(YUV420, 8) },
+
+    { VLC_CODEC_NVDEC_OPAQUE_444,      GPU_FMT(YUV444, 8) },
+    { VLC_CODEC_NVDEC_OPAQUE_444_16B,  GPU_FMT(YUV444, 16) },
+
+    { VLC_CODEC_CVPX_NV12,             GPU_FMT(YUV420, 8) },
+    { VLC_CODEC_CVPX_UYVY,             GPU_FMT(YUV422, 8) },
+    { VLC_CODEC_CVPX_I420,             GPU_FMT(YUV420, 8) },
+    { VLC_CODEC_CVPX_BGRA,             GPU_FMT(RGB, 8) },
+
+    { VLC_CODEC_CVPX_P010,             GPU_FMT(YUV420, 10) },
+
+    { VLC_CODEC_GST_MEM_OPAQUE,        GPU_FMT(OTHER, 0) },
+
+    { VLC_CODEC_VAAPI_420,             GPU_FMT(YUV420, 8) },
+    { VLC_CODEC_VAAPI_420_10BPP,       GPU_FMT(YUV420, 10) },
+    { VLC_CODEC_VAAPI_420_12BPP,       GPU_FMT(YUV420, 12) },
 };
 
 #undef PACKED_FMT

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/fourcc_list.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/fourcc_list.h Changed

@@ -920,6 +920,12 @@
         A("NV12"),
     B(VLC_CODEC_NV21, "Biplanar 4:2:0 Y/VU"),
         A("NV21"),
+    B(VLC_CODEC_P010, "Biplanar 4:2:0 Y/VU 10-bit LE"),
+        A("P010"),
+    B(VLC_CODEC_P012, "Biplanar 4:2:0 Y/VU 12-bit LE"),
+        A("P012"),
+    B(VLC_CODEC_P016, "Biplanar 4:2:0 Y/VU 16-bit LE"),
+        A("P016"),
     B(VLC_CODEC_NV16, "Biplanar 4:2:2 Y/UV"),
         A("NV16"),
     B(VLC_CODEC_NV61, "Biplanar 4:2:2 Y/VU"),
@@ -1045,6 +1051,9 @@
     B(VLC_CODEC_BMP, "BMP Image"),
         A("bmp "),
 
+    B(VLC_CODEC_FARBFELD, "Farbfeld Image"),
+        A("farb"),
+
     B(VLC_CODEC_TIFF, "TIFF Image"),
         A("tiff"),
 
@@ -1242,6 +1251,9 @@
     B(VLC_CODEC_VAAPI_420_10BPP, "4:2:0 10bits VAAPI opaque"),
         A("VAO0"),
 
+    B(VLC_CODEC_VAAPI_420_12BPP, "4:2:0 12bits VAAPI opaque"),
+        A("VAO2"),
+
     B(VLC_CODEC_ANDROID_OPAQUE, "Android opaque"),
         A("ANOP"),
 
@@ -1523,6 +1535,10 @@
     B(VLC_CODEC_QDMC, "QDMC Audio"),
         A("QDMC"),
 
+    /* QOA */
+    B(VLC_CODEC_QOA, "Quite OK Audio Format"),
+        A("qoaf"),
+
     /* COOK */
     B(VLC_CODEC_COOK, "Cook Audio"),
         A("cook"),

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/frame.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/frame.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/image.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/image.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/interrupt.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/interrupt.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/keystore.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/keystore.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/medialibrary.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/medialibrary.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/messages.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/messages.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/mime.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/mime.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/objres.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/objres.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/picture.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/picture.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/picture.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/picture.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/picture_pool.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/picture_pool.c Changed

@@ -35,20 +35,19 @@
 #include <vlc_threads.h>
 #include <vlc_picture_pool.h>
 #include <vlc_atomic.h>
+#include <vlc_list.h>
 #include "picture.h"
 
-#define POOL_MAX (CHAR_BIT * sizeof (unsigned long long))
-
-static_assert ((POOL_MAX & (POOL_MAX - 1)) == 0, "Not a power of two");
+#define POOL_MAX 256
 
 struct picture_pool_t {
     vlc_mutex_t lock;
     vlc_cond_t  wait;
 
-    unsigned long long available;
     vlc_atomic_rc_t    refs;
-    unsigned short     picture_count;
-    picture_t  *picture;
+    bool released;
+    struct vlc_list inuse_list;
+    struct vlc_list available_list;
 };
 
 static void picture_pool_Destroy(picture_pool_t *pool)
@@ -56,43 +55,67 @@
     if (!vlc_atomic_rc_dec(&pool->refs))
         return;
 
-    aligned_free(pool);
+    assert(vlc_list_is_empty(&pool->inuse_list));
+    assert(vlc_list_is_empty(&pool->available_list));
+
+    free(pool);
 }
 
 void picture_pool_Release(picture_pool_t *pool)
 {
-    for (unsigned i = 0; i < pool->picture_count; i++)
-        picture_Release(pool->picturei);
+    vlc_mutex_lock(&pool->lock);
+
+    /* Release pictures from both available and in-use lists */
+    for (size_t i = 0; i < 2; ++i)
+    {
+        struct vlc_list *list = i == 0 ? &pool->available_list : &pool->inuse_list;
+
+        picture_priv_t *priv;
+        vlc_list_foreach(priv, list, pool_node)
+        {
+            assert(priv->pool == pool);
+            vlc_list_remove(&priv->pool_node);
+            picture_Release(&priv->picture);
+        }
+    }
+    /* Prevent in-use cloned pictures to be added back to lists */
+    pool->released = true;
+    vlc_mutex_unlock(&pool->lock);
     picture_pool_Destroy(pool);
 }
 
 static void picture_pool_ReleaseClone(picture_t *clone)
 {
-    picture_priv_t *priv = (picture_priv_t *)clone;
-    uintptr_t sys = (uintptr_t)priv->gc.opaque;
-    picture_pool_t *pool = (void *)(sys & ~(POOL_MAX - 1));
-    unsigned offset = sys & (POOL_MAX - 1);
-    picture_t *picture = pool->pictureoffset;
+    picture_priv_t *priv = container_of(clone, picture_priv_t, picture);
+
+    /* Retrieve the original pic that was cloned */
+    picture_t *original = priv->gc.opaque;
+    picture_priv_t *original_priv = container_of(original, picture_priv_t, picture);
 
-    picture_Release(picture);
+    picture_pool_t *pool = original_priv->pool;
+    assert(pool != NULL);
 
     vlc_mutex_lock(&pool->lock);
-    assert(!(pool->available & (1ULL << offset)));
-    pool->available |= 1ULL << offset;
-    vlc_cond_signal(&pool->wait);
+
+    if (!pool->released)
+    {
+        vlc_list_remove(&original_priv->pool_node);
+        vlc_list_append(&original_priv->pool_node, &pool->available_list);
+        vlc_cond_signal(&pool->wait);
+    }
+
     vlc_mutex_unlock(&pool->lock);
 
+    picture_Release(original);
+
     picture_pool_Destroy(pool);
 }
 
 static picture_t *picture_pool_ClonePicture(picture_pool_t *pool,
-                                            unsigned offset)
+                                            picture_t *picture)
 {
-    picture_t *picture = pool->pictureoffset;
-    uintptr_t sys = ((uintptr_t)pool) + offset;
-
     picture_t *clone = picture_InternalClone(picture, picture_pool_ReleaseClone,
-                                 (void*)sys);
+                                             picture);
     if (clone != NULL) {
         assert(!picture_HasChainedPics(clone));
         vlc_atomic_rc_inc(&pool->refs);
@@ -100,28 +123,44 @@
     return clone;
 }
 
-picture_pool_t *picture_pool_New(unsigned count, picture_t *const *tab)
+static void picture_pool_AppendPic(picture_pool_t *pool, picture_t *pic)
 {
-    if (unlikely(count > POOL_MAX))
-        return NULL;
+    picture_priv_t *priv = container_of(pic, picture_priv_t, picture);
+    assert(priv->pool == NULL);
+    vlc_list_append(&priv->pool_node, &pool->available_list);
+    priv->pool = pool;
+}
 
-    picture_pool_t *pool;
-    size_t size = sizeof (*pool) + count * sizeof (picture_t *);
+static picture_pool_t *
+picture_pool_NewCommon(void)
+{
+    picture_pool_t *pool = malloc(sizeof(*pool));
 
-    size += (-size) & (POOL_MAX - 1);
-    pool = aligned_alloc(POOL_MAX, size);
     if (unlikely(pool == NULL))
         return NULL;
 
+    vlc_list_init(&pool->inuse_list);
+    vlc_list_init(&pool->available_list);
+
     vlc_mutex_init(&pool->lock);
     vlc_cond_init(&pool->wait);
-    if (count == POOL_MAX)
-        pool->available = ~0ULL;
-    else
-        pool->available = (1ULL << count) - 1;
     vlc_atomic_rc_init(&pool->refs);
-    pool->picture_count = count;
-    memcpy(pool->picture, tab, count * sizeof (picture_t *));
+    pool->released = false;
+
+    return pool;
+}
+
+picture_pool_t *picture_pool_New(unsigned count, picture_t *const *tab)
+{
+    if (unlikely(count > POOL_MAX))
+        return NULL;
+
+    picture_pool_t *pool = picture_pool_NewCommon();
+    if (unlikely(pool == NULL))
+        return NULL;
+
+    for (unsigned i = 0; i < count; ++i)
+        picture_pool_AppendPic(pool, tabi);
     return pool;
 }
 
@@ -133,25 +172,37 @@
     if (unlikely(count > POOL_MAX))
         return NULL;
 
-    picture_t *picturePOOL_MAX;
-    unsigned i;
+    picture_pool_t *pool = picture_pool_NewCommon();
+    if (unlikely(pool == NULL))
+        return NULL;
 
-    for (i = 0; i < count; i++) {
-        picturei = picture_NewFromFormat(fmt);
-        if (picturei == NULL)
-            goto error;
+    for (unsigned i = 0; i < count; ++i)
+    {
+        picture_t *pic = picture_NewFromFormat(fmt);
+        if (pic == NULL)
+        {
+            picture_pool_Release(pool);
+            return NULL;
+        }
+        picture_pool_AppendPic(pool, pic);
     }
 
-    picture_pool_t *pool = picture_pool_New(count, picture);
-    if (!pool)
-        goto error;
-
     return pool;
+}
+
+static picture_t *picture_pool_GetAvailableLocked(picture_pool_t *pool)
+{
+    picture_priv_t *priv = vlc_list_first_entry_or_null(&pool->available_list,
+                                                        picture_priv_t,
+                                                        pool_node);
+    assert(priv != NULL);
+
+    assert(priv->pool == pool);
+
+    vlc_list_remove(&priv->pool_node);
+    vlc_list_append(&priv->pool_node, &pool->inuse_list);
 
-error:
-    while (i > 0)
-        picture_Release(picture--i);
-    return NULL;
+    return &priv->picture;
 }
 
 picture_t *picture_pool_Get(picture_pool_t *pool)
@@ -160,17 +211,17 @@
     vlc_mutex_lock(&pool->lock);
     assert(vlc_atomic_rc_get(&pool->refs) > 0);
 
-    if (pool->available == 0)
+    if (vlc_list_is_empty(&pool->available_list))
     {
         vlc_mutex_unlock(&pool->lock);
         return NULL;
     }
 
-    int i = stdc_trailing_zeros(pool->available);
-    pool->available &= ~(1ULL << i);
+    picture_t *pic = picture_pool_GetAvailableLocked(pool);
+
     vlc_mutex_unlock(&pool->lock);
 
-    return picture_pool_ClonePicture(pool, i);
+    return picture_pool_ClonePicture(pool, pic);
 }
 
 picture_t *picture_pool_Wait(picture_pool_t *pool)
@@ -178,12 +229,12 @@
     vlc_mutex_lock(&pool->lock);
     assert(vlc_atomic_rc_get(&pool->refs) > 0);
 
-    while (pool->available == 0)
+    while (vlc_list_is_empty(&pool->available_list))
         vlc_cond_wait(&pool->wait, &pool->lock);
 
-    int i = stdc_trailing_zeros(pool->available);
-    pool->available &= ~(1ULL << i);
+    picture_t *pic = picture_pool_GetAvailableLocked(pool);
+
     vlc_mutex_unlock(&pool->lock);
 
-    return picture_pool_ClonePicture(pool, i);
+    return picture_pool_ClonePicture(pool, pic);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/probe.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/probe.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/renderer_discovery.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/renderer_discovery.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/subpicture.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/subpicture.c Changed

@@ -160,7 +160,7 @@
         return NULL;
     }
 
-    p_region->b_absolute = true;
+    p_region->b_absolute = true; p_region->b_in_window = false;
     p_region->fmt.i_sar_num =
     p_region->fmt.i_sar_den = 0;
 
@@ -175,6 +175,7 @@
 void subpicture_Update( subpicture_t *p_subpicture,
                         const video_format_t *p_fmt_src,
                         const video_format_t *p_fmt_dst,
+                        unsigned display_width, unsigned display_height,
                         vlc_tick_t i_ts )
 {
     subpicture_updater_t *p_upd = &p_subpicture->updater;
@@ -183,10 +184,16 @@
     if (p_upd->ops == NULL)
         return;
 
-    p_upd->ops->update(p_subpicture,
-                       &p_private->src, p_fmt_src,
-                       &p_private->dst, p_fmt_dst,
-                       i_ts);
+    struct vlc_spu_updater_configuration cfg = {
+        .prev_src  = &p_private->src,
+        .prev_dst  = &p_private->dst,
+        .display_width  = display_width,
+        .display_height = display_height,
+        .video_src = p_fmt_src,
+        .video_dst = p_fmt_dst,
+        .pts       = i_ts,
+    };
+    p_upd->ops->update( p_subpicture, &cfg );
 
     video_format_Clean( &p_private->src );
     video_format_Clean( &p_private->dst );
@@ -195,43 +202,63 @@
     video_format_Copy( &p_private->dst, p_fmt_dst );
 }
 
+typedef struct subpicture_region_private_t
+{
+    subpicture_region_t region;
+    video_format_t fmt;
+    picture_t *p_picture;
+} subpicture_region_private_t;
 
-subpicture_region_private_t *subpicture_region_private_New( video_format_t *p_fmt )
+const video_format_t * subpicture_region_cache_GetFormat( const subpicture_region_t *p_region )
 {
-    subpicture_region_private_t *p_private = malloc( sizeof(*p_private) );
+    subpicture_region_private_t *p_priv = container_of(p_region, subpicture_region_private_t, region);
+    return &p_priv->fmt;
+}
 
-    if( !p_private )
-        return NULL;
+picture_t * subpicture_region_cache_GetPicture( subpicture_region_t *p_region )
+{
+    subpicture_region_private_t *p_priv = container_of(p_region, subpicture_region_private_t, region);
+    return p_priv->p_picture;
+}
 
-    if ( video_format_Copy( &p_private->fmt, p_fmt ) != VLC_SUCCESS )
+bool subpicture_region_cache_IsValid(const subpicture_region_t *p_region)
+{
+    subpicture_region_private_t *p_priv = container_of(p_region, subpicture_region_private_t, region);
+    return p_priv->fmt.i_chroma;
+}
+void subpicture_region_cache_Invalidate( subpicture_region_t *p_region )
+{
+    subpicture_region_private_t *p_priv = container_of(p_region, subpicture_region_private_t, region);
+    if( p_priv->p_picture )
     {
-        free( p_private );
-        return NULL;
+        picture_Release( p_priv->p_picture );
+        p_priv->p_picture = NULL;
     }
-
-    p_private->p_picture = NULL;
-    return p_private;
+    video_format_Clean( &p_priv->fmt );
+    video_format_Init( &p_priv->fmt, 0 );
 }
 
-void subpicture_region_private_Delete( subpicture_region_private_t *p_private )
+int subpicture_region_cache_Assign( subpicture_region_t *p_region, picture_t *p_picture )
 {
-    if( p_private->p_picture )
-        picture_Release( p_private->p_picture );
-    video_format_Clean( &p_private->fmt );
-    free( p_private );
+    subpicture_region_private_t *p_priv = container_of(p_region, subpicture_region_private_t, region);
+    if ( video_format_Copy( &p_priv->fmt, &p_picture->format ) != VLC_SUCCESS )
+        return VLC_EGENERIC;
+    p_priv->p_picture = p_picture;
+    return VLC_SUCCESS;
 }
 
 static subpicture_region_t * subpicture_region_NewInternal( void )
 {
-    subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) );
+    subpicture_region_private_t *p_region = calloc( 1, sizeof(subpicture_region_private_t) );
     if( unlikely(p_region == NULL) )
         return NULL;
 
-    p_region->i_alpha = 0xff;
-    p_region->i_x = INT_MAX;
-    p_region->i_y = INT_MAX;
+    p_region->region.i_alpha = 0xff;
+    p_region->region.i_x = INT_MAX;
+    p_region->region.i_y = INT_MAX;
+    p_region->region.b_absolute = false; p_region->region.b_in_window = false;
 
-    return p_region;
+    return &p_region->region;
 }
 
 subpicture_region_t *subpicture_region_New( const video_format_t *p_fmt )
@@ -329,15 +356,16 @@
     if( !p_region )
         return;
 
-    if( p_region->p_private )
-        subpicture_region_private_Delete( p_region->p_private );
+    subpicture_region_private_t *p_priv = container_of(p_region, subpicture_region_private_t, region);
+
+    subpicture_region_cache_Invalidate( p_region );
 
     if( p_region->p_picture )
         picture_Release( p_region->p_picture );
 
     text_segment_ChainDelete( p_region->p_text );
     video_format_Clean( &p_region->fmt );
-    free( p_region );
+    free( p_priv );
 }
 
 void vlc_spu_regions_Clear( vlc_spu_regions *regions )

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/subpicture.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/subpicture.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/threads.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/threads.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/variables.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/variables.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/misc/viewpoint.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/misc/viewpoint.c Changed

@@ -79,27 +79,37 @@
         default:
         case ORIENT_NORMAL:
         case ORIENT_HFLIPPED:
-            *vp = (vlc_viewpoint_t) { .fov = vp->fov };
+            vlc_viewpoint_from_euler(vp, 0.f, 0.f, 0.f);
             break;
 
         case ORIENT_ROTATED_90:
         case ORIENT_ANTI_TRANSPOSED:
-            *vp = (vlc_viewpoint_t) {
-                .roll = -90.f, .fov = vp->fov
-            };
+            vlc_viewpoint_from_euler(vp, 0.f, 0.f, -90.f);
             break;
 
         case ORIENT_ROTATED_180:
         case ORIENT_VFLIPPED:
-            *vp = (vlc_viewpoint_t) {
-                .roll = -180.f, .fov = vp->fov
-            };
+            vlc_viewpoint_from_euler(vp, 0.f, 0.f, -180.f);
             break;
         case ORIENT_ROTATED_270:
         case ORIENT_TRANSPOSED:
-            *vp = (vlc_viewpoint_t) {
-                .roll = -270.f, .fov = vp->fov
-            };
+            vlc_viewpoint_from_euler(vp, 0.f, 0.f, -270.f);
             break;
     }
 }
+
+void vlc_viewpoint_from_euler(vlc_viewpoint_t *vp,
+                              float yaw, float pitch, float roll)
+{
+    vp->yaw   = yaw;
+    vp->pitch = pitch;
+    vp->roll  = roll;
+}
+
+void vlc_viewpoint_to_euler(const vlc_viewpoint_t *vp,
+                            float *yaw, float *pitch, float *roll)
+{
+    *yaw   = vp->yaw;
+    *pitch = vp->pitch;
+    *roll  = vp->roll;
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/modules/bank.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/modules/bank.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/modules/cache.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/modules/cache.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/modules/entry.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/modules/entry.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/modules/modules.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/modules/modules.c Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/netbsd Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/netbsd/thread.c Added

@@ -0,0 +1,45 @@
+/*****************************************************************************
+ * netbsd/thread.c: NetBSD specifics for threading
+ *****************************************************************************
+ * Copyright (C) 2020 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <pthread.h>
+#include <lwp.h>
+
+#include <vlc_common.h>
+#include <vlc_threads.h>
+#include <vlc_atomic.h>
+
+unsigned long vlc_thread_id(void)
+{
+     static _Thread_local lwpid_t tid = -1;
+
+     if (unlikely(tid == -1))
+         tid = _lwp_self();
+
+     return tid;
+}
+
+void (vlc_thread_set_name)(const char *name)
+{
+    pthread_setname_np(pthread_self(), "%s", (void *)name);
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/network/http_auth.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/network/http_auth.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/network/tls.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/network/tls.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/network/udp.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/network/udp.c Changed

@@ -118,21 +118,16 @@
 
     if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen))
     {
-        union
-        {
-            struct sockaddr a;
-            struct sockaddr_in in;
-            struct sockaddr_in6 in6;
-        } dumb = {
+        vlc_sockaddr dumb = {
             { .sa_family = ptr->ai_addr->sa_family, },
         };
 
         static_assert (offsetof (struct sockaddr_in, sin_port) ==
                        offsetof (struct sockaddr_in6, sin6_port), "Mismatch");
         assert(ptr->ai_addrlen <= sizeof (dumb));
-        memcpy(&dumb.in6.sin6_port, ((unsigned char *)ptr->ai_addr)
+        memcpy(&dumb.sin6.sin6_port, ((unsigned char *)ptr->ai_addr)
                                + offsetof (struct sockaddr_in, sin_port), 2);
-        bind(fd, &dumb.a, ptr->ai_addrlen);
+        bind(fd, &dumb.sa, ptr->ai_addrlen);
     }
     else
 #endif
@@ -502,20 +497,14 @@
 
 static int net_SetDSCP( int fd, uint8_t dscp )
 {
-    union {
-        struct sockaddr a;
-        struct sockaddr_in in;
-#ifdef IPV6_TCLASS
-        struct sockaddr_in in6;
-#endif
-    } addr;
+    vlc_sockaddr addr;
 
-    if (getsockname(fd, &addr.a, &(socklen_t){ sizeof (addr) }))
+    if (getsockname(fd, &addr.sa, &(socklen_t){ sizeof (addr) }))
         return -1;
 
     int level, cmd;
 
-    switch (addr.a.sa_family)
+    switch (addr.sa.sa_family)
     {
 #ifdef IPV6_TCLASS
         case AF_INET6:

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/openbsd Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/openbsd/cpu.c Added

@@ -0,0 +1,95 @@
+/*****************************************************************************
+ * openbsd/cpu.c: CPU detection code for OpenBSD
+ *****************************************************************************
+ * Copyright (C) 2012 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <sys/auxv.h>
+
+#include <vlc_common.h>
+#include <vlc_cpu.h>
+
+#if defined (__aarch64__)
+unsigned vlc_CPU_raw(void)
+{
+    unsigned int flags = 0;
+    unsigned long hwcap = 0;
+    //unsigned long hwcap2 = 0; // TODO: SVE2
+
+    elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
+    // elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap2)); // TODO: SVE2
+
+    /* HWCAP_FP (HAVE_FPU) is statically assumed. */
+    if (hwcap & HWCAP_ASIMD)
+        flags |= VLC_CPU_ARM_NEON;
+    if (hwcap & HWCAP_SVE)
+        flags |= VLC_CPU_ARM_SVE;
+
+    return flags;
+}
+
+#elif defined (__arm__)
+unsigned vlc_CPU_raw(void)
+{
+    unsigned int flags = 0;
+    unsigned long hwcap = 0;
+
+    elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
+
+    /* TLS implies ARMv6, Thumb-EE and VFP imply ARMv7 */
+    if (hwcap & (HWCAP_TLS|HWCAP_THUMBEE|HWCAP_VFP))
+        flags |= VLC_CPU_ARMv6; /* SIMD */
+    if (hwcap & HWCAP_NEON)
+        flags |= VLC_CPU_ARM_NEON; /* Advanced SIMD */
+
+    return flags;
+}
+
+#elif defined (__powerpc__) /* both 32- and 64-bit */
+unsigned vlc_CPU_raw(void)
+{
+    unsigned int flags = 0;
+    unsigned long hwcap = 0;
+
+    elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
+
+    if (hwcap & PPC_FEATURE_HAS_ALTIVEC)
+        flags |= VLC_CPU_ALTIVEC;
+
+    return flags;
+}
+
+#elif defined (__riscv)
+# define HWCAP_RV(letter) (1LU << ((letter) - 'A'))
+
+unsigned vlc_CPU_raw(void)
+{
+    unsigned int flags = 0;
+    unsigned long hwcap = 0;
+
+    elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
+
+    if (hwcap & HWCAP_RV('V'))
+        flags |= VLC_CPU_RV_V;
+
+    return flags;
+}
+#endif

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/openbsd/thread.c Added

@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * openbsd/thread.c: OpenBSD specifics for threading
+ *****************************************************************************
+ * Copyright (C) 2020 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <unistd.h>
+#include <pthread.h>
+#include <pthread_np.h>
+
+#include <vlc_common.h>
+#include <vlc_threads.h>
+#include <vlc_atomic.h>
+
+unsigned long vlc_thread_id(void)
+{
+     static _Thread_local pid_t tid = -1;
+
+     if (unlikely(tid == -1))
+         tid = getthrid();
+
+     return tid;
+}
+
+void (vlc_thread_set_name)(const char *name)
+{
+    pthread_set_name_np(pthread_self(), name);
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/os2/filesystem.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/os2/filesystem.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/os2/getaddrinfo.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/os2/getaddrinfo.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/os2/thread.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/os2/thread.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/player/input.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/player/input.c Changed

@@ -798,29 +798,33 @@
 
     /* Handle Up/Down/Left/Right if the demux can't navigate */
     vlc_viewpoint_t vp = { 0 };
+    bool viewpoint_updated = true;
+    float yaw = 0.f, pitch = 0.f, roll = 0.f;
+
     int vol_direction = 0;
     int seek_direction = 0;
     switch (nav_type)
     {
         case INPUT_CONTROL_NAV_UP:
             vol_direction = 1;
-            vp.pitch = -1.f;
+            pitch = -1.f;
             break;
         case INPUT_CONTROL_NAV_DOWN:
             vol_direction = -1;
-            vp.pitch = 1.f;
+            pitch = 1.f;
             break;
         case INPUT_CONTROL_NAV_LEFT:
             seek_direction = -1;
-            vp.yaw = -1.f;
+            yaw = -1.f;
             break;
         case INPUT_CONTROL_NAV_RIGHT:
             seek_direction = 1;
-            vp.yaw = 1.f;
+            yaw = 1.f;
             break;
         case INPUT_CONTROL_NAV_ACTIVATE:
         case INPUT_CONTROL_NAV_POPUP:
         case INPUT_CONTROL_NAV_MENU:
+            viewpoint_updated = false;
             return;
         default:
             vlc_assert_unreachable();
@@ -838,8 +842,11 @@
     }
     free(vouts);
 
-    if (viewpoint_ch)
+    if (viewpoint_ch && viewpoint_updated)
+    {
+        vlc_viewpoint_from_euler(&vp, yaw, pitch, roll);
         vlc_player_input_UpdateViewpoint(input, &vp, VLC_PLAYER_WHENCE_RELATIVE);
+    }
     else if (seek_direction != 0)
     {
         /* Seek or change volume if the input doesn't have navigation or viewpoint */
@@ -857,6 +864,16 @@
 }
 
 static void
+vlc_player_input_MouseFallback(struct vlc_player_input *input,
+                               const struct vlc_input_event_mouse *ev)
+{
+    vlc_player_t *player = input->player;
+
+    if (vlc_mouse_HasPressed(&ev->oldmouse, &ev->newmouse, MOUSE_BUTTON_LEFT))
+        vlc_player_TogglePause(player);
+}
+
+static void
 input_thread_Events(input_thread_t *input_thread,
                     const struct vlc_input_event *event, void *user_data)
 {
@@ -1035,6 +1052,9 @@
         case INPUT_EVENT_NAV_FAILED:
             vlc_player_input_NavigationFallback(input, event->nav_type);
             break;
+        case INPUT_EVENT_MOUSE:
+            vlc_player_input_MouseFallback(input, &event->mouse_data);
+            break;
         default:
             break;
     }
@@ -1142,6 +1162,7 @@
 
     const struct vlc_input_thread_cfg cfg = {
         .type = INPUT_TYPE_PLAYBACK,
+        .hw_dec = INPUT_CFG_HW_DEC_DEFAULT,
         .resource = player->resource,
         .renderer = player->renderer,
         .cbs = &cbs,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/player/osd.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/player/osd.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/player/player.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/player/player.c Changed

@@ -32,8 +32,9 @@
 #include <vlc_decoder.h>
 #include <vlc_memstream.h>
 #include <vlc_http.h>
+#include <vlc_vout_osd.h>
 
-#include "libvlc.h"
+#include "../libvlc.h"
 #include "input/resource.h"
 #include "audio_output/aout_internal.h"
 
@@ -1513,6 +1514,83 @@
     return ret;
 }
 
+int
+vlc_player_SetAtoBLoopTime(vlc_player_t *player, vlc_tick_t a_time, vlc_tick_t b_time)
+{
+    if (a_time < 0 || b_time < 0)
+        return VLC_EINVAL;
+
+    if (a_time == VLC_TICK_INVALID || b_time == VLC_TICK_INVALID)
+        return VLC_EINVAL;
+
+    if (b_time <= a_time)
+        return VLC_EINVAL;
+
+    struct vlc_player_input *input = vlc_player_get_input_locked(player);
+
+    if (!input || !vlc_player_CanSeek(player))
+        return VLC_EGENERIC;
+
+    input->abloop_state0.time = a_time;
+    input->abloop_state0.pos = 0;
+    input->abloop_state0.set = true;
+    input->abloop_state1.time = b_time;
+    input->abloop_state1.pos = 0;
+    input->abloop_state1.set = true;
+
+    vlc_player_SetTime(player, a_time);
+
+    vlc_player_SendEvent(player, on_atobloop_changed, VLC_PLAYER_ABLOOP_A, a_time, 0);
+    vlc_player_SendEvent(player, on_atobloop_changed, VLC_PLAYER_ABLOOP_B, b_time, 0);
+    return VLC_SUCCESS;
+}
+
+int
+vlc_player_SetAtoBLoopPosition(vlc_player_t *player, double a_pos, double b_pos)
+{
+    if (a_pos < 0 || a_pos > 1.0 || b_pos < 0 || b_pos > 1.0)
+        return VLC_EINVAL;
+
+    if (b_pos <= a_pos)
+        return VLC_EINVAL;
+
+    struct vlc_player_input *input = vlc_player_get_input_locked(player);
+
+    if (!input || !vlc_player_CanSeek(player))
+        return VLC_EGENERIC;
+
+    input->abloop_state0.time = VLC_TICK_INVALID;
+    input->abloop_state0.pos = a_pos;
+    input->abloop_state0.set = true;
+    input->abloop_state1.time = VLC_TICK_INVALID;
+    input->abloop_state1.pos = b_pos;
+    input->abloop_state1.set = true;
+
+    vlc_player_SetPosition(player, a_pos);
+
+    vlc_player_SendEvent(player, on_atobloop_changed, VLC_PLAYER_ABLOOP_A, VLC_TICK_INVALID, a_pos);
+    vlc_player_SendEvent(player, on_atobloop_changed, VLC_PLAYER_ABLOOP_B, VLC_TICK_INVALID, b_pos);
+    return VLC_SUCCESS;
+}
+
+int
+vlc_player_ResetAtoBLoop(vlc_player_t *player) {
+    struct vlc_player_input *input = vlc_player_get_input_locked(player);
+
+    if (!input || !vlc_player_CanSeek(player))
+        return VLC_EGENERIC;
+
+    input->abloop_state0.time = VLC_TICK_INVALID;
+    input->abloop_state0.pos = 0;
+    input->abloop_state0.set = false;
+    input->abloop_state1.time = VLC_TICK_INVALID;
+    input->abloop_state1.pos = 0;
+    input->abloop_state1.set = false;
+
+    vlc_player_SendEvent(player, on_atobloop_changed, VLC_PLAYER_ABLOOP_NONE, VLC_TICK_INVALID, 0);
+    return VLC_SUCCESS;
+}
+
 enum vlc_player_abloop
 vlc_player_GetAtoBLoop(vlc_player_t *player, vlc_tick_t *a_time, double *a_pos,
                        vlc_tick_t *b_time, double *b_pos)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/playlist/export.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/playlist/export.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/playlist/playlist.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/playlist/playlist.c Changed

@@ -40,10 +40,12 @@
 
     if (rec != VLC_PLAYLIST_PREPARSING_DISABLED)
     {
-        playlist->parser = vlc_preparser_New(parent, preparse_max_threads,
-                                             preparse_timeout,
-                                             META_REQUEST_OPTION_PARSE |
-                                             META_REQUEST_OPTION_FETCH_LOCAL);
+        const struct vlc_preparser_cfg cfg = {
+            .types = VLC_PREPARSER_TYPE_PARSE | VLC_PREPARSER_TYPE_FETCHMETA_LOCAL,
+            .max_parser_threads = preparse_max_threads,
+            .timeout = preparse_timeout,
+        };
+        playlist->parser = vlc_preparser_New(parent, &cfg);
         if (playlist->parser == NULL)
         {
             free(playlist);
@@ -83,13 +85,11 @@
     assert(vlc_list_is_empty(&playlist->listeners));
 
     if (playlist->parser != NULL)
-        vlc_preparser_Deactivate(playlist->parser);
+        vlc_preparser_Delete(playlist->parser);
 
     vlc_playlist_PlayerDestroy(playlist);
     randomizer_Destroy(&playlist->randomizer);
     vlc_playlist_ClearItems(playlist);
-    if (playlist->parser != NULL)
-        vlc_preparser_Delete(playlist->parser);
     free(playlist);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/playlist/preparse.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/playlist/preparse.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/playlist/request.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/playlist/request.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/posix/thread.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/posix/thread.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/preparser/fetcher.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/preparser/fetcher.c Changed

@@ -34,7 +34,7 @@
 #include <vlc_executor.h>
 
 #include "art.h"
-#include "libvlc.h"
+#include "../libvlc.h"
 #include "fetcher.h"
 #include "input/input_interface.h"
 #include "misc/interrupt.h"
@@ -71,7 +71,7 @@
 
 static struct task *
 TaskNew(input_fetcher_t *fetcher, vlc_executor_t *executor, input_item_t *item,
-        input_item_meta_request_option_t options,
+        int options,
         const input_fetcher_callbacks_t *cbs, void *userdata)
 {
     struct task *task = malloc(sizeof(*task));
@@ -127,7 +127,7 @@
 
 static int
 Submit(input_fetcher_t *fetcher, vlc_executor_t *executor, input_item_t *item,
-       input_item_meta_request_option_t options,
+       int options,
        const input_fetcher_callbacks_t *cbs, void *userdata)
 {
     struct task *task =
@@ -380,7 +380,7 @@
     if( SearchByScope( task, FETCHER_SCOPE_LOCAL ) == VLC_SUCCESS )
         goto end; /* done */
 
-    if( task->options & META_REQUEST_OPTION_FETCH_NETWORK )
+    if( task->options & VLC_PREPARSER_TYPE_FETCHMETA_NET )
     {
         int ret = Submit(fetcher, fetcher->executor_network, task->item,
                          task->options, task->cbs, task->userdata);
@@ -422,9 +422,9 @@
 }
 
 input_fetcher_t* input_fetcher_New( vlc_object_t* owner,
-                                    input_item_meta_request_option_t request_type )
+                                    int request_type )
 {
-    assert(request_type & META_REQUEST_OPTION_FETCH_ANY);
+    assert(request_type & VLC_PREPARSER_TYPE_FETCHMETA_ALL);
     input_fetcher_t* fetcher = malloc( sizeof( *fetcher ) );
 
     if( unlikely( !fetcher ) )
@@ -434,7 +434,7 @@
     if (max_threads < 1)
         max_threads = 1;
 
-    if (request_type & META_REQUEST_OPTION_FETCH_LOCAL)
+    if (request_type & VLC_PREPARSER_TYPE_FETCHMETA_LOCAL)
     {
         fetcher->executor_local = vlc_executor_New(max_threads);
         if (!fetcher->executor_local)
@@ -446,7 +446,7 @@
     else
         fetcher->executor_local = NULL;
 
-    if (request_type & META_REQUEST_OPTION_FETCH_NETWORK)
+    if (request_type & VLC_PREPARSER_TYPE_FETCHMETA_NET)
     {
         fetcher->executor_network = vlc_executor_New(max_threads);
         if (!fetcher->executor_network)
@@ -483,16 +483,16 @@
 }
 
 int input_fetcher_Push(input_fetcher_t* fetcher, input_item_t* item,
-    input_item_meta_request_option_t options,
-    const input_fetcher_callbacks_t *cbs, void *cbs_userdata)
+                       int options,
+                       const input_fetcher_callbacks_t *cbs, void *cbs_userdata)
 {
-    assert(options & META_REQUEST_OPTION_FETCH_ANY);
-    if (options & META_REQUEST_OPTION_FETCH_LOCAL)
+    assert(options & VLC_PREPARSER_TYPE_FETCHMETA_ALL);
+    if (options & VLC_PREPARSER_TYPE_FETCHMETA_LOCAL)
         assert(fetcher->executor_local != NULL);
-    if (options & META_REQUEST_OPTION_FETCH_NETWORK)
+    if (options & VLC_PREPARSER_TYPE_FETCHMETA_NET)
         assert(fetcher->executor_network != NULL);
 
-    vlc_executor_t *executor = options & META_REQUEST_OPTION_FETCH_LOCAL
+    vlc_executor_t *executor = options & VLC_PREPARSER_TYPE_FETCHMETA_LOCAL
                              ? fetcher->executor_local
                              : fetcher->executor_network;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/preparser/fetcher.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/preparser/fetcher.h Changed

@@ -42,12 +42,11 @@
 /**
  * This function creates the fetcher object and thread.
  *
- * @param request_type a combination of META_REQUEST_OPTION_FETCH_LOCAL and
- * META_REQUEST_OPTION_FETCH_NETWORK, it is used to setup the executors for
+ * @param request_type a combination of VLC_PREPARSER_TYPE_FETCHMETA_LOCAL and
+ * VLC_PREPARSER_TYPE_FETCHMETA_NET, it is used to setup the executors for
  * each domain.
  */
-input_fetcher_t *input_fetcher_New( vlc_object_t *,
-                                    input_item_meta_request_option_t request_type );
+input_fetcher_t *input_fetcher_New( vlc_object_t *, int request_type );
 
 /**
  * This function enqueues the provided item to be art fetched.
@@ -55,8 +54,7 @@
  * The input item is retained until the art fetching is done or until the
  * fetcher object is destroyed.
  */
-int input_fetcher_Push( input_fetcher_t *, input_item_t *,
-                        input_item_meta_request_option_t,
+int input_fetcher_Push( input_fetcher_t *, input_item_t *, int,
                         const input_fetcher_callbacks_t *, void * );
 
 /**

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/preparser/preparser.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/preparser/preparser.c Changed

@@ -22,38 +22,65 @@
 # include "config.h"
 #endif
 
+#include <fcntl.h>
+
 #include <vlc_common.h>
 #include <vlc_atomic.h>
 #include <vlc_executor.h>
 #include <vlc_preparser.h>
+#include <vlc_interrupt.h>
+#include <vlc_modules.h>
+#include <vlc_fs.h>
 
 #include "input/input_interface.h"
 #include "input/input_internal.h"
 #include "fetcher.h"
 
+union vlc_preparser_cbs
+{
+    const input_item_parser_cbs_t *parser;
+    const struct vlc_thumbnailer_cbs *thumbnailer;
+    const struct vlc_thumbnailer_to_files_cbs *thumbnailer_to_files;
+};
+
 struct vlc_preparser_t
 {
     vlc_object_t* owner;
     input_fetcher_t* fetcher;
-    vlc_executor_t *executor;
+    vlc_executor_t *parser;
+    vlc_executor_t *thumbnailer;
+    vlc_executor_t *thumbnailer_to_files;
     vlc_tick_t timeout;
-    atomic_bool deactivated;
 
     vlc_mutex_t lock;
     vlc_preparser_req_id current_id;
     struct vlc_list submitted_tasks; /**< list of struct task */
 };
 
+struct task_thumbnail_output
+{
+    vlc_fourcc_t fourcc;
+    int width;
+    int height;
+    bool crop;
+    char *file_path;
+    unsigned int creat_mode;
+};
+
 struct task
 {
     vlc_preparser_t *preparser;
     input_item_t *item;
-    input_item_meta_request_option_t options;
-    const input_item_parser_cbs_t *cbs;
+    int options;
+    struct vlc_thumbnailer_arg thumb_arg;
+    union vlc_preparser_cbs cbs;
     void *userdata;
     vlc_preparser_req_id id;
 
-    input_item_parser_id_t *parser;
+    vlc_interrupt_t *i11e_ctx;
+    picture_t *pic;
+    struct task_thumbnail_output *outputs;
+    size_t output_count;
 
     vlc_sem_t preparse_ended;
     int preparse_status;
@@ -64,12 +91,10 @@
     struct vlc_list node; /**< node of vlc_preparser_t.submitted_tasks */
 };
 
-static void RunnableRun(void *);
-
 static struct task *
-TaskNew(vlc_preparser_t *preparser, input_item_t *item,
-        input_item_meta_request_option_t options,
-        const input_item_parser_cbs_t *cbs, void *userdata)
+TaskNew(vlc_preparser_t *preparser, void (*run)(void *), input_item_t *item,
+        int options, const struct vlc_thumbnailer_arg *thumb_arg,
+        union vlc_preparser_cbs cbs, void *userdata)
 {
     struct task *task = malloc(sizeof(*task));
     if (!task)
@@ -80,16 +105,30 @@
     task->options = options;
     task->cbs = cbs;
     task->userdata = userdata;
+    task->pic = NULL;
+    task->outputs = NULL;
+    task->output_count = 0;
+
+    if (thumb_arg == NULL)
+        task->thumb_arg = (struct vlc_thumbnailer_arg) {
+            .seek.type = VLC_THUMBNAILER_SEEK_NONE,
+            .hw_dec = false,
+        };
+    else
+        task->thumb_arg = *thumb_arg;
 
     input_item_Hold(item);
 
-    task->parser = NULL;
     vlc_sem_init(&task->preparse_ended, 0);
     task->preparse_status = VLC_EGENERIC;
     atomic_init(&task->interrupted, false);
 
-    task->runnable.run = RunnableRun;
+    task->runnable.run = run;
     task->runnable.userdata = task;
+    if (options & VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES)
+        task->i11e_ctx = vlc_interrupt_create();
+    else
+        task->i11e_ctx = NULL;
 
     return task;
 }
@@ -98,6 +137,11 @@
 TaskDelete(struct task *task)
 {
     input_item_Release(task->item);
+    for (size_t i = 0; i < task->output_count; ++i)
+        free(task->outputsi.file_path);
+    free(task->outputs);
+    if (task->i11e_ctx != NULL)
+        vlc_interrupt_destroy(task->i11e_ctx);
     free(task);
 }
 
@@ -130,18 +174,15 @@
 }
 
 static void
-NotifyPreparseEnded(struct task *task, bool cancelled)
+NotifyPreparseEnded(struct task *task)
 {
-    if (cancelled || atomic_load(&task->interrupted))
+    if (atomic_load(&task->interrupted))
         task->preparse_status = -EINTR;
     else if (task->preparse_status == VLC_SUCCESS)
         input_item_SetPreparsed(task->item);
 
-    if (task->cbs == NULL)
-        return;
-
-    if (task->cbs->on_ended)
-        task->cbs->on_ended(task->item, task->preparse_status, task->userdata);
+    task->cbs.parser->on_ended(task->item, task->preparse_status,
+                               task->userdata);
 }
 
 static void
@@ -164,8 +205,8 @@
     if (atomic_load(&task->interrupted))
         return;
 
-    if (task->cbs && task->cbs->on_subtree_added)
-        task->cbs->on_subtree_added(task->item, subtree, task->userdata);
+    if (task->cbs.parser->on_subtree_added)
+        task->cbs.parser->on_subtree_added(task->item, subtree, task->userdata);
 }
 
 static void
@@ -179,8 +220,9 @@
     if (atomic_load(&task->interrupted))
         return;
 
-    if (task->cbs && task->cbs->on_attachments_added)
-        task->cbs->on_attachments_added(task->item, array, count, task->userdata);
+    if (task->cbs.parser->on_attachments_added)
+        task->cbs.parser->on_attachments_added(task->item, array, count, 
+                                               task->userdata);
 }
 
 static void
@@ -191,7 +233,7 @@
 
     struct task *task = userdata;
 
-    NotifyPreparseEnded(task, false);
+    NotifyPreparseEnded(task);
     TaskDelete(task);
 }
 
@@ -212,11 +254,12 @@
     const struct input_item_parser_cfg cfg = {
         .cbs = &cbs,
         .cbs_data = task,
-        .subitems = task->options & META_REQUEST_OPTION_PARSE_SUBITEMS,
-        .interact = task->options & META_REQUEST_OPTION_DO_INTERACT,
+        .subitems = task->options & VLC_PREPARSER_OPTION_SUBITEMS,
+        .interact = task->options & VLC_PREPARSER_OPTION_INTERACT,
     };
-    task->parser = input_item_Parse(obj, task->item, &cfg);
-    if (!task->parser)
+    input_item_parser_id_t *parser =
+        input_item_Parse(obj, task->item, &cfg);
+    if (parser == NULL)
     {
         task->preparse_status = VLC_EGENERIC;
         return;
@@ -228,29 +271,29 @@
     else
         if (vlc_sem_timedwait(&task->preparse_ended, deadline))
         {
-            input_item_parser_id_Release(task->parser);
+            input_item_parser_id_Release(parser);
             task->preparse_status = VLC_ETIMEOUT;
             return;
         }
 
     /* This call also interrupts the parsing if it is still running */
-    input_item_parser_id_Release(task->parser);
+    input_item_parser_id_Release(parser);
 }
 
 static int
 Fetch(struct task *task)
 {
     input_fetcher_t *fetcher = task->preparser->fetcher;
-    if (!fetcher || !(task->options & META_REQUEST_OPTION_FETCH_ANY))
+    if (!fetcher || !(task->options & VLC_PREPARSER_TYPE_FETCHMETA_ALL))
         return VLC_ENOENT;
 
     return input_fetcher_Push(fetcher, task->item,
-                              task->options & META_REQUEST_OPTION_FETCH_ANY,
+                              task->options & VLC_PREPARSER_TYPE_FETCHMETA_ALL,
                               &input_fetcher_callbacks, task);
 }
 
 static void
-RunnableRun(void *userdata)
+ParserRun(void *userdata)
 {
     vlc_thread_set_name("vlc-run-prepars");
 
@@ -260,7 +303,7 @@
     vlc_tick_t deadline = preparser->timeout ? vlc_tick_now() + preparser->timeout
                                              : VLC_TICK_INVALID;
 
-    if (task->options & META_REQUEST_OPTION_PARSE)
+    if (task->options & VLC_PREPARSER_TYPE_PARSE)
     {
         if (atomic_load(&task->interrupted))
         {
@@ -273,7 +316,7 @@
 
     PreparserRemoveTask(preparser, task);
 
-    if (task->preparse_status == VLC_ETIMEOUT)
+    if (task->preparse_status == VLC_ETIMEOUT || atomic_load(&task->interrupted))
         goto end;
 
     int ret = Fetch(task);
@@ -282,94 +325,363 @@
         return; /* Remove the task and notify from the fetcher callback */
 
 end:
-    NotifyPreparseEnded(task, false);
+    NotifyPreparseEnded(task);
     TaskDelete(task);
 }
 
 static void
+on_thumbnailer_input_event( input_thread_t *input,
+                            const struct vlc_input_event *event, void *userdata )
+{
+    VLC_UNUSED(input);
+    if ( event->type != INPUT_EVENT_THUMBNAIL_READY &&
+         ( event->type != INPUT_EVENT_STATE || ( event->state.value != ERROR_S &&
+                                                 event->state.value != END_S ) ) )
+         return;
+
+    struct task *task = userdata;
+
+    if (event->type == INPUT_EVENT_THUMBNAIL_READY)
+    {
+        task->pic = picture_Hold(event->thumbnail);
+        task->preparse_status = VLC_SUCCESS;
+    }
+    vlc_sem_post(&task->preparse_ended);
+}
+
+static int
+WriteToFile(const block_t *block, const char *path, unsigned mode)
+{
+    int bflags =
+#ifdef O_BINARY
+        O_BINARY;
+#else
+        0;
+#endif
+
+    int fd = vlc_open(path, O_WRONLY|O_CREAT|O_TRUNC|O_NONBLOCK|bflags, mode);
+    if (fd == -1)
+        return -errno;
+
+    uint8_t *data = block->p_buffer;
+    size_t size = block->i_buffer;
+
+    while (size > 0)
+    {
+        ssize_t len = vlc_write_i11e(fd, data, size);
+        if (len == -1)
+        {
+            if (errno == EAGAIN)
+                continue;
+            break;
+        }
+
+        size -= len;
+        data += len;
+    }
+
+    close(fd);
+    return size == 0 ? 0 : -errno;
+}
+
+static void
+ThumbnailerToFilesRun(void *userdata)
+{
+    vlc_thread_set_name("vlc-run-thfil");
+
+    struct task *task = userdata;
+    vlc_preparser_t *preparser = task->preparser;
+    picture_t* pic = task->pic;
+
+    vlc_interrupt_set(task->i11e_ctx);
+
+    bool *result_array = vlc_alloc(task->output_count, sizeof(bool));
+    if (result_array == NULL)
+        goto error;
+
+    for (size_t i = 0; i < task->output_count; ++i)
+    {
+        struct task_thumbnail_output *output = &task->outputsi;
+
+        if (output->fourcc == VLC_CODEC_UNKNOWN)
+        {
+            result_arrayi = false;
+            continue;
+        }
+
+        block_t* block;
+        int ret = picture_Export(preparser->owner, &block, NULL, pic,
+                                 output->fourcc, output->width, output->height,
+                                 output->crop);
+
+        if (ret != VLC_SUCCESS)
+        {
+            result_arrayi = false;
+            continue;
+        }
+
+        ret = WriteToFile(block, output->file_path, output->creat_mode);
+        block_Release(block);
+        if (ret == -EINTR)
+        {
+            task->preparse_status = -EINTR;
+            goto error;
+        }
+
+        result_arrayi = ret == 0;
+    }
+
+    task->preparse_status = VLC_SUCCESS;
+error:
+    PreparserRemoveTask(preparser, task);
+    if (task->preparse_status == VLC_SUCCESS)
+        task->cbs.thumbnailer_to_files->on_ended(task->item, task->preparse_status,
+                                                 result_array, task->output_count,
+                                                 task->userdata);
+    else
+        task->cbs.thumbnailer_to_files->on_ended(task->item, task->preparse_status,
+                                                 NULL, 0, task->userdata);
+    picture_Release(pic);
+    TaskDelete(task);
+    free(result_array);
+}
+
+static void
+ThumbnailerRun(void *userdata)
+{
+    vlc_thread_set_name("vlc-run-thumb");
+
+    struct task *task = userdata;
+    vlc_preparser_t *preparser = task->preparser;
+
+    static const struct vlc_input_thread_callbacks cbs = {
+        .on_event = on_thumbnailer_input_event,
+    };
+
+    const struct vlc_input_thread_cfg cfg = {
+        .type = INPUT_TYPE_THUMBNAILING,
+        .hw_dec = task->thumb_arg.hw_dec ? INPUT_CFG_HW_DEC_ENABLED
+                                         : INPUT_CFG_HW_DEC_DISABLED,
+        .cbs = &cbs,
+        .cbs_data = task,
+    };
+
+    vlc_tick_t deadline = preparser->timeout != VLC_TICK_INVALID ?
+                          vlc_tick_now() + preparser->timeout :
+                          VLC_TICK_INVALID;
+
+    input_thread_t* input =
+            input_Create( preparser->owner, task->item, &cfg );
+    if (!input)
+        goto error;
+
+    assert(task->thumb_arg.seek.speed == VLC_THUMBNAILER_SEEK_PRECISE
+        || task->thumb_arg.seek.speed == VLC_THUMBNAILER_SEEK_FAST);
+    bool fast_seek = task->thumb_arg.seek.speed == VLC_THUMBNAILER_SEEK_FAST;
+
+    switch (task->thumb_arg.seek.type)
+    {
+        case VLC_THUMBNAILER_SEEK_NONE:
+            break;
+        case VLC_THUMBNAILER_SEEK_TIME:
+            input_SetTime(input, task->thumb_arg.seek.time, fast_seek);
+            break;
+        case VLC_THUMBNAILER_SEEK_POS:
+            input_SetPosition(input, task->thumb_arg.seek.pos, fast_seek);
+            break;
+        default:
+            vlc_assert_unreachable();
+    }
+
+    int ret = input_Start(input);
+    if (ret != VLC_SUCCESS)
+    {
+        input_Close(input);
+        goto error;
+    }
+
+    if (deadline == VLC_TICK_INVALID)
+        vlc_sem_wait(&task->preparse_ended);
+    else
+    {
+        if (vlc_sem_timedwait(&task->preparse_ended, deadline))
+            task->preparse_status = VLC_ETIMEOUT;
+    }
+
+    if (atomic_load(&task->interrupted))
+        task->preparse_status = -EINTR;
+
+    picture_t* pic = task->pic;
+
+    if (task->options & VLC_PREPARSER_TYPE_THUMBNAIL)
+    {
+        assert((task->options & VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES) == 0);
+
+        PreparserRemoveTask(preparser, task);
+        task->cbs.thumbnailer->on_ended(task->item, task->preparse_status,
+                                        task->preparse_status == VLC_SUCCESS ?
+                                        pic : NULL, task->userdata);
+    }
+    else
+    {
+        assert(task->options & VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES);
+
+        if (task->preparse_status != VLC_SUCCESS)
+        {
+            PreparserRemoveTask(preparser, task);
+            task->cbs.thumbnailer_to_files->on_ended(task->item, task->preparse_status,
+                                                     NULL, 0, task->userdata);
+        }
+        else
+        {
+            /* Export the thumbnail to several files via a new executor in
+             * order to not slow down the current thread doing picture
+             * conversion and I/O */
+
+            assert(pic != NULL);
+
+            task->runnable.run = ThumbnailerToFilesRun;
+            vlc_executor_Submit(preparser->thumbnailer_to_files, &task->runnable);
+            pic = NULL;
+            task = NULL;
+        }
+    }
+
+    if (pic)
+        picture_Release(pic);
+
+    input_Stop(input);
+    input_Close(input);
+
+error:
+    if (task != NULL)
+        TaskDelete(task);
+}
+
+static void
 Interrupt(struct task *task)
 {
     atomic_store(&task->interrupted, true);
+    if (task->i11e_ctx != NULL)
+        vlc_interrupt_kill(task->i11e_ctx);
 
     vlc_sem_post(&task->preparse_ended);
 }
 
-vlc_preparser_t* vlc_preparser_New( vlc_object_t *parent, unsigned max_threads,
-                                    vlc_tick_t timeout,
-                                    input_item_meta_request_option_t request_type )
+vlc_preparser_t* vlc_preparser_New( vlc_object_t *parent,
+                                    const struct vlc_preparser_cfg *cfg )
 {
-    assert(max_threads >= 1);
-    assert(timeout >= 0);
-    assert(request_type & (META_REQUEST_OPTION_FETCH_ANY|META_REQUEST_OPTION_PARSE));
+    assert(cfg != NULL);
+
+    assert(cfg->timeout >= 0);
+
+    int request_type = cfg->types;
+    assert(request_type & (VLC_PREPARSER_TYPE_FETCHMETA_ALL|
+                           VLC_PREPARSER_TYPE_PARSE|
+                           VLC_PREPARSER_TYPE_THUMBNAIL|
+                           VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES));
+
+    unsigned parser_threads = cfg->max_parser_threads == 0 ? 1 :
+                              cfg->max_parser_threads;
+    unsigned thumbnailer_threads = cfg->max_thumbnailer_threads == 0 ? 1 :
+                                   cfg->max_thumbnailer_threads;
 
     vlc_preparser_t* preparser = malloc( sizeof *preparser );
     if (!preparser)
         return NULL;
 
-    if (request_type & META_REQUEST_OPTION_PARSE)
+    preparser->timeout = cfg->timeout;
+    preparser->owner = parent;
+
+    if (request_type & VLC_PREPARSER_TYPE_PARSE)
     {
-        preparser->executor = vlc_executor_New(max_threads);
-        if (!preparser->executor)
-        {
-            free(preparser);
-            return NULL;
-        }
+        preparser->parser = vlc_executor_New(parser_threads);
+        if (!preparser->parser)
+            goto error_parser;
     }
     else
-        preparser->executor = NULL;
+        preparser->parser = NULL;
 
-    preparser->timeout = timeout;
-
-    preparser->owner = parent;
-    if (request_type & META_REQUEST_OPTION_FETCH_ANY)
+    if (request_type & VLC_PREPARSER_TYPE_FETCHMETA_ALL)
     {
         preparser->fetcher = input_fetcher_New(parent, request_type);
         if (unlikely(preparser->fetcher == NULL))
-        {
-            if (preparser->executor != NULL)
-                vlc_executor_Delete(preparser->executor);
-            free(preparser);
-            return NULL;
-        }
+            goto error_fetcher;
     }
     else
         preparser->fetcher = NULL;
 
-    atomic_init( &preparser->deactivated, false );
+    if (request_type & (VLC_PREPARSER_TYPE_THUMBNAIL |
+                        VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES))
+    {
+        preparser->thumbnailer = vlc_executor_New(thumbnailer_threads);
+        if (!preparser->thumbnailer)
+            goto error_thumbnail;
+    }
+    else
+        preparser->thumbnailer = NULL;
+
+    if (request_type & VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES)
+    {
+        preparser->thumbnailer_to_files = vlc_executor_New(1);
+        if (preparser->thumbnailer_to_files == NULL)
+            goto error_thumbnail_to_files;
+    }
+    else
+        preparser->thumbnailer_to_files = NULL;
 
     vlc_mutex_init(&preparser->lock);
     vlc_list_init(&preparser->submitted_tasks);
     preparser->current_id = 1;
 
     return preparser;
+
+error_thumbnail_to_files:
+    if (preparser->thumbnailer != NULL)
+        vlc_executor_Delete(preparser->thumbnailer);
+error_thumbnail:
+    if (preparser->fetcher != NULL)
+        input_fetcher_Delete(preparser->fetcher);
+error_fetcher:
+    if (preparser->parser != NULL)
+        vlc_executor_Delete(preparser->parser);
+error_parser:
+    free(preparser);
+    return NULL;
 }
 
 vlc_preparser_req_id vlc_preparser_Push( vlc_preparser_t *preparser, input_item_t *item,
-                                  input_item_meta_request_option_t i_options,
-                                  const input_item_parser_cbs_t *cbs,
-                                  void *cbs_userdata )
+                                         int type_options,
+                                         const input_item_parser_cbs_t *cbs,
+                                         void *cbs_userdata )
 {
-    if( atomic_load( &preparser->deactivated ) )
-        return 0;
+    assert((type_options & VLC_PREPARSER_TYPE_THUMBNAIL) == 0);
+    assert((type_options & VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES) == 0);
 
-    assert(i_options & META_REQUEST_OPTION_PARSE
-        || i_options & META_REQUEST_OPTION_FETCH_ANY);
+    assert(type_options & VLC_PREPARSER_TYPE_PARSE
+        || type_options & VLC_PREPARSER_TYPE_FETCHMETA_ALL);
 
-    assert(!(i_options & META_REQUEST_OPTION_PARSE)
-        || preparser->executor != NULL);
-    assert(!(i_options & META_REQUEST_OPTION_FETCH_ANY)
+    assert(!(type_options & VLC_PREPARSER_TYPE_PARSE)
+        || preparser->parser != NULL);
+    assert(!(type_options & VLC_PREPARSER_TYPE_FETCHMETA_ALL)
         || preparser->fetcher != NULL);
 
-    struct task *task =
-        TaskNew(preparser, item, i_options, cbs, cbs_userdata);
+    assert(cbs != NULL && cbs->on_ended != NULL);
+
+    union vlc_preparser_cbs task_cbs = {
+        .parser = cbs,
+    };
+
+    struct task *task = TaskNew(preparser, ParserRun, item, type_options, NULL,
+                                task_cbs, cbs_userdata);
     if( !task )
-        return 0;
+        return VLC_PREPARSER_REQ_ID_INVALID;
 
-    if (preparser->executor != NULL)
+    if (preparser->parser != NULL)
     {
         vlc_preparser_req_id id = PreparserAddTask(preparser, task);
 
-        vlc_executor_Submit(preparser->executor, &task->runnable);
+        vlc_executor_Submit(preparser->parser, &task->runnable);
 
         return id;
     }
@@ -384,6 +696,166 @@
     return ret == VLC_SUCCESS ? id : 0;
 }
 
+vlc_preparser_req_id
+vlc_preparser_GenerateThumbnail( vlc_preparser_t *preparser, input_item_t *item,
+                                 const struct vlc_thumbnailer_arg *thumb_arg,
+                                 const struct vlc_thumbnailer_cbs *cbs,
+                                 void *cbs_userdata )
+{
+    assert(preparser->thumbnailer != NULL);
+    assert(cbs != NULL && cbs->on_ended != NULL);
+
+    union vlc_preparser_cbs task_cbs = {
+        .thumbnailer = cbs,
+    };
+
+    struct task *task =
+        TaskNew(preparser, ThumbnailerRun, item, VLC_PREPARSER_TYPE_THUMBNAIL,
+                thumb_arg, task_cbs, cbs_userdata);
+    if (task == NULL)
+        return VLC_PREPARSER_REQ_ID_INVALID;
+
+    vlc_preparser_req_id id = PreparserAddTask(preparser, task);
+
+    vlc_executor_Submit(preparser->thumbnailer, &task->runnable);
+
+    return id;
+}
+
+static int
+CheckThumbnailerFormat(enum vlc_thumbnailer_format format,
+                       enum vlc_thumbnailer_format *out_format,
+                       const char **out_ext, vlc_fourcc_t *out_fourcc)
+{
+    static const struct format
+    {
+        enum vlc_thumbnailer_format format;
+        const char *module;
+        vlc_fourcc_t fourcc;
+        const char *ext;
+    } formats = {
+        {
+            .format = VLC_THUMBNAILER_FORMAT_PNG, .fourcc = VLC_CODEC_PNG,
+            .module = "png", .ext = "png",
+        },
+        {
+            .format = VLC_THUMBNAILER_FORMAT_WEBP, .fourcc = VLC_CODEC_WEBP,
+            .module = "vpx", .ext = "webp",
+        },
+        {
+            .format = VLC_THUMBNAILER_FORMAT_JPEG, .fourcc = VLC_CODEC_JPEG,
+            .module = "jpeg", .ext = "jpg",
+        },
+    };
+
+    for (size_t i = 0; i < ARRAY_SIZE(formats); ++i)
+    {
+        /* if out_format is valid, don't check format, and get the first
+         * possible format */
+        if (out_format == NULL && format != formatsi.format)
+            continue;
+
+        /* Check if the image encoder is present */
+        if (!module_exists(formatsi.module))
+            continue;
+
+        if (out_format != NULL)
+            *out_format = formatsi.format;
+        if (out_fourcc != NULL)
+            *out_fourcc = formatsi.fourcc;
+        if (out_ext != NULL)
+            *out_ext = formatsi.ext;
+        return 0;
+    }
+
+    return VLC_ENOENT;
+}
+
+int
+vlc_preparser_GetBestThumbnailerFormat(enum vlc_thumbnailer_format *format,
+                                       const char **out_ext)
+{
+    return CheckThumbnailerFormat(0, format, out_ext, NULL);
+}
+
+int
+vlc_preparser_CheckThumbnailerFormat(enum vlc_thumbnailer_format format)
+{
+    return CheckThumbnailerFormat(format, NULL, NULL, NULL);
+}
+
+vlc_preparser_req_id
+vlc_preparser_GenerateThumbnailToFiles( vlc_preparser_t *preparser, input_item_t *item,
+                                        const struct vlc_thumbnailer_arg *thumb_arg,
+                                        const struct vlc_thumbnailer_output *outputs,
+                                        size_t output_count,
+                                        const struct vlc_thumbnailer_to_files_cbs *cbs,
+                                        void *cbs_userdata )
+{
+    assert(preparser->thumbnailer != NULL);
+    assert(cbs != NULL && cbs->on_ended != NULL);
+    assert(outputs != NULL && output_count > 0);
+
+    union vlc_preparser_cbs task_cbs = {
+        .thumbnailer_to_files = cbs,
+    };
+
+    struct task *task =
+        TaskNew(preparser, ThumbnailerRun, item,
+                VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES, thumb_arg,
+                task_cbs, cbs_userdata);
+    if (task == NULL)
+        return VLC_PREPARSER_REQ_ID_INVALID;
+
+    task->outputs = vlc_alloc(output_count, sizeof(*outputs));
+    if (unlikely(task->outputs == NULL))
+    {
+        TaskDelete(task);
+        return VLC_PREPARSER_REQ_ID_INVALID;
+    }
+
+    size_t valid_output_count = 0;
+    for (size_t i = 0; i < output_count; ++i)
+    {
+        struct task_thumbnail_output *dst = &task->outputsi;
+        const struct vlc_thumbnailer_output *src = &outputsi;
+        assert(src->file_path != NULL);
+
+        enum vlc_thumbnailer_format format = src->format;
+        int ret = CheckThumbnailerFormat(format, NULL, NULL, &dst->fourcc);
+        if (ret != 0)
+            dst->fourcc = VLC_CODEC_UNKNOWN;
+        else
+            valid_output_count++;
+
+        dst->width = src->width;
+        dst->height = src->height;
+        dst->crop = src->crop;
+        dst->creat_mode = src->creat_mode;
+        dst->file_path = strdup(src->file_path);
+
+        if (unlikely(dst->file_path == NULL))
+        {
+            TaskDelete(task);
+            return VLC_PREPARSER_REQ_ID_INVALID;
+        }
+        task->output_count++;
+    }
+
+    if (valid_output_count == 0)
+    {
+        TaskDelete(task);
+        msg_Err(preparser->owner, "thumbnailer: no valid \"image encoder\" found");
+        return VLC_PREPARSER_REQ_ID_INVALID;
+    }
+
+    vlc_preparser_req_id id = PreparserAddTask(preparser, task);
+
+    vlc_executor_Submit(preparser->thumbnailer, &task->runnable);
+
+    return id;
+}
+
 size_t vlc_preparser_Cancel( vlc_preparser_t *preparser, vlc_preparser_req_id id )
 {
     vlc_mutex_lock(&preparser->lock);
@@ -395,14 +867,58 @@
         if (id == VLC_PREPARSER_REQ_ID_INVALID || task->id == id)
         {
             count++;
-            /* TODO: the fetcher should be cancellable too */
-            bool canceled = preparser->executor != NULL
-              && vlc_executor_Cancel(preparser->executor, &task->runnable);
+
+            bool canceled;
+            if (task->options & VLC_PREPARSER_TYPE_PARSE)
+            {
+                assert(preparser->parser != NULL);
+                canceled = vlc_executor_Cancel(preparser->parser,
+                                               &task->runnable);
+            }
+            else if (task->options & (VLC_PREPARSER_TYPE_THUMBNAIL |
+                                      VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES))
+            {
+                assert(preparser->thumbnailer != NULL);
+                canceled = vlc_executor_Cancel(preparser->thumbnailer,
+                                               &task->runnable);
+                if (!canceled &&
+                    task->options & VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES)
+                {
+                    assert(preparser->thumbnailer_to_files != NULL);
+                    canceled = vlc_executor_Cancel(preparser->thumbnailer_to_files,
+                                                   &task->runnable);
+                }
+            }
+            else /* TODO: the fetcher should be cancellable too */
+                canceled = false;
+
             if (canceled)
             {
                 vlc_list_remove(&task->node);
                 vlc_mutex_unlock(&preparser->lock);
-                NotifyPreparseEnded(task, true);
+                task->preparse_status = -EINTR;
+                if (task->options & (VLC_PREPARSER_TYPE_PARSE |
+                                     VLC_PREPARSER_TYPE_FETCHMETA_ALL))
+                {
+                    assert((task->options & VLC_PREPARSER_TYPE_THUMBNAIL) == 0);
+                    task->cbs.parser->on_ended(task->item, task->preparse_status,
+                                               task->userdata);
+                }
+                else if (task->options & VLC_PREPARSER_TYPE_THUMBNAIL)
+                {
+                    assert((task->options & VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES) == 0);
+                    task->cbs.thumbnailer->on_ended(task->item,
+                                                    task->preparse_status, NULL,
+                                                    task->userdata);
+                }
+                else
+                {
+                    assert(task->options & VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES);
+                    task->cbs.thumbnailer_to_files->on_ended(task->item,
+                                                             task->preparse_status,
+                                                             NULL, 0,
+                                                             task->userdata);
+                }
                 TaskDelete(task);
 
                 /* Small optimisation in the likely case where the user cancel
@@ -422,12 +938,6 @@
     return count;
 }
 
-void vlc_preparser_Deactivate( vlc_preparser_t* preparser )
-{
-    atomic_store( &preparser->deactivated, true );
-    vlc_preparser_Cancel(preparser, 0);
-}
-
 void vlc_preparser_SetTimeout( vlc_preparser_t *preparser,
                                vlc_tick_t timeout )
 {
@@ -439,11 +949,17 @@
     /* In case vlc_preparser_Deactivate() has not been called */
     vlc_preparser_Cancel(preparser, 0);
 
-    if (preparser->executor != NULL)
-        vlc_executor_Delete(preparser->executor);
+    if (preparser->parser != NULL)
+        vlc_executor_Delete(preparser->parser);
 
     if( preparser->fetcher )
         input_fetcher_Delete( preparser->fetcher );
 
+    if (preparser->thumbnailer != NULL)
+        vlc_executor_Delete(preparser->thumbnailer);
+
+    if (preparser->thumbnailer_to_files != NULL)
+        vlc_executor_Delete(preparser->thumbnailer_to_files);
+
     free( preparser );
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/Makefile.am Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-core/Cargo.toml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-core/Cargo.toml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-core/src/lib.rs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-core/src/lib.rs Changed

@@ -1,4 +1,8 @@
 #!deny(unsafe_op_in_unsafe_fn)
+#!feature(extern_types)
+#!feature(associated_type_defaults)
+#!feature(allocator_api)
+#!feature(c_size_t)
 
 //! The `vlcrs-core` crate.
 //!
@@ -8,4 +12,25 @@
 //! If you need a vlc core C API that is not ported or wrapped yet here,
 //! then do so first instead of bypassing this crate.
 
+// SPDX-License-Identifier: LGPL-2.1-or-later
+// Copyright (C) 2024 Alexandre Janniaux <ajanni@videolabs.io>
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.#!deny(unsafe_op_in_unsafe_fn)
+
+pub mod plugin;
+
 pub mod object;
+
+pub mod tracer;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-core/src/object/mod.rs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-core/src/object/mod.rs Changed

@@ -3,17 +3,78 @@
 use sys::ObjectInternalData;
 use vlcrs_messages::Logger;
 
+use std::{
+    ops::{Deref, DerefMut},
+    ptr::NonNull,
+};
+
 #repr(C)
-pub struct Object {
+pub struct Object<'a> {
     logger: Option<Logger>,
-    internal_data: ObjectInternalData,
+    internal_data: ObjectInternalData<'a>,
     no_interact: bool,
     force: bool,
 }
 
-impl Object {
+pub struct ObjectHandle<'a> {
+    obj: NonNull<Object<'a>>,
+}
 
+impl Object<'_> {
     pub fn logger(&self) -> Option<&Logger> {
         self.logger.as_ref()
-    } 
+    }
+}
+
+impl ObjectHandle<'_> {
+    ///
+    /// Create a new VLC Object as child of an existing object or from scratch.
+    ///
+    /// The new object cannot be used after its parent has been destroyed, so
+    /// the following code is forbidden:
+    ///
+    /// ```compile_fail
+    /// use vlcrs_core::object::ObjectHandle;
+    /// let mut obj = ObjectHandle::new(None).unwrap();
+    /// let obj2 = ObjectHandle::new(Some(&obj)).unwrap();
+    /// drop(obj);
+    /// drop(obj2);
+    /// ````
+    pub fn new<'parent>(parent: Option<&'parent Object>) -> Option<ObjectHandle<'parent>> {
+        let obj = unsafe { sys::vlc_object_create(parent, size_of::<Object>())? };
+        Some(ObjectHandle { obj })
+    }
+}
+
+impl<'a> Deref for ObjectHandle<'a> {
+    type Target = Object<'a>;
+
+    fn deref(&self) -> &Self::Target {
+        return unsafe { self.obj.as_ref() };
+    }
+}
+
+impl<'a> DerefMut for ObjectHandle<'a> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        return unsafe { self.obj.as_mut() };
+    }
+}
+
+impl Drop for ObjectHandle<'_> {
+    fn drop(&mut self) {
+        unsafe { sys::vlc_object_delete(self.obj.as_mut()) };
+    }
+}
+
+#cfg(test)
+mod test {
+    use crate::object::ObjectHandle;
+
+    #test
+    fn test_create_and_destroy_object() {
+        let mut obj = ObjectHandle::new(None).unwrap();
+        let obj2 = ObjectHandle::new(Some(&mut obj)).unwrap();
+        drop(obj2);
+        drop(obj);
+    }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-core/src/object/sys.rs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-core/src/object/sys.rs Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-core/src/plugin Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-core/src/plugin/mod.rs Added

@@ -0,0 +1,279 @@
+pub mod sys;
+
+use crate::object::Object;
+
+pub const VLC_COPYRIGHT_VIDEOLAN: &str = r#"
+\x43\x6f\x70\x79\x72\x69\x67\x68\x74\x20\x28\x43\x29\x20\x74\x68
+\x65\x20\x56\x69\x64\x65\x6f\x4c\x41\x4e\x20\x56\x4c\x43\x20\x6d
+\x65\x64\x69\x61\x20\x70\x6c\x61\x79\x65\x72\x20\x64\x65\x76\x65
+\x6c\x6f\x70\x65\x72\x73"#;
+
+pub const VLC_LICENSE_LGPL_2_1_PLUS: &str = r#"
+\x4c\x69\x63\x65\x6e\x73\x65\x64\x20\x75\x6e\x64\x65\x72\x20\x74
+\x68\x65\x20\x74\x65\x72\x6d\x73\x20\x6f\x66\x20\x74\x68\x65\x20
+\x47\x4e\x55\x20\x4c\x65\x73\x73\x65\x72\x20\x47\x65\x6e\x65\x72
+\x61\x6c\x20\x50\x75\x62\x6c\x69\x63\x20\x4c\x69\x63\x65\x6e\x73
+\x65\x2c\x20\x76\x65\x72\x73\x69\x6f\x6e\x20\x32\x2e\x31\x20\x6f"#;
+
+#allow(non_camel_case_types)
+#allow(unused)
+extern "C" {
+    pub type module_t;
+    pub type vlc_param;
+}
+
+#allow(non_camel_case_types)
+#repr(u32)
+pub enum ConfigModule {
+    HINT_CATEGORY = 0x02,
+    SUBCATEGORY = 0x07,
+    SECTION = 0x08,
+    ITEM_FLOAT = 1 << 5,
+    ITEM_INTEGER = 2 << 5,
+    ITEM_RGB = ConfigModule::ITEM_INTEGER as u32 | 0x01,
+    ITEM_BOOL = 3 << 5,
+    ITEM_STRING = 4 << 5,
+    ITEM_PASSWORD = ConfigModule::ITEM_STRING as u32 | 0x01,
+    ITEM_KEY = ConfigModule::ITEM_STRING as u32 | 0x02,
+    ITEM_MODULE = ConfigModule::ITEM_STRING as u32 | 0x04,
+    ITEM_MODULE_CAT = ConfigModule::ITEM_STRING as u32 | 0x05,
+    ITEM_MODULE_LIST = ConfigModule::ITEM_STRING as u32 | 0x06,
+    ITEM_MODULE_LIST_CAT = ConfigModule::ITEM_STRING as u32 | 0x07,
+    ITEM_LOADFILE = ConfigModule::ITEM_STRING as u32 | 0x0C,
+    ITEM_SAVEFILE = ConfigModule::ITEM_STRING as u32 | 0x0D,
+    ITEM_DIRECTORY = ConfigModule::ITEM_STRING as u32 | 0x0E,
+    ITEM_FONT = ConfigModule::ITEM_STRING as u32 | 0x0F,
+}
+
+#allow(non_camel_case_types)
+#repr(i32)
+pub enum ConfigCategory {
+    HIDDEN = -1,
+    UNKNOWN = 0,
+    INTERFACE = 1,
+    AUDIO = 2,
+    VIDEO = 3,
+    INPUT = 4,
+    SOUT = 5,
+    ADVANCED = 6,
+    PLAYLIST = 7,
+}
+
+#allow(non_camel_case_types)
+#repr(i32)
+pub enum ConfigSubcategory {
+    HIDDEN = -1,
+    UNKNOWN = 0,
+
+    INTERFACE_GENERAL = 101,
+    INTERFACE_MAIN = 102,
+    INTERFACE_CONTROL = 103,
+    INTERFACE_HOTKEYS = 104,
+
+    AUDIO_GENERAL = 201,
+    AUDIO_AOUT = 202,
+    AUDIO_AFILTER = 203,
+    AUDIO_VISUAL = 204,
+    AUDIO_RESAMPLER = 206,
+
+    VIDEO_GENERAL = 301,
+    VIDEO_VOUT = 302,
+    VIDEO_VFILTER = 303,
+    VIDEO_SUBPIC = 305,
+    VIDEO_SPLITTER = 306,
+
+    INPUT_GENERAL = 401,
+    INPUT_ACCESS = 402,
+    INPUT_DEMUX = 403,
+    INPUT_VCODEC = 404,
+    INPUT_ACODEC = 405,
+    INPUT_SCODEC = 406,
+    INPUT_STREAM_FILTER = 407,
+
+    SOUT_GENERAL = 501,
+    SOUT_STREAM = 502,
+    SOUT_MUX = 503,
+    SOUT_ACO = 504,
+    SOUT_PACKETIZER = 505,
+    SOUT_VOD = 507,
+    SOUT_RENDERER = 508,
+
+    ADVANCED_MISC = 602,
+    ADVANCED_NETWORK = 603,
+
+    PLAYLIST_GENERAL = 701,
+    PLAYLIST_SD = 702,
+    PLAYLIST_EXPORT = 703,
+}
+
+#derive(Debug, PartialEq, PartialOrd)
+#allow(non_camel_case_types)
+#repr(i32)
+pub enum ModuleProperties {
+    MODULE_CREATE,
+    CONFIG_CREATE,
+
+    MODULE_CPU_REQUIREMENT = 0x100,
+    MODULE_SHORTCUT,
+    MODULE_CAPABILITY,
+    MODULE_SCORE,
+    MODULE_CB_OPEN,
+    MODULE_CB_CLOSE,
+    MODULE_NO_UNLOAD,
+    MODULE_NAME,
+    MODULE_SHORTNAME,
+    MODULE_DESCRIPTION,
+    MODULE_HELP,
+    MODULE_TEXTDOMAIN,
+    MODULE_HELP_HTML,
+
+    CONFIG_NAME = 0x1000,
+    CONFIG_VALUE,
+    CONFIG_RANGE,
+    CONFIG_ADVANCED_RESERVED,
+    CONFIG_VOLATILE,
+    CONFIG_PERSISTENT_OBSOLETE,
+    CONFIG_PRIVATE,
+    CONFIG_REMOVED,
+    CONFIG_CAPABILITY,
+    CONFIG_SHORTCUT,
+    CONFIG_OLDNAME_OBSOLETE,
+    CONFIG_SAFE,
+    CONFIG_DESC,
+    CONFIG_LIST_OBSOLETE,
+    CONFIG_ADD_ACTION_OBSOLETE,
+    CONFIG_LIST,
+    CONFIG_LIST_CB_OBSOLETE,
+}
+
+impl TryFrom<i32> for ModuleProperties {
+    type Error = ();
+
+    fn try_from(opcode: i32) -> Result<Self, Self::Error> {
+        let prop = match opcode {
+            x if x == ModuleProperties::MODULE_CREATE as i32 => ModuleProperties::MODULE_CREATE,
+            x if x == ModuleProperties::CONFIG_CREATE as i32 => ModuleProperties::CONFIG_CREATE,
+
+            x if x == ModuleProperties::MODULE_CPU_REQUIREMENT as i32 => {
+                ModuleProperties::MODULE_CPU_REQUIREMENT
+            }
+            x if x == ModuleProperties::MODULE_SHORTCUT as i32 => ModuleProperties::MODULE_SHORTCUT,
+            x if x == ModuleProperties::MODULE_CAPABILITY as i32 => {
+                ModuleProperties::MODULE_CAPABILITY
+            }
+            x if x == ModuleProperties::MODULE_SCORE as i32 => ModuleProperties::MODULE_SCORE,
+            x if x == ModuleProperties::MODULE_CB_OPEN as i32 => ModuleProperties::MODULE_CB_OPEN,
+            x if x == ModuleProperties::MODULE_CB_CLOSE as i32 => ModuleProperties::MODULE_CB_CLOSE,
+            x if x == ModuleProperties::MODULE_NO_UNLOAD as i32 => {
+                ModuleProperties::MODULE_NO_UNLOAD
+            }
+            x if x == ModuleProperties::MODULE_NAME as i32 => ModuleProperties::MODULE_NAME,
+            x if x == ModuleProperties::MODULE_SHORTNAME as i32 => {
+                ModuleProperties::MODULE_SHORTNAME
+            }
+            x if x == ModuleProperties::MODULE_DESCRIPTION as i32 => {
+                ModuleProperties::MODULE_DESCRIPTION
+            }
+            x if x == ModuleProperties::MODULE_HELP as i32 => ModuleProperties::MODULE_HELP,
+            x if x == ModuleProperties::MODULE_TEXTDOMAIN as i32 => {
+                ModuleProperties::MODULE_TEXTDOMAIN
+            }
+            x if x == ModuleProperties::MODULE_HELP_HTML as i32 => {
+                ModuleProperties::MODULE_HELP_HTML
+            }
+
+            x if x == ModuleProperties::CONFIG_NAME as i32 => ModuleProperties::CONFIG_NAME,
+            x if x == ModuleProperties::CONFIG_VALUE as i32 => ModuleProperties::CONFIG_VALUE,
+            x if x == ModuleProperties::CONFIG_RANGE as i32 => ModuleProperties::CONFIG_RANGE,
+            x if x == ModuleProperties::CONFIG_ADVANCED_RESERVED as i32 => {
+                ModuleProperties::CONFIG_ADVANCED_RESERVED
+            }
+            x if x == ModuleProperties::CONFIG_VOLATILE as i32 => ModuleProperties::CONFIG_VOLATILE,
+            x if x == ModuleProperties::CONFIG_PERSISTENT_OBSOLETE as i32 => {
+                ModuleProperties::CONFIG_PERSISTENT_OBSOLETE
+            }
+            x if x == ModuleProperties::CONFIG_PRIVATE as i32 => ModuleProperties::CONFIG_PRIVATE,
+            x if x == ModuleProperties::CONFIG_REMOVED as i32 => ModuleProperties::CONFIG_REMOVED,
+            x if x == ModuleProperties::CONFIG_CAPABILITY as i32 => {
+                ModuleProperties::CONFIG_CAPABILITY
+            }
+            x if x == ModuleProperties::CONFIG_SHORTCUT as i32 => ModuleProperties::CONFIG_SHORTCUT,
+            x if x == ModuleProperties::CONFIG_OLDNAME_OBSOLETE as i32 => {
+                ModuleProperties::CONFIG_OLDNAME_OBSOLETE
+            }
+            x if x == ModuleProperties::CONFIG_SAFE as i32 => ModuleProperties::CONFIG_SAFE,
+            x if x == ModuleProperties::CONFIG_DESC as i32 => ModuleProperties::CONFIG_DESC,
+            x if x == ModuleProperties::CONFIG_LIST_OBSOLETE as i32 => {
+                ModuleProperties::CONFIG_LIST_OBSOLETE
+            }
+            x if x == ModuleProperties::CONFIG_ADD_ACTION_OBSOLETE as i32 => {
+                ModuleProperties::CONFIG_ADD_ACTION_OBSOLETE
+            }
+            x if x == ModuleProperties::CONFIG_LIST as i32 => ModuleProperties::CONFIG_LIST,
+            x if x == ModuleProperties::CONFIG_LIST_CB_OBSOLETE as i32 => {
+                ModuleProperties::CONFIG_LIST_CB_OBSOLETE
+            }
+            _ => return Err(()),
+        };
+        Ok(prop)
+    }
+}
+
+use std::ffi::c_int;
+#allow(non_camel_case_types)
+pub type vlc_activate = unsafe extern "C" fn(*mut Object) -> c_int;
+#allow(non_camel_case_types)
+pub type vlc_deactivate = unsafe extern "C" fn(*mut Object);
+
+///
+/// Exposes the activation and deactivation functions for modules.
+///
+/// Capabilities for modules are traits implementing a Loader type
+/// implementing the ModuleProtocol trait to provide the activation
+/// and deactivation functions for the module.
+///
+/// * `T`: Type implementing the final capability trait
+/// * `Activate`: Type for the activation function
+/// * `Deactivate`: Type for the deactivation function
+///
+/// ```no_run
+/// use vlcrs_core::plugin::ModuleProtocol;
+///
+/// /* New trait bringing support for new capabilities in modules. */
+///
+/// type ActivateFunction = unsafe extern "C" fn();
+/// type DeactivateFunction = unsafe extern "C" fn();
+/// trait NewCapabilityTrait {
+///     /* Mandatory type definition for capability traits */
+///
+///     /* Example capability interface, can be anything and can add
+///      * as many function as required. */
+///     fn open(&self);
+/// }
+///
+/// /* Implement a function to load modules implementing NewCapabilityTrait. */
+/// unsafe extern "C" fn activate_new_capability<ModuleType: NewCapabilityTrait>() {
+///     /* Do anything needed to initialize the module, for instance initializing
+///      * a ModuleType object and call the open() function on it. */
+/// }
+///
+/// /* Implement a module loader for this new capability trait. */
+/// struct NewCapabilityLoader;
+/// impl<ModuleType> ModuleProtocol<ModuleType>
+/// for NewCapabilityLoader
+/// where ModuleType : NewCapabilityTrait {
+///     type Activate = ActivateFunction;
+///     type Deactivate = DeactivateFunction;
+///
+///     fn activate_function() -> ActivateFunction { activate_new_capability::<ModuleType> }
+///     fn deactivate_function() -> Option<DeactivateFunction> { None }
+/// }
+/// ```
+pub trait ModuleProtocol<ModuleType: ?Sized> {
+    type Activate;
+    type Deactivate = *mut ();
+    fn activate_function() -> Self::Activate;
+    fn deactivate_function() -> Option<Self::Deactivate> {
+        None
+    }
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-core/src/plugin/sys.rs Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-core/src/tracer Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-core/src/tracer/mod.rs Added

@@ -0,0 +1,215 @@
+/// SPDX-License-Identifier: LGPL-2.1-or-later
+/// Copyright (C) 2024-2025 Alexandre Janniaux <ajanni@videolabs.io>
+///
+/// This program is free software; you can redistribute it and/or modify it
+/// under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation; either version 2.1 of the License, or
+/// (at your option) any later version.
+///
+/// This program is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with this program; if not, write to the Free Software Foundation,
+/// Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+use std::{
+    cell::UnsafeCell,
+    ffi::{c_char, c_void, CStr},
+    mem::MaybeUninit,
+    ptr::NonNull,
+};
+
+use crate::{object::Object, plugin::ModuleProtocol};
+
+pub mod sys;
+pub use sys::{Trace, TraceField};
+
+pub struct Tick(pub i64);
+
+///
+/// Trait representing the module capability for implementing tracers.
+///
+/// A type implementing the TracerCapability trait can be exposed to
+/// a vlcrs_macros::module! manifest using the
+/// TracerModuleLoader type loader, which will expose it as a "tracer"
+/// capability for VLC core.
+///
+/// Note that this trait *requires* Sync since the tracer is used
+/// from the C code in multiple threads at the same time.
+///
+/// Sync is automatically implemented by types using only Sync
+/// types, and is unsafe to implement. It means that the following
+/// implementation would not be possible without unsafe:
+///
+/// ```compile_fail
+/// use std::cell::Cell;
+/// use vlcrs_core::object::Object;
+/// use vlcrs_core::tracer::{Tick, TracerCapability, Trace};
+/// struct Module { last_trace_tick: Cell<Tick>, }
+/// impl TracerCapability for Module {
+///     fn open(obj: &mut Object) -> Option<impl TracerCapability> {
+///         Some(Self{ last_trace_tick: Cell::from(Tick(0)) })
+///     }
+///
+///     fn trace(&self, tick: Tick, entries: &Trace) {
+///         let mut state = self.last_trace_tick.get_mut();
+///         *state = tick;
+///     }
+/// }
+/// ````
+///
+/// As it will fail with the following error:
+///
+/// ```no_build
+///     test: vlcrs-core/src/tracer/mod.rs - tracer::TracerCapability (line 31)
+///     errorE0277: `Cell<Tick>` cannot be shared between threads safely
+///       --> vlcrs-core/src/tracer/mod.rs:36:27
+///        |
+///     8  | impl TracerCapability for Module {
+///        |                           ^^^^^^ `Cell<Tick>` cannot be shared between threads safely
+///        |
+///        = help: within `Module`, the trait `Sync` is not implemented for `Cell<Tick>`, which is required by `Module: Sync`
+///        = note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock`
+///     note: required because it appears within the type `Module`
+/// ````
+///
+/// Instead, proper concurrency handling must be implemented inside the
+/// object so that it becomes Sync and can be used in the multiples threads.
+///
+pub trait TracerCapability: Sync {
+    fn open(obj: &mut Object) -> Option<impl TracerCapability>
+    where
+        Self: Sized;
+
+    fn trace(&self, tick: Tick, entries: &Trace);
+}
+
+#allow(non_camel_case_types)
+pub type TracerCapabilityActivate =
+    unsafe extern "C" fn(
+        obj: &mut Object,
+        opaque: &mut MaybeUninit<*mut c_void>,
+    ) -> Option<&'static sys::vlc_tracer_operations>;
+
+extern "C" fn tracer_trace(opaque: *const c_void, tick: sys::vlc_tick, entries: sys::Trace) {
+    {
+        let tracer: &dyn TracerCapability =
+            unsafe { &**(opaque as *const Box<dyn TracerCapability>) };
+        tracer.trace(Tick(tick), &entries);
+    }
+}
+
+extern "C" fn tracer_destroy(opaque: *mut c_void) {
+    let tracer: *mut Box<dyn TracerCapability> = opaque as *mut _;
+    let _ = unsafe { Box::from_raw(tracer) };
+}
+
+const TRACER_OPERATIONS: sys::vlc_tracer_operations = sys::vlc_tracer_operations {
+    trace: tracer_trace,
+    destroy: tracer_destroy,
+};
+
+extern "C" fn activate_tracer<T: TracerCapability>(
+    obj: &mut Object,
+    opaque: &mut MaybeUninit<*mut c_void>,
+) -> Option<&'static sys::vlc_tracer_operations> {
+    if let Some(instance) = T::open(obj) {
+        let wrapper: Box<dyn TracerCapability> = Box::try_new(instance).ok()?;
+        let sys = Box::into_raw(Box::try_new(wrapper).ok()?);
+        opaque.write(sys as *mut _);
+        return Some(&TRACER_OPERATIONS);
+    }
+    None
+}
+
+///
+/// Loader type for the "tracer" capability, using the
+/// TracerCapability trait.
+///
+/// This is an implementation of the ModuleProtocol type for the
+/// TracerCapability trait, exposing modules from the declaration
+/// (`vlcrs_macros::module!`) of the manifest as a "tracer"
+/// capability for VLC core.
+///
+/// ```
+/// use vlcrs_core::tracer::{Tick, TracerCapability, TracerModuleLoader, Trace};
+/// use vlcrs_core::object::Object;
+/// use vlcrs_macros::module;
+/// struct CustomTracer {}
+///
+/// // Empty implementation
+/// impl TracerCapability for CustomTracer {
+///     fn open(obj: &mut Object) -> Option<impl TracerCapability> {
+///         Some(Self{})
+///     }
+///     fn trace(&self, _tick: Tick, _entries: &Trace) {}
+/// }
+///
+/// module!{
+///    type: CustomTracer (TracerModuleLoader),
+///    capability: "tracer" @ 0,
+///    category: ADVANCED_MISC,
+///    description: "Custom tracer implementation",
+///    shortname: "Custom tracer",
+///    shortcuts: "customtracer",
+///}
+/// ````
+pub struct TracerModuleLoader;
+
+impl<T> ModuleProtocol<T> for TracerModuleLoader
+where
+    T: TracerCapability,
+{
+    type Activate = TracerCapabilityActivate;
+    fn activate_function() -> Self::Activate {
+        activate_tracer::<T>
+    }
+}
+
+///
+/// Wrapper around a vlc_tracer implementation from VLC core.
+///
+/// Exposes the public API for using tracers from VLC core.
+///
+pub struct Tracer {
+    tracer: UnsafeCell<NonNull<sys::vlc_tracer>>,
+}
+
+impl Tracer {
+    ///
+    /// Request a new instance of a tracer from LibVLC.
+    ///
+    pub fn create(obj: &Object, name: &CStr) -> Option<Tracer> {
+        let name = name.as_ptr() as *const c_char;
+
+        // SAFETY: sys::vlc_tracer_Create() is safe as long as name is
+        //         null-terminated (given by CStr) and Object is valid,
+        //         which is given by requiring a reference.
+        let tracer: NonNull<sys::vlc_tracer> = unsafe { sys::vlc_tracer_Create(obj, name)? };
+
+        Some(Self {
+            tracer: UnsafeCell::new(tracer),
+        })
+    }
+
+    ///
+    /// Register the new point at time tick with the metadata entries.
+    ///
+    pub fn trace(&self, tick: Tick, entries: Trace) {
+        unsafe {
+            // SAFETY: TODO
+            let tracer = *self.tracer.get();
+
+            // SAFETY: the pointer `tracer` is guaranteed to be non-null and
+            //         nobody else has reference to it.
+            sys::vlc_tracer_TraceWithTs(tracer, tick.0, entries);
+        }
+    }
+}
+
+#macro_export
+macro_rules! trace {
+    ($tracer: ident, $ts: expr, $($key:ident = $value:expr)*) => {};
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-core/src/tracer/sys.rs Added

@@ -0,0 +1,195 @@
+#!allow(rustdoc::bare_urls)
+#!allow(rustdoc::broken_intra_doc_links)
+#!allow(non_upper_case_globals)
+#!allow(non_camel_case_types)
+#!allow(non_snake_case)
+
+/// SPDX-License-Identifier: LGPL-2.1-or-later
+/// Copyright (C) 2024-2025 Alexandre Janniaux <ajanni@videolabs.io>
+///
+/// This program is free software; you can redistribute it and/or modify it
+/// under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation; either version 2.1 of the License, or
+/// (at your option) any later version.
+///
+/// This program is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with this program; if not, write to the Free Software Foundation,
+/// Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+use std::{
+    ffi::{c_char, c_double, c_void, CStr},
+    ptr::NonNull,
+};
+
+use crate::object::Object;
+
+pub type vlc_tick = i64;
+
+#repr(C)
+#non_exhaustive
+#doc = "Tracer message values"
+#derive(Debug, Copy, Clone, Hash, PartialEq, Eq)
+pub enum vlc_tracer_value_type {
+    Integer = 0,
+    Double = 1,
+    String = 2,
+    Unsigned = 3,
+}
+
+#repr(C)
+#derive(Copy, Clone)
+pub union vlc_tracer_value {
+    pub integer: i64,
+    pub double: c_double,
+    pub string: *const c_char,
+    pub unsigned: u64,
+}
+
+#repr(C)
+#derive(Copy, Clone)
+pub struct vlc_tracer_entry {
+    pub key: *const c_char,
+    pub value: vlc_tracer_value,
+    pub kind: vlc_tracer_value_type,
+}
+
+#repr(C)
+pub struct vlc_tracer_trace {
+    pub entries: NonNull<vlc_tracer_entry>,
+}
+
+#repr(C)
+#derive(Debug, Copy, Clone)
+pub struct vlc_tracer {
+    _unused: u8; 0,
+}
+
+#derive(PartialEq, Copy, Clone)
+#repr(transparent)
+pub struct Trace {
+    pub entries: NonNull<vlc_tracer_trace>,
+}
+
+#derive(PartialEq, Copy, Clone, Debug)
+#repr(transparent)
+pub struct TraceField {
+    pub entry: NonNull<vlc_tracer_entry>,
+}
+
+impl TraceField {
+    pub fn key(&self) -> &str {
+        unsafe {
+            let key = CStr::from_ptr(self.entry.read().key);
+            key.to_str().unwrap()
+        }
+    }
+
+    pub fn kind(&self) -> vlc_tracer_value_type {
+        unsafe { self.entry.read().kind }
+    }
+
+    pub fn value(&self) -> vlc_tracer_value {
+        unsafe { self.entry.read().value }
+    }
+}
+
+pub struct TraceIterator {
+    current_field: NonNull<vlc_tracer_entry>,
+}
+
+impl IntoIterator for Trace {
+    type Item = TraceField;
+    type IntoIter = TraceIterator;
+    fn into_iter(self) -> Self::IntoIter {
+        TraceIterator {
+            current_field: unsafe { self.entries.read().entries },
+        }
+    }
+}
+
+impl Iterator for TraceIterator {
+    type Item = TraceField;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        unsafe {
+            if self.current_field.read().key.is_null() {
+                return None;
+            }
+            let output = Some(TraceField {
+                entry: self.current_field,
+            });
+            self.current_field = self.current_field.add(1);
+            output
+        }
+    }
+}
+
+#repr(C)
+#derive(Debug, Copy, Clone)
+pub struct vlc_tracer_operations {
+    pub trace: extern "C" fn(opaque: *const c_void, ts: vlc_tick, entries: Trace),
+    pub destroy: extern "C" fn(*mut c_void),
+}
+
+extern "C" {
+    pub fn vlc_tracer_Create(parent: &Object, name: *const c_char) -> Option<NonNull<vlc_tracer>>;
+
+    pub fn vlc_tracer_TraceWithTs(tracer: NonNull<vlc_tracer>, tick: vlc_tick, entries: Trace);
+}
+
+#cfg(test)
+mod test {
+    #test
+    fn test_trace_interop() {
+        use super::*;
+        let entries = 
+            vlc_tracer_entry {
+                kind: vlc_tracer_value_type::String,
+                value: vlc_tracer_value {
+                    string: c"value1".as_ptr(),
+                },
+                key: c"test1".as_ptr(),
+            },
+            vlc_tracer_entry {
+                kind: vlc_tracer_value_type::Integer,
+                value: vlc_tracer_value { integer: 0 },
+                key: std::ptr::null(),
+            },
+        ;
+
+        let trace_field = TraceField {
+            entry: NonNull::from(&entries0),
+        };
+        assert_eq!(trace_field.kind(), vlc_tracer_value_type::String);
+        assert_eq!(trace_field.key(), "test1");
+
+        let trace_field = TraceField {
+            entry: NonNull::from(&entries1),
+        };
+        assert_eq!(trace_field.kind(), vlc_tracer_value_type::Integer);
+
+        let trace = vlc_tracer_trace {
+            entries: NonNull::from(&entries0),
+        };
+
+        let trace = Trace {
+            entries: NonNull::from(&trace),
+        };
+
+        let mut iterator = trace.into_iter();
+
+        let first = iterator.next().expect("First field must be valid");
+        assert_eq!(first.kind(), vlc_tracer_value_type::String);
+        assert_eq!(first.key(), "test1");
+        unsafe {
+            assert_eq!(CStr::from_ptr(first.value().string), c"value1");
+        }
+
+        let second = iterator.next();
+        assert_eq!(second, None);
+    }
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-macros/Cargo.toml -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-macros/Cargo.toml Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-macros/src/lib.rs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-macros/src/lib.rs Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-macros/src/module.rs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-macros/src/module.rs Changed

@@ -546,7 +546,7 @@
                 vlc_set(
                     opaque,
                     module as _,
-                    ::vlcrs_plugin::ModuleProperties::MODULE_HELP as _,
+                    ::vlcrs_core::plugin::ModuleProperties::MODULE_HELP as _,
                     #help_with_nul,
                 )
             } != 0
@@ -563,7 +563,7 @@
                 vlc_set(
                     opaque,
                     module as _,
-                    ::vlcrs_plugin::ModuleProperties::MODULE_SHORTNAME as _,
+                    ::vlcrs_core::plugin::ModuleProperties::MODULE_SHORTNAME as _,
                     #shortname_with_nul,
                 )
             } != 0
@@ -587,7 +587,7 @@
                     vlc_set(
                         opaque,
                         module as _,
-                        ::vlcrs_plugin::ModuleProperties::MODULE_SHORTCUT as _,
+                        ::vlcrs_core::plugin::ModuleProperties::MODULE_SHORTCUT as _,
                         #shortcuts_with_nul_len,
                         SHORCUTS.as_ptr(),
                     )
@@ -605,9 +605,9 @@
                 vlc_set(
                     opaque,
                     ::std::ptr::null_mut(),
-                    ::vlcrs_plugin::ModuleProperties::CONFIG_CREATE as _,
-                    ::vlcrs_plugin::ConfigModule::SUBCATEGORY as i64,
-                    &mut config as *mut *mut ::vlcrs_plugin::vlc_param,
+                    ::vlcrs_core::plugin::ModuleProperties::CONFIG_CREATE as _,
+                    ::vlcrs_core::plugin::ConfigModule::SUBCATEGORY as std::ffi::c_int,
+                    &mut config as *mut *mut ::vlcrs_core::plugin::vlc_param,
                 )
             } != 0
             {
@@ -617,8 +617,8 @@
                 vlc_set(
                     opaque,
                     config as _,
-                    ::vlcrs_plugin::ModuleProperties::CONFIG_VALUE as _,
-                    ::vlcrs_plugin::ConfigSubcategory::#category as i64,
+                    ::vlcrs_core::plugin::ModuleProperties::CONFIG_VALUE as _,
+                    ::vlcrs_core::plugin::ConfigSubcategory::#category as std::ffi::c_int,
                 )
             } != 0
             {
@@ -664,9 +664,9 @@
                         vlc_set(
                             opaque,
                             ::std::ptr::null_mut(),
-                            ::vlcrs_plugin::ModuleProperties::CONFIG_CREATE as _,
-                            ::vlcrs_plugin::ConfigModule::SECTION as i64,
-                            &mut config as *mut *mut ::vlcrs_plugin::vlc_param,
+                            ::vlcrs_core::plugin::ModuleProperties::CONFIG_CREATE as _,
+                            ::vlcrs_core::plugin::ConfigModule::SECTION as std::ffi::c_int,
+                            &mut config as *mut *mut ::vlcrs_core::plugin::vlc_param,
                         )
                     } != 0
                     {
@@ -676,7 +676,7 @@
                         vlc_set(
                             opaque,
                             config.cast(),
-                            ::vlcrs_plugin::ModuleProperties::CONFIG_DESC as _,
+                            ::vlcrs_core::plugin::ModuleProperties::CONFIG_DESC as _,
                             #name_with_nul,
                             #description_with_nul,
                         )
@@ -698,9 +698,9 @@
                 };
 
                 let item_type = if has_rgb {
-                    quote! { ::vlcrs_plugin::ConfigModule::ITEM_RGB }
+                    quote! { ::vlcrs_core::plugin::ConfigModule::ITEM_RGB }
                 } else {
-                    quote! { ::vlcrs_plugin::ConfigModule::ITEM_INTEGER }
+                    quote! { ::vlcrs_core::plugin::ConfigModule::ITEM_INTEGER }
                 };
                 let range_type = Some(quote! { i64 });
 
@@ -712,7 +712,7 @@
                         ::std::convert::Into::<::std::ffi::c_double>::into(#default_)
                     }
                 };
-                let item_type = quote! { ::vlcrs_plugin::ConfigModule::ITEM_FLOAT };
+                let item_type = quote! { ::vlcrs_core::plugin::ConfigModule::ITEM_FLOAT };
                 let range_type = Some(quote! { ::std::ffi::c_double });
 
                 (value, item_type, range_type)
@@ -723,7 +723,7 @@
                         ::std::convert::Into::<i64>::into(#default_)
                     }
                 };
-                let item_type = quote! { ::vlcrs_plugin::ConfigModule::ITEM_BOOL };
+                let item_type = quote! { ::vlcrs_core::plugin::ConfigModule::ITEM_BOOL };
 
                 (value, item_type, None)
             } else if param.type_ == "str" {
@@ -739,17 +739,17 @@
                 };
 
                 let item_type = if has_font {
-                    quote! { ::vlcrs_plugin::ConfigModule::ITEM_FONT }
+                    quote! { ::vlcrs_core::plugin::ConfigModule::ITEM_FONT }
                 } else if has_savefile {
-                    quote! { ::vlcrs_plugin::ConfigModule::ITEM_SAVEFILE }
+                    quote! { ::vlcrs_core::plugin::ConfigModule::ITEM_SAVEFILE }
                 } else if has_loadfile {
-                    quote! { ::vlcrs_plugin::ConfigModule::ITEM_LOADFILE }
+                    quote! { ::vlcrs_core::plugin::ConfigModule::ITEM_LOADFILE }
                 } else if has_password {
-                    quote! { ::vlcrs_plugin::ConfigModule::ITEM_PASSWORD }
+                    quote! { ::vlcrs_core::plugin::ConfigModule::ITEM_PASSWORD }
                 } else if has_directory {
-                    quote! { ::vlcrs_plugin::ConfigModule::ITEM_DIRECTORY }
+                    quote! { ::vlcrs_core::plugin::ConfigModule::ITEM_DIRECTORY }
                 } else {
-                    quote! { ::vlcrs_plugin::ConfigModule::ITEM_STRING }
+                    quote! { ::vlcrs_core::plugin::ConfigModule::ITEM_STRING }
                 };
 
                 (value, item_type, None)
@@ -762,9 +762,9 @@
                     vlc_set(
                         opaque,
                         ::std::ptr::null_mut(),
-                        ::vlcrs_plugin::ModuleProperties::CONFIG_CREATE as _,
-                        #item_type as i64,
-                        &mut config as *mut *mut ::vlcrs_plugin::vlc_param,
+                        ::vlcrs_core::plugin::ModuleProperties::CONFIG_CREATE as _,
+                        #item_type as std::ffi::c_int,
+                        &mut config as *mut *mut ::vlcrs_core::plugin::vlc_param,
                     )
                 } != 0
                 {
@@ -774,7 +774,7 @@
                     vlc_set(
                         opaque,
                         config.cast(),
-                        ::vlcrs_plugin::ModuleProperties::CONFIG_DESC as _,
+                        ::vlcrs_core::plugin::ModuleProperties::CONFIG_DESC as _,
                         #text_with_nul,
                         #long_text_with_nul,
                     )
@@ -786,7 +786,7 @@
                     vlc_set(
                         opaque,
                         config.cast(),
-                        ::vlcrs_plugin::ModuleProperties::CONFIG_NAME as _,
+                        ::vlcrs_core::plugin::ModuleProperties::CONFIG_NAME as _,
                         #name_with_nul,
                     )
                 } != 0
@@ -797,7 +797,7 @@
                     vlc_set(
                         opaque,
                         config.cast(),
-                        ::vlcrs_plugin::ModuleProperties::CONFIG_VALUE as _,
+                        ::vlcrs_core::plugin::ModuleProperties::CONFIG_VALUE as _,
                         #value,
                     )
                 } != 0
@@ -812,7 +812,7 @@
                         vlc_set(
                             opaque,
                             config.cast(),
-                            ::vlcrs_plugin::ModuleProperties::CONFIG_REMOVED as _,
+                            ::vlcrs_core::plugin::ModuleProperties::CONFIG_REMOVED as _,
                         )
                     } != 0
                     {
@@ -830,7 +830,7 @@
                         vlc_set(
                             opaque,
                             config.cast(),
-                            ::vlcrs_plugin::ModuleProperties::CONFIG_RANGE as _,
+                            ::vlcrs_core::plugin::ModuleProperties::CONFIG_RANGE as _,
                             0,
                             0xFFFFFF
                         )
@@ -858,7 +858,7 @@
                             vlc_set(
                                 opaque,
                                 config.cast(),
-                                ::vlcrs_plugin::ModuleProperties::CONFIG_RANGE as _,
+                                ::vlcrs_core::plugin::ModuleProperties::CONFIG_RANGE as _,
                                 #from,
                                 #to
                             )
@@ -901,7 +901,7 @@
             vlc_set(
                 opaque,
                 module as _,
-                ::vlcrs_plugin::ModuleProperties::MODULE_CAPABILITY as _,
+                ::vlcrs_core::plugin::ModuleProperties::MODULE_CAPABILITY as _,
                 #capability_with_nul,
             )
         } != 0 {
@@ -911,7 +911,7 @@
             vlc_set(
                 opaque,
                 module as _,
-                ::vlcrs_plugin::ModuleProperties::MODULE_SCORE as _,
+                ::vlcrs_core::plugin::ModuleProperties::MODULE_SCORE as _,
                 ::std::convert::Into::<i32>::into(#score),
             )
         } != 0 {
@@ -922,7 +922,7 @@
             vlc_set(
                 opaque,
                 module as _,
-                ::vlcrs_plugin::ModuleProperties::MODULE_DESCRIPTION as _,
+                ::vlcrs_core::plugin::ModuleProperties::MODULE_DESCRIPTION as _,
                 #description_with_nul,
             )
         } != 0
@@ -936,7 +936,7 @@
             vlc_set(
                 opaque,
                 module as _,
-                ::vlcrs_plugin::ModuleProperties::MODULE_CB_OPEN as _,
+                ::vlcrs_core::plugin::ModuleProperties::MODULE_CB_OPEN as _,
                 #module_open_with_nul,
                 unsafe {
                     <#loader as ModuleProtocol<#type_>>::activate_function()
@@ -953,7 +953,7 @@
                 vlc_set(
                     opaque,
                     module as _,
-                    ::vlcrs_plugin::ModuleProperties::MODULE_CB_CLOSE as _,
+                    ::vlcrs_core::plugin::ModuleProperties::MODULE_CB_CLOSE as _,
                     #module_close_with_nul,
                     unsafe {
                         <#loader as ModuleProtocol<#type_>>::deactivate_function().unwrap()
@@ -999,7 +999,7 @@
         #no_mangle
         #doc(hidden)
         extern "C" fn #symbol() -> *const u8 {
-            ::vlcrs_plugin::VLC_COPYRIGHT_VIDEOLAN.as_ptr()
+            ::vlcrs_core::plugin::VLC_COPYRIGHT_VIDEOLAN.as_ptr()
         }
     }
 }
@@ -1010,7 +1010,7 @@
         #no_mangle
         #doc(hidden)
         extern "C" fn #symbol() -> *const u8 {
-            ::vlcrs_plugin::VLC_LICENSE_LGPL_2_1_PLUS.as_ptr()
+            ::vlcrs_core::plugin::VLC_LICENSE_LGPL_2_1_PLUS.as_ptr()
         }
     }
 }
@@ -1081,8 +1081,8 @@
                     vlc_set(
                         opaque,
                         module as _,
-                        ::vlcrs_plugin::ModuleProperties::MODULE_CREATE as _,
-                        &mut module as *mut *mut ::vlcrs_plugin::module_t,
+                        ::vlcrs_core::plugin::ModuleProperties::MODULE_CREATE as _,
+                        &mut module as *mut *mut ::vlcrs_core::plugin::module_t,
                     )
                 } != 0
                 {
@@ -1103,19 +1103,19 @@
             #no_mangle
             #doc(hidden)
             extern "C" fn #symbol(
-                vlc_set: ::vlcrs_plugin::sys::vlc_set_cb,
+                vlc_set: ::vlcrs_core::plugin::sys::vlc_set_cb,
                 opaque: *mut ::std::ffi::c_void,
             ) -> i32 {
-                use vlcrs_plugin::ModuleProtocol;
-                let mut module: *mut ::vlcrs_plugin::module_t = ::std::ptr::null_mut();
-                let mut config: *mut ::vlcrs_plugin::vlc_param = ::std::ptr::null_mut();
+                use vlcrs_core::plugin::ModuleProtocol;
+                let mut module: *mut ::vlcrs_core::plugin::module_t = ::std::ptr::null_mut();
+                let mut config: *mut ::vlcrs_core::plugin::vlc_param = ::std::ptr::null_mut();
 
                 if unsafe {
                     vlc_set(
                         opaque,
                         ::std::ptr::null_mut(),
-                        ::vlcrs_plugin::ModuleProperties::MODULE_CREATE as _,
-                        &mut module as *mut *mut ::vlcrs_plugin::module_t,
+                        ::vlcrs_core::plugin::ModuleProperties::MODULE_CREATE as _,
+                        &mut module as *mut *mut ::vlcrs_core::plugin::module_t,
                     )
                 } != 0
                 {
@@ -1125,7 +1125,7 @@
                     vlc_set(
                         opaque,
                         module as _,
-                        ::vlcrs_plugin::ModuleProperties::MODULE_NAME as _,
+                        ::vlcrs_core::plugin::ModuleProperties::MODULE_NAME as _,
                         #name_with_nul,
                     )
                 } != 0
@@ -1141,8 +1141,8 @@
     let module_entry_module_name = vlc_entry(Some(&module_suffix));
     let module_entry = vlc_entry(None);
 
-    let cfg_static = quote!{ #cfg(vlc_static_plugins) };
-    let cfg_not_static = quote!{ #cfg(not(vlc_static_plugins)) };
+    let cfg_static = quote! { #cfg(vlc_static_plugins) };
+    let cfg_not_static = quote! { #cfg(not(vlc_static_plugins)) };
 
     let expanded = quote! {
         #type_params
@@ -1168,6 +1168,7 @@
         #cfg_not_static
         #entry_copyright
 
+        #cfg_not_static
         #module_name
 
         #cfg_not_static

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-macros/tests/common/mod.rs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-macros/tests/common/mod.rs Changed

@@ -5,31 +5,35 @@
 /* This should only be in the tests/ final modules but cargo doesn't
  * seem to account them correctly otherwise. */
 
-use std::{ffi::{c_char, c_int, c_void}, marker::FnPtr};
-use vlcrs_plugin::{vlc_activate, vlc_deactivate};
+use std::{
+    ffi::{c_char, c_int, c_void},
+    marker::FnPtr,
+};
+use vlcrs_core::plugin::{vlc_activate, vlc_deactivate};
 
-pub struct TestContext<Activate, Deactivate=vlc_deactivate> {
+pub struct TestContext<Activate, Deactivate = vlc_deactivate> {
     pub command_cursor: usize,
-    pub commands: Vec<vlcrs_plugin::ModuleProperties>,
+    pub commands: Vec<vlcrs_core::plugin::ModuleProperties>,
     pub open_cb: Option<Activate>,
     pub close_cb: Option<Deactivate>,
 }
 
 pub fn load_manifest<Activate, Deactivate>(
     context: &mut TestContext<Activate, Deactivate>,
-    vlc_entry: extern "C" fn (vlc_set_cb: vlcrs_plugin::sys::vlc_set_cb, opaque: *mut c_void) -> c_int
-)
-    -> i32
-{
-    use vlcrs_plugin::ModuleProperties;
-
-    unsafe extern "C" fn set_cb<T : Sized + FnPtr>(
+    vlc_entry: extern "C" fn(
+        vlc_set_cb: vlcrs_core::plugin::sys::vlc_set_cb,
+        opaque: *mut c_void,
+    ) -> c_int,
+) -> i32 {
+    use vlcrs_core::plugin::ModuleProperties;
+
+    unsafe extern "C" fn set_cb<T: Sized + FnPtr>(
         context: *mut c_void,
         _target: *mut c_void,
         propid: c_int,
-        mut args: ...) -> c_int
-    {
-        let context : *mut TestContext::<T> = context as *mut _;
+        mut args: ...
+    ) -> c_int {
+        let context: *mut TestContext<T> = context as *mut _;
         let opcode = ModuleProperties::try_from(propid);
         println!("PropId: {:?} ({})", opcode, propid);
 
@@ -39,23 +43,16 @@
         assert_eq!((*context).commands(*context).command_cursor, opcode);
         (*context).command_cursor += 1;
 
-        if opcode == ModuleProperties::MODULE_CB_OPEN
-        {
+        if opcode == ModuleProperties::MODULE_CB_OPEN {
             let _name = args.arg::<*const c_char>();
             let func = args.arg::<*mut c_void>();
             assert_ne!(func, std::ptr::null_mut());
-            (*context).open_cb = unsafe {
-                Some(std::mem::transmute_copy(&func))
-            };
-        }
-        else if opcode == ModuleProperties::MODULE_CB_CLOSE
-        {
+            (*context).open_cb = unsafe { Some(std::mem::transmute_copy(&func)) };
+        } else if opcode == ModuleProperties::MODULE_CB_CLOSE {
             let _name = args.arg::<*const c_char>();
             let func = args.arg::<*mut c_void>();
             assert_ne!(func, std::ptr::null_mut());
-            (*context).close_cb = unsafe {
-                Some(std::mem::transmute_copy(&func))
-            };
+            (*context).close_cb = unsafe { Some(std::mem::transmute_copy(&func)) };
         }
 
         0

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-macros/tests/module.rs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-macros/tests/module.rs Changed

@@ -13,36 +13,31 @@
 
 use std::ffi::c_int;
 
-use vlcrs_plugin::{vlc_activate, vlc_deactivate};
+use vlcrs_core::plugin::{vlc_activate, vlc_deactivate};
 
 use vlcrs_core::object::Object;
 
-unsafe extern "C"
-fn activate_test<T: SpecificCapabilityModule>(_obj: *mut Object) -> c_int
-{
+unsafe extern "C" fn activate_test<T: SpecificCapabilityModule>(_obj: *mut Object) -> c_int {
     0
 }
 
-unsafe extern "C"
-fn deactivate_test<T: SpecificCapabilityModule>(_obj: *mut Object)
-{}
+unsafe extern "C" fn deactivate_test<T: SpecificCapabilityModule>(_obj: *mut Object) {}
 
-use vlcrs_plugin::ModuleProtocol;
+use vlcrs_core::plugin::ModuleProtocol;
 
 pub struct ModuleLoader;
 impl<T> ModuleProtocol<T> for ModuleLoader
-    where T: SpecificCapabilityModule
+where
+    T: SpecificCapabilityModule,
 {
     type Activate = vlc_activate;
     type Deactivate = vlc_deactivate;
 
-    fn activate_function() -> Self::Activate
-    {
+    fn activate_function() -> Self::Activate {
         activate_test::<T>
     }
 
-    fn deactivate_function() -> Option<Self::Deactivate>
-    {
+    fn deactivate_function() -> Option<Self::Deactivate> {
         Some(deactivate_test::<T>)
     }
 }
@@ -68,9 +63,8 @@
 }
 
 #test
-fn test_module_load_common_activate()
-{
-    use vlcrs_plugin::ModuleProperties;
+fn test_module_load_common_activate() {
+    use vlcrs_core::plugin::ModuleProperties;
 
     let mut context = TestContext::<vlc_activate> {
         command_cursor: 0,

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-macros/tests/module_default.rs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-macros/tests/module_default.rs Changed

@@ -13,17 +13,14 @@
 use vlcrs_macros::module;
 
 use std::ffi::{c_int, CStr};
-use vlcrs_plugin::{ModuleProtocol,vlc_activate};
+use vlcrs_core::plugin::{vlc_activate, ModuleProtocol};
 
 use vlcrs_core::object::Object;
 
-unsafe extern "C"
-fn activate_filter(_obj: *mut Object) -> c_int
-{
+unsafe extern "C" fn activate_filter(_obj: *mut Object) -> c_int {
     0
 }
 
-
 //
 // Create an implementation loader for the TestFilterCapability
 //
@@ -33,12 +30,12 @@
 /// Signal the core that we can load modules with this loader
 ///
 impl<T> ModuleProtocol<T> for FilterModuleLoader
-    where T: TestNoDeactivateCapability
+where
+    T: TestNoDeactivateCapability,
 {
     type Activate = vlc_activate;
     type Deactivate = *mut ();
-    fn activate_function() -> vlc_activate
-    {
+    fn activate_function() -> vlc_activate {
         activate_filter
     }
 }
@@ -71,12 +68,11 @@
 // module.
 //
 #test
-fn test_module_load_default_deactivate()
-{
-    let version = unsafe{ CStr::from_ptr(vlc_entry_api_version() as *const i8) };
+fn test_module_load_default_deactivate() {
+    let version = unsafe { CStr::from_ptr(vlc_entry_api_version() as *const i8) };
     assert_eq!(version, c"4.0.6");
 
-    use vlcrs_plugin::ModuleProperties;
+    use vlcrs_core::plugin::ModuleProperties;
     let mut context = TestContext::<vlc_activate> {
         command_cursor: 0,
         commands: vec!

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-macros/tests/module_multiple.rs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-macros/tests/module_multiple.rs Changed

@@ -12,27 +12,29 @@
 use vlcrs_macros::module;
 
 use std::ffi::c_int;
-use vlcrs_plugin::ModuleProtocol;
+use vlcrs_core::plugin::ModuleProtocol;
 
-extern {
+extern "C" {
     // Create a dummy different type to change the activation function.
     #allow(non_camel_case_types)
     pub type vlc_filter_t;
 }
 
 #allow(non_camel_case_types)
-type vlc_filter_activate = unsafe extern "C" fn (_obj: *mut vlc_filter_t, valid: &mut bool) -> c_int;
+type vlc_filter_activate = unsafe extern "C" fn(_obj: *mut vlc_filter_t, valid: &mut bool) -> c_int;
 
-unsafe extern "C"
-fn activate_filter<T: TestFilterCapability>(_obj: *mut vlc_filter_t, valid: &mut bool) -> c_int
-{
+unsafe extern "C" fn activate_filter<T: TestFilterCapability>(
+    _obj: *mut vlc_filter_t,
+    valid: &mut bool,
+) -> c_int {
     T::open(_obj, valid);
     0
 }
 
-unsafe extern "C"
-fn activate_other_filter<T: TestOtherCapability>(_obj: *mut vlc_filter_t, valid: &mut bool) -> c_int
-{
+unsafe extern "C" fn activate_other_filter<T: TestOtherCapability>(
+    _obj: *mut vlc_filter_t,
+    valid: &mut bool,
+) -> c_int {
     T::open(_obj, valid);
     0
 }
@@ -46,11 +48,11 @@
 /// Signal the core that we can load modules with this loader
 ///
 impl<T> ModuleProtocol<T> for FilterModuleLoader
-    where T: TestFilterCapability
+where
+    T: TestFilterCapability,
 {
     type Activate = vlc_filter_activate;
-    fn activate_function() -> Self::Activate
-    {
+    fn activate_function() -> Self::Activate {
         activate_filter::<T>
     }
 }
@@ -71,13 +73,14 @@
 }
 
 /* Implement dummy module capability */
-pub trait TestOtherCapability  {
+pub trait TestOtherCapability {
     fn open(obj: *mut vlc_filter_t, bool: &mut bool);
 }
 
 struct TestOtherCapabilityLoader;
 impl<T> ModuleProtocol<T> for TestOtherCapabilityLoader
-    where T: TestOtherCapability
+where
+    T: TestOtherCapability,
 {
     type Activate = vlc_filter_activate;
     fn activate_function() -> Self::Activate {
@@ -94,7 +97,6 @@
     }
 }
 
-
 //
 // Define a module manifest using this module capability
 // and this module.
@@ -123,9 +125,8 @@
 // module.
 //
 #test
-fn test_module_manifest_multiple_capabilities()
-{
-    use vlcrs_plugin::ModuleProperties;
+fn test_module_manifest_multiple_capabilities() {
+    use vlcrs_core::plugin::ModuleProperties;
     let mut context = TestContext::<vlc_filter_activate> {
         command_cursor: 0,
         commands: vec!

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/rust/vlcrs-macros/tests/module_specific.rs -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/rust/vlcrs-macros/tests/module_specific.rs Changed

@@ -12,30 +12,33 @@
 use vlcrs_macros::module;
 
 use std::ffi::c_int;
-use vlcrs_plugin::ModuleProtocol;
+use vlcrs_core::plugin::ModuleProtocol;
 
-extern {
+extern "C" {
     // Create a dummy different type to change the activation function.
     #allow(non_camel_case_types)
     pub type vlc_filter_t;
 }
 
 #allow(non_camel_case_types)
-type vlc_filter_activate = unsafe extern "C" fn (_obj: *mut vlc_filter_t, valid: &mut bool) -> c_int;
+type vlc_filter_activate = unsafe extern "C" fn(_obj: *mut vlc_filter_t, valid: &mut bool) -> c_int;
 
 #allow(non_camel_case_types)
-type vlc_filter_deactivate = unsafe extern "C" fn (_obj: *mut vlc_filter_t, valid: &mut bool) -> c_int;
+type vlc_filter_deactivate =
+    unsafe extern "C" fn(_obj: *mut vlc_filter_t, valid: &mut bool) -> c_int;
 
-unsafe extern "C"
-fn activate_filter<T: TestFilterCapability>(_obj: *mut vlc_filter_t, valid: &mut bool) -> c_int
-{
+unsafe extern "C" fn activate_filter<T: TestFilterCapability>(
+    _obj: *mut vlc_filter_t,
+    valid: &mut bool,
+) -> c_int {
     T::open(_obj, valid);
     0
 }
 
-unsafe extern "C"
-fn deactivate_filter<T: TestFilterCapability>(_obj: *mut vlc_filter_t, valid: &mut bool) -> c_int
-{
+unsafe extern "C" fn deactivate_filter<T: TestFilterCapability>(
+    _obj: *mut vlc_filter_t,
+    valid: &mut bool,
+) -> c_int {
     T::close(_obj, valid);
     0
 }
@@ -49,13 +52,13 @@
 /// Signal the core that we can load modules with this loader
 ///
 impl<T> ModuleProtocol<T> for FilterModuleLoader
-    where T: TestFilterCapability
+where
+    T: TestFilterCapability,
 {
     type Activate = vlc_filter_activate;
     type Deactivate = vlc_filter_deactivate;
 
-    fn activate_function() -> Self::Activate
-    {
+    fn activate_function() -> Self::Activate {
         activate_filter::<T>
     }
 
@@ -103,9 +106,8 @@
 // module.
 //
 #test
-fn test_module_load_specific_open()
-{
-    use vlcrs_plugin::ModuleProperties;
+fn test_module_load_specific_open() {
+    use vlcrs_core::plugin::ModuleProperties;
     let mut context = TestContext::<vlc_filter_activate, vlc_filter_deactivate> {
         command_cursor: 0,
         commands: vec!

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/stream_output/sap.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/stream_output/sap.c Changed

@@ -37,7 +37,7 @@
 #include <vlc_memstream.h>
 
 #include "stream_output.h"
-#include "libvlc.h"
+#include "../libvlc.h"
 
 /* SAP is always on that port */
 #define IPPORT_SAP 9875
@@ -63,11 +63,7 @@
     vlc_cond_t              wait;
 
     char                    groupNI_MAXNUMERICHOST;
-    union {
-        struct sockaddr     a;
-        struct sockaddr_in  in;
-        struct sockaddr_in6 in6;
-    } orig;
+    vlc_sockaddr            orig;
     socklen_t               origlen;
     int                     fd;
     unsigned                interval;
@@ -101,7 +97,7 @@
     strlcpy (addr->group, group, sizeof (addr->group));
     addr->fd = fd;
     addr->origlen = sizeof (addr->orig);
-    getsockname(fd, &addr->orig.a, &addr->origlen);
+    getsockname(fd, &addr->orig.sa, &addr->origlen);
 
     addr->interval = var_CreateGetInteger (obj, "sap-interval");
     vlc_cond_init (&addr->wait);
@@ -165,12 +161,7 @@
 {
     int i;
     char psz_addrNI_MAXNUMERICHOST;
-    union
-    {
-        struct sockaddr     a;
-        struct sockaddr_in  in;
-        struct sockaddr_in6 in6;
-    } addr;
+    vlc_sockaddr addr;
     socklen_t addrlen = 0;
     struct addrinfo *res;
 
@@ -191,13 +182,13 @@
     }
 
     /* Determine SAP multicast address automatically */
-    switch (addr.a.sa_family)
+    switch (addr.sa.sa_family)
     {
 #if defined (HAVE_INET_PTON) || defined (_WIN32)
         case AF_INET6:
         {
             /* See RFC3513 for list of valid IPv6 scopes */
-            struct in6_addr *a6 = &addr.in6.sin6_addr;
+            struct in6_addr *a6 = &addr.sin6.sin6_addr;
 
             memcpy( a6->s6_addr + 2, "\x00\x00\x00\x00\x00\x00"
                    "\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 );
@@ -214,7 +205,7 @@
         case AF_INET:
         {
             /* See RFC2365 for IPv4 scopes */
-            uint32_t ipv4 = addr.in.sin_addr.s_addr;
+            uint32_t ipv4 = addr.sin.sin_addr.s_addr;
 
             /* 224.0.0.0/24 => 224.0.0.255 */
             if ((ipv4 & htonl (0xffffff00)) == htonl (0xe0000000))
@@ -241,17 +232,17 @@
                 return NULL;
             }
 
-            addr.in.sin_addr.s_addr = ipv4;
+            addr.sin.sin_addr.s_addr = ipv4;
             break;
         }
 
         default:
             msg_Err (obj, "Address family %u not supported by SAP",
-                     (unsigned)addr.a.sa_family);
+                     (unsigned)addr.sa.sa_family);
             return NULL;
     }
 
-    i = vlc_getnameinfo( &addr.a, addrlen,
+    i = vlc_getnameinfo( &addr.sa, addrlen,
                          psz_addr, sizeof( psz_addr ), NULL, NI_NUMERICHOST );
 
     if( i )
@@ -289,26 +280,26 @@
     /* SAPv1, not encrypted, not compressed */
     uint8_t flags = 0x20;
 #ifdef AF_INET6
-    if (sap_addr->orig.a.sa_family == AF_INET6)
+    if (sap_addr->orig.sa.sa_family == AF_INET6)
         flags |= 0x10;
 #endif
     vlc_memstream_putc(&stream, flags);
     vlc_memstream_putc(&stream, 0x00); /* No authentication length */
     vlc_memstream_write(&stream, &(uint16_t){ vlc_tick_now() }, 2); /* ID hash */
 
-    switch (sap_addr->orig.a.sa_family)
+    switch (sap_addr->orig.sa.sa_family)
     {
 #ifdef AF_INET6
         case AF_INET6:
         {
-            const struct in6_addr *a6 = &sap_addr->orig.in6.sin6_addr;
+            const struct in6_addr *a6 = &sap_addr->orig.sin6.sin6_addr;
             vlc_memstream_write(&stream, a6, 16);
             break;
         }
 #endif
         case AF_INET:
         {
-            const struct in_addr *a4 = &sap_addr->orig.in.sin_addr;
+            const struct in_addr *a4 = &sap_addr->orig.sin.sin_addr;
             vlc_memstream_write(&stream, a4, 4);
             break;
         }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/test/picture_pool.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/test/picture_pool.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/text/charset.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/text/charset.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/text/strings.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/text/strings.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/text/unicode.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/text/unicode.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/display.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/display.c Changed

@@ -38,7 +38,7 @@
 #include <vlc_picture_pool.h>
 #include <vlc_codec.h>
 
-#include <libvlc.h>
+#include "../libvlc.h"
 
 #include "display.h"
 #include "vout_internal.h"
@@ -707,21 +707,14 @@
                               const vlc_viewpoint_t *p_viewpoint)
 {
     vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
+    vlc_viewpoint_t old_vp = osys->cfg.viewpoint;
+    osys->cfg.viewpoint = *p_viewpoint;
 
-    if (osys->cfg.viewpoint.yaw   != p_viewpoint->yaw ||
-        osys->cfg.viewpoint.pitch != p_viewpoint->pitch ||
-        osys->cfg.viewpoint.roll  != p_viewpoint->roll ||
-        osys->cfg.viewpoint.fov   != p_viewpoint->fov) {
-        vlc_viewpoint_t old_vp = osys->cfg.viewpoint;
-
-        osys->cfg.viewpoint = *p_viewpoint;
-
-        if (vd->ops->set_viewpoint)
-        {
-            if (vd->ops->set_viewpoint(vd, &osys->cfg.viewpoint)) {
-                msg_Err(vd, "Failed to change Viewpoint");
-                osys->cfg.viewpoint = old_vp;
-            }
+    if (vd->ops->set_viewpoint)
+    {
+        if (vd->ops->set_viewpoint(vd, &osys->cfg.viewpoint)) {
+            msg_Err(vd, "Failed to change Viewpoint");
+            osys->cfg.viewpoint = old_vp;
         }
     }
 }
@@ -769,6 +762,32 @@
     return VLC_SUCCESS;
 }
 
+void vout_SetDisplayProjection(vout_display_t *vd,
+                               video_projection_mode_t projection)
+{
+    vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
+    osys->cfg.projection = projection;
+    vout_display_ChangeProjection(vd, projection);
+}
+
+void vout_SetDisplayStereo(vout_display_t *vd, vlc_stereoscopic_mode_t mode)
+{
+    vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
+
+    if (osys->cfg.stereo_mode != mode) {
+        osys->cfg.stereo_mode = mode;
+        int err;
+        if (vd->ops->set_stereo)
+            err = vd->ops->set_stereo(vd, mode);
+        else
+            err = VLC_ENOTSUP; // not handled, we need to do it in the core
+        if (err != VLC_SUCCESS)
+        {
+            msg_Err(vd, "Failed to change multiview display mode");
+        }
+    }
+}
+
 vout_display_t *vout_display_New(vlc_object_t *parent,
                                  const video_format_t *source,
                                  vlc_video_context *vctx,
@@ -798,6 +817,8 @@
 
     osys->src_vctx = vctx ? vlc_video_context_Hold( vctx ) : NULL;
 
+    osys->cfg.stereo_mode = cfg->stereo_mode;
+
     /* */
     vout_display_t *vd = &osys->display;
     vd->source = &osys->source;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/inhibit.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/inhibit.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/opengl.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/opengl.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/video_epg.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/video_epg.c Changed

@@ -109,7 +109,7 @@
     if (!region)
         return NULL;
 
-    region->b_absolute = false;
+    region->b_absolute = false; region->b_in_window = false;
     region->i_align = SUBPICTURE_ALIGN_LEFT | SUBPICTURE_ALIGN_TOP;
     region->i_x = x;
     region->i_y = y;
@@ -146,7 +146,7 @@
     if (!region)
         return NULL;
 
-    region->b_absolute = false;
+    region->b_absolute = false; region->b_in_window = false;
     region->i_align = SUBPICTURE_ALIGN_LEFT | SUBPICTURE_ALIGN_TOP;
     region->i_x = x;
     region->i_y = y;
@@ -236,7 +236,7 @@
             spuregion_CreateFromPicture( p_obj, &fmt_out, psz_uri );
     if( image )
     {
-        image->b_absolute = false;
+        image->b_absolute = false; image->b_in_window = false;
         image->i_x = x;
         image->i_y = y;
         image->i_align = SUBPICTURE_ALIGN_LEFT|SUBPICTURE_ALIGN_TOP;
@@ -263,7 +263,7 @@
     if (!region)
         return NULL;
 
-    region->b_absolute = false;
+    region->b_absolute = false; region->b_in_window = false;
     region->fmt.i_sar_num = 1;
     region->fmt.i_sar_den = 1;
     region->p_text   = p_segment;
@@ -498,15 +498,12 @@
 }
 
 static void OSDEpgUpdate(subpicture_t *subpic,
-                         const video_format_t *prev_src, const video_format_t *fmt_src,
-                         const video_format_t *prev_dst, const video_format_t *fmt_dst,
-                         vlc_tick_t ts)
+                         const struct vlc_spu_updater_configuration *cfg)
 {
     epg_spu_updater_sys_t *sys = subpic->updater.sys;
-    VLC_UNUSED(fmt_src); VLC_UNUSED(ts);
-    VLC_UNUSED(prev_src);
+    const video_format_t *fmt_dst = cfg->video_dst;
 
-    if (video_format_IsSimilar(prev_dst, fmt_dst))
+    if (video_format_IsSimilar(cfg->prev_dst, fmt_dst))
         return;
 
     vlc_spu_regions_Clear( &subpic->regions );

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/video_output.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/video_output.c Changed

@@ -53,7 +53,7 @@
 #include <vlc_tracer.h>
 #include <vlc_atomic.h>
 
-#include <libvlc.h>
+#include "../libvlc.h"
 #include "vout_private.h"
 #include "vout_internal.h"
 #include "display.h"
@@ -119,6 +119,7 @@
         bool        is_interlaced;
         picture_t   *decoded; // decoded picture before passed through chain_static
         picture_t   *current;
+        video_projection_mode_t projection;
     } displayed;
 
     struct {
@@ -316,6 +317,10 @@
         if (!filter_chain_MouseFilter(sys->filter.chain_static,
                                       &tmp1, m))
             m = &tmp1;
+
+        bool has_mouse_filter = filter_chain_HasMouseFilter(sys->filter.chain_interactive) ||
+                                filter_chain_HasMouseFilter(sys->filter.chain_static);
+        vlc_mouse_SetMouseFilter(m, has_mouse_filter);
     }
     vlc_mutex_unlock(&sys->filter.lock);
 
@@ -673,6 +678,62 @@
     vlc_queuedmutex_unlock(&sys->display_lock);
 }
 
+void vout_ToggleProjection(vout_thread_t *vout, bool enabled)
+{
+    vout_thread_sys_t *sys = VOUT_THREAD_TO_SYS(vout);
+    assert(!sys->dummy);
+
+    video_projection_mode_t projection;
+    if (sys->displayed.projection != PROJECTION_MODE_RECTANGULAR && !enabled)
+        projection = PROJECTION_MODE_RECTANGULAR;
+    else if (sys->original.projection_mode != PROJECTION_MODE_RECTANGULAR && enabled)
+        projection = sys->original.projection_mode;
+    else return;
+
+    vlc_queuedmutex_lock(&sys->display_lock);
+    if (sys->display != NULL)
+        vout_SetDisplayProjection(sys->display, projection);
+    vlc_queuedmutex_unlock(&sys->display_lock);
+
+}
+
+void vout_ResetProjection(vout_thread_t *vout)
+{
+    vout_thread_sys_t *sys = VOUT_THREAD_TO_SYS(vout);
+    assert(!sys->dummy);
+
+    msg_Dbg(vout, "resetting projection_mode to %d", sys->original.projection_mode);
+    vout_ChangeProjection(vout, sys->original.projection_mode);
+}
+
+void vout_ChangeProjection(vout_thread_t *vout,
+                           video_projection_mode_t projection)
+{
+    vout_thread_sys_t *sys = VOUT_THREAD_TO_SYS(vout);
+    assert(!sys->dummy);
+
+    /* Use vout_ResetProjection instead. */
+    assert((int)projection != -1);
+    msg_Dbg(vout, "setting projection_mode to %d", projection);
+
+    vlc_queuedmutex_lock(&sys->display_lock);
+    if (sys->display != NULL)
+        vout_SetDisplayProjection(sys->display, projection);
+    vlc_queuedmutex_unlock(&sys->display_lock);
+}
+
+void vout_ControlChangeStereo(vout_thread_t *vout, vlc_stereoscopic_mode_t mode)
+{
+    vout_thread_sys_t *sys = VOUT_THREAD_TO_SYS(vout);
+    assert(!sys->dummy);
+
+    vlc_queuedmutex_lock(&sys->display_lock);
+    sys->display_cfg.stereo_mode = mode;
+    if (sys->display != NULL)
+        vout_SetDisplayStereo(sys->display, mode);
+    vlc_queuedmutex_unlock(&sys->display_lock);
+}
+
 /* */
 static void VoutGetDisplayCfg(vout_thread_sys_t *p_vout, const video_format_t *fmt, vout_display_cfg_t *cfg)
 {
@@ -711,6 +772,7 @@
         cfg->display.align.vertical = VLC_VIDEO_ALIGN_TOP;
     else if (align_mask & VOUT_ALIGN_BOTTOM)
         cfg->display.align.vertical = VLC_VIDEO_ALIGN_BOTTOM;
+    cfg->stereo_mode = var_GetInteger(vout, "video-stereo-mode");
 }
 
 /* */
@@ -1810,6 +1872,12 @@
     dcfg.display.width = sys->window_width;
     dcfg.display.height = sys->window_height;
 
+    int projection = var_InheritInteger(&vout->obj, "projection-mode");
+    if (projection == -1)
+        dcfg.projection = sys->original.projection_mode;
+    else if (projection >= 0)
+        dcfg.projection = (video_projection_mode_t)projection;
+
     sys->private_pool =
         picture_pool_NewFromFormat(&sys->original, FILTER_POOL_SIZE);
     if (sys->private_pool == NULL) {
@@ -2302,6 +2370,7 @@
     vlc_mutex_lock(&sys->window_lock);
     video_format_Clean(&sys->original);
     sys->original = original;
+    sys->displayed.projection = original.projection_mode;
     vout_InitSource(vout);
 
     if (EnableWindowLocked(vout, &original) != 0)

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/video_text.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/video_text.c Changed

@@ -38,15 +38,12 @@
 } osd_spu_updater_sys_t;
 
 static void OSDTextUpdate(subpicture_t *subpic,
-                          const video_format_t *prev_src, const video_format_t *fmt_src,
-                          const video_format_t *prev_dst, const video_format_t *fmt_dst,
-                          vlc_tick_t ts)
+                          const struct vlc_spu_updater_configuration *cfg)
 {
     osd_spu_updater_sys_t *sys = subpic->updater.sys;
-    VLC_UNUSED(fmt_src); VLC_UNUSED(ts);
-    VLC_UNUSED(prev_src);
+    const video_format_t *fmt_dst = cfg->video_dst;
 
-    if (video_format_IsSimilar(prev_dst, fmt_dst))
+    if (video_format_IsSimilar(cfg->prev_dst, fmt_dst))
         return;
 
     vlc_spu_regions_Clear( &subpic->regions );
@@ -70,7 +67,7 @@
     const int   margin_v     = margin_ratio * fmt_dst->i_visible_height;
 
     r->text_flags |= sys->position;
-    r->b_absolute = false;
+    r->b_absolute = false; r->b_in_window = false;
     r->i_align = sys->position;
     if (r->i_align & SUBPICTURE_ALIGN_LEFT)
         r->i_x = margin_h + fmt_dst->i_x_offset;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/video_widgets.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/video_widgets.c Changed

@@ -255,16 +255,13 @@
 } osdwidget_spu_updater_sys_t;
 
 static void OSDWidgetUpdate(subpicture_t *subpic,
-                            const video_format_t *prev_src, const video_format_t *fmt_src,
-                            const video_format_t *prev_dst, const video_format_t *fmt_dst,
-                            vlc_tick_t ts)
+                            const struct vlc_spu_updater_configuration *cfg)
 {
     osdwidget_spu_updater_sys_t *sys = subpic->updater.sys;
     subpicture_region_t *p_region;
-    VLC_UNUSED(fmt_src); VLC_UNUSED(ts);
-    VLC_UNUSED(prev_src);
+    const video_format_t *fmt_dst = cfg->video_dst;
 
-    if (video_format_IsSimilar(prev_dst, fmt_dst))
+    if (video_format_IsSimilar(cfg->prev_dst, fmt_dst))
         return;
 
     vlc_spu_regions_Clear( &subpic->regions );
@@ -285,6 +282,7 @@
     if (p_region)
     {
         p_region->b_absolute = true;
+        p_region->b_in_window = true;
         vlc_spu_regions_push(&subpic->regions, p_region);
     }
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/vout_internal.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/vout_internal.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/vout_intf.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/vout_intf.c Changed

@@ -82,6 +82,14 @@
                                        vlc_value_t, vlc_value_t, void * );
 static int ViewpointCallback( vlc_object_t *, char const *,
                               vlc_value_t, vlc_value_t, void * );
+static int Stereo3DCallback( vlc_object_t *, char const *,
+                             vlc_value_t, vlc_value_t, void * );
+
+static int OverrideProjectionCallback( vlc_object_t *, char const *,
+                              vlc_value_t, vlc_value_t, void * );
+
+static int ChangeProjectionCallback( vlc_object_t *, char const *,
+                              vlc_value_t, vlc_value_t, void * );
 
 /*****************************************************************************
  * vout_IntfInit: called during the vout creation to initialise misc things.
@@ -143,6 +151,18 @@
     { VLC_VIDEO_FIT_HEIGHT,  N_("Window Height") },
 };
 
+static const struct
+{
+    int i_value;
+    char psz_label13;
+} p_3D_output_format_values = {
+    { VIDEO_STEREO_OUTPUT_AUTO, N_("Auto") },
+    { VIDEO_STEREO_OUTPUT_STEREO, N_("Stereo") },
+    { VIDEO_STEREO_OUTPUT_LEFT_ONLY, N_("Left Only") },
+    { VIDEO_STEREO_OUTPUT_RIGHT_ONLY, N_("Right Only") },
+    { VIDEO_STEREO_OUTPUT_SIDE_BY_SIDE, N_("Side-by-Side") },
+};
+
 static void AddCustomRatios( vout_thread_t *p_vout, const char *psz_var,
                              char *psz_list )
 {
@@ -211,6 +231,16 @@
                     vlc_gettext( p_zoom_valuesi.psz_label ) );
     }
 
+    var_Create( p_vout, "video-stereo-mode", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Change( p_vout, "video-stereo-mode", VLC_VAR_SETTEXT, _("video-stereo-output"), NULL );
+
+    for( size_t i = 0; i < ARRAY_SIZE(p_3D_output_format_values); i++ )
+    {
+        val.i_int = p_3D_output_format_valuesi.i_value;
+        var_Change( p_vout, "video-stereo-mode", VLC_VAR_ADDCHOICE, val,
+                    vlc_gettext( p_3D_output_format_valuesi.psz_label ) );
+    }
+
     /* Crop offset vars */
     var_Create( p_vout, "crop-left", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
     var_Create( p_vout, "crop-top", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
@@ -328,6 +358,11 @@
     /* SPU in full window */
     var_Create( p_vout, "spu-fill", VLC_VAR_BOOL | VLC_VAR_DOINHERIT
                 | VLC_VAR_ISCOMMAND );
+
+    var_Create(p_vout, "override-projection", VLC_VAR_BOOL);
+    var_SetBool(p_vout, "override-projection", false);
+
+    var_Create(p_vout, "projection-mode", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
 }
 
 void vout_IntfInit( vout_thread_t *p_vout )
@@ -350,6 +385,9 @@
     var_AddCallback( p_vout, "sub-filter", SubFilterCallback, NULL );
     var_AddCallback( p_vout, "sub-margin", SubMarginCallback, NULL );
     var_AddCallback( p_vout, "viewpoint", ViewpointCallback, NULL );
+    var_AddCallback( p_vout, "override-projection", OverrideProjectionCallback, NULL );
+    var_AddCallback( p_vout, "projection-mode", ChangeProjectionCallback, NULL );
+    var_AddCallback(p_vout, "video-stereo-mode", Stereo3DCallback, NULL);
 }
 
 void vout_IntfReinit( vout_thread_t *p_vout )
@@ -364,6 +402,9 @@
         cause unwanted OSD on vout start. Filter out it there. */
     var_TriggerCallback( p_vout, "sub-margin" );
     var_TriggerCallback( p_vout, "secondary-sub-margin" );
+
+    var_TriggerCallback( p_vout, "projection-mode" );
+    var_TriggerCallback(p_vout, "video-stereo-mode");
 }
 
 void vout_IntfDeinit(vlc_object_t *obj)
@@ -387,6 +428,9 @@
     var_DelCallback(obj, "zoom", ZoomCallback, NULL);
     var_DelCallback(obj, "fit", FitCallback, NULL);
     var_DelCallback(obj, "autoscale", AutoScaleCallback, NULL);
+    var_DelCallback(obj, "override-projection", OverrideProjectionCallback, NULL);
+    var_DelCallback(obj, "projection-mode", ChangeProjectionCallback, NULL);
+    var_DelCallback(obj, "video-stereo-mode", Stereo3DCallback, NULL);
 }
 
 /*****************************************************************************
@@ -614,6 +658,48 @@
     return VLC_SUCCESS;
 }
 
+static int OverrideProjectionCallback( vlc_object_t *obj, char const *name,
+                              vlc_value_t prev, vlc_value_t cur, void *data )
+{
+    VLC_UNUSED(name); VLC_UNUSED(prev); VLC_UNUSED(data);
+    vout_thread_t *vout = (vout_thread_t *)obj;
+
+    vout_OSDMessage(vout, VOUT_SPU_CHANNEL_OSD, "Projection: %s", cur.b_bool ? "disabled" : "enabled");
+    vout_ToggleProjection(vout, !cur.b_bool);
+    return VLC_SUCCESS;
+}
+
+static int ChangeProjectionCallback( vlc_object_t *obj, char const *name,
+                              vlc_value_t prev, vlc_value_t cur, void *data )
+{
+    VLC_UNUSED(name); VLC_UNUSED(prev); VLC_UNUSED(data);
+    vout_thread_t *vout = (vout_thread_t *)obj;
+
+    const char *projection;
+    switch(cur.i_int)
+    {
+        case -1:                                        projection = "source"; break;
+        case PROJECTION_MODE_RECTANGULAR:               projection = "rectangular"; break;
+        case PROJECTION_MODE_EQUIRECTANGULAR:           projection = "equirectangular"; break;
+        case PROJECTION_MODE_CUBEMAP_LAYOUT_STANDARD:   projection = "cubemap (standard)"; break;
+        default: projection = "unknown"; break;
+    }
+
+    vout_OSDMessage(vout, VOUT_SPU_CHANNEL_OSD, "Projection: %s", projection);
+    if (cur.i_int == -1)
+    {
+        vout_ResetProjection(vout);
+        return VLC_SUCCESS;
+    }
+    else if (cur.i_int < 0 || cur.i_int > (int)PROJECTION_MODE_CUBEMAP_LAYOUT_STANDARD)
+    {
+        return VLC_EGENERIC;
+    }
+
+    vout_ChangeProjection(vout, cur.i_int);
+    return VLC_SUCCESS;
+}
+
 static int ZoomCallback( vlc_object_t *obj, char const *name,
                          vlc_value_t prev, vlc_value_t cur, void *data )
 {
@@ -624,6 +710,15 @@
     return VLC_SUCCESS;
 }
 
+static int Stereo3DCallback( vlc_object_t *obj, char const *name,
+                         vlc_value_t prev, vlc_value_t cur, void *data )
+{
+    vout_thread_t *p_vout = (vout_thread_t *)obj;
+    (void) name; (void) prev; (void) data;
+    vout_ControlChangeStereo( p_vout, cur.i_int );
+    return VLC_SUCCESS;
+}
+
 static int AboveCallback( vlc_object_t *obj, char const *name,
                           vlc_value_t prev, vlc_value_t cur, void *data )
 {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/vout_subpictures.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/vout_subpictures.c Changed

@@ -84,7 +84,11 @@
 };
 typedef struct VLC_VECTOR(struct subtitle_position_cache) subtitles_positions_vector;
 
+typedef struct spu_private_t spu_private_t;
+
 struct spu_private_t {
+    spu_t spu;
+
     vlc_mutex_t  lock;            /* lock to protect all following fields */
     input_thread_t *input;
 
@@ -95,7 +99,7 @@
     vlc_mutex_t textlock;
     filter_t *scale_yuvp;                     /**< scaling module for YUVP */
     filter_t *scale;                    /**< scaling module (all but YUVP) */
-    bool force_crop;                     /**< force cropping of subpicture */
+    bool crop_highlight;                     /**< force cropping of subpicture */
     struct {
         int x;
         int y;
@@ -246,7 +250,7 @@
 
 static struct spu_channel *spu_GetChannel(spu_t *spu, size_t channel_id, size_t *index)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     for (size_t i = 0; i < sys->channels.size; ++i)
     {
@@ -262,7 +266,7 @@
 
 static ssize_t spu_GetFreeChannelId(spu_t *spu, enum vlc_vout_order *order)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     if (unlikely(sys->channels.size > SSIZE_MAX))
         return VOUT_SPU_CHANNEL_INVALID;
@@ -294,10 +298,11 @@
                                int *attachment_count)
 {
     spu_t *spu = filter->owner.sys;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
-    if (spu->p->input)
+    if (sys->input)
     {
-        int count = input_GetAttachments(spu->p->input, attachment_ptr);
+        int count = input_GetAttachments(sys->input, attachment_ptr);
         if (count <= 0)
             return VLC_EGENERIC;
         *attachment_count = count;
@@ -404,7 +409,7 @@
                           unsigned output_height,
                           const vlc_fourcc_t *chroma_list)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
     assert(subpicture_region_IsText( region ));
     if ( region->p_text == NULL )
         return NULL;
@@ -577,8 +582,8 @@
 }
 
 
-static void SpuAreaFitInside(spu_area_t *area, const unsigned boundary_width,
-                                               const unsigned boundary_height)
+static void SpuAreaMoveInside(spu_area_t *area, const unsigned boundary_width,
+                                                const unsigned boundary_height)
 {
     spu_area_t a = spu_area_scaled(*area);
     bool modified = false;
@@ -779,10 +784,16 @@
                                                  entry->orgstart, channel->rate,
                                                  NULL);
 
-        entry->stop =
-            vlc_clock_ConvertToSystem(channel->clock, system_now,
-                                      entry->orgstop, channel->rate,
-                                      NULL);
+        if (entry->orgstop != VLC_TICK_INVALID)
+        {
+            entry->stop = vlc_clock_ConvertToSystem(channel->clock,
+                                                    system_now,
+                                                    entry->orgstop,
+                                                    channel->rate,
+                                                    NULL);
+        }
+        else
+            entry->stop = VLC_TICK_INVALID;
     }
     vlc_clock_Unlock(channel->clock);
 
@@ -823,7 +834,7 @@
                       vlc_tick_t render_subtitle_date,
                       bool ignore_osd, size_t *subpicture_count)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     assert(sys->channels.size >= VOUT_SPU_CHANNEL_OSD_COUNT);
 
@@ -951,12 +962,13 @@
                             subpicture_region_t *region,
                             const spu_scale_t scale_size, bool apply_scale,
                             const vlc_fourcc_t *chroma_list,
+                            const unsigned output_x, const unsigned output_y,
                             const unsigned output_width, const unsigned output_height,
                             const spu_area_t *subtitle_area, size_t subtitle_area_count,
                             vlc_tick_t render_date)
 {
     assert(!subpicture_region_IsText( region ));
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     if (scale_size.h == SCALE_UNIT && scale_size.w == SCALE_UNIT)
         apply_scale = false;
@@ -968,12 +980,12 @@
     picture_t *region_picture;
 
     /* Force palette if requested
-     * FIXME b_force_palette and force_crop are applied to all subpictures using palette
+     * FIXME b_force_palette and crop_highlight are applied to all subpictures using palette
      * instead of only the right one (being the dvd spu).
      */
     const bool using_palette = region->p_picture->format.i_chroma == VLC_CODEC_YUVP;
     const bool force_palette = using_palette && sys->palette.i_entries > 0;
-    const bool crop_requested = (force_palette && sys->force_crop) ||
+    const bool crop_requested = (force_palette && sys->crop_highlight) ||
                                 region->i_max_width || region->i_max_height;
     bool changed_palette     = false;
 
@@ -989,9 +1001,11 @@
     /* Place the picture
      * We compute the position in the rendered size */
 
-    int i_align = region->i_align;
-    if (channel_order == VLC_VOUT_ORDER_SECONDARY)
-        i_align = sys->secondary_alignment >= 0 ? sys->secondary_alignment : i_align;
+    int i_align;
+    if (channel_order == VLC_VOUT_ORDER_SECONDARY && sys->secondary_alignment >= 0)
+        i_align = sys->secondary_alignment;
+    else
+        i_align = region->i_align;
 
     SpuRegionPlace(&x_offset, &y_offset,
                    subpic, region, i_align);
@@ -1035,7 +1049,9 @@
     if (subpic->b_subtitle)
         restrained.y -= y_margin;
 
-    SpuAreaFitInside(&restrained, output_width, output_height);
+    SpuAreaMoveInside(&restrained,
+                      apply_scale ? (output_x + output_width ) : spu_invscale_w(output_x + output_width, scale_size),
+                      apply_scale ? (output_y + output_height) : spu_invscale_h(output_y + output_height, scale_size));
 
     /* Fix the position for the current scale_size */
     x_offset = spu_scale_w(restrained.x, restrained.scale);
@@ -1108,31 +1124,29 @@
     if ((apply_scale && (scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT)) || convert_chroma)
     {
         /* Destroy the cache if unusable */
-        if (region->p_private) {
-            subpicture_region_private_t *private = region->p_private;
+        if (!subpicture_region_cache_IsValid(region)) {
+            const video_format_t *cachefmt = subpicture_region_cache_GetFormat(region);
             bool is_changed = false;
 
             /* Check resize changes */
-            if (dst_width  != private->fmt.i_visible_width ||
-                dst_height != private->fmt.i_visible_height)
+            if (dst_width  != cachefmt->i_visible_width ||
+                dst_height != cachefmt->i_visible_height)
                 is_changed = true;
 
             /* Check forced palette changes */
             if (changed_palette)
                 is_changed = true;
 
-            if (convert_chroma && private->fmt.i_chroma != chroma_list0)
+            if (convert_chroma && cachefmt->i_chroma != chroma_list0)
                 is_changed = true;
 
             if (is_changed) {
-                subpicture_region_private_Delete(private);
-                region->p_private = NULL;
+                subpicture_region_cache_Invalidate(region);
             }
         }
 
         /* Scale if needed into cache */
-        if (!region->p_private) {
-            filter_t *scale = sys->scale;
+        if (!subpicture_region_cache_IsValid(region)) {
 
             picture_t *picture = region->p_picture;
             picture_Hold(picture);
@@ -1165,6 +1179,7 @@
                  picture->format.i_visible_height != dst_height ||
                  (convert_chroma && !using_palette)))
             {
+                filter_t *scale = sys->scale;
                 scale->fmt_in.video  = picture->format;
                 scale->fmt_out.video = picture->format;
                 if (using_palette)
@@ -1191,26 +1206,22 @@
 
             /* */
             if (picture) {
-                region->p_private = subpicture_region_private_New(&picture->format);
-                if (region->p_private) {
-                    region->p_private->p_picture = picture;
-                } else {
+                if(subpicture_region_cache_Assign(region, picture) != VLC_SUCCESS)
                     picture_Release(picture);
-                }
             }
         }
 
         /* And use the scaled picture */
-        if (region->p_private) {
-            region_fmt     = region->p_private->fmt;
-            region_picture = region->p_private->p_picture;
+        if (subpicture_region_cache_IsValid(region)) {
+            region_fmt     = *subpicture_region_cache_GetFormat(region);
+            region_picture = subpicture_region_cache_GetPicture(region);
         }
     }
 
     /* Force cropping if requested */
     if (crop_requested) {
         int crop_x, crop_y, crop_width, crop_height;
-        if(sys->force_crop){
+        if(sys->crop_highlight){
             crop_x     = apply_scale ? spu_scale_w(sys->crop.x, scale_size) : sys->crop.x;
             crop_y     = apply_scale ? spu_scale_h(sys->crop.y, scale_size) : sys->crop.y;
             crop_width = apply_scale ? spu_scale_w(sys->crop.width,  scale_size) : sys->crop.width;
@@ -1269,10 +1280,26 @@
     dst->p_picture->format.i_y_offset       = region_fmt.i_y_offset;
     dst->p_picture->format.i_visible_width  = region_fmt.i_visible_width;
     dst->p_picture->format.i_visible_height = region_fmt.i_visible_height;
-    dst->place.x    = x_offset;
-    dst->place.y    = y_offset;
-    dst->place.width  = region_fmt.i_visible_width;
-    dst->place.height = region_fmt.i_visible_height;
+    if (!apply_scale && scale_size.w != SCALE_UNIT)
+    {
+        dst->place.x      = spu_scale_w(x_offset,                   scale_size);
+        dst->place.width  = spu_scale_w(region_fmt.i_visible_width, scale_size);
+    }
+    else
+    {
+        dst->place.x      = x_offset;
+        dst->place.width  = region_fmt.i_visible_width;
+    }
+    if (!apply_scale && scale_size.h != SCALE_UNIT)
+    {
+        dst->place.y      = spu_scale_h(y_offset,                    scale_size);
+        dst->place.height = spu_scale_h(region_fmt.i_visible_height, scale_size);
+    }
+    else
+    {
+        dst->place.y      = y_offset;
+        dst->place.height = region_fmt.i_visible_height;
+    }
     int fade_alpha = 255;
     if (subpic->b_fade) {
         assert(subpic->i_stop != VLC_TICK_INVALID);
@@ -1285,16 +1312,6 @@
     }
     dst->i_alpha   = fade_alpha * subpic->i_alpha * region->i_alpha / (255 * 255);
 
-    if (!apply_scale && scale_size.h != SCALE_UNIT)
-    {
-        dst->place.x      = spu_scale_w(dst->place.x,     scale_size);
-        dst->place.width  = spu_scale_w(dst->place.width, scale_size);
-    }
-    if (!apply_scale && scale_size.w != SCALE_UNIT)
-    {
-        dst->place.y      = spu_scale_h(dst->place.y,     scale_size);
-        dst->place.height = spu_scale_h(dst->place.height, scale_size);
-    }
     return dst;
 }
 
@@ -1313,27 +1330,6 @@
     }
 }
 
-static bool IsSubpicInVideo(const subpicture_t *subpic, bool spu_in_full_window)
-{
-    // no spu outside video allowed
-    if (!spu_in_full_window)
-        return true;
-
-    // only subtitle SPUs allowed outside video
-    if (!subpic->b_subtitle)
-        return true;
-
-    // absolute spu in video coordinates
-    const subpicture_region_t *p_region;
-    vlc_spu_regions_foreach_const(p_region, &subpic->regions)
-    {
-        if (p_region->b_absolute)
-            return true;
-    }
-
-    return false;
-}
-
 /**
  * This function renders all sub picture units in the list.
  */
@@ -1349,6 +1345,8 @@
                                           vlc_tick_t render_subtitle_date,
                                           bool external_scale)
 {
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
+
     /* Count the number of regions and subtitle regions */
     size_t subtitle_region_count = 0;
     size_t region_count          = 0;
@@ -1379,7 +1377,7 @@
     spu_area_t *subtitle_area;
     size_t subtitle_area_count = 0;
 
-    subtitles_positions_StartUpdate(&spu->p->subs_pos);
+    subtitles_positions_StartUpdate(&sys->subs_pos);
 
     subtitle_area = subtitle_area_buffer;
     if (subtitle_region_count > ARRAY_SIZE(subtitle_area_buffer))
@@ -1398,16 +1396,6 @@
 
         const unsigned i_original_width = subpic->i_original_picture_width;
         const unsigned i_original_height = subpic->i_original_picture_height;
-        const bool subpic_in_video = IsSubpicInVideo(subpic, spu_in_full_window);
-
-        unsigned output_width, output_height;
-        if (subpic_in_video) {
-            output_width  = video_position->width;
-            output_height = video_position->height;
-        } else {
-            output_width  = fmt_dst->i_visible_width;
-            output_height = fmt_dst->i_visible_height;
-        }
 
         /* Render all regions
          * We always transform non absolute subtitle into absolute one on the
@@ -1433,6 +1421,22 @@
             }
             region_FixFmt(region);
 
+            const bool subpic_in_video = !spu_in_full_window ||
+                                         !region->b_in_window;
+            unsigned output_width, output_height;
+            unsigned output_x, output_y;
+            if (subpic_in_video) {
+                output_x      = video_position->x;
+                output_y      = video_position->y;
+                output_width  = video_position->width;
+                output_height = video_position->height;
+            } else {
+                output_x      = fmt_dst->i_x_offset;
+                output_y      = fmt_dst->i_y_offset;
+                output_width  = fmt_dst->i_visible_width;
+                output_height = fmt_dst->i_visible_height;
+            }
+
             /* Compute region scale AR */
             vlc_rational_t region_sar = (vlc_rational_t) {
                 .num = region->fmt.i_sar_num,
@@ -1464,21 +1468,30 @@
             /* Check scale validity */
             assert(scale.w != 0 && scale.h != 0);
 
+            bool cached_is_absolute;
+            bool cached_is_in_window;
+            int cached_alignment;
             subpicture_t forced_subpic = *subpic;
             struct subtitle_position_cache *cache_pos =
-                subtitles_positions_FindRegion(&spu->p->subs_pos, subpic, region);
+                subtitles_positions_FindRegion(&sys->subs_pos, subpic, region);
             if (cache_pos != NULL)
             {
                 region->i_x = cache_pos->x;
                 region->i_y = cache_pos->y;
+                cached_is_absolute = region->b_absolute;
+                cached_is_in_window = region->b_in_window;
+                cached_alignment = region->i_align;
+                region->i_align = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT;
                 region->b_absolute = true;
+                region->b_in_window = true;
             }
 
             /* */
             output_last_ptr = SpuRenderRegion(spu, &area,
                             &forced_subpic, entry->channel_order,
                             region, scale, !external_scale,
-                            chroma_list, output_width, output_height,
+                            chroma_list,
+                            output_x, output_y, output_width, output_height,
                             subtitle_area, subtitle_area_count,
                             subpic->b_subtitle ? render_subtitle_date : system_now);
             if (unlikely(output_last_ptr == NULL))
@@ -1492,7 +1505,9 @@
 
             if (cache_pos != NULL)
             {
-                region->b_absolute = false; // back to the original state
+                region->b_absolute = cached_is_absolute;
+                region->b_in_window = cached_is_in_window;
+                region->i_align = cached_alignment;
                 assert(output_last_ptr->place.x == cache_pos->x);
                 assert(output_last_ptr->place.y == cache_pos->y);
             }
@@ -1504,7 +1519,7 @@
                     area = spu_area_unscaled(area, scale);
                 if (subtitle_area)
                     subtitle_areasubtitle_area_count++ = area;
-                subtitles_positions_AddRegion(&spu->p->subs_pos, subpic, region, &area);
+                subtitles_positions_AddRegion(&sys->subs_pos, subpic, region, &area);
             }
         }
     }
@@ -1513,7 +1528,7 @@
     if (subtitle_area != subtitle_area_buffer)
         free(subtitle_area);
 
-    subtitles_positions_FinishUpdate(&spu->p->subs_pos);
+    subtitles_positions_FinishUpdate(&sys->subs_pos);
 
     return output;
 }
@@ -1523,21 +1538,21 @@
  *****************************************************************************/
 
 /*****************************************************************************
- * UpdateSPU: update subpicture settings
+ * SetHighlights: update subpicture settings
  *****************************************************************************/
-static void UpdateSPU(spu_t *spu, const vlc_spu_highlight_t *hl)
+static void SetHighlights(spu_t *spu, const vlc_spu_highlight_t *hl)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     vlc_mutex_assert(&sys->lock);
 
     sys->palette.i_entries = 0;
-    sys->force_crop = false;
+    sys->crop_highlight = false;
 
     if (hl == NULL)
         return;
 
-    sys->force_crop = true;
+    sys->crop_highlight = true;
     sys->crop.x      = hl->x_start;
     sys->crop.y      = hl->y_start;
     sys->crop.width  = hl->x_end - sys->crop.x;
@@ -1745,7 +1760,7 @@
 static void * spu_PrerenderThread(void *priv)
 {
     spu_t *spu = priv;
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
     vlc_fourcc_t chroma_listSPU_CHROMALIST_COUNT+1;
 
     vlc_thread_set_name("vlc-spu-prerend");
@@ -1779,22 +1794,32 @@
         fmtdst = sys->prerender.fmtdst;
         fmtsrc = sys->prerender.fmtsrc;
 
-        if (IsSubpicInVideo(sys->prerender.p_processed, sys->prerender.spu_in_full_window))
+        unsigned display_width, display_height;
+        fmtdst.i_width  = fmtdst.i_visible_width  = sys->prerender.video_position.width;
+        fmtdst.i_height = fmtdst.i_visible_height = sys->prerender.video_position.height;
+        fmtdst.i_sar_num = fmtdst.i_sar_den = 1;
+        if (!sys->prerender.spu_in_full_window)
+        {
+            display_width  = sys->prerender.video_position.width;
+            display_height = sys->prerender.video_position.height;
+        }
+        else
         {
-            fmtdst.i_width  = fmtdst.i_visible_width  = sys->prerender.video_position.width;
-            fmtdst.i_height = fmtdst.i_visible_height = sys->prerender.video_position.height;
-            fmtdst.i_sar_num = fmtdst.i_sar_den = 1;
+            display_width  = sys->prerender.fmtdst.i_visible_width;
+            display_height = sys->prerender.fmtdst.i_visible_height;
         }
 
         vlc_mutex_unlock(&sys->prerender.lock);
 
         subpicture_t *p_subpic = sys->prerender.p_processed;
 
-        spu_UpdateOriginalSize(spu, p_subpic, &fmtsrc);
 
         subpicture_Update(p_subpic, &fmtsrc, &fmtdst,
+                          display_width, display_height,
                           p_subpic->b_subtitle ? p_subpic->i_start : vlc_tick_now());
 
+        spu_UpdateOriginalSize(spu, p_subpic, &fmtsrc);
+
         spu_PrerenderText(spu, p_subpic, chroma_list);
 
         vlc_mutex_lock(&sys->prerender.lock);
@@ -1812,7 +1837,7 @@
 
 static void spu_Cleanup(spu_t *spu)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     if (sys->text)
         vlc_filter_Delete(sys->text);
@@ -1857,7 +1882,7 @@
  */
 void spu_Destroy(spu_t *spu)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
     /* stop prerendering */
     vlc_mutex_lock(&sys->prerender.lock);
     sys->prerender.live = false;
@@ -1878,14 +1903,14 @@
  */
 spu_t *spu_Create(vlc_object_t *object, vout_thread_t *vout)
 {
-    spu_t *spu = vlc_custom_create(object,
-                                   sizeof(spu_t) + sizeof(spu_private_t),
-                                   "subpicture");
-    if (!spu)
+    spu_private_t *sys = vlc_custom_create(object,
+                                           sizeof(spu_private_t),
+                                           "subpicture");
+    if (!sys)
         return NULL;
 
     /* Initialize spu fields */
-    spu_private_t *sys = spu->p = (spu_private_t*)&spu1;
+    spu_t *spu = &sys->spu;
 
     vlc_vector_init(&sys->channels);
     if (!vlc_vector_reserve(&sys->channels, VOUT_SPU_CHANNEL_OSD_COUNT))
@@ -1969,19 +1994,20 @@
  */
 void spu_Attach(spu_t *spu, input_thread_t *input)
 {
-    vlc_mutex_lock(&spu->p->lock);
-    if (spu->p->input != input) {
-        UpdateSPU(spu, NULL);
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
+    vlc_mutex_lock(&sys->lock);
+    if (sys->input != input) {
+        SetHighlights(spu, NULL);
 
-        spu->p->input = input;
+        sys->input = input;
 
-        vlc_mutex_lock(&spu->p->textlock);
-        if (spu->p->text)
-            vlc_filter_Delete(spu->p->text);
-        spu->p->text = SpuRenderCreateAndLoadText(spu);
-        vlc_mutex_unlock(&spu->p->textlock);
+        vlc_mutex_lock(&sys->textlock);
+        if (sys->text)
+            vlc_filter_Delete(sys->text);
+        sys->text = SpuRenderCreateAndLoadText(spu);
+        vlc_mutex_unlock(&sys->textlock);
     }
-    vlc_mutex_unlock(&spu->p->lock);
+    vlc_mutex_unlock(&sys->lock);
 }
 
 /**
@@ -1989,15 +2015,16 @@
  */
 void spu_Detach(spu_t *spu)
 {
-    vlc_mutex_lock(&spu->p->lock);
-    spu_PrerenderPause(spu->p);
-    spu->p->input = NULL;
-    vlc_mutex_unlock(&spu->p->lock);
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
+    vlc_mutex_lock(&sys->lock);
+    spu_PrerenderPause(sys);
+    sys->input = NULL;
+    vlc_mutex_unlock(&sys->lock);
 }
 
 void spu_SetClockDelay(spu_t *spu, size_t channel_id, vlc_tick_t delay)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     vlc_mutex_lock(&sys->lock);
     struct spu_channel *channel = spu_GetChannel(spu, channel_id, NULL);
@@ -2011,7 +2038,7 @@
 
 void spu_SetClockRate(spu_t *spu, size_t channel_id, float rate)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     vlc_mutex_lock(&sys->lock);
     struct spu_channel *channel = spu_GetChannel(spu, channel_id, NULL);
@@ -2039,7 +2066,7 @@
  */
 void spu_PutSubpicture(spu_t *spu, subpicture_t *subpic)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     /* Update sub-filter chain */
     vlc_mutex_lock(&sys->lock);
@@ -2058,7 +2085,7 @@
                                      sys->vout);
             filter_chain_Clear(sys->filter_chain);
 
-            filter_chain_AppendFromString(spu->p->filter_chain, chain_update);
+            filter_chain_AppendFromString(sys->filter_chain, chain_update);
             if (sys->vout)
                 filter_chain_ForEach(sys->filter_chain,
                                      SubFilterAddProxyCallbacks,
@@ -2070,7 +2097,7 @@
         /* "sub-source"  was formerly "sub-filter", so now the "sub-filter"
         configuration may contain sub-filters or sub-sources configurations.
         if the filters chain was left empty it may indicate that it's a sub-source configuration */
-        is_left_empty = filter_chain_IsEmpty(spu->p->filter_chain);
+        is_left_empty = filter_chain_IsEmpty(sys->filter_chain);
     }
     vlc_mutex_unlock(&sys->filter_chain_lock);
 
@@ -2110,7 +2137,7 @@
     /* p_private is for spu only and cannot be non NULL here */
     subpicture_region_t *r;
     vlc_spu_regions_foreach(r, &subpic->regions)
-        assert(r->p_private == NULL);
+        assert(!subpicture_region_cache_IsValid(r));
 
     /* */
     vlc_mutex_lock(&sys->lock);
@@ -2128,9 +2155,13 @@
         subpic->i_start =
             vlc_clock_ConvertToSystem(channel->clock, system_now,
                                       orgstart, channel->rate, NULL);
-        subpic->i_stop =
-            vlc_clock_ConvertToSystem(channel->clock, system_now,
+        if (orgstop != VLC_TICK_INVALID)
+        {
+            subpic->i_stop =
+                vlc_clock_ConvertToSystem(channel->clock, system_now,
                                       orgstop, channel->rate, NULL);
+        }
+
         vlc_clock_Unlock(channel->clock);
 
         spu_channel_EarlyRemoveLate(sys, channel, system_now);
@@ -2188,7 +2219,7 @@
                          vlc_tick_t render_subtitle_date,
                          bool ignore_osd)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
     const bool external_scale = chroma_list != NULL;
 
     /* Update sub-source chain */
@@ -2205,7 +2236,7 @@
                                      sys->vout);
         filter_chain_Clear(sys->source_chain);
 
-        filter_chain_AppendFromString(spu->p->source_chain, chain_update);
+        filter_chain_AppendFromString(sys->source_chain, chain_update);
         if (sys->vout)
             filter_chain_ForEach(sys->source_chain,
                                  SubSourceAddProxyCallbacks, sys->vout);
@@ -2282,16 +2313,24 @@
         subpic->i_start = entry->start;
         subpic->i_stop = entry->stop;
 
+        unsigned display_width, display_height;
         video_format_t fmtdst = *fmt_dst;
-        if (IsSubpicInVideo(subpic, spu_in_full_window))
+        fmtdst.i_width  = fmtdst.i_visible_width  = video_position->width;
+        fmtdst.i_height = fmtdst.i_visible_height = video_position->height;
+        fmtdst.i_sar_num = fmtdst.i_sar_den = 1;
+        if (!spu_in_full_window)
         {
-            fmtdst.i_width  = fmtdst.i_visible_width  = video_position->width;
-            fmtdst.i_height = fmtdst.i_visible_height = video_position->height;
-            fmtdst.i_sar_num = fmtdst.i_sar_den = 1;
+            display_width  = video_position->width;
+            display_height = video_position->height;
+        }
+        else
+        {
+            display_width  = fmt_dst->i_visible_width;
+            display_height = fmt_dst->i_visible_height;
         }
 
         subpicture_Update(subpic,
-                          fmt_src, &fmtdst,
+                          fmt_src, &fmtdst, display_width, display_height,
                           subpic->b_subtitle ? render_subtitle_date : system_now);
     }
 
@@ -2319,7 +2358,7 @@
 ssize_t spu_RegisterChannelInternal(spu_t *spu, vlc_clock_t *clock,
                                     enum vlc_vout_order *order)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     vlc_mutex_lock(&sys->lock);
 
@@ -2350,7 +2389,7 @@
 
 void spu_ClearChannel(spu_t *spu, size_t channel_id)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
     vlc_mutex_lock(&sys->lock);
     struct spu_channel *channel = spu_GetChannel(spu, channel_id, NULL);
     spu_channel_Clean(sys, channel);
@@ -2366,7 +2405,7 @@
 
 void spu_UnregisterChannel(spu_t *spu, size_t channel_id)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     vlc_mutex_lock(&sys->lock);
     size_t channel_index = 0;
@@ -2378,7 +2417,7 @@
 
 void spu_ChangeSources(spu_t *spu, const char *filters)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     vlc_mutex_lock(&sys->lock);
 
@@ -2397,7 +2436,7 @@
 
 void spu_ChangeFilters(spu_t *spu, const char *filters)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     vlc_mutex_lock(&sys->lock);
 
@@ -2417,7 +2456,7 @@
 void spu_ChangeChannelOrderMargin(spu_t *spu, enum vlc_vout_order order,
                                   int margin)
 {
-    spu_private_t *sys = spu->p;
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
 
     vlc_mutex_lock(&sys->lock);
     switch (order)
@@ -2436,7 +2475,8 @@
 
 void spu_SetHighlight(spu_t *spu, const vlc_spu_highlight_t *hl)
 {
-    vlc_mutex_lock(&spu->p->lock);
-    UpdateSPU(spu, hl);
-    vlc_mutex_unlock(&spu->p->lock);
+    spu_private_t *sys = container_of(spu, spu_private_t, spu);
+    vlc_mutex_lock(&sys->lock);
+    SetHighlights(spu, hl);
+    vlc_mutex_unlock(&sys->lock);
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/vout_wrapper.h -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/vout_wrapper.h Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/video_output/window.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/video_output/window.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/win32/dirs.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/win32/dirs.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/win32/filesystem.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/win32/filesystem.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/win32/plugin.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/win32/plugin.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/win32/specific.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/win32/specific.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/win32/thread.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/win32/thread.c Changed

@@ -35,7 +35,7 @@
 #include <vlc_threads.h>
 #include <vlc_charset.h>
 
-#include "libvlc.h"
+#include "../libvlc.h"
 #include <stdarg.h>
 #include <stdatomic.h>
 #include <assert.h>
@@ -52,8 +52,7 @@
 #define NTDDI_WIN10_RS1  0x0A000002
 #endif
 
-#if NTDDI_VERSION >= NTDDI_WIN10_RS1 && defined(__MINGW64_VERSION_MAJOR)
-// SetThreadDescription is not defined yet in mingw64
+#if NTDDI_VERSION >= NTDDI_WIN10_RS1 && defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR < 10
 WINBASEAPI HRESULT WINAPI SetThreadDescription(HANDLE,PCWSTR);
 #endif
 
@@ -175,13 +174,17 @@
 }
 
 /*** Futeces^WAddress waits ***/
-static HRESULT (WINAPI *SetThreadDescription_)(HANDLE, PCWSTR);
+typedef HRESULT (WINAPI *SetThreadDescription_ptr)(HANDLE, PCWSTR);
+static SetThreadDescription_ptr SetThreadDescription_;
 #if (_WIN32_WINNT < _WIN32_WINNT_WIN8)
-static BOOL (WINAPI *WaitOnAddress_)(VOID volatile *, PVOID, SIZE_T, DWORD);
+typedef BOOL (WINAPI *WaitOnAddress_ptr)(VOID volatile *, PVOID, SIZE_T, DWORD);
+static WaitOnAddress_ptr WaitOnAddress_;
 #define WaitOnAddress (*WaitOnAddress_)
-static VOID (WINAPI *WakeByAddressAll_)(PVOID);
+typedef VOID (WINAPI *WakeByAddressAll_ptr)(PVOID);
+static WakeByAddressAll_ptr WakeByAddressAll_;
 #define WakeByAddressAll (*WakeByAddressAll_)
-static VOID (WINAPI *WakeByAddressSingle_)(PVOID);
+typedef VOID (WINAPI *WakeByAddressSingle_ptr)(PVOID);
+static WakeByAddressSingle_ptr WakeByAddressSingle_;
 #define WakeByAddressSingle (*WakeByAddressSingle_)
 
 static struct wait_addr_bucket
@@ -346,7 +349,7 @@
 /*** Threads ***/
 static
 unsigned
-__stdcall vlc_entry (void *p)
+__stdcall ThreadEntry (void *p)
 {
     struct vlc_thread *th = p;
 
@@ -376,7 +379,7 @@
      * function instead of CreateThread, otherwise you'll end up with
      * memory leaks and the signal functions not working (see Microsoft
      * Knowledge Base, article 104641) */
-    h = (HANDLE)(uintptr_t) _beginthreadex (NULL, 0, vlc_entry, th, 0, NULL);
+    h = (HANDLE)(uintptr_t) _beginthreadex (NULL, 0, ThreadEntry, th, 0, NULL);
     if (h == 0)
     {
         int err = errno;
@@ -705,7 +708,7 @@
 #endif
 }
 
-#define LOOKUP(s) (((s##_) = (void *)GetProcAddress(h, #s)) != NULL)
+#define LOOKUP(s) (((s##_) = (s##_ptr)GetProcAddress(h, #s)) != NULL)
 
 int __stdcall DllMain (void *hinstDll, unsigned long fdwReason, void *lpvReserved)
 {

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/src/win32/timer.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/src/win32/timer.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/Makefile.am -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/Makefile.am Changed

@@ -29,16 +29,19 @@
 	test_src_misc_variables \
 	test_src_input_stream \
 	test_src_input_stream_fifo \
-	test_src_input_thumbnail \
+	test_src_preparser_thumbnail \
+	test_src_preparser_thumbnail_to_files \
 	test_src_input_decoder \
 	test_src_player \
 	test_src_player_monotonic_clock \
 	test_src_interface_dialog \
 	test_src_media_source \
 	test_src_misc_bits \
+	test_src_misc_chroma_probe \
 	test_src_misc_epg \
 	test_src_misc_keystore \
 	test_src_misc_image \
+	test_src_misc_viewpoint \
 	test_src_video_output \
 	test_src_video_output_opengl \
 	test_modules_lua_extension \
@@ -178,8 +181,10 @@
 test_src_input_stream_net_LDADD = $(LIBVLCCORE) $(LIBVLC)
 test_src_input_stream_fifo_SOURCES = src/input/stream_fifo.c
 test_src_input_stream_fifo_LDADD = $(LIBVLCCORE) $(LIBVLC)
-test_src_input_thumbnail_SOURCES = src/input/thumbnail.c
-test_src_input_thumbnail_LDADD = $(LIBVLCCORE) $(LIBVLC)
+test_src_preparser_thumbnail_SOURCES = src/preparser/thumbnail.c
+test_src_preparser_thumbnail_LDADD = $(LIBVLCCORE) $(LIBVLC)
+test_src_preparser_thumbnail_to_files_SOURCES = src/preparser/thumbnail_to_files.c
+test_src_preparser_thumbnail_to_files_LDADD = $(LIBVLCCORE) $(LIBVLC)
 test_src_player_SOURCES = src/player/player.c
 test_src_player_LDADD = $(LIBVLCCORE) $(LIBVLC) $(LIBM)
 test_src_player_monotonic_clock_SOURCES = src/player/player.c
@@ -194,6 +199,8 @@
 test_src_misc_image_cvpx_SOURCES = src/misc/image_cvpx.c
 test_src_misc_image_cvpx_LDADD = $(LIBVLCCORE) $(LIBVLC) ../modules/libvlc_vtutils.la
 test_src_misc_image_cvpx_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreVideo
+test_src_misc_viewpoint_SOURCES = src/misc/viewpoint.c
+test_src_misc_viewpoint_LDADD = $(LIBVLCCORE) $(LIBM)
 test_src_interface_dialog_SOURCES = src/interface/dialog.c
 test_src_interface_dialog_LDADD = $(LIBVLCCORE) $(LIBVLC)
 test_src_media_source_LDADD = $(LIBVLCCORE) $(LIBVLC)
@@ -213,6 +220,9 @@
 	src/input/decoder/input_decoder_scenarios.c
 test_src_input_decoder_LDADD = $(LIBVLCCORE) $(LIBVLC)
 
+test_src_misc_chroma_probe_SOURCES = src/misc/chroma_probe.c
+test_src_misc_chroma_probe_LDADD = $(LIBVLCCORE) $(LIBVLC)
+
 test_src_misc_image_SOURCES = src/misc/image.c
 test_src_misc_image_LDADD = $(LIBVLCCORE) $(LIBVLC)
 
@@ -320,8 +330,8 @@
 .PHONY: FORCE
 
 libvlc_demux_run_la_SOURCES = src/input/demux-run.c src/input/demux-run.h \
-	src/input/common.c src/input/common.h
-libvlc_demux_run_la_CPPFLAGS = $(AM_CPPFLAGS)
+	src/input/common.c src/input/common.h $(top_srcdir)/src/input/var.c
+libvlc_demux_run_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src
 libvlc_demux_run_la_LDFLAGS = -no-install -static
 libvlc_demux_run_la_LIBADD = \
 	../lib/libvlc.la ../src/libvlccore.la ../compat/libcompat.la

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/libvlc/media.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/libvlc/media.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/libvlc/media_player.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/libvlc/media_player.c Changed

@@ -659,6 +659,23 @@
     libvlc_media_player_release(player2);
 }
 
+static void test_media_player_video_controls(const char** argv, int argc)
+{
+    libvlc_instance_t *instance = libvlc_new(argc, argv);
+
+    /* ...with the media and the player being on different instances */
+    libvlc_media_t *media1 = libvlc_media_new_path("foo");
+    libvlc_media_player_t *player1 = libvlc_media_player_new(instance);
+    libvlc_media_player_set_media(player1, media1);
+
+    libvlc_video_set_video_stereo_mode(player1, libvlc_VideoStereoSideBySide);
+
+    libvlc_media_release(media1);
+    libvlc_media_player_release(player1);
+    libvlc_release(instance);
+}
+
+
 int main (void)
 {
     test_init();
@@ -669,6 +686,7 @@
     test_media_player_tracks (test_defaults_args, test_defaults_nargs);
     test_media_player_programs (test_defaults_args, test_defaults_nargs);
     test_media_player_multiple_instance (test_defaults_args, test_defaults_nargs);
+    test_media_player_video_controls(test_defaults_args, test_defaults_nargs);
 
     return 0;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/meson.build Changed

@@ -24,6 +24,7 @@
         'cpp_args',
         'objc_args',
         'include_directories',
+        'env',
     
 
     foreach key : vlc_test.keys()
@@ -42,18 +43,22 @@
     disabled_dependencies = 
     test_modules_deps = 
     foreach module_name : vlc_test.get('module_depends', )
-        if module_name not in vlc_plugins_targets.keys()
+        if module_name not in vlc_plugins_manifest.keys()
             error('Test entry \'@0@\' cannot depend on non-existant VLC plugin \'@1@\''
                   .format(vlc_test'name', module_name))
         endif
-        test_modules_deps += vlc_plugins_targetsmodule_name
+
         if not vlc_plugins_manifestmodule_name.get('enabled', true)
             disabled_dependencies += module_name
+        else
+            test_modules_deps += vlc_plugins_targetsmodule_name
         endif
     endforeach
 
     if disabled_dependencies != 
         # TODO: mark as skipped
+        warning('Test \'@0@\' will be disabled, missing plugins: @1@'.format(
+                vlc_test'name', ', '.join(disabled_dependencies)))
         continue
     endif
 
@@ -78,6 +83,47 @@
             c_args: vlc_test.get('c_args', ), common_args,
             cpp_args: vlc_test.get('cpp_args', ), common_args,
             objc_args: vlc_test.get('objc_args', ), common_args),
+            env: vlc_test.get('env', ),
         suite: vlc_test.get('suite', ), 'test',
         depends: test_modules_deps)
 endforeach
+
+libvlc_demux_defines = 
+libvlc_demux_deps = 
+# TODO support !HAVE_DYNAMIC_PLUGINS
+# libvlc_demux_defines='-DHAVE_STATIC_MODULES'
+# if libdvbpsi_dep.found()
+#     libvlc_demux_defines += '-DHAVE_DVBPSI'
+#     libvlc_demux_deps += libdvbpsi_dep, aribb24_dep, libdvbcsa_dep
+# endif
+# if libebml_dep.found() and libmatroska_dep.found()
+#     libvlc_demux_defines += '-DHAVE_MATROSKA'
+#     libvlc_demux_deps += libebml_dep, libmatroska_dep, z_dep
+# endif
+
+libvlc_demux_run = static_library ('libvlc_demux_run',
+    files('src/input/demux-run.c', 'src/input/common.c', '../src/input/var.c'),
+    c_args: libvlc_demux_defines,
+    dependencies: libvlc_demux_deps,
+    include_directories: vlc_include_dirs,
+    link_with: libvlc, libvlccore, vlc_libcompat)
+
+libvlc_demux_dec_defines = libvlc_demux_defines, '-DHAVE_DECODERS'
+libvlc_demux_dec_run = static_library ('libvlc_demux_dec_run',
+    files('src/input/demux-run.c', 'src/input/common.c', '../src/input/var.c', 'src/input/decoder.c'),
+    c_args: libvlc_demux_dec_defines,
+    dependencies: libvlc_demux_deps,
+    include_directories: vlc_include_dirs,
+    link_with: libvlc, libvlccore, vlc_libcompat)
+
+executable('vlc-demux-run', 'vlc-demux-run.c',
+    include_directories: vlc_include_dirs,
+    link_with: libvlc_demux_run, libvlc, libvlccore, vlc_libcompat,
+    install: false,
+    win_subsystem: 'console')
+
+executable('vlc-demux-dec-run', 'vlc-demux-run.c',
+    include_directories: vlc_include_dirs,
+    link_with: libvlc_demux_dec_run, libvlc, libvlccore, vlc_libcompat,
+    install: false,
+    win_subsystem: 'console')

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/modules/codec/hxxx_helper.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/modules/codec/hxxx_helper.c Changed

@@ -167,6 +167,54 @@
     return 0;
 }
 
+static int test_configuration_change(vlc_fourcc_t codec,
+                                     const uint8_t *p_annexb, size_t i_annexb,
+                                     size_t i_borkoffset)
+{
+    fprintf(stderr,"test_configuration_change\n");
+
+    struct hxxx_helper hlpr;
+    hxxx_helper_init(&hlpr, NULL, codec, 0, 0);
+
+    block_t *b = block_Alloc(i_annexb);
+    if(!b)
+        return 1;
+    memcpy(b->p_buffer, p_annexb, i_annexb);
+
+    dump_hex("in", b->p_buffer, b->i_buffer);
+
+    assert(!hxxx_helper_has_new_config(&hlpr));
+    b = hxxx_helper_process_block(&hlpr, b);
+    if(!b)
+        return 1;
+
+    /* now have a config */
+    assert(hxxx_helper_has_new_config(&hlpr));
+
+    b = hxxx_helper_process_block(&hlpr, b);
+    if(!b)
+        return 1;
+
+    /* should not have a new config */
+    assert(!hxxx_helper_has_new_config(&hlpr));
+
+    /* patch our SPS */
+    b->p_bufferi_borkoffset = ~ b->p_bufferi_borkoffset;
+    dump_hex("in new", b->p_buffer, b->i_buffer);
+    b = hxxx_helper_process_block(&hlpr, b);
+    if(!b)
+        return 1;
+
+    /* now have a new SPS/PPS config */
+    assert(hxxx_helper_has_new_config(&hlpr));
+
+    block_Release(b);
+
+    hxxx_helper_clean(&hlpr);
+
+    return 0;
+}
+
 static int test_any(struct hxxx_helper *hlpr,
                     const uint8_t *p_in, size_t i_in,
                     const uint8_t *p_out, size_t i_out,
@@ -268,6 +316,14 @@
                 test_extradata_raw_h265_hvc1, sizeof(test_extradata_raw_h265_hvc1));
     if(ret) return ret;
 
+    ret = test_configuration_change(VLC_CODEC_H264,
+                test_samples_raw_h264_annexb, sizeof(test_samples_raw_h264_annexb), 4+2); // poke constraints
+    if(ret) return ret;
+
+    ret = test_configuration_change(VLC_CODEC_HEVC,
+                test_samples_raw_h265_annexb, sizeof(test_samples_raw_h265_annexb), 4+2); // poke profiletieridc
+    if(ret) return ret;
+
     return 0;
 }

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/modules/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/modules/meson.build Changed

@@ -6,6 +6,7 @@
     'module_depends' : vlc_plugins_targets.keys()
 }
 
+if not (host_system == 'windows') # missing mkdtemp()
 vlc_tests += {
     'name' : 'test_modules_misc_medialibrary',
     'sources' : files('misc/medialibrary.c'),
@@ -14,6 +15,7 @@
     'module_depends' : vlc_plugins_targets.keys(),
     #'module_depends' : 'medialibrary', 'demux_mock', 'jpeg', 'png', 'rawvid',
 }
+endif
 
 vlc_tests += {
     'name' : 'test_modules_packetizer_helpers',
@@ -63,6 +65,7 @@
     'module_depends' : vlc_plugins_targets.keys()
 }
 
+if not(host_system == 'windows')
 vlc_tests += {
     'name' : 'test_modules_tls',
     'sources' : files('misc/tls.c'),
@@ -70,6 +73,7 @@
     'link_with' : libvlc, libvlccore,
     'module_depends' : vlc_plugins_targets.keys()
 }
+endif
 
 vlc_tests += {
     'name' : 'test_modules_demux_timestamps_filter',
@@ -92,18 +96,13 @@
 
 vlc_tests += {
     'name' : 'test_modules_codec_hxxx_helper',
-    'sources' : files(
-        'codec/hxxx_helper.c',
-        '../../modules/codec/hxxx_helper.c',
-        '../../modules/packetizer/hxxx_nal.c',
-        '../../modules/packetizer/h264_slice.c',
-        '../../modules/packetizer/h264_nal.c',
-        '../../modules/packetizer/hevc_nal.c'),
+    'sources' : files('codec/hxxx_helper.c'),
     'suite' : 'modules', 'test_modules',
-    'link_with' : libvlc, libvlccore,
+    'link_with' : libvlc, libvlccore, hxxxhelper_lib,
     'module_depends' : vlc_plugins_targets.keys()
 }
 
+if opengl_dep.found()
 vlc_tests += {
     'name' : 'test_modules_video_output_opengl_filters',
     'sources' : files(
@@ -141,6 +140,7 @@
     'c_args' : '-DVLC_TEST_OPENGL_API=VLC_OPENGL_ES2',
     'module_depends' : vlc_plugins_targets.keys()
 }
+endif
 
 vlc_tests += {
     'name' : 'test_modules_stream_out_transcode',

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/modules/packetizer/helpers.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/modules/packetizer/helpers.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/modules/packetizer/hxxx.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/modules/packetizer/hxxx.c Changed

@@ -194,6 +194,12 @@
     const uint8_t test7_avcdata2   = { 0, 0 };
     const uint8_t test7_avcdata4   = { 0, 0, 0, 0 };
 
+    /* padding/trailing zeroes stripping */
+    const uint8_t test8_annexbdata = { 0, 0, 0, 0, 0, 1, 0xff, 0, 0, 0, 0, 0, 1, 0xff, 0 };
+    const uint8_t test8_avcdata1   = { 1, 0xff, 1, 0xff };
+    const uint8_t test8_avcdata2   = { 0, 1, 0xff, 0, 1, 0xff };
+    const uint8_t test8_avcdata4   = { 0, 0, 0, 1, 0xff, 0, 0, 0, 1, 0xff };
+
     runtest(4, "empty nal test", testannexbin);
     runtest(2, "single nal test", testannexbin);
     runtest(3, "single nal test, startcode 3", testannexbin);
@@ -208,8 +214,9 @@
     runtest(5, "IT 4 bytes prefixed nal only (4 prefix optz)", test_iterators);
     runtest(6, "startcode repeat / empty nal", test_iterators);
     runtest(7, "IT empty nal", test_iterators);
+    runtest(8, "IT zeroes stripping", test_iterators);
 
-    printf("\nTEST 8 borkage test\n");\
+    printf("\nTEST 9 borkage test\n");\
     rgi_res0 = 0;
     rgi_res1 = rgi_res2 = 1;
     p_res0 = NULL;

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/src/input/decoder/input_decoder_scenarios.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/src/input/decoder/input_decoder_scenarios.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/src/input/demux-run.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/src/input/demux-run.c Changed

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/src/meson.build -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/src/meson.build Changed

@@ -19,6 +19,13 @@
 }
 
 vlc_tests += {
+    'name' : 'test_src_misc_viewpoint',
+    'sources' : files('misc/viewpoint.c'),
+    'suite' : 'src', 'test_src',
+    'link_with' : libvlccore,
+}
+
+vlc_tests += {
     'name' : 'test_src_clock_clock',
     'sources' : files(
         'clock/clock.c',
@@ -35,7 +42,7 @@
     'link_with' : libvlc, libvlccore,
 }
 
-if gcrypt_dep.found()
+if gcrypt_dep.found() and get_option('update-check').allowed()
     vlc_tests += {
         'name' : 'test_src_crypto_update',
         'sources' : files('crypto/update.c'),
@@ -46,6 +53,7 @@
     }
 endif
 
+if not(host_system == 'windows')
 vlc_tests += {
     'name' : 'test_src_input_stream',
     'sources' : files('input/stream.c'),
@@ -62,6 +70,7 @@
     'c_args' : '-DTEST_NET',
     'module_depends' : vlc_plugins_targets.keys()
 }
+endif
 
 vlc_tests += {
     'name' : 'test_src_input_stream_fifo',
@@ -71,8 +80,16 @@
 }
 
 vlc_tests += {
-    'name' : 'test_src_input_thumbnail',
-    'sources' : files('input/thumbnail.c'),
+    'name' : 'test_src_preparser_thumbnail',
+    'sources' : files('preparser/thumbnail.c'),
+    'suite' : 'src', 'test_src',
+    'link_with' : libvlc, libvlccore,
+    'module_depends' : 'demux_mock', 'rawvideo'
+}
+
+vlc_tests += {
+    'name' : 'test_src_preparser_thumbnail_to_files',
+    'sources' : files('preparser/thumbnail_to_files.c'),
     'suite' : 'src', 'test_src',
     'link_with' : libvlc, libvlccore,
     'module_depends' : 'demux_mock', 'rawvideo'

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/src/misc/chroma_probe.c Added

@@ -0,0 +1,379 @@
+/*****************************************************************************
+ * chroma_probe.c: test for chroma_probe
+ *****************************************************************************
+ * Copyright (C) 2025 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* Define a builtin module for mocked parts */
+#define MODULE_NAME test_chroma_probe
+#undef VLC_DYNAMIC_PLUGIN
+#include "../../libvlc/test.h"
+
+#include <vlc/vlc.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_chroma_probe.h>
+#include <vlc_fourcc.h>
+
+#include <assert.h>
+
+const char vlc_module_name = MODULE_STRING;
+
+#define RESULT_MAX 6
+struct scenario_result
+{
+    unsigned cost;
+    unsigned quality;
+    vlc_fourcc_t chainVLC_CHROMA_CONV_CHAIN_COUNT_MAX - 1 /* exclude 'from' */;
+};
+
+struct scenario
+{
+    unsigned max_indirect_steps;
+    int flags;
+    vlc_fourcc_t in;
+    vlc_fourcc_t out;
+    struct scenario_result resultsRESULT_MAX;
+    size_t result_count;
+};
+
+static const struct scenario scenario_array =
+{
+#define COST VLC_CHROMA_CONV_FLAG_SORT_COST
+#define ONLY_YUV VLC_CHROMA_CONV_FLAG_ONLY_YUV
+#define ONLY_RGB VLC_CHROMA_CONV_FLAG_ONLY_RGB
+#define RESULT(cost, quality, chain0, chain1 ) \
+    { cost, quality, { chain0, chain1 } }
+
+#define SCENARIO0(max_indirect_steps_, from, to) { \
+    .max_indirect_steps = max_indirect_steps_, \
+    .flags = 0, \
+    .in = from, .out = to, \
+    .result_count = 0, \
+}
+
+#define SCENARIO1(max_indirect_steps_, sort_, from, to, cost, quality, chain0) { \
+    .max_indirect_steps = max_indirect_steps_, \
+    .flags = sort_, \
+    .in = from, .out = to, \
+    .results = { RESULT(cost, quality, chain0, 0) }, \
+    .result_count = 1, \
+}
+
+#define SCENARIO2(max_indirect_steps_, sort_, from, to, \
+                  result0_cost, result0_quality, result0_chain0, \
+                  result1_cost, result1_quality, result1_chain0) { \
+    .max_indirect_steps = max_indirect_steps_, \
+    .flags = sort_, \
+    .in = from, .out = to, \
+    .results = { RESULT(result0_cost, result0_quality, result0_chain0, 0), \
+                 RESULT(result1_cost, result1_quality, result1_chain0, 0), }, \
+    .result_count = 2, \
+}
+
+#define SCENARIOX(max_indirect_steps_, sort_, from, to, count, ...) { \
+    .max_indirect_steps = max_indirect_steps_, \
+    .flags = sort_, \
+    .in = from, .out = to, \
+    .results = { __VA_ARGS__ }, \
+    .result_count = count, \
+}
+
+    /* Success with a depth of 0 (Direct conversion) */
+    SCENARIO1(0, 0, VLC_CODEC_VAAPI_420, VLC_CODEC_I420, 26, 100, 0),
+
+    /* Success with a depth of 1 */
+    SCENARIO1(1, 0, VLC_CODEC_VAAPI_420_10BPP, VLC_CODEC_I420,
+              47, 80, VLC_CODEC_P010),
+
+    /* Fail because it require a depth of 1 */
+    SCENARIO0(0, VLC_CODEC_VAAPI_420_10BPP, VLC_CODEC_I420),
+
+    /* Check duplicated entries are removed and that we keep the lowest cost */
+    SCENARIO1(1, 0, VLC_CODEC_NV12, VLC_CODEC_I420,
+              18, 100, 0),
+
+    /* Check two_way is doing as expected */
+    SCENARIO1(1, 0, VLC_CODEC_I420, VLC_CODEC_VAAPI_420_10BPP,
+              47, 100, VLC_CODEC_P010),
+
+    /* Fail because it requires a depth of 2 */
+    SCENARIO0(1, VLC_CODEC_CVPX_P010, VLC_CODEC_P010),
+
+    /* Fail because conversion is not two-way */
+    SCENARIO0(1, VLC_CODEC_P010, VLC_CODEC_CVPX_P010),
+
+    /* Check low cost of GPU <-> GPU */
+    SCENARIO1(1, 0, VLC_CODEC_CVPX_P010, VLC_CODEC_CVPX_BGRA, 11, 80, 0),
+
+    /* Check cost and quality of direct conversion */
+    SCENARIO1(0, 0, VLC_CODEC_YUVA_444_12L, VLC_CODEC_I420, 60, 33, 0),
+
+    /* Check 1 depth conversions are correctly sorted */
+    SCENARIOX(1, 0, VLC_CODEC_VAAPI_420_10BPP, 0, 6,
+              RESULT(33, 100, VLC_CODEC_P010, 0),
+              RESULT(33, 100, VLC_CODEC_I420_10L, 0),
+              RESULT(66, 100, VLC_CODEC_P010, VLC_CODEC_I420_10L),
+              RESULT(66, 100, VLC_CODEC_I420_10L, VLC_CODEC_P010),
+              RESULT(47, 80, VLC_CODEC_P010, VLC_CODEC_I420),
+              RESULT(84, 72, VLC_CODEC_P010, VLC_CODEC_RGBA)),
+
+    /* Check default QUALITY order */
+    SCENARIOX(0, 0, VLC_CODEC_YUVA_444_12L, 0, 4,
+              RESULT(112, 90, VLC_CODEC_RGBA64, 0),
+              RESULT(88, 83, VLC_CODEC_YUVA_444_10L, 0),
+              RESULT(80, 60, VLC_CODEC_RGBA, 0),
+              RESULT(60, 33, VLC_CODEC_I420, 0)),
+
+    /* Check ONLY_YUV */
+    SCENARIOX(0, ONLY_YUV, VLC_CODEC_YUVA_444_12L, 0, 2,
+              RESULT(88, 83, VLC_CODEC_YUVA_444_10L, 0),
+              RESULT(60, 33, VLC_CODEC_I420, 0)),
+
+    /* Check ONLY_RGB */
+    SCENARIOX(0, ONLY_RGB, VLC_CODEC_YUVA_444_12L, 0, 2,
+              RESULT(112, 90, VLC_CODEC_RGBA64, 0),
+              RESULT(80, 60,  VLC_CODEC_RGBA, 0)),
+
+    /* Check COST order */
+    SCENARIOX(0, COST, VLC_CODEC_YUVA_444_12L, 0, 4,
+              RESULT(60, 33, VLC_CODEC_I420, 0),
+              RESULT(80, 60,  VLC_CODEC_RGBA, 0),
+              RESULT(88, 83, VLC_CODEC_YUVA_444_10L, 0),
+              RESULT(112, 90, VLC_CODEC_RGBA64, 0)),
+
+    /* Check VLC_CHROMA_CONV_ADD_IN_OUTTLIST, and quality order with smaller
+     * RGB chromas */
+    SCENARIOX(0, 0, VLC_CODEC_YV12, 0, 5,
+              RESULT(36, 90, VLC_CODEC_XRGB, 0),
+              RESULT(28, 59, VLC_CODEC_RGB565, 0),
+              RESULT(28, 59, VLC_CODEC_BGR565, 0),
+              RESULT(27, 56, VLC_CODEC_RGB555, 0),
+              RESULT(27, 56, VLC_CODEC_BGR555, 0)),
+
+    /* Check VLC_CHROMA_CONV_ADD_OUT_INLIST */
+    SCENARIO1(0, 0, VLC_CODEC_NV16, VLC_CODEC_I422, 32, 100, 0),
+    SCENARIO1(0, 0, VLC_CODEC_YUYV, VLC_CODEC_I422, 32, 100, 0),
+    SCENARIO1(0, 0, VLC_CODEC_UYVY, VLC_CODEC_I422, 32, 100, 0),
+
+    /* Check VLC_CHROMA_CONV_ADD_ALL */
+    SCENARIO1(1, 0, VLC_CODEC_I444_12L, VLC_CODEC_I444, 60, 66, 0),
+    SCENARIO1(1, 0, VLC_CODEC_I444, VLC_CODEC_I444_12L, 60, 100, 0),
+    SCENARIO1(1, 0, VLC_CODEC_I444_12L, VLC_CODEC_I444_10L, 66, 83, 0),
+    SCENARIO1(1, 0, VLC_CODEC_I444_10L, VLC_CODEC_I444_12L, 66, 100, 0),
+};
+
+static void ProbeChroma(vlc_chroma_conv_vec *vec)
+{
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_VAAPI_420, VLC_CODEC_I420, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_VAAPI_420_10BPP, VLC_CODEC_P010, true);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_VAAPI_420_10BPP, VLC_CODEC_I420_10L, true);
+
+    vlc_chroma_conv_add(vec, 0.75, VLC_CODEC_I420, VLC_CODEC_NV12, true);
+    vlc_chroma_conv_add(vec, 0.75, VLC_CODEC_I420, VLC_CODEC_P010, true);
+    vlc_chroma_conv_add(vec, 1, VLC_CODEC_I420_10L, VLC_CODEC_P010, true);
+    vlc_chroma_conv_add(vec, 1, VLC_CODEC_RGBA, VLC_CODEC_P010, true);
+    vlc_chroma_conv_add(vec, 1, VLC_CODEC_RGBA, VLC_CODEC_NV12, true);
+
+    /* Test duplicated entries are removed */
+    vlc_chroma_conv_add(vec, 1.0, VLC_CODEC_I420, VLC_CODEC_NV12, true);
+
+    /* Don't change this order as this is used to test to cost sort
+     * (we don't want the result to be naturally sorted) */
+    vlc_chroma_conv_add(vec, 1, VLC_CODEC_YUVA_444_12L, VLC_CODEC_RGBA, true);
+    vlc_chroma_conv_add(vec, 1, VLC_CODEC_YUVA_444_12L, VLC_CODEC_I420, true);
+
+    vlc_chroma_conv_add(vec, 1, VLC_CODEC_YUVA_444_12L, VLC_CODEC_YUVA_444_10L, true);
+    vlc_chroma_conv_add(vec, 1, VLC_CODEC_YUVA_444_12L, VLC_CODEC_RGBA64, true);
+
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_NV12, VLC_CODEC_CVPX_BGRA, false);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_CVPX_NV12, VLC_CODEC_NV12, false);
+    vlc_chroma_conv_add(vec, 0.25, VLC_CODEC_CVPX_P010, VLC_CODEC_CVPX_BGRA, false);
+    vlc_chroma_conv_add(vec, 1.1, VLC_CODEC_CVPX_BGRA, VLC_CODEC_RGBA, false);
+
+    vlc_chroma_conv_add_in_outlist(vec, 1, VLC_CODEC_YV12, VLC_CODEC_XRGB,
+                                    VLC_CODEC_RGB565, VLC_CODEC_BGR565,
+                                    VLC_CODEC_RGB555, VLC_CODEC_BGR555);
+
+    vlc_chroma_conv_add_out_inlist(vec, 1, VLC_CODEC_I422, VLC_CODEC_NV16,
+            VLC_CODEC_YUYV, VLC_CODEC_UYVY);
+
+    vlc_chroma_conv_add(vec, 1, VLC_CODEC_I444, VLC_CODEC_I444_10L, true);
+    vlc_chroma_conv_add(vec, 1, VLC_CODEC_I444, VLC_CODEC_I444_12L, true);
+    vlc_chroma_conv_add(vec, 1, VLC_CODEC_I444_10L, VLC_CODEC_I444_12L, true);
+
+    /* Test duplicated entries are removed */
+    vlc_chroma_conv_add(vec, 1.0, VLC_CODEC_I420, VLC_CODEC_NV12, true);
+}
+
+vlc_module_begin()
+    set_callback_chroma_conv_probe(ProbeChroma)
+vlc_module_end()
+
+VLC_EXPORT vlc_plugin_cb vlc_static_modules = {
+    VLC_SYMBOL(vlc_entry),
+    NULL
+};
+
+static void
+print_results(const struct vlc_chroma_conv_result *array, size_t count)
+{
+    for (size_t i = 0; i < count; ++i)
+    {
+        const struct vlc_chroma_conv_result *res = &arrayi;
+        char *res_str = vlc_chroma_conv_result_ToString(res);
+        assert(res_str != NULL);
+        fprintf(stderr, "\tres%zu: %s\n", i, res_str);
+        free(res_str);
+    }
+}
+
+static void
+check_results(const struct scenario *scr,
+              const struct vlc_chroma_conv_result *results)
+{
+    for (size_t i = 0; i < scr->result_count; ++i)
+    {
+        const struct vlc_chroma_conv_result *result = &resultsi;
+        const struct scenario_result *scr_result = &scr->resultsi;
+
+        assert(result->chain_count > 1);
+        assert(result->chain_count <= VLC_CHROMA_CONV_CHAIN_COUNT_MAX);
+
+        /*  Reconstruct the expected fourcc array from the scenario */
+        vlc_fourcc_t scr_chainVLC_CHROMA_CONV_CHAIN_COUNT_MAX;
+        bool end_reached = false;
+        size_t scr_count = 1;
+        scr_chain0 = scr->in;
+        for (size_t j = 1; j < VLC_CHROMA_CONV_CHAIN_COUNT_MAX; ++j)
+        {
+            if (end_reached)
+            {
+                scr_chainj = 0;
+                continue;
+            }
+
+            if (scr_result->chainj - 1 != 0)
+            {
+                scr_chainj = scr_result->chainj - 1;
+                scr_count++;
+            }
+            else
+            {
+                if (scr->out != 0)
+                {
+                    scr_chainj = scr->out;
+                    scr_count++;
+                }
+                end_reached = true;
+            }
+        }
+
+        assert(scr_count == result->chain_count);
+        size_t j;
+        for (j = 0; j < result->chain_count; ++j)
+            assert(result->chainj == scr_chainj);
+        for (; j < VLC_CHROMA_CONV_CHAIN_COUNT_MAX - 1; ++j)
+            assert(scr_result->chainj - 1 == 0);
+
+        assert(result->cost == scr_result->cost);
+        assert(result->quality == scr_result->quality);
+    }
+}
+
+int main(int argc, const char *argv)
+{
+    test_init();
+
+    if (argc > 1 && strlen(argv1) >= 4)
+    {
+        /* Disable test module (use all VLC modules) */
+        vlc_static_modules0 = NULL;
+
+        unsigned max_indirect_steps = 1;
+        if (argc > 2)
+            max_indirect_steps = atoi(argv2);
+
+        int flags = 0;
+        if (argc > 3)
+            flags = atoi(argv3);
+
+        const char *f = argv1;
+        vlc_fourcc_t from_fourcc = VLC_FOURCC(f0, f1, f2, f3);
+        vlc_fourcc_t to_fourcc = 0;
+        if (f4 == '-' && strlen(f) >= 9)
+            to_fourcc = VLC_FOURCC(f5, f6, f7, f8);
+        libvlc_instance_t *vlc = libvlc_new(0, NULL);
+        assert(vlc != NULL);
+
+        size_t count;
+        struct vlc_chroma_conv_result *results =
+            vlc_chroma_conv_Probe(from_fourcc, to_fourcc, 0, 0,
+                                  max_indirect_steps, flags, &count);
+        assert(results != NULL);
+        print_results(results, count);
+        free(results);
+
+        libvlc_release(vlc);
+        return 0;
+    }
+
+    /* Disable all modules except the one from this test */
+    const char *libvlc_argv = {
+        "--no-plugins-cache",
+        "--no-plugins-scan",
+    };
+    int libvlc_argc = ARRAY_SIZE(libvlc_argv);
+
+    libvlc_instance_t *vlc = libvlc_new(libvlc_argc, libvlc_argv);
+    assert(vlc != NULL);
+
+    size_t scenario_count = ARRAY_SIZE(scenario_array);
+    for (size_t i = 0; i < scenario_count; i++)
+    {
+        const struct scenario *scr = &scenario_arrayi;
+
+        fprintf(stderr, "scenario: %4.4s -> %4.4s flags: 0x%x, "
+                "max_indirect_steps: %u result_count: %zu\n",
+                (const char *)&scr->in, (const char *)&scr->out,
+                scr->flags,
+                scr->max_indirect_steps, scr->result_count);
+
+        size_t count;
+        struct vlc_chroma_conv_result *results =
+            vlc_chroma_conv_Probe(scr->in, scr->out, 0, 0,
+                                  scr->max_indirect_steps, scr->flags, &count);
+        if (results == NULL)
+        {
+            assert(scr->result_count == 0);
+            continue;
+        }
+        print_results(results, count);
+        assert(count == scr->result_count);
+        check_results(scr, results);
+        free(results);
+    }
+
+    libvlc_release(vlc);
+
+    return 0;
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/src/misc/viewpoint.c Added

@@ -0,0 +1,221 @@
+/*****************************************************************************
+ * viewpoint.c: test for viewpoint
+ *****************************************************************************
+ * Copyright (C) 2019 VLC Authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include <vlc_viewpoint.h>
+#include <math.h>
+#include "../../libvlc/test.h"
+
+
+static void mat4x4_for_angles( float *m, float *angles )
+{
+    const float yaw   = -angles0 * (float)M_PI / 180.f;
+    const float pitch = -angles1 * (float)M_PI / 180.f;
+    const float roll  = -angles2 * (float)M_PI / 180.f;
+
+    float s, c;
+
+    s = sinf(pitch);
+    c = cosf(pitch);
+    const float x_rot44 = {
+        { 1.f,    0.f,    0.f,    0.f },
+        { 0.f,    c,      -s,      0.f },
+        { 0.f,    s,      c,      0.f },
+        { 0.f,    0.f,    0.f,    1.f } };
+
+    s = sinf(yaw);
+    c = cosf(yaw);
+    const float y_rot44 = {
+        { c,      0.f,    s,     0.f },
+        { 0.f,    1.f,    0.f,    0.f },
+        { -s,      0.f,    c,      0.f },
+        { 0.f,    0.f,    0.f,    1.f } };
+
+    s = sinf(roll);
+    c = cosf(roll);
+    const float z_rot44 = {
+        { c,      s,      0.f,    0.f },
+        { -s,     c,      0.f,    0.f },
+        { 0.f,    0.f,    1.f,    0.f },
+        { 0.f,    0.f,    0.f,    1.f } };
+
+    /**
+     * Column-major matrix multiplication mathematically equal to
+     * z_rot * x_rot * y_rot
+     */
+    memset(m, 0, 16 * sizeof(float));
+    for (int i=0; i<4; ++i)
+        for (int j=0; j<4; ++j)
+            for (int k=0; k<4; ++k)
+                for (int l=0; l<4; ++l)
+                    m4*i+l += y_rotij * x_rotjk * z_rotkl;
+}
+
+static bool
+compare_angles(float epsilon, const float a13, const float a23)
+{
+    const float MAX_YAW   = 180.f;
+    const float MAX_PITCH = 360.f;
+    const float MAX_ROLL  = 180.f;
+
+    /* We add MAX_YAW, MAX_PITCH and MAX_ROLL to ensure the value for fmodf
+     * will stay positive. The value will be between 0 and {MAX_ANGLE}. */
+    float dy = fmodf(MAX_YAW   + (a10 - a20), MAX_YAW);
+    float dp = fmodf(MAX_PITCH + (a11 - a21), MAX_PITCH);
+    float dr = fmodf(MAX_ROLL  + (a12 - a22), MAX_ROLL);
+
+    /* Check the two borders of the torus, 0.f and 180.f or 360.f depending
+     * on the range of the compared value. */
+    return (dy < epsilon || MAX_YAW   - dy < epsilon) &&
+           (dp < epsilon || MAX_PITCH - dp < epsilon) &&
+           (dr < epsilon || MAX_ROLL  - dr < epsilon);
+}
+
+/**
+ * Execute conversion back and forth from Euler angles to quaternion.
+ * Check that the original angles are preserved by the conversion methods.
+ */
+static bool
+reciprocal_euler(float epsilon, float yaw, float pitch, float roll)
+{
+    vlc_viewpoint_t vp;
+    vlc_viewpoint_from_euler(&vp, yaw, pitch, roll);
+
+    float yaw2, pitch2, roll2;
+    vlc_viewpoint_to_euler(&vp, &yaw2, &pitch2, &roll2);
+
+    fprintf(stderr, "==========================================\n");
+    fprintf(stderr, "original:   yaw=%f, pitch=%f, roll=%f\n", yaw, pitch, roll);
+    fprintf(stderr, "converted:  yaw=%f, pitch=%f, roll=%f\n", yaw2, pitch2, roll2);
+    fprintf(stderr, "==========================================\n");
+
+    return compare_angles(epsilon,
+            (float){yaw, pitch, roll},
+            (float){yaw, pitch, roll});
+}
+
+static void test_conversion()
+{
+    const float epsilon = 0.1f;
+    assert(reciprocal_euler(epsilon, 0.f,  0.f,  0.f));
+    assert(reciprocal_euler(epsilon, 45.f, 0.f,  0.f));
+    assert(reciprocal_euler(epsilon, 0.f,  45.f, 0.f));
+    assert(reciprocal_euler(epsilon, 0.f,  0.f,  45.f));
+    assert(reciprocal_euler(epsilon, 45.f, 45.f, 0.f));
+    assert(reciprocal_euler(epsilon, 0.f,  45.f, 45.f));
+    assert(reciprocal_euler(epsilon, 45.f, 45.f, 45.f));
+
+    assert(reciprocal_euler(epsilon, -45.f,  0.f,  0.f));
+    assert(reciprocal_euler(epsilon,  0.f,  -45.f, 0.f));
+    assert(reciprocal_euler(epsilon,  0.f,   0.f,  -45.f));
+    assert(reciprocal_euler(epsilon, -45.f, -45.f,  0.f));
+    assert(reciprocal_euler(epsilon,  0.f,  -45.f, -45.f));
+    assert(reciprocal_euler(epsilon, -45.f, -45.f, -45.f));
+}
+
+static int fuzzy_memcmp(const float *a, const float *b,
+                         size_t size, float epsilon)
+{
+    for (size_t i=0; i < size; ++i)
+    {
+        if (fabs(ai-bi) > epsilon)
+        {
+            fprintf(stderr, "Difference at %zu, a%zu=%f, b%zu=%f\n",
+                    i, i, ai, i, bi);
+            return ai < bi ? -1 : 1;
+        }
+    }
+    return 0;
+}
+
+struct example_mat4x4
+{
+    float angles3;
+};
+
+struct example_mat4x4 examples_mat4x4 = {
+    { .angles = {  0.f,   45.f,  45.f } },
+    { .angles = { 45.f,   45.f,  0.f  } },
+    { .angles = { 45.f,   0.f,   0.f  } },
+    { .angles = { -45.f,  0.f,   0.f  } },
+    { .angles = {  0.f,   45.f,  0.f  } },
+    { .angles = {  0.f,    0.f,  45.f } },
+    { .angles = { 90.f, 0.f, 0.f } },
+    { .angles = { 0.f, 90.f, 0.f } },
+    { .angles = { 0.f, 0.f, 90.f } },
+    { .angles = { 90.f, 90.f, 0.f } },
+    { .angles = { 90.f, 0.f, 90.f } },
+    { .angles = { 0.f, 90.f, 90.f } },
+    { .angles = { 90.f, 90.f, 90.f } },
+};
+
+static void
+test_conversion_viewpoint_mat4x4()
+{
+    const float epsilon = 0.1f;
+    vlc_viewpoint_t vp;
+    float mat16;
+
+#define MATLINE "%f %f %f %f\n"
+#define MAT MATLINE MATLINE MATLINE MATLINE
+#define printmat(title, mat) \
+    fprintf(stderr, title ":\n" MAT "\n", \
+           mat0,  mat1,  mat2, mat3, \
+           mat4,  mat5,  mat6, mat7, \
+           mat8,  mat9,  mat10, mat11, \
+           mat12, mat13, mat14, mat15);
+
+    bool success = true;
+    for (size_t i=0; i<ARRAY_SIZE(examples_mat4x4); ++i)
+    {
+        struct example_mat4x4 *ex = &examples_mat4x4i;
+        vlc_viewpoint_from_euler(&vp,
+                                 ex->angles0,
+                                 ex->angles1,
+                                 ex->angles2);
+        vlc_viewpoint_to_4x4(&vp, mat);
+        fprintf(stderr, "angles: %f %f %f\n",
+                ex->angles0, ex->angles1,
+                ex->angles2);
+
+        float expect_mat16;
+        mat4x4_for_angles(expect_mat, ex->angles);
+
+        bool diff = fuzzy_memcmp(mat, expect_mat,
+                                 ARRAY_SIZE(mat), epsilon);
+        if (!diff)
+            continue;
+
+        printmat("EXPECT COMPUTED", expect_mat);
+        printmat("RESULT", mat);
+        success = false;
+    }
+
+    assert(success);
+}
+
+int main( void )
+{
+    test_init();
+
+    test_conversion();
+    test_conversion_viewpoint_mat4x4();
+
+    return 0;
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/src/player/player.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/src/player/player.c Changed

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/src/preparser Added

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/src/preparser/thumbnail.c Added

@@ -0,0 +1,250 @@
+/*****************************************************************************
+ * thumbnail.c: test thumbnailing API
+ *****************************************************************************
+ * Copyright (C) 2018 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include "../../libvlc/test.h"
+#include "../lib/libvlc_internal.h"
+
+#include <vlc_common.h>
+#include <vlc_preparser.h>
+#include <vlc_input_item.h>
+#include <vlc_picture.h>
+
+#include <errno.h>
+
+#define MOCK_DURATION VLC_TICK_FROM_SEC( 5 * 60 )
+
+const struct
+{
+    uint32_t i_nb_video_tracks;
+    uint32_t i_nb_audio_tracks;
+    vlc_tick_t i_add_video_track_at;
+    vlc_tick_t i_time;
+    float f_pos;
+    bool b_use_pos;
+    bool b_fast_seek;
+    bool b_can_control_pace;
+    vlc_tick_t i_timeout;
+    bool b_expected_success;
+} test_params = {
+    /* Simple test with a thumbnail at 60s, with a video track */
+    { 1, 0, VLC_TICK_INVALID, VLC_TICK_FROM_SEC( 60 ), .0f, false, true, true,
+      VLC_TICK_INVALID, true },
+    /* Test without fast-seek */
+    { 1, 0, VLC_TICK_INVALID, VLC_TICK_FROM_SEC( 60 ), .0f, false, false, true,
+      VLC_TICK_INVALID, true },
+    /* Seek by position test */
+    { 1, 0, VLC_TICK_INVALID, 0, .3f, true, true, true, VLC_TICK_INVALID, true },
+    /* Seek at a negative position */
+    { 1, 0, VLC_TICK_INVALID, -12345, .0f, false, true, true, VLC_TICK_INVALID, true },
+    /* Take a thumbnail of a file without video, which should timeout. */
+    { 0, 1, VLC_TICK_INVALID, VLC_TICK_FROM_SEC( 60 ), .0f, false, true, false, VLC_TICK_FROM_MS( 100 ), false },
+    /* Take a thumbnail of a file with a video track starting later */
+    { 1, 1, VLC_TICK_FROM_SEC( 60 ), VLC_TICK_FROM_SEC( 30 ), .0f, false, true, true,
+      VLC_TICK_INVALID, true },
+};
+
+struct test_ctx
+{
+    vlc_cond_t cond;
+    vlc_mutex_t lock;
+    size_t test_idx;
+    bool b_done;
+};
+
+static void thumbnailer_callback( input_item_t *item, int status,
+                                  picture_t* thumbnail, void *data )
+{
+    (void) item;
+    struct test_ctx* p_ctx = data;
+    vlc_mutex_lock( &p_ctx->lock );
+
+    if ( thumbnail != NULL )
+    {
+        assert( test_paramsp_ctx->test_idx.b_expected_success &&
+                "Expected failure but got a thumbnail" );
+        assert( thumbnail->format.i_chroma == VLC_CODEC_ARGB );
+        assert( status == VLC_SUCCESS );
+
+        /* TODO: Enable this once the new clock is merged */
+#if 0
+        vlc_tick_t expected_date;
+        /* Don't rely on the expected date if it was purposely invalid */
+        if ( test_paramsp_ctx->test_idx.b_use_pos == true )
+            expected_date = MOCK_DURATION * test_paramsp_ctx->test_idx.f_pos;
+        else if ( test_paramsp_ctx->test_idx.i_add_video_track_at != VLC_TICK_INVALID )
+            expected_date = test_paramsp_ctx->test_idx.i_add_video_track_at;
+        else
+        {
+            if ( test_paramsp_ctx->test_idx.i_time < 0 )
+                expected_date = VLC_TICK_0;
+            else
+                expected_date = test_paramsp_ctx->test_idx.i_time;
+        }
+        assert( thumbnail->date == expected_date && "Unexpected picture date");
+#endif
+    }
+    else
+    {
+        assert( !test_paramsp_ctx->test_idx.b_expected_success &&
+                "Expected a thumbnail but got a failure" );
+        if (test_paramsp_ctx->test_idx.i_timeout == VLC_TICK_INVALID)
+            assert( status == VLC_EGENERIC );
+        else
+            assert( status == VLC_ETIMEOUT );
+    }
+
+    p_ctx->b_done = true;
+    vlc_cond_signal( &p_ctx->cond );
+    vlc_mutex_unlock( &p_ctx->lock );
+}
+
+static void test_thumbnails( libvlc_instance_t* p_vlc )
+{
+    struct test_ctx ctx;
+    vlc_cond_init( &ctx.cond );
+    vlc_mutex_init( &ctx.lock );
+
+    for ( size_t i = 0; i < ARRAY_SIZE(test_params); ++i)
+    {
+        char* psz_mrl;
+
+        ctx.test_idx = i;
+        ctx.b_done = false;
+
+        const struct vlc_preparser_cfg cfg = {
+            .types = VLC_PREPARSER_TYPE_THUMBNAIL,
+            .timeout = test_paramsi.i_timeout,
+        };
+
+        vlc_preparser_t* p_thumbnailer = vlc_preparser_New(
+                    VLC_OBJECT( p_vlc->p_libvlc_int ), &cfg );
+        assert( p_thumbnailer != NULL );
+
+
+        if ( asprintf( &psz_mrl, "mock://video_track_count=%u;audio_track_count=%u"
+                       ";length=%" PRId64 ";can_control_pace=%s;video_chroma=ARGB;video_add_track_at=%" PRId64,
+                       test_paramsi.i_nb_video_tracks,
+                       test_paramsi.i_nb_audio_tracks, MOCK_DURATION,
+                       test_paramsi.b_can_control_pace ? "true" : "false",
+                       test_paramsi.i_add_video_track_at ) < 0 )
+            assert( !"Failed to allocate mock mrl" );
+        input_item_t* p_item = input_item_New( psz_mrl, "mock item" );
+        assert( p_item != NULL );
+
+        vlc_mutex_lock( &ctx.lock );
+
+        vlc_preparser_req_id id;
+        struct vlc_thumbnailer_arg thumb_arg;
+        if ( test_paramsi.b_use_pos )
+        {
+            thumb_arg.seek.type = VLC_THUMBNAILER_SEEK_POS;
+            thumb_arg.seek.pos = test_paramsi.f_pos;
+            thumb_arg.seek.speed = test_paramsi.b_fast_seek ?
+                VLC_THUMBNAILER_SEEK_FAST : VLC_THUMBNAILER_SEEK_PRECISE;
+        }
+        else
+        {
+            thumb_arg.seek.type = VLC_THUMBNAILER_SEEK_TIME;
+            thumb_arg.seek.time = test_paramsi.i_time;
+            thumb_arg.seek.speed = test_paramsi.b_fast_seek ?
+                VLC_THUMBNAILER_SEEK_FAST : VLC_THUMBNAILER_SEEK_PRECISE;
+        }
+        thumb_arg.hw_dec = false;
+        static const struct vlc_thumbnailer_cbs cbs = {
+            .on_ended = thumbnailer_callback,
+        };
+        id = vlc_preparser_GenerateThumbnail( p_thumbnailer, p_item, &thumb_arg,
+                                              &cbs, &ctx );
+        assert( id != VLC_PREPARSER_REQ_ID_INVALID );
+
+        while ( ctx.b_done == false )
+            vlc_cond_wait( &ctx.cond, &ctx.lock );
+
+        vlc_mutex_unlock( &ctx.lock );
+
+        input_item_Release( p_item );
+        free( psz_mrl );
+
+        vlc_preparser_Delete( p_thumbnailer );
+    }
+}
+
+static void thumbnailer_callback_cancel( input_item_t *item, int status,
+                                         picture_t* p_thumbnail, void *data )
+{
+    (void) item;
+    assert( p_thumbnail == NULL );
+    assert( status == -EINTR );
+
+    vlc_sem_t *sem = data;
+    vlc_sem_post(sem);
+}
+
+static void test_cancel_thumbnail( libvlc_instance_t* p_vlc )
+{
+    const struct vlc_preparser_cfg cfg = {
+        .types = VLC_PREPARSER_TYPE_THUMBNAIL,
+        .timeout = VLC_TICK_INVALID,
+    };
+    vlc_preparser_t* p_thumbnailer = vlc_preparser_New(
+                VLC_OBJECT( p_vlc->p_libvlc_int ), &cfg );
+    assert( p_thumbnailer != NULL );
+
+    const char* psz_mrl = "mock://video_track_count=0;audio_track_count=1;"
+                          /* force timeout: parsing will take the same time as length */
+                          "can_control_pace=false;"
+                          "length=20000000";
+    input_item_t* p_item = input_item_New( psz_mrl, "mock item" );
+    assert( p_item != NULL );
+
+    static const struct vlc_thumbnailer_cbs cbs = {
+        .on_ended = thumbnailer_callback_cancel,
+    };
+
+    vlc_sem_t sem;
+    vlc_sem_init(&sem, 0);
+    vlc_preparser_req_id id =
+        vlc_preparser_GenerateThumbnail( p_thumbnailer, p_item, NULL, &cbs, &sem );
+
+    vlc_preparser_Cancel( p_thumbnailer, id );
+
+    vlc_sem_wait(&sem);
+
+    input_item_Release( p_item );
+
+    vlc_preparser_Delete( p_thumbnailer );
+}
+
+int main( void )
+{
+    test_init();
+
+    static const char * argv = {
+        "-v",
+        "--ignore-config",
+    };
+    libvlc_instance_t *vlc = libvlc_new(ARRAY_SIZE(argv), argv);
+    assert(vlc);
+
+    test_thumbnails( vlc );
+    test_cancel_thumbnail( vlc );
+
+    libvlc_release( vlc );
+}

_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/src/preparser/thumbnail_to_files.c Added

@@ -0,0 +1,362 @@
+/*****************************************************************************
+ * thumbnail_to_files.c: test thumbnailing to files API
+ *****************************************************************************
+ * Copyright (C) 2024 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include "../../libvlc/test.h"
+#include "../lib/libvlc_internal.h"
+
+#include <vlc_common.h>
+#include <vlc_preparser.h>
+#include <vlc_input_item.h>
+#include <vlc_picture.h>
+#include <vlc_modules.h>
+#include <vlc_fs.h>
+
+#include <errno.h>
+
+#define MOCK_WIDTH 640
+#define MOCK_HEIGHT 480
+
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+#define MOCK_URL "mock://video_track_count=1;" \
+                 "video_width="STRINGIFY(MOCK_WIDTH)";" \
+                 "video_height="STRINGIFY(MOCK_HEIGHT)
+
+struct test_entry
+{
+    int in_width;
+    int in_height;
+    bool in_crop;
+
+    bool should_succeed;
+    unsigned out_width;
+    unsigned out_height;
+};
+
+static const struct test_entry test_entries =
+{
+    {
+        .in_width = 0, .in_height = 0, .in_crop = false,
+        .should_succeed = true,
+        .out_width = MOCK_WIDTH, .out_height = MOCK_HEIGHT
+    },
+
+    {
+        .in_width = 0, .in_height = 0, .in_crop = false,
+        .should_succeed = false,
+    },
+    {
+        .in_width = 320, .in_height = 0, .in_crop = false,
+        .should_succeed = true,
+        .out_width = 320, .out_height = 240,
+    },
+};
+
+struct context
+{
+    size_t test_count;
+    const struct vlc_thumbnailer_output *entries;
+    const struct test_entry *test_entries;
+    vlc_preparser_t *preparser;
+
+    vlc_fourcc_t parsed_fourcc;
+    const char *forced_demux;
+
+    vlc_sem_t sem;
+};
+
+static void parser_on_ended(input_item_t *item, int status, void *userdata)
+{
+    struct context *context = userdata;
+    assert(status == VLC_SUCCESS);
+
+    /* Retrieve the test_entry from the uri */
+    const struct test_entry *test_entry = NULL;
+    for (size_t i = 0; i < context->test_count; ++i)
+    {
+        if (strcmp(item->psz_uri + strlen("file://"),
+                   context->entriesi.file_path) == 0)
+        {
+            test_entry = &context->test_entriesi;
+            break;
+        }
+    }
+    assert(test_entry != NULL);
+
+    assert(item->es_vec.size == 1);
+    const struct input_item_es *item_es = &item->es_vec.data0;
+    const es_format_t *es_fmt = &item_es->es;
+
+    /* Check if the video format of the thumbnail is expected */
+    assert(es_fmt->i_cat == VIDEO_ES);
+    assert(es_fmt->i_codec == context->parsed_fourcc);
+    assert(es_fmt->video.i_width == test_entry->out_width);
+    assert(es_fmt->video.i_height == test_entry->out_height);
+
+    vlc_sem_post(&context->sem);
+}
+
+static void on_ended(input_item_t *item, int status,
+                     const bool *result_array, size_t result_count, void *data)
+{
+    struct context *context = data;
+    (void) item;
+    assert(status == VLC_SUCCESS);
+    assert(context->test_count == result_count);
+
+    static const struct input_item_parser_cbs_t parser_cbs = {
+        .on_ended = parser_on_ended,
+    };
+
+    for (size_t i = 0; i < result_count; ++i)
+    {
+        const struct vlc_thumbnailer_output *entry = &context->entriesi;
+        const struct test_entry *test_entry = &context->test_entriesi;
+
+        assert(test_entry->should_succeed == result_arrayi);
+
+        if (!result_arrayi)
+            vlc_sem_post(&context->sem);
+        else
+        {
+            /* Parse the thumbnail to check its validity */
+            char *uri;
+            int ret = asprintf(&uri, "file://%s", entry->file_path);
+            assert(ret > 0);
+            input_item_t *thumb = input_item_New(uri, "thumb");
+            free(uri);
+            assert(thumb != NULL);
+
+            if (context->forced_demux != NULL)
+            {
+                /* Setup the forced demux */
+                char *option;
+                ret = asprintf(&option, ":demux=%s", context->forced_demux);
+                assert(ret > 0);
+                input_item_AddOption(thumb, option, VLC_INPUT_OPTION_TRUSTED);
+                free(option);
+            }
+
+            vlc_preparser_req_id req_id =
+                vlc_preparser_Push(context->preparser, thumb,
+                                   VLC_PREPARSER_TYPE_PARSE,
+                                   &parser_cbs, context);
+            assert(req_id != VLC_PREPARSER_REQ_ID_INVALID);
+            input_item_Release(thumb);
+        }
+    }
+}
+
+static int get_formats(enum vlc_thumbnailer_format *out_format,
+                       vlc_fourcc_t *parsed_fourcc, const char **forced_demux,
+                       const char **ext)
+{
+    /* This test require any of these images encoders */
+    static const struct format
+    {
+        enum vlc_thumbnailer_format format;
+        vlc_fourcc_t parsed_fourcc;
+        const char *ext;
+        const char *forced_demux;
+    } formats = {
+        {
+            .format = VLC_THUMBNAILER_FORMAT_PNG,
+            .parsed_fourcc = VLC_CODEC_RGB24,
+            .ext = "png"
+        },
+        {
+            .format = VLC_THUMBNAILER_FORMAT_WEBP,
+            .parsed_fourcc = VLC_CODEC_I420,
+            .ext = "webp"
+        },
+        {
+            .format = VLC_THUMBNAILER_FORMAT_JPEG,
+            .parsed_fourcc = VLC_CODEC_MJPG,
+            .ext = "jpg",
+            /* XXX: The mjpeg demux won't parse width/height */
+            .forced_demux = "avformat"
+        },
+    };
+
+    /* Retrieve the best format */
+    enum vlc_thumbnailer_format format;
+    int ret = vlc_preparser_GetBestThumbnailerFormat(&format, ext);
+    if (ret != 0)
+        return ret;
+
+    /* Check that the best format is checked and succeed */
+    ret = vlc_preparser_CheckThumbnailerFormat(format);
+    assert(ret == 0);
+
+    for (size_t i = 0; i < ARRAY_SIZE(formats); ++i)
+    {
+        if (formatsi.format != format)
+            continue;
+
+        /* Check if the forced demux module (for preparsing) is present */
+        if (formatsi.forced_demux != NULL
+         && !module_exists(formatsi.forced_demux))
+            return VLC_ENOENT;
+
+        assert(strcmp(*ext, formatsi.ext) == 0);
+
+        *out_format = format;
+        *parsed_fourcc = formatsi.parsed_fourcc;
+        *forced_demux = formatsi.forced_demux;
+        return 0;
+    }
+
+    vlc_assert_unreachable();
+}
+
+int main(int argc, const char *argv)
+{
+    test_init();
+    argc--;
+    argv++;
+
+    size_t test_count = ARRAY_SIZE(test_entries);
+    struct vlc_thumbnailer_output entriestest_count;
+    int fd_arraytest_count;
+    char path_arraytest_countsizeof("/tmp/libvlc_XXXXXX");
+
+    libvlc_instance_t *vlc = libvlc_new(argc, argv);
+    assert(vlc);
+
+    /* This test require swscale */
+    if (!module_exists("swscale"))
+    {
+        fprintf(stderr, "skip: no \"swscale\" module\n");
+        goto skip;
+    }
+
+    enum vlc_thumbnailer_format format;
+    const char *forced_demux, *ext;
+    vlc_fourcc_t parsed_fourcc;
+    int ret = get_formats(&format, &parsed_fourcc, &forced_demux, &ext);
+    if (ret == VLC_ENOENT)
+    {
+        fprintf(stderr, "skip: no \"image encoder\" modules\n");
+        goto skip;
+    }
+    assert(ret == 0);
+
+    fprintf(stderr, "thumbnail_to_files: using format: %s\n", ext);
+
+    /* Fill output entries */
+    for (size_t i = 0; i < test_count; ++i)
+    {
+        const struct test_entry *test_entry = &test_entriesi;
+        struct vlc_thumbnailer_output *entry = &entriesi;
+
+        if (test_entry->should_succeed)
+        {
+            /* Fill the output entry with a valid tmp path */
+            strcpy(path_arrayi, "/tmp/libvlc_XXXXXX");
+            fd_arrayi = vlc_mkstemp(path_arrayi);
+            if (i == 0 && fd_arrayi == -1)
+            {
+                fprintf(stderr, "skip: vlc_mkstemp failed\n");
+                goto skip;
+            }
+            assert(fd_arrayi != -1);
+            entry->file_path = path_arrayi;
+        }
+        else
+        {
+            fd_arrayi = -1;
+            entry->file_path = "/this/path/does/not/exist/and/should/fail";
+        }
+        entry->format = format;
+        entry->width = test_entry->in_width;
+        entry->height = test_entry->in_height;
+        entry->crop = test_entry->in_crop;
+        entry->creat_mode = 0666;
+    }
+
+    /* Preparser configuration: thumbnailer + parser */
+    const struct vlc_preparser_cfg cfg = {
+        .types = VLC_PREPARSER_TYPE_THUMBNAIL_TO_FILES|VLC_PREPARSER_TYPE_PARSE,
+        .max_parser_threads = 1,
+        .max_thumbnailer_threads = 1,
+        .timeout = 0,
+    };
+    vlc_preparser_t *preparser = vlc_preparser_New(VLC_OBJECT(vlc->p_libvlc_int),
+                                                   &cfg);
+    assert(preparser != NULL);
+
+    struct context context = {
+        .test_count = test_count,
+        .entries = entries,
+        .test_entries = test_entries,
+        .preparser = preparser,
+        .parsed_fourcc = parsed_fourcc,
+        .forced_demux = forced_demux,
+    };
+    vlc_sem_init(&context.sem, 0);
+
+    /* Common arguments */
+    const struct vlc_thumbnailer_arg arg =
+    {
+        .seek = {
+            .type = VLC_THUMBNAILER_SEEK_POS,
+            .pos = 0.2,
+            .speed = VLC_THUMBNAILER_SEEK_FAST,
+        },
+        .hw_dec = false,
+    };
+    static const struct vlc_thumbnailer_to_files_cbs cbs = {
+        .on_ended = on_ended,
+    };
+
+    input_item_t *item = input_item_New(MOCK_URL, "mock");
+    assert(item != NULL);
+
+    vlc_preparser_req_id req_id =
+        vlc_preparser_GenerateThumbnailToFiles(preparser, item, &arg,
+                                               entries, test_count,
+                                               &cbs, &context);
+
+    assert(req_id != VLC_PREPARSER_REQ_ID_INVALID);
+
+    /* Wait for all tests */
+    for (size_t i = 0; i < test_count; ++i)
+        vlc_sem_wait(&context.sem);
+
+    size_t count = vlc_preparser_Cancel(preparser, req_id);
+    assert(count == 0); /* Should not be cancelled and already processed */
+
+    for (size_t i = 0; i < test_count; ++i)
+        if (fd_arrayi != -1)
+        {
+            unlink(path_arrayi);
+            close(fd_arrayi);
+        }
+
+    input_item_Release(item);
+
+    vlc_preparser_Delete(preparser);
+    libvlc_release(vlc);
+    return 0;
+
+skip:
+    libvlc_release(vlc);
+    return 77;
+}

_service:obs_scm:vlc-beta-20241105.477f37bdba.obscpio/test/vlc-demux-libfuzzer.c -> _service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio/test/vlc-demux-libfuzzer.c Changed

_service:obs_scm:vlc-beta.obsinfo Changed