Packman Build Service PMBS

vlc-beta.changes Changed

vlc-beta.spec Changed

@@ -26,7 +26,7 @@
 %bcond_with opengles
 %endif
 Name:           vlc-beta
-Version:        20210405.f3c7ba5bb3
+Version:        20210430.0b6b242324
 Release:        0
 Summary:        Video Lan Client multimedia player
 License:        GPL-2.0+ and LGPL-2.1+
@@ -42,6 +42,66 @@
 Patch6:         fix_freerdp2_detection.patch
 Patch7:         fix_lua53_luaL_checkint.patch
 
+Conflicts:      vlc
+Conflicts:      vlc-devel
+Obsoletes:      vlc-codec-gstreamer < %{version}-%{release}
+Obsoletes:      vlc-codec-gstreamer-debuginfo < %{version}-%{release}
+Obsoletes:      vlc-debuginfo < %{version}-%{release}
+Obsoletes:      vlc-debugsource < %{version}-%{release}
+Obsoletes:      vlc-devel < %{version}-%{release}
+Obsoletes:      vlc-jack < %{version}-%{release}
+Obsoletes:      vlc-jack-debuginfo < %{version}-%{release}
+Obsoletes:      vlc-lang < %{version}-%{release}
+Obsoletes:      vlc-noX < %{version}-%{release}
+Obsoletes:      vlc-noX-debuginfo < %{version}-%{release}
+Obsoletes:      vlc-opencv < %{version}-%{release}
+Obsoletes:      vlc-opencv-debuginfo < %{version}-%{release}
+Obsoletes:      vlc-qt < %{version}-%{release}
+Obsoletes:      vlc-qt-debuginfo < %{version}-%{release}
+Obsoletes:      vlc-vdpau < %{version}-%{release}
+Obsoletes:      vlc-vdpau-debuginfo < %{version}-%{release}
+Provides:       vlc-codec-gstreamer = %{version}-%{release}
+Provides:       vlc-codec-gstreamer-debuginfo = %{version}-%{release}
+Provides:       vlc-debuginfo = %{version}-%{release}
+Provides:       vlc-debugsource = %{version}-%{release}
+Provides:       vlc-devel = %{version}-%{release}
+Provides:       vlc-jack = %{version}-%{release}
+Provides:       vlc-jack-debuginfo = %{version}-%{release}
+Provides:       vlc-lang = %{version}-%{release}
+Provides:       vlc-noX = %{version}-%{release}
+Provides:       vlc-noX-debuginfo = %{version}-%{release}
+Provides:       vlc-opencv = %{version}-%{release}
+Provides:       vlc-opencv-debuginfo = %{version}-%{release}
+Provides:       vlc-qt = %{version}-%{release}
+Provides:       vlc-qt-debuginfo = %{version}-%{release}
+Provides:       vlc-vdpau = %{version}-%{release}
+Provides:       vlc-vdpau-debuginfo = %{version}-%{release}
+
+Obsoletes:      libvlc123 < %{version}-%{release}
+Obsoletes:      libvlc123-debuginfo < %{version}-%{release}
+Obsoletes:      libvlccore123 < %{version}-%{release}
+Obsoletes:      libvlccore123-debuginfo < %{version}-%{release}
+Obsoletes:      vlc-beta-debuginfo < %{version}-%{release}
+Obsoletes:      vlc-beta-debugsource < %{version}-%{release}
+Obsoletes:      vlc-beta-devel < %{version}-%{release}
+Obsoletes:      vlc-beta-noX < %{version}-%{release}
+Obsoletes:      vlc-beta-noX-debuginfo < %{version}-%{release}
+Obsoletes:      vlc-beta-noX-lang < %{version}-%{release}
+Obsoletes:      vlc-beta-qt < %{version}-%{release}
+Obsoletes:      vlc-beta-qt-debuginfo < %{version}-%{release}
+Provides:       libvlc123 = %{version}-%{release}
+Provides:       libvlc123-debuginfo = %{version}-%{release}
+Provides:       libvlccore123 = %{version}-%{release}
+Provides:       libvlccore123-debuginfo = %{version}-%{release}
+Provides:       vlc-beta-debuginfo = %{version}-%{release}
+Provides:       vlc-beta-debugsource = %{version}-%{release}
+Provides:       vlc-beta-devel = %{version}-%{release}
+Provides:       vlc-beta-noX = %{version}-%{release}
+Provides:       vlc-beta-noX-debuginfo = %{version}-%{release}
+Provides:       vlc-beta-noX-lang = %{version}-%{release}
+Provides:       vlc-beta-qt = %{version}-%{release}
+Provides:       vlc-beta-qt-debuginfo = %{version}-%{release}
+
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  flex
@@ -96,7 +156,9 @@
 BuildRequires:  pkgconfig(libswscale) >= 0.5.0
 BuildRequires:  pkgconfig(libpostproc)
 BuildRequires:  pkgconfig(faad2)
+%if 0%{?suse_version} > 1500
 BuildRequires:  pkgconfig(rav1e)
+%endif
 BuildRequires:  pkgconfig(dav1d) >= 0.5.0
 BuildRequires:  pkgconfig(vpx) >= 1.5.0
 BuildRequires:  pkgconfig(twolame)
@@ -187,10 +249,6 @@
 BuildRequires:  fdupes
 BuildRequires:  update-desktop-files
 
-Requires:       %{name}-noX = %{version}-%{release}
-Requires:       %{name}-qt = %{version}-%{release}
-Conflicts:      vlc
-
 %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, ...)
@@ -198,75 +256,6 @@
 It can also be used as a server to stream in unicast or multicast
 in IPv4 or IPv6 on a high-bandwidth network.
 
-%package devel
-Summary:        Video Lan Client Development system
-Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}-%{release}
-Conflicts:      vlc-devel
-
-%description devel
-Those development headers are required if you plan on coding against VLC
-
-%package -n libvlc%{libvlc}
-Summary:        Shared library libvlc
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description -n libvlc%{libvlc}
-Shared library libvlc. To be installed by system dependencies
-
-%package -n libvlccore%{libvlccore}
-Summary:        Shared library libvlc
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description -n libvlccore%{libvlccore}
-Shared library libvlc. To be installed by system dependencies
-
-%package noX
-Summary:        VLC: VideoLAN Client - without X dependencies
-Group:          Productivity/Multimedia/Video/Players
-Requires:       libvlc%{libvlc} = %{version}-%{release}
-Requires:       libvlccore%{libvlccore} = %{version}-%{release}
-Provides:       %{name}-codecs = %{version}-%{release}
-Obsoletes:      %{name}-codecs < %{version}-%{release}
-Obsoletes:      %{name}-codecs-debuginfo
-Recommends:     %{name}-noX-lang
-Recommends:     libdvdcss
-Conflicts:      vlc-codec-gstreamer
-Conflicts:      vlc-codec-gstreamer-debuginfo
-Conflicts:      vlc-codecs
-Conflicts:      vlc-codecs-debuginfo
-Conflicts:      vlc-jack
-Conflicts:      vlc-jack-debuginfo
-Conflicts:      vlc-noX
-Conflicts:      vlc-noX-debuginfo
-Conflicts:      vlc-opencv
-Conflicts:      vlc-opencv-debuginfo
-Conflicts:      vlc-vdpau
-Conflicts:      vlc-vdpau-debuginfo
-
-%description noX
-This Package of VLC contains the bare requirements you need to install.
-Here is no graphical User Interface included, thus it's also perfectly
-suitable for server installations (Streaming Server for example)
-
-Should you decide to install the GUI modules, %{name}-noX will stay
-installed as a dependency.
-
-%lang_package -n %{name}-noX
-
-
-%package qt
-Summary:        VLC: VideoLAN Client - Qt interface
-Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-noX = %{version}-%{release}
-Supplements:    packageand(%{name}-noX:libqt5)
-Conflicts:      vlc-qt
-
-%description qt
-The all new Qt interface for the VLC VideoLAN Client.
-
 %prep
 %autosetup -p1
 
@@ -371,7 +360,9 @@
 	--enable-postproc \
 	--enable-faad \
 	--disable-aom \
+%if 0%{?suse_version} > 1500
 	--enable-rav1e \
+%endif
 	--enable-dav1d \
 	--disable-vpx \
 	--enable-vpx \
@@ -470,7 +461,6 @@
 	--disable-osx-notifications \
 	--enable-gbm \
 	--enable-notify \
-	--disable-libplacebo \
 	--disable-vulkan \
 	--enable-libplacebo \
 	--enable-vulkan \
@@ -500,511 +490,25 @@
 done
 %find_lang vlc
 
-%files
-%{_bindir}/vlc
-%{_bindir}/vlc-wrapper
+%post -p /sbin/ldconfig
+

vlc-beta.patch Changed

@@ -1,11 +1,9 @@
 control/cli/cli.c: In function 'Run':
 control/cli/cli.c:541:1: error: no return statement in function returning non-void [-Werror=return-type]
 
-diff --git a/modules/control/cli/cli.c b/modules/control/cli/cli.c
-index 2fa1e7b90d..5de888d3af 100644
 --- a/modules/control/cli/cli.c
 +++ b/modules/control/cli/cli.c
-@@ -503,9 +503,8 @@ static void cli_client_delete(struct cli_client *cl)
+@@ -524,9 +524,8 @@ static void cli_client_delete(struct cli
      free(cl);
  }
  
@@ -16,7 +14,7 @@
      intf_sys_t *sys = intf->p_sys;
  
      assert(sys->pi_socket_listen != NULL);
-@@ -540,6 +539,13 @@ static void *Run(void *data)
+@@ -561,6 +560,13 @@ static void *Run(void *data)
      }
  }
  
@@ -30,3 +28,13 @@
  #else
  static void msg_vprint(intf_thread_t *p_intf, const char *psz_fmt, va_list args)
  {
+--- a/modules/video_output/placebo_utils.h
++++ b/modules/video_output/placebo_utils.h
+@@ -319,7 +319,6 @@ static const struct pl_filter_config *co
+     [SCALE_EWA_LANCZOS]         = &pl_filter_ewa_lanczos,
+     [SCALE_EWA_GINSENG]         = &pl_filter_ewa_ginseng,
+     [SCALE_EWA_HANN]            = &pl_filter_ewa_hann,
+-    [SCALE_HAASNSOFT]           = &pl_filter_haasnsoft,
+     [SCALE_BICUBIC]             = &pl_filter_bicubic,
+     [SCALE_CATMULL_ROM]         = &pl_filter_catmull_rom,
+     [SCALE_MITCHELL]            = &pl_filter_mitchell,

vlc-beta-20210405.f3c7ba5bb3.tar.xz/README Deleted

@@ -1,57 +0,0 @@
-README for the VLC media player
-===============================
-
-VLC is a popular libre and open source media player and multimedia engine,
-used by a large number of individuals, professionals, companies and
-institutions. Using open source technologies and libraries, VLC has been
-ported to most computing platforms, including GNU/Linux, Windows, Mac OS X,
-BSD, iOS and Android.
-VLC can play most multimedia files, discs, streams, allows playback from
-devices, and is able to convert to or stream in various formats.
-The VideoLAN project was started at the university École Centrale Paris who
-relicensed VLC under the GPLv2 license in February 2001. Since then, VLC has
-been downloaded close to one billion times.
-
-Links:
-======
-
-The VLC web site  . . . . . http://www.videolan.org/
-Support . . . . . . . . . . http://www.videolan.org/support/
-Forums  . . . . . . . . . . https://forum.videolan.org/
-Wiki  . . . . . . . . . . . https://wiki.videolan.org/
-The Developers site . . . . https://wiki.videolan.org/Developers_Corner
-VLC hacking guide . . . . . https://wiki.videolan.org/Hacker_Guide
-Bugtracker  . . . . . . . . https://trac.videolan.org/vlc/
-The VideoLAN web site . . . http://www.videolan.org/
-
-Source Code Content:
-===================
-ABOUT-NLS          - Notes on the Free Translation Project.
-AUTHORS            - VLC authors.
-COPYING            - The GPL license.
-COPYING.LIB        - The LGPL license.
-INSTALL            - Installation and building instructions.
-NEWS               - Important modifications between the releases.
-README             - This file.
-THANKS             - VLC contributors.
-
-bin/               - VLC binaries.
-bindings/          - libVLC bindings to other languages.
-compat/            - compatibility library for operating systems missing
-                     essential functionalities.
-contrib/           - Facilities for retrieving external libraries and building
-                     them for systems that don't have the right versions.
-doc/               - Miscellaneous documentation.
-extras/analyser    - Code analyser and editor specific files.
-extras/buildsystem - different buildsystems specific files.
-extras/misc        - Files that don't fit in the other extras/ categories.
-extras/package     - VLC packaging specific files such as spec files.
-extras/tools/      - Facilities for retrieving external building tools needed
-                     for systems that don't have the right versions.
-include/           - Header files.
-lib/               - libVLC source code.
-modules/           - VLC plugins and modules. Most of the code is here.
-po/                - VLC translations.
-share/             - Common Resources files.
-src/               - libvlccore source code.
-test/              - testing system.

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dav1d/0001-SSE2-PIC-464ca6c2.patch Deleted

@@ -1,380 +0,0 @@
-From 464ca6c2f37b93180cc27ea41889ffaf1eab388e Mon Sep 17 00:00:00 2001
-From: Henrik Gramner <gramner@twoorioles.com>
-Date: Thu, 25 Jun 2020 01:27:28 +0200
-Subject: [PATCH] x86: Fix 32-bit build with PIC enabled
-
----
- src/x86/mc_sse.asm | 147 +++++++++++++++++----------------------------
- 1 file changed, 56 insertions(+), 91 deletions(-)
-
-diff --git a/src/x86/mc_sse.asm b/src/x86/mc_sse.asm
-index d98ac621..5d5c5e3f 100644
---- a/src/x86/mc_sse.asm
-+++ b/src/x86/mc_sse.asm
-@@ -1263,7 +1263,7 @@ cglobal prep_bilin, 3, 7, 0, tmp, src, stride, w, h, mxy, stride3
-  %if ARCH_X86_64
-     mova                 m8, [pw_8]
-  %else
--  %define m8 [pw_8]
-+  %define m8 [t1-prep_sse2+pw_8]
-  %endif
-     pxor                 m7, m7
- %endif
-@@ -1272,13 +1272,11 @@ cglobal prep_bilin, 3, 7, 0, tmp, src, stride, w, h, mxy, stride3
-     pshuflw              m6, m6, q0000
- %if cpuflag(ssse3)
-     punpcklqdq           m6, m6
--%else
-- %if ARCH_X86_64
-+%elif ARCH_X86_64
-     psrlw                m0, m8, 3
-     punpcklwd            m6, m0
-- %else
-+%else
-     punpcklwd            m6, [base+pw_1]
-- %endif
- %endif
- %if ARCH_X86_32
-     mov                  t1, t2 ; save base reg for w4
-@@ -1396,8 +1394,8 @@ cglobal prep_bilin, 3, 7, 0, tmp, src, stride, w, h, mxy, stride3
-     PUSH                 r7
-  %endif
-     mov                  r7, tmpq
-+    mov                  r5, srcq
- %endif
--    mov                  t1, srcq
- .hv_w16_hloop:
-     movu                 m0, [srcq+strideq*0+8*0]
-     movu                 m1, [srcq+strideq*0+8*1]
-@@ -1440,14 +1438,17 @@ cglobal prep_bilin, 3, 7, 0, tmp, src, stride, w, h, mxy, stride3
-     sub                  hd, 2
-     jg .hv_w16_vloop
-     movzx                hd, t2w
--    add                  t1, 16
--    mov                srcq, t1
- %if ARCH_X86_64
-+    add                  r5, 16
-     add                  r7, 2*16
-+    mov                srcq, r5
-     mov                tmpq, r7
- %else
-+    mov                srcq, srcmp
-     mov                tmpq, tmpmp
-+    add                srcq, 16
-     add                tmpq, 2*16
-+    mov               srcmp, srcq
-     mov               tmpmp, tmpq
- %endif
-     sub                 t2d, 1<<16
-@@ -2624,22 +2625,20 @@ cglobal put_8tap, 1, 9, 0, dst, ds, src, ss, w, h, mx, my, ss3
- %macro PHADDW 4 ; dst, src, pw_1/tmp, load_pw_1
-  %if cpuflag(ssse3)
-     phaddw               %1, %2
-- %else
--  %ifnidn %1, %2
-+ %elifnidn %1, %2
-    %if %4 == 1
--    mova                 %3, [pw_1]
-+    mova                 %3, [base+pw_1]
-    %endif
-     pmaddwd              %1, %3
-     pmaddwd              %2, %3
-     packssdw             %1, %2
--  %else
-+ %else
-    %if %4 == 1
--    pmaddwd              %1, [pw_1]
-+    pmaddwd              %1, [base+pw_1]
-    %else
-     pmaddwd              %1, %3
-    %endif
-     packssdw             %1, %1
--  %endif
-  %endif
- %endmacro
- 
-@@ -2795,11 +2794,9 @@ PREP_8TAP_FN sharp_smooth,   SHARP,   SMOOTH
- %if ARCH_X86_32
-  %define base_reg r2
-  %define base base_reg-prep%+SUFFIX
-- %define W32_RESTORE_SSQ mov strideq, stridem
- %else
-  %define base_reg r7
-  %define base 0
-- %define W32_RESTORE_SSQ
- %endif
- cglobal prep_8tap, 1, 9, 0, tmp, src, stride, w, h, mx, my, stride3
- %assign org_stack_offset stack_offset
-@@ -2834,6 +2831,10 @@ cglobal prep_8tap, 1, 9, 0, tmp, src, stride, w, h, mx, my, stride3
-     WIN64_SPILL_XMM      12
- %else
-     WIN64_SPILL_XMM      16
-+%endif
-+%if ARCH_X86_32
-+ %define strideq r6
-+    mov             strideq, stridem
- %endif
-     cmp                  wd, 4
-     je .h_w4
-@@ -2894,7 +2895,6 @@ cglobal prep_8tap, 1, 9, 0, tmp, src, stride, w, h, mx, my, stride3
-     punpcklbw            m4, m4
-     psraw                m4, 8
- %endif
--    W32_RESTORE_SSQ
- %if ARCH_X86_64
-     lea            stride3q, [strideq*3]
- %endif
-@@ -2916,8 +2916,7 @@ cglobal prep_8tap, 1, 9, 0, tmp, src, stride, w, h, mx, my, stride3
-     pshufb               m1, m5
-     pshufb               m2, m5
-     pshufb               m3, m5
--%else
-- %if ARCH_X86_64
-+%elif ARCH_X86_64
-     movd                 m0, [srcq+strideq*0+0]
-     movd                m12, [srcq+strideq*0+1]
-     movd                 m1, [srcq+strideq*1+0]
-@@ -2947,7 +2946,7 @@ cglobal prep_8tap, 1, 9, 0, tmp, src, stride, w, h, mx, my, stride3
-     punpcklqdq           m1, m5  ; 1
-     punpcklqdq           m2, m13 ; 2
-     punpcklqdq           m3, m7  ; 3
-- %else
-+%else
-     movd                 m0, [srcq+strideq*0+0]
-     movd                 m1, [srcq+strideq*0+1]
-     movd                 m2, [srcq+strideq*0+2]
-@@ -2978,7 +2977,6 @@ cglobal prep_8tap, 1, 9, 0, tmp, src, stride, w, h, mx, my, stride3
-     lea                srcq, [srcq+strideq*2]
-     punpckldq            m7, m5
-     punpcklqdq           m3, m7 ; 3
-- %endif
- %endif
-     PMADDUBSW            m0, m4, m5, m7, 1 ; subpel_filters + 2
-     PMADDUBSW            m1, m4, m5, m7, 0
-@@ -2994,14 +2992,7 @@ cglobal prep_8tap, 1, 9, 0, tmp, src, stride, w, h, mx, my, stride3
-     sub                  hd, 4
-     jg .h_w4_loop
-     RET
--    ;
- .h_w8:
--%if ARCH_X86_32
--    mov                  r3, r2
-- %define           base_reg  r3
--    W32_RESTORE_SSQ
--%endif
--.h_w8_loop:
- %if cpuflag(ssse3)
-     PREP_8TAP_H           0, srcq+strideq*0
-     PREP_8TAP_H           1, srcq+strideq*1
-@@ -3017,51 +3008,42 @@ cglobal prep_8tap, 1, 9, 0, tmp, src, stride, w, h, mx, my, stride3
-     add                tmpq, 16
-     dec                  hd
- %endif
--    jg .h_w8_loop
-+    jg .h_w8
-     RET
- .h_w16:
--    mov                  r6, -16*1
-+    mov                  r3, -16*1
-     jmp .h_start
- .h_w32:
--    mov                  r6, -16*2
-+    mov                  r3, -16*2
-     jmp .h_start
- .h_w64:
--    mov                  r6, -16*4
-+    mov                  r3, -16*4
-     jmp .h_start
- .h_w128:
--    mov                  r6, -16*8
-+    mov                  r3, -16*8
- .h_start:
--%if ARCH_X86_32
--    mov                  r3, r2
-- %define           base_reg  r3
--%endif
--    sub                srcq, r6
--    mov                  r5, r6
--    W32_RESTORE_SSQ
-+    sub                srcq, r3

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dvbpsi/0001-really-set-last-section-number.patch Deleted

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/fluid/fluid-no-bin.patch Deleted

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/libarchive/0001-Fix-retrieving-incorrect-member-from-struct-statfs.patch Deleted

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/libarchive/0005-don-t-force-windows-versions-if-they-are-set-in-the-.patch Deleted

@@ -1,44 +0,0 @@
-From a4fa6bef8bdb141d629d79d8d1f3e67448bd67e1 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@ycbcr.xyz>
-Date: Thu, 2 Apr 2020 15:33:40 +0200
-Subject: [PATCH 5/5] don't force windows versions if they are set in the
- environment
-
----
- configure.ac | 20 +++++++++++++++++---
- 1 file changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7312c4d5..05ca4955 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -244,9 +244,23 @@ AM_CONDITIONAL([STATIC_BSDCPIO], [ test "$static_bsdcpio" = yes ])
- # Set up defines needed before including any headers
- case $host in
-   *mingw* | *cygwin* | *msys*  )
--  AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.])
--  AC_DEFINE([WINVER], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.])
--  AC_DEFINE([NTDDI_VERSION], 0x05020000, [Define to '0x05020000' for Windows Server 2003 APIs.])
-+  AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
-+    [[#ifdef _WIN32_WINNT
-+     # error _WIN32_WINNT already defined
-+     #endif
-+    ]],[[;]])
-+  ],[
-+    AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.])
-+    AC_DEFINE([NTDDI_VERSION], 0x05020000, [Define to '0x05020000' for Windows Server 2003 APIs.])
-+  ])
-+  AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
-+    [[#ifdef WINVER
-+     # error WINVER already defined
-+     #endif
-+    ]],[[;]])
-+  ],[
-+    AC_DEFINE([WINVER], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.])
-+  ])
-   ;;
- esac
- 
--- 
-2.26.0.windows.1
-

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/libarchive/fix-types.patch Deleted

@@ -1,43 +0,0 @@
-From 93a8b303904e40261ac58fbd95eb338d6b9cb1df Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@ycbcr.xyz>
-Date: Fri, 27 Mar 2020 16:26:07 +0100
-Subject: [PATCH 2/4] archive_entry: use the proper define for mode_t
-
----
- libarchive/archive_entry.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c
-index 72c644e6..7afec1b1 100644
---- a/libarchive/archive_entry.c
-+++ b/libarchive/archive_entry.c
-@@ -353,7 +353,7 @@ archive_entry_devminor(struct archive_entry *entry)
- 		return minor(entry->ae_stat.aest_dev);
- }
- 
--mode_t
-+__LA_MODE_T
- archive_entry_filetype(struct archive_entry *entry)
- {
- 	return (AE_IFMT & entry->acl.mode);
-@@ -525,7 +525,7 @@ archive_entry_ino64(struct archive_entry *entry)
- 	return (entry->ae_stat.aest_ino);
- }
- 
--mode_t
-+__LA_MODE_T
- archive_entry_mode(struct archive_entry *entry)
- {
- 	return (entry->acl.mode);
-@@ -598,7 +598,7 @@ _archive_entry_pathname_l(struct archive_entry *entry,
- 	return (archive_mstring_get_mbs_l(&entry->ae_pathname, p, len, sc));
- }
- 
--mode_t
-+__LA_MODE_T
- archive_entry_perm(struct archive_entry *entry)
- {
- 	return (~AE_IFMT & entry->acl.mode);
--- 
-2.26.0.windows.1
-

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp Deleted

@@ -1,208 +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.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "toolbareditor.hpp"
-#include "util/i18n.hpp"
-#include "util/systempalette.hpp"
-#include "util/qml_main_context.hpp"
-#include "player/playercontrolbarmodel.hpp"
-#include "maininterface/main_interface.hpp"
-
-#include <QInputDialog>
-#include <QQuickItem>
-#include <QtQml/QQmlContext>
-#include <QQmlEngine>
-
-#define PROFILE_NAME_1 "Minimalist Style"
-#define VALUE_1 "0;64;3;1;4;64;11;64;34;64;9;64;33 | 3;0;1;4"
-#define PROFILE_NAME_2 "One-Liner Style"
-#define VALUE_2 "0;64;3;1;4;64;7;9;8;64;64;11;10;12;13;#33 | 17;3;0;1;4;18"
-#define PROFILE_NAME_3 "Simplest Style"
-#define VALUE_3 "33;#0;4;1;#7 | 3;0;4"
-
-ToolbarEditorDialog::ToolbarEditorDialog( QWidget *_w, intf_thread_t *_p_intf)
-    : QVLCDialog( _w,  _p_intf )
-{
-    setWindowTitle( qtr( "Toolbars Editor" ) );
-    setWindowRole( "vlc-toolbars-editor" );
-    setMinimumWidth( 800 );
-    setMinimumHeight( 600 );
-
-    /* Profile */
-    QGridLayout *mainLayout = new QGridLayout( this );
-    QHBoxLayout *profileBoxLayout = new QHBoxLayout();
-
-    profileCombo = new QComboBox;
-
-    QToolButton *newButton = new QToolButton;
-    newButton->setIcon( QIcon( ":/new.svg" ) );
-    newButton->setToolTip( qtr("New profile") );
-    QToolButton *deleteButton = new QToolButton;
-    deleteButton->setIcon( QIcon( ":/toolbar/clear.svg" ) );
-    deleteButton->setToolTip( qtr( "Delete the current profile" ) );
-
-    profileBoxLayout->addWidget( new QLabel( qtr( "Select profile:" ) ) );
-    profileBoxLayout->addWidget( profileCombo );
-    profileBoxLayout->addWidget( newButton );
-    profileBoxLayout->addWidget( deleteButton );
-
-    mainLayout->addLayout( profileBoxLayout, 0, 0, 1, 9 );
-
-    /* Fill combos */
-    int i_size = getSettings()->beginReadArray( "ToolbarProfiles" );
-    for( int i = 0; i < i_size; i++ )
-    {
-        getSettings()->setArrayIndex(i);
-        profileCombo->addItem( getSettings()->value( "ProfileName" ).toString(),
-                               getSettings()->value( "Value" ).toString() );
-    }
-    getSettings()->endArray();
-
-    /* Load defaults ones if we have no combos */
-    if( i_size == 0 )
-    {
-        profileCombo->addItem( qtr("Default Style"), PlayerControlBarModel::getSerializedDefaultStyle() );
-        profileCombo->addItem( PROFILE_NAME_1, QString( VALUE_1 ) );
-        profileCombo->addItem( PROFILE_NAME_2, QString( VALUE_2 ) );
-        profileCombo->addItem( PROFILE_NAME_3, QString( VALUE_3 ) );
-        profileCombo->setCurrentIndex(0);
-    }
-    else
-    {
-        profileCombo->setCurrentIndex( -1 );
-    }
-
-    /* Drag and Drop */
-    editorView = new QQuickWidget(this);
-    editorView->setClearColor(Qt::transparent);
-    QQmlContext* rootCtx = editorView->rootContext();
-    QQmlEngine* engine = editorView->engine();
-
-    intf_sys_t* p_sys = p_intf->p_sys;
-    MainInterface* mainInterface = p_sys->p_mi;
-
-    rootCtx->setContextProperty( "player", p_sys->p_mainPlayerController );
-    rootCtx->setContextProperty( "i18n", new I18n(engine) );
-    rootCtx->setContextProperty( "mainctx", new QmlMainContext(p_intf, mainInterface, engine));
-    rootCtx->setContextProperty( "mainInterface", mainInterface);
-    rootCtx->setContextProperty( "topWindow", mainInterface->windowHandle());
-    rootCtx->setContextProperty( "systemPalette", new SystemPalette(engine));
-    rootCtx->setContextProperty( "medialib", nullptr );
-    rootCtx->setContextProperty( "toolbareditor",  this);
-    rootCtx->setContextProperty( "rootPlayer", nullptr );
-
-    editorView->setSource( QUrl ( QStringLiteral("qrc:/dialogs/ToolbarEditor.qml") ) );
-
-    mainLayout->addWidget(editorView, 0, 0);
-
-    editorView->setResizeMode( QQuickWidget::SizeRootObjectToView );
-
-    mainLayout->addWidget( editorView, 1, 0, 1, 9 );
-    editorView->show();
-
-    /* Buttons */
-    QDialogButtonBox *okCancel = new QDialogButtonBox;
-    QPushButton *okButton = new QPushButton( qtr( "Cl&ose" ), this );
-    okButton->setDefault( true );
-    QPushButton *cancelButton = new QPushButton( qtr( "&Cancel" ), this );
-    okCancel->addButton( okButton, QDialogButtonBox::AcceptRole );
-    okCancel->addButton( cancelButton, QDialogButtonBox::RejectRole );
-
-    BUTTONACT( deleteButton, deleteProfile() );
-    BUTTONACT( newButton, newProfile() );
-    CONNECT( profileCombo, currentIndexChanged( int ), this, changeProfile( int ) );
-    BUTTONACT( okButton, close() );
-    BUTTONACT( cancelButton, cancel() );
-    mainLayout->addWidget( okCancel, 2, 0, 1, 9 );
-}
-ToolbarEditorDialog::~ToolbarEditorDialog()
-{
-    getSettings()->beginWriteArray( "ToolbarProfiles" );
-    for( int i = 0; i < profileCombo->count(); i++ )
-    {
-        getSettings()->setArrayIndex(i);
-        getSettings()->setValue( "ProfileName", profileCombo->itemText( i ) );
-        getSettings()->setValue( "Value", profileCombo->itemData( i ) );
-    }
-    getSettings()->endArray();
-}
-
-void ToolbarEditorDialog::close()
-{
-    emit saveConfig();
-    accept();
-}
-
-void ToolbarEditorDialog::cancel()
-{
-    reject();
-}
-
-void ToolbarEditorDialog::newProfile()
-{
-    bool ok;
-    QString name =  QInputDialog::getText( this, qtr( "Profile Name" ),
-                                           qtr( "Please enter the new profile name." ), QLineEdit::Normal, 0, &ok );
-    if( !ok ) return;
-
-    QVariant config;
-    QMetaObject::invokeMethod(editorView->rootObject(),"getProfileConfig",
-                              Q_RETURN_ARG(QVariant, config));
-
-    profileCombo->addItem( name, config.toString() );
-    profileCombo->setCurrentIndex( profileCombo->count() - 1 );
-}
-
-void ToolbarEditorDialog::deleteProfile()
-{
-    profileCombo->removeItem( profileCombo->currentIndex() );
-}
-
-void ToolbarEditorDialog::changeProfile( int i )
-{
-    QStringList qs_list = profileCombo->itemData( i ).toString().split( "|" );
-    if( qs_list.count() < 2 )
-        return;
-
-    QStringList align_list_main = qs_list[0].split("#");
-    QStringList align_list_mini = qs_list[1].split("#");
-
-    emit updatePlayerModel("MainPlayerToolbar-left", align_list_main[0]);
-    if(align_list_main.size() >= 2)
-        emit updatePlayerModel("MainPlayerToolbar-center", align_list_main[1]);
-    else
-        emit updatePlayerModel("MainPlayerToolbar-center", "");
-    if(align_list_main.size() >= 3)
-        emit updatePlayerModel("MainPlayerToolbar-right", align_list_main[2]);
-    else
-        emit updatePlayerModel("MainPlayerToolbar-right", "");
-
-    emit updatePlayerModel("MiniPlayerToolbar-left", align_list_mini[0]);

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/toolbar/toolbareditor.hpp Deleted

@@ -1,55 +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.
- *****************************************************************************/
-
-#ifndef QVLC_TOOLBAREDITOR_DIALOG_H_
-#define QVLC_TOOLBAREDITOR_DIALOG_H_ 1
-
-#include "widgets/native/qvlcframe.hpp"                                 /* QVLCDialog */
-#include "util/qml_main_context.hpp"
-#include "dialogs/sout/profile_selector.hpp"
-
-#include <QAbstractListModel>
-#include <QVector>
-#include <QQuickWidget>
-
-class ToolbarEditorDialog : public QVLCDialog
-{
-    Q_OBJECT
-public:
-    ToolbarEditorDialog( QWidget *, intf_thread_t *);
-    virtual ~ToolbarEditorDialog();
-
-public slots:
-    Q_INVOKABLE void close();
-    Q_INVOKABLE void cancel();
-
-private slots:
-    void newProfile();
-    void deleteProfile();
-    void changeProfile( int );
-
-private:
-    QComboBox *profileCombo;
-    QQuickWidget *editorView;
-
-signals:
-    void updatePlayerModel(QString toolbarName,QString config);
-    void saveConfig();
-};
-
-#endif

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/playercontrolbarmodel.cpp Deleted

@@ -1,326 +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.
- *****************************************************************************/
-#include <QSettings>
-
-#include "qt.hpp"
-#include "playercontrolbarmodel.hpp"
-
-enum default_align {
-    ALIGN_LEFT = 0,
-    ALIGN_CENTER,
-    ALIGN_RIGHT,
-    ALIGN_SIZE
-};
-
-static const QVector<PlayerControlBarModel::IconToolButton> MAIN_TB_DEFAULT[default_align::ALIGN_SIZE] = {
-    {
-        // left
-        {PlayerControlBarModel::LANG_BUTTON},
-        {PlayerControlBarModel::MENU_BUTTON}
-    },
-    {
-        // center
-        {PlayerControlBarModel::RANDOM_BUTTON},
-        {PlayerControlBarModel::PREVIOUS_BUTTON},
-        {PlayerControlBarModel::PLAY_BUTTON},
-        {PlayerControlBarModel::NEXT_BUTTON},
-        {PlayerControlBarModel::LOOP_BUTTON}
-    },
-    {
-        // right
-        {PlayerControlBarModel::VOLUME},
-        {PlayerControlBarModel::FULLSCREEN_BUTTON}
-    }
-};
-
-static const QVector<PlayerControlBarModel::IconToolButton> MINI_TB_DEFAULT[default_align::ALIGN_SIZE] = {
-    {
-        // left
-        {PlayerControlBarModel::ARTWORK_INFO}
-    },
-    {
-        // center
-        {PlayerControlBarModel::RANDOM_BUTTON},
-        {PlayerControlBarModel::PREVIOUS_BUTTON},
-        {PlayerControlBarModel::PLAY_BUTTON},
-        {PlayerControlBarModel::NEXT_BUTTON},
-        {PlayerControlBarModel::LOOP_BUTTON}
-    },
-    {
-        // right
-        {PlayerControlBarModel::VOLUME},
-        {PlayerControlBarModel::PLAYER_SWITCH_BUTTON}
-    }
-};
-
-
-PlayerControlBarModel::PlayerControlBarModel(QObject *_parent) : QAbstractListModel(_parent)
-{
-    configName = "MainPlayerToolbar";
-
-    connect(this, &QAbstractListModel::rowsInserted, this, &PlayerControlBarModel::countChanged);
-    connect(this, &QAbstractListModel::rowsRemoved, this, &PlayerControlBarModel::countChanged);
-    connect(this, &QAbstractListModel::modelReset, this, &PlayerControlBarModel::countChanged);
-}
-
-void PlayerControlBarModel::saveConfig()
-{
-    getSettings()->setValue(configName,getConfig());
-}
-
-QString PlayerControlBarModel::getConfig()
-{
-    QString config="";
-    for (IconToolButton it: mButtons) {
-        config += QString::number(it.id);
-        config += ";";
-    }
-    return config;
-}
-
-void PlayerControlBarModel::reloadConfig(QString config)
-{
-    beginResetModel();
-    mButtons.clear();
-    if (!config.isEmpty())
-        parseAndAdd(config);
-    endResetModel();
-}
-
-void PlayerControlBarModel::reloadModel()
-{
-    beginResetModel();
-    mButtons.clear();
-
-    QVariant config = getSettings() ->value(configName);
-
-    if (!config.isNull() && config.canConvert<QString>())
-        parseAndAdd(config.toString());
-    else
-    {
-        const auto configAndAlignment = configName.split("-");
-        if (configAndAlignment.size() == 2)
-        {
-            const auto alignment = configAndAlignment[1];
-            if (configAndAlignment[0] == QLatin1String("MainPlayerToolbar"))
-            {
-                if (alignment == "left")
-                    parseDefault(MAIN_TB_DEFAULT[default_align::ALIGN_LEFT]);
-                else if (alignment == "center")
-                    parseDefault(MAIN_TB_DEFAULT[default_align::ALIGN_CENTER]);
-                else if (alignment == "right")
-                    parseDefault(MAIN_TB_DEFAULT[default_align::ALIGN_RIGHT]);
-            }
-            else
-            {
-                if (alignment == "left")
-                    parseDefault(MINI_TB_DEFAULT[default_align::ALIGN_LEFT]);
-                else if (alignment == "center")
-                    parseDefault(MINI_TB_DEFAULT[default_align::ALIGN_CENTER]);
-                else if (alignment == "right")
-                    parseDefault(MINI_TB_DEFAULT[default_align::ALIGN_RIGHT]);
-
-            }
-        }
-    }
-    endResetModel();
-}
-
-void PlayerControlBarModel::parseDefault(const QVector<PlayerControlBarModel::IconToolButton>& config)
-{
-    beginInsertRows(QModelIndex(),rowCount(),rowCount() + config.size());
-    for (const auto& i : config)
-        mButtons.append(i);
-    endInsertRows();
-}
-
-void PlayerControlBarModel::parseAndAdd(const QString &config)
-{
-    beginInsertRows(QModelIndex(),rowCount(),rowCount()+config.split(";",
-                                                                     #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-                                                                         Qt::SkipEmptyParts
-                                                                     #else
-                                                                         QString::SkipEmptyParts
-                                                                     #endif
-                                                                     ).length() - 1);
-
-    for (const QString& iconPropertyTxt : config.split( ";",
-                                                    #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-                                                        Qt::SkipEmptyParts
-                                                    #else
-                                                        QString::SkipEmptyParts
-                                                    #endif
-                                                    ) )
-    {
-        QStringList list2 = iconPropertyTxt.trimmed().split( "-" );
-
-        if( list2.count() < 1 )
-        {
-            msg_Warn( p_intf, "Parsing error 1. Please, report this." );
-            continue;
-        }
-        bool ok;
-        ButtonType_e i_type = static_cast<ButtonType_e>(list2.at( 0 ).toInt( &ok ));
-        if( !ok )
-        {
-            msg_Warn( p_intf, "Parsing error 2. Please, report this." );
-            continue;
-        }
-
-        IconToolButton itButton = {i_type};
-        mButtons.append(itButton);
-    }
-
-    endInsertRows();
-}
-
-int PlayerControlBarModel::rowCount(const QModelIndex &parent) const
-{
-    if (parent.isValid() )
-        return 0;
-
-    return mButtons.size();
-}
-

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/playercontrolbarmodel.hpp Deleted

@@ -1,139 +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.
- *****************************************************************************/
-
-#ifndef CONTROLLERMODEL_H
-#define CONTROLLERMODEL_H
-
-#include <QAbstractListModel>
-#include <QVector>
-
-#include "util/qml_main_context.hpp"
-
-class PlayerControlBarModel : public QAbstractListModel
-{
-    Q_OBJECT
-    Q_PROPERTY(QmlMainContext* mainCtx READ getMainCtx WRITE setMainCtx NOTIFY ctxChanged)
-    Q_PROPERTY(QString configName READ getConfigName WRITE setConfigName NOTIFY configNameChanged)
-    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
-
-
-public:
-    explicit PlayerControlBarModel(QObject *_parent = nullptr);
-    struct IconToolButton
-    {
-        int id;
-    };
-    enum{
-        ID_ROLE
-    };
-    enum ButtonType_e
-    {
-        PLAY_BUTTON,
-        STOP_BUTTON,
-        OPEN_BUTTON,
-        PREVIOUS_BUTTON,
-        NEXT_BUTTON,
-        SLOWER_BUTTON,
-        FASTER_BUTTON,
-        FULLSCREEN_BUTTON,
-        EXTENDED_BUTTON,
-        PLAYLIST_BUTTON,
-        SNAPSHOT_BUTTON,
-        RECORD_BUTTON,
-        ATOB_BUTTON,
-        FRAME_BUTTON,
-        SKIP_BACK_BUTTON,
-        SKIP_FW_BUTTON,
-        QUIT_BUTTON,
-        RANDOM_BUTTON,
-        LOOP_BUTTON,
-        INFO_BUTTON,
-        LANG_BUTTON,
-        MENU_BUTTON,
-        BACK_BUTTON,
-        CHAPTER_PREVIOUS_BUTTON,
-        CHAPTER_NEXT_BUTTON,
-        BUTTON_MAX,
-        PLAYER_SWITCH_BUTTON,
-        ARTWORK_INFO,
-
-        SPLITTER = 0x20,
-        VOLUME,
-        TELETEXT_BUTTONS,
-        ASPECT_RATIO_COMBOBOX,
-        SPECIAL_MAX,
-
-        WIDGET_SPACER = 0x40,
-        WIDGET_SPACER_EXTEND,
-        WIDGET_MAX
-    };
-    Q_ENUM(ButtonType_e)
-
-    // Basic functionality:
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-
-    // Editable:
-    bool setData(const QModelIndex &index, const QVariant &value,
-                 int role = Qt::EditRole) override;
-
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-
-    virtual QHash<int, QByteArray> roleNames() const override;
-
-    inline QmlMainContext* getMainCtx() const { return m_mainCtx; }
-    void setMainCtx(QmlMainContext*);
-
-    inline QString getConfigName() { return configName; }
-    void setConfigName(QString name);
-
-    static QString getSerializedDefaultStyle();
-
-signals:
-    void ctxChanged(QmlMainContext*);
-    void configNameChanged(QString);
-    void countChanged();
-
-protected:
-    intf_thread_t       *p_intf  = nullptr;
-
-private:
-    QVector<IconToolButton> mButtons;
-    QString configName;
-
-    void parseAndAdd(const QString& config);
-    void parseDefault(const QVector<IconToolButton>& config);
-
-    bool setButtonAt(int index, const IconToolButton &button);
-    void addProfiles();
-    void loadConfig();
-
-    QmlMainContext* m_mainCtx = nullptr;
-
-public slots:
-    Q_INVOKABLE void insert(int index, QVariantMap bdata);
-    Q_INVOKABLE void move(int src,int dest);
-    Q_INVOKABLE void remove(int index);
-    Q_INVOKABLE void reloadConfig(QString config);
-    Q_INVOKABLE void saveConfig();
-    Q_INVOKABLE QString getConfig();
-    Q_INVOKABLE void reloadModel();
-};
-
-#endif // CONTROLLERMODEL_H

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/RoundImage.qml Deleted

@@ -1,56 +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 2.11
-import QtQuick.Controls 2.4
-import QtGraphicalEffects 1.0
-
-import "qrc:///style/"
-
-Item {
-    id: root
-
-    property real radius: 3
-    property alias asynchronous: cover.asynchronous
-    property alias fillMode: cover.fillMode
-    property alias mipmap: cover.mipmap
-    property alias paintedHeight: cover.paintedHeight
-    property alias paintedWidth: cover.paintedWidth
-    property alias source: cover.source
-    property alias sourceSize: cover.sourceSize
-    property alias status: cover.status
-    property alias horizontalAlignment: cover.horizontalAlignment
-    property alias verticalAlignment: cover.verticalAlignment
-
-    Image {
-        id: cover
-
-        anchors.fill: parent
-        asynchronous: true
-        fillMode: Image.PreserveAspectCrop
-        sourceSize: Qt.size(width, height)
-        layer.enabled: true
-        layer.effect: OpacityMask {
-            maskSource: Rectangle {
-                radius: root.radius
-                width: root.width
-                height: root.height
-                visible: false
-            }
-        }
-    }
-}

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/VideoQualityLabel.qml Deleted

@@ -1,38 +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 2.11
-import QtQuick.Controls 2.4
-
-import "qrc:///style/"
-
-Label {
-    id: label
-    color: "white"
-    bottomPadding: VLCStyle.margin_xxxsmall
-    topPadding: VLCStyle.margin_xxxsmall
-    leftPadding: VLCStyle.margin_xxxsmall
-    rightPadding: VLCStyle.margin_xxxsmall
-    font.pixelSize: VLCStyle.fontSize_normal
-    background: Rectangle {
-        anchors.fill: label
-        color: "black"
-        opacity: 0.5
-        radius: 3
-    }
-    Accessible.ignored: true
-}

vlc-beta-20210430.0b6b242324.tar.xz/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/NEWS -> vlc-beta-20210430.0b6b242324.tar.xz/NEWS Changed

@@ -105,6 +105,46 @@
 
 appleOS:
  * Improved proxy configuration handling
+Changes between 3.0.12.1 and 3.0.13:
+----------------------------------
+
+Demux:
+ * Adaptive: fix artefacts in HLS streams with wrong profiles/levels
+ * Fix regression on some MP4 files for the audio track
+ * Fix MPGA and ADTS probing in TS files
+ * Fix Flac inside AVI files
+ * Fix VP9/Webm artefacts when seeking
+
+Codec:
+ * Support SSA text scaling
+ * Fix rotation on Android rotation
+ * Fix WebVTT subtitles that start at 00:00
+
+Access:
+ * Update libnfs to support NFSv4
+ * Improve SMB2 integration
+ * Fix Blu-ray files using Unicode names on Windows
+ * Disable mcast lookups on Android for RTSP playback
+
+Video Output:
+ * Rework the D3D11 rendering wait, to fix choppiness on display
+
+Interfaces:
+ * Fix VLC getting stuck on close on X11 (#21875)
+ * Improve RTL on preferences on macOS
+ * Add mousewheel horizontal axis control
+ * Fix crash on exit on macOS
+ * Fix sizing of the fullscreen controls on macOS
+
+Windows:
+ * Fix subtitles/OSD under Windows XP
+
+Misc:
+ * Update translations
+ * Improve MIDI fonts search on Linux
+ * Update Soundcloud, Youtube, liveleak
+ * Fix compilation with GCC11
+ * Fix input-slave option for subtitles
 
 
 Changes between 3.0.12 and 3.0.12.1:
@@ -114,6 +154,7 @@
  * 3.0.12.1 is the first release for Apple Silicon macs
  * Version bump to allow an automatic upgrade path
 
+
 Changes between 3.0.11.1 and 3.0.12:
 ----------------------------------
 
@@ -178,6 +219,7 @@
  * Updated libmatroska to 1.6.0
  * Updated mpg123 to 1.26.2
 
+
 Changes between 3.0.10 and 3.0.11:
 ----------------------------------

vlc-beta-20210430.0b6b242324.tar.xz/README.md Added

@@ -0,0 +1,130 @@
+# VLC media player
+
+**VLC** is a libre and open source **media player** and **multimedia engine**,
+focused on **playing everything**, and **running everywhere**.
+
+**VLC** can play most multimedia files, discs, streams, devices and is able to
+convert, encode, **stream** and manipulate streams into numerous formats.
+
+VLC is used by many over the world, on numerous platforms, for very different use cases.
+
+The **engine of VLC** can be embedded by 3rd party applications, and is called *libVLC*.
+
+**VLC** is part of the [VideoLAN project](https://videolan.org) and
+is developed and supported by a community of volunteers.
+
+The VideoLAN project was started at the university [École Centrale Paris](https://www.centralesupelec.fr/) who
+relicensed VLC under the GPLv2 license in February 2001. Since then, VLC has
+been downloaded multi-billion times.
+
+## License
+
+**VLC** is released under the GPLv2 *(or later)* license.
+*On some platforms, it is de facto GPLv3, because of dependencies licenses*.
+
+**libVLC**, the engine is released under the LGPLv2 *(or later)* license. \
+This allows embedding the engine in 3rd party applications, while letting them to be licensed under other licenses.
+
+# Platforms
+
+VLC is available on the following platforms:
+- Windows *(from 7 to all versions of 10)*, including UWP platforms
+- macOS *(10.10 and more recent)*
+- GNU/Linux and affiliated
+- \*BSD and affiliated
+- Android *(4.2 and more recent)*, including Android TV and Android Auto
+- iOS *(9 and more recent)*, including AppleTV and iPadOS
+- Haiku, OS/2 and a few others.
+
+Not all platforms receive the same amount of care, due to our limited resources.
+
+**Nota Bene**: [Android repository](https://code.videolan.org/videolan/vlc-android/) and
+[iOS repository](https://code.videolan.org/videolan/vlc-ios/) are on different repository
+than the main one.
+
+# Contributing & Community
+
+**VLC** is maintained by a community of people, and VideoLAN is not paying any of them.\
+The community is composed of developers, helpers, maintainers, designers and writers that want
+the open source project to thrive.
+
+The main development of VLC is done in the C language, but this repository has also plenty of C++, Obj-C, asm, Rust.
+
+Other repositories linked to vlc are done in Kotlin/Java [(Android)](https://code.videolan.org/videolan/vlc-android/),
+in Swift [(iOS)](https://code.videolan.org/videolan/vlc-ios/), C# [(libVLCSharp)](https://code.videolan.org/videolan/libvlcsharp/)
+
+We need help for the following tasks:
+- coding
+- packaging for Windows, macOS and Linux distributions
+- technical writing for the documentation
+- design
+- support
+- community management and communication.
+
+Please reach us :)
+
+We are on IRC, on the **#videolan** channel on *Freenode*.
+
+## Contributions
+
+Contributions are now done through Merge Requests on our [gitlab repository](https://code.videolan.org/videolan/vlc/).
+
+CI, Discussions should be resolved before merging a Merge Request.
+
+# libVLC
+
+**libVLC** is an embeddable engine for 3rd party applications and frameworks.
+
+It runs on the same platforms of VLC *(and sometimes on more platforms)* and can provide playback,
+streaming and converting of multimedia files and stream.
+
+**libVLC** has numerous bindings for other languagues, like C++, Python or C#.
+
+# Support
+
+## Links
+
+You can found here several links that might help you:
+
+- [The VLC web site](http://www.videolan.org/vlc/)
+- [Support](https://www.videolan.org/support/)
+- [Forums](https://forum.videolan.org/)
+- [Wiki](https://wiki.videolan.org/)
+- [The Developers site](https://wiki.videolan.org/Developers_Corner)
+- [VLC hacking guide](https://wiki.videolan.org/Hacker_Guide)
+- [Bugtracker](https://code.videolan.org/videolan/vlc/-/issues)
+- [The VideoLAN web site](https://www.videolan.org/)
+
+## Source Code sitemap
+```
+ABOUT-NLS          - Notes on the Free Translation Project.
+AUTHORS            - VLC authors.
+COPYING            - The GPL license.
+COPYING.LIB        - The LGPL license.
+INSTALL            - Installation and building instructions.
+NEWS               - Important modifications between the releases.
+README             - This file.
+THANKS             - VLC contributors.
+
+bin/               - VLC binaries.
+bindings/          - libVLC bindings to other languages.
+compat/            - compatibility library for operating systems missing
+                     essential functionalities.
+contrib/           - Facilities for retrieving external libraries and building
+                     them for systems that don't have the right versions.
+doc/               - Miscellaneous documentation.
+extras/analyser    - Code analyser and editor specific files.
+extras/buildsystem - different buildsystems specific files.
+extras/misc        - Files that don't fit in the other extras/ categories.
+extras/package     - VLC packaging specific files such as spec files.
+extras/tools/      - Facilities for retrieving external building tools needed
+                     for systems that don't have the right versions.
+include/           - Header files.
+lib/               - libVLC source code.
+modules/           - VLC plugins and modules. Most of the code is here.
+po/                - VLC translations.
+share/             - Common Resources files.
+src/               - libvlccore source code.
+test/              - testing system.
+```
+

vlc-beta-20210430.0b6b242324.tar.xz/autotools/.gitignore Added

vlc-beta-20210430.0b6b242324.tar.xz/bin/.gitignore Added

vlc-beta-20210430.0b6b242324.tar.xz/compat/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/configure.ac -> vlc-beta-20210430.0b6b242324.tar.xz/configure.ac Changed

@@ -1659,7 +1659,7 @@
   AC_CACHE_CHECK([if $CC groks AVX inline assembly], [ac_cv_avx_inline], [
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[[
 void *p;
-asm volatile("xorps256 %%ymm1,%%ymm2"::"r"(p):"ymm1", "ymm2");
+asm volatile("vxorps %%ymm1,%%ymm2,%%ymm3"::"r"(p):"ymm1", "ymm2", "ymm3");
 ]])
     ], [
       ac_cv_avx_inline=yes
@@ -1675,7 +1675,7 @@
   AC_CACHE_CHECK([if $CC groks AVX2 inline assembly], [ac_cv_avx2_inline], [
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[[
 void *p;
-asm volatile("punpckhqdq256 %%ymm1,%%ymm2"::"r"(p):"ymm1", "ymm2");
+asm volatile("vpunpckhqdq %%ymm1,%%ymm2,%%ymm3"::"r"(p):"ymm1", "ymm2", "ymm3");
 ]])
     ], [
       ac_cv_avx2_inline=yes
@@ -4278,8 +4278,7 @@
 dnl
 dnl  Bitstream
 dnl
-PKG_CHECK_MODULES([BITSTREAM], [bitstream > 1.4],[have_bitstream="yes"], [have_bitstream="no"])
-AM_CONDITIONAL([HAVE_BITSTREAM], [test "${have_bitstream}" = "yes"])
+PKG_HAVE_WITH_MODULES([BITSTREAM], [bitstream > 1.4])
 
 dnl
 dnl  SRT plugin
@@ -4470,20 +4469,7 @@
 dnl
 dnl Check for GBM
 dnl
-AC_ARG_ENABLE([gbm],
-  AS_HELP_STRING([--enable-gbm],
-    [Use GBM for egl_pbuffer (default enabled)]))
-have_gbm="no"
-AS_IF([test "${enable_gbm}" != "no"], [
-  PKG_CHECK_MODULES([GBM], [gbm], [have_gbm="yes"], [
-    AS_IF([test -n "${enable_gbm}"], [
-      AC_MSG_ERROR([${GBM_PKG_ERRORS}.])
-    ], [
-      AC_MSG_WARN([${GBM_PKG_ERRORS}.])
-    ])
-  ])
-])
-AM_CONDITIONAL([HAVE_GBM], [test "${have_gbm}" = "yes"])
+PKG_HAVE_WITH_MODULES([GBM], [gbm])
 
 dnl
 dnl Libnotify notification plugin

vlc-beta-20210430.0b6b242324.tar.xz/contrib/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/bluray/SHA512SUMS -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/bluray/SHA512SUMS Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/bluray/rules.mak -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/bluray/rules.mak Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dav1d/SHA512SUMS -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/dav1d/SHA512SUMS Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dav1d/rules.mak -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/dav1d/rules.mak Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dvbpsi/SHA512SUMS -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/dvbpsi/SHA512SUMS Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dvbpsi/rules.mak -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/dvbpsi/rules.mak Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dvdcss/SHA512SUMS -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/dvdcss/SHA512SUMS Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dvdcss/rules.mak -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/dvdcss/rules.mak Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dvdnav/SHA512SUMS -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/dvdnav/SHA512SUMS Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dvdnav/rules.mak -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/dvdnav/rules.mak Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dvdread/SHA512SUMS -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/dvdread/SHA512SUMS Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/dvdread/rules.mak -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/dvdread/rules.mak Changed

vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/ffmpeg/0001-avcodec-mpeg12dec-don-t-call-hw-end_frame-when-start.patch Added

@@ -0,0 +1,36 @@
+From ef1c4233ee7b694916c5b6059ea3fb57faf7f8ba Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Fri, 12 Feb 2021 08:20:56 +0100
+Subject: [PATCH 1/2] avcodec/mpeg12dec: don't call hw->end_frame when starting
+ second field decoding
+
+This call is unbalanced with a hwaccel->start_frame. It fixes some crashes
+because this call ends up using uninitialized memory. Decoding works as
+expected after this patch.
+---
+ libavcodec/mpeg12dec.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
+index 775579f9f0..5dfea63b71 100644
+--- a/libavcodec/mpeg12dec.c
++++ b/libavcodec/mpeg12dec.c
+@@ -1669,15 +1669,6 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size)
+             return AVERROR_INVALIDDATA;
+         }
+ 
+-        if (s->avctx->hwaccel &&
+-            (s->avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) {
+-            if ((ret = s->avctx->hwaccel->end_frame(s->avctx)) < 0) {
+-                av_log(avctx, AV_LOG_ERROR,
+-                       "hardware accelerator failed to decode first field\n");
+-                return ret;
+-            }
+-        }
+-
+         for (i = 0; i < 4; i++) {
+             s->current_picture.f->data[i] = s->current_picture_ptr->f->data[i];
+             if (s->picture_structure == PICT_BOTTOM_FIELD)
+-- 
+2.27.0.windows.1
+

vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/ffmpeg/0002-avcodec-mpeg12dec-don-t-end-a-slice-without-first_sl.patch Added

@@ -0,0 +1,49 @@
+From e2cfacf5501fbe5d6a56de56f4f5e4f47f6ad484 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Fri, 12 Feb 2021 11:10:03 +0100
+Subject: [PATCH 2/2] avcodec/mpeg12dec: don't end a slice without first_slice
+
+If first_slice is set that means the first slice/field is not started yet. We
+should not end the slice. In particular calling hwaccel->end_frame may crash as
+we're ending a frame that was not started.
+
+We also need to reset first_slice once the slice_end is finished handling
+for this check to work.
+---
+ libavcodec/mpeg12dec.c | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
+index 5dfea63b71..2689446cfd 100644
+--- a/libavcodec/mpeg12dec.c
++++ b/libavcodec/mpeg12dec.c
+@@ -2476,13 +2476,19 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture,
+                         s2->er.error_count += s2->thread_context[i]->er.error_count;
+                 }
+ 
+-                ret = slice_end(avctx, picture);
+-                if (ret < 0)
+-                    return ret;
+-                else if (ret) {
+-                    // FIXME: merge with the stuff in mpeg_decode_slice
+-                    if (s2->last_picture_ptr || s2->low_delay)
+-                        *got_output = 1;
++                if (s->first_slice) // not started yet. don't end it
++                    ret = 0;
++                else {
++                    ret = slice_end(avctx, picture);
++                    if (ret < 0)
++                        return ret;
++                    else if (ret) {
++                        // FIXME: merge with the stuff in mpeg_decode_slice
++                        if (s2->last_picture_ptr || s2->low_delay)
++                            *got_output = 1;
++                    }
++                    // slice ended, don't end it again later
++                    s->first_slice = 1;
+                 }
+             }
+             s2->pict_type = 0;
+-- 
+2.27.0.windows.1
+

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/ffmpeg/rules.mak -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/ffmpeg/rules.mak Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/fluid/SHA512SUMS -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/fluid/SHA512SUMS Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/fluid/rules.mak -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/fluid/rules.mak Changed

@@ -1,7 +1,7 @@
 # fluid
 
-FLUID_VERSION := 1.1.6
-FLUID_URL := $(SF)/fluidsynth/fluidsynth-$(FLUID_VERSION)/fluidsynth-$(FLUID_VERSION).tar.bz2
+FLUID_VERSION := 2.1.8
+FLUID_URL := $(GITHUB)/FluidSynth/fluidsynth/archive/refs/tags/v$(FLUID_VERSION).tar.gz
 
 ifeq ($(call need_pkg,"glib-2.0 gthread-2.0"),)
 PKGS += fluid
@@ -12,41 +12,36 @@
 
 DEPS_fluid = glib $(DEPS_glib)
 
-$(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.bz2:
+$(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.gz:
 	$(call download_pkg,$(FLUID_URL),fluid)
 
-.sum-fluid: fluidsynth-$(FLUID_VERSION).tar.bz2
+.sum-fluid: fluidsynth-$(FLUID_VERSION).tar.gz
 
-fluidsynth: fluidsynth-$(FLUID_VERSION).tar.bz2 .sum-fluid
+fluidsynth: fluidsynth-$(FLUID_VERSION).tar.gz .sum-fluid
 	$(UNPACK)
-	$(APPLY) $(SRC)/fluid/fluid-no-bin.patch
 	$(APPLY) $(SRC)/fluid/fluid-pkg-static.patch
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/fluid/fluid-static-win32.patch
 endif
-	# Remove symbolic links to /usr/share/aclocal
-	cd $(UNPACK_DIR)/m4/ && rm -f libtool.m4 lt*m4
 	$(MOVE)
 
-FLUIDCONF := $(HOSTCONF) \
-	--disable-alsa-support \
-	--disable-aufile-support \
-	--disable-coreaudio \
-	--disable-coremidi \
-	--disable-dart \
-	--disable-dbus-support \
-	--disable-jack-support \
-	--disable-ladcca \
-	--disable-lash \
-	--disable-libsndfile-support \
-	--disable-midishare \
-	--disable-oss-support \
-	--disable-portaudio-support \
-	--disable-pulse-support \
-	--without-readline
-
-.fluid: fluidsynth
-	$(RECONF)
-	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DFLUIDSYNTH_NOT_A_DLL" ./configure $(FLUIDCONF)
-	cd $< && $(MAKE) install
+FLUIDCONF := \
+	-Denable-alsa=0 \
+	-Denable-aufile=0 \
+	-Denable-coreaudio=0 \
+	-Denable-coremidi=0 \
+	-Denable-dart=0 \
+	-Denable-dbus=0 \
+	-Denable-jack=0 \
+	-Denable-lash=0 \
+	-Denable-libsndfile=0 \
+	-Denable-midishare=0 \
+	-Denable-oss=0 \
+	-Denable-portaudio=0 \
+	-Denable-pulseaudio=0 \
+	-Denable-readline=0
+
+.fluid: fluidsynth toolchain.cmake
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DFLUIDSYNTH_NOT_A_DLL" $(CMAKE) $(FLUIDCONF)
+	cd $< && $(CMAKEBUILD) . --target install
 	touch $@

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/libarchive/SHA512SUMS -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/libarchive/SHA512SUMS Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/libarchive/rules.mak -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/libarchive/rules.mak Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/libarchive/winrt.patch -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/libarchive/winrt.patch Changed

@@ -255,15 +255,6 @@
  			/* Avoid infinity wait.
  			 * Note: If there is no data in the pipe, ReadFile()
  			 * called in read() never returns and so we won't
-@@ -437,7 +439,7 @@ __archive_read_program(struct archive_read_filter *self, const char *cmd)
- 		    cmd);
- 		return (ARCHIVE_FATAL);
- 	}
--#if defined(_WIN32) && !defined(__CYGWIN__)
-+#if defined(_WIN32) && !defined(__CYGWIN__) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- 	state->child = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, child);
- 	if (state->child == NULL) {
- 		child_stop(self, state);
 @@ -516,3 +518,5 @@ program_filter_close(struct archive_read_filter *self)
  
  	return (e);
@@ -514,30 +505,27 @@
  #define WEXITSTATUS(sts)	(sts & 0x0FF)
 diff --git a/libarchive/filter_fork_windows.c b/libarchive/filter_fork_windows.c
 index ad271fe6..0414d6f4 100644
---- a/libarchive/filter_fork_windows.c
-+++ b/libarchive/filter_fork_windows.c
+--- a/libarchive/filter_fork_windows.c.orig	2020-12-26 02:29:38.000000000 +0100
++++ b/libarchive/filter_fork_windows.c	2021-04-21 17:17:42.651099766 +0200
 @@ -31,6 +31,13 @@
  
  #include "filter_fork.h"
  
 +#if !WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
-+pid_t
-+__archive_create_child(const char *cmd, int *child_stdin, int *child_stdout)
++int
++__archive_create_child(const char *cmd, int *child_stdin, int *child_stdout, HANDLE *out_child)
 +{
-+	return (-1);
++	return ARCHIVE_FAILED;
 +}
 +#else /* WINAPI_PARTITION_DESKTOP */
- pid_t
- __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout)
- {
-@@ -178,6 +185,7 @@ fail:
+ int
+ __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout,
+ 		HANDLE *out_child)
+@@ -187,6 +194,7 @@
  	__archive_cmdline_free(acmd);
- 	return (-1);
+ 	return ARCHIVE_FAILED;
  }
 +#endif /* WINAPI_PARTITION_DESKTOP */
  
  void
  __archive_check_child(int in, int out)
--- 
-2.26.0.windows.1
-

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/rav1e/SHA512SUMS -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/rav1e/SHA512SUMS Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/contrib/src/rav1e/rules.mak -> vlc-beta-20210430.0b6b242324.tar.xz/contrib/src/rav1e/rules.mak Changed

vlc-beta-20210430.0b6b242324.tar.xz/contrib/tarballs/.gitignore Added

vlc-beta-20210430.0b6b242324.tar.xz/doc/.gitignore Added

vlc-beta-20210430.0b6b242324.tar.xz/extras/analyser/.gitignore Added

vlc-beta-20210430.0b6b242324.tar.xz/extras/package/macosx/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/extras/package/macosx/package.mak -> vlc-beta-20210430.0b6b242324.tar.xz/extras/package/macosx/package.mak Changed

vlc-beta-20210430.0b6b242324.tar.xz/extras/package/win32/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/extras/package/win32/msi/product.wxs -> vlc-beta-20210430.0b6b242324.tar.xz/extras/package/win32/msi/product.wxs Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/extras/package/win32/package.mak -> vlc-beta-20210430.0b6b242324.tar.xz/extras/package/win32/package.mak Changed

vlc-beta-20210430.0b6b242324.tar.xz/extras/tools/.gitignore Added

vlc-beta-20210430.0b6b242324.tar.xz/include/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/include/vlc_config_cat.h -> vlc-beta-20210430.0b6b242324.tar.xz/include/vlc_config_cat.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/include/vlc_configuration.h -> vlc-beta-20210430.0b6b242324.tar.xz/include/vlc_configuration.h Changed

@@ -112,7 +112,7 @@
 VLC_API int config_GetType(const char *name) VLC_USED;
 
 /**
- * Gets an integer configuration item.
+ * Gets an integer configuration item's value.
  *
  * This function retrieves the current value of a configuration item of
  * integral type (\ref CONFIG_ITEM_INTEGER and \ref CONFIG_ITEM_BOOL).
@@ -127,7 +127,7 @@
 VLC_API int64_t config_GetInt(const char *name) VLC_USED;
 
 /**
- * Sets an integer configuration item.
+ * Sets an integer configuration item's value.
  *
  * This function changes the current value of a configuration item of
  * integral type (\ref CONFIG_ITEM_INTEGER and \ref CONFIG_ITEM_BOOL).
@@ -144,7 +144,7 @@
 VLC_API void config_PutInt(const char *name, int64_t val);
 
 /**
- * Gets an floating point configuration item.
+ * Gets a floating point configuration item's value.
  *
  * This function retrieves the current value of a configuration item of
  * floating point type (\ref CONFIG_ITEM_FLOAT).
@@ -160,7 +160,7 @@
 VLC_API float config_GetFloat(const char *name) VLC_USED;
 
 /**
- * Sets an floating point configuration item.
+ * Sets a floating point configuration item's value.
  *
  * This function changes the current value of a configuration item of
  * floating point type (\ref CONFIG_ITEM_FLOAT).
@@ -177,7 +177,7 @@
 VLC_API void config_PutFloat(const char *name, float val);
 
 /**
- * Gets an string configuration item.
+ * Gets a string configuration item's value.
  *
  * This function retrieves the current value of a configuration item of
  * string type (\ref CONFIG_ITEM_STRING).
@@ -199,7 +199,7 @@
 VLC_API char *config_GetPsz(const char *name) VLC_USED VLC_MALLOC;
 
 /**
- * Sets an string configuration item.
+ * Sets a string configuration item's value.
  *
  * This function changes the current value of a configuration item of
  * string type (e.g. \ref CONFIG_ITEM_STRING).

vlc-beta-20210405.f3c7ba5bb3.tar.xz/include/vlc_cpu.h -> vlc-beta-20210430.0b6b242324.tar.xz/include/vlc_cpu.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/include/vlc_media_library.h -> vlc-beta-20210430.0b6b242324.tar.xz/include/vlc_media_library.h Changed

@@ -226,12 +226,32 @@
     };
 } vlc_ml_media_t;
 
-typedef struct vlc_ml_playlist_t
+typedef struct vlc_ml_group_t
 {
     int64_t i_id;
+
     char* psz_name;
+
+    unsigned int i_nb_total_media;
+
+    unsigned int i_duration;
+
     uint32_t i_creation_date;
+} vlc_ml_group_t;
+
+typedef struct vlc_ml_playlist_t
+{
+    int64_t i_id;
+
+    char* psz_name;
+
+    char* psz_mrl;
+
     char* psz_artwork_mrl;
+
+    uint32_t i_creation_date;
+
+    bool b_is_read_only;
 } vlc_ml_playlist_t;
 
 typedef struct vlc_ml_artist_t
@@ -296,6 +316,12 @@
     vlc_ml_genre_t p_items[];
 } vlc_ml_genre_list_t;
 
+typedef struct vlc_ml_group_list_t
+{
+    size_t i_nb_items;
+    vlc_ml_group_t p_items[];
+} vlc_ml_group_list_t;
+
 typedef struct vlc_ml_playlist_list_t
 {
     size_t i_nb_items;
@@ -377,6 +403,7 @@
     VLC_ML_GET_ARTIST,          /**< arg1: Artist   ID; ret: vlc_ml_artist_t*   */
     VLC_ML_GET_GENRE,           /**< arg1: Genre    ID; ret: vlc_ml_genre_t*    */
     VLC_ML_GET_SHOW,            /**< arg1: Show     ID; ret: vlc_ml_show_t*     */
+    VLC_ML_GET_GROUP,           /**< arg1: Group    ID; ret: vlc_ml_group_t*    */
     VLC_ML_GET_PLAYLIST,        /**< arg1: Playlist ID; ret: vlc_ml_playlist_t* */
 };
 
@@ -396,6 +423,8 @@
     VLC_ML_COUNT_ARTISTS,         /**< arg1 bool: includeAll; arg2 (out): size_t*                   */
     VLC_ML_LIST_SHOWS,            /**< arg1 (out): vlc_ml_show_list_t**                             */
     VLC_ML_COUNT_SHOWS,           /**< arg1 (out): size_t*                                          */
+    VLC_ML_LIST_GROUPS,           /**< arg1 (out): vlc_ml_group_list_t**                            */
+    VLC_ML_COUNT_GROUPS,          /**< arg1 (out): size_t*                                          */
     VLC_ML_LIST_PLAYLISTS,        /**< arg1 (out): vlc_ml_playlist_list_t**                         */
     VLC_ML_COUNT_PLAYLISTS,       /**< arg1 (out): size_t*                                          */
     VLC_ML_LIST_HISTORY,          /**< arg1 (out): vlc_ml_media_list_t**                            */
@@ -434,6 +463,10 @@
     VLC_ML_COUNT_MEDIA_LABELS,    /**< arg1: media id;  arg2 (out): size_t*              */
     VLC_ML_LIST_MEDIA_BOOKMARKS,  /**< arg1: media id;  arg2 (out): vlc_ml_bookmark_list_t** */
 
+    /* Groups specific listings */
+    VLC_ML_LIST_GROUP_MEDIA,   /**< arg1: playlist id; arg2 (out): vlc_ml_media_list_t** */
+    VLC_ML_COUNT_GROUP_MEDIA,  /**< arg1: playlist id; arg2 (out): size_t* */
+
     /* Playlist specific listings */
     VLC_ML_LIST_PLAYLIST_MEDIA,   /**< arg1: playlist id; arg2 (out): vlc_ml_media_list_t** */
     VLC_ML_COUNT_PLAYLIST_MEDIA,  /**< arg1: playlist id; arg2 (out): size_t* */
@@ -454,6 +487,7 @@
     VLC_ML_PARENT_ARTIST,
     VLC_ML_PARENT_SHOW,
     VLC_ML_PARENT_GENRE,
+    VLC_ML_PARENT_GROUP,
     VLC_ML_PARENT_PLAYLIST,
 };
 
@@ -575,6 +609,9 @@
     VLC_ML_EVENT_ALBUM_ADDED,
     VLC_ML_EVENT_ALBUM_UPDATED,
     VLC_ML_EVENT_ALBUM_DELETED,
+    VLC_ML_EVENT_GROUP_ADDED,
+    VLC_ML_EVENT_GROUP_UPDATED,
+    VLC_ML_EVENT_GROUP_DELETED,
     VLC_ML_EVENT_PLAYLIST_ADDED,
     VLC_ML_EVENT_PLAYLIST_UPDATED,
     VLC_ML_EVENT_PLAYLIST_DELETED,
@@ -745,6 +782,7 @@
             const vlc_ml_media_t* p_media;
             const vlc_ml_artist_t* p_artist;
             const vlc_ml_album_t* p_album;
+            const vlc_ml_group_t* p_group;
             const vlc_ml_playlist_t* p_playlist;
             const vlc_ml_genre_t* p_genre;
             const vlc_ml_bookmark_t* p_bookmark;
@@ -859,6 +897,7 @@
 VLC_API void vlc_ml_genre_release( vlc_ml_genre_t* p_genre );
 VLC_API void vlc_ml_media_release( vlc_ml_media_t* p_media );
 VLC_API void vlc_ml_album_release( vlc_ml_album_t* p_album );
+VLC_API void vlc_ml_group_release( vlc_ml_group_t* p_group );
 VLC_API void vlc_ml_playlist_release( vlc_ml_playlist_t* p_playlist );
 
 VLC_API void vlc_ml_label_list_release( vlc_ml_label_list_t* p_list );
@@ -868,6 +907,7 @@
 VLC_API void vlc_ml_album_list_release( vlc_ml_album_list_t* p_list );
 VLC_API void vlc_ml_show_list_release( vlc_ml_show_list_t* p_list );
 VLC_API void vlc_ml_genre_list_release( vlc_ml_genre_list_t* p_list );
+VLC_API void vlc_ml_group_list_release( vlc_ml_group_list_t* p_list );
 VLC_API void vlc_ml_playlist_list_release( vlc_ml_playlist_list_t* p_list );
 VLC_API void vlc_ml_entry_point_list_release( vlc_ml_entry_point_list_t* p_list );
 VLC_API void vlc_ml_playback_states_all_release( vlc_ml_playback_states_all* prefs );
@@ -1157,6 +1197,11 @@
     return (vlc_ml_show_t*)vlc_ml_get( p_ml, VLC_ML_GET_SHOW, i_show_id );
 }
 
+static inline vlc_ml_group_t* vlc_ml_get_group( vlc_medialibrary_t* p_ml, int64_t i_group_id )
+{
+    return (vlc_ml_group_t*)vlc_ml_get( p_ml, VLC_ML_GET_GROUP, i_group_id );
+}
+
 static inline vlc_ml_playlist_t* vlc_ml_get_playlist( vlc_medialibrary_t* p_ml, int64_t i_playlist_id )
 {
     return (vlc_ml_playlist_t*)vlc_ml_get( p_ml, VLC_ML_GET_PLAYLIST, i_playlist_id );
@@ -1549,6 +1594,47 @@
     return count;
 }
 
+//-------------------------------------------------------------------------------------------------
+// Groups
+
+static inline vlc_ml_group_list_t* vlc_ml_list_groups( vlc_medialibrary_t* p_ml, const vlc_ml_query_params_t* params )
+{
+    vlc_assert( p_ml != NULL );
+    vlc_ml_group_list_t* res;
+    if ( vlc_ml_list( p_ml, VLC_ML_LIST_GROUPS, params, &res ) != VLC_SUCCESS )
+        return NULL;
+    return res;
+}
+
+static inline size_t vlc_ml_count_groups( vlc_medialibrary_t* p_ml, const vlc_ml_query_params_t* params )
+{
+    vlc_assert( p_ml != NULL );
+    size_t count;
+    if ( vlc_ml_list( p_ml, VLC_ML_COUNT_GROUPS, params, &count ) != VLC_SUCCESS )
+        return 0;
+    return count;
+}
+
+static inline vlc_ml_media_list_t* vlc_ml_list_group_media( vlc_medialibrary_t* p_ml, const vlc_ml_query_params_t* params, int64_t i_group_id )
+{
+    vlc_assert( p_ml != NULL );
+    vlc_ml_media_list_t* res;
+    if ( vlc_ml_list( p_ml, VLC_ML_LIST_GROUP_MEDIA, params, i_group_id, &res ) != VLC_SUCCESS )
+        return NULL;
+    return res;
+}
+
+static inline size_t vlc_ml_count_group_media( vlc_medialibrary_t* p_ml, const vlc_ml_query_params_t* params, int64_t i_group_id )
+{
+    vlc_assert( p_ml != NULL );
+    size_t count;
+    if ( vlc_ml_list( p_ml, VLC_ML_COUNT_GROUP_MEDIA, params, i_group_id, &count ) != VLC_SUCCESS )
+        return 0;
+    return count;
+}
+
+//-------------------------------------------------------------------------------------------------
+
 static inline vlc_ml_playlist_list_t* vlc_ml_list_playlists( vlc_medialibrary_t* p_ml, const vlc_ml_query_params_t* params )
 {
     vlc_assert( p_ml != NULL );
@@ -1596,6 +1682,7 @@
     vlc_ml_album_t*: vlc_ml_album_release, \
     vlc_ml_genre_t*: vlc_ml_genre_release, \
     vlc_ml_media_t*: vlc_ml_media_release, \
+    vlc_ml_group_t*: vlc_ml_group_release, \
     vlc_ml_playlist_t*: vlc_ml_playlist_release, \
     vlc_ml_label_list_t*: vlc_ml_label_list_release, \
     vlc_ml_file_list_t*: vlc_ml_file_list_release, \
@@ -1604,6 +1691,7 @@
     vlc_ml_album_list_t*: vlc_ml_album_list_release, \
     vlc_ml_show_list_t*: vlc_ml_show_list_release, \
     vlc_ml_genre_list_t*: vlc_ml_genre_list_release, \
+    vlc_ml_group_list_t*: vlc_ml_group_list_release, \
     vlc_ml_playlist_list_t*: vlc_ml_playlist_list_release, \
     vlc_ml_entry_point_list_t*: vlc_ml_entry_point_list_release, \
     vlc_ml_playback_states_all*: vlc_ml_playback_states_all_release, \
@@ -1616,6 +1704,7 @@
 static inline void vlc_ml_release( vlc_ml_album_t* album ) { vlc_ml_album_release( album ); }
 static inline void vlc_ml_release( vlc_ml_genre_t* genre ) { vlc_ml_genre_release( genre ); }
 static inline void vlc_ml_release( vlc_ml_media_t* media ) { vlc_ml_media_release( media ); }
+static inline void vlc_ml_release( vlc_ml_group_t* group ) { vlc_ml_group_release( group ); }
 static inline void vlc_ml_release( vlc_ml_playlist_t* playlist ) { vlc_ml_playlist_release( playlist ); }
 static inline void vlc_ml_release( vlc_ml_label_list_t* list ) { vlc_ml_label_list_release( list ); }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/lib/media_player.c -> vlc-beta-20210430.0b6b242324.tar.xz/lib/media_player.c Changed

vlc-beta-20210430.0b6b242324.tar.xz/m4/.gitignore Added

vlc-beta-20210430.0b6b242324.tar.xz/modules/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/access/cdda.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/access/cdda.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/access/rist.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/access/rist.c Changed

@@ -1142,11 +1142,11 @@
     add_integer( "nack-type", NACK_FMT_RANGE,
             N_("RIST nack type, 0 = range, 1 = bitmask. Default is range"), NULL, true )
         change_integer_list( nack_type, nack_type_names )
-    add_bool( "disable-nacks", false, "Disable NACK output packets",
-        "Use this to disable packet recovery", true )
-    add_bool( "mcast-blind-nacks", false, "Do not check for a valid rtcp message from the encoder",
-        "Send nack messages even when we have not confirmed that the encoder is on our local " \
-        "network.", true )
+    add_bool( "disable-nacks", false, N_("Disable NACK output packets"),
+        N_("Use this to disable packet recovery"), true )
+    add_bool( "mcast-blind-nacks", false, N_("Do not check for a valid rtcp message from the encoder"),
+        N_("Send nack messages even when we have not confirmed that the encoder is on our local " \
+        "network."), true )
 
     set_capability( "access", 0 )
     add_shortcut( "rist", "tr06" )

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/audio_output/auhal.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/audio_output/auhal.c Changed

@@ -24,14 +24,16 @@
 
 #pragma mark includes
 
-#import "coreaudio_common.h"
+#include "coreaudio_common.h"
 
-#import <vlc_plugin.h>
-#import <vlc_dialog.h>                      // vlc_dialog_display_error
-#import <vlc_charset.h>                     // FromCFString
+#include <vlc_plugin.h>
+#include <vlc_dialog.h>                      // vlc_dialog_display_error
+#include <vlc_charset.h>                     // FromCFString
 
-#import <CoreAudio/CoreAudio.h>             // AudioDeviceID
-#import <CoreServices/CoreServices.h>
+#include <CoreAudio/CoreAudio.h>             // AudioDeviceID
+#include <CoreServices/CoreServices.h>
+
+#include <IOKit/audio/IOAudioTypes.h>
 
 #pragma mark -
 #pragma mark local prototypes & module descriptor
@@ -431,13 +433,13 @@
     AudioObjectGetPropertyData(i_dev_id, &property, 0, NULL, &size, &data);
 
     /*
-     'hdpn' == headphone
-     'ispk' == internal speaker
+     'hdpn' == headphone (kIOAudioOutputPortSubTypeHeadphones)
+     'ispk' == internal speaker (kIOAudioOutputPortSubTypeInternalSpeaker)
      '61pd' == HDMI
      '    ' == Bluetooth accessory or AirPlay
     */
 
-    return data == 'hdpn';
+    return data == kIOAudioOutputPortSubTypeHeadphones;
 }
 
 /*
@@ -889,12 +891,7 @@
 {
     aout_sys_t *p_sys = p_aout->sys;
 
-    if (name)
-        p_sys->i_new_selected_dev = atoi(name);
-    else
-        p_sys->i_new_selected_dev = 0;
-
-    p_sys->i_new_selected_dev = p_sys->i_new_selected_dev;
+    p_sys->i_new_selected_dev = (name) ? atoi(name) : 0;
 
     aout_DeviceReport(p_aout, name);
     aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
@@ -906,7 +903,7 @@
 VolumeSet(audio_output_t * p_aout, float volume)
 {
     aout_sys_t *p_sys = p_aout->sys;
-    OSStatus ostatus = 0;
+    OSStatus err = noErr;
 
     if (p_sys->b_digital)
         return VLC_EGENERIC;
@@ -917,7 +914,7 @@
     /* Set volume for output unit */
     if (!p_sys->b_mute)
     {
-        ostatus = AudioUnitSetParameter(p_sys->au_unit,
+        err = AudioUnitSetParameter(p_sys->au_unit,
                                         kHALOutputParam_Volume,
                                         kAudioUnitScope_Global,
                                         0,
@@ -928,7 +925,7 @@
     if (var_InheritBool(p_aout, "volume-save"))
         config_PutInt("auhal-volume", lroundf(volume * AOUT_VOLUME_DEFAULT));
 
-    return ostatus;
+    return (err == noErr) ? VLC_SUCCESS : VLC_EGENERIC;
 }
 
 static int
@@ -936,7 +933,7 @@
 {
     aout_sys_t *p_sys = p_aout->sys;
 
-    if(p_sys->b_digital)
+    if (p_sys->b_digital)
         return VLC_EGENERIC;
 
     p_sys->b_mute = mute;
@@ -951,7 +948,7 @@
                               kAudioUnitScope_Global, 0,
                               volume * volume * volume, 0);
 
-    return err == noErr ? VLC_SUCCESS : VLC_EGENERIC;
+    return (err == noErr) ? VLC_SUCCESS : VLC_EGENERIC;
 }
 
 #pragma mark -

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/audio_output/coreaudio_common.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/audio_output/coreaudio_common.c Changed

@@ -22,8 +22,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import "coreaudio_common.h"
-#import <CoreAudio/CoreAudioTypes.h>
+#include "coreaudio_common.h"
+#include <CoreAudio/CoreAudioTypes.h>
 
 static inline uint64_t
 BytesToFrames(struct aout_sys_common *p_sys, size_t i_bytes)
@@ -32,7 +32,7 @@
 }
 
 static inline vlc_tick_t
-FramesToUs(struct aout_sys_common *p_sys, uint64_t i_nb_frames)
+FramesToTicks(struct aout_sys_common *p_sys, int64_t i_nb_frames)
 {
     return vlc_tick_from_samples(i_nb_frames, p_sys->i_rate);
 }
@@ -43,23 +43,37 @@
     return i_frames * p_sys->i_bytes_per_frame / p_sys->i_frame_length;
 }
 
-static inline uint64_t
-UsToFrames(struct aout_sys_common *p_sys, vlc_tick_t i_us)
+static inline int64_t
+TicksToFrames(struct aout_sys_common *p_sys, vlc_tick_t i_ticks)
 {
-    assert(i_us > 0);
-    return samples_from_vlc_tick(i_us, p_sys->i_rate);
+    assert(i_ticks != VLC_TICK_INVALID);
+    return samples_from_vlc_tick(i_ticks, p_sys->i_rate);
 }
 
+/**
+ * Convert a relative audio host time to vlc_ticks
+ *
+ * \warning  This function may only be used to convert relative
+ *           host times to ticks, as vlc_ticks do not have the
+ *           same clock origin as the audio host clock!
+ */
 static inline vlc_tick_t
 HostTimeToTick(struct aout_sys_common *p_sys, int64_t i_host_time)
 {
     return VLC_TICK_FROM_NS(i_host_time * p_sys->tinfo.numer / p_sys->tinfo.denom);
 }
 
+/**
+ * Convert relative vlc_ticks to an audio host time
+ *
+ * \warning  This function may only be used to convert relative
+ *           vlc_ticks, as vlc_ticks do not have the same origin
+ *           as the audio host clock!
+ */
 static inline int64_t
-TickToHostTime(struct aout_sys_common *p_sys, vlc_tick_t i_us)
+TickToHostTime(struct aout_sys_common *p_sys, vlc_tick_t i_ticks)
 {
-    return NS_FROM_VLC_TICK(i_us * p_sys->tinfo.denom / p_sys->tinfo.numer);
+    return NS_FROM_VLC_TICK(i_ticks * p_sys->tinfo.denom / p_sys->tinfo.numer);
 }
 
 static void
@@ -156,10 +170,10 @@
         /* Convert the requested bytes into host time and check that it does
          * not overlap between the first_render host time and the current one.
          * */
-        const size_t i_requested_us =
-            FramesToUs(p_sys, BytesToFrames(p_sys, i_requested));
+        const vlc_tick_t i_requested_ticks =
+            FramesToTicks(p_sys, BytesToFrames(p_sys, i_requested));
         const int64_t i_requested_host_time =
-            TickToHostTime(p_sys, i_requested_us);
+            TickToHostTime(p_sys, i_requested_ticks);
         if (p_sys->i_first_render_host_time >= i_host_time + i_requested_host_time)
         {
             /* Fill the buffer with silence */
@@ -167,11 +181,11 @@
         }
 
         /* Write silence to reach the first_render host time */
-        const vlc_tick_t i_silence_us =
+        const vlc_tick_t i_silence_ticks =
             HostTimeToTick(p_sys, p_sys->i_first_render_host_time - i_host_time);
 
         const size_t i_silence_bytes =
-            FramesToBytes(p_sys, UsToFrames(p_sys, i_silence_us));
+            FramesToBytes(p_sys, TicksToFrames(p_sys, i_silence_ticks));
         assert(i_silence_bytes <= i_requested);
         memset(p_output, 0, i_silence_bytes);
 
@@ -235,8 +249,8 @@
     struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys;
 
     const int64_t i_out_frames = BytesToFrames(p_sys, p_sys->i_out_size);
-    return FramesToUs(p_sys, i_out_frames + p_sys->i_render_frames)
-           + p_sys->i_dev_latency_us;
+    return FramesToTicks(p_sys, i_out_frames + p_sys->i_render_frames)
+           + p_sys->i_dev_latency_ticks;
 }
 
 int
@@ -363,12 +377,12 @@
                 return;
             }
 
-            const vlc_tick_t i_frame_us =
-                FramesToUs(p_sys, BytesToFrames(p_sys, p_block->i_buffer));
+            const vlc_tick_t i_frame_ticks =
+                FramesToTicks(p_sys, BytesToFrames(p_sys, p_block->i_buffer));
 
             /* Wait for the render buffer to play the remaining data */
             lock_unlock(p_sys);
-            vlc_tick_sleep(i_frame_us);
+            vlc_tick_sleep(i_frame_ticks);
             lock_lock(p_sys);
         }
         else
@@ -394,7 +408,7 @@
 
 int
 ca_Initialize(audio_output_t *p_aout, const audio_sample_format_t *fmt,
-              vlc_tick_t i_dev_latency_us)
+              vlc_tick_t i_dev_latency_ticks)
 {
     struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys;
 
@@ -408,7 +422,7 @@
     p_sys->i_frame_length = fmt->i_frame_length;
     p_sys->chans_to_reorder = 0;
 
-    p_sys->i_dev_latency_us = i_dev_latency_us;
+    p_sys->i_dev_latency_ticks = i_dev_latency_ticks;
 
     /* setup circular buffer */
     size_t i_audiobuffer_size = fmt->i_rate * fmt->i_bytes_per_frame
@@ -462,12 +476,12 @@
         vlc_sem_post(&p_sys->flush_sem);
 }
 
-void ca_SetDeviceLatency(audio_output_t *p_aout, vlc_tick_t i_dev_latency_us)
+void ca_SetDeviceLatency(audio_output_t *p_aout, vlc_tick_t i_dev_latency_ticks)
 {
     struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys;
 
     lock_lock(p_sys);
-    p_sys->i_dev_latency_us = i_dev_latency_us;
+    p_sys->i_dev_latency_ticks = i_dev_latency_ticks;
     lock_unlock(p_sys);
 }
 
@@ -843,7 +857,7 @@
 
 int
 au_Initialize(audio_output_t *p_aout, AudioUnit au, audio_sample_format_t *fmt,
-              const AudioChannelLayout *outlayout, vlc_tick_t i_dev_latency_us,
+              const AudioChannelLayout *outlayout, vlc_tick_t i_dev_latency_ticks,
               bool *warn_configuration)
 {
     int ret;
@@ -951,7 +965,7 @@
         return VLC_EGENERIC;
     }
 
-    ret = ca_Initialize(p_aout, fmt, i_dev_latency_us);
+    ret = ca_Initialize(p_aout, fmt, i_dev_latency_ticks);
     if (ret != VLC_SUCCESS)
     {
         AudioUnitUninitialize(au);

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/audio_output/coreaudio_common.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/audio_output/coreaudio_common.h Changed

@@ -23,17 +23,17 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# import "config.h"
+# include "config.h"
 #endif
 
-#import <vlc_common.h>
-#import <vlc_aout.h>
-#import <vlc_threads.h>
+#include <vlc_common.h>
+#include <vlc_aout.h>
+#include <vlc_threads.h>
 
-#import <AudioUnit/AudioUnit.h>
-#import <AudioToolbox/AudioToolbox.h>
-#import <os/lock.h>
-#import <mach/mach_time.h>
+#include <AudioUnit/AudioUnit.h>
+#include <AudioToolbox/AudioToolbox.h>
+#include <os/lock.h>
+#include <mach/mach_time.h>
 
 #define STREAM_FORMAT_MSG(pre, sfm) \
     pre "[%f][%4.4s][%u][%u][%u][%u][%u][%u]", \
@@ -80,8 +80,8 @@
     unsigned int        i_frame_length;
     uint8_t             chans_to_reorder;
     uint8_t             chan_table[AOUT_CHAN_MAX];
-    /* ca_TimeGet extra latency, in micro-seconds */
-    vlc_tick_t          i_dev_latency_us;
+    /* ca_TimeGet extra latency, in vlc ticks */
+    vlc_tick_t          i_dev_latency_ticks;
 };
 
 int ca_Open(audio_output_t *p_aout);
@@ -98,19 +98,19 @@
 void ca_Play(audio_output_t * p_aout, block_t * p_block, vlc_tick_t date);
 
 int  ca_Initialize(audio_output_t *p_aout, const audio_sample_format_t *fmt,
-                   vlc_tick_t i_dev_latency_us);
+                   vlc_tick_t i_dev_latency_ticks);
 
 void ca_Uninitialize(audio_output_t *p_aout);
 
 void ca_SetAliveState(audio_output_t *p_aout, bool alive);
 
-void ca_SetDeviceLatency(audio_output_t *p_aout, vlc_tick_t i_dev_latency_us);
+void ca_SetDeviceLatency(audio_output_t *p_aout, vlc_tick_t i_dev_latency_ticks);
 
 AudioUnit au_NewOutputInstance(audio_output_t *p_aout, OSType comp_sub_type);
 
 int  au_Initialize(audio_output_t *p_aout, AudioUnit au,
                    audio_sample_format_t *fmt,
-                   const AudioChannelLayout *outlayout, vlc_tick_t i_dev_latency_us,
+                   const AudioChannelLayout *outlayout, vlc_tick_t i_dev_latency_ticks,
                    bool *warn_configuration);
 
 void au_Uninitialize(audio_output_t *p_aout, AudioUnit au);

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/codec/avcodec/encoder.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/codec/avcodec/encoder.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/codec/fluidsynth.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/codec/fluidsynth.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/codec/kate.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/codec/kate.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/codec/videotoolbox.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/codec/videotoolbox.c Changed

vlc-beta-20210430.0b6b242324.tar.xz/modules/codec/webvtt/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/SegmentTracker.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/SegmentTracker.cpp Changed

@@ -73,11 +73,14 @@
     this->format = f;
 }
 
-SegmentChangedEvent::SegmentChangedEvent(const ID &id, vlc_tick_t duration)
+SegmentChangedEvent::SegmentChangedEvent(const ID &id, vlc_tick_t starttime,
+                                         vlc_tick_t duration, vlc_tick_t displaytime)
     : TrackerEvent(Type::SegmentChange)
 {
     this->id = &id;
     this->duration = duration;
+    this->starttime = starttime;
+    this->displaytime = displaytime;
 }
 
 BufferingStateUpdatedEvent::BufferingStateUpdatedEvent(const ID &id, bool enabled)
@@ -225,11 +228,13 @@
     chunk = nullptr;
 }
 
-SegmentTracker::ChunkEntry::ChunkEntry(SegmentChunk *c, Position p, vlc_tick_t d)
+SegmentTracker::ChunkEntry::ChunkEntry(SegmentChunk *c, Position p, vlc_tick_t s, vlc_tick_t d, vlc_tick_t dt)
 {
     chunk = c;
     pos = p;
     duration = d;
+    starttime = s;
+    displaytime = dt;
 }
 
 bool SegmentTracker::ChunkEntry::isValid() const
@@ -311,7 +316,8 @@
         return ChunkEntry();
 
     const Timescale timescale = pos.rep->inheritTimescale();
-    return ChunkEntry(segmentChunk, pos, timescale.ToTime(segment->duration.Get()));
+    return ChunkEntry(segmentChunk, pos, timescale.ToTime(segment->startTime.Get()),
+                      timescale.ToTime(segment->duration.Get()), segment->getDisplayTime());
 }
 
 void SegmentTracker::resetChunksSequence()
@@ -396,7 +402,7 @@
 
     /* Notify new segment length for stats / logic */
     if(chunk.pos.init_sent && chunk.pos.index_sent)
-        notify(SegmentChangedEvent(adaptationSet->getID(), chunk.duration));
+        notify(SegmentChangedEvent(adaptationSet->getID(), chunk.starttime, chunk.duration, chunk.displaytime));
 
     /* Handle both implicit and explicit discontinuities */
     if(b_gap || b_discontinuity)

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/SegmentTracker.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/SegmentTracker.hpp Changed

@@ -111,10 +111,12 @@
     {
         public:
             SegmentChangedEvent() = delete;
-            SegmentChangedEvent(const ID &, vlc_tick_t);
+            SegmentChangedEvent(const ID &, vlc_tick_t, vlc_tick_t, vlc_tick_t = VLC_TICK_INVALID);
             virtual ~SegmentChangedEvent() = default;
 
             const ID *id;
+            vlc_tick_t displaytime;
+            vlc_tick_t starttime;
             vlc_tick_t duration;
     };
 
@@ -204,10 +206,12 @@
             {
                 public:
                     ChunkEntry();
-                    ChunkEntry(SegmentChunk *c, Position p, vlc_tick_t d);
+                    ChunkEntry(SegmentChunk *c, Position p, vlc_tick_t s, vlc_tick_t d, vlc_tick_t dt);
                     bool isValid() const;
                     SegmentChunk *chunk;
                     Position pos;
+                    vlc_tick_t displaytime;
+                    vlc_tick_t starttime;
                     vlc_tick_t duration;
             };
             std::list<ChunkEntry> chunkssequence;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/StreamFormat.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/StreamFormat.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/Streams.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/Streams.cpp Changed

@@ -70,38 +70,32 @@
     if(demuxersource)
     {
         CommandsFactory *factory = new (std::nothrow) CommandsFactory();
-        if(factory)
+        AbstractCommandsQueue *commandsqueue = new (std::nothrow) CommandsQueue();
+        if(factory && commandsqueue)
         {
-            CommandsQueue *commandsqueue = new (std::nothrow) CommandsQueue(factory);
-            if(commandsqueue)
+            fakeesout = new (std::nothrow) FakeESOut(p_realdemux->out,
+                                                     commandsqueue, factory);
+            if(fakeesout)
             {
-                fakeesout = new (std::nothrow) FakeESOut(p_realdemux->out, commandsqueue);
-                if(fakeesout)
-                {
-                    /* All successfull */
-                    fakeesout->setExtraInfoProvider( this );
-                    const Role & streamRole = tracker->getStreamRole();
-                    if(streamRole.isDefault() && streamRole.autoSelectable())
-                        fakeesout->setPriority(ES_PRIORITY_MIN + 10);
-                    else if(!streamRole.autoSelectable())
-                        fakeesout->setPriority(ES_PRIORITY_NOT_DEFAULTABLE);
-                    format = format_;
-                    segmentTracker = tracker;
-                    segmentTracker->registerListener(this);
-                    segmentTracker->notifyBufferingState(true);
-                    connManager = conn;
-                    fakeesout->setExpectedTimestamp(segmentTracker->getPlaybackTime());
-                    declaredCodecs();
-                    return true;
-                }
-                delete commandsqueue;
-                commandsqueue = nullptr;
-            }
-            else
-            {
-                delete factory;
+                /* All successfull */
+                fakeesout->setExtraInfoProvider( this );
+                const Role & streamRole = tracker->getStreamRole();
+                if(streamRole.isDefault() && streamRole.autoSelectable())
+                    fakeesout->setPriority(ES_PRIORITY_MIN + 10);
+                else if(!streamRole.autoSelectable())
+                    fakeesout->setPriority(ES_PRIORITY_NOT_DEFAULTABLE);
+                format = format_;
+                segmentTracker = tracker;
+                segmentTracker->registerListener(this);
+                segmentTracker->notifyBufferingState(true);
+                connManager = conn;
+                fakeesout->setExpectedTimestamp(segmentTracker->getPlaybackTime());
+                declaredCodecs();
+                return true;
             }
         }
+        delete factory;
+        delete commandsqueue;
         delete demuxersource;
     }
 
@@ -181,14 +175,6 @@
     description = desc;
 }
 
-vlc_tick_t AbstractStream::getPCR() const
-{
-    vlc_mutex_locker locker(&lock);
-    if(!valid || disabled)
-        return VLC_TICK_INVALID;
-    return fakeEsOut()->commandsQueue()->getPCR();
-}
-
 vlc_tick_t AbstractStream::getMinAheadTime() const
 {
     if(!segmentTracker)
@@ -404,16 +390,6 @@
     {
         if(!startDemux())
         {
-            /* If demux fails because of probing failure / wrong format*/
-            if(discontinuity)
-            {
-                msg_Dbg( p_realdemux, "Draining on format change" );
-                prepareRestart();
-                discontinuity = false;
-                fakeEsOut()->commandsQueue()->setDraining();
-                vlc_mutex_unlock(&lock);
-                return BufferingStatus::Ongoing;
-            }
             valid = false; /* Prevent further retries */
             fakeEsOut()->commandsQueue()->setEOF(true);
             vlc_mutex_unlock(&lock);
@@ -427,7 +403,7 @@
     {
         vlc_tick_t nz_extdeadline = fakeEsOut()->commandsQueue()->getBufferingLevel() +
                                     (i_max_buffering - i_demuxed) / 4;
-        nz_deadline = std::max(nz_deadline, nz_extdeadline);
+        nz_deadline = std::min(nz_extdeadline, nz_deadline + VLC_TICK_FROM_SEC(1));
 
         /* need to read, demuxer still buffering, ... */
         vlc_mutex_unlock(&lock);
@@ -437,7 +413,7 @@
         {
             if(discontinuity || needrestart)
             {
-                msg_Dbg(p_realdemux, "Restarting demuxer");
+                msg_Dbg(p_realdemux, "Restarting demuxer %d %d", needrestart, discontinuity);
                 prepareRestart(discontinuity);
                 if(discontinuity)
                 {

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/Streams.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/Streams.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/Time.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/Time.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/http/Chunk.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/http/Chunk.cpp Changed

@@ -38,10 +38,14 @@
 using namespace adaptive::http;
 using vlc::threads::mutex_locker;
 
-AbstractChunkSource::AbstractChunkSource()
+AbstractChunkSource::AbstractChunkSource(ChunkType t, const BytesRange &range)
 {
+    type = t;
     contentLength = 0;
     requeststatus = RequestStatus::Success;
+    bytesRange = range;
+    if(bytesRange.isValid() && bytesRange.getEndByte())
+        contentLength = bytesRange.getEndByte() - bytesRange.getStartByte();
 }
 
 AbstractChunkSource::~AbstractChunkSource()
@@ -49,13 +53,6 @@
 
 }
 
-void AbstractChunkSource::setBytesRange(const BytesRange &range)
-{
-    bytesRange = range;
-    if(bytesRange.isValid() && bytesRange.getEndByte())
-        contentLength = bytesRange.getEndByte() - bytesRange.getStartByte();
-}
-
 const BytesRange & AbstractChunkSource::getBytesRange() const
 {
     return bytesRange;
@@ -71,6 +68,11 @@
     return requeststatus;
 }
 
+ChunkType AbstractChunkSource::getChunkType() const
+{
+    return type;
+}
+
 AbstractChunk::AbstractChunk(AbstractChunkSource *source_)
 {
     bytesRead = 0;
@@ -139,8 +141,9 @@
 }
 
 HTTPChunkSource::HTTPChunkSource(const std::string& url, AbstractConnectionManager *manager,
-                                 const adaptive::ID &id, ChunkType t, bool access) :
-    AbstractChunkSource(),
+                                 const adaptive::ID &id, ChunkType t, const BytesRange &range,
+                                 bool access) :
+    AbstractChunkSource(t, range),
     connection   (nullptr),
     connManager  (manager),
     consumed     (0)
@@ -148,7 +151,6 @@
     prepared = false;
     eof = false;
     sourceid = id;
-    type = t;
     setUseAccess(access);
     if(!init(url))
         eof = true;
@@ -309,8 +311,9 @@
 
 HTTPChunkBufferedSource::HTTPChunkBufferedSource(const std::string& url, AbstractConnectionManager *manager,
                                                  const adaptive::ID &sourceid,
-                                                 ChunkType type, bool access) :
-    HTTPChunkSource(url, manager, sourceid, type, access),
+                                                 ChunkType type, const BytesRange &range,
+                                                 bool access) :
+    HTTPChunkSource(url, manager, sourceid, type, range, access),
     p_head     (nullptr),
     pp_tail    (&p_head),
     buffered     (0)
@@ -520,10 +523,9 @@
 }
 
 HTTPChunk::HTTPChunk(const std::string &url, AbstractConnectionManager *manager,
-                     const adaptive::ID &id, ChunkType type, bool access):
-    AbstractChunk(new HTTPChunkSource(url, manager, id, type, access))
+                     const adaptive::ID &id, ChunkType type, const BytesRange &range):
+    AbstractChunk(manager->makeSource(url, id, type, range))
 {
-
 }
 
 HTTPChunk::~HTTPChunk()

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/http/Chunk.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/http/Chunk.h Changed

@@ -68,14 +68,15 @@
         class AbstractChunkSource : public ChunkInterface
         {
             public:
-                AbstractChunkSource();
+                AbstractChunkSource(ChunkType, const BytesRange & = BytesRange());
                 virtual ~AbstractChunkSource();
-                void                setBytesRange   (const BytesRange &);
                 const BytesRange &  getBytesRange   () const;
+                ChunkType           getChunkType    () const;
                 virtual std::string getContentType  () const override;
                 virtual RequestStatus getRequestStatus() const override;
 
             protected:
+                ChunkType           type;
                 RequestStatus       requeststatus;
                 size_t              contentLength;
                 BytesRange          bytesRange;
@@ -108,9 +109,9 @@
         class HTTPChunkSource : public AbstractChunkSource,
                                 public BackendPrefInterface
         {
+            friend class HTTPConnectionManager;
+
             public:
-                HTTPChunkSource(const std::string &url, AbstractConnectionManager *,
-                                const ID &, ChunkType, bool = false);
                 virtual ~HTTPChunkSource();
 
                 virtual block_t *   readBlock       ()  override;
@@ -122,6 +123,10 @@
                 static const size_t CHUNK_SIZE = 32768;
 
             protected:
+                HTTPChunkSource(const std::string &url, AbstractConnectionManager *,
+                                const ID &, ChunkType, const BytesRange &,
+                                bool = false);
+
                 virtual bool        prepare();
                 AbstractConnection    *connection;
                 AbstractConnectionManager *connManager;
@@ -130,7 +135,6 @@
                 bool                prepared;
                 bool                eof;
                 ID                  sourceid;
-                ChunkType           type;
                 vlc_tick_t          requestStartTime;
                 vlc_tick_t          responseTime;
                 vlc_tick_t          downloadEndTime;
@@ -142,22 +146,24 @@
 
         class HTTPChunkBufferedSource : public HTTPChunkSource
         {
+            friend class HTTPConnectionManager;
             friend class Downloader;
 
             public:
-                HTTPChunkBufferedSource(const std::string &url, AbstractConnectionManager *,
-                                        const ID &, ChunkType, bool = false);
                 virtual ~HTTPChunkBufferedSource();
                 virtual block_t *  readBlock       ()  override;
                 virtual block_t *  read            (size_t)  override;
                 virtual bool       hasMoreData     () const  override;
-                void               hold();
-                void               release();
 
             protected:
+                HTTPChunkBufferedSource(const std::string &url, AbstractConnectionManager *,
+                                        const ID &, ChunkType, const BytesRange &,
+                                        bool = false);
                 virtual bool       prepare()  override;
                 void               bufferize(size_t);
                 bool               isDone() const;
+                void               hold();
+                void               release();
 
             private:
                 block_t            *p_head; /* read cache buffer */
@@ -173,7 +179,7 @@
         {
             public:
                 HTTPChunk(const std::string &url, AbstractConnectionManager *,
-                          const ID &, ChunkType, bool = false);
+                          const ID &, ChunkType, const BytesRange &);
                 virtual ~HTTPChunk();
 
             protected:

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/http/HTTPConnectionManager.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/http/HTTPConnectionManager.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/http/HTTPConnectionManager.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/http/HTTPConnectionManager.h Changed

@@ -26,6 +26,7 @@
 #define HTTPCONNECTIONMANAGER_H_
 
 #include "../logic/IDownloadRateObserver.h"
+#include "BytesRange.hpp"
 
 #include <vlc_common.h>
 
@@ -42,6 +43,7 @@
         class AbstractConnection;
         class Downloader;
         class AbstractChunkSource;
+        enum class ChunkType;
 
         class AbstractConnectionManager : public IDownloadRateObserver
         {
@@ -50,6 +52,10 @@
                 ~AbstractConnectionManager();
                 virtual void    closeAllConnections () = 0;
                 virtual AbstractConnection * getConnection(ConnectionParams &) = 0;
+                virtual AbstractChunkSource *makeSource(const std::string &,
+                                                        const ID &, ChunkType,
+                                                        const BytesRange &) = 0;
+
                 virtual void start(AbstractChunkSource *) = 0;
                 virtual void cancel(AbstractChunkSource *) = 0;
 
@@ -72,6 +78,9 @@
 
                 virtual void    closeAllConnections ()  override;
                 virtual AbstractConnection * getConnection(ConnectionParams &)  override;
+                virtual AbstractChunkSource *makeSource(const std::string &,
+                                                        const ID &, ChunkType,
+                                                        const BytesRange &) override;
 
                 virtual void start(AbstractChunkSource *)  override;
                 virtual void cancel(AbstractChunkSource *)  override;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/playlist/Inheritables.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/playlist/Inheritables.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/playlist/Segment.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/playlist/Segment.cpp Changed

@@ -50,6 +50,7 @@
     sequence = 0;
     templated = false;
     discontinuity = false;
+    displayTime = VLC_TICK_INVALID;
 }
 
 ISegment::~ISegment()
@@ -78,14 +79,15 @@
                                 size_t index, BaseRepresentation *rep)
 {
     const std::string url = getUrlSegment().toString(index, rep);
-    HTTPChunkBufferedSource *source = new (std::nothrow) HTTPChunkBufferedSource(url, connManager,
-                                                                                 rep->getAdaptationSet()->getID(),
-                                                                                 ChunkType::Segment);
-    if( source )
+    BytesRange range;
+    if(startByte != endByte)
+        range = BytesRange(startByte, endByte);
+    AbstractChunkSource *source = connManager->makeSource(url,
+                                                          rep->getAdaptationSet()->getID(),
+                                                          ChunkType::Segment,
+                                                          range);
+    if(source)
     {
-        if(startByte != endByte)
-            source->setBytesRange(BytesRange(startByte, endByte));
-
         SegmentChunk *chunk = createChunk(source, rep);
         if(chunk)
         {
@@ -183,6 +185,16 @@
     encryption = e;
 }
 
+void ISegment::setDisplayTime(vlc_tick_t t)
+{
+    displayTime = t;
+}
+
+vlc_tick_t ISegment::getDisplayTime() const
+{
+    return displayTime;
+}
+
 Segment::Segment(ICanonicalUrl *parent) :
         ISegment(parent)
 {

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/playlist/Segment.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/playlist/Segment.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/playlist/SegmentInformation.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/playlist/SegmentInformation.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/playlist/SegmentList.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/playlist/SegmentList.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/playlist/SegmentTimeline.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/playlist/SegmentTimeline.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/plumbing/CommandsQueue.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/plumbing/CommandsQueue.cpp Changed

@@ -67,6 +67,11 @@
     p_fakeid = p_es;
 }
 
+const void * AbstractFakeEsCommand::esIdentifier() const
+{
+    return static_cast<const void *>(p_fakeid);
+}
+
 EsOutSendCommand::EsOutSendCommand( AbstractFakeESOutID *p_es, block_t *p_block_ ) :
     AbstractFakeEsCommand( ES_OUT_PRIVATE_COMMAND_SEND, p_es )
 {
@@ -93,11 +98,6 @@
         return AbstractCommand::getTime();
 }
 
-const void * EsOutSendCommand::esIdentifier() const
-{
-    return static_cast<const void *>(p_fakeid);
-}
-
 EsOutDelCommand::EsOutDelCommand( AbstractFakeESOutID *p_es ) :
     AbstractFakeEsCommand( ES_OUT_PRIVATE_COMMAND_DEL, p_es )
 {
@@ -239,21 +239,53 @@
 }
 #endif
 
-CommandsQueue::CommandsQueue( CommandsFactory *f )
+AbstractCommandsQueue::AbstractCommandsQueue()
 {
-    bufferinglevel = VLC_TICK_INVALID;
-    pcr = VLC_TICK_INVALID;
     b_drop = false;
     b_draining = false;
     b_eof = false;
-    commandsFactory = f;
+}
+
+void AbstractCommandsQueue::setDrop( bool b )
+{
+    b_drop = b;
+}
+
+void AbstractCommandsQueue::setDraining()
+{
+    b_draining = true;
+}
+
+bool AbstractCommandsQueue::isDraining() const
+{
+    return b_draining;
+}
+
+void AbstractCommandsQueue::setEOF( bool b )
+{
+    b_eof = b;
+    if( b_eof )
+        setDraining();
+    else
+        b_draining = false;
+}
+
+bool AbstractCommandsQueue::isEOF() const
+{
+    return b_eof;
+}
+
+CommandsQueue::CommandsQueue()
+    : AbstractCommandsQueue()
+{
+    bufferinglevel = VLC_TICK_INVALID;
+    pcr = VLC_TICK_INVALID;
     nextsequence = 0;
 }
 
 CommandsQueue::~CommandsQueue()
 {
     Abort( false );
-    delete commandsFactory;
 }
 
 static bool compareCommands( const Queueentry &a, const Queueentry &b )
@@ -279,7 +311,7 @@
     }
 }
 
-void CommandsQueue::Schedule( AbstractCommand *command )
+void CommandsQueue::Schedule( AbstractCommand *command, EsType )
 {
     if( b_drop )
     {
@@ -297,11 +329,6 @@
     }
 }
 
-const CommandsFactory * CommandsQueue::factory() const
-{
-    return commandsFactory;
-}
-
 vlc_tick_t CommandsQueue::Process( vlc_tick_t barrier )
 {
     vlc_tick_t lastdts = barrier;
@@ -427,13 +454,7 @@
 
 bool CommandsQueue::isEmpty() const
 {
-    bool b_empty = commands.empty() && incoming.empty();
-    return b_empty;
-}
-
-void CommandsQueue::setDrop( bool b )
-{
-    b_drop = b;
+    return commands.empty() && incoming.empty();
 }
 
 void CommandsQueue::setDraining()
@@ -441,42 +462,22 @@
     LockedSetDraining();
 }
 
-bool CommandsQueue::isDraining() const
-{
-    bool b = b_draining;
-    return b;
-}
-
-void CommandsQueue::setEOF( bool b )
-{
-    b_eof = b;
-    if( b_eof )
-        LockedSetDraining();
-    else
-        b_draining = false;
-}
-
-bool CommandsQueue::isEOF() const
-{
-    bool b = b_eof;
-    return b;
-}
-
 vlc_tick_t CommandsQueue::getDemuxedAmount(vlc_tick_t from) const
 {
-    if( bufferinglevel == VLC_TICK_INVALID || from > bufferinglevel )
+    vlc_tick_t bufferingstart = getFirstDTS();
+    if( bufferinglevel == VLC_TICK_INVALID ||
+        bufferingstart == VLC_TICK_INVALID ||
+        from > bufferinglevel )
         return 0;
-    if( from > getFirstDTS() )
+    if( from > bufferingstart )
         return bufferinglevel - from;
     else
-        return bufferinglevel - getFirstDTS();
+        return bufferinglevel - bufferingstart;
 }
 
 vlc_tick_t CommandsQueue::getBufferingLevel() const
 {
-    vlc_tick_t i_buffer;
-    i_buffer = bufferinglevel;
-    return i_buffer;
+    return bufferinglevel;
 }
 
 vlc_tick_t CommandsQueue::getFirstDTS() const
@@ -504,6 +505,5 @@
 
 vlc_tick_t CommandsQueue::getPCR() const
 {
-    vlc_tick_t i_pcr = pcr;
-    return i_pcr;
+    return pcr;
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/plumbing/CommandsQueue.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/plumbing/CommandsQueue.hpp Changed

@@ -20,6 +20,8 @@
 #ifndef COMMANDSQUEUE_HPP_
 #define COMMANDSQUEUE_HPP_
 
+#include "FakeESOutID.hpp"
+
 #include <vlc_common.h>
 #include <vlc_es.h>
 
@@ -29,7 +31,6 @@
 namespace adaptive
 {
     class AbstractFakeEsOut;
-    class AbstractFakeESOutID;
 
     class AbstractCommand
     {
@@ -47,6 +48,9 @@
 
     class AbstractFakeEsCommand : public AbstractCommand
     {
+        public:
+            const void * esIdentifier() const;
+
         protected:
             AbstractFakeEsCommand( int, AbstractFakeESOutID * );
             AbstractFakeESOutID *p_fakeid;
@@ -59,7 +63,6 @@
             virtual ~EsOutSendCommand();
             virtual void Execute( ) override;
             virtual vlc_tick_t getTime() const override;
-            const void * esIdentifier() const;
 
         protected:
             EsOutSendCommand( AbstractFakeESOutID *, block_t * );
@@ -150,39 +153,56 @@
 
     using Queueentry = std::pair<uint64_t, AbstractCommand *>;
 
-    /* Queuing for doing all the stuff in order */
-    class CommandsQueue
+    class AbstractCommandsQueue
     {
         public:
-            CommandsQueue( CommandsFactory * );
-            ~CommandsQueue();
-            const CommandsFactory * factory() const;
-            void Schedule( AbstractCommand * );
-            vlc_tick_t Process( vlc_tick_t );
-            void Abort( bool b_reset );
-            void Commit();
-            bool isEmpty() const;
+            AbstractCommandsQueue();
+            virtual ~AbstractCommandsQueue() = default;
+            virtual void Schedule( AbstractCommand *, EsType = EsType::Other ) = 0;
+            virtual vlc_tick_t Process( vlc_tick_t )  = 0;
+            virtual void Abort( bool b_reset )  = 0;
+            virtual void Commit()  = 0;
+            virtual bool isEmpty() const = 0;
             void setDrop( bool );
-            void setDraining();
+            virtual void setDraining();
             void setEOF( bool );
             bool isDraining() const;
             bool isEOF() const;
-            vlc_tick_t getDemuxedAmount(vlc_tick_t) const;
-            vlc_tick_t getBufferingLevel() const;
-            vlc_tick_t getFirstDTS() const;
-            vlc_tick_t getPCR() const;
+            virtual vlc_tick_t getDemuxedAmount(vlc_tick_t) const  = 0;
+            virtual vlc_tick_t getBufferingLevel() const  = 0;
+            virtual vlc_tick_t getFirstDTS() const  = 0;
+            virtual vlc_tick_t getPCR() const = 0;
+
+        protected:
+            bool b_draining;
+            bool b_drop;
+            bool b_eof;
+    };
+
+    /* Queuing for doing all the stuff in order */
+    class CommandsQueue : public AbstractCommandsQueue
+    {
+        public:
+            CommandsQueue();
+            virtual ~CommandsQueue();
+            virtual void Schedule( AbstractCommand *, EsType = EsType::Other ) override;
+            virtual vlc_tick_t Process( vlc_tick_t ) override;
+            virtual void Abort( bool b_reset ) override;
+            virtual void Commit() override;
+            virtual bool isEmpty() const override;
+            virtual void setDraining() override;
+            virtual vlc_tick_t getDemuxedAmount(vlc_tick_t) const override;
+            virtual vlc_tick_t getBufferingLevel() const override;
+            virtual vlc_tick_t getFirstDTS() const override;
+            virtual vlc_tick_t getPCR() const override;
 
         private:
-            CommandsFactory *commandsFactory;
             void LockedCommit();
             void LockedSetDraining();
             std::list<Queueentry> incoming;
             std::list<Queueentry> commands;
             vlc_tick_t bufferinglevel;
             vlc_tick_t pcr;
-            bool b_draining;
-            bool b_drop;
-            bool b_eof;
             uint64_t nextsequence;
     };
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/plumbing/FakeESOut.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/plumbing/FakeESOut.cpp Changed

@@ -135,11 +135,13 @@
     return p;
 }
 
-FakeESOut::FakeESOut( es_out_t *es, CommandsQueue *queue )
+FakeESOut::FakeESOut( es_out_t *es, AbstractCommandsQueue *queue,
+                      CommandsFactory *cf )
     : AbstractFakeEsOut()
     , real_es_out( es )
     , extrainfo( nullptr )
     , commandsqueue( queue )
+    , commandsfactory( cf )
     , timestamps_offset( 0 )
 {
     associated.b_timestamp_set = false;
@@ -155,17 +157,23 @@
     return LockedFakeEsOut(*this);
 }
 
-CommandsQueue * FakeESOut::commandsQueue()
+AbstractCommandsQueue * FakeESOut::commandsQueue()
 {
     return commandsqueue;
 }
 
+CommandsFactory * FakeESOut::commandsFactory() const
+{
+    return commandsfactory;
+}
+
 FakeESOut::~FakeESOut()
 {
     recycleAll();
     gc();
 
     delete commandsqueue;
+    delete commandsfactory;
 }
 
 void FakeESOut::resetTimestamps()
@@ -327,7 +335,7 @@
 
 void FakeESOut::schedulePCRReset()
 {
-    AbstractCommand *command = commandsqueue->factory()->creatEsOutControlResetPCRCommand();
+    AbstractCommand *command = commandsfactory->creatEsOutControlResetPCRCommand();
     if( likely(command) )
         commandsqueue->Schedule( command );
 }
@@ -340,7 +348,7 @@
         FakeESOutID *es_id = *it;
         if(!es_id->scheduledForDeletion())
         {
-            AbstractCommand *command = commandsqueue->factory()->createEsOutDelCommand( es_id );
+            AbstractCommand *command = commandsfactory->createEsOutDelCommand( es_id );
             if( likely(command) )
             {
                 commandsqueue->Schedule( command );
@@ -493,7 +501,7 @@
     if( likely(es_id) )
     {
         assert(!es_id->scheduledForDeletion());
-        AbstractCommand *command = commandsqueue->factory()->createEsOutAddCommand( es_id );
+        AbstractCommand *command = commandsfactory->createEsOutAddCommand( es_id );
         if( likely(command) )
         {
             fakeesidlist.push_back(es_id);
@@ -518,7 +526,7 @@
     p_block->i_dts = fixTimestamp( p_block->i_dts );
     p_block->i_pts = fixTimestamp( p_block->i_pts );
 
-    AbstractCommand *command = commandsqueue->factory()->createEsOutSendCommand( es_id, p_block );
+    AbstractCommand *command = commandsfactory->createEsOutSendCommand( es_id, p_block );
     if( likely(command) )
     {
         commandsqueue->Schedule( command );
@@ -532,7 +540,7 @@
     vlc_mutex_locker locker(&lock);
 
     FakeESOutID *es_id = reinterpret_cast<FakeESOutID *>( p_es );
-    AbstractCommand *command = commandsqueue->factory()->createEsOutDelCommand( es_id );
+    AbstractCommand *command = commandsfactory->createEsOutDelCommand( es_id );
     if( likely(command) )
     {
         es_id->setScheduledForDeletion();
@@ -556,7 +564,7 @@
                 i_group = 0;
             vlc_tick_t  pcr = va_arg( args, vlc_tick_t );
             pcr = fixTimestamp( pcr );
-            AbstractCommand *command = commandsqueue->factory()->createEsOutControlPCRCommand( i_group, pcr );
+            AbstractCommand *command = commandsfactory->createEsOutControlPCRCommand( i_group, pcr );
             if( likely(command) )
             {
                 commandsqueue->Schedule( command );
@@ -569,7 +577,7 @@
         {
             static_cast<void>(va_arg( args, int )); /* ignore group */
             const vlc_meta_t *p_meta = va_arg( args, const vlc_meta_t * );
-            AbstractCommand *command = commandsqueue->factory()->createEsOutMetaCommand( this,-1, p_meta );
+            AbstractCommand *command = commandsfactory->createEsOutMetaCommand( this,-1, p_meta );
             if( likely(command) )
             {
                 commandsqueue->Schedule( command );
@@ -600,7 +608,7 @@
 {
     vlc_mutex_locker locker(&lock);
 
-    AbstractCommand *command = commandsqueue->factory()->createEsOutDestroyCommand();
+    AbstractCommand *command = commandsfactory->createEsOutDestroyCommand();
     if( likely(command) )
         commandsqueue->Schedule( command );
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/plumbing/FakeESOut.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/plumbing/FakeESOut.hpp Changed

@@ -32,7 +32,8 @@
             virtual ~ExtraFMTInfoInterface() = default;
     };
 
-    class CommandsQueue;
+    class AbstractCommandsQueue;
+    class CommandsFactory;
     class AbstractFakeESOutID;
     class FakeESOutID;
 
@@ -74,10 +75,11 @@
                     FakeESOut *p;
                     LockedFakeEsOut(FakeESOut &q);
             };
-            FakeESOut( es_out_t *, CommandsQueue * );
+            FakeESOut( es_out_t *, AbstractCommandsQueue *, CommandsFactory * );
             virtual ~FakeESOut();
             LockedFakeEsOut WithLock();
-            CommandsQueue * commandsQueue();
+            AbstractCommandsQueue * commandsQueue();
+            CommandsFactory *commandsFactory() const;
             void setAssociatedTimestamp( vlc_tick_t );
             void setExpectedTimestamp( vlc_tick_t );
             void resetTimestamps();
@@ -114,7 +116,8 @@
             es_out_t *real_es_out;
             FakeESOutID * createNewID( const es_format_t * );
             ExtraFMTInfoInterface *extrainfo;
-            CommandsQueue *commandsqueue;
+            AbstractCommandsQueue *commandsqueue;
+            CommandsFactory *commandsfactory;
             struct
             {
                 vlc_tick_t timestamp;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/plumbing/FakeESOutID.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/plumbing/FakeESOutID.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/plumbing/FakeESOutID.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/plumbing/FakeESOutID.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/test/playlist/M3U8.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/test/playlist/M3U8.cpp Changed

@@ -321,15 +321,15 @@
         /* date set and incremented */
         seg = rep->getMediaSegment(10);
         Expect(seg);
-        Expect(static_cast<HLSSegment *>(seg)->getUTCTime() == VLC_TICK_0 + vlc_tick_from_sec(10));
+        Expect(static_cast<HLSSegment *>(seg)->getDisplayTime() == VLC_TICK_0 + vlc_tick_from_sec(10));
         seg = rep->getMediaSegment(11);
         Expect(seg);
-        Expect(static_cast<HLSSegment *>(seg)->getUTCTime() == VLC_TICK_0 + vlc_tick_from_sec(10 + 8));
+        Expect(static_cast<HLSSegment *>(seg)->getDisplayTime() == VLC_TICK_0 + vlc_tick_from_sec(10 + 8));
 
         /* date change after discontinuity */
         seg = rep->getMediaSegment(20);
         Expect(seg);
-        Expect(static_cast<HLSSegment *>(seg)->getUTCTime() == VLC_TICK_0 + vlc_tick_from_sec(7200));
+        Expect(static_cast<HLSSegment *>(seg)->getDisplayTime() == VLC_TICK_0 + vlc_tick_from_sec(7200));
 
         vlc_tick_t begin, end, duration;
         Expect(rep->getMediaPlaybackRange(&begin, &end, &duration));

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/test/plumbing/CommandsQueue.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/test/plumbing/CommandsQueue.cpp Changed

@@ -81,6 +81,7 @@
         {
             out->sendData(this, b);
         }
+        virtual EsType esType() const override { return EsType::Other; }
 
     private:
         TestEsOut *out;
@@ -93,8 +94,8 @@
     TestEsOutID *id1 = nullptr;
     try
     {
-        CommandsFactory *factory = new CommandsFactory();
-        CommandsQueue queue(factory);
+        CommandsFactory factory;
+        CommandsQueue queue;
 
         id0 = new TestEsOutID(&esout);
         AbstractCommand *cmd = nullptr;
@@ -106,9 +107,9 @@
         Expect(queue.getBufferingLevel() == VLC_TICK_INVALID);
         Expect(queue.getFirstDTS() == VLC_TICK_INVALID);
         Expect(queue.getPCR() == VLC_TICK_INVALID);
-        cmd = queue.factory()->createEsOutAddCommand(id0);
+        cmd = factory.createEsOutAddCommand(id0);
         queue.Schedule(cmd);
-        cmd = queue.factory()->createEsOutDelCommand(id0);
+        cmd = factory.createEsOutDelCommand(id0);
         queue.Schedule(cmd);
         for(size_t i=0; i<3; i++) /* Add / Del will return in between */
             queue.Process(std::numeric_limits<vlc_tick_t>::max());
@@ -132,7 +133,7 @@
             block_t *data = block_Alloc(0);
             Expect(data);
             data->i_dts = VLC_TICK_0 + vlc_tick_from_sec(i);
-            cmd = queue.factory()->createEsOutSendCommand(id0, data);
+            cmd = factory.createEsOutSendCommand(id0, data);
             queue.Schedule(cmd);
         }
         Expect(queue.getPCR() == VLC_TICK_INVALID);
@@ -140,7 +141,7 @@
         Expect(queue.getDemuxedAmount(VLC_TICK_0) == 0);
         Expect(queue.getBufferingLevel() == VLC_TICK_INVALID);
         /* commit some */
-        cmd = queue.factory()->createEsOutControlPCRCommand(0, VLC_TICK_0 + vlc_tick_from_sec(8));
+        cmd = factory.createEsOutControlPCRCommand(0, VLC_TICK_0 + vlc_tick_from_sec(8));
         queue.Schedule(cmd);
         Expect(queue.getDemuxedAmount(VLC_TICK_0) == vlc_tick_from_sec(8)); /* PCR committed data up to 8s */
         Expect(queue.getBufferingLevel() == VLC_TICK_0 + vlc_tick_from_sec(8));
@@ -148,7 +149,7 @@
         Expect(queue.getDemuxedAmount(VLC_TICK_0 + vlc_tick_from_sec(7)) == vlc_tick_from_sec(1));
         Expect(queue.getPCR() == VLC_TICK_INVALID);
         /* extend through PCR */
-        cmd = queue.factory()->createEsOutControlPCRCommand(0, VLC_TICK_0 + vlc_tick_from_sec(10));
+        cmd = factory.createEsOutControlPCRCommand(0, VLC_TICK_0 + vlc_tick_from_sec(10));
         queue.Schedule(cmd);
         Expect(queue.getBufferingLevel() == VLC_TICK_0 + vlc_tick_from_sec(10));
         Expect(queue.getDemuxedAmount(VLC_TICK_0) == vlc_tick_from_sec(10));
@@ -167,10 +168,10 @@
             block_t *data = block_Alloc(0);
             Expect(data);
             data->i_dts = VLC_TICK_0 + vlc_tick_from_sec(11);
-            cmd = queue.factory()->createEsOutSendCommand(id0, data);
+            cmd = factory.createEsOutSendCommand(id0, data);
             queue.Schedule(cmd);
         } while(0);
-        cmd = queue.factory()->createEsOutControlPCRCommand(0, VLC_TICK_0 + vlc_tick_from_sec(11));
+        cmd = factory.createEsOutControlPCRCommand(0, VLC_TICK_0 + vlc_tick_from_sec(11));
         queue.Schedule(cmd);
         Expect(queue.getPCR() == VLC_TICK_0 + vlc_tick_from_sec(3)); /* should be unchanged */
         Expect(queue.getDemuxedAmount(VLC_TICK_0 + vlc_tick_from_sec(3)) == vlc_tick_from_sec(7));
@@ -196,12 +197,12 @@
                 block_t *data = block_Alloc(0);
                 Expect(data);
                 data->i_dts = VLC_TICK_0 + OFFSET + vlc_tick_from_sec(i);
-                cmd = queue.factory()->createEsOutSendCommand(id, data);
+                cmd = factory.createEsOutSendCommand(id, data);
                 queue.Schedule(cmd);
             }
         }
 
-        cmd = queue.factory()->createEsOutControlPCRCommand(0, VLC_TICK_0 + OFFSET + vlc_tick_from_sec(10));
+        cmd = factory.createEsOutControlPCRCommand(0, VLC_TICK_0 + OFFSET + vlc_tick_from_sec(10));
         queue.Schedule(cmd);
         Expect(esout.output.empty());
         queue.Process(VLC_TICK_0 + OFFSET - 1);
@@ -236,11 +237,11 @@
                     block_t *data = block_Alloc(0);
                     Expect(data);
                     data->i_dts = VLC_TICK_0 + OFFSET + vlc_tick_from_sec(k * 2 + i);
-                    cmd = queue.factory()->createEsOutSendCommand(id, data);
+                    cmd = factory.createEsOutSendCommand(id, data);
                     queue.Schedule(cmd);
                 }
             }
-            cmd = queue.factory()->createEsOutControlPCRCommand(0,
+            cmd = factory.createEsOutControlPCRCommand(0,
                     VLC_TICK_0 + OFFSET + vlc_tick_from_sec( (k*2)+1 ));
             queue.Schedule(cmd);
         }
@@ -271,11 +272,11 @@
                     Expect(data);
                     if(i==0)
                         data->i_dts = VLC_TICK_0 + OFFSET + vlc_tick_from_sec(k);
-                    cmd = queue.factory()->createEsOutSendCommand(id, data);
+                    cmd = factory.createEsOutSendCommand(id, data);
                     queue.Schedule(cmd);
                 }
             }
-            cmd = queue.factory()->createEsOutControlPCRCommand(0,
+            cmd = factory.createEsOutControlPCRCommand(0,
                     VLC_TICK_0 + OFFSET + vlc_tick_from_sec(k));
             queue.Schedule(cmd);
         }
@@ -303,12 +304,12 @@
         for(size_t i=0; i<2; i++)
         {
             const vlc_tick_t now = VLC_TICK_0 + OFFSET + vlc_tick_from_sec(i);
-            cmd = queue.factory()->createEsOutControlPCRCommand(0, now);
+            cmd = factory.createEsOutControlPCRCommand(0, now);
             queue.Schedule(cmd);
             block_t *data = block_Alloc(0);
             Expect(data);
             data->i_dts = now;
-            cmd = queue.factory()->createEsOutSendCommand(id0, data);
+            cmd = factory.createEsOutSendCommand(id0, data);
             queue.Schedule(cmd);
         }
         queue.Process(VLC_TICK_0 + OFFSET + vlc_tick_from_sec(0));

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/adaptive/tools/Retrieve.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/adaptive/tools/Retrieve.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/av1_unpack.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/av1_unpack.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/hls/HLSStreams.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/hls/HLSStreams.cpp Changed

@@ -99,25 +99,24 @@
 
 block_t * HLSStream::checkBlock(block_t *p_block, bool b_first)
 {
-    if(b_first && p_block &&
-       p_block->i_buffer >= 10 && ID3TAG_IsTag(p_block->p_buffer, false))
+    if(b_first && p_block)
     {
-        while( p_block->i_buffer )
+        while(p_block->i_buffer >= 10 && ID3TAG_IsTag(p_block->p_buffer, false))
         {
             size_t i_size = ID3TAG_Parse( p_block->p_buffer, p_block->i_buffer,
                                           ID3TAG_Parse_Handler, static_cast<void *>(this) );
+            if(i_size >= p_block->i_buffer || i_size == 0)
+                break;
             /* Skip ID3 for demuxer */
             p_block->p_buffer += i_size;
             p_block->i_buffer -= i_size;
-            if( i_size == 0 )
-                break;
         }
     }
 
     if( b_meta_updated )
     {
         b_meta_updated = false;
-        AbstractCommand *command = fakeEsOut()->commandsQueue()->factory()->createEsOutMetaCommand( fakeesout, -1, p_meta );
+        AbstractCommand *command = fakeEsOut()->commandsFactory()->createEsOutMetaCommand( fakeesout, -1, p_meta );
         if( command )
             fakeEsOut()->commandsQueue()->Schedule( command );
     }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/hls/playlist/HLSRepresentation.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/hls/playlist/HLSRepresentation.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/hls/playlist/Parser.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/hls/playlist/Parser.cpp Changed

@@ -234,6 +234,8 @@
     CommonEncryption encryption;
     const ValuesListTag *ctx_extinf = nullptr;
 
+    std::list<HLSSegment *> segmentstoappend;
+
     std::list<Tag *>::const_iterator it;
     for(it = tagslist.begin(); it != tagslist.end(); ++it)
     {
@@ -284,11 +286,11 @@
                 totalduration += nzDuration;
                 if(absReferenceTime != VLC_TICK_INVALID)
                 {
-                    segment->utcTime = absReferenceTime;
+                    segment->setDisplayTime(absReferenceTime);
                     absReferenceTime += nzDuration;
                 }
 
-                segmentList->addSegment(segment);
+                segmentstoappend.push_back(segment);
 
                 if(ctx_byterange)
                 {
@@ -327,6 +329,20 @@
                 rep->b_consistent = false;
                 absReferenceTime = VLC_TICK_0 +
                         UTCTime(static_cast<const SingleValueTag *>(tag)->getValue().value).mtime();
+                /* Reverse apply UTC timespec from first discont */
+                if(segmentstoappend.size() && segmentstoappend.back()->getDisplayTime() == VLC_TICK_INVALID)
+                {
+                    vlc_tick_t tempTime = absReferenceTime;
+                    for(auto it = segmentstoappend.crbegin(); it != segmentstoappend.crend(); ++it)
+                    {
+                        vlc_tick_t duration = timescale.ToTime((*it)->duration.Get());
+                        if( duration < tempTime - VLC_TICK_0 )
+                            tempTime -= duration;
+                        else
+                            tempTime = VLC_TICK_0;
+                        (*it)->setDisplayTime(tempTime);
+                    }
+                }
                 break;
 
             case AttributesTag::EXTXKEY:
@@ -367,6 +383,10 @@
         }
     }
 
+    for(HLSSegment *seg : segmentstoappend)
+        segmentList->addSegment(seg);
+    segmentstoappend.clear();
+
     if(rep->isLive())
     {
         rep->getPlaylist()->duration.Set(0);

vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/json/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/ogg.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/ogg.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/smooth/playlist/ForgedInitSegment.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/smooth/playlist/ForgedInitSegment.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/smooth/playlist/Manifest.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/smooth/playlist/Manifest.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/smooth/playlist/MemoryChunk.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/smooth/playlist/MemoryChunk.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/demux/smooth/playlist/MemoryChunk.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/demux/smooth/playlist/MemoryChunk.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/macosx/UI/MainMenu.xib -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/macosx/UI/MainMenu.xib Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/macosx/extensions/NSString+Helpers.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/macosx/extensions/NSString+Helpers.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/macosx/menus/VLCMainMenu.m -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/macosx/menus/VLCMainMenu.m Changed

@@ -335,8 +335,8 @@
 - (void)initStrings
 {
     /* main menu */
-    [_about setTitle: [_NS("About VLC media player") stringByAppendingString: @"..."]];
-    [_checkForUpdate setTitle: _NS("Check for Update...")];
+    [_about setTitle: _NS("About VLC media player...")];
+    [_checkForUpdate setTitle: _NS("Check for Updates...")];
     [_prefs setTitle: _NS("Preferences...")];
     [_extensions setTitle: _NS("Extensions")];
     [_extensionsMenu setTitle: _NS("Extensions")];
@@ -352,7 +352,8 @@
     /* this special case is needed to due to archiac legacy translations of the File menu
      * on the Mac to the German translation which resulted in 'Ablage' instead of 'Datei'.
      * This remains until the present day and does not affect the Windows world. */
-    [_fileMenu setTitle: _ANS("1:File")];
+     /* xgettext: Label for the macOS main "File" menu */
+    [_fileMenu setTitle: _PNS("macOS MainMenu", "File")];
     [_open_generic setTitle: _NS("Advanced Open File...")];
     [_open_file setTitle: _NS("Open File...")];
     [_open_disc setTitle: _NS("Open Disc...")];

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/macosx/views/VLCTimeField.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/macosx/views/VLCTimeField.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/macosx/views/VLCTimeField.m -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/macosx/views/VLCTimeField.m Changed

@@ -2,6 +2,7 @@
  * VLCTimeField.m: NSTextField subclass for playback time fields
  *****************************************************************************
  * Copyright (C) 2003-2017 VLC authors and VideoLAN
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Felix Paul Kühne <fkuehne at videolan dot org>
@@ -31,8 +32,11 @@
 
 @interface VLCTimeField ()
 {
-    NSString *o_remaining_identifier;
-    BOOL b_time_remaining;
+    NSString *_identifier;
+    BOOL _isTimeRemaining;
+
+    NSString *_cachedTime;
+    NSString *_remainingTime;
 }
 @end
 
@@ -48,10 +52,10 @@
 }
 
 
-- (void)setRemainingIdentifier:(NSString *)o_string
+- (void)setRemainingIdentifier:(NSString *)identifier
 {
-    o_remaining_identifier = o_string;
-    b_time_remaining = [[NSUserDefaults standardUserDefaults] boolForKey:o_remaining_identifier];
+    _identifier = identifier;
+    _isTimeRemaining = [[NSUserDefaults standardUserDefaults] boolForKey:_identifier];
 }
 
 - (void)mouseDown: (NSEvent *)ourEvent
@@ -60,24 +64,54 @@
         [[[VLCMain sharedInstance] mainMenu] goToSpecificTime: nil];
     else
     {
-        if (o_remaining_identifier) {
-            b_time_remaining = [[NSUserDefaults standardUserDefaults] boolForKey:o_remaining_identifier];
-            b_time_remaining = !b_time_remaining;
-            [[NSUserDefaults standardUserDefaults] setObject:(b_time_remaining ? @"YES" : @"NO") forKey:o_remaining_identifier];
+        if (_identifier) {
+            _isTimeRemaining = [[NSUserDefaults standardUserDefaults] boolForKey:_identifier];
+            _isTimeRemaining = !_isTimeRemaining;
+            [[NSUserDefaults standardUserDefaults] setObject:(_isTimeRemaining ? @"YES" : @"NO") forKey:_identifier];
         } else {
-            b_time_remaining = !b_time_remaining;
+            _isTimeRemaining = !_isTimeRemaining;
         }
+
+        [self updateTimeValue];
     }
 
     [[self nextResponder] mouseDown:ourEvent];
 }
 
+- (void)setTime:(NSString *)time withRemainingTime:(NSString *)remainingTime
+{
+    _cachedTime = time;
+    _remainingTime = remainingTime;
+
+    [self updateTimeValue];
+}
+
+- (void)updateTimeValue
+{
+    if (!_cachedTime || !_remainingTime)
+        return;
+
+    if ([self timeRemaining]) {
+        [super setStringValue:_remainingTime];
+    } else {
+        [super setStringValue:_cachedTime];
+    }
+}
+
+- (void)setStringValue:(NSString *)stringValue
+{
+    [super setStringValue:stringValue];
+
+    _cachedTime = nil;
+    _remainingTime = nil;
+}
+
 - (BOOL)timeRemaining
 {
-    if (o_remaining_identifier)
-        return [[NSUserDefaults standardUserDefaults] boolForKey:o_remaining_identifier];
+    if (_identifier)
+        return [[NSUserDefaults standardUserDefaults] boolForKey:_identifier];
     else
-        return b_time_remaining;
+        return _isTimeRemaining;
 }
 
 @end

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/macosx/windows/mainwindow/VLCControlsBarCommon.m -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/macosx/windows/mainwindow/VLCControlsBarCommon.m Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/macosx/windows/video/VLCFSPanelController.m -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/macosx/windows/video/VLCFSPanelController.m Changed

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/Makefile.am -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/Makefile.am Changed

@@ -112,7 +112,10 @@
 	gui/qt/dialogs/sout/sout.cpp gui/qt/dialogs/sout/sout.hpp \
 	gui/qt/dialogs/sout/sout_widgets.cpp \
 	gui/qt/dialogs/sout/sout_widgets.hpp \
-	gui/qt/dialogs/toolbar/toolbareditor.cpp gui/qt/dialogs/toolbar/toolbareditor.hpp \
+	gui/qt/dialogs/toolbar/controlbar_profile.hpp \
+	gui/qt/dialogs/toolbar/controlbar_profile.cpp \
+	gui/qt/dialogs/toolbar/controlbar_profile_model.cpp \
+	gui/qt/dialogs/toolbar/controlbar_profile_model.hpp \
 	gui/qt/dialogs/vlm/vlm.cpp gui/qt/dialogs/vlm/vlm.hpp \
 	gui/qt/dialogs/playlists/playlists.cpp gui/qt/dialogs/playlists/playlists.hpp \
 	gui/qt/maininterface/compositor.hpp \
@@ -154,6 +157,10 @@
 	gui/qt/medialibrary/mlgenre.hpp \
 	gui/qt/medialibrary/mlgenremodel.cpp \
 	gui/qt/medialibrary/mlgenremodel.hpp \
+	gui/qt/medialibrary/mlgroup.cpp \
+	gui/qt/medialibrary/mlgroup.hpp \
+	gui/qt/medialibrary/mlgrouplistmodel.cpp \
+	gui/qt/medialibrary/mlgrouplistmodel.hpp \
 	gui/qt/medialibrary/mlhelper.cpp \
 	gui/qt/medialibrary/mlhelper.hpp \
 	gui/qt/medialibrary/mlqmltypes.hpp \
@@ -194,7 +201,8 @@
 	gui/qt/network/servicesdiscoverymodel.hpp \
 	gui/qt/player/input_models.cpp gui/qt/player/input_models.hpp \
 	gui/qt/player/player_controller.cpp gui/qt/player/player_controller.hpp gui/qt/player/player_controller_p.hpp \
-	gui/qt/player/playercontrolbarmodel.cpp gui/qt/player/playercontrolbarmodel.hpp \
+	gui/qt/player/player_controlbar_model.cpp gui/qt/player/player_controlbar_model.hpp \
+	gui/qt/player/control_list_model.cpp gui/qt/player/control_list_model.hpp \
 	gui/qt/playlist/media.hpp \
 	gui/qt/playlist/playlist_common.cpp \
 	gui/qt/playlist/playlist_common.hpp \
@@ -246,6 +254,7 @@
 	gui/qt/widgets/native/interface_widgets.hpp \
 	gui/qt/widgets/native/qvlcframe.cpp \
 	gui/qt/widgets/native/qvlcframe.hpp \
+	gui/qt/widgets/native/roundimage.cpp gui/qt/widgets/native/roundimage.hpp \
 	gui/qt/widgets/native/searchlineedit.cpp gui/qt/widgets/native/searchlineedit.hpp
 if HAVE_WIN32
 libqt_plugin_la_SOURCES += \
@@ -316,7 +325,8 @@
 	gui/qt/dialogs/sout/profile_selector.moc.cpp \
 	gui/qt/dialogs/sout/sout.moc.cpp \
 	gui/qt/dialogs/sout/sout_widgets.moc.cpp \
-	gui/qt/dialogs/toolbar/toolbareditor.moc.cpp \
+	gui/qt/dialogs/toolbar/controlbar_profile.moc.cpp \
+	gui/qt/dialogs/toolbar/controlbar_profile_model.moc.cpp \
 	gui/qt/dialogs/playlists/playlists.moc.cpp \
 	gui/qt/maininterface/compositor_dummy.moc.cpp \
 	gui/qt/maininterface/interface_window_handler.moc.cpp \
@@ -335,6 +345,8 @@
 	gui/qt/medialibrary/mlfoldersmodel.moc.cpp \
 	gui/qt/medialibrary/mlgenre.moc.cpp \
 	gui/qt/medialibrary/mlgenremodel.moc.cpp \
+	gui/qt/medialibrary/mlgroup.moc.cpp \
+	gui/qt/medialibrary/mlgrouplistmodel.moc.cpp \
 	gui/qt/medialibrary/mlqmltypes.moc.cpp \
 	gui/qt/medialibrary/mlrecentsmodel.moc.cpp \
 	gui/qt/medialibrary/mlrecentsvideomodel.moc.cpp \
@@ -353,7 +365,8 @@
 	gui/qt/network/servicesdiscoverymodel.moc.cpp \
 	gui/qt/player/input_models.moc.cpp \
 	gui/qt/player/player_controller.moc.cpp \
-	gui/qt/player/playercontrolbarmodel.moc.cpp \
+	gui/qt/player/player_controlbar_model.moc.cpp \
+	gui/qt/player/control_list_model.moc.cpp \
 	gui/qt/playlist/playlist_common.moc.cpp \
 	gui/qt/playlist/playlist_controller.moc.cpp \
 	gui/qt/playlist/playlist_item.moc.cpp \
@@ -380,6 +393,7 @@
 	gui/qt/widgets/native/animators.moc.cpp \
 	gui/qt/widgets/native/customwidgets.moc.cpp \
 	gui/qt/widgets/native/interface_widgets.moc.cpp \
+	gui/qt/widgets/native/roundimage.moc.cpp \
 	gui/qt/widgets/native/searchlineedit.moc.cpp
 
 if HAVE_WIN32
@@ -640,12 +654,14 @@
 	gui/qt/dialogs/dialogs/qml/CustomDialog.qml \
 	gui/qt/dialogs/dialogs/qml/Dialogs.qml \
 	gui/qt/dialogs/dialogs/qml/ModalDialog.qml \
+	gui/qt/dialogs/dialogs/qml/WindowDialog.qml \
 	gui/qt/dialogs/help/qml/About.qml \
 	gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml \
 	gui/qt/dialogs/toolbar/qml/EditorDNDView.qml\
 	gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml \
 	gui/qt/dialogs/toolbar/qml/EditorTabButton.qml \
 	gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml \
+	gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml \
 	gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml \
 	gui/qt/maininterface/qml/BannerSources.qml \
 	gui/qt/maininterface/qml/MainInterface.qml \
@@ -657,6 +673,8 @@
 	gui/qt/medialibrary/qml/ArtistTopBanner.qml \
 	gui/qt/medialibrary/qml/AudioGridItem.qml \
 	gui/qt/medialibrary/qml/EmptyLabel.qml \
+	gui/qt/medialibrary/qml/MediaGroupDisplay.qml \
+	gui/qt/medialibrary/qml/MediaGroupList.qml \
 	gui/qt/medialibrary/qml/MusicAlbums.qml \
 	gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml \
 	gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml \
@@ -673,6 +691,7 @@
 	gui/qt/medialibrary/qml/VideoDisplay.qml \
 	gui/qt/medialibrary/qml/VideoAll.qml \
 	gui/qt/medialibrary/qml/VideoAllDisplay.qml \
+	gui/qt/medialibrary/qml/VideoGroupsDisplay.qml \
 	gui/qt/medialibrary/qml/PlaylistMediaList.qml \
 	gui/qt/medialibrary/qml/PlaylistMedia.qml \
 	gui/qt/medialibrary/qml/PlaylistMediaDelegate.qml \
@@ -701,6 +720,7 @@
 	gui/qt/player/qml/ControlBar.qml \
 	gui/qt/player/qml/ControlButtons.qml \
 	gui/qt/player/qml/LanguageMenu.qml \
+	gui/qt/player/qml/PlaybackSpeed.qml \
 	gui/qt/player/qml/MiniPlayer.qml \
 	gui/qt/player/qml/PIPPlayer.qml \
 	gui/qt/player/qml/Player.qml \
@@ -723,6 +743,7 @@
 	gui/qt/style/VLCIcons.qml \
 	gui/qt/style/VLCStyle.qml \
 	gui/qt/style/qmldir \
+	gui/qt/util/qml/Helpers.js \
 	gui/qt/util/qml/KeyHelper.js \
 	gui/qt/util/qml/SelectableDelegateModel.qml \
 	gui/qt/widgets/qml/BannerTabButton.qml \
@@ -741,6 +762,7 @@
 	gui/qt/widgets/qml/ExpandGridView.qml \
 	gui/qt/widgets/qml/FocusBackground.qml \
 	gui/qt/widgets/qml/GridItem.qml \
+	gui/qt/widgets/qml/GridShadows.qml \
 	gui/qt/widgets/qml/HorizontalResizeHandle.qml \
 	gui/qt/widgets/qml/IconLabel.qml \
 	gui/qt/widgets/qml/IconButton.qml \
@@ -767,10 +789,10 @@
 	gui/qt/widgets/qml/NavigableRow.qml \
 	gui/qt/widgets/qml/PlayCover.qml \
 	gui/qt/widgets/qml/RoundButton.qml \
-	gui/qt/widgets/qml/RoundImage.qml \
 	gui/qt/widgets/qml/ScanProgressBar.qml \
 	gui/qt/widgets/qml/ScrollingText.qml \
 	gui/qt/widgets/qml/SearchBox.qml \
+	gui/qt/widgets/qml/ShadowCoverGenerator.qml \
 	gui/qt/widgets/qml/SortControl.qml \
 	gui/qt/widgets/qml/SpinBoxExt.qml \
 	gui/qt/widgets/qml/StackViewExt.qml \
@@ -781,7 +803,7 @@
 	gui/qt/widgets/qml/TextToolButton.qml \
 	gui/qt/widgets/qml/ToolTipArea.qml \
 	gui/qt/widgets/qml/VideoProgressBar.qml \
-	gui/qt/widgets/qml/VideoQualityLabel.qml \
+	gui/qt/widgets/qml/VideoQualityLabels.qml \
 	gui/qt/widgets/qml/ListSubtitleLabel.qml \
 	gui/qt/widgets/qml/PointingTooltip.qml \
 	gui/qt/widgets/qml/FrostedGlassEffect.qml \

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml Changed

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/dialogs/qml/WindowDialog.qml Added

@@ -0,0 +1,101 @@
+/*****************************************************************************
+ * 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 2.11
+import QtQuick.Window 2.11
+import QtQuick.Layouts 1.11
+import QtQuick.Controls 2.4
+
+import "qrc:///widgets/" as Widgets
+import "qrc:///style/"
+
+Window {
+    id: root
+
+    flags: Qt.Dialog
+
+    property bool modal: false
+    modality: modal ? Qt.ApplicationModal : Qt.NonModal
+
+    width: VLCStyle.appWidth * 0.75
+    height: VLCStyle.appHeight * 0.85
+
+    title: i18n.qtr("Dialog")
+    color: VLCStyle.colors.bg
+
+    property alias contentComponent: loader.sourceComponent
+    property alias standardButtons: buttonBox.standardButtons
+
+    signal accepted()
+    signal rejected(bool byButton)
+    signal applied()
+    signal discarded()
+    signal reset()
+
+    onAccepted: hide()
+    onRejected: if (byButton) hide()
+    onApplied: hide()
+    onDiscarded: hide()
+    onReset: hide()
+
+    onClosing: {
+        rejected(false)
+    }
+
+    function open() {
+        show()
+    }
+
+    ColumnLayout {
+        anchors.fill: parent
+        anchors.margins: VLCStyle.margin_small
+
+        Loader {
+            id: loader
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+
+            clip: true
+            sourceComponent: contentComponent
+        }
+
+        DialogButtonBox {
+            id: buttonBox
+
+            bottomPadding: 0
+            topPadding: 0
+            padding: VLCStyle.margin_small
+            spacing: VLCStyle.margin_small
+
+            Layout.fillWidth: true
+            Layout.minimumHeight: VLCStyle.icon_normal
+
+            standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel
+
+            onAccepted: root.accepted()
+            onRejected: root.rejected(true)
+            onApplied: root.applied()
+            onDiscarded: root.discarded()
+            onReset: root.reset()
+
+            // Customize DialogButtonBox so that it matches with the app theme
+            background: Item { }
+            delegate: Widgets.TextToolButton { }
+        }
+    }
+}

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/dialogs_provider.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/dialogs_provider.cpp Changed

@@ -50,7 +50,6 @@
 #include "dialogs/help/help.hpp"
 #include "dialogs/gototime/gototime.hpp"
 #include "dialogs/podcast/podcast_configuration.hpp"
-#include "dialogs/toolbar/toolbareditor.hpp"
 #include "dialogs/plugins/plugins.hpp"
 #include "dialogs/epg/epg.hpp"
 #include "dialogs/errors/errors.hpp"
@@ -61,6 +60,7 @@
 #include <QSignalMapper>
 #include <QFileDialog>
 #include <QUrl>
+#include <QInputDialog>
 
 #define I_OP_DIR_WINTITLE I_DIR_OR_FOLDER( N_("Open Directory"), \
                                            N_("Open Folder") )
@@ -112,6 +112,36 @@
     return QFileDialog::getSaveFileUrl( parent, caption, dir, filter, selectedFilter, QFileDialog::Options(), schemes).toLocalFile();
 }
 
+QVariant DialogsProvider::getTextDialog(QWidget *parent,
+                                        const QString &title,
+                                        const QString &label,
+                                        const QString &placeholder,
+                                        bool *ok)
+{
+    bool _ok = false;
+    QString ret = QInputDialog::getText(parent,
+                                        title,
+                                        label,
+                                        QLineEdit::Normal,
+                                        placeholder,
+                                        ok ? ok : &_ok);
+
+    if (!ok)
+    {
+        // When this function is called from the QML side, instead of setting `ok` parameter
+        // a QVariantMap with key `ok` and `text` is returned instead
+
+        QVariantMap map;
+        map["text"] = ret;
+        map["ok"] = _ok;
+        return map;
+    }
+    else
+    {
+        return ret;
+    }
+}
+
 void DialogsProvider::quit()
 {
     b_isDying = true;
@@ -345,14 +375,6 @@
     PodcastConfigDialog::getInstance( p_intf )->toggleVisible();
 }
 
-void DialogsProvider::toolbarDialog()
-{
-    ToolbarEditorDialog *toolbarEditor = new ToolbarEditorDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf);
-    if( toolbarEditor->exec() == QDialog::Accepted )
-        emit toolBarConfUpdated();
-    delete toolbarEditor;
-}
-
 void DialogsProvider::pluginDialog()
 {
     PluginDialog::getInstance( p_intf )->toggleVisible();
@@ -505,7 +527,7 @@
     fileTypes.chop(2); //remove trailling ";;"
 
     QList<QUrl> urls = QFileDialog::getOpenFileUrls( NULL,
-        help.isEmpty() ? qtr(I_OP_SEL_FILES ) : help,
+        help.isEmpty() ? qfut(I_OP_SEL_FILES ) : help,
         path.isEmpty() ? p_intf->p_sys->filepath : path,
         fileTypes );
 
@@ -578,7 +600,7 @@
 {
     const QStringList schemes = QStringList(QStringLiteral("file"));
     QUrl dirurl = QFileDialog::getExistingDirectoryUrl( NULL,
-            qtr( I_OP_DIR_WINTITLE ), p_intf->p_sys->filepath,
+            qfut( I_OP_DIR_WINTITLE ), p_intf->p_sys->filepath,
             QFileDialog::ShowDirsOnly, schemes );
 
     if( dirurl.isEmpty() ) return QString();
@@ -637,7 +659,7 @@
 
     for( size_t i = 0; i < sizeof (types) / sizeof (types[0]); i++ )
     {
-        QString tmp = qfu( vlc_gettext( types[i].filter_name ) ) + " (*." + types[i].filter_patterns + ")";
+        QString tmp = qfut( types[i].filter_name ) + " (*." + types[i].filter_patterns + ")";
         if( ext == qfu( types[i].filter_patterns ) )
             filters.insert( 0, tmp );
         else
@@ -671,7 +693,7 @@
     {
         for( size_t i = 0; i < sizeof (types) / sizeof (types[0]); i++)
         {
-            if ( selected.startsWith( qfu( vlc_gettext( types[i].filter_name ) ) ) )
+            if ( selected.startsWith( qfut( types[i].filter_name ) ) )
             {
                 psz_selected_module = types[i].module;
                 psz_last_playlist_ext = types[i].filter_patterns;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/dialogs_provider.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/dialogs_provider.hpp Changed

@@ -42,6 +42,7 @@
 #define TITLE_EXTENSIONS_MEDIA qtr( "Media Files" )
 #define TITLE_EXTENSIONS_VIDEO qtr( "Video Files" )
 #define TITLE_EXTENSIONS_AUDIO qtr( "Audio Files" )
+#define TITLE_EXTENSIONS_IMAGE qtr( "Image Files" )
 #define TITLE_EXTENSIONS_PLAYLIST qtr( "Playlist Files" )
 #define TITLE_EXTENSIONS_SUBTITLE qtr( "Subtitle Files" )
 #define TITLE_EXTENSIONS_ALL qtr( "All Files" )
@@ -100,6 +101,11 @@
                                     const QString &filter = QString(),
                                     QString *selectedFilter = NULL );
 
+    Q_INVOKABLE static QVariant getTextDialog(QWidget *parent, const QString& title,
+                                              const QString& label,
+                                              const QString& placeholder,
+                                              bool* ok = nullptr);
+
 protected:
     void customEvent( QEvent *);
 
@@ -144,7 +150,6 @@
     void aboutDialog();
     void gotoTimeDialog();
     void podcastConfigureDialog();
-    void toolbarDialog();
     void pluginDialog();
     void epgDialog();
     void setPopupMenu();
@@ -181,8 +186,8 @@
     void quit();
 
 signals:
-    void  toolBarConfUpdated();
     void releaseMouseEvents();
+    void showToolbarEditorDialog();
 };
 
 class DialogEvent : public QEvent

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/extended/extended_panels.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/extended/extended_panels.cpp Changed

@@ -366,7 +366,7 @@
 {
     const QStringList schemes = QStringList(QStringLiteral("file"));
     QString filter = QString( "%1 (*.png *.jpg);;%2 (*)" )
-                        .arg( qtr("Image Files") )
+                        .arg( TITLE_EXTENSIONS_IMAGE )
                         .arg( TITLE_EXTENSIONS_ALL );
     QString file = QFileDialog::getOpenFileUrl( NULL, qtr( "Logo filenames" ),
                    p_intf->p_sys->filepath, filter,
@@ -379,7 +379,7 @@
 {
     const QStringList schemes = QStringList(QStringLiteral("file"));
     QString filter = QString( "%1 (*.png *.jpg);;%2 (*)" )
-                        .arg( qtr("Image Files") )
+                        .arg( TITLE_EXTENSIONS_IMAGE )
                         .arg( TITLE_EXTENSIONS_ALL );
     QString file = QFileDialog::getOpenFileUrl( NULL, qtr( "Image mask" ),
                    p_intf->p_sys->filepath, filter,
@@ -411,7 +411,7 @@
         ssize_t count = config_GetIntChoices( qtu( option ), &values, &texts );
         for( ssize_t i = 0; i < count; i++ )
         {
-            combobox->addItem( qtr( texts[i] ), qlonglong(values[i]) );
+            combobox->addItem( qfut( texts[i] ), qlonglong(values[i]) );
             free( texts[i] );
         }
         free( texts );
@@ -424,7 +424,7 @@
         ssize_t count = config_GetPszChoices( qtu( option ), &values, &texts );
         for( ssize_t i = 0; i < count; i++ )
         {
-            combobox->addItem( qtr( texts[i] ), qfu(values[i]) );
+            combobox->addItem( qfut( texts[i] ), qfu(values[i]) );
             free( texts[i] );
             free( values[i] );
         }
@@ -660,7 +660,7 @@
 
             if( !var_Change( p_obj, psz_var, VLC_VAR_GETTEXT, &vartext ) )
             {
-                name = qtr(vartext);
+                name = qfut(vartext);
                 free(vartext);
             }
             else
@@ -1176,7 +1176,7 @@
                        palette().color( QPalette::WindowText ) );
         scene.setSceneRect( 0.0, 0.0, eqz_preset_10b[i].i_band , 40.0 );
         scene.render( &painter, icon.rect(), scene.sceneRect(), Qt::IgnoreAspectRatio );
-        ui.presetsCombo->addItem( icon, qtr( preset_list_text[i] ),
+        ui.presetsCombo->addItem( icon, qfut( preset_list_text[i] ),
                                      QVariant( preset_list[i] ) );
     }
     CONNECT( ui.presetsCombo, activated(int), this, setCorePreset(int) );

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/help/help.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/help/help.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/mediainfo/info_panels.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/mediainfo/info_panels.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/open/open_panels.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/open/open_panels.cpp Changed

@@ -349,8 +349,8 @@
     /* State to avoid overwritting the users changes with the configuration */
     m_discType = None;
 
-    ui.browseDiscButton->setToolTip( qtr( I_DEVICE_TOOLTIP ));
-    ui.deviceCombo->setToolTip( qtr(I_DEVICE_TOOLTIP) );
+    ui.browseDiscButton->setToolTip( qfut( I_DEVICE_TOOLTIP ));
+    ui.deviceCombo->setToolTip( qfut( I_DEVICE_TOOLTIP ) );
     ui.deviceCombo->setInsertPolicy( QComboBox::InsertAtTop );
 
 #if !defined( _WIN32 ) && !defined( __OS2__ )
@@ -649,7 +649,7 @@
 {
     const QStringList schemes = QStringList(QStringLiteral("file"));
     QString dir = QFileDialog::getExistingDirectoryUrl( this,
-            qtr( I_DEVICE_TOOLTIP ), p_intf->p_sys->filepath,
+            qfut( I_DEVICE_TOOLTIP ), p_intf->p_sys->filepath,
             QFileDialog::ShowDirsOnly, schemes ).toLocalFile();
     if( !dir.isEmpty() )
     {
@@ -786,7 +786,7 @@
     layout * name ## PropLayout = new layout;               \
     name ## DevPage->setLayout( name ## DevLayout );                  \
     name ## PropPage->setLayout( name ## PropLayout );                \
-    ui.deviceCombo->addItem( qtr( label ), QVariant( number ) );
+    ui.deviceCombo->addItem( qfut( label ), QVariant( number ) );
 
 #define CuMRL( widget, slot ) CONNECT( widget , slot , this, updateMRL() );
 
@@ -834,7 +834,7 @@
         "video*"
     };
     if( module_exists( "v4l2" ) ){
-    addModuleAndLayouts( V4L2_DEVICE, v4l2, "Video camera", QGridLayout );
+    addModuleAndLayouts( V4L2_DEVICE, v4l2, N_("Video camera"), QGridLayout );
 
     /* V4L2 main panel */
     QLabel *v4l2VideoDeviceLabel = new QLabel( qtr( "Video device name" ) );
@@ -887,7 +887,7 @@
      * JACK *
      *******/
     if( module_exists( "jack" ) ){
-    addModuleAndLayouts( JACK_DEVICE, jack, "JACK Audio Connection Kit",
+    addModuleAndLayouts( JACK_DEVICE, jack, N_("JACK Audio Connection Kit"),
                          QGridLayout);
 
     /* Jack Main panel */
@@ -1116,7 +1116,7 @@
     /**********
      * Screen *
      **********/
-    addModuleAndLayouts( SCREEN_DEVICE, screen, "Desktop", QGridLayout );
+    addModuleAndLayouts( SCREEN_DEVICE, screen, N_("Desktop"), QGridLayout );
     QLabel *screenLabel = new QLabel( qtr( "Your display will be "
             "opened and played in order to stream or save it." ) );
     screenLabel->setWordWrap( true );

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/preferences/complete_preferences.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/preferences/complete_preferences.cpp Changed

@@ -256,12 +256,12 @@
         PrefsItemData *module_data = new PrefsItemData( this );
         module_data->i_type = PrefsItemData::TYPE_MODULE;
         module_data->psz_shortcut = strdup( module_get_object( p_module ) );
-        module_data->name = qtr( module_get_name( p_module, false ) );
+        module_data->name = qfut( module_get_name( p_module, false ) );
         module_data->help.clear();
         module_data->p_module = p_module;
         const char *psz_help = module_get_help( p_module );
         if ( psz_help )
-            module_data->help = qtr( psz_help );
+            module_data->help = qfut( psz_help );
 
         QTreeWidgetItem *module_item = new QTreeWidgetItem();
         module_item->setText( 0, module_data->name );
@@ -535,7 +535,7 @@
     }
     else
     {
-        head = QString( qtr( module_GetLongName( p_module ) ) );
+        head = QString( qfut( module_GetLongName( p_module ) ) );
     }
 
     if (name.contains( text, cs ) || head.contains( text, cs ) || help.contains( text, cs ))
@@ -557,7 +557,7 @@
 
         if( p_item->b_internal ) continue;
 
-        if ( p_item->psz_text && qtr( p_item->psz_text ).contains( text, cs ) )
+        if ( p_item->psz_text && qfut( p_item->psz_text ).contains( text, cs ) )
         {
             module_config_free( p_config );
             return true;
@@ -637,7 +637,7 @@
     }
     else
     {
-        head = QString( qtr( module_GetLongName( p_module ) ) );
+        head = QString( qfut( module_GetLongName( p_module ) ) );
     }
 
     QLabel *titleLabel = new QLabel( head );
@@ -689,7 +689,7 @@
                 i_line++;
             }
             i_boxline = 0;
-            box = new QGroupBox( qtr( p_item->psz_text ), this );
+            box = new QGroupBox( qfut( p_item->psz_text ), this );
             box->hide();
             boxlayout = new QGridLayout();
         }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp Changed

@@ -208,7 +208,7 @@
                                           bool pwd ) :
                            VStringConfigControl( _p_this, _p_item )
 {
-    label = new QLabel( p_item->psz_text ? qtr(p_item->psz_text) : "", _parent );
+    label = new QLabel( p_item->psz_text ? qfut(p_item->psz_text) : "", _parent );
     text = new QLineEdit( p_item->value.psz ? qfu(p_item->value.psz) : "", _parent );
     if( pwd ) text->setEchoMode( QLineEdit::Password );
     finish();
@@ -239,7 +239,7 @@
     text->setText( qfu(p_item->value.psz) );
     if( p_item->psz_longtext )
     {
-        QString tipText = qtr(p_item->psz_longtext);
+        QString tipText = qfut(p_item->psz_longtext);
         text->setToolTip( formatTooltip(tipText) );
         if( label )
             label->setToolTip( formatTooltip(tipText) );
@@ -253,7 +253,7 @@
                                       module_config_t *_p_item, QWidget *p ) :
                            VStringConfigControl( _p_this, _p_item )
 {
-    label = new QLabel( qtr(p_item->psz_text), p );
+    label = new QLabel( qfut(p_item->psz_text), p );
     text = new QLineEdit( qfu(p_item->value.psz), p );
     browse = new QPushButton( qtr( "Browse..." ), p );
 
@@ -308,7 +308,7 @@
     text->setText( qfu(p_item->value.psz) );
     if( p_item->psz_longtext )
     {
-        QString tipText = qtr(p_item->psz_longtext);
+        QString tipText = qfut(p_item->psz_longtext);
         text->setToolTip( formatTooltip(tipText) );
         if( label )
             label->setToolTip( formatTooltip(tipText) );
@@ -332,7 +332,7 @@
 void DirectoryConfigControl::updateField()
 {
     QString dir = QFileDialog::getExistingDirectory( NULL,
-                      qtr( I_OP_SEL_DIR ),
+                      qfut( I_OP_SEL_DIR ),
                       text->text().isEmpty() ?
                         QVLCUserDir( VLC_HOME_DIR ) : text->text(),
                   QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
@@ -346,13 +346,13 @@
                         module_config_t *_p_item, QWidget *p ) :
      VStringConfigControl( _p_this, _p_item )
 {
-    label = new QLabel( qtr(p_item->psz_text), p );
+    label = new QLabel( qfut(p_item->psz_text), p );
     font = new QFontComboBox( p );
     font->setCurrentFont( QFont( qfu( p_item->value.psz) ) );
 
     if( p_item->psz_longtext )
     {
-        label->setToolTip( formatTooltip( qtr(p_item->psz_longtext) ) );
+        label->setToolTip( formatTooltip( qfut(p_item->psz_longtext) ) );
     }
 }
 
@@ -373,7 +373,7 @@
 
     if( p_item->psz_longtext )
     {
-        label->setToolTip( formatTooltip( qtr(p_item->psz_longtext) ) );
+        label->setToolTip( formatTooltip( qfut(p_item->psz_longtext) ) );
     }
 }
 
@@ -382,7 +382,7 @@
                module_config_t *_p_item, QWidget *p ) :
                VStringConfigControl( _p_this, _p_item )
 {
-    label = new QLabel( qtr(p_item->psz_text), p );
+    label = new QLabel( qfut(p_item->psz_text), p );
     combo = new QComboBox( p );
     combo->setMinimumWidth( MINWIDTH_BOX );
     combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
@@ -445,7 +445,7 @@
 
     if( p_module_config->psz_longtext  )
     {
-        QString tipText = qtr(p_module_config->psz_longtext);
+        QString tipText = qfut(p_module_config->psz_longtext);
         combo->setToolTip( formatTooltip(tipText) );
         if( label )
             label->setToolTip( formatTooltip(tipText) );
@@ -471,7 +471,7 @@
         ssize_t count = config_GetPszChoices(configname, &values, &texts);
         for( ssize_t i = 0; i < count; i++ )
         {
-            combo->addItem( qtr(texts[i]), QVariant(qfu(values[i])) );
+            combo->addItem( qfut(texts[i]), QVariant(qfu(values[i])) );
             if( p_config->value.psz && !strcmp(p_config->value.psz, values[i]) )
                 combo->setCurrentIndex( i );
             free( texts[i] );
@@ -487,7 +487,7 @@
         ssize_t count = config_GetIntChoices(configname, &values, &texts);
         for( ssize_t i = 0; i < count; i++ )
         {
-            combo->addItem( qtr(texts[i]), QVariant(qlonglong(values[i])) );
+            combo->addItem( qfut(texts[i]), QVariant(qlonglong(values[i])) );
             if( p_config->value.i == values[i] )
                 combo->setCurrentIndex( i );
             free( texts[i] );
@@ -505,7 +505,7 @@
                module_config_t *_p_item, QWidget *p ) :
                VStringConfigControl( _p_this, _p_item )
 {
-    label = new QLabel( qtr(p_item->psz_text), p );
+    label = new QLabel( qfut(p_item->psz_text), p );
     combo = new QComboBox( p );
     combo->setMinimumWidth( MINWIDTH_BOX );
     finish( );
@@ -550,7 +550,7 @@
             const module_config_t *p_cfg = p_config + i;
             if( p_cfg->i_type == CONFIG_SUBCATEGORY &&
                 p_cfg->value.i == p_item->min.i )
-                combo->addItem( qtr( module_GetLongName( p_parser )),
+                combo->addItem( qfut( module_GetLongName( p_parser )),
                                 QVariant( module_get_object( p_parser ) ) );
             if( p_item->value.psz && !strcmp( p_item->value.psz,
                                               module_get_object( p_parser ) ) )
@@ -562,7 +562,7 @@
 
     if( p_item->psz_longtext )
     {
-        QString tipText = qtr(p_item->psz_longtext);
+        QString tipText = qfut(p_item->psz_longtext);
         combo->setToolTip( formatTooltip(tipText) );
         if( label )
             label->setToolTip( formatTooltip(tipText) );
@@ -586,7 +586,7 @@
     /* Special Hack */
     if( !p_item->psz_text ) return;
 
-    groupBox = new QGroupBox ( qtr(p_item->psz_text), p );
+    groupBox = new QGroupBox ( qfut(p_item->psz_text), p );
     text = new QLineEdit( p );
     QGridLayout *layoutGroupBox = new QGridLayout( groupBox );
 
@@ -602,7 +602,7 @@
     layoutGroupBox->addWidget( text, boxline, 0, 1, 2 );
 
     if( p_item->psz_longtext )
-        text->setToolTip( formatTooltip( qtr( p_item->psz_longtext) ) );
+        text->setToolTip( formatTooltip( qfut( p_item->psz_longtext) ) );
 }
 
 void ModuleListConfigControl::fillGrid( QGridLayout *l, int line )
@@ -622,8 +622,8 @@
 void ModuleListConfigControl::checkbox_lists( module_t *p_parser )
 {
     const char *help = module_get_help( p_parser );
-    checkbox_lists( qtr( module_GetLongName( p_parser ) ),
-                    help != NULL ? qtr( help ): "",
+    checkbox_lists( qfut( module_GetLongName( p_parser ) ),
+                    help != NULL ? qfut( help ): "",
                     module_get_object( p_parser ) );
 }
 
@@ -745,7 +745,7 @@
                                             module_config_t *_p_item, QWidget *p ) :
                            VIntConfigControl( _p_this, _p_item )
 {
-    label = new QLabel( qtr(p_item->psz_text), p );
+    label = new QLabel( qfut(p_item->psz_text), p );
     spin = new QSpinBox( p ); spin->setMinimumWidth( MINWIDTH_BOX );
     spin->setAlignment( Qt::AlignRight );
     spin->setMaximumWidth( MINWIDTH_BOX );
@@ -776,7 +776,7 @@
 
     if( p_item->psz_longtext )
     {
-        QString tipText = qtr(p_item->psz_longtext);
+        QString tipText = qfut(p_item->psz_longtext);
         spin->setToolTip( formatTooltip(tipText) );
         if( label )
             label->setToolTip( formatTooltip(tipText) );
@@ -827,7 +827,7 @@
     slider->setValue( p_item->value.i );
     if( p_item->psz_longtext )
     {
-        QString tipText = qtr(p_item->psz_longtext);
+        QString tipText = qfut(p_item->psz_longtext);
         slider->setToolTip( formatTooltip(tipText) );
         if( label )
             label->setToolTip( formatTooltip(tipText) );
@@ -847,7 +847,7 @@
                module_config_t *_p_item, QWidget *p, bool ) :
                VIntConfigControl( _p_this, _p_item )
 {
-    label = new QLabel( qtr(p_item->psz_text), p );
+    label = new QLabel( qfut(p_item->psz_text), p );
     combo = new QComboBox( p );
     combo->setMinimumWidth( MINWIDTH_BOX );
 
@@ -890,7 +890,7 @@
                                           &values, &texts );

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/preferences/simple_preferences.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/preferences/simple_preferences.cpp Changed

@@ -240,9 +240,9 @@
                   cone_audio_64, 1 );
     ADD_CATEGORY( SPrefsVideo, qtr("Video"), qtr("Video Settings"),
                   cone_video_64, 2 );
-    ADD_CATEGORY( SPrefsSubtitles, qtr(SUBPIC_TITLE), qtr("Subtitle & On Screen Display Settings"),
+    ADD_CATEGORY( SPrefsSubtitles, qfut(SUBPIC_TITLE), qtr("Subtitle & On Screen Display Settings"),
                   cone_subtitles_64, 3 );
-    ADD_CATEGORY( SPrefsInputAndCodecs, qtr(INPUT_TITLE), qtr("Input & Codecs Settings"),
+    ADD_CATEGORY( SPrefsInputAndCodecs, qfut(INPUT_TITLE), qtr("Input & Codecs Settings"),
                   cone_input_64, 4 );
     ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), qtr("Configure Hotkeys"),
                   cone_hotkeys_64, 5 );
@@ -681,7 +681,7 @@
             /* Caching */
             /* Add the things to the ComboBox */
             #define addToCachingBox( str, cachingNumber ) \
-                ui.cachingCombo->addItem( qtr(str), QVariant( cachingNumber ) );
+                ui.cachingCombo->addItem( qfut(str), QVariant( cachingNumber ) );
             addToCachingBox( N_("Custom"), CachingCustom );
             addToCachingBox( N_("Lowest latency"), CachingLowest );
             addToCachingBox( N_("Low latency"), CachingLow );
@@ -737,7 +737,7 @@
             ui.skinsLabel->setText(
                     qtr( "This is VLC's skinnable interface. You can download other skins at" )
                     + QString( " <a href=\"http://www.videolan.org/vlc/skins.php\">" )
-                    + qtr( "VLC skins website" )+ QString( "</a>." ) );
+                    + qtr( "VLC skins website" ) + QString( "</a>." ) );
             ui.skinsLabel->setFont( italicFont );
 
 #ifdef _WIN32

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/sout/sout_widgets.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/sout/sout_widgets.cpp Changed

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/toolbar/controlbar_profile.cpp Added

@@ -0,0 +1,225 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+#include "controlbar_profile.hpp"
+
+#include "player/control_list_model.hpp"
+#include "player/player_controlbar_model.hpp"
+
+
+decltype(ControlbarProfile::m_defaults)
+    ControlbarProfile::m_defaults =
+        {
+            {
+                PlayerControlbarModel::Mainplayer,
+                {
+                    {
+                        {
+                            ControlListModel::LANG_BUTTON,
+                            ControlListModel::MENU_BUTTON
+                        },
+                        {
+                            ControlListModel::RANDOM_BUTTON,
+                            ControlListModel::PREVIOUS_BUTTON,
+                            ControlListModel::PLAY_BUTTON,
+                            ControlListModel::NEXT_BUTTON,
+                            ControlListModel::LOOP_BUTTON
+                        },
+                        {
+                            ControlListModel::VOLUME,
+                            ControlListModel::FULLSCREEN_BUTTON
+                        }
+                    }
+                }
+            },
+            {
+                PlayerControlbarModel::Miniplayer,
+                {
+                    {
+                        {
+                            ControlListModel::ARTWORK_INFO
+                        },
+                        {
+                            ControlListModel::RANDOM_BUTTON,
+                            ControlListModel::PREVIOUS_BUTTON,
+                            ControlListModel::PLAY_BUTTON,
+                            ControlListModel::NEXT_BUTTON,
+                            ControlListModel::LOOP_BUTTON
+                        },
+                        {
+                            ControlListModel::VOLUME,
+                            ControlListModel::PLAYER_SWITCH_BUTTON
+                        }
+                    }
+                }
+            }
+        };
+
+
+ControlbarProfile::ControlbarProfile(QObject *parent) : QObject(parent)
+{
+    injectDefaults();
+}
+
+PlayerControlbarModel *ControlbarProfile::newModel(int identifier)
+{
+    if (m_models.contains(identifier))
+        return nullptr; // can not allow the same identifier
+
+    const auto model = new PlayerControlbarModel(this);
+
+    connect(model, &PlayerControlbarModel::controlListChanged, this, &ControlbarProfile::generateLinearControlList);
+
+    connect(model, &PlayerControlbarModel::dirtyChanged, this, [this](bool dirty) {
+        if (dirty)
+            ++m_dirty;
+        else
+            --m_dirty;
+
+        emit dirtyChanged( this->dirty() );
+    });
+
+    m_models.insert(identifier, model);
+
+    return model;
+}
+
+PlayerControlbarModel *ControlbarProfile::getModel(int identifier) const
+{
+    if (m_models.contains(identifier))
+    {
+        return m_models[identifier];
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
+void ControlbarProfile::setModelData(int identifier, const std::array<QVector<int>, 3> &data)
+{
+    auto ptrModel = getModel(identifier);
+
+    if (ptrModel)
+    {
+        ptrModel->loadModels(data);
+    }
+    else
+    {
+        ptrModel = newModel(identifier);
+
+        if (!ptrModel)
+            return;
+
+        ptrModel->loadModels(data);
+    }
+
+    ptrModel->setDirty(true);
+}
+
+std::array<QVector<int>, 3> ControlbarProfile::getModelData(int identifier) const
+{
+    const auto ptrModel = getModel(identifier);
+
+    if (!ptrModel)
+        return {};
+
+    return ptrModel->serializeModels();
+}
+
+void ControlbarProfile::deleteModel(int identifier)
+{
+    if (m_models.contains(identifier))
+    {
+        m_models[identifier]->deleteLater();
+        m_models.remove(identifier);
+    }
+}
+
+void ControlbarProfile::setName(const QString &name)
+{
+    if (name == m_name)
+        return;
+
+    m_name = name;
+
+    emit nameChanged(m_name);
+}
+
+bool ControlbarProfile::dirty() const
+{
+    return (m_dirty > 0);
+}
+
+QString ControlbarProfile::name() const
+{
+    return m_name;
+}
+
+void ControlbarProfile::injectDefaults(bool resetDirty)
+{
+    injectModel(m_defaults);
+
+    if (resetDirty)
+        this->resetDirty(); // defaults normally should not make the profile dirty
+}
+
+void ControlbarProfile::injectModel(const QVector<ControlbarProfile::Configuration> &modelData)
+{
+    m_pauseControlListGeneration = true;
+
+    for (const auto& i : modelData)
+    {
+        setModelData(i.identifier, i.data);
+    }
+
+    m_pauseControlListGeneration = false;
+
+    generateLinearControlList();
+}
+
+void ControlbarProfile::generateLinearControlList()
+{
+    if (m_pauseControlListGeneration)
+        return;
+

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/toolbar/controlbar_profile.hpp Added

@@ -0,0 +1,91 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+#ifndef ControlbarProfile_HPP
+#define ControlbarProfile_HPP
+
+#include <QObject>
+#include <QMap>
+#include <QVector>
+#include <array>
+
+class PlayerControlbarModel;
+
+class ControlbarProfile : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool dirty READ dirty RESET resetDirty NOTIFY dirtyChanged)
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+
+    friend class ControlbarProfileModel;
+
+public:
+    explicit ControlbarProfile(QObject *parent = nullptr);
+
+    PlayerControlbarModel* newModel(int identifier);
+    Q_INVOKABLE PlayerControlbarModel* getModel(int identifier) const;
+
+    void setModelData(int identifier, const std::array<QVector<int>, 3>& data);
+    std::array<QVector<int>, 3> getModelData(int identifier) const;
+
+    void deleteModel(int identifier);
+
+    Q_INVOKABLE void injectDefaults(bool resetDirty = true);
+
+    bool dirty() const;
+    QString name() const;
+
+public slots:
+    void resetDirty();
+    void setName(const QString& name);
+
+private:
+    // m_dirty indicates the count of PlayerControlbarModel
+    // residing in m_models which has the dirty property
+    // set true.
+    int m_dirty = 0;
+
+    QString m_name {"N/A"};
+    bool m_pauseControlListGeneration = false;
+
+    // According to benchmarks, QMap performs better than
+    // QHash when item count is less than 32.
+    // Assuming model (player) count to stay below that,
+    // QMap is used here.
+    QMap<int, PlayerControlbarModel *> m_models;
+
+    struct Configuration {
+        int identifier;
+        std::array<QVector<int>, 3> data;
+    };
+    static const QVector<Configuration> m_defaults;
+
+private:
+    void injectModel(const QVector<Configuration>& modelData);
+
+private slots:
+    void generateLinearControlList();
+
+signals:
+    void dirtyChanged(bool dirty);
+    void nameChanged(QString name);
+
+    void controlListChanged(const QVector<int>& linearControlList);
+};
+
+#endif // ControlbarProfile_HPP

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp Added

@@ -0,0 +1,718 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+#include "controlbar_profile_model.hpp"
+
+#include <QSettings>
+
+#include "qt.hpp"
+#include "controlbar_profile.hpp"
+#include "player/control_list_model.hpp"
+#include "player/player_controlbar_model.hpp"
+
+#define SETTINGS_KEY_SELECTEDPROFILE "SelectedProfile"
+#define SETTINGS_ARRAYNAME_PROFILES "Profiles"
+#define SETTINGS_KEY_NAME "Name"
+#define SETTINGS_KEY_MODEL "Model"
+
+#define SETTINGS_CONTROL_SEPARATOR ","
+#define SETTINGS_CONFIGURATION_SEPARATOR "|"
+#define SETTINGS_PROFILE_SEPARATOR "$"
+
+decltype (ControlbarProfileModel::m_defaults)
+    ControlbarProfileModel::m_defaults =
+        {
+            {
+                N_("Minimalist Style"),
+                {
+                    {
+                        PlayerControlbarModel::Mainplayer,
+                        {
+                            {
+                                {
+                                    ControlListModel::PLAY_BUTTON,
+                                    ControlListModel::WIDGET_SPACER,
+                                    ControlListModel::PREVIOUS_BUTTON,
+                                    ControlListModel::STOP_BUTTON,
+                                    ControlListModel::NEXT_BUTTON,
+                                    ControlListModel::WIDGET_SPACER,
+                                    ControlListModel::RECORD_BUTTON,
+                                    ControlListModel::WIDGET_SPACER,
+                                    ControlListModel::TELETEXT_BUTTONS,
+                                    ControlListModel::WIDGET_SPACER,
+                                    ControlListModel::PLAYLIST_BUTTON,
+                                    ControlListModel::WIDGET_SPACER,
+                                    ControlListModel::VOLUME
+                                },
+                                {
+
+                                },
+                                {
+
+                                }
+                            }
+                        }
+                    },
+                    {
+                        PlayerControlbarModel::Miniplayer,
+                        {
+                            {
+                                {
+                                    ControlListModel::PREVIOUS_BUTTON,
+                                    ControlListModel::PLAY_BUTTON,
+                                    ControlListModel::STOP_BUTTON,
+                                    ControlListModel::NEXT_BUTTON
+                                },
+                                {
+
+                                },
+                                {
+
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            {
+                N_("One-liner Style"),
+                {
+                    {
+                        PlayerControlbarModel::Mainplayer,
+                        {
+                            {
+                                {
+                                    ControlListModel::PLAY_BUTTON,
+                                    ControlListModel::WIDGET_SPACER,
+                                    ControlListModel::PREVIOUS_BUTTON,
+                                    ControlListModel::STOP_BUTTON,
+                                    ControlListModel::NEXT_BUTTON,
+                                    ControlListModel::WIDGET_SPACER,
+                                    ControlListModel::FULLSCREEN_BUTTON,
+                                    ControlListModel::PLAYLIST_BUTTON,
+                                    ControlListModel::EXTENDED_BUTTON,
+                                    ControlListModel::WIDGET_SPACER,
+                                    ControlListModel::WIDGET_SPACER,
+                                    ControlListModel::RECORD_BUTTON,
+                                    ControlListModel::SNAPSHOT_BUTTON,
+                                    ControlListModel::ATOB_BUTTON,
+                                    ControlListModel::FRAME_BUTTON
+                                },
+                                {
+                                    ControlListModel::VOLUME
+                                },
+                                {
+
+                                }
+                            }
+                        }
+                    },
+                    {
+                        PlayerControlbarModel::Miniplayer,
+                        {
+                            {
+                                {
+                                    ControlListModel::RANDOM_BUTTON,
+                                    ControlListModel::PREVIOUS_BUTTON,
+                                    ControlListModel::PLAY_BUTTON,
+                                    ControlListModel::STOP_BUTTON,
+                                    ControlListModel::NEXT_BUTTON,
+                                    ControlListModel::LOOP_BUTTON
+                                },
+                                {
+
+                                },
+                                {
+
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            {
+                N_("Simplest Style"),
+                {
+                    {
+                        PlayerControlbarModel::Mainplayer,
+                        {
+                            {
+                                {
+                                    ControlListModel::VOLUME
+                                },
+                                {
+                                    ControlListModel::PLAY_BUTTON,
+                                    ControlListModel::NEXT_BUTTON,
+                                    ControlListModel::STOP_BUTTON
+                                },
+                                {
+                                    ControlListModel::FULLSCREEN_BUTTON
+                                }
+                            }
+                        }
+                    },
+                    {
+                        PlayerControlbarModel::Miniplayer,
+                        {
+                            {
+                                {
+                                    ControlListModel::PREVIOUS_BUTTON,
+                                    ControlListModel::PLAY_BUTTON,
+                                    ControlListModel::NEXT_BUTTON
+                                },
+                                {
+
+                                },
+                                {
+
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+
+
+ControlbarProfileModel::ControlbarProfileModel(intf_thread_t *p_intf, QObject *parent)
+    : QAbstractListModel(parent),
+    m_intf(p_intf)
+{
+    assert(m_intf);
+
+    connect(this, &QAbstractListModel::rowsInserted, this, &ControlbarProfileModel::countChanged);
+    connect(this, &QAbstractListModel::rowsRemoved, this, &ControlbarProfileModel::countChanged);
+    connect(this, &QAbstractListModel::modelReset, this, &ControlbarProfileModel::countChanged);

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/toolbar/controlbar_profile_model.hpp Added

@@ -0,0 +1,110 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+#ifndef CONTROLBARPROFILEMODEL_H
+#define CONTROLBARPROFILEMODEL_H
+
+#include <QAbstractListModel>
+#include <array>
+
+#include "controlbar_profile.hpp"
+
+struct intf_thread_t;
+
+class ControlbarProfileModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int selectedProfile READ selectedProfile WRITE setSelectedProfile NOTIFY selectedProfileChanged)
+    Q_PROPERTY(ControlbarProfile* currentModel READ currentModel NOTIFY selectedProfileChanged)
+
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+
+public:
+    explicit ControlbarProfileModel(intf_thread_t *p_intf, QObject *parent = nullptr);
+
+    // Basic functionality:
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    QHash<int, QByteArray> roleNames() const override;
+
+    // Editable:
+    Q_INVOKABLE bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::DisplayRole) override;
+
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
+
+    // Add data:
+    Q_INVOKABLE bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
+
+    // Remove data:
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
+
+public:
+    enum Roles {
+        MODEL_ROLE = Qt::UserRole,
+    };
+
+    int selectedProfile() const;
+    ControlbarProfile* currentModel() const;
+
+    ControlbarProfile* cloneProfile(const ControlbarProfile* profile);
+    Q_INVOKABLE void cloneSelectedProfile(const QString& newProfileName);
+
+    Q_INVOKABLE ControlbarProfile* getProfile(int index) const;
+
+    Q_INVOKABLE ControlbarProfile* newProfile(const QString& name);
+    ControlbarProfile* newProfile();
+
+    Q_INVOKABLE void deleteSelectedProfile();
+
+public slots:
+    void save(bool clearDirty = true) const;
+    bool reload();
+
+    bool setSelectedProfile(int selectedProfile);
+
+signals:
+    void countChanged();
+    void selectedProfileChanged();
+
+    void selectedProfileControlListChanged(const QVector<int>& linearControlList);
+
+private:
+    QVector<ControlbarProfile *> m_profiles;
+
+    int m_selectedProfile = -1;
+
+    struct Profile {
+        const char* name;
+        QVector<ControlbarProfile::Configuration> modelData;
+    };
+
+    static const QVector<Profile> m_defaults;
+
+private:
+    void insertDefaults();
+
+    QString generateUniqueName(const QString& name);
+
+protected:
+    intf_thread_t *m_intf = nullptr;
+};
+
+#endif // CONTROLBARPROFILEMODEL_H

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/toolbar/qml/EditorTabButton.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/toolbar/qml/EditorTabButton.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml Changed

@@ -17,13 +17,14 @@
  *****************************************************************************/
 import QtQuick 2.11
 import QtQuick.Controls 2.4
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts 1.11
 import QtQml.Models 2.11
 
 import org.videolan.vlc 0.1
 
 import "qrc:///player/" as Player
 import "qrc:///style/"
+import "qrc:///widgets/" as Widgets
 
 Rectangle{
     id: root
@@ -33,6 +34,8 @@
 
     property alias removeInfoRectVisible: buttonList.removeInfoRectVisible
 
+    property var _viewThatContainsDrag: undefined
+
     MouseArea {
         anchors.fill: parent
         z: -1
@@ -48,252 +51,158 @@
 
         TabBar {
             id: bar
-            Layout.preferredHeight: VLCStyle.heightBar_normal
-
             z: 1
 
-            spacing: VLCStyle.dp(1) // this causes binding loop warning in Qt 5.11.3 probably due to a bug
-
-            EditorTabButton {
-                id: mainPlayerTab
-
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
+            background: Item { }
 
-                index: 0
-                text: i18n.qtr("Mainplayer")
-            }
-
-            EditorTabButton {
-                id: miniPlayerTab
+            Repeater {
+                model: PlayerListModel.model
 
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
+                delegate: EditorTabButton {
+                    anchors.top: parent.top
+                    anchors.bottom: parent.bottom
 
-                index: 1
-                text: i18n.qtr("Miniplayer")
+                    text: modelData.name
+                    readonly property int identifier: modelData.identifier
+                }
             }
         }
 
         Rectangle{
+            id: parentRectangle
+
             Layout.preferredHeight: VLCStyle.heightBar_large * 1.25
             Layout.fillWidth: true
 
-            color: VLCStyle.colors.bgAlt
+            color: "transparent"
 
             border.color: VLCStyle.colors.accent
             border.width: VLCStyle.dp(1, VLCStyle.scale)
 
-            StackLayout{
-                anchors.fill: parent
-                currentIndex: bar.currentIndex
-
-                RowLayout {
-                    Layout.preferredHeight: VLCStyle.heightBar_large * 1.25
-                    Layout.fillWidth: true
-
-                    TextMetrics {
-                        id: leftMetric
-                        text: i18n.qtr("L   E   F   T")
-                        font.pixelSize: VLCStyle.fontSize_xxlarge
-                    }
-
-                    TextMetrics {
-                        id: centerMetric
-                        text: i18n.qtr("C   E   N   T   E   R")
-                        font.pixelSize: VLCStyle.fontSize_xxlarge
-                    }
-
-                    TextMetrics {
-                        id: rightMetric
-                        text: i18n.qtr("R   I   G   H   T")
-                        font.pixelSize: VLCStyle.fontSize_xxlarge
-                    }
-
-                    EditorDNDView {
-                        id : playerBtnDND_left
-                        Layout.fillHeight: true
-
-                        Layout.fillWidth: count > 0 || (playerBtnDND_left.count === 0 && playerBtnDND_center.count === 0 && playerBtnDND_right.count === 0)
-                        Layout.minimumWidth: centerMetric.width
-                        Layout.leftMargin: VLCStyle.margin_xsmall
-                        Layout.rightMargin: VLCStyle.margin_xsmall
-
-                        model: playerControlBarModel_left
-
-                        Text {
-                            anchors.fill: parent
-
-                            text: leftMetric.text
-                            verticalAlignment: Text.AlignVCenter
-                            font.pixelSize: VLCStyle.fontSize_xxlarge
-                            color: VLCStyle.colors.menuCaption
-                            horizontalAlignment: Text.AlignHCenter
-                            visible: (parent.count === 0)
-                        }
-                    }
-
-                    Rectangle {
-                        Layout.preferredWidth: VLCStyle.margin_small
-
-                        Layout.fillHeight: true
-                        Layout.topMargin: VLCStyle.dp(1, VLCStyle.scale)
-                        Layout.bottomMargin: VLCStyle.dp(1, VLCStyle.scale)
-                        Layout.alignment: Qt.AlignVCenter
-
-                        color: VLCStyle.colors.bg
-                    }
-
-                    EditorDNDView {
-                        id : playerBtnDND_center
-                        Layout.fillHeight: true
-
-                        Layout.fillWidth: count > 0 || (playerBtnDND_left.count === 0 && playerBtnDND_center.count === 0 && playerBtnDND_right.count === 0)
-                        Layout.minimumWidth: centerMetric.width
-                        Layout.leftMargin: VLCStyle.margin_xsmall
-                        Layout.rightMargin: VLCStyle.margin_xsmall
-
-                        model: playerControlBarModel_center
-
-                        Text {
-                            anchors.fill: parent
-
-                            text: centerMetric.text
-                            verticalAlignment: Text.AlignVCenter
-                            font.pixelSize: VLCStyle.fontSize_xxlarge
-                            color: VLCStyle.colors.menuCaption
-                            horizontalAlignment: Text.AlignHCenter
-                            visible: (parent.count === 0)
-                        }
-                    }
-
-                    Rectangle {
-                        Layout.preferredWidth: VLCStyle.margin_small
-
-                        Layout.fillHeight: true
-                        Layout.topMargin: VLCStyle.dp(1, VLCStyle.scale)
-                        Layout.bottomMargin: VLCStyle.dp(1, VLCStyle.scale)
-                        Layout.alignment: Qt.AlignVCenter
-
-                        color: VLCStyle.colors.bg
-                    }
-
-                    EditorDNDView {
-                        id : playerBtnDND_right
-                        Layout.fillHeight: true
-
-                        Layout.fillWidth: count > 0 || (playerBtnDND_left.count === 0 && playerBtnDND_center.count === 0 && playerBtnDND_right.count === 0)
-                        Layout.minimumWidth: centerMetric.width
-                        Layout.leftMargin: VLCStyle.margin_xsmall
-                        Layout.rightMargin: VLCStyle.margin_xsmall
-
-                        model: playerControlBarModel_right
-
-                        Text {
-                            anchors.fill: parent
-
-                            text: rightMetric.text
-                            verticalAlignment: Text.AlignVCenter
-                            font.pixelSize: VLCStyle.fontSize_xxlarge
-                            color: VLCStyle.colors.menuCaption
-                            horizontalAlignment: Text.AlignHCenter
-                            visible: (parent.count === 0)
-                        }
-                    }
-                }
-
-                RowLayout {
-                    Layout.preferredHeight: VLCStyle.heightBar_large * 1.25
-                    Layout.fillWidth: true
-
-                    EditorDNDView {

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml Changed

@@ -23,18 +23,19 @@
 import org.videolan.vlc 0.1
 
 import "qrc:///style/"
+import "qrc:///widgets/" as Widgets
 
 GridView{
     id: allButtonsView
     clip: true
 
-    highlight: Rectangle{
-        color: VLCStyle.colors.bgHover
-    }
-    ScrollBar.vertical: ScrollBar {}
+    ScrollBar.vertical: ScrollBar { policy: ScrollBar.AlwaysOn }
     model: controlButtons.buttonL.length
 
-    highlightMoveDuration: 0 //ms
+    highlightFollowsCurrentItem: false
+
+    cellWidth: VLCStyle.cover_small
+    cellHeight: cellWidth
 
     property alias removeInfoRectVisible: removeInfoRect.visible
 
@@ -105,8 +106,8 @@
         id:dragArea
         objectName: "buttonsList"
         hoverEnabled: true
-        width: VLCStyle.cover_small
-        height: width
+        width: cellWidth
+        height: cellHeight
 
         property bool held: false
         property int mIndex: controlButtons.buttonL[model.index].id
@@ -135,6 +136,15 @@
 
         onEntered: allButtonsView.currentIndex = index
 
+        Loader {
+            active: allButtonsView.currentIndex === index
+            anchors.fill: parent
+
+            sourceComponent: Rectangle {
+                color: VLCStyle.colors.bgHover
+            }
+        }
+
         ColumnLayout{
             id: listelemlayout
             anchors.fill: parent
@@ -146,15 +156,15 @@
                 Layout.alignment: Qt.AlignHCenter
                 text: controlButtons.buttonL[model.index].label
             }
-            Text {
+
+            Widgets.ListSubtitleLabel {
                 id: buttonName
                 Layout.fillWidth: true
                 Layout.fillHeight: true
+
+                elide: Text.ElideNone
                 text: controlButtons.buttonL[model.index].text
-                font.pointSize: VLCStyle.fontHeight_xsmall
-                color: VLCStyle.colors.buttonText
                 wrapMode: Text.WordWrap
-                verticalAlignment: Text.AlignVCenter
                 horizontalAlignment: Text.AlignHCenter
             }
         }

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml Added

@@ -0,0 +1,171 @@
+/*****************************************************************************
+ * 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 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.11
+
+import "qrc:///widgets/" as Widgets
+import "qrc:///style/"
+
+import org.videolan.vlc 0.1
+
+WindowDialog {
+    id: root
+
+    width: 800
+    height: 600
+
+    modal: true
+    title: i18n.qtr("Toolbar Editor")
+
+    signal unload()
+
+    Component.onCompleted: {
+        // Save first, in case the dialog is rejected.
+        mainInterface.controlbarProfileModel.save(false)
+    }
+
+    onAccepted: {
+        mainInterface.controlbarProfileModel.save()
+        unload()
+    }
+
+    onRejected: {
+        // Load saved to discard the changes
+        mainInterface.controlbarProfileModel.reload()
+        unload()
+    }
+
+    function _markDirty(text) {
+        return (text += " *")
+    }
+
+    contentComponent: Item {
+        ColumnLayout {
+            anchors.fill: parent
+
+            RowLayout {
+                Widgets.MenuLabel {
+                    Layout.fillWidth: true
+
+                    text: i18n.qtr("Select profile:")
+                }
+
+                Widgets.ComboBoxExt {
+                    id: comboBox
+                    font.pixelSize: VLCStyle.fontSize_normal
+
+                    width: VLCStyle.combobox_width_large
+                    height: VLCStyle.combobox_height_normal
+
+                    delegate: ItemDelegate {
+                        width: comboBox.width
+                        leftPadding: comboBox.leftPadding
+                        background: Item {}
+                        contentItem: Text {
+                            text: model.dirty ? _markDirty(model.name)
+                                              : model.name
+                            color: comboBox.color
+                            font: comboBox.font
+                            elide: Text.ElideRight
+                            verticalAlignment: Text.AlignVCenter
+                        }
+                        highlighted: (comboBox.highlightedIndex === index)
+                    }
+
+                    displayText: {
+                        var text
+
+                        if (!!mainInterface.controlbarProfileModel.currentModel)
+                            text = mainInterface.controlbarProfileModel.currentModel.name
+                        else {
+                            text = "N/A"
+                            return text
+                        }
+
+                        if (mainInterface.controlbarProfileModel.currentModel.dirty)
+                            return _markDirty(text)
+                        else
+                            return text
+                    }
+
+                    model: mainInterface.controlbarProfileModel
+
+                    currentIndex: mainInterface.controlbarProfileModel.selectedProfile
+
+                    onCurrentIndexChanged: {
+                        mainInterface.controlbarProfileModel.selectedProfile = currentIndex
+                    }
+
+                    Accessible.name: i18n.qtr("Profiles")
+                }
+
+                Widgets.IconToolButton {
+                    text: i18n.qtr("New Profile")
+                    iconText: VLCIcons.profile_new
+
+                    onClicked: {
+                        var npDialog = dialogProvider.getTextDialog(null,
+                                                                    i18n.qtr("Profile Name"),
+                                                                    i18n.qtr("Please enter the new profile name:"),
+                                                                    i18n.qtr("Profile %1").arg(comboBox.count + 1))
+                        if (!npDialog.ok)
+                            return
+
+                        mainInterface.controlbarProfileModel.cloneSelectedProfile(npDialog.text)
+                        mainInterface.controlbarProfileModel.selectedProfile = (mainInterface.controlbarProfileModel.rowCount() - 1)
+                    }
+
+                    ToolTip.visible: hovered
+                }
+
+                Widgets.IconToolButton {
+                    id: useDefaultButton
+
+                    text: i18n.qtr("Use Default")
+                    iconText: VLCIcons.history
+
+                    onClicked: {
+                        mainInterface.controlbarProfileModel.currentModel.injectDefaults(false)
+                    }
+
+                    ToolTip.visible: hovered
+                }
+
+                Widgets.IconToolButton {
+                    text: i18n.qtr("Delete the current profile")
+                    iconText: VLCIcons.del
+
+                    onClicked: {
+                          mainInterface.controlbarProfileModel.deleteSelectedProfile()
+                    }
+
+                    ToolTip.visible: hovered
+                }
+            }
+
+            // The main context of the toolbareditor dialog:
+            ToolbarEditor {
+                id: toolbarEditor
+
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+            }
+        }
+    }
+}

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/dialogs/vlm/vlm.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/dialogs/vlm/vlm.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/maininterface/main_interface.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/maininterface/main_interface.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/maininterface/main_interface.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/maininterface/main_interface.hpp Changed

@@ -59,6 +59,7 @@
 class StandardPLPanel;
 struct vout_window_t;
 class VideoSurfaceProvider;
+class ControlbarProfileModel;
 
 class WindowStateHolder : public QObject
 {
@@ -159,6 +160,8 @@
     Q_PROPERTY(bool hasToolbarMenu READ hasToolbarMenu NOTIFY hasToolbarMenuChanged)
     Q_PROPERTY(bool canShowVideoPIP READ canShowVideoPIP CONSTANT)
     Q_PROPERTY(bool pinVideoControls READ pinVideoControls WRITE setPinVideoControls NOTIFY pinVideoControlsChanged)
+    Q_PROPERTY(ControlbarProfileModel* controlbarProfileModel READ controlbarProfileModel CONSTANT)
+
 
 public:
     /* tors */
@@ -207,6 +210,7 @@
     inline bool canShowVideoPIP() const { return m_canShowVideoPIP; }
     inline void setCanShowVideoPIP(bool canShowVideoPIP) { m_canShowVideoPIP = canShowVideoPIP; }
     inline bool pinVideoControls() const { return m_pinVideoControls; }
+    inline ControlbarProfileModel* controlbarProfileModel() const { return m_controlbarProfileModel; }
 
     bool hasEmbededVideo() const;
     VideoSurfaceProvider* getVideoSurfaceProvider() const;
@@ -290,6 +294,8 @@
 
     VLCVarChoiceModel* m_extraInterfaces;
 
+    ControlbarProfileModel* m_controlbarProfileModel;
+
 public slots:
     void toggleUpdateSystrayMenu();
     void showUpdateSystrayMenu();
@@ -341,7 +347,6 @@
     void interfaceAlwaysOnTopChanged(bool);
     void interfaceFullScreenChanged(bool);
     void hasEmbededVideoChanged(bool);
-    void toolBarConfUpdated();
     void showRemainingTimeChanged(bool);
     void gridViewChanged( bool );
     void colorSchemeChanged( QString );

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/maininterface/mainui.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/maininterface/mainui.cpp Changed

@@ -13,12 +13,17 @@
 #include "medialibrary/mlrecentsmodel.hpp"
 #include "medialibrary/mlrecentsvideomodel.hpp"
 #include "medialibrary/mlfoldersmodel.hpp"
+#include "medialibrary/mlgrouplistmodel.hpp"
 #include "medialibrary/mlplaylistlistmodel.hpp"
 #include "medialibrary/mlplaylistmodel.hpp"
 #include "medialibrary/mlplaylist.hpp"
 
 #include "player/player_controller.hpp"
-#include "player/playercontrolbarmodel.hpp"
+#include "player/player_controlbar_model.hpp"
+#include "player/control_list_model.hpp"
+
+#include "dialogs/toolbar/controlbar_profile_model.hpp"
+#include "dialogs/toolbar/controlbar_profile.hpp"
 
 #include "playlist/playlist_model.hpp"
 #include "playlist/playlist_controller.hpp"
@@ -45,6 +50,8 @@
 
 #include "menus/qml_menu_wrapper.hpp"
 
+#include "widgets/native/roundimage.hpp"
+
 #include "videosurface.hpp"
 
 #include <QQuickWindow>
@@ -176,6 +183,7 @@
         qmlRegisterType<MLUrlModel>( "org.videolan.medialib", 0, 1, "MLUrlModel" );
         qmlRegisterType<MLVideoModel>( "org.videolan.medialib", 0, 1, "MLVideoModel" );
         qmlRegisterType<MLRecentsVideoModel>( "org.videolan.medialib", 0, 1, "MLRecentsVideoModel" );
+        qmlRegisterType<MLGroupListModel>( "org.videolan.medialib", 0, 1, "MLGroupListModel" );
         qmlRegisterType<MLPlaylistListModel>( "org.videolan.medialib", 0, 1, "MLPlaylistListModel" );
         qmlRegisterType<MLPlaylistModel>( "org.videolan.medialib", 0, 1, "MLPlaylistModel" );
 
@@ -200,6 +208,7 @@
         qmlRegisterType<AlbumTrackContextMenu>( "org.videolan.medialib", 0, 1, "AlbumTrackContextMenu" );
         qmlRegisterType<URLContextMenu>( "org.videolan.medialib", 0, 1, "URLContextMenu" );
         qmlRegisterType<VideoContextMenu>( "org.videolan.medialib", 0, 1, "VideoContextMenu" );
+        qmlRegisterType<GroupListContextMenu>( "org.videolan.medialib", 0, 1, "GroupListContextMenu" );
         qmlRegisterType<PlaylistListContextMenu>( "org.videolan.medialib", 0, 1, "PlaylistListContextMenu" );
         qmlRegisterType<PlaylistMediaContextMenu>( "org.videolan.medialib", 0, 1, "PlaylistMediaContextMenu" );
     }
@@ -235,7 +244,12 @@
 
     qmlRegisterType<QmlEventFilter>( "org.videolan.vlc", 0, 1, "EventFilter" );
 
-    qmlRegisterType<PlayerControlBarModel>( "org.videolan.vlc", 0, 1, "PlayerControlBarModel");
+    qRegisterMetaType<ControlbarProfile*>();
+    qRegisterMetaType<ControlbarProfileModel*>();
+    qmlRegisterUncreatableType<ControlbarProfile>("org.videolan.vlc", 0, 1, "ControlbarProfile", "");
+    qmlRegisterUncreatableType<PlayerControlbarModel>("org.videolan.vlc", 0, 1, "PlayerControlbarModel", "");
+    qmlRegisterUncreatableType<ControlListModel>( "org.videolan.vlc", 0, 1, "ControlListModel", "" );
+    qmlRegisterSingletonType("org.videolan.vlc", 0, 1, "PlayerListModel", PlayerControlbarModel::getPlaylistIdentifierListModel);
 
     qRegisterMetaType<QmlMainContext*>();
     qmlRegisterType<QmlGlobalMenu>( "org.videolan.vlc", 0, 1, "QmlGlobalMenu" );
@@ -245,6 +259,9 @@
     qmlRegisterType<PlaylistContextMenu>( "org.videolan.vlc", 0, 1, "PlaylistContextMenu" );
     qmlRegisterType<SortFilterProxyModel>( "org.videolan.vlc", 0, 1, "SortFilterProxyModel" );
 
+    // Custom controls
+    qmlRegisterType<RoundImage>( "org.videolan.controls", 0, 1, "RoundImage" );
+
     qRegisterMetaType<QList<QQmlError>>("QList<QQmlError>");
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/maininterface/qml/BannerSources.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/maininterface/qml/BannerSources.qml Changed

@@ -27,6 +27,7 @@
 import "qrc:///widgets/" as Widgets
 import "qrc:///menus/" as Menus
 import "qrc:///util/KeyHelper.js" as KeyHelper
+import "qrc:///util/Helpers.js" as Helpers
 
 Widgets.NavigableFocusScope {
     id: root
@@ -176,12 +177,25 @@
                 }
             }
 
-            Item {
+            Widgets.NavigableFocusScope {
                 id: localToolbar
 
                 width: parent.width
                 height: VLCStyle.localToolbar_height
 
+                onActiveFocusChanged: {
+                    if (activeFocus) {
+                        // sometimes when view changes, one of the "focusable" object will become disabled
+                        // but because of focus chainning, FocusScope still tries to force active focus on the object
+                        // but that will fail, manually assign focus in such cases
+                        var focusable = [localContextGroup, localMenuGroup, playlistGroup]
+                        if (!focusable.some(function (obj) { return obj.activeFocus; })) {
+                            // no object has focus
+                            localToolbar.nextItemInFocusChain(true).forceActiveFocus()
+                        }
+                    }
+                }
+
                 Rectangle {
                     id: localToolbarBg
                     color: VLCStyle.colors.bg
@@ -309,17 +323,14 @@
 
                         focus: !!item && item.focus && item.visible
                         visible: !!item
+                        enabled: status === Loader.Ready
                         y: (VLCStyle.localToolbar_height - item.height) / 2
                         width: !!item
-                               ? clamp(localMenuView.availableWidth
-                                       , localMenuGroup.item.minimumWidth || localMenuGroup.item.implicitWidth
-                                       , localMenuGroup.item.maximumWidth || localMenuGroup.item.implicitWidth)
+                               ? Helpers.clamp(localMenuView.availableWidth,
+                                               localMenuGroup.item.minimumWidth || localMenuGroup.item.implicitWidth,
+                                               localMenuGroup.item.maximumWidth || localMenuGroup.item.implicitWidth)
                                : 0
 
-                        function clamp(num, min, max) {
-                          return num <= min ? min : num >= max ? max : num;
-                        }
-
                         onVisibleChanged: {
                             //reset the focus on the global group when the local group is hidden,
                             //this avoids losing the focus if the subview changes

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/maininterface/qml/MainDisplay.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/maininterface/qml/MainDisplay.qml Changed

@@ -25,6 +25,7 @@
 import "qrc:///main/" as Main
 import "qrc:///widgets/" as Widgets
 import "qrc:///util/KeyHelper.js" as KeyHelper
+import "qrc:///util/Helpers.js" as Helpers
 import "qrc:///playlist/" as PL
 import "qrc:///player/" as Player
 
@@ -253,9 +254,9 @@
                                 name: "expanded"
                                 PropertyChanges {
                                     target: playlistColumn
-                                    width: resizeHandle.clamp(root.width / resizeHandle.widthFactor,
-                                                              playlist.minimumWidth,
-                                                              root.width / 2)
+                                    width: Helpers.clamp(root.width / resizeHandle.widthFactor,
+                                                         playlist.minimumWidth,
+                                                         root.width / 2)
                                     visible: true
                                 }
                             },

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlalbum.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlalbum.cpp Changed

@@ -28,31 +28,10 @@
     , m_cover       ( QString::fromUtf8( _data->thumbnails[VLC_ML_THUMBNAIL_SMALL].psz_mrl ) )
     , m_mainArtist  ( QString::fromUtf8( _data->psz_artist ) )
     , m_nbTracks    ( _data->i_nb_tracks )
+    , m_duration    ( _data->i_duration )
 {
     assert( _data );
     assert( _ml );
-
-    int t_sec = _data->i_duration / 1000;
-    int sec = t_sec % 60;
-    int min = (t_sec / 60) % 60;
-    int hour = t_sec / 3600;
-    if (hour == 0)
-    {
-        m_duration = QString("%1:%2")
-                .arg(min, 2, 10, QChar('0'))
-                .arg(sec, 2, 10, QChar('0'));
-        m_durationShort = m_duration;
-    }
-    else
-    {
-        m_duration = QString("%1:%2:%3")
-                .arg(hour, 2, 10, QChar('0'))
-                .arg(min, 2, 10, QChar('0'))
-                .arg(sec, 2, 10, QChar('0'));
-        m_durationShort = QString("%1h%2")
-                .arg(hour)
-                .arg(min, 2, 10, QChar('0'));
-    }
 }
 
 QString MLAlbum::getTitle() const
@@ -86,16 +65,11 @@
     return m_nbTracks;
 }
 
-QString MLAlbum::getDuration() const
+int64_t MLAlbum::getDuration() const
 {
     return m_duration;
 }
 
-QString MLAlbum::getDurationShort() const
-{
-    return m_durationShort;
-}
-
 QString MLAlbum::getPresName() const
 {
     return m_title;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlalbum.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlalbum.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlalbummodel.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlalbummodel.cpp Changed

@@ -24,8 +24,7 @@
     {"release_year", VLC_ML_SORTING_RELEASEDATE},
     {"main_artist", VLC_ML_SORTING_ARTIST},
     //{"nb_tracks"},
-    {"duration", VLC_ML_SORTING_DURATION},
-    {"duration_short", VLC_ML_SORTING_DURATION}
+    {"duration", VLC_ML_SORTING_DURATION}
 };
 
 MLAlbumModel::MLAlbumModel(QObject *parent)
@@ -60,8 +59,6 @@
         return QVariant::fromValue( ml_item->getNbTracks() );
     case ALBUM_DURATION:
         return QVariant::fromValue( ml_item->getDuration() );
-    case ALBUM_DURATION_SHORT:
-        return QVariant::fromValue( ml_item->getDurationShort() );
     case ALBUM_TITLE_FIRST_SYMBOL:
         return QVariant::fromValue( getFirstSymbol( ml_item->getTitle() ) );
     case ALBUM_MAIN_ARTIST_FIRST_SYMBOL:
@@ -82,7 +79,6 @@
         {ALBUM_MAIN_ARTIST, "main_artist"},
         {ALBUM_NB_TRACKS, "nb_tracks"},
         {ALBUM_DURATION, "duration"},
-        {ALBUM_DURATION_SHORT, "duration_short"},
         {ALBUM_TITLE_FIRST_SYMBOL, "title_first_symbol"},
         {ALBUM_MAIN_ARTIST_FIRST_SYMBOL, "main_artist_first_symbol"}
     };
@@ -139,7 +135,6 @@
     case ALBUM_MAIN_ARTIST :
         return VLC_ML_SORTING_ARTIST;
     case ALBUM_DURATION:
-    case ALBUM_DURATION_SHORT:
         return VLC_ML_SORTING_DURATION;
     default:
         return VLC_ML_SORTING_DEFAULT;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlalbummodel.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlalbummodel.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlalbumtrack.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlalbumtrack.cpp Changed

@@ -25,33 +25,12 @@
     , MLItem       ( MLItemId( _data->i_id, VLC_ML_PARENT_UNKNOWN ) )
     , m_title      ( QString::fromUtf8( _data->psz_title ) )
     , m_trackNumber( _data->album_track.i_track_nb )
-    , m_discNumber( _data->album_track.i_disc_nb )
+    , m_discNumber ( _data->album_track.i_disc_nb )
+    , m_duration   ( _data->i_duration )
 {
     assert( _data );
     assert( _data->i_type == VLC_ML_MEDIA_TYPE_AUDIO );
 
-    int t_sec = _data->i_duration / 1000;
-    int sec = t_sec % 60;
-    int min = (t_sec / 60) % 60;
-    int hour = t_sec / 3600;
-    if (hour == 0)
-    {
-        m_duration = QString("%1:%2")
-                .arg(min, 2, 10, QChar('0'))
-                .arg(sec, 2, 10, QChar('0'));
-        m_durationShort = m_duration;
-    }
-    else
-    {
-        m_duration = QString("%1:%2:%3")
-                .arg(hour, 2, 10, QChar('0'))
-                .arg(min, 2, 10, QChar('0'))
-                .arg(sec, 2, 10, QChar('0'));
-        m_durationShort = QString("%1h%2")
-                .arg(hour)
-                .arg(min, 2, 10, QChar('0'));
-    }
-
     for( const vlc_ml_file_t& file: ml_range_iterate<vlc_ml_file_t>( _data->p_files ) )
         if( file.i_type == VLC_ML_FILE_TYPE_MAIN )
         {
@@ -112,16 +91,11 @@
     return m_discNumber;
 }
 
-QString MLAlbumTrack::getDuration() const
+int64_t MLAlbumTrack::getDuration() const
 {
     return m_duration;
 }
 
-QString MLAlbumTrack::getDurationShort() const
-{
-    return m_durationShort;
-}
-
 QString MLAlbumTrack::getMRL() const
 {
     return m_mrl;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlalbumtrack.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlalbumtrack.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp Changed

@@ -25,8 +25,7 @@
     {"track_number", VLC_ML_SORTING_TRACKNUMBER},
     {"release_year", VLC_ML_SORTING_RELEASEDATE},
     {"main_artist", VLC_ML_SORTING_ARTIST},
-    {"duration", VLC_ML_SORTING_DURATION},
-    {"duration_short", VLC_ML_SORTING_DURATION}
+    {"duration", VLC_ML_SORTING_DURATION}
 };
 
 MLAlbumTrackModel::MLAlbumTrackModel(QObject *parent)
@@ -58,8 +57,6 @@
         return QVariant::fromValue( ml_track->getDiscNumber() );
     case TRACK_DURATION :
         return QVariant::fromValue( ml_track->getDuration() );
-    case TRACK_DURATION_SHORT :
-        return QVariant::fromValue( ml_track->getDurationShort() );
     case TRACK_ALBUM:
         return QVariant::fromValue( ml_track->getAlbumTitle() );
     case TRACK_ARTIST:
@@ -84,7 +81,6 @@
         { TRACK_NUMBER, "track_number" },
         { TRACK_DISC_NUMBER, "disc_number" },
         { TRACK_DURATION, "duration" },
-        { TRACK_DURATION_SHORT, "duration_short" },
         { TRACK_ALBUM, "album_title"},
         { TRACK_ARTIST, "main_artist"},
         { TRACK_TITLE_FIRST_SYMBOL, "title_first_symbol"},
@@ -101,7 +97,6 @@
     case TRACK_NUMBER :
         return VLC_ML_SORTING_TRACKNUMBER;
     case TRACK_DURATION :
-    case TRACK_DURATION_SHORT :
         return VLC_ML_SORTING_DURATION;
     default:
         return VLC_ML_SORTING_DEFAULT;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlalbumtrackmodel.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlalbumtrackmodel.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlbasemodel.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlbasemodel.cpp Changed

@@ -52,16 +52,29 @@
     endResetModel();
 }
 
-QMap<QString, QVariant> MLBaseModel::getDataAt(int idx)
+//-------------------------------------------------------------------------------------------------
+
+/* Q_INVOKABLE */ QMap<QString, QVariant> MLBaseModel::getDataAt(const QModelIndex & index)
 {
     QMap<QString, QVariant> dataDict;
-    QHash<int,QByteArray> roles = roleNames();
-    for (auto role: roles.keys()) {
-        dataDict[roles[role]] = data(index(idx), role);
+
+    QHash<int, QByteArray> roles = roleNames();
+
+    for (int role: roles.keys())
+    {
+        dataDict[roles[role]] = data(index, role);
     }
+
     return dataDict;
 }
 
+/* Q_INVOKABLE */ QMap<QString, QVariant> MLBaseModel::getDataAt(int idx)
+{
+    return getDataAt(index(idx));
+}
+
+//-------------------------------------------------------------------------------------------------
+
 void MLBaseModel::onResetRequested()
 {
     beginResetModel();
@@ -130,6 +143,12 @@
             break;
         }
     }
+
+    if (m_mediaLib && m_mediaLib->idle() && m_need_reset)
+    {
+        emit resetRequested();
+        m_need_reset = false;
+    }
 }
 
 QString MLBaseModel::getFirstSymbol(QString str)

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlbasemodel.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlbasemodel.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlevent.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlevent.hpp Changed

@@ -71,6 +71,9 @@
             case VLC_ML_EVENT_ALBUM_ADDED:
                 creation.i_entity_id = event->creation.p_album->i_id;
                 break;
+            case VLC_ML_EVENT_GROUP_ADDED:
+                creation.i_entity_id = event->creation.p_group->i_id;
+                break;
             case VLC_ML_EVENT_PLAYLIST_ADDED:
                 creation.i_entity_id = event->creation.p_playlist->i_id;
                 break;
@@ -83,6 +86,7 @@
             case VLC_ML_EVENT_MEDIA_UPDATED:
             case VLC_ML_EVENT_ARTIST_UPDATED:
             case VLC_ML_EVENT_ALBUM_UPDATED:
+            case VLC_ML_EVENT_GROUP_UPDATED:
             case VLC_ML_EVENT_PLAYLIST_UPDATED:
             case VLC_ML_EVENT_GENRE_UPDATED:
             case VLC_ML_EVENT_BOOKMARKS_UPDATED:
@@ -91,6 +95,7 @@
             case VLC_ML_EVENT_MEDIA_DELETED:
             case VLC_ML_EVENT_ARTIST_DELETED:
             case VLC_ML_EVENT_ALBUM_DELETED:
+            case VLC_ML_EVENT_GROUP_DELETED:
             case VLC_ML_EVENT_PLAYLIST_DELETED:
             case VLC_ML_EVENT_GENRE_DELETED:
             case VLC_ML_EVENT_BOOKMARKS_DELETED:

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlgroup.cpp Added

@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * Copyright (C) 2021 VLC authors and VideoLAN
+ *
+ * Authors: Benjamin Arnaud <bunjee@omega.gg>
+ *
+ * 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 "mlgroup.hpp"
+
+// VLC includes
+#include <vlc_media_library.h>
+#include "qt.hpp"
+
+//-------------------------------------------------------------------------------------------------
+// Ctor / dtor
+//-------------------------------------------------------------------------------------------------
+
+MLGroup::MLGroup(vlc_medialibrary_t * ml, const vlc_ml_group_t * data, QObject * parent)
+    : QObject(parent)
+    , MLItem(MLItemId(data->i_id, VLC_ML_PARENT_GROUP))
+    , m_ml(ml)
+    , m_name(qfu(data->psz_name))
+    , m_duration(data->i_duration)
+    , m_date(data->i_creation_date)
+    , m_count(data->i_nb_total_media)
+{
+    assert(data);
+}
+
+//-------------------------------------------------------------------------------------------------
+// Interface
+//-------------------------------------------------------------------------------------------------
+
+QString MLGroup::getName() const
+{
+    return m_name;
+}
+
+QString MLGroup::getThumbnail()
+{
+    return QString();
+}
+
+int64_t MLGroup::getDuration() const
+{
+    return m_duration;
+}
+
+unsigned int MLGroup::getDate() const
+{
+    return m_date;
+}
+
+unsigned int MLGroup::getCount() const
+{
+    return m_count;
+}

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlgroup.hpp Added

@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Copyright (C) 2021 VLC authors and VideoLAN
+ *
+ * Authors: Benjamin Arnaud <bunjee@omega.gg>
+ *
+ * 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 MLGROUP_HPP
+#define MLGROUP_HPP
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+// MediaLibrary includes
+#include "mlqmltypes.hpp"
+
+// Qt includes
+#include <QObject>
+
+class MLGroup : public QObject, public MLItem
+{
+    Q_OBJECT
+
+public:
+    MLGroup(vlc_medialibrary_t * ml, const vlc_ml_group_t * data, QObject * parent = nullptr);
+
+public: // Interface
+    QString getName() const;
+
+    QString getThumbnail();
+
+    int64_t getDuration() const;
+
+    unsigned int getDate() const;
+
+    unsigned int getCount() const;
+
+private:
+    vlc_medialibrary_t * m_ml;
+
+    QString m_name;
+
+    int64_t m_duration;
+
+    unsigned int m_date;
+
+    unsigned int m_count;
+};
+
+#endif

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlgrouplistmodel.cpp Added

@@ -0,0 +1,287 @@
+/*****************************************************************************
+ * Copyright (C) 2021 VLC authors and VideoLAN
+ *
+ * Authors: Benjamin Arnaud <bunjee@omega.gg>
+ *
+ * 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.
+ *****************************************************************************/
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "mlgrouplistmodel.hpp"
+
+// VLC includes
+#include <vlc_media_library.h>
+
+// MediaLibrary includes
+#include "mlhelper.hpp"
+#include "mlgroup.hpp"
+#include "mlvideo.hpp"
+
+//-------------------------------------------------------------------------------------------------
+// Static variables
+
+static const QHash<QByteArray, vlc_ml_sorting_criteria_t> criterias =
+{
+    {"id",   VLC_ML_SORTING_DEFAULT},
+    {"name", VLC_ML_SORTING_ALPHA},
+    {"date", VLC_ML_SORTING_INSERTIONDATE}
+};
+
+//=================================================================================================
+// MLGroupListModel
+//=================================================================================================
+
+/* explicit */ MLGroupListModel::MLGroupListModel(vlc_medialibrary_t * ml, QObject * parent)
+    : MLBaseModel(parent)
+{
+    m_ml = ml;
+}
+
+/* explicit */ MLGroupListModel::MLGroupListModel(QObject * parent)
+    : MLBaseModel(parent) {}
+
+//-------------------------------------------------------------------------------------------------
+// QAbstractItemModel implementation
+//-------------------------------------------------------------------------------------------------
+
+QHash<int, QByteArray> MLGroupListModel::roleNames() const /* override */
+{
+    return
+    {
+        { GROUP_ID,                 "id"                 },
+        { GROUP_NAME,               "name"               },
+        { GROUP_THUMBNAIL,          "thumbnail"          },
+        { GROUP_DURATION,           "duration"           },
+        { GROUP_DATE,               "date"               },
+        { GROUP_COUNT,              "count"              },
+        // NOTE: Media specific.
+        { GROUP_TITLE,              "title"              },
+        { GROUP_RESOLUTION,         "resolution_name"    },
+        { GROUP_CHANNEL,            "channel"            },
+        { GROUP_MRL,                "mrl"                },
+        { GROUP_MRL_DISPLAY,        "display_mrl"        },
+        { GROUP_PROGRESS,           "progress"           },
+        { GROUP_PLAYCOUNT,          "playcount"          },
+        { GROUP_VIDEO_TRACK,        "videoDesc"          },
+        { GROUP_AUDIO_TRACK,        "audioDesc"          },
+        { GROUP_TITLE_FIRST_SYMBOL, "title_first_symbol" }
+    };
+}
+
+QVariant MLGroupListModel::data(const QModelIndex & index, int role) const /* override */
+{
+
+    MLItem * item = this->item(index.row());
+
+    if (item == nullptr)
+        return QVariant();
+
+    if (item->getId().type == VLC_ML_PARENT_GROUP)
+    {
+        MLGroup * group = static_cast<MLGroup *> (item);
+
+        switch (role)
+        {
+            // NOTE: This is the condition for QWidget view(s).
+            case Qt::DisplayRole:
+                if (index.column() == 0)
+                    return QVariant::fromValue(group->getName());
+                else
+                    return QVariant();
+            // NOTE: These are the conditions for QML view(s).
+            case GROUP_ID:
+                return QVariant::fromValue(group->getId());
+            case GROUP_NAME:
+                return QVariant::fromValue(group->getName());
+            case GROUP_THUMBNAIL:
+                return QVariant::fromValue(group->getThumbnail());
+            case GROUP_DURATION:
+                return QVariant::fromValue(group->getDuration());
+            case GROUP_DATE:
+                return QVariant::fromValue(group->getDate());
+            case GROUP_COUNT:
+                return QVariant::fromValue(group->getCount());
+            default:
+                return QVariant();
+        }
+    }
+    else
+    {
+        MLVideo * video = static_cast<MLVideo *> (item);
+
+        switch (role)
+        {
+            // NOTE: This is the condition for QWidget view(s).
+            case Qt::DisplayRole:
+                if (index.column() == 0)
+                    return QVariant::fromValue(video->getTitle());
+                else
+                    return QVariant();
+            // NOTE: These are the conditions for QML view(s).
+            case GROUP_ID:
+                return QVariant::fromValue(video->getId());
+            case GROUP_NAME:
+                return QVariant::fromValue(video->getTitle());
+            case GROUP_THUMBNAIL:
+                return QVariant::fromValue(video->getThumbnail());
+            case GROUP_DURATION:
+                return QVariant::fromValue(video->getDuration());
+            case GROUP_DATE:
+                return QVariant();
+            case GROUP_COUNT:
+                return 1;
+            // NOTE: Media specific.
+            case GROUP_TITLE:
+                return QVariant::fromValue(video->getTitle());
+            case GROUP_RESOLUTION:
+                return QVariant::fromValue(video->getResolutionName());
+            case GROUP_CHANNEL:
+                return QVariant::fromValue(video->getChannel());
+            case GROUP_MRL:
+                return QVariant::fromValue(video->getMRL());
+            case GROUP_MRL_DISPLAY:
+                return QVariant::fromValue(video->getDisplayMRL());
+            case GROUP_PROGRESS:
+                return QVariant::fromValue(video->getProgress());
+            case GROUP_PLAYCOUNT:
+                return QVariant::fromValue(video->getPlayCount());
+            case GROUP_VIDEO_TRACK:
+                return QVariant::fromValue(video->getVideoDesc());
+            case GROUP_AUDIO_TRACK:
+                return QVariant::fromValue(video->getAudioDesc());
+            case GROUP_TITLE_FIRST_SYMBOL:
+                return QVariant::fromValue(getFirstSymbol(video->getTitle()));
+            default:
+                return QVariant();
+        }
+    }
+}
+
+//-------------------------------------------------------------------------------------------------
+// Protected MLBaseModel implementation
+//-------------------------------------------------------------------------------------------------
+
+vlc_ml_sorting_criteria_t MLGroupListModel::roleToCriteria(int role) const /* override */
+{
+    switch (role)
+    {
+        case GROUP_NAME:
+            return VLC_ML_SORTING_ALPHA;
+        case GROUP_DATE:
+            return VLC_ML_SORTING_INSERTIONDATE;
+        default:
+            return VLC_ML_SORTING_DEFAULT;
+    }
+}
+
+vlc_ml_sorting_criteria_t MLGroupListModel::nameToCriteria(QByteArray name) const /* override */
+{
+    return criterias.value(name, VLC_ML_SORTING_DEFAULT);
+}
+
+QByteArray MLGroupListModel::criteriaToName(vlc_ml_sorting_criteria_t criteria) const
+/* override */
+{

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlgrouplistmodel.hpp Added

@@ -0,0 +1,91 @@
+/*****************************************************************************
+ * Copyright (C) 2021 VLC authors and VideoLAN
+ *
+ * Authors: Benjamin Arnaud <bunjee@omega.gg>
+ *
+ * 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 MLGROUPLISTMODEL_HPP
+#define MLGROUPLISTMODEL_HPP
+
+// MediaLibrary includes
+#include "mlbasemodel.hpp"
+
+// Forward declarations
+class vlc_medialibrary_t;
+
+class MLGroupListModel : public MLBaseModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles
+    {
+        GROUP_ID = Qt::UserRole + 1,
+        GROUP_NAME,
+        GROUP_THUMBNAIL,
+        GROUP_DURATION,
+        GROUP_DATE,
+        GROUP_COUNT,
+        // NOTE: Media specific.
+        GROUP_TITLE,
+        GROUP_RESOLUTION,
+        GROUP_CHANNEL,
+        GROUP_MRL,
+        GROUP_MRL_DISPLAY,
+        GROUP_PROGRESS,
+        GROUP_PLAYCOUNT,
+        GROUP_VIDEO_TRACK,
+        GROUP_AUDIO_TRACK,
+        GROUP_TITLE_FIRST_SYMBOL
+    };
+
+public:
+    explicit MLGroupListModel(vlc_medialibrary_t * ml, QObject * parent = nullptr);
+
+    explicit MLGroupListModel(QObject * parent = nullptr);
+
+public: // QAbstractItemModel implementation
+    QHash<int, QByteArray> roleNames() const override;
+
+    QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
+
+protected: // MLBaseModel implementation
+    vlc_ml_sorting_criteria_t roleToCriteria(int role) const override;
+
+    vlc_ml_sorting_criteria_t nameToCriteria(QByteArray name) const override;
+
+    QByteArray criteriaToName(vlc_ml_sorting_criteria_t criteria) const override;
+
+    ListCacheLoader<std::unique_ptr<MLItem>> * createLoader() const override;
+
+private: // MLBaseModel implementation
+    void onVlcMlEvent(const MLEvent & event) override;
+
+    void thumbnailUpdated(int idx) override;
+
+private:
+    struct Loader : public MLBaseModel::BaseLoader
+    {
+        Loader(const MLGroupListModel & model);
+
+        size_t count() const override;
+
+        std::vector<std::unique_ptr<MLItem>> load(size_t index, size_t count) const override;
+    };
+};
+
+#endif // MLGROUPLISTMODEL_HPP

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlplaylistmedia.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlplaylistmedia.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlplaylistmedia.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlplaylistmedia.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlplaylistmodel.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlplaylistmodel.cpp Changed

@@ -37,7 +37,6 @@
     {"id",             VLC_ML_SORTING_DEFAULT},
     {"title",          VLC_ML_SORTING_ALPHA},
     {"duration",       VLC_ML_SORTING_DURATION},
-    {"duration_short", VLC_ML_SORTING_DURATION},
     {"playcount",      VLC_ML_SORTING_PLAYCOUNT},
 };
 
@@ -177,7 +176,6 @@
         { MEDIA_TITLE,              "title"              },
         { MEDIA_THUMBNAIL,          "thumbnail"          },
         { MEDIA_DURATION,           "duration"           },
-        { MEDIA_DURATION_SHORT,     "duration_short"     },
         { MEDIA_PROGRESS,           "progress"           },
         { MEDIA_PLAYCOUNT,          "playcount"          },
         { MEDIA_RESOLUTION,         "resolution_name"    },
@@ -207,8 +205,6 @@
             return QVariant::fromValue(media->getThumbnail());
         case MEDIA_DURATION:
             return QVariant::fromValue(media->getDuration());
-        case MEDIA_DURATION_SHORT:
-            return QVariant::fromValue(media->getDurationShort());
         case MEDIA_PROGRESS:
             return QVariant::fromValue(media->getProgress());
         case MEDIA_PLAYCOUNT:
@@ -243,7 +239,6 @@
         case MEDIA_TITLE:
             return VLC_ML_SORTING_ALPHA;
         case MEDIA_DURATION:
-        case MEDIA_DURATION_SHORT:
             return VLC_ML_SORTING_DURATION;
         case MEDIA_PLAYCOUNT:
             return VLC_ML_SORTING_PLAYCOUNT;
@@ -270,35 +265,41 @@
 }
 
 //-------------------------------------------------------------------------------------------------
-// Private functions
+// Protected MLBaseModel reimplementation
+//-------------------------------------------------------------------------------------------------
 
-QList<int> MLPlaylistModel::getRows(const QModelIndexList & indexes) const
+void MLPlaylistModel::onVlcMlEvent(const MLEvent & event) /* override */
 {
-    QList<int> rows;
-
-    for (const QModelIndex & index : indexes)
+    if (event.i_type == VLC_ML_EVENT_PLAYLIST_UPDATED)
     {
-        rows.append(index.row());
+        m_need_reset = true;
+
+        // NOTE: Maybe we should call this from MLBaseModel ?
+        emit resetRequested();
     }
 
-    return rows;
+    MLBaseModel::onVlcMlEvent(event);
+}
+
+void MLPlaylistModel::thumbnailUpdated(int idx) /* override */
+{
+    emit dataChanged(index(idx), index(idx), { MEDIA_THUMBNAIL });
 }
 
 //-------------------------------------------------------------------------------------------------
-// Private MLBaseModel reimplementation
+// Private functions
 //-------------------------------------------------------------------------------------------------
 
-void MLPlaylistModel::onVlcMlEvent(const MLEvent & event) /* override */
+QList<int> MLPlaylistModel::getRows(const QModelIndexList & indexes) const
 {
-    if (event.i_type == VLC_ML_EVENT_PLAYLIST_UPDATED)
-    {
-        m_need_reset = true;
+    QList<int> rows;
 
-        // NOTE: Maybe we should call this from MLBaseModel ?
-        emit resetRequested();
+    for (const QModelIndex & index : indexes)
+    {
+        rows.append(index.row());
     }
 
-    MLBaseModel::onVlcMlEvent(event);
+    return rows;
 }
 
 //=================================================================================================

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlplaylistmodel.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlplaylistmodel.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlqmltypes.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlqmltypes.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlurlmodel.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlurlmodel.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlvideo.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlvideo.cpp Changed

@@ -77,6 +77,7 @@
     , m_ml( ml )
     , m_title( QString::fromUtf8( data->psz_title ) )
     , m_thumbnail( QString::fromUtf8( data->thumbnails[VLC_ML_THUMBNAIL_SMALL].psz_mrl ) )
+    , m_duration( data->i_duration )
     , m_progress( data->f_progress )
     , m_playCount( data->i_playcount )
     , m_thumbnailStatus( data->thumbnails[VLC_ML_THUMBNAIL_SMALL].i_status )
@@ -87,8 +88,6 @@
 {
     assert( data->i_type == VLC_ML_MEDIA_TYPE_VIDEO || data->i_type == VLC_ML_MEDIA_TYPE_UNKNOWN );
 
-    m_duration = data->i_duration;
-
     for( const vlc_ml_file_t& file: ml_range_iterate<vlc_ml_file_t>( data->p_files ) )
         if( file.i_type == VLC_ML_FILE_TYPE_MAIN )
         {
@@ -179,14 +178,9 @@
     return m_thumbnail;
 }
 
-QString MLVideo::getDuration() const
-{
-    return MsToString( m_duration );
-}
-
-QString MLVideo::getDurationShort() const
+int64_t MLVideo::getDuration() const
 {
-    return MsToString( m_duration, true );
+    return m_duration;
 }
 
 QString MLVideo::getMRL() const

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlvideo.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlvideo.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlvideomodel.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlvideomodel.cpp Changed

@@ -22,7 +22,6 @@
     {"id", VLC_ML_SORTING_DEFAULT},
     {"title", VLC_ML_SORTING_ALPHA},
     {"duration", VLC_ML_SORTING_DURATION},
-    {"duration_short", VLC_ML_SORTING_DURATION},
     {"playcount", VLC_ML_SORTING_PLAYCOUNT},
 };
 
@@ -46,8 +45,6 @@
             return QVariant::fromValue( video->getThumbnail() );
         case VIDEO_DURATION:
             return QVariant::fromValue( video->getDuration() );
-        case VIDEO_DURATION_SHORT:
-            return QVariant::fromValue( video->getDurationShort() );
         case VIDEO_PROGRESS:
             return QVariant::fromValue( video->getProgress() );
         case VIDEO_PLAYCOUNT:
@@ -79,7 +76,6 @@
         { VIDEO_TITLE, "title" },
         { VIDEO_THUMBNAIL, "thumbnail" },
         { VIDEO_DURATION, "duration" },
-        { VIDEO_DURATION_SHORT, "duration_short" },
         { VIDEO_PROGRESS, "progress" },
         { VIDEO_PLAYCOUNT, "playcount" },
         { VIDEO_RESOLUTION, "resolution_name" },
@@ -99,7 +95,6 @@
         case VIDEO_TITLE:
             return VLC_ML_SORTING_ALPHA;
         case VIDEO_DURATION:
-        case VIDEO_DURATION_SHORT:
             return VLC_ML_SORTING_DURATION;
         case VIDEO_PLAYCOUNT:
             return VLC_ML_SORTING_PLAYCOUNT;
@@ -144,26 +139,41 @@
     return new Loader(*this);
 }
 
-size_t MLVideoModel::Loader::count() const
+size_t MLVideoModel::Loader::count() const /* override */
 {
-    MLQueryParams params = getParams();
-    auto queryParams = params.toCQueryParams();
+    vlc_ml_query_params_t params = getParams().toCQueryParams();
 
-    return vlc_ml_count_video_media(m_ml, &queryParams);
+    int64_t id = m_parent.id;
+
+    if (id <= 0)
+        return vlc_ml_count_video_media(m_ml, &params);
+    else
+        return vlc_ml_count_media_of(m_ml, &params, m_parent.type, id);
 }
 
 std::vector<std::unique_ptr<MLItem>>
-MLVideoModel::Loader::load(size_t index, size_t count) const
+MLVideoModel::Loader::load(size_t index, size_t count) const /* override */
 {
-    MLQueryParams params = getParams(index, count);
-    auto queryParams = params.toCQueryParams();
+    vlc_ml_query_params_t params = getParams(index, count).toCQueryParams();
+
+    ml_unique_ptr<vlc_ml_media_list_t> list;
+
+    int64_t id = m_parent.id;
 
-    ml_unique_ptr<vlc_ml_media_list_t> media_list{ vlc_ml_list_video_media(
-                m_ml, &queryParams ) };
-    if ( media_list == nullptr )
+    if (id <= 0)
+        list.reset(vlc_ml_list_video_media(m_ml, &params));
+    else
+        list.reset(vlc_ml_list_media_of(m_ml, &params, m_parent.type, id));
+
+    if (list == nullptr)
         return {};
-    std::vector<std::unique_ptr<MLItem>> res;
-    for( vlc_ml_media_t &media: ml_range_iterate<vlc_ml_media_t>( media_list ) )
-        res.emplace_back( std::make_unique<MLVideo>(m_ml, &media) );
-    return res;
+
+    std::vector<std::unique_ptr<MLItem>> result;
+
+    for (const vlc_ml_media_t & media : ml_range_iterate<vlc_ml_media_t>(list))
+    {
+        result.emplace_back(std::make_unique<MLVideo>(m_ml, &media));
+    }
+
+    return result;
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/mlvideomodel.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/mlvideomodel.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/AudioGridItem.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/AudioGridItem.qml Changed

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/MediaGroupDisplay.qml Added

@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Copyright (C) 2021 VLC authors and VideoLAN
+ *
+ * Authors: Benjamin Arnaud <bunjee@omega.gg>
+ *
+ * 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 2.11
+
+import org.videolan.medialib 0.1
+
+import "qrc:///widgets/" as Widgets
+import "qrc:///style/"
+
+VideoAll {
+    id: root
+
+    //---------------------------------------------------------------------------------------------
+    // Properties
+    //---------------------------------------------------------------------------------------------
+
+    property int    initialIndex: 0
+    property var    initialId
+    property string initialName
+
+    //---------------------------------------------------------------------------------------------
+    // Aliases
+    //---------------------------------------------------------------------------------------------
+
+    // NOTE: This is used to determine which media(s) shall be displayed.
+    property alias parentId: modelGroup.parentId
+
+    // NOTE: The name of the group.
+    property string name
+
+    //---------------------------------------------------------------------------------------------
+    // Childs
+    //---------------------------------------------------------------------------------------------
+
+    model: MLVideoModel {
+        id: modelGroup
+
+        ml: medialib
+
+        parentId: initialId
+    }
+
+    header: Column {
+        topPadding: VLCStyle.margin_normal
+
+        Widgets.SubtitleLabel {
+            width: root.width
+
+            leftPadding  : VLCStyle.margin_xlarge
+            bottomPadding: VLCStyle.margin_xsmall
+
+            text: root.name
+        }
+    }
+}

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/MediaGroupList.qml Added

@@ -0,0 +1,412 @@
+/*****************************************************************************
+ * Copyright (C) 2021 VLC authors and VideoLAN
+ *
+ * Authors: Benjamin Arnaud <bunjee@omega.gg>
+ *
+ * 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 2.11
+
+import org.videolan.medialib 0.1
+
+import "qrc:///widgets/" as Widgets
+import "qrc:///main/"    as MainInterface
+import "qrc:///util/"    as Util
+import "qrc:///style/"
+
+Widgets.NavigableFocusScope {
+    id: root
+
+    //---------------------------------------------------------------------------------------------
+    // Properties
+    //---------------------------------------------------------------------------------------------
+
+    readonly property int currentIndex: currentItem.currentIndex
+
+    property int initialIndex: 0
+
+    property var sortModel: [
+        { text: i18n.qtr("Alphabetic"), criteria: "name" },
+        { text: i18n.qtr("Date"),       criteria: "date" }
+    ]
+
+    //---------------------------------------------------------------------------------------------
+    // Alias
+    //---------------------------------------------------------------------------------------------
+
+    property alias model: model
+
+    property alias currentItem: view.currentItem
+
+    //---------------------------------------------------------------------------------------------
+    // Signals
+    //---------------------------------------------------------------------------------------------
+
+    signal showList(variant model)
+
+    //---------------------------------------------------------------------------------------------
+    // Settings
+    //---------------------------------------------------------------------------------------------
+
+    navigationCancel: function() {
+        if (currentItem.currentIndex > 0) {
+            currentItem.currentIndex = 0;
+
+            currentItem.positionViewAtIndex(0, ItemView.Contain);
+        } else {
+            defaultNavigationCancel();
+        }
+    }
+
+    //---------------------------------------------------------------------------------------------
+    // Events
+    //---------------------------------------------------------------------------------------------
+
+    onModelChanged: resetFocus()
+
+    onInitialIndexChanged: resetFocus()
+
+    //---------------------------------------------------------------------------------------------
+    // Connections
+    //---------------------------------------------------------------------------------------------
+
+    Connections {
+        target: mainInterface
+
+        onGridViewChanged: {
+            if (mainInterface.gridView) view.replace(grid);
+            else                        view.replace(list);
+        }
+    }
+
+    //---------------------------------------------------------------------------------------------
+    // Functions
+    //---------------------------------------------------------------------------------------------
+
+    function setCurrentItemFocus() { listView.currentItem.forceActiveFocus() }
+
+    function resetFocus() {
+        if (model.count === 0) return;
+
+        var initialIndex = root.initialIndex;
+
+        if (initialIndex >= model.count)
+            initialIndex = 0;
+
+        modelSelect.select(model.index(initialIndex, 0), ItemSelectionModel.ClearAndSelect);
+
+        if (currentItem)
+            currentItem.positionViewAtIndex(initialIndex, ItemView.Contain);
+    }
+
+    //---------------------------------------------------------------------------------------------
+    // Private
+
+    function _actionAtIndex() {
+        if (modelSelect.selectedIndexes.length > 1) {
+            _play(model.getIdsForIndexes(modelSelect.selectedIndexes));
+        } else if (modelSelect.selectedIndexes.length === 1) {
+            var index = modelSelect.selectedIndexes[0];
+            _showList(model.getDataAt(index));
+        }
+    }
+
+    function _play(ids) {
+        g_mainDisplay.showPlayer();
+
+        medialib.addAndPlay(ids);
+    }
+
+    function _showList(model)
+    {
+        // NOTE: If the count is 1 we consider the group is a media.
+        if (model.count == 1)
+            _play(model.id);
+        else
+            showList(model);
+    }
+
+    //---------------------------------------------------------------------------------------------
+
+    function _getLabels(model, string)
+    {
+        var count = model.count;
+
+        if (count === 1) {
+            return [
+                model.resolution_name || "",
+                model.channel         || ""
+            ].filter(function(a) { return a !== "" });
+        } else return [
+            string.arg(count)
+        ];
+    }
+
+    //---------------------------------------------------------------------------------------------
+    // Childs
+    //---------------------------------------------------------------------------------------------
+
+    MLGroupListModel {
+        id: model
+
+        ml: medialib
+
+        onCountChanged: {
+            if (count === 0 || modelSelect.hasSelection) return;
+
+            resetFocus();
+        }
+    }
+
+    Util.SelectableDelegateModel {
+        id: modelSelect
+
+        model: root.model
+    }
+
+    Widgets.StackViewExt {
+        id: view
+
+        anchors.fill: parent
+
+        initialItem: (mainInterface.gridView) ? grid : list
+
+        focus: (model.count !== 0)
+    }
+
+    GroupListContextMenu {
+        id: contextMenu
+
+        model: root.model
+    }
+
+    Widgets.DragItem {
+        id: dragItem
+
+        function updateComponents(maxCovers) {

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/MusicAlbums.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/MusicAlbums.qml Changed

@@ -139,11 +139,20 @@
             delegateModel: selectionModel
             model: albumModelId
 
+            Widgets.GridShadows {
+                id: shadows
+
+                coverWidth: VLCStyle.gridCover_music_width
+                coverHeight: VLCStyle.gridCover_music_height
+            }
+
             delegate: AudioGridItem {
                 id: audioGridItem
 
                 opacity: gridView_id.expandIndex !== -1 && gridView_id.expandIndex !== audioGridItem.index ? .7 : 1
                 dragItem: albumDragItem
+                unselectedUnderlay: shadows.unselected
+                selectedUnderlay: shadows.selected
 
                 onItemClicked : gridView_id.leftClickOnItem(modifier, index)
 
@@ -218,7 +227,7 @@
             sortModel:  [
                 { isPrimary: true, criteria: "title", width: VLCStyle.colWidth(2), text: i18n.qtr("Title"), headerDelegate: tableColumns.titleHeaderDelegate, colDelegate: tableColumns.titleDelegate },
                 { criteria: "main_artist", width: VLCStyle.colWidth(Math.max(tableView_id._nbCols - 3, 1)), text: i18n.qtr("Artist") },
-                { criteria: "duration_short", width:VLCStyle.colWidth(1), showSection: "", headerDelegate: tableColumns.timeHeaderDelegate, colDelegate: tableColumns.timeColDelegate },
+                { criteria: "duration", width:VLCStyle.colWidth(1), showSection: "", headerDelegate: tableColumns.timeHeaderDelegate, colDelegate: tableColumns.timeColDelegate },
             ]
 
             navigationCancel: function() {
@@ -230,6 +239,7 @@
 
             onContextMenuButtonClicked: contextMenu.popup(selectionModel.selectedIndexes,  menuParent.mapToGlobal(0,0))
             onRightClick: contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
+            onItemDoubleClicked: medialib.addAndPlay( model.id )
 
             Widgets.TableColumns {
                 id: tableColumns

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml Changed

@@ -21,8 +21,10 @@
 import QtQml.Models 2.11
 
 import org.videolan.medialib 0.1
+import org.videolan.controls 0.1
 
 import "qrc:///widgets/" as Widgets
+import "qrc:///util/Helpers.js" as Helpers
 import "qrc:///style/"
 
 Widgets.NavigableFocusScope {
@@ -88,9 +90,9 @@
                     height: VLCStyle.expandCover_music_height
                     width: VLCStyle.expandCover_music_width
 
-                    Widgets.RoundImage {
+                    RoundImage {
                         id: expand_cover_id
-                        asynchronous: true
+
                         height: VLCStyle.expandCover_music_height
                         width: VLCStyle.expandCover_music_width
                         radius: VLCStyle.expandCover_music_radius
@@ -177,7 +179,7 @@
                 text: i18n.qtr("%1 - %2 - %3")
                     .arg(model.main_artist || i18n.qtr("Unknown artist"))
                     .arg(model.release_year || "")
-                    .arg(model.duration || "")
+                    .arg(Helpers.msToString(model.duration) || "")
 
                 Layout.fillWidth: true
                 Layout.preferredHeight: implicitHeight
@@ -240,7 +242,7 @@
 
                 sortModel: [
                     { isPrimary: true, criteria: "title", width: VLCStyle.colWidth(Math.max(expand_track_id._nbCols - 1, 1)), visible: true, text: i18n.qtr("Title"), showSection: "", colDelegate: titleDelegate, headerDelegate: titleHeaderDelegate },
-                    { criteria: "duration_short",          width: VLCStyle.colWidth(1), visible: true, showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate },
+                    { criteria: "duration",               width: VLCStyle.colWidth(1), visible: true, showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate },
                 ]
 
                 navigationParent: root

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/MusicArtist.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/MusicArtist.qml Changed

@@ -31,13 +31,24 @@
     id: root
 
     property var artist: ({})
-    readonly property var currentIndex: headerItem.albumsListView.currentIndex || view.currentItem.currentIndex
-    property Item headerItem: view.currentItem.headerItem
+
     //the index to "go to" when the view is loaded
     property var initialIndex: 0
 
+    property Item headerItem: view.currentItem ? view.currentItem.headerItem : null
+
+    // current index of album model
+    readonly property int currentIndex: {
+        if (!view.currentItem)
+           return -1
+        else if (mainInterface.gridView)
+           return view.currentItem.currentIndex
+        else
+           return headerItem.albumsListView.currentIndex
+    }
+
     property Component header: FocusScope {
-        property Item albumsListView: albumsLoader.item.albumsListView
+        property Item albumsListView: albumsLoader.status === Loader.Ready ? albumsLoader.item.albumsListView: null
         property Item focusItem: albumsLoader.active ? albumsLoader.item.albumsListView : artistBanner
 
         focus: true
@@ -47,8 +58,9 @@
         Column {
             id: col
 
-            height: childrenRect.height + VLCStyle.margin_normal
+            height: implicitHeight
             width: root.width
+            bottomPadding: VLCStyle.margin_normal
 
             ArtistTopBanner {
                 id: artistBanner
@@ -77,7 +89,7 @@
                     property alias albumsListView: albumsList
 
                     width: root.width
-                    height: childrenRect.height
+                    height: implicitHeight
 
                     Widgets.SubtitleLabel {
                         id: albumsText
@@ -111,13 +123,15 @@
                             image: model.cover || VLCStyle.noArtAlbum
                             title: model.title || i18n.qtr("Unknown title")
                             subtitle: model.release_year || ""
-                            textHorizontalAlignment: Text.AlignHCenter
+                            textAlignHCenter: true
                             x: selectedBorderWidth
                             y: selectedBorderWidth
                             pictureWidth: VLCStyle.gridCover_music_width
                             pictureHeight: VLCStyle.gridCover_music_height
-                            playCoverBorder.width: VLCStyle.gridCover_music_border
+                            playCoverBorderWidth: VLCStyle.gridCover_music_border
                             dragItem: albumDragItem
+                            unselectedUnderlay: shadows.unselected
+                            selectedUnderlay: shadows.selected
 
                             onPlayClicked: play()
                             onItemDoubleClicked: play()
@@ -144,6 +158,13 @@
                         onSelectAll: albumSelectionModel.selectAll()
                         onSelectionUpdated: albumSelectionModel.updateSelection( keyModifiers, oldIndex, newIndex )
                         onActionAtIndex: medialib.addAndPlay( albumModel.getIdForIndex( index ) )
+
+                        Widgets.GridShadows {
+                            id: shadows
+
+                            coverWidth: VLCStyle.gridCover_music_width
+                            coverHeight: VLCStyle.gridCover_music_height
+                        }
                     }
 
                     Widgets.SubtitleLabel {
@@ -240,12 +261,6 @@
 
         ml: medialib
         parentId: albumModel.parentId
-
-        onCountChanged: {
-            if (trackModel.count > 0) {
-                root.resetFocus()
-            }
-        }
     }
 
     AlbumContextMenu {
@@ -283,6 +298,8 @@
 
                 opacity: gridView_id.expandIndex !== -1 && gridView_id.expandIndex !== audioGridItem.index ? .7 : 1
                 dragItem: albumDragItem
+                unselectedUnderlay: shadows.unselected
+                selectedUnderlay: shadows.selected
 
                 onItemClicked : gridView_id.leftClickOnItem(modifier, index)
 
@@ -330,6 +347,13 @@
                 target: contextMenu
                 onShowMediaInformation: gridView_id.switchExpandItem( index )
             }
+
+            Widgets.GridShadows {
+                id: shadows
+
+                coverWidth: VLCStyle.gridCover_music_width
+                coverHeight: VLCStyle.gridCover_music_height
+            }
         }
 
     }
@@ -356,7 +380,7 @@
             sortModel:  [
                 { isPrimary: true, criteria: "title", width: VLCStyle.colWidth(2), text: i18n.qtr("Title"), headerDelegate: tableColumns.titleHeaderDelegate, colDelegate: tableColumns.titleDelegate },
                 { criteria: "album_title", width: VLCStyle.colWidth(Math.max(tableView_id._nbCols - 3, 1)), text: i18n.qtr("Album") },
-                { criteria: "duration_short", width:VLCStyle.colWidth(1), showSection: "", headerDelegate: tableColumns.timeHeaderDelegate, colDelegate: tableColumns.timeColDelegate },
+                { criteria: "duration", width:VLCStyle.colWidth(1), showSection: "", headerDelegate: tableColumns.timeHeaderDelegate, colDelegate: tableColumns.timeColDelegate },
             ]
 
             navigationCancel: function() {
@@ -366,6 +390,7 @@
                     tableView_id.currentIndex = 0;
             }
 
+            onItemDoubleClicked: medialib.addAndPlay(model.id)
             onContextMenuButtonClicked: trackContextMenu.popup(trackSelectionModel.selectedIndexes, menuParent.mapToGlobal(0,0))
             onRightClick: trackContextMenu.popup(trackSelectionModel.selectedIndexes, globalMousePos)
             dragItem: Widgets.DragItem {

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml Changed

@@ -21,8 +21,10 @@
 import QtQuick.Layouts 1.3
 
 import org.videolan.medialib 0.1
+import org.videolan.controls 0.1
 
 import "qrc:///util/" as Util
+import "qrc:///util/Helpers.js" as Helpers
 import "qrc:///widgets/" as Widgets
 import "qrc:///main/" as MainInterface
 import "qrc:///style/"
@@ -107,14 +109,14 @@
         Widgets.KeyNavigableListView {
             id: artistList
 
-            z: 1
-            width: resizeHandle.clamp(root.width / resizeHandle.widthFactor,
-                                      VLCStyle.colWidth(1) + VLCStyle.column_margin_width,
-                                      root.width * .5)
-            height: parent.height
             spacing: 4
             model: artistModel
             currentIndex: -1
+            z: 1
+            height: parent.height
+            width: Helpers.clamp(root.width / resizeHandle.widthFactor,
+                                 VLCStyle.colWidth(1) + VLCStyle.column_margin_width,
+                                 root.width * .5)
 
             focus: true
             footer: MainInterface.MiniPlayerBottomMargin {
@@ -160,12 +162,11 @@
                         bottomMargin: VLCStyle.margin_xsmall
                     }
 
-                    Widgets.RoundImage {
+                    RoundImage {
                         source: model.cover || VLCStyle.noArtArtistSmall
                         height: VLCStyle.play_cover_small
                         width: VLCStyle.play_cover_small
                         radius: VLCStyle.play_cover_small
-                        mipmap: true
 
                         Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/MusicArtistsDisplay.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/MusicArtistsDisplay.qml Changed

@@ -160,6 +160,15 @@
                         }
                     }
 
+                    Widgets.GridShadows {
+                        id: shadows
+
+                        leftPadding: (VLCStyle.colWidth(1) - shadows.coverWidth) / 2 // GridItem's rect is horizontally centered
+                        coverWidth: VLCStyle.artistGridCover_radius
+                        coverHeight: VLCStyle.artistGridCover_radius
+                        coverRadius: VLCStyle.artistGridCover_radius
+                    }
+
                     delegate: AudioGridItem {
                         id: gridItem
 
@@ -168,12 +177,15 @@
                         pictureRadius: VLCStyle.artistGridCover_radius
                         pictureHeight: VLCStyle.artistGridCover_radius
                         pictureWidth: VLCStyle.artistGridCover_radius
-                        playCoverBorder.width: VLCStyle.dp(3, VLCStyle.scale)
+                        playCoverBorderWidth: VLCStyle.dp(3, VLCStyle.scale)
                         titleMargin: VLCStyle.margin_xlarge
                         playIconSize: VLCStyle.play_cover_small
-                        textHorizontalAlignment: Text.AlignHCenter
+                        textAlignHCenter: true
                         width: VLCStyle.colWidth(1)
                         dragItem: artistsDragItem
+                        unselectedUnderlay: shadows.unselected
+                        selectedUnderlay: shadows.selected
+
 
                         onItemClicked: artistGrid.leftClickOnItem(modifier, index)

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/MusicGenres.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/MusicGenres.qml Changed

@@ -149,7 +149,15 @@
             model: genreModel
             topMargin: VLCStyle.margin_large
 
-            delegate: Widgets.GridItem {
+            Widgets.GridShadows {
+                id: shadows
+
+                leftPadding: 0
+                coverWidth: VLCStyle.colWidth(2)
+                coverHeight: shadows.coverWidth / 2
+            }
+
+           delegate: Widgets.GridItem {
                 id: item
 
                 property var model: ({})
@@ -160,8 +168,10 @@
                 pictureWidth: width
                 pictureHeight: height
                 image: model.cover || VLCStyle.noArtAlbum
-                playCoverBorder.width: VLCStyle.dp(3, VLCStyle.scale)
+                playCoverBorderWidth: VLCStyle.dp(3, VLCStyle.scale)
                 dragItem: genreDragItem
+                unselectedUnderlay: shadows.unselected
+                selectedUnderlay: shadows.selected
 
                 onItemDoubleClicked: root.showAlbumView(model)
                 onItemClicked: gridView_id.leftClickOnItem(modifier, item.index)

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml Changed

@@ -33,14 +33,14 @@
         { isPrimary: true, criteria: "title",       width: VLCStyle.colWidth(1), text: i18n.qtr("Title"),    showSection: "title", colDelegate: tableColumns.titleDelegate, headerDelegate: tableColumns.titleHeaderDelegate },
         { criteria: "album_title", width: VLCStyle.colWidth(1), text: i18n.qtr("Album"),    showSection: "album_title" },
         { criteria: "main_artist", width: VLCStyle.colWidth(1), text: i18n.qtr("Artist"),   showSection: "main_artist" },
-        { criteria: "duration_short", width: VLCStyle.colWidth(1), text: i18n.qtr("Duration"), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate },
+        { criteria: "duration", width: VLCStyle.colWidth(1), text: i18n.qtr("Duration"), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate },
     ]
 
     property var sortModelMedium: [
         { isPrimary: true, criteria: "title",       width: VLCStyle.colWidth(2), text: i18n.qtr("Title"),    showSection: "title", colDelegate: tableColumns.titleDelegate, headerDelegate: tableColumns.titleHeaderDelegate },
         { criteria: "album_title", width: VLCStyle.colWidth(2), text: i18n.qtr("Album"),    showSection: "album_title" },
         { criteria: "main_artist", width: VLCStyle.colWidth(1), text: i18n.qtr("Artist"),   showSection: "main_artist" },
-        { criteria: "duration_short", width: VLCStyle.colWidth(1), text: i18n.qtr("Duration"), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate },
+        { criteria: "duration", width: VLCStyle.colWidth(1), text: i18n.qtr("Duration"), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate },
     ]
 
     readonly property int _expandingColsSpan: Math.floor((VLCStyle.gridColumnsForWidth(root.availableRowWidth) - 3 /* static cols (track_number, etc)*/) / 3)
@@ -48,7 +48,7 @@
         { isPrimary: true, criteria: "title",       width: VLCStyle.colWidth(root._expandingColsSpan), text: i18n.qtr("Title"),    showSection: "title", colDelegate: tableColumns.titleDelegate, headerDelegate: tableColumns.titleHeaderDelegate },
         { criteria: "album_title", width: VLCStyle.colWidth(root._expandingColsSpan), text: i18n.qtr("Album"),    showSection: "album_title" },
         { criteria: "main_artist", width: VLCStyle.colWidth(root._expandingColsSpan), text: i18n.qtr("Artist"),   showSection: "main_artist" },
-        { criteria: "duration_short", width: VLCStyle.colWidth(1), text: i18n.qtr("Duration"), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate },
+        { criteria: "duration", width: VLCStyle.colWidth(1), text: i18n.qtr("Duration"), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate },
         { criteria: "track_number",width: VLCStyle.colWidth(1), text: i18n.qtr("Track"), showSection: "" },
         { criteria: "disc_number", width: VLCStyle.colWidth(1), text: i18n.qtr("Disc"),  showSection: "" },
     ]
@@ -67,7 +67,7 @@
     property alias parentId: rootmodel.parentId
 
     onActionForSelection:  medialib.addAndPlay(model.getIdsForIndexes( selection ))
-
+    onItemDoubleClicked: medialib.addAndPlay(model.id)
     onContextMenuButtonClicked: contextMenu.popup(selectionModel.selectedIndexes, menuParent.mapToGlobal(0,0))
     onRightClick: contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/PlaylistMedia.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/PlaylistMedia.qml Changed

@@ -24,6 +24,7 @@
 
 import "qrc:///widgets/" as Widgets
 import "qrc:///main/"    as MainInterface
+import "qrc:///util/Helpers.js" as Helpers
 import "qrc:///style/"
 
 MainInterface.MainTableView {
@@ -70,7 +71,7 @@
 
         text: i18n.qtr("Title")
     }, {
-        criteria: "duration_short",
+        criteria: "duration",
 
         width: VLCStyle.colWidth(1),
 
@@ -83,6 +84,7 @@
     //---------------------------------------------------------------------------------------------
 
     onActionForSelection: medialib.addAndPlay(model.getIdsForIndexes(selection))
+    onItemDoubleClicked: medialib.addAndPlay(model.id)
 
     //---------------------------------------------------------------------------------------------
     // Connections
@@ -100,14 +102,9 @@
     //---------------------------------------------------------------------------------------------
     // Drop interface
 
-    // FIXME: Maybe this could be a global function ?
-    function isValidInstanceOf(object, type) {
-        return (!!object && (object instanceof type));
-    }
-
     function isDroppable(drop, index) {
         // NOTE: Internal drop (intra-playlist).
-        return isValidInstanceOf(drop.source, Widgets.DragItem);
+        return Helpers.isValidInstanceOf(drop.source, Widgets.DragItem);
     }
 
     function applyDrop(drop, index) {
@@ -118,7 +115,7 @@
             model.move(modelSelect.selectedIndexes, index);
 
         // NOTE: Dropping medialibrary content into the playlist.
-        } else if (isValidInstanceOf(item, Widgets.DragItem)) {
+        } else if (Helpers.isValidInstanceOf(item, Widgets.DragItem)) {
             model.insert(item.getSelectedInputItem(), index);
         }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml Changed

@@ -136,12 +136,12 @@
     //---------------------------------------------------------------------------------------------
     // Private
 
-    function _actionAtIndex(index) {
+    function _actionAtIndex() {
         if (modelSelect.selectedIndexes.length > 1) {
             medialib.addAndPlay(model.getIdsForIndexes(modelSelect.selectedIndexes));
         } else if (modelSelect.selectedIndexes.length === 1) {
-            var indexes = modelSelect.selectedIndexes[0];
-            showList(model.getDataAt(indexes));
+            var index = modelSelect.selectedIndexes[0];
+            showList(model.getDataAt(index));
         }
     }
 
@@ -244,7 +244,7 @@
 
             onSelectionUpdated: modelSelect.updateSelection(keyModifiers, oldIndex, newIndex)
 
-            onActionAtIndex: _actionAtIndex(index)
+            onActionAtIndex: _actionAtIndex()
 
             //-------------------------------------------------------------------------------------
             // Childs
@@ -272,6 +272,9 @@
 
                 dragItem: dragItemPlaylist
 
+                unselectedUnderlay: shadows.unselected
+                selectedUnderlay: shadows.selected
+
                 pictureOverlay: Item {
                     Column {
                         anchors.centerIn: parent
@@ -306,7 +309,7 @@
                     }
                 }
 
-                playCoverBorder.width: VLCStyle.dp(3, VLCStyle.scale)
+                playCoverBorderWidth: VLCStyle.dp(3, VLCStyle.scale)
 
                 //---------------------------------------------------------------------------------
                 // Events
@@ -323,6 +326,13 @@
                     contextMenu.popup(modelSelect.selectedIndexes, globalMousePos);
                 }
             }
+
+            Widgets.GridShadows {
+                id: shadows
+
+                coverWidth: root._width
+                coverHeight: root._height
+            }
         }
     }
 
@@ -384,9 +394,7 @@
             //-------------------------------------------------------------------------------------
             // Events
 
-            onActionForSelection: _actionAtIndex(selection)
-
-            onItemDoubleClicked: showList(model)
+            onActionForSelection: _actionAtIndex()
 
             onContextMenuButtonClicked: contextMenu.popup(modelSelect.selectedIndexes,
                                                           menuParent.mapToGlobal(0,0))

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/UrlListDisplay.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/UrlListDisplay.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/VideoAll.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/VideoAll.qml Changed

@@ -44,20 +44,17 @@
 
     property int initialIndex: 0
 
+    property var model: MLVideoModel { ml: medialib }
+
     property var sortModel: [
         { text: i18n.qtr("Alphabetic"), criteria: "title"          },
-        { text: i18n.qtr("Duration"),   criteria: "duration_short" }
+        { text: i18n.qtr("Duration"),   criteria: "duration" }
     ]
 
     //---------------------------------------------------------------------------------------------
     // Aliases
     //---------------------------------------------------------------------------------------------
 
-    // NOTE: This is used to determine which media(s) shall be displayed.
-    property alias parentId: model.parentId
-
-    property alias model: model
-
     property alias currentItem: view.currentItem
 
     //---------------------------------------------------------------------------------------------
@@ -99,6 +96,16 @@
         }
     }
 
+    Connections {
+        target: model
+
+        onCountChanged: {
+            if (count === 0 || modelSelect.hasSelection) return;
+
+            resetFocus();
+        }
+    }
+
     //---------------------------------------------------------------------------------------------
     // Functions
     //---------------------------------------------------------------------------------------------
@@ -122,7 +129,7 @@
     //---------------------------------------------------------------------------------------------
     // Private
 
-    function _actionAtIndex(index) {
+    function _actionAtIndex() {
         g_mainDisplay.showPlayer();
 
         medialib.addAndPlay(model.getIdsForIndexes(modelSelect.selectedIndexes));
@@ -132,18 +139,6 @@
     // Childs
     //---------------------------------------------------------------------------------------------
 
-    MLVideoModel {
-        id: model
-
-        ml: medialib
-
-        onCountChanged: {
-            if (count === 0 || modelSelect.hasSelection) return;
-
-            resetFocus();
-        }
-    }
-
     Widgets.StackViewExt {
         id: view
 
@@ -238,10 +233,26 @@
                 onRetract: gridView.retract()
             }
 
+            //---------------------------------------------------------------------------------
+            // Shadows
+
+            Widgets.GridShadows {
+                id: shadows
+
+                coverWidth: VLCStyle.gridCover_video_width
+                coverHeight: VLCStyle.gridCover_video_height
+            }
+
             delegate: VideoGridItem {
                 id: gridItem
 
                 //---------------------------------------------------------------------------------
+                // properties required by ExpandGridView
+
+                property var model: ({})
+                property int index: -1
+
+                //---------------------------------------------------------------------------------
                 // Settings
 
                 opacity: (gridView.expandIndex !== -1
@@ -249,12 +260,20 @@
                           gridView.expandIndex !== gridItem.index) ? 0.7 : 1
 
                 dragItem: root.dragItem
+                unselectedUnderlay: shadows.unselected
+                selectedUnderlay: shadows.selected
 
                 //---------------------------------------------------------------------------------
                 // Events
 
                 onItemClicked: gridView.leftClickOnItem(modifier, index)
 
+                onItemDoubleClicked: {
+                    g_mainDisplay.showPlayer();
+
+                    medialib.addAndPlay(model.id);
+                }
+
                 onContextMenuButtonClicked: {
                     gridView.rightClickOnItem(index);
 
@@ -284,7 +303,7 @@
 
             onSelectionUpdated: modelSelect.updateSelection(keyModifiers, oldIndex, newIndex)
 
-            onActionAtIndex: _actionAtIndex(index)
+            onActionAtIndex: _actionAtIndex()
 
             //-------------------------------------------------------------------------------------
             // Connections
@@ -325,6 +344,8 @@
             //-------------------------------------------------------------------------------------
             // Events
 
+            onActionForSelection: medialib.addAndPlay(model.getIdsForIndexes(selection))
+
             onContextMenuButtonClicked: contextMenu.popup(modelSelect.selectedIndexes,
                                                           menuParent.mapToGlobal(0,0))

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/VideoDisplay.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/VideoDisplay.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/VideoDisplayRecentVideos.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/VideoDisplayRecentVideos.qml Changed

@@ -23,6 +23,7 @@
 
 import "qrc:///widgets/" as Widgets
 import "qrc:///util/" as Util
+import "qrc:///util/Helpers.js" as Helpers
 import "qrc:///style/"
 
 Widgets.NavigableFocusScope {
@@ -92,34 +93,18 @@
                 width: VLCStyle.margin_xlarge
             }
 
-            delegate: Widgets.GridItem {
+            delegate: VideoGridItem {
                 id: recentVideoGridItem
 
                 focus: true
                 x: selectedBorderWidth
                 y: selectedBorderWidth
-
-                image: model.thumbnail || VLCStyle.noArtCover
-                title: model.title || i18n.qtr("Unknown title")
-                subtitle: model.duration || ""
-                labels: [
-                    model.resolution_name || "",
-                    model.channel || ""
-                ].filter(function(a) { return a !== "" } )
-                progress: model.progress > 0 ? model.progress : 0
                 pictureWidth: VLCStyle.gridCover_video_width_large
                 pictureHeight: VLCStyle.gridCover_video_height_large
-                playCoverBorder.width: VLCStyle.gridCover_video_border
-                titleMargin: VLCStyle.margin_xxsmall
-                showNewIndicator: true
-                onItemDoubleClicked: {
-                    if ( model.id !== undefined ) {
-                        g_mainDisplay.showPlayer()
-                        medialib.addAndPlay( model.id )
-                    }
-                }
+                unselectedUnderlay: shadows.unselected
+                selectedUnderlay: shadows.selected
 
-                onPlayClicked: {
+                onItemDoubleClicked: {
                     if ( model.id !== undefined ) {
                         g_mainDisplay.showPlayer()
                         medialib.addAndPlay( model.id )
@@ -154,6 +139,13 @@
                 g_mainDisplay.showPlayer()
                 medialib.addAndPlay( model.getIdsForIndexes( recentVideoSelection.selectedIndexes ) )
             }
+
+            Widgets.GridShadows {
+                id: shadows
+
+                coverWidth: VLCStyle.gridCover_video_width_large
+                coverHeight: VLCStyle.gridCover_video_height_large
+            }
         }
     }
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/VideoGridItem.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/VideoGridItem.qml Changed

@@ -20,35 +20,87 @@
 import org.videolan.medialib 0.1
 
 import "qrc:///widgets/" as Widgets
+import "qrc:///util/Helpers.js" as Helpers
 import "qrc:///style/"
 
 Widgets.GridItem {
-    property var model: ({})
-    property int index: -1
+    id: root
 
-    image: model.thumbnail || VLCStyle.noArtCover
-    title: model.title || i18n.qtr("Unknown title")
-    subtitle: model.duration || ""
-    labels: [
+    property bool showNewIndicator: true
+    property int newIndicatorMedian: root.highlighted ? VLCStyle.icon_small : VLCStyle.icon_xsmall
+    
+    property var labels: [
         model.resolution_name || "",
         model.channel || ""
-    ].filter(function(a) { return a !== "" } )
-    progress: model.progress > 0 ? model.progress : 0
+    ].filter(function(a) { return a !== "" })
+
+    image: model.thumbnail || VLCStyle.noArtCover
+    title: model.title || i18n.qtr("Unknown title")
+    subtitle: Helpers.msToString(model.duration) || ""
     pictureWidth: VLCStyle.gridCover_video_width
     pictureHeight: VLCStyle.gridCover_video_height
-    playCoverBorder.width: VLCStyle.gridCover_video_border
+    playCoverBorderWidth: VLCStyle.gridCover_video_border
     titleMargin: VLCStyle.margin_xxsmall
-    showNewIndicator: true
-    onItemDoubleClicked: {
-        if ( model.id !== undefined ) {
-            g_mainDisplay.showPlayer()
-            medialib.addAndPlay( model.id )
+
+    pictureOverlay: Item {
+        width: root.pictureWidth
+        height: root.pictureHeight
+
+        Widgets.VideoQualityLabels {
+            anchors {
+                top: parent.top
+                right: parent.right
+                topMargin: VLCStyle.margin_xxsmall
+                leftMargin: VLCStyle.margin_xxsmall
+                rightMargin: VLCStyle.margin_xxsmall
+            }
+
+            labels: root.labels
+        }
+
+        Widgets.VideoProgressBar {
+            id: progressBar
+
+            visible: !root.highlighted && value > 0
+            value: model.progress > 0 ? model.progress : 0
+            anchors {
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+                rightMargin: root.pictureRadius
+            }
         }
     }
+
     onPlayClicked: {
         if ( model.id !== undefined ) {
             g_mainDisplay.showPlayer()
             medialib.addAndPlay( model.id )
         }
     }
+    
+    Behavior on newIndicatorMedian {
+        NumberAnimation {
+            duration: 200
+            easing.type: Easing.InOutSine
+        }
+    }
+
+    Item {
+        clip: true
+        x: parent.width - width
+        y: 0
+        width: 2 * root.newIndicatorMedian
+        height: 2 * root.newIndicatorMedian
+        visible: root.showNewIndicator && model.progress <= 0
+
+        Rectangle {
+            x: parent.width - root.newIndicatorMedian
+            y: - root.newIndicatorMedian
+            width: 2 * root.newIndicatorMedian
+            height: 2 * root.newIndicatorMedian
+            color: VLCStyle.colors.accent
+            rotation: 45
+        }
+    }
 }

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/VideoGroupsDisplay.qml Added

@@ -0,0 +1,117 @@
+/*****************************************************************************
+ * Copyright (C) 2021 VLC authors and VideoLAN
+ *
+ * Authors: Benjamin Arnaud <bunjee@omega.gg>
+ *
+ * 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          2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts  1.3
+import QtQml.Models     2.2
+
+import org.videolan.medialib 0.1
+
+import "qrc:///widgets/" as Widgets
+import "qrc:///style/"
+
+Widgets.PageLoader {
+    id: root
+
+    //---------------------------------------------------------------------------------------------
+    // Aliases
+    //---------------------------------------------------------------------------------------------
+
+    property bool isViewMultiView: true
+
+    property variant model
+    property variant sortModel
+
+    //---------------------------------------------------------------------------------------------
+    // Settings
+    //---------------------------------------------------------------------------------------------
+
+    defaultPage: "all"
+
+    pageModel: [{
+        name: "all",
+        component: componentAll
+    }, {
+        name: "list",
+        component: componentList
+    }]
+
+    //---------------------------------------------------------------------------------------------
+    // Events
+    //---------------------------------------------------------------------------------------------
+
+    onCurrentItemChanged: {
+        model     = currentItem.model;
+        sortModel = currentItem.sortModel;
+
+        isViewMultiView = (currentItem.isViewMultiView === undefined
+                           ||
+                           currentItem.isViewMultiView);
+    }
+
+    //---------------------------------------------------------------------------------------------
+    // Functions
+    //---------------------------------------------------------------------------------------------
+    // Private
+
+    function _updateHistoryAll(index) {
+        history.update(["mc", "video", "groups", "all", { "initialIndex": index }]);
+    }
+
+    function _updateHistoryList(list) {
+        history.update(["mc", "video", "groups", "list", {
+                            "initialIndex": list.currentIndex,
+                            "initialId"   : list.parentId,
+                            "initialName" : list.name
+                        }]);
+    }
+
+    //---------------------------------------------------------------------------------------------
+    // Childs
+    //---------------------------------------------------------------------------------------------
+
+    Component {
+        id: componentAll
+
+        MediaGroupList {
+            anchors.fill: parent
+
+            onCurrentIndexChanged: _updateHistoryAll(currentIndex)
+
+            onShowList: history.push(["mc", "video", "groups", "list",
+                                      { parentId: model.id, name: model.name }])
+        }
+    }
+
+    Component {
+        id: componentList
+
+        MediaGroupDisplay {
+            id: list
+
+            anchors.fill: parent
+
+            onCurrentIndexChanged: _updateHistoryList(list)
+            onParentIdChanged    : _updateHistoryList(list)
+            onNameChanged        : _updateHistoryList(list)
+        }
+    }
+}

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml Changed

@@ -21,9 +21,11 @@
 import QtQuick.Layouts 1.3
 
 import org.videolan.medialib 0.1
+import org.videolan.controls 0.1
 
 import "qrc:///widgets/" as Widgets
 import "qrc:///util/KeyHelper.js" as KeyHelper
+import "qrc:///util/Helpers.js" as Helpers
 import "qrc:///style/"
 
 Widgets.NavigableFocusScope {
@@ -93,14 +95,12 @@
                         width: VLCStyle.gridCover_video_width
 
                         /* A bigger cover for the album */
-                        Widgets.RoundImage {
+                        RoundImage {
                             id: expand_cover_id
 
                             anchors.fill: parent
-                            asynchronous: true
                             source: model.thumbnail || VLCStyle.noArtCover
                             sourceSize: Qt.size(width, height)
-                            fillMode: Image.PreserveAspectFit
                             radius: VLCStyle.gridCover_radius
                         }
 
@@ -169,7 +169,7 @@
                 }
 
                 Widgets.CaptionLabel {
-                    text: model.duration
+                    text: Helpers.msToString(model.duration)
                     color: VLCStyle.colors.text
                     width: parent.width
                 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml Changed

@@ -29,36 +29,62 @@
 MainInterface.MainTableView {
     id: listView_id
 
+    //---------------------------------------------------------------------------------------------
+    // Properties
+    //---------------------------------------------------------------------------------------------
+
+    // NOTE: This is useful for groups because our main criteria is 'name' instead of 'title'.
+    property string mainCriteria: "title"
+
+    //---------------------------------------------------------------------------------------------
+    // Private
+
     readonly property int _nbCols: VLCStyle.gridColumnsForWidth(listView_id.availableRowWidth)
 
-    sortModel: [
-        { type: "image", criteria: "thumbnail", width: VLCStyle.colWidth(1), showSection: "", colDelegate: tableColumns.titleDelegate, headerDelegate: tableColumns.titleHeaderDelegate },
-        { isPrimary: true, criteria: "title",   width: VLCStyle.colWidth(Math.max(listView_id._nbCols - 2, 1)), text: i18n.qtr("Title"),    showSection: "title" },
-        { criteria: "duration_short",            width: VLCStyle.colWidth(1), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate, showContextButton: true },
-    ]
+    //---------------------------------------------------------------------------------------------
+    // Settings
+    //---------------------------------------------------------------------------------------------
 
-    section.property: "title_first_symbol"
+    sortModel: [{
+        type: "image",
 
-    rowHeight: VLCStyle.tableCoverRow_height
+        criteria: "thumbnail",
 
-    headerColor: VLCStyle.colors.bg
+        width: VLCStyle.colWidth(1),
 
-    onActionForSelection: medialib.addAndPlay(model.getIdsForIndexes( selection ))
+        showSection: "",
 
-    Widgets.TableColumns {
-        id: tableColumns
+        headerDelegate: tableColumns.titleHeaderDelegate,
+        colDelegate   : tableColumns.titleDelegate,
+    }, {
+        isPrimary: true,
+        criteria: mainCriteria,
 
-        showTitleText: false
-        titleCover_height: VLCStyle.listAlbumCover_height
-        titleCover_width: VLCStyle.listAlbumCover_width
-        titleCover_radius: VLCStyle.listAlbumCover_radius
+        width: VLCStyle.colWidth(Math.max(listView_id._nbCols - 2, 1)),
 
-        function titlecoverLabels(model) {
-            return [!model ? "" : model.resolution_name
-                    , model ? "" : model.channel
-                    ].filter(function(a) { return a !== "" })
-        }
-    }
+        showSection: "title",
+
+        text: i18n.qtr("Title")
+    }, {
+        criteria: "duration_short",
+
+        width: VLCStyle.colWidth(1),
+
+        showSection: "",
+
+        headerDelegate: tableColumns.timeHeaderDelegate, showContextButton: true,
+        colDelegate   : tableColumns.timeColDelegate
+    }]
+
+    section.property: "title_first_symbol"
+
+    rowHeight: VLCStyle.tableCoverRow_height
+
+    headerColor: VLCStyle.colors.bg
+
+    //---------------------------------------------------------------------------------------------
+    // Connections
+    //---------------------------------------------------------------------------------------------
 
     Connections {
         target: model
@@ -72,4 +98,37 @@
             }
         }
     }
+
+    //---------------------------------------------------------------------------------------------
+    // Functions
+    //---------------------------------------------------------------------------------------------
+    // Events
+
+    function onLabels(model)
+    {
+        if (model === null)
+            return [];
+
+        return [
+            model.resolution_name || "",
+            model.channel         || ""
+        ].filter(function(a) { return a !== "" });
+    }
+
+    //---------------------------------------------------------------------------------------------
+    // Childs
+    //---------------------------------------------------------------------------------------------
+
+    Widgets.TableColumns {
+        id: tableColumns
+
+        showTitleText: false
+        titleCover_height: VLCStyle.listAlbumCover_height
+        titleCover_width: VLCStyle.listAlbumCover_width
+        titleCover_radius: VLCStyle.listAlbumCover_radius
+
+        function titlecoverLabels(model) {
+            return listView_id.onLabels(model);
+        }
+    }
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/menus/menus.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/menus/menus.cpp Changed

@@ -87,7 +87,7 @@
     {
         if( !EMPTY_STR( shortcut ) )
             action = menu->addAction( QIcon( icon ), text, THEDP,
-                                      member, qtr( shortcut ) );
+                                      member, qfut( shortcut ) );
         else
             action = menu->addAction( QIcon( icon ), text, THEDP, member );
     }
@@ -95,7 +95,7 @@
 #endif
     {
         if( !EMPTY_STR( shortcut ) )
-            action = menu->addAction( text, THEDP, member, qtr( shortcut ) );
+            action = menu->addAction( text, THEDP, member, qfut( shortcut ) );
         else
             action = menu->addAction( text, THEDP, member );
     }
@@ -209,7 +209,7 @@
         ":/type/file-asym.svg", []() { THEDP->simpleOpenDialog(); } , "Ctrl+O" );
     addDPStaticEntry( menu, qtr( "&Open Multiple Files..." ),
         ":/type/file-asym.svg", &DialogsProvider::openFileDialog, "Ctrl+Shift+O" );
-    addDPStaticEntry( menu, qtr( I_OP_OPDIR ),
+    addDPStaticEntry( menu, qfut( I_OP_OPDIR ),
         ":/type/folder-grey.svg", &DialogsProvider::PLOpenDir, "Ctrl+F" );
     addDPStaticEntry( menu, qtr( "Open &Disc..." ),
         ":/type/disc.svg", &DialogsProvider::openDiscDialog, "Ctrl+D" );
@@ -234,7 +234,7 @@
 
     menu->addSeparator();
 
-    addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", &DialogsProvider::savePlayingToPlaylist,
+    addDPStaticEntry( menu, qfut( I_PL_SAVE ), "", &DialogsProvider::savePlayingToPlaylist,
         "Ctrl+Y" );
 
 #ifdef ENABLE_SOUT
@@ -272,21 +272,21 @@
     addDPStaticEntry( menu, qtr( "&Track Synchronization"), ":/menu/setting.svgs",
             &DialogsProvider::synchroDialog, "" );
 
-    addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/menu/info.svg",
+    addDPStaticEntry( menu, qfut( I_MENU_INFO ) , ":/menu/info.svg",
         QOverload<>::of(&DialogsProvider::mediaInfoDialog), "Ctrl+I" );
 
-    addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) ,
+    addDPStaticEntry( menu, qfut( I_MENU_CODECINFO ) ,
         ":/menu/info.svg", &DialogsProvider::mediaCodecDialog, "Ctrl+J" );
 
 #ifdef ENABLE_VLM
-    addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", &DialogsProvider::vlmDialog,
+    addDPStaticEntry( menu, qfut( I_MENU_VLM ), "", &DialogsProvider::vlmDialog,
         "Ctrl+Shift+W" );
 #endif
 
     addDPStaticEntry( menu, qtr( "Program Guide" ), "", &DialogsProvider::epgDialog,
         "" );
 
-    addDPStaticEntry( menu, qtr( I_MENU_MSG ),
+    addDPStaticEntry( menu, qfut( I_MENU_MSG ),
         ":/menu/messages.svg", &DialogsProvider::messagesDialog, "Ctrl+M" );
 
     addDPStaticEntry( menu, qtr( "Plu&gins and extensions" ),
@@ -295,7 +295,7 @@
 
     if( !p_intf->p_sys->b_isDialogProvider )
         addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ),
-            ":/menu/preferences.svg", &DialogsProvider::toolbarDialog);
+            ":/menu/preferences.svg", &DialogsProvider::showToolbarEditorDialog);
 
     addDPStaticEntry( menu, qtr( "&Preferences" ),
         ":/menu/preferences.svg", &DialogsProvider::prefsDialog, "Ctrl+P", QAction::PreferencesRole );
@@ -532,7 +532,7 @@
 
     if (p_intf->p_sys->p_mi && p_intf->p_sys->p_mi->hasMediaLibrary() )
     {
-        submenu = new QMenu( qtr( I_MENU_BOOKMARK ), menu );
+        submenu = new QMenu( qfut( I_MENU_BOOKMARK ), menu );
         submenu->setTearOffEnabled( true );
         addDPStaticEntry( submenu, qtr( "&Manage" ), "",
                           &DialogsProvider::bookmarksDialog, "Ctrl+B" );
@@ -589,7 +589,7 @@
                       &DialogsProvider::updateDialog);
 #endif
     menu->addSeparator();
-    addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/menu/info.svg",
+    addDPStaticEntry( menu, qfut( I_MENU_ABOUT ), ":/menu/info.svg",
             &DialogsProvider::aboutDialog, "Shift+F1", QAction::AboutRole );
     return menu;
 }
@@ -707,7 +707,7 @@
     action->setIcon( QIcon( ":/toolbar/skip_back.svg") );
 #endif
 
-    action = menu->addAction( qtr( I_MENU_GOTOTIME ), THEDP, &DialogsProvider::gotoTimeDialog, qtr( "Ctrl+T" ) );
+    action = menu->addAction( qfut( I_MENU_GOTOTIME ), THEDP, &DialogsProvider::gotoTimeDialog, qtr( "Ctrl+T" ) );
 
     menu->addSeparator();
 }
@@ -715,9 +715,9 @@
 void VLCMenuBar::PopupMenuStaticEntries( QMenu *menu )
 {
     QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu );
-    addDPStaticEntry( openmenu, qtr( I_OP_OPF ),
+    addDPStaticEntry( openmenu, qfut( I_OP_OPF ),
         ":/type/file-asym.svg", &DialogsProvider::openFileDialog);
-    addDPStaticEntry( openmenu, qtr( I_OP_OPDIR ),
+    addDPStaticEntry( openmenu, qfut( I_OP_OPDIR ),
         ":/type/folder-grey.svg", &DialogsProvider::PLOpenDir);
     addDPStaticEntry( openmenu, qtr( "Open &Disc..." ),
         ":/type/disc.svg", &DialogsProvider::openDiscDialog);

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/menus/qml_menu_wrapper.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/menus/qml_menu_wrapper.cpp Changed

@@ -20,6 +20,7 @@
 #include "util/qml_main_context.hpp"
 #include "medialibrary/medialib.hpp"
 #include "medialibrary/mlvideomodel.hpp"
+#include "medialibrary/mlgrouplistmodel.hpp"
 #include "medialibrary/mlplaylistlistmodel.hpp"
 #include "medialibrary/mlplaylistmodel.hpp"
 #include "medialibrary/mlalbummodel.hpp"
@@ -393,6 +394,50 @@
 }
 
 //=================================================================================================
+// GroupListContextMenu
+//=================================================================================================
+
+GroupListContextMenu::GroupListContextMenu(QObject * parent) : QObject(parent) {}
+
+GroupListContextMenu::~GroupListContextMenu() /* override */
+{
+    if (m_menu)
+        delete m_menu;
+}
+
+void GroupListContextMenu::popup(const QModelIndexList & selected, QPoint pos, QVariantMap)
+{
+    if (m_model == nullptr)
+        return;
+
+    if (m_menu)
+        delete m_menu;
+
+    QVariantList ids;
+
+    for (const QModelIndex & modelIndex : selected)
+        ids.push_back(m_model->data(modelIndex, MLGroupListModel::GROUP_ID));
+
+    m_menu = new QMenu();
+
+    MediaLib * ml = m_model->ml();
+
+    QAction * action = m_menu->addAction(qtr("Add and play"));
+
+    connect(action, &QAction::triggered, [ml, ids]() {
+        ml->addAndPlay(ids);
+    });
+
+    action = m_menu->addAction(qtr("Enqueue"));
+
+    connect(action, &QAction::triggered, [ml, ids]() {
+        ml->addToPlaylist(ids);
+    });
+
+    m_menu->popup(pos);
+}
+
+//=================================================================================================
 // PlaylistListContextMenu
 //=================================================================================================

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/menus/qml_menu_wrapper.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/menus/qml_menu_wrapper.hpp Changed

@@ -32,6 +32,8 @@
 class MLAlbumTrackModel;
 class MLUrlModel;
 class MLVideoModel;
+class MLGroupListModel;
+class MLGroupModel;
 class MLPlaylistListModel;
 class MLPlaylistModel;
 class NetworkDeviceModel;
@@ -216,6 +218,25 @@
     QMenu* m_menu = nullptr;
 };
 
+//-------------------------------------------------------------------------------------------------
+// Groups
+//-------------------------------------------------------------------------------------------------
+
+class GroupListContextMenu : public QObject {
+    Q_OBJECT
+    SIMPLE_MENU_PROPERTY(MLGroupListModel *, model, nullptr)
+public:
+    GroupListContextMenu(QObject * parent = nullptr);
+    ~GroupListContextMenu() /* override */;
+
+public slots:
+    void popup(const QModelIndexList & selected, QPoint pos, QVariantMap options = {});
+private:
+    QMenu* m_menu = nullptr;
+};
+
+//-------------------------------------------------------------------------------------------------
+
 class PlaylistListContextMenu : public QObject {
     Q_OBJECT
     SIMPLE_MENU_PROPERTY(MLPlaylistListModel *, model, nullptr)

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml Changed

@@ -52,8 +52,12 @@
                 height: VLCStyle.dp(32, VLCStyle.scale)
                 width: VLCStyle.colWidth(Math.max(VLCStyle.gridColumnsForWidth(root.width * .6), 2))
                 placeholderText: i18n.qtr("Paste or write the URL here")
-                color: VLCStyle.colors.text
+                palette.text: VLCStyle.colors.text
+                palette.highlight: VLCStyle.colors.bgHover
+                palette.highlightedText: VLCStyle.colors.bgHoverText
                 font.pixelSize: VLCStyle.fontSize_large
+                selectByMouse: true
+
                 background: Rectangle {
                     color: VLCStyle.colors.bg
                     border.width: VLCStyle.dp(2, VLCStyle.scale)
@@ -63,7 +67,10 @@
                 }
 
                 onAccepted: {
-                    mainPlaylistController.append([text], true)
+                    if (urlListDisplay.status == Loader.Ready)
+                        urlListDisplay.item.model.addAndPlay(text)
+                    else
+                        mainPlaylistController.append([text], true)
                 }
 
                 Keys.priority: Keys.AfterItem

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml Changed

@@ -190,6 +190,8 @@
                 subtitle: ""
                 height: VLCStyle.gridCover_network_height + VLCStyle.margin_xsmall + VLCStyle.fontHeight_normal
                 dragItem: networkDragItem
+                unselectedUnderlay: shadows.unselected
+                selectedUnderlay: shadows.selected
 
                 onPlayClicked: playAt(index)
                 onItemClicked : gridView.leftClickOnItem(modifier, index)
@@ -216,6 +218,13 @@
             navigationCancel: function() {
                 history.previous()
             }
+
+            Widgets.GridShadows {
+                id: shadows
+
+                coverWidth: VLCStyle.gridCover_network_width
+                coverHeight: VLCStyle.gridCover_network_height
+            }
         }
     }
 
@@ -305,6 +314,7 @@
             ]
 
             onActionForSelection: _actionAtIndex(selection[0].row)
+            onItemDoubleClicked: _actionAtIndex(index)
             onContextMenuButtonClicked: contextMenu.popup(filterModel.mapIndexesToSource(selectionModel.selectedIndexes), menuParent.mapToGlobal(0,0))
             onRightClick: contextMenu.popup(filterModel.mapIndexesToSource(selectionModel.selectedIndexes), globalMousePos)
         }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/network/qml/NetworkGridItem.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/network/qml/NetworkGridItem.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/network/qml/NetworkHomeDeviceListView.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/network/qml/NetworkHomeDeviceListView.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/network/qml/ServicesHomeDisplay.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/network/qml/ServicesHomeDisplay.qml Changed

@@ -302,9 +302,11 @@
                 pictureWidth: VLCStyle.colWidth(1)
                 pictureHeight: VLCStyle.gridCover_network_height
                 height: VLCStyle.gridCover_network_height + VLCStyle.margin_xsmall + VLCStyle.fontHeight_normal
-                playCoverBorder.width: VLCStyle.gridCover_network_border
+                playCoverBorderWidth: VLCStyle.gridCover_network_border
                 playCoverOnlyBorders: true
                 pictureOverlay: overlay
+                unselectedUnderlay: shadows.unselected
+                selectedUnderlay: shadows.selected
 
                 onItemDoubleClicked: {
                     if (is_dummy)
@@ -408,6 +410,13 @@
                 sourceModel: sourcesModel
                 searchRole: "name"
             }
+
+            Widgets.GridShadows {
+                id: shadows
+
+                coverWidth: VLCStyle.gridCover_network_width
+                coverHeight: VLCStyle.gridCover_network_height
+            }
         }
     }
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/pixmaps/VLCIcons.ttf -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/pixmaps/VLCIcons.ttf Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/pixmaps/faster.svg -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/pixmaps/faster.svg Changed

@@ -1,78 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="faster.svg">
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="956"
-     inkscape:window-height="1021"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="14.307204"
-     inkscape:cy="0.84031181"
-     inkscape:window-x="2560"
-     inkscape:window-y="30"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       position="0,24.017661"
-       orientation="1,0"
-       id="guide2390"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="23.59322,0"
-       orientation="0,1"
-       id="guide2392"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Master"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-384,-1004.3622)"
-     style="display:inline">
-    <path
-       style="display:inline;opacity:1;fill:#747474;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 11 12 L 11 36 L 25 24.800781 L 25 36 L 40 24 L 25 12 L 25 23.199219 L 11 12 z "
-       transform="translate(384,1004.3622)"
-       id="path7185-5" />
-  </g>
-</svg>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.7105 4.1584L21.7105 11.1584C22.0965 11.4587 22.0965 12.0422 21.7104 12.3425L12.7089 19.3425C12.2162 19.7256 11.4985 19.3745 11.4985 18.7503V13.673L4.20888 19.3425C3.7162 19.7256 2.99847 19.3745 2.99847 18.7503L3 4.75033C3.00007 4.12626 3.71784 3.77525 4.21046 4.1584L11.4985 9.82702L11.5 4.75033C11.5001 4.12626 12.2178 3.77525 12.7105 4.1584Z" fill="#212121"/>
+</svg>
\ No newline at end of file

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/pixmaps/slower.svg -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/pixmaps/slower.svg Changed

@@ -1,78 +1,1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="slower.svg">
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="956"
-     inkscape:window-height="1021"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="3.4766083"
-     inkscape:cx="-5.7712991"
-     inkscape:cy="36.518407"
-     inkscape:window-x="2560"
-     inkscape:window-y="30"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       position="0,24.017661"
-       orientation="1,0"
-       id="guide2390"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="23.59322,0"
-       orientation="0,1"
-       id="guide2392"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Master"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-384,-1004.3622)"
-     style="display:inline">
-    <path
-       style="display:inline;opacity:1;fill:#747474;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 23 12 L 8 24 L 23 36 L 23 24.800781 L 37 36 L 37 12 L 23 23.199219 L 23 12 z "
-       transform="translate(384,1004.3622)"
-       id="path6873" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"><path d="M12.288 19.342l-9-7a.75.75 0 0 1 0-1.184l9.002-7a.75.75 0 0 1 1.21.593v5.077l7.29-5.67a.75.75 0 0 1 1.21.593l-.002 14a.75.75 0 0 1-1.21.591L13.5 13.674l-.002 5.077a.75.75 0 0 1-1.21.591z" fill="#212121"/></svg>
\ No newline at end of file

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/control_list_model.cpp Added

@@ -0,0 +1,155 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+#include "control_list_model.hpp"
+
+ControlListModel::ControlListModel(QObject *parent) : QAbstractListModel(parent)
+{
+    connect(this, &QAbstractListModel::rowsInserted, this, &ControlListModel::countChanged);
+    connect(this, &QAbstractListModel::rowsRemoved, this, &ControlListModel::countChanged);
+    connect(this, &QAbstractListModel::modelReset, this, &ControlListModel::countChanged);
+}
+
+int ControlListModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return m_controls.size();
+}
+
+QVariant ControlListModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    const ControlType control = m_controls.at(index.row());
+
+    switch (role) {
+    case ID_ROLE:
+        return QVariant(control);
+    }
+    return QVariant();
+}
+
+bool ControlListModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    ControlType control = m_controls.at(index.row());
+
+    switch (role) {
+    case ID_ROLE:
+        if (value.canConvert(QVariant::Int))
+            control = static_cast<ControlType>(value.toInt());
+        else
+            return false;
+        break;
+    }
+
+    if (setButtonAt(index.row(), control)) {
+        emit dataChanged(index, index, { role });
+        return true;
+    }
+    return false;
+}
+
+Qt::ItemFlags ControlListModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::NoItemFlags;
+
+    return (Qt::ItemIsEditable | Qt::ItemNeverHasChildren);
+}
+
+QHash<int, QByteArray> ControlListModel::roleNames() const
+{
+    return {
+        {
+            ID_ROLE, "id"
+        }
+    };
+}
+
+QVector<int> ControlListModel::getControls() const
+{
+    QVector<int> list;
+
+    for (auto i : m_controls)
+    {
+        list.append(static_cast<int>(i));
+    }
+
+    return list;
+}
+
+void ControlListModel::setControls(const QVector<int> &list)
+{
+    beginResetModel();
+
+    m_controls.resize(list.size());
+
+    for (int i = 0; i < list.size(); ++i)
+    {
+        m_controls[i] = static_cast<ControlType>(list.at(i));
+    }
+
+    endResetModel();
+}
+
+bool ControlListModel::setButtonAt(int index, const ControlType &button)
+{
+    if(index < 0 || index >= m_controls.size())
+        return false;
+
+    const ControlType oldControl = m_controls.at(index);
+
+    if (button == oldControl)
+        return false;
+
+    m_controls[index] = button;
+    return true;
+}
+
+void ControlListModel::insert(int index, QVariantMap bdata)
+{
+    beginInsertRows(QModelIndex(), index, index);
+    m_controls.insert(index, static_cast<ControlType>(bdata.value("id").toInt()));
+    endInsertRows();
+}
+void ControlListModel::move(int src, int dest)
+{
+    if(src == dest)
+        return;
+
+    beginMoveRows(QModelIndex(), src, src, QModelIndex(), dest + (src < dest ? 1 : 0));
+    m_controls.move(src, dest);
+    endMoveRows();
+}
+
+void ControlListModel::remove(int index)
+{
+    beginRemoveRows(QModelIndex(), index, index);
+    m_controls.remove(index);
+    endRemoveRows();
+}
+
+void ControlListModel::clear()
+{
+    beginResetModel();
+    m_controls.clear();
+    endResetModel();
+}

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/control_list_model.hpp Added

@@ -0,0 +1,111 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+#ifndef CONTROLLISTMODEL_HPP
+#define CONTROLLISTMODEL_HPP
+
+#include <QAbstractListModel>
+#include <QVector>
+
+class ControlListModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+
+public:
+    explicit ControlListModel(QObject *parent = nullptr);
+
+    enum Roles {
+        ID_ROLE = Qt::UserRole
+    };
+
+    enum ControlType
+    {
+        PLAY_BUTTON,
+        STOP_BUTTON,
+        OPEN_BUTTON,
+        PREVIOUS_BUTTON,
+        NEXT_BUTTON,
+        SLOWER_BUTTON,
+        FASTER_BUTTON,
+        FULLSCREEN_BUTTON,
+        EXTENDED_BUTTON,
+        PLAYLIST_BUTTON,
+        SNAPSHOT_BUTTON,
+        RECORD_BUTTON,
+        ATOB_BUTTON,
+        FRAME_BUTTON,
+        SKIP_BACK_BUTTON,
+        SKIP_FW_BUTTON,
+        QUIT_BUTTON,
+        RANDOM_BUTTON,
+        LOOP_BUTTON,
+        INFO_BUTTON,
+        LANG_BUTTON,
+        MENU_BUTTON,
+        BACK_BUTTON,
+        CHAPTER_PREVIOUS_BUTTON,
+        CHAPTER_NEXT_BUTTON,
+        BUTTON_MAX,
+        PLAYER_SWITCH_BUTTON,
+        ARTWORK_INFO,
+        PLAYBACK_SPEED_BUTTON,
+
+        SPLITTER = 0x20,
+        VOLUME,
+        TELETEXT_BUTTONS,
+        ASPECT_RATIO_COMBOBOX,
+        SPECIAL_MAX,
+
+        WIDGET_SPACER = 0x40,
+        WIDGET_SPACER_EXTEND,
+        WIDGET_MAX
+    };
+    Q_ENUM(ControlType)
+
+    // Basic functionality:
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    // Editable:
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole) override;
+
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
+
+    virtual QHash<int, QByteArray> roleNames() const override;
+
+    QVector<int> getControls() const;
+    void setControls(const QVector<int>& list);
+
+signals:
+    void countChanged();
+
+private:
+    QVector<ControlType> m_controls;
+    bool setButtonAt(int index, const ControlType &button);
+
+public slots:
+    Q_INVOKABLE void insert(int index, QVariantMap bdata);
+    Q_INVOKABLE void move(int src,int dest);
+    Q_INVOKABLE void remove(int index);
+    Q_INVOKABLE void clear();
+};
+
+#endif // CONTROLLISTMODEL_HPP

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/player_controlbar_model.cpp Added

@@ -0,0 +1,137 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+#include "player_controlbar_model.hpp"
+
+#include <QMetaEnum>
+#include <QJSEngine>
+
+#include "qt.hpp"
+#include "control_list_model.hpp"
+
+decltype (PlayerControlbarModel::playerIdentifierDictionary)
+    PlayerControlbarModel::playerIdentifierDictionary {
+        {Mainplayer, N_("Mainplayer")},
+        {Miniplayer, N_("Miniplayer")}
+    };
+
+QJSValue PlayerControlbarModel::getPlaylistIdentifierListModel(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+
+    static const QMetaEnum metaEnum = QMetaEnum::fromType<PlayerIdentifier>();
+
+    QJSValue array = scriptEngine->newArray();
+
+    for (int i = 0; i < metaEnum.keyCount(); ++i)
+    {
+       QJSValue obj = scriptEngine->newObject();
+
+       const int val = metaEnum.value(i);
+       obj.setProperty("identifier", val);
+
+       QString key;
+       if ( playerIdentifierDictionary.contains(static_cast<PlayerControlbarModel::PlayerIdentifier>(i)) )
+       {
+           key = qfut( playerIdentifierDictionary[static_cast<PlayerControlbarModel::PlayerIdentifier>(i)] );
+       }
+       else
+       {
+           key = metaEnum.key(i);
+       }
+
+       obj.setProperty("name", key);
+
+       array.setProperty(i, obj);
+    }
+
+    QJSValue value = scriptEngine->newObject();
+    value.setProperty("model", array);
+
+    return value;
+}
+
+PlayerControlbarModel::PlayerControlbarModel(QObject *parent) : QObject(parent)
+{
+    m_left = new ControlListModel(this);
+    m_center = new ControlListModel(this);
+    m_right = new ControlListModel(this);
+
+    connect(m_left, &ControlListModel::countChanged, this, &PlayerControlbarModel::contentChanged);
+    connect(m_center, &ControlListModel::countChanged, this, &PlayerControlbarModel::contentChanged);
+    connect(m_right, &ControlListModel::countChanged, this, &PlayerControlbarModel::contentChanged);
+
+    connect(m_left, &QAbstractListModel::dataChanged, this, &PlayerControlbarModel::contentChanged);
+    connect(m_center, &QAbstractListModel::dataChanged, this, &PlayerControlbarModel::contentChanged);
+    connect(m_right, &QAbstractListModel::dataChanged, this, &PlayerControlbarModel::contentChanged);
+}
+
+PlayerControlbarModel::~PlayerControlbarModel()
+{
+    setDirty(false);
+}
+
+bool PlayerControlbarModel::dirty() const
+{
+    return m_dirty;
+}
+
+std::array<QVector<int>, 3> PlayerControlbarModel::serializeModels() const
+{
+    return { left()->getControls(),
+            center()->getControls(),
+            right()->getControls() };
+}
+
+void PlayerControlbarModel::loadModels(const std::array<QVector<int>, 3> &array)
+{
+    left()->setControls(array.at(0));
+    center()->setControls(array.at(1));
+    right()->setControls(array.at(2));
+}
+
+ControlListModel *PlayerControlbarModel::left() const
+{
+    return m_left;
+}
+
+ControlListModel *PlayerControlbarModel::center() const
+{
+    return m_center;
+}
+
+ControlListModel *PlayerControlbarModel::right() const
+{
+    return m_right;
+}
+
+void PlayerControlbarModel::setDirty(bool dirty)
+{
+    if (m_dirty == dirty)
+        return;
+
+    m_dirty = dirty;
+    emit dirtyChanged(m_dirty);
+}
+
+void PlayerControlbarModel::contentChanged()
+{
+    setDirty(true);
+
+    emit controlListChanged();
+}

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/player_controlbar_model.hpp Added

@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+#ifndef PLAYERCONTROLBARMODEL_HPP
+#define PLAYERCONTROLBARMODEL_HPP
+
+#include <QObject>
+#include <QJSValue>
+#include <QMap>
+
+#include <array>
+
+class ControlListModel;
+
+class PlayerControlbarModel : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool dirty READ dirty WRITE setDirty NOTIFY dirtyChanged)
+
+    Q_PROPERTY(ControlListModel* left READ left CONSTANT)
+    Q_PROPERTY(ControlListModel* center READ center CONSTANT)
+    Q_PROPERTY(ControlListModel* right READ right CONSTANT)
+
+public:
+    // When there is a need to add a new Player, just
+    // add its identifier in this enum and set QML buttons layout
+    // identifier to it. Such as `property int identifier =
+    // PlayerControlbarModel.Mainplayer`.
+    // To make it translatable, add a corresponding entry to
+    // the static member playerIdentifierDictionary which is
+    // initalized in the source file.
+    enum PlayerIdentifier {
+        Mainplayer = 0,
+        Miniplayer
+    };
+    Q_ENUM(PlayerIdentifier)
+    // This enum is iterated through QMetaEnum, and
+    // a model out of this enum is generated
+    // and used in the configuration editor.
+    // Thanks to MOC, adding an entry to this enum
+    // is enough for the editor to consider the
+    // added entry without any other modification.
+    // (except for the translation)
+
+    static const QMap<PlayerIdentifier, const char*> playerIdentifierDictionary;
+
+    static QJSValue getPlaylistIdentifierListModel(class QQmlEngine *engine,
+                                                   class QJSEngine *scriptEngine);
+
+    explicit PlayerControlbarModel(QObject *parent = nullptr);
+    ~PlayerControlbarModel();
+
+    bool dirty() const;
+
+    std::array<QVector<int>, 3> serializeModels() const;
+    void loadModels(const std::array<QVector<int>, 3>& array);
+
+    ControlListModel* left() const;
+    ControlListModel* center() const;
+    ControlListModel* right() const;
+
+public slots:
+    void setDirty(bool dirty);
+
+signals:
+    void dirtyChanged(bool dirty);
+    void controlListChanged();
+
+private:
+    bool m_dirty = false;
+
+    ControlListModel* m_left = nullptr;
+    ControlListModel* m_center = nullptr;
+    ControlListModel* m_right = nullptr;
+
+private slots:
+    void contentChanged();
+};
+
+#endif

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/qml/ButtonsLayout.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/ButtonsLayout.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/qml/ControlBar.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/ControlBar.qml Changed

@@ -40,7 +40,7 @@
     readonly property alias sliderY: row2.y
     property int textPosition: ControlBar.TimeTextPosition.AboveSlider
     property VLCColors colors: VLCStyle.nightColors
-    property var configs: ["MainPlayerToolbar-left", "MainPlayerToolbar-center", "MainPlayerToolbar-right"]
+    property alias identifier: playerButtonsLayout.identifier
     property alias sliderHeight: trackPositionSlider.barHeight
     property alias sliderBackgroundColor: trackPositionSlider.backgroundColor
     property alias sliderProgressColor: trackPositionSlider.progressBarColor
@@ -145,8 +145,6 @@
                     bottomMargin: VLCStyle.applicationVerticalMargin
                 }
 
-                models: [playerControlBarModel_left, playerControlBarModel_center, playerControlBarModel_right]
-
                 navigationUpItem: trackPositionSlider.enabled ? trackPositionSlider : root.navigationUpItem
 
                 colors: root.colors
@@ -194,23 +192,4 @@
 
         Keys.onDownPressed: playerButtonsLayout.focus = true
     }
-
-
-    PlayerControlBarModel{
-        id:playerControlBarModel_left
-        mainCtx: mainctx
-        configName: root.configs[0]
-    }
-
-    PlayerControlBarModel{
-        id:playerControlBarModel_center
-        mainCtx: mainctx
-        configName: root.configs[1]
-    }
-
-    PlayerControlBarModel{
-        id:playerControlBarModel_right
-        mainCtx: mainctx
-        configName: root.configs[2]
-    }
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/qml/ControlButtons.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/ControlButtons.qml Changed

@@ -26,6 +26,7 @@
 import "qrc:///widgets/" as Widgets
 import "qrc:///style/"
 import "qrc:///util/KeyHelper.js" as KeyHelper
+import "qrc:///util/Helpers.js" as Helpers
 
 Item{
     id: controlButtons
@@ -35,74 +36,76 @@
     signal requestLockUnlockAutoHide(bool lock, var source)
 
     property var buttonL: [
-        { id:  PlayerControlBarModel.PLAY_BUTTON, label: VLCIcons.play, text: i18n.qtr("Play")},
-        { id:  PlayerControlBarModel.STOP_BUTTON, label: VLCIcons.stop, text: i18n.qtr("Stop")},
-        { id:  PlayerControlBarModel.OPEN_BUTTON, label: VLCIcons.eject, text: i18n.qtr("Open")},
-        { id:  PlayerControlBarModel.PREVIOUS_BUTTON, label: VLCIcons.previous, text: i18n.qtr("Previous")},
-        { id:  PlayerControlBarModel.NEXT_BUTTON, label: VLCIcons.next, text: i18n.qtr("Next")},
-        { id:  PlayerControlBarModel.SLOWER_BUTTON, label: VLCIcons.slower, text: i18n.qtr("Slower")},
-        { id:  PlayerControlBarModel.FASTER_BUTTON, label: VLCIcons.faster, text: i18n.qtr("Faster")},
-        { id:  PlayerControlBarModel.FULLSCREEN_BUTTON, label: VLCIcons.fullscreen, text: i18n.qtr("Fullscreen")},
-        { id:  PlayerControlBarModel.EXTENDED_BUTTON, label: VLCIcons.extended, text: i18n.qtr("Extended panel")},
-        { id:  PlayerControlBarModel.PLAYLIST_BUTTON, label: VLCIcons.playlist, text: i18n.qtr("Playlist")},
-        { id:  PlayerControlBarModel.SNAPSHOT_BUTTON, label: VLCIcons.snapshot, text: i18n.qtr("Snapshot")},
-        { id:  PlayerControlBarModel.RECORD_BUTTON, label: VLCIcons.record, text: i18n.qtr("Record")},
-        { id:  PlayerControlBarModel.ATOB_BUTTON, label: VLCIcons.atob, text: i18n.qtr("A-B Loop")},
-        { id:  PlayerControlBarModel.FRAME_BUTTON, label: VLCIcons.frame_by_frame, text: i18n.qtr("Frame By Frame")},
-        { id:  PlayerControlBarModel.SKIP_BACK_BUTTON, label: VLCIcons.skip_back, text: i18n.qtr("Step backward")},
-        { id:  PlayerControlBarModel.SKIP_FW_BUTTON, label: VLCIcons.skip_for, text: i18n.qtr("Step forward")},
-        { id:  PlayerControlBarModel.QUIT_BUTTON, label: VLCIcons.clear, text: i18n.qtr("Quit")},
-        { id:  PlayerControlBarModel.RANDOM_BUTTON, label: VLCIcons.shuffle_on, text: i18n.qtr("Random")},
-        { id:  PlayerControlBarModel.LOOP_BUTTON, label: VLCIcons.repeat_all, text: i18n.qtr("Loop")},
-        { id:  PlayerControlBarModel.INFO_BUTTON, label: VLCIcons.info, text: i18n.qtr("Information")},
-        { id:  PlayerControlBarModel.LANG_BUTTON, label: VLCIcons.audiosub, text: i18n.qtr("Open subtitles")},
-        { id:  PlayerControlBarModel.MENU_BUTTON, label: VLCIcons.menu, text: i18n.qtr("Menu Button")},
-        { id:  PlayerControlBarModel.BACK_BUTTON, label: VLCIcons.exit, text: i18n.qtr("Back Button")},
-        { id:  PlayerControlBarModel.CHAPTER_PREVIOUS_BUTTON, label: VLCIcons.dvd_prev, text: i18n.qtr("Previous chapter")},
-        { id:  PlayerControlBarModel.CHAPTER_NEXT_BUTTON, label: VLCIcons.dvd_next, text: i18n.qtr("Next chapter")},
-        { id:  PlayerControlBarModel.VOLUME, label: VLCIcons.volume_high, text: i18n.qtr("Volume Widget")},
-        { id:  PlayerControlBarModel.TELETEXT_BUTTONS, label: VLCIcons.tvtelx, text: i18n.qtr("Teletext")},
-        { id:  PlayerControlBarModel.ASPECT_RATIO_COMBOBOX, label: VLCIcons.aspect_ratio, text: i18n.qtr("Aspect Ratio")},
-        { id:  PlayerControlBarModel.WIDGET_SPACER, label: VLCIcons.space, text: i18n.qtr("Spacer")},
-        { id:  PlayerControlBarModel.WIDGET_SPACER_EXTEND, label: VLCIcons.space, text: i18n.qtr("Expanding Spacer")},
-        { id:  PlayerControlBarModel.PLAYER_SWITCH_BUTTON, label: VLCIcons.fullscreen, text: i18n.qtr("Switch Player")},
-        { id:  PlayerControlBarModel.ARTWORK_INFO, label: VLCIcons.info, text: i18n.qtr("Artwork Info")}
+        { id:  ControlListModel.PLAY_BUTTON, label: VLCIcons.play, text: i18n.qtr("Play")},
+        { id:  ControlListModel.STOP_BUTTON, label: VLCIcons.stop, text: i18n.qtr("Stop")},
+        { id:  ControlListModel.OPEN_BUTTON, label: VLCIcons.eject, text: i18n.qtr("Open")},
+        { id:  ControlListModel.PREVIOUS_BUTTON, label: VLCIcons.previous, text: i18n.qtr("Previous")},
+        { id:  ControlListModel.NEXT_BUTTON, label: VLCIcons.next, text: i18n.qtr("Next")},
+        { id:  ControlListModel.SLOWER_BUTTON, label: VLCIcons.slower, text: i18n.qtr("Slower")},
+        { id:  ControlListModel.FASTER_BUTTON, label: VLCIcons.faster, text: i18n.qtr("Faster")},
+        { id:  ControlListModel.FULLSCREEN_BUTTON, label: VLCIcons.fullscreen, text: i18n.qtr("Fullscreen")},
+        { id:  ControlListModel.EXTENDED_BUTTON, label: VLCIcons.extended, text: i18n.qtr("Extended panel")},
+        { id:  ControlListModel.PLAYLIST_BUTTON, label: VLCIcons.playlist, text: i18n.qtr("Playlist")},
+        { id:  ControlListModel.SNAPSHOT_BUTTON, label: VLCIcons.snapshot, text: i18n.qtr("Snapshot")},
+        { id:  ControlListModel.RECORD_BUTTON, label: VLCIcons.record, text: i18n.qtr("Record")},
+        { id:  ControlListModel.ATOB_BUTTON, label: VLCIcons.atob, text: i18n.qtr("A-B Loop")},
+        { id:  ControlListModel.FRAME_BUTTON, label: VLCIcons.frame_by_frame, text: i18n.qtr("Frame By Frame")},
+        { id:  ControlListModel.SKIP_BACK_BUTTON, label: VLCIcons.skip_back, text: i18n.qtr("Step backward")},
+        { id:  ControlListModel.SKIP_FW_BUTTON, label: VLCIcons.skip_for, text: i18n.qtr("Step forward")},
+        { id:  ControlListModel.QUIT_BUTTON, label: VLCIcons.clear, text: i18n.qtr("Quit")},
+        { id:  ControlListModel.RANDOM_BUTTON, label: VLCIcons.shuffle_on, text: i18n.qtr("Random")},
+        { id:  ControlListModel.LOOP_BUTTON, label: VLCIcons.repeat_all, text: i18n.qtr("Loop")},
+        { id:  ControlListModel.INFO_BUTTON, label: VLCIcons.info, text: i18n.qtr("Information")},
+        { id:  ControlListModel.LANG_BUTTON, label: VLCIcons.audiosub, text: i18n.qtr("Open subtitles")},
+        { id:  ControlListModel.MENU_BUTTON, label: VLCIcons.menu, text: i18n.qtr("Menu Button")},
+        { id:  ControlListModel.BACK_BUTTON, label: VLCIcons.exit, text: i18n.qtr("Back Button")},
+        { id:  ControlListModel.CHAPTER_PREVIOUS_BUTTON, label: VLCIcons.dvd_prev, text: i18n.qtr("Previous chapter")},
+        { id:  ControlListModel.CHAPTER_NEXT_BUTTON, label: VLCIcons.dvd_next, text: i18n.qtr("Next chapter")},
+        { id:  ControlListModel.VOLUME, label: VLCIcons.volume_high, text: i18n.qtr("Volume Widget")},
+        { id:  ControlListModel.TELETEXT_BUTTONS, label: VLCIcons.tvtelx, text: i18n.qtr("Teletext")},
+        { id:  ControlListModel.ASPECT_RATIO_COMBOBOX, label: VLCIcons.aspect_ratio, text: i18n.qtr("Aspect Ratio")},
+        { id:  ControlListModel.WIDGET_SPACER, label: VLCIcons.space, text: i18n.qtr("Spacer")},
+        { id:  ControlListModel.WIDGET_SPACER_EXTEND, label: VLCIcons.space, text: i18n.qtr("Expanding Spacer")},
+        { id:  ControlListModel.PLAYER_SWITCH_BUTTON, label: VLCIcons.fullscreen, text: i18n.qtr("Switch Player")},
+        { id:  ControlListModel.ARTWORK_INFO, label: VLCIcons.info, text: i18n.qtr("Artwork Info")},
+        { id:  ControlListModel.PLAYBACK_SPEED_BUTTON, label: "1x", text: i18n.qtr("Playback Speed")}
     ]
 
     function returnbuttondelegate(inpID){
         switch (inpID){
-        case PlayerControlBarModel.RANDOM_BUTTON: return randomBtnDelegate
-        case PlayerControlBarModel.PREVIOUS_BUTTON: return prevBtnDelegate
-        case PlayerControlBarModel.PLAY_BUTTON: return playBtnDelegate
-        case PlayerControlBarModel.NEXT_BUTTON: return nextBtnDelegate
-        case PlayerControlBarModel.LOOP_BUTTON: return repeatBtnDelegate
-        case PlayerControlBarModel.LANG_BUTTON: return langBtnDelegate
-        case PlayerControlBarModel.PLAYLIST_BUTTON:return playlistBtnDelegate
-        case PlayerControlBarModel.MENU_BUTTON:return  menuBtnDelegate
-        case PlayerControlBarModel.CHAPTER_PREVIOUS_BUTTON:return  chapterPreviousBtnDelegate
-        case PlayerControlBarModel.CHAPTER_NEXT_BUTTON:return  chapterNextBtnDelegate
-        case PlayerControlBarModel.BACK_BUTTON:return  backBtnDelegate
-        case PlayerControlBarModel.WIDGET_SPACER:return  spacerDelegate
-        case PlayerControlBarModel.WIDGET_SPACER_EXTEND:return  extendiblespacerDelegate
-        case PlayerControlBarModel.RECORD_BUTTON: return recordBtnDelegate
-        case PlayerControlBarModel.FULLSCREEN_BUTTON: return fullScreenBtnDelegate
-        case PlayerControlBarModel.ATOB_BUTTON: return toggleABloopstateDelegate
-        case PlayerControlBarModel.SNAPSHOT_BUTTON: return snapshotBtnDelegate
-        case PlayerControlBarModel.STOP_BUTTON: return stopBtndelgate
-        case PlayerControlBarModel.INFO_BUTTON: return mediainfoBtnDelegate
-        case PlayerControlBarModel.FRAME_BUTTON: return framebyframeDelegate
-        case PlayerControlBarModel.FASTER_BUTTON: return fasterBtnDelegate
-        case PlayerControlBarModel.SLOWER_BUTTON: return slowerBtnDelegate
-        case PlayerControlBarModel.OPEN_BUTTON: return openmediaBtnDelegate
-        case PlayerControlBarModel.EXTENDED_BUTTON: return extdSettingsBtnDelegate
-        case PlayerControlBarModel.SKIP_FW_BUTTON: return stepFwdBtnDelegate
-        case PlayerControlBarModel.SKIP_BACK_BUTTON: return stepBackBtnDelegate
-        case PlayerControlBarModel.QUIT_BUTTON: return quitBtnDelegate
-        case PlayerControlBarModel.VOLUME: return volumeBtnDelegate
-        case PlayerControlBarModel.ASPECT_RATIO_COMBOBOX: return aspectRatioDelegate
-        case PlayerControlBarModel.TELETEXT_BUTTONS: return teletextdelegate
-        case PlayerControlBarModel.PLAYER_SWITCH_BUTTON: return playerSwitchBtnDelegate
-        case PlayerControlBarModel.ARTWORK_INFO: return artworkInfoDelegate
+        case ControlListModel.RANDOM_BUTTON: return randomBtnDelegate
+        case ControlListModel.PREVIOUS_BUTTON: return prevBtnDelegate
+        case ControlListModel.PLAY_BUTTON: return playBtnDelegate
+        case ControlListModel.NEXT_BUTTON: return nextBtnDelegate
+        case ControlListModel.LOOP_BUTTON: return repeatBtnDelegate
+        case ControlListModel.LANG_BUTTON: return langBtnDelegate
+        case ControlListModel.PLAYLIST_BUTTON:return playlistBtnDelegate
+        case ControlListModel.MENU_BUTTON:return  menuBtnDelegate
+        case ControlListModel.CHAPTER_PREVIOUS_BUTTON:return  chapterPreviousBtnDelegate
+        case ControlListModel.CHAPTER_NEXT_BUTTON:return  chapterNextBtnDelegate
+        case ControlListModel.BACK_BUTTON:return  backBtnDelegate
+        case ControlListModel.WIDGET_SPACER:return  spacerDelegate
+        case ControlListModel.WIDGET_SPACER_EXTEND:return  extendiblespacerDelegate
+        case ControlListModel.RECORD_BUTTON: return recordBtnDelegate
+        case ControlListModel.FULLSCREEN_BUTTON: return fullScreenBtnDelegate
+        case ControlListModel.ATOB_BUTTON: return toggleABloopstateDelegate
+        case ControlListModel.SNAPSHOT_BUTTON: return snapshotBtnDelegate
+        case ControlListModel.STOP_BUTTON: return stopBtndelgate
+        case ControlListModel.INFO_BUTTON: return mediainfoBtnDelegate
+        case ControlListModel.FRAME_BUTTON: return framebyframeDelegate
+        case ControlListModel.FASTER_BUTTON: return fasterBtnDelegate
+        case ControlListModel.SLOWER_BUTTON: return slowerBtnDelegate
+        case ControlListModel.OPEN_BUTTON: return openmediaBtnDelegate
+        case ControlListModel.EXTENDED_BUTTON: return extdSettingsBtnDelegate
+        case ControlListModel.SKIP_FW_BUTTON: return stepFwdBtnDelegate
+        case ControlListModel.SKIP_BACK_BUTTON: return stepBackBtnDelegate
+        case ControlListModel.QUIT_BUTTON: return quitBtnDelegate
+        case ControlListModel.VOLUME: return volumeBtnDelegate
+        case ControlListModel.ASPECT_RATIO_COMBOBOX: return aspectRatioDelegate
+        case ControlListModel.TELETEXT_BUTTONS: return teletextdelegate
+        case ControlListModel.PLAYER_SWITCH_BUTTON: return playerSwitchBtnDelegate
+        case ControlListModel.ARTWORK_INFO: return artworkInfoDelegate
+        case ControlListModel.PLAYBACK_SPEED_BUTTON: return playbackSpeedButtonDelegate
         }
         console.log("button delegate id " + inpID +  " doesn't exists")
         return spacerDelegate
@@ -433,28 +436,37 @@
             size: VLCStyle.icon_medium
             iconText: VLCIcons.audiosub
 
-            onClicked: langMenu.open()
+            enabled: langMenuLoader.status === Loader.Ready
+            onClicked: langMenuLoader.item.open()
 
             text: i18n.qtr("Languages and tracks")
 
-            LanguageMenu {
-                id: langMenu
+            Loader {
+                id: langMenuLoader
 
-                parent: rootPlayer
-                focus: true
-                x: 0
-                y: (!!rootPlayer) ? (rootPlayer.positionSliderY - height) : 0
-                z: 1
+                active: (typeof rootPlayer !== 'undefined') && (rootPlayer !== null)
 
-                onOpened: {
-                    controlButtons.requestLockUnlockAutoHide(true, controlButtons)
-                    rootPlayer._menu = langMenu
-                }
+                sourceComponent: LanguageMenu {
+                    id: langMenu
 
-                onMenuClosed: {
-                    controlButtons.requestLockUnlockAutoHide(false, controlButtons)
-                    langBtn.forceActiveFocus()
-                    rootPlayer._menu = undefined
+                    parent: rootPlayer
+                    focus: true
+                    x: 0
+                    y: (rootPlayer.positionSliderY - height)
+                    z: 1
+
+                    onOpened: {
+                        controlButtons.requestLockUnlockAutoHide(true, controlButtons)
+                        if (!!rootPlayer)
+                            rootPlayer.menu = langMenu
+                    }
+
+                    onClosed: {
+                        controlButtons.requestLockUnlockAutoHide(false, controlButtons)
+                        langBtn.forceActiveFocus()
+                        if (!!rootPlayer)
+                            rootPlayer.menu = undefined
+                    }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/qml/LanguageMenu.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/LanguageMenu.qml Changed

@@ -29,34 +29,17 @@
 import "qrc:///util/" as Util
 import "qrc:///util/KeyHelper.js" as KeyHelper
 
-T.Menu {
+T.Popup {
     id: control
 
-    property var parentMenu: undefined
-    property bool _emitMenuClose: true
-    signal menuClosed
-
-    modal: true
-    cascade: false
-    closePolicy: Popup.CloseOnPressOutside | Popup.CloseOnEscape
     height: VLCStyle.dp(296, VLCStyle.scale)
-    width: (!!rootPlayer) ? rootPlayer.width : 0
+    width: rootPlayer.width
 
-    onOpened: {
-        control._emitMenuClose = true
-
-        for (var i = 0; i < control.count; i++) {
-            if (control.itemAt(i).enabled) {
-                control.currentIndex = i
-                break
-            }
-        }
-    }
-
-    onClosed: {
-        if (control._emitMenuClose) {
-            menuClosed()
-        }
+    // Popup.CloseOnPressOutside doesn't work with non-model Popup on Qt < 5.15
+    closePolicy: Popup.CloseOnPressOutside | Popup.CloseOnEscape
+    modal: true
+    T.Overlay.modal: Rectangle {
+        color: "transparent"
     }
 
     contentItem: StackView {
@@ -107,10 +90,6 @@
         opacity: .8
     }
 
-    T.Overlay.modal: Rectangle {
-        color: "transparent"
-    }
-
     function _updateWidth(isFirstPage) {
         if (isFirstPage)
             control.width = Qt.binding(function () {

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/qml/MiniPlayer.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/MiniPlayer.qml Changed

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/PlaybackSpeed.qml Added

@@ -0,0 +1,173 @@
+/*****************************************************************************
+ * 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 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.3
+
+import org.videolan.vlc 0.1
+
+import "qrc:///style/"
+import "qrc:///widgets/" as Widgets
+
+Popup {
+    id: root
+
+    property VLCColors colors: VLCStyle.nightColors
+
+    height: implicitHeight
+    width: implicitWidth
+    padding: VLCStyle.margin_small
+
+    // Popup.CloseOnPressOutside doesn't work with non-model Popup on Qt < 5.15
+    closePolicy: Popup.CloseOnPressOutside | Popup.CloseOnEscape
+    modal: true
+    Overlay.modal: Rectangle {
+       color: "transparent"
+    }
+
+    background: Rectangle {
+        color: colors.bg
+        opacity: .85
+    }
+
+    contentItem: ColumnLayout {
+        spacing: VLCStyle.margin_xsmall
+
+        Widgets.ListLabel {
+            text: i18n.qtr("Playback Speed")
+            color: root.colors.text
+            font.pixelSize: VLCStyle.fontSize_large
+
+            Layout.fillWidth: true
+            Layout.bottomMargin: VLCStyle.margin_xsmall
+        }
+
+        Slider {
+            id: speedSlider
+
+            property bool _inhibitUpdate: false
+
+            from: 0.25
+            to: 4
+            clip: true
+            implicitHeight: VLCStyle.heightBar_small
+            KeyNavigation.down: slowerButton
+
+            background: Rectangle {
+                x: speedSlider.leftPadding
+                y: speedSlider.topPadding + speedSlider.availableHeight / 2 - height / 2
+                implicitWidth: 200
+                implicitHeight: 4
+                width: speedSlider.availableWidth
+                height: implicitHeight
+                radius: 2
+                color: root.colors.bgAlt
+
+                Rectangle {
+                    width: speedSlider.visualPosition * parent.width
+                    height: parent.height
+                    radius: 2
+                    color: (speedSlider.activeFocus || speedSlider.pressed)
+                           ? root.colors.accent
+                           : root.colors.text
+                }
+            }
+
+            handle: Rectangle {
+                x: speedSlider.leftPadding + speedSlider.visualPosition * (speedSlider.availableWidth - width)
+                y: speedSlider.topPadding + speedSlider.availableHeight / 2 - height / 2
+                width: speedSlider.implicitHeight
+                height: speedSlider.implicitHeight
+                radius: speedSlider.implicitHeight
+                color: (speedSlider.activeFocus || speedSlider.pressed) ? root.colors.accent : root.colors.text
+            }
+
+            onValueChanged:  {
+                if (_inhibitUpdate)
+                    return
+                player.rate = value
+            }
+
+            function _updateFromPlayer() {
+                _inhibitUpdate = true
+                value = player.rate
+                _inhibitUpdate = false
+            }
+
+            Connections {
+                target: player
+                onRateChanged: speedSlider._updateFromPlayer()
+            }
+
+            Layout.fillWidth: true
+
+            Component.onCompleted: speedSlider._updateFromPlayer()
+        }
+
+        RowLayout {
+            spacing: 0
+            KeyNavigation.up: speedSlider
+
+            Widgets.IconControlButton {
+                id: slowerButton
+
+                iconText: VLCIcons.slower
+                colors: root.colors
+                KeyNavigation.right: resetButton
+
+                onClicked: speedSlider.decrease()
+            }
+
+            Item {
+                Layout.fillWidth: true
+            }
+
+            Widgets.IconControlButton {
+                id: resetButton
+
+                colors: root.colors
+                KeyNavigation.left: slowerButton
+                KeyNavigation.right: fasterButton
+
+                onClicked: speedSlider.value = 1.0
+
+                Label {
+                    anchors.centerIn: parent
+                    font.pixelSize: VLCStyle.fontSize_normal
+                    text: i18n.qtr("1x")
+                    color: resetButton.background.foregroundColor // IconToolButton.background is a FocusBackground
+                }
+            }
+
+            Item {
+                Layout.fillWidth: true
+            }
+
+            Widgets.IconControlButton {
+                id: fasterButton
+
+                iconText: VLCIcons.faster
+                colors: root.colors
+                KeyNavigation.left: resetButton
+
+                onClicked: speedSlider.increase()
+            }
+        }
+    }
+}

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/qml/Player.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/Player.qml Changed

@@ -32,7 +32,7 @@
     id: rootPlayer
 
     //menu/overlay to dismiss
-    property var _menu: undefined
+    property var menu: undefined
     property int _lockAutoHide: 0
     readonly property bool _autoHide: _lockAutoHide == 0
                                       && rootPlayer.hasEmbededVideo
@@ -92,8 +92,12 @@
     }
 
     function dismiss() {
-        if (_menu)
-            _menu.dismiss()
+        if ((typeof menu === undefined) || !menu)
+            return
+        if (menu.hasOwnProperty("dismiss"))
+            menu.dismiss()
+        else if (menu.hasOwnProperty("close"))
+            menu.close()
     }
 
     function lockUnlockAutoHide(lock, source /*unused*/) {
@@ -200,9 +204,18 @@
         edge: Widgets.DrawerExt.Edges.Top
         state: topcontrolView.state
         width: parent.width
-        visible: rootPlayer.hasEmbededVideo || rootPlayer.pinVideoControls
+        visible: rootPlayer.hasEmbededVideo || rootPlayer.pinVideoControls || topcontrolView.contentItem.isResumeDialogVisible
         height: contentItem.height
-        component: rootPlayer.pinVideoControls ? backgroundForPinnedControls : topcontrolViewBackground
+
+        component: {
+            if (rootPlayer.pinVideoControls)
+                return backgroundForPinnedControls
+            else if (topcontrolView.contentItem.isResumeDialogVisible)
+                return topcontrolViewResumeBg
+            else
+                return topcontrolViewBackground
+        }
+
         onContentItemChanged: {
             if (rootPlayer.pinVideoControls)
                 contentItem.height = Qt.binding(function () { return topcontrolView.height + topcontrolView.anchors.topMargin; })
@@ -220,6 +233,17 @@
                 }
             }
         }
+
+        Component {
+            id: topcontrolViewResumeBg
+
+            Rectangle {
+                width: rootPlayer.width
+                height: topcontrolView.height + topcontrolView.anchors.topMargin * 2
+                color: rootPlayer.colors.playerBg
+                opacity: .8
+            }
+        }
     }
 
     /* bottom control bar background */
@@ -297,6 +321,8 @@
         state: "visible"
 
         component: FocusScope {
+            readonly property bool isResumeDialogVisible: resumeDialog.visible
+
             width: topcontrolView.width
             height: topbar.implicitHeight
             focus: true
@@ -499,6 +525,8 @@
                 navigationUpItem: playlistpopup.showPlaylist ? playlistpopup : (audioControls.visible ? audioControls : topcontrolView)
 
                 onRequestLockUnlockAutoHide: rootPlayer.lockUnlockAutoHide(lock, source)
+
+                identifier: PlayerControlbarModel.Mainplayer
             }
         }
     }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/qml/PlayerButtonsLayout.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/PlayerButtonsLayout.qml Changed

@@ -42,24 +42,18 @@
     property real spacing: VLCStyle.margin_normal // spacing between controls
     property real layoutSpacing: VLCStyle.margin_xlarge // spacing between layouts (left, center, and right)
 
-    signal requestLockUnlockAutoHide(bool lock, var source)
-
-    enum Alignment {
-        Left = 0,
-        Center = 1,
-        Right = 2
+    property int identifier: -1
+    readonly property var model: {
+        if (!!mainInterface.controlbarProfileModel.currentModel)
+            mainInterface.controlbarProfileModel.currentModel.getModel(identifier)
+        else
+            undefined
     }
 
-    property var models: []
-
-    Connections {
-        target: mainInterface
+    signal requestLockUnlockAutoHide(bool lock, var source)
 
-        onToolBarConfUpdated: {
-            models[PlayerButtonsLayout.Alignment.Left].reloadModel()
-            models[PlayerButtonsLayout.Alignment.Center].reloadModel()
-            models[PlayerButtonsLayout.Alignment.Right].reloadModel()
-        }
+    Component.onCompleted: {
+        console.assert(identifier >= 0)
     }
 
     ControlButtons {
@@ -70,13 +64,9 @@
         onRequestLockUnlockAutoHide: playerButtonsLayout.requestLockUnlockAutoHide(lock, source)
     }
 
-    ButtonsLayout {
+    Loader {
         id: buttonrow_left
 
-        model: models[PlayerButtonsLayout.Alignment.Left]
-
-        extraWidth: (buttonrow_center.x - buttonrow_left.x - minimumWidth - layoutSpacing)
-
         anchors {
             left: parent.left
             verticalCenter: parent.verticalCenter
@@ -86,20 +76,26 @@
             bottomMargin: marginBottom
             rightMargin: layoutSpacing
         }
-        
-        visible: extraWidth < 0 ? false : true // extraWidth < 0 means there is not even available space for minimumSize
 
-        navigationParent: playerButtonsLayout
-        navigationRightItem: buttonrow_center
+        active: !!playerButtonsLayout.model && !!playerButtonsLayout.model.left
+
+        sourceComponent: ButtonsLayout {
+            model: playerButtonsLayout.model.left
+
+            extraWidth: (buttonrow_center.x - buttonrow_left.x - minimumWidth - layoutSpacing)
 
-        focus: true
+            visible: extraWidth < 0 ? false : true // extraWidth < 0 means there is not even available space for minimumSize
+
+            navigationParent: playerButtonsLayout
+            navigationRightItem: buttonrow_center
+
+            focus: true
+        }
     }
 
-    ButtonsLayout {
+    Loader {
         id: buttonrow_center
 
-        model: models[PlayerButtonsLayout.Alignment.Center]
-
         anchors {
             centerIn: parent
 
@@ -107,17 +103,19 @@
             bottomMargin: playerButtonsLayout.marginBottom
         }
 
-        navigationParent: playerButtonsLayout
-        navigationLeftItem: buttonrow_left
-        navigationRightItem: buttonrow_right
-    }
+        active: !!playerButtonsLayout.model && !!playerButtonsLayout.model.center
 
-    ButtonsLayout {
-        id: buttonrow_right
+        sourceComponent: ButtonsLayout {
+            model: playerButtonsLayout.model.center
 
-        model: models[PlayerButtonsLayout.Alignment.Right]
+            navigationParent: playerButtonsLayout
+            navigationLeftItem: buttonrow_left
+            navigationRightItem: buttonrow_right
+        }
+    }
 
-        extraWidth: (playerButtonsLayout.width - (buttonrow_center.x + buttonrow_center.width) - minimumWidth - (2 * layoutSpacing))
+    Loader {
+        id: buttonrow_right
 
         anchors {
             right: parent.right
@@ -129,9 +127,19 @@
             leftMargin: layoutSpacing
         }
 
-        visible: extraWidth < 0 ? false : true // extraWidth < 0 means there is not even available space for minimumSize
+        active: !!playerButtonsLayout.model && !!playerButtonsLayout.model.right
 
-        navigationParent: playerButtonsLayout
-        navigationLeftItem: buttonrow_center
+        sourceComponent: ButtonsLayout {
+
+
+            model: playerButtonsLayout.model.right
+
+            extraWidth: (playerButtonsLayout.width - (buttonrow_center.x + buttonrow_center.width) - minimumWidth - (2 * layoutSpacing))
+
+            visible: extraWidth < 0 ? false : true // extraWidth < 0 means there is not even available space for minimumSize
+
+            navigationParent: playerButtonsLayout
+            navigationLeftItem: buttonrow_center
+        }
     }
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/qml/ResumeDialog.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/ResumeDialog.qml Changed

@@ -85,80 +85,77 @@
         hideResumePanel()
     }
 
-    Rectangle {
+    //drag and dbl click the titlebar in CSD mode
+    Loader {
         anchors.fill: parent
-        color: resumePanel.colors.setColorAlpha(resumePanel.colors.playerBg, 0.8)
+        active: mainInterface.clientSideDecoration
+        source: "qrc:///widgets/CSDTitlebarTapNDrapHandler.qml"
+    }
 
-        //drag and dbl click the titlebar in CSD mode
-        Loader {
-            anchors.fill: parent
-            active: mainInterface.clientSideDecoration
-            source: "qrc:///widgets/CSDTitlebarTapNDrapHandler.qml"
-        }
+    RowLayout {
+        id: layout
 
-        RowLayout {
-            id: layout
+        anchors.fill: parent
+        anchors.leftMargin: VLCStyle.margin_small
+        spacing: VLCStyle.margin_small
 
-            anchors.fill: parent
-            anchors.leftMargin: VLCStyle.margin_small
-            spacing: VLCStyle.margin_small
+        Label {
+            Layout.preferredHeight: implicitHeight
+            Layout.preferredWidth: implicitWidth
 
-            Label {
-                Layout.preferredHeight: implicitHeight
-                Layout.preferredWidth: implicitWidth
+            color: resumePanel.colors.playerFg
+            font.pixelSize: VLCStyle.fontSize_normal
+            font.bold: true
 
-                color: resumePanel.colors.playerFg
-                font.pixelSize: VLCStyle.fontSize_normal
-                font.bold: true
+            text: i18n.qtr("Do you want to restart the playback where you left off?")
+        }
 
-                text: i18n.qtr("Do you want to restart the playback where you left off?")
+        Widgets.TabButtonExt {
+            id: continueBtn
+            Layout.preferredHeight: implicitHeight
+            Layout.preferredWidth: implicitWidth
+            text: i18n.qtr("Continue")
+            font.bold: true
+            color: resumePanel.colors.playerFg
+            focus: true
+            onClicked: {
+                player.restorePlaybackPos()
+                hideResumePanel()
             }
 
-            Widgets.TabButtonExt {
-                id: continueBtn
-                Layout.preferredHeight: implicitHeight
-                Layout.preferredWidth: implicitWidth
-                text: i18n.qtr("Continue")
-                font.bold: true
-                color: resumePanel.colors.playerFg
-                focus: true
-                onClicked: {
-                    player.restorePlaybackPos()
-                    hideResumePanel()
-                }
-
-                KeyNavigation.right: closeBtn
-            }
+            KeyNavigation.right: closeBtn
+        }
 
-            Widgets.TabButtonExt {
-                id: closeBtn
-                Layout.preferredHeight: implicitHeight
-                Layout.preferredWidth: implicitWidth
-                text: i18n.qtr("Dismiss")
-                font.bold: true
-                color: resumePanel.colors.playerFg
-                onClicked: hideResumePanel()
+        Widgets.TabButtonExt {
+            id: closeBtn
+            Layout.preferredHeight: implicitHeight
+            Layout.preferredWidth: implicitWidth
+            text: i18n.qtr("Dismiss")
+            font.bold: true
+            color: resumePanel.colors.playerFg
+            onClicked: hideResumePanel()
 
-                KeyNavigation.left: continueBtn
-            }
+            KeyNavigation.left: continueBtn
+        }
 
-            Item {
-                Layout.fillWidth: true
-            }
+        Item {
+            Layout.fillWidth: true
+        }
 
-            Loader {
-                id: csdDecorations
-
-                focus: false
-                height: VLCStyle.icon_normal
-                active: mainInterface.clientSideDecoration
-                enabled: mainInterface.clientSideDecoration
-                visible: mainInterface.clientSideDecoration
-                source: "qrc:///widgets/CSDWindowButtonSet.qml"
-                onLoaded: {
-                    item.color = Qt.binding(function() { return resumePanel.colors.playerFg })
-                    item.hoverColor = Qt.binding(function() { return resumePanel.colors.windowCSDButtonDarkBg })
-                }
+        Loader {
+            id: csdDecorations
+
+            Layout.alignment: Qt.AlignTop | Qt.AlignRight
+
+            focus: false
+            height: VLCStyle.icon_normal
+            active: mainInterface.clientSideDecoration
+            enabled: mainInterface.clientSideDecoration
+            visible: mainInterface.clientSideDecoration
+            source: "qrc:///widgets/CSDWindowButtonSet.qml"
+            onLoaded: {
+                item.color = Qt.binding(function() { return resumePanel.colors.playerFg })
+                item.hoverColor = Qt.binding(function() { return resumePanel.colors.windowCSDButtonDarkBg })
             }
         }
     }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/qml/TopBar.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/TopBar.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/player/qml/VolumeWidget.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/player/qml/VolumeWidget.qml Changed

@@ -205,19 +205,20 @@
 
                     onPositionChanged: function (event) {
                         if (sliderMouseArea.pressedButtons === Qt.RightButton) {
-                            if (sliderMouseArea.mouseX < sliderMouseArea.width * volControl.fullvolpos / 4)
+                            var pos = sliderMouseArea.mouseX * volControl.maxvolpos / sliderMouseArea.width
+                            if (pos < 0.25)
                                 volControl.value = 0
-                            else if (sliderMouseArea.mouseX < sliderMouseArea.width * volControl.fullvolpos * 3 / 4)
+                            else if (pos < 0.75)
                                 volControl.value = 0.5
-                            else if (sliderMouseArea.mouseX >= sliderMouseArea.width)
-                                volControl.value = 1.25
-                            else
+                            else if (pos < 1.125)
                                 volControl.value = 1
+                            else
+                                volControl.value = 1.25
                             return
                         }
 
                         if(pressed)
-                            volControl.value = volControl.maxvolpos * event.x / (volControl.width)
+                            volControl.value = volControl.maxvolpos * (event.x - handle.width / 2) / (sliderMouseArea.width - handle.width)
                     }
 
                     onWheel: {

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/playlist/playlist_controller.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/playlist/playlist_controller.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/playlist/playlist_item.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/playlist/playlist_item.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/playlist/qml/PlaylistDelegate.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/playlist/qml/PlaylistDelegate.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/playlist/qml/PlaylistListView.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/playlist/qml/PlaylistListView.qml Changed

@@ -25,6 +25,7 @@
 
 import "qrc:///widgets/" as Widgets
 import "qrc:///util/KeyHelper.js" as KeyHelper
+import "qrc:///util/Helpers.js" as Helpers
 import "qrc:///style/"
 
 Widgets.NavigableFocusScope {
@@ -48,13 +49,9 @@
         Move // Keyboard item move mode, activated through PlaylistOverlayMenu
     }
 
-    function isValidInstanceOf(object, type) {
-        return (!!object && (object instanceof type))
-    }
-
     function isDropAcceptable(drop, index) {
         return drop.hasUrls || // external drop (i.e. from filesystem)
-                (isValidInstanceOf(drop.source, Widgets.DragItem)) // internal drop (inter-view or intra-playlist)
+                (Helpers.isValidInstanceOf(drop.source, Widgets.DragItem)) // internal drop (inter-view or intra-playlist)
     }
 
     function acceptDrop(index, drop) {
@@ -65,7 +62,7 @@
             model.moveItemsPre(model.getSelection(), index);
 
         // NOTE: Dropping medialibrary content into the queue.
-        } else if (isValidInstanceOf(item, Widgets.DragItem)) {
+        } else if (Helpers.isValidInstanceOf(item, Widgets.DragItem)) {
             mainPlaylistController.insert(index, item.getSelectedInputItem());
 
         // NOTE: Dropping an external item (i.e. filesystem) into the queue.
@@ -130,7 +127,7 @@
                 return model.getItemsForIndexes(model.getSelection())
             }
 
-            property point _pos: null
+            property point _pos
             property int _scrollingDirection: 0
 
             function updatePos(pos) {

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/playlist/qml/PlaylistToolbar.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/playlist/qml/PlaylistToolbar.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/qt.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/qt.cpp Changed

@@ -502,8 +502,10 @@
     /* Wait for the interface to be ready. This prevents the main
      * LibVLC thread from starting video playback before we can create
      * an embedded video window. */
+#ifndef Q_OS_MAC
     while (open_state == OPEN_STATE_INIT)
         wait_ready.wait(lock);
+#endif
 
     if (open_state == OPEN_STATE_ERROR)
     {
@@ -717,14 +719,14 @@
     /* Explain how to show a dialog :D */
     p_intf->pf_show_dialog = ShowDialog;
 
+#ifndef Q_OS_MAC
     /* Tell the main LibVLC thread we are ready */
     {
         vlc::threads::mutex_locker locker (lock);
         open_state = OPEN_STATE_OPENED;
         wait_ready.signal();
     }
-
-#ifdef Q_OS_MAC
+#else
     /* We took over main thread, register and start here */
     if( !p_sys->b_isDialogProvider )
     {
@@ -765,11 +767,15 @@
     intf_sys_t *p_sys = p_intf->p_sys;
 
     {
+#ifndef Q_OS_MAC
         vlc::threads::mutex_locker locker (lock);
+#endif
         if( error )
         {
             open_state = OPEN_STATE_ERROR;
+#ifndef Q_OS_MAC
             wait_ready.signal();
+#endif
         }
         else
             open_state = OPEN_STATE_INIT;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/qt.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/qt.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/style/VLCStyle.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/style/VLCStyle.qml Changed

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/util/qml/Helpers.js Added

@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+.pragma library
+
+function msToString(time, short) {
+    if (time < 0) return "--:--"
+
+    var t_sec = Math.floor(time / 1000)
+    var sec = t_sec % 60
+    var min = Math.floor(t_sec / 60) % 60
+    var hour = Math.floor(t_sec / 3600)
+
+    function prefixZero(number) {
+        return number < 10 ? "0" + number : number;
+    }
+
+    if (hour === 0)
+        return "%1:%2".arg(prefixZero(min)).arg(prefixZero(sec))
+    if (!!short)
+        return "%1h%2".arg(hour.toFixed()).arg(prefixZero(min))
+    return "%1:%2:%3".arg(prefixZero(hour)).arg(prefixZero(min)).arg(prefixZero(sec))
+}
+
+function clamp(num, min, max) {
+  return num <= min ? min : num >= max ? max : num;
+}
+
+function isValidInstanceOf(object, type) {
+    return (!!object && (object instanceof type))
+}

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/vlc.qrc -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/vlc.qrc Changed

@@ -26,6 +26,7 @@
         <file alias="wait4.svg">pixmaps/util/wait4.svg</file>
         <file alias="SelectableDelegateModel.qml">util/qml/SelectableDelegateModel.qml</file>
         <file alias="KeyHelper.js">util/qml/KeyHelper.js</file>
+        <file alias="Helpers.js">util/qml/Helpers.js</file>
     </qresource>
     <qresource prefix="/toolbar">
         <file alias="faster.svg">pixmaps/faster.svg</file>
@@ -222,8 +223,7 @@
         <file alias="RoundButton.qml">widgets/qml/RoundButton.qml</file>
         <file alias="LabelSeparator.qml">widgets/qml/LabelSeparator.qml</file>
         <file alias="ContextButton.qml">widgets/qml/ContextButton.qml</file>
-        <file alias="RoundImage.qml">widgets/qml/RoundImage.qml</file>
-        <file alias="VideoQualityLabel.qml">widgets/qml/VideoQualityLabel.qml</file>
+        <file alias="VideoQualityLabels.qml">widgets/qml/VideoQualityLabels.qml</file>
         <file alias="VideoProgressBar.qml">widgets/qml/VideoProgressBar.qml</file>
         <file alias="NavigableCol.qml">widgets/qml/NavigableCol.qml</file>
         <file alias="NavigableRow.qml">widgets/qml/NavigableRow.qml</file>
@@ -250,6 +250,8 @@
         <file alias="ListCoverShadow.qml">widgets/qml/ListCoverShadow.qml</file>
         <file alias="OverlayMenu.qml">widgets/qml/OverlayMenu.qml</file>
         <file alias="IconControlButton.qml">widgets/qml/IconControlButton.qml</file>
+        <file alias="ShadowCoverGenerator.qml">widgets/qml/ShadowCoverGenerator.qml</file>
+        <file alias="GridShadows.qml">widgets/qml/GridShadows.qml</file>
     </qresource>
     <qresource prefix="/network">
         <file alias="AddressbarButton.qml">network/qml/AddressbarButton.qml</file>
@@ -268,12 +270,15 @@
     </qresource>
     <qresource prefix="/medialibrary">
         <file alias="EmptyLabel.qml">medialibrary/qml/EmptyLabel.qml</file>
+        <file alias="MediaGroupDisplay.qml">medialibrary/qml/MediaGroupDisplay.qml</file>
+        <file alias="MediaGroupList.qml">medialibrary/qml/MediaGroupList.qml</file>
         <file alias="MusicAlbums.qml">medialibrary/qml/MusicAlbums.qml</file>
         <file alias="MusicDisplay.qml">medialibrary/qml/MusicDisplay.qml</file>
         <file alias="MusicGenres.qml">medialibrary/qml/MusicGenres.qml</file>
         <file alias="VideoDisplay.qml">medialibrary/qml/VideoDisplay.qml</file>
         <file alias="VideoAll.qml">medialibrary/qml/VideoAll.qml</file>
         <file alias="VideoAllDisplay.qml">medialibrary/qml/VideoAllDisplay.qml</file>
+        <file alias="VideoGroupsDisplay.qml">medialibrary/qml/VideoGroupsDisplay.qml</file>
         <file alias="PlaylistMediaList.qml">medialibrary/qml/PlaylistMediaList.qml</file>
         <file alias="PlaylistMedia.qml">medialibrary/qml/PlaylistMedia.qml</file>
         <file alias="PlaylistMediaDelegate.qml">medialibrary/qml/PlaylistMediaDelegate.qml</file>
@@ -331,6 +336,7 @@
         <file alias="PlayerMenuItem.qml">player/qml/PlayerMenuItem.qml</file>
         <file alias="LanguageMenu.qml">player/qml/LanguageMenu.qml</file>
         <file alias="ButtonsLayout.qml">player/qml/ButtonsLayout.qml</file>
+        <file alias="PlaybackSpeed.qml">player/qml/PlaybackSpeed.qml</file>
     </qresource>
     <qresource prefix="/about">
         <file alias="About.qml">dialogs/help/qml/About.qml</file>
@@ -339,10 +345,12 @@
         <file alias="CustomDialog.qml">dialogs/dialogs/qml/CustomDialog.qml</file>
         <file alias="Dialogs.qml">dialogs/dialogs/qml/Dialogs.qml</file>
         <file alias="ModalDialog.qml">dialogs/dialogs/qml/ModalDialog.qml</file>
+        <file alias="WindowDialog.qml">dialogs/dialogs/qml/WindowDialog.qml</file>
         <file alias="EditorDummyButton.qml">dialogs/toolbar/qml/EditorDummyButton.qml</file>
         <file alias="EditorDNDDelegate.qml">dialogs/toolbar/qml/EditorDNDDelegate.qml</file>
         <file alias="ToolbarEditorButtonList.qml">dialogs/toolbar/qml/ToolbarEditorButtonList.qml</file>
         <file alias="ToolbarEditor.qml">dialogs/toolbar/qml/ToolbarEditor.qml</file>
+        <file alias="ToolbarEditorDialog.qml">dialogs/toolbar/qml/ToolbarEditorDialog.qml</file>
         <file alias="EditorDNDView.qml">dialogs/toolbar/qml/EditorDNDView.qml</file>
         <file alias="EditorTabButton.qml">dialogs/toolbar/qml/EditorTabButton.qml</file>
     </qresource>

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/native/customwidgets.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/native/customwidgets.cpp Changed

@@ -30,6 +30,7 @@
 #include "customwidgets.hpp"
 #include "qt.hpp"               /* needed for qtr,  but not necessary */
 
+#include <QtMath>  // for wheel deadzone calculation
 #include <QPainter>
 #include <QRect>
 #include <QKeyEvent>
@@ -296,22 +297,28 @@
 
 int qtWheelEventToVLCKey( const QWheelEvent& e )
 {
-    int i_vlck = 0;
-    /* Handle modifiers */
-    i_vlck |= qtKeyModifiersToVLC( e );
+    const qreal v_cos_deadzone = 0.45; // ~63 degrees
+    const qreal h_cos_deadzone = 0.95; // ~15 degrees
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-    if ( e.angleDelta().y() > 0 )
-#else
-    if ( e.delta() > 0 )
-#endif
-    {
-        i_vlck |= KEY_MOUSEWHEELUP;
-    }
-    else
+    int i_vlck = qtKeyModifiersToVLC(e);  // Handle modifiers
+
+    QPoint p = e.angleDelta();
+    if (!p.isNull())
     {
-        i_vlck |= KEY_MOUSEWHEELDOWN;
+        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;
 }

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/native/roundimage.cpp Added

@@ -0,0 +1,324 @@
+/*****************************************************************************
+ * 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 "roundimage.hpp"
+
+#include <QBrush>
+#include <QImage>
+#include <QPainterPath>
+#include <QPen>
+#include <QQuickWindow>
+#include <QSvgRenderer>
+#include <QGuiApplication>
+
+#ifdef QT_NETWORK_LIB
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#endif
+
+namespace
+{
+    QString getPath(const QUrl &url)
+    {
+        QString path = url.isLocalFile() ? url.toLocalFile() : url.toString();
+        if (path.startsWith("qrc:///"))
+            path.replace(0, strlen("qrc:///"), ":/");
+        return path;
+    }
+
+    QByteArray readFile(const QUrl &url)
+    {
+#ifdef QT_NETWORK_LIB
+        if (url.scheme() == "http" || url.scheme() == "https")
+        {
+            QNetworkAccessManager networkMgr;
+            networkMgr.setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
+            auto reply = networkMgr.get(QNetworkRequest(url));
+            QEventLoop loop;
+            QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
+            loop.exec();
+            return reply->readAll();
+        }
+#endif
+
+        QByteArray data;
+        QString path = getPath(url);
+        QFile file(path);
+        if (file.open(QIODevice::ReadOnly))
+            data = file.readAll();
+        return data;
+    }
+}
+
+RoundImage::RoundImage(QQuickItem *parent) : QQuickPaintedItem {parent}
+{
+    if (window() || qGuiApp)
+        setDPR(window() ? window()->devicePixelRatio() : qGuiApp->devicePixelRatio());
+
+    connect(this, &QQuickItem::heightChanged, this, &RoundImage::regenerateRoundImage);
+    connect(this, &QQuickItem::widthChanged, this, &RoundImage::regenerateRoundImage);
+}
+
+void RoundImage::paint(QPainter *painter)
+{
+    painter->drawImage(QPointF {0., 0.}, m_roundImage, m_roundImage.rect());
+}
+
+void RoundImage::classBegin()
+{
+    QQuickPaintedItem::classBegin();
+
+    m_isComponentComplete = false;
+}
+
+void RoundImage::componentComplete()
+{
+    QQuickPaintedItem::componentComplete();
+
+    Q_ASSERT(!m_isComponentComplete); // classBegin is not called?
+    m_isComponentComplete = true;
+    if (!m_source.isEmpty())
+        updateSource();
+}
+
+QUrl RoundImage::source() const
+{
+    return m_source;
+}
+
+qreal RoundImage::radius() const
+{
+    return m_radius;
+}
+
+QSizeF RoundImage::sourceSize() const
+{
+    return m_sourceSize;
+}
+
+void RoundImage::setSource(QUrl source)
+{
+    if (m_source == source)
+        return;
+
+    m_source = source;
+    emit sourceChanged(m_source);
+    updateSource();
+}
+
+void RoundImage::setRadius(qreal radius)
+{
+    if (m_radius == radius)
+        return;
+
+    m_radius = radius;
+    emit radiusChanged(m_radius);
+    regenerateRoundImage();
+}
+
+void RoundImage::setSourceSize(QSizeF sourceSize)
+{
+    if (m_sourceSize == sourceSize)
+        return;
+
+    m_sourceSize = sourceSize;
+    emit sourceSizeChanged(m_sourceSize);
+    updateSource();
+}
+
+void RoundImage::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value)
+{
+    if (change == QQuickItem::ItemDevicePixelRatioHasChanged)
+        setDPR(value.realValue);
+
+    QQuickPaintedItem::itemChange(change, value);
+}
+
+void RoundImage::setDPR(const qreal value)
+{
+    if (m_dpr == value)
+        return;
+
+    m_dpr = value;
+    if (m_sourceSize.isValid())
+        updateSource(); // "effectiveSourceSize" is changed
+    else
+        regenerateRoundImage();
+}
+
+void RoundImage::updateSource()
+{
+    if (!m_isComponentComplete)
+        return;
+
+    const QSizeF effectiveSourceSize = m_sourceSize.isValid() ? m_sourceSize * m_dpr : QSize {};
+    m_loader.reset(new Loader({m_source, effectiveSourceSize}));
+    connect(m_loader.get(), &BaseAsyncTask::result, this, [this]()
+    {
+        m_sourceImage = m_loader->takeResult();
+        m_loader.reset();
+
+        regenerateRoundImage();
+    });
+
+    m_loader->start(*QThreadPool::globalInstance());
+}
+
+void RoundImage::regenerateRoundImage()
+{
+    if (!m_isComponentComplete
+            || m_enqueuedGeneration
+            || m_loader /* when loader ends it will call regenerateRoundImage */)
+        return;
+
+    // use Qt::QueuedConnection to delay generation, so that dependent properties

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/native/roundimage.hpp Added

@@ -0,0 +1,139 @@
+/*****************************************************************************
+ * 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 "qt.hpp"
+
+#include "util/asynctask.hpp"
+
+#include <QPixmap>
+#include <QPainter>
+#include <QQuickPaintedItem>
+#include <QUrl>
+
+class RoundImage : public QQuickPaintedItem
+{
+    Q_OBJECT
+
+    // url of the image
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+
+    // sets the maximum number of pixels stored for the loaded image so that large images do not use more memory than necessary
+    Q_PROPERTY(QSizeF sourceSize READ sourceSize WRITE setSourceSize NOTIFY sourceSizeChanged)
+
+    Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged)
+
+public:
+    RoundImage(QQuickItem *parent = nullptr);
+
+    void paint(QPainter *painter) override;
+
+    void classBegin() override;
+    void componentComplete() override;
+
+    QUrl source() const;
+    qreal radius() const;
+    QSizeF sourceSize() const;
+
+public slots:
+    void setSource(QUrl source);
+    void setRadius(qreal radius);
+    void setSourceSize(QSizeF sourceSize);
+
+signals:
+    void sourceChanged(QUrl source);
+    void radiusChanged(int radius);
+    void sourceSizeChanged(QSizeF sourceSize);
+
+protected:
+    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value) override;
+
+private:
+    class Image
+    {
+    public:
+        static std::shared_ptr<Image> getImage(const QUrl &source, const QSizeF &sourceSize);
+        virtual ~Image() = default;
+
+        // must be reentrant
+        virtual void paint(QPainter *painter, const QSizeF &size) = 0;
+    };
+
+    using ImagePtr = std::shared_ptr<Image>;
+
+    class Loader : public AsyncTask<ImagePtr>
+    {
+    public:
+        struct Params
+        {
+            QUrl source;
+            QSizeF sourceSize;
+        };
+
+        Loader(const Params &params);
+
+        ImagePtr execute();
+
+    private:
+        const Params params;
+    };
+
+    class RoundImageGenerator : public AsyncTask<QImage>
+    {
+    public:
+        struct Params
+        {
+            qreal width;
+            qreal height;
+            qreal radius;
+            ImagePtr image;
+        };
+
+        RoundImageGenerator(const Params &params);
+
+        QImage execute();
+
+    private:
+        const Params params;
+    };
+
+    void setDPR(qreal value);
+    void updateSource();
+    void regenerateRoundImage();
+
+    QUrl m_source;
+    ImagePtr m_sourceImage;
+    qreal m_radius = 0.0;
+    QSizeF m_sourceSize;
+    qreal m_dpr = 1.0; // device pixel ratio
+    QImage m_roundImage;
+    TaskHandle<Loader> m_loader {};
+    TaskHandle<RoundImageGenerator> m_roundImageGenerator {};
+
+    bool m_enqueuedGeneration = false;
+    bool m_isComponentComplete = true;
+};
+
+#endif
+

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/native/searchlineedit.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/native/searchlineedit.cpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/GridItem.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/GridItem.qml Changed

@@ -31,22 +31,25 @@
     property alias image: picture.source
     property alias title: titleLabel.text
     property alias subtitle: subtitleTxt.text
-    property alias textHorizontalAlignment: subtitleTxt.horizontalAlignment
-    property alias playCoverBorder: picture.playCoverBorder
+    property alias playCoverBorderWidth: picture.playCoverBorderWidth
     property alias playCoverOnlyBorders: picture.playCoverOnlyBorders
     property alias playIconSize: picture.playIconSize
     property alias pictureRadius: picture.radius
     property alias pictureOverlay: picture.imageOverlay
-    property bool selected: false
+    property alias unselectedUnderlay: unselectedUnderlayLoader.sourceComponent
+    property alias selectedUnderlay: selectedUnderlayLoader.sourceComponent
 
-    property alias progress: picture.progress
-    property alias labels: picture.labels
-    property bool showNewIndicator: false
     property real pictureWidth: VLCStyle.colWidth(1)
     property real pictureHeight: pictureWidth
     property int titleMargin: VLCStyle.margin_xsmall
     property Item dragItem
 
+    // if true, texts are horizontally centered, provided it can fit in pictureWidth
+    property bool textAlignHCenter: false
+
+    // if the item is selected
+    property bool selected: false
+
     signal playClicked
     signal addToPlaylistClicked
     signal itemClicked(Item menuParent, int key, int modifier)
@@ -61,26 +64,25 @@
     implicitWidth: mouseArea.implicitWidth
     implicitHeight: mouseArea.implicitHeight
 
-    readonly property bool _highlighted: mouseArea.containsMouse || content.activeFocus
+    readonly property bool highlighted: mouseArea.containsMouse || root.activeFocus
 
     readonly property int selectedBorderWidth: VLCStyle.gridItemSelectedBorder
 
-    property int _newIndicatorMedian: VLCStyle.margin_xsmall
     property int _modifiersOnLastPress: Qt.NoModifier
 
-    state: _highlighted ? "selected" : "unselected"
+    state: highlighted ? "selected" : "unselected"
     states: [
         State {
             name: "unselected"
 
             PropertyChanges {
-                target: selectedShadow
+                target: selectedUnderlayLoader
                 opacity: 0
                 visible: false
             }
 
             PropertyChanges {
-                target: unselectedShadow
+                target: unselectedUnderlayLoader
                 opacity: 1
                 visible: true
             }
@@ -90,23 +92,18 @@
                 playCoverOpacity: 0
                 playCoverVisible: false
             }
-
-            PropertyChanges {
-                target: root
-                _newIndicatorMedian: VLCStyle.margin_xsmall
-            }
         },
         State {
             name: "selected"
 
             PropertyChanges {
-                target: selectedShadow
+                target: selectedUnderlayLoader
                 opacity: 1
                 visible: true
             }
 
             PropertyChanges {
-                target: unselectedShadow
+                target: unselectedUnderlayLoader
                 opacity: 0
                 visible: false
             }
@@ -116,11 +113,6 @@
                 playCoverOpacity: 1
                 playCoverVisible: true
             }
-
-            PropertyChanges {
-                target: root
-                _newIndicatorMedian: VLCStyle.margin_small
-            }
         }
     ]
 
@@ -132,27 +124,18 @@
 
             SequentialAnimation {
                 PropertyAction {
-                    targets: [picture, selectedShadow]
+                    targets: [picture, selectedUnderlayLoader]
                     properties: "playCoverVisible,visible"
                 }
 
-                ParallelAnimation {
-                    NumberAnimation {
-                        properties: "opacity,playCoverOpacity"
-                        duration: 240
-                        easing.type: Easing.InSine
-                    }
-
-                    SmoothedAnimation {
-                        target: root
-                        property: "_newIndicatorMedian"
-                        duration: 240
-                        easing.type: Easing.InSine
-                    }
+                NumberAnimation {
+                    properties: "opacity,playCoverOpacity"
+                    duration: 240
+                    easing.type: Easing.InSine
                 }
 
                 PropertyAction {
-                    target: unselectedShadow
+                    target: unselectedUnderlayLoader
                     property: "visible"
                 }
             }
@@ -164,27 +147,18 @@
 
             SequentialAnimation {
                 PropertyAction {
-                    target: unselectedShadow
+                    target: unselectedUnderlayLoader
                     property: "visible"
                 }
 
-                ParallelAnimation {
-                    NumberAnimation {
-                        properties: "opacity,playCoverOpacity"
-                        duration: 200
-                        easing.type: Easing.OutSine
-                    }
-
-                    SmoothedAnimation {
-                        target: root
-                        duration: 200
-                        property: "_newIndicatorMedian"
-                        easing.type: Easing.OutSine
-                    }
+                NumberAnimation {
+                    properties: "opacity,playCoverOpacity"
+                    duration: 200
+                    easing.type: Easing.OutSine
                 }
 
                 PropertyAction {
-                    targets: [picture, selectedShadow]
+                    targets: [picture, selectedUnderlayLoader]
                     properties: "playCoverVisible,visible"
                 }
             }
@@ -193,11 +167,11 @@
 
     MouseArea {
         id: mouseArea
-        hoverEnabled: true
 
+        hoverEnabled: true
         anchors.fill: parent
-        implicitWidth: content.implicitWidth
-        implicitHeight: content.implicitHeight
+        implicitWidth: layout.implicitWidth
+        implicitHeight: layout.implicitHeight
         drag.target: root.dragItem
         drag.axis: Drag.XAndYAxis
         drag.onActiveChanged: {
@@ -237,132 +211,84 @@
             }
         }
 
-        FocusScope {
-            id: content
-
-            anchors.fill: parent
-            implicitWidth: layout.implicitWidth
-            implicitHeight: layout.implicitHeight
-            focus: true
-
-            /* background visible when selected */
-            Rectangle {
-                id: selectionRect
+        /* background visible when selected */

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/GridShadows.qml Added

@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * 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 2.11
+
+import "qrc:///style/"
+
+Item {
+    id: root
+
+    property alias leftPadding: unselectedShadow.leftPadding
+    property alias topPadding: unselectedShadow.topPadding
+    property alias coverMargins: unselectedShadow.coverMargins
+    property alias coverWidth: unselectedShadow.coverWidth
+    property alias coverHeight: unselectedShadow.coverHeight
+    property alias coverRadius: unselectedShadow.coverRadius
+
+    property alias unselected: unselectedShadow.imageComponent
+    property alias selected: selectedShadow.imageComponent
+
+    ShadowCoverGenerator {
+        id: unselectedShadow
+
+        leftPadding: 0
+        topPadding: 0
+        coverMargins: 1
+        coverWidth: VLCStyle.colWidth(1)
+        coverHeight: VLCStyle.colWidth(1)
+        coverRadius: VLCStyle.gridCover_radius
+
+        secondaryVerticalOffset: VLCStyle.dp(1, VLCStyle.scale)
+        secondaryRadius: VLCStyle.dp(2, VLCStyle.scale)
+        secondarySamples: 1 + VLCStyle.dp(2, VLCStyle.scale) * 2
+        primaryVerticalOffset: VLCStyle.dp(4, VLCStyle.scale)
+        primaryRadius: VLCStyle.dp(9, VLCStyle.scale)
+        primarySamples: 1 + VLCStyle.dp(9, VLCStyle.scale) * 2
+    }
+
+    ShadowCoverGenerator {
+        id: selectedShadow
+
+        leftPadding: root.leftPadding
+        topPadding: root.topPadding
+        coverMargins: root.coverMargins
+        coverWidth: root.coverWidth
+        coverHeight: root.coverHeight
+        coverRadius: root.coverRadius
+
+        secondaryVerticalOffset: VLCStyle.dp(6, VLCStyle.scale)
+        secondaryRadius: VLCStyle.dp(18, VLCStyle.scale)
+        secondarySamples: 1 + VLCStyle.dp(18, VLCStyle.scale) * 2
+        primaryVerticalOffset: VLCStyle.dp(32, VLCStyle.scale)
+        primaryRadius: VLCStyle.dp(72, VLCStyle.scale)
+        primarySamples: 1 + VLCStyle.dp(72, VLCStyle.scale) * 2
+    }
+}

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/IconToolButton.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/IconToolButton.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/KeyNavigableListView.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/KeyNavigableListView.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/KeyNavigableTableView.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/KeyNavigableTableView.qml Changed

@@ -32,7 +32,7 @@
     signal actionForSelection( var selection )
     signal contextMenuButtonClicked(Item menuParent, var menuModel)
     signal rightClick(Item menuParent, var menuModel, var globalMousePos)
-    signal itemDoubleClicked(var model)
+    signal itemDoubleClicked(var index, var model)
 
     property var sortModel: []
     property Component colDelegate: Widgets.ListLabel {
@@ -74,12 +74,12 @@
     property var selectionDelegateModel
     property real rowHeight: VLCStyle.tableRow_height
     readonly property int _contextButtonHorizontalSpace: VLCStyle.icon_normal + VLCStyle.margin_xxsmall * 2
-    readonly property real availableRowWidth: width
-                                              - ( !!section.property ? VLCStyle.table_section_width * 2 : 0 )
-                                              - _contextButtonHorizontalSpace
     property alias spacing: view.spacing
     property int horizontalSpacing: VLCStyle.column_margin_width
 
+    property real availableRowWidth: 0
+    property real _availabeRowWidthLastUpdateTime: Date.now()
+
     property alias fadeColor:             view.fadeColor
     property alias fadeRectBottomHovered: view.fadeRectBottomHovered
     property alias fadeRectTopHovered:    view.fadeRectTopHovered
@@ -96,6 +96,45 @@
         view.positionViewAtIndex(index, mode)
     }
 
+    Timer {
+        id: availableRowWidthUpdater
+
+        interval: 100
+        triggeredOnStart: false
+        repeat: false
+        onTriggered: {
+            _update()
+        }
+
+        function _update() {
+            root.availableRowWidth = root.width
+                    - ( !!section.property ? VLCStyle.table_section_width * 2 : 0 )
+                    - _contextButtonHorizontalSpace
+            root._availabeRowWidthLastUpdateTime = Date.now()
+        }
+
+        function enqueueUpdate() {
+            // updating availableRowWidth is expensive because of property bindings in sortModel
+            // and availableRowWidth is dependent on root.width which can update in a burst
+            // so try to maintain a minimum time gap between subsequent availableRowWidth updates
+            var sinceLastUpdate = Date.now() - root._availabeRowWidthLastUpdateTime
+            if ((root.availableRowWidth === 0) || (sinceLastUpdate > 128 && !availableRowWidthUpdater.running)) {
+                _update()
+            } else if (!availableRowWidthUpdater.running) {
+                availableRowWidthUpdater.interval = Math.max(128 - sinceLastUpdate, 32)
+                availableRowWidthUpdater.start()
+            }
+        }
+    }
+
+    onWidthChanged: {
+        availableRowWidthUpdater.enqueueUpdate()
+    }
+
+    onSectionChanged: {
+        availableRowWidthUpdater.enqueueUpdate()
+    }
+
     KeyNavigableListView {
         id: view
 
@@ -125,8 +164,10 @@
                 leftPadding: VLCStyle.table_section_text_margin
                 text: view.currentSection
                 color: VLCStyle.colors.accent
-                visible: text !== "" && view.contentY > (row.height - col.height - row.topPadding)
                 verticalAlignment: Text.AlignTop
+                visible: view.headerPositioning === ListView.OverlayHeader
+                         && text !== ""
+                         && view.contentY > (row.height - col.height - row.topPadding)
             }
 
             Column {

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/MediaCover.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/MediaCover.qml Changed

@@ -18,26 +18,26 @@
  *****************************************************************************/
 import QtQuick 2.11
 import QtQuick.Controls 2.4
-import QtQuick.Layouts 1.11
 
 import "qrc:///widgets/" as Widgets
 import "qrc:///style/"
 
-Widgets.RoundImage {
+import org.videolan.controls 0.1
+
+RoundImage {
     id: root
 
-    property var labels: []
-    property alias progress: progressBar.value
-    property alias playCoverOpacity: playCover.opacity
-    property alias playCoverVisible: playCover.visible
-    property alias playCoverOnlyBorders: playCover.onlyBorders
-    property alias playIconSize: playCover.iconSize
-    property alias playCoverBorder: playCover.border
+    property alias playCoverOpacity: playCoverLoader.opacity
+    property alias playCoverVisible: playCoverLoader.visible
+    property bool playCoverOnlyBorders: false
+    property real playIconSize: VLCStyle.play_cover_normal
+    property real playCoverBorderWidth: VLCStyle.table_cover_border
     property alias imageOverlay: overlay.sourceComponent
     signal playIconClicked
 
     height: VLCStyle.listAlbumCover_height
     width: VLCStyle.listAlbumCover_width
+    sourceSize: Qt.size(width, height)
 
     Loader {
         id: overlay
@@ -45,50 +45,24 @@
         anchors.fill: parent
     }
 
-    RowLayout {
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            topMargin: VLCStyle.margin_xxsmall
-            leftMargin: VLCStyle.margin_xxsmall
-            rightMargin: VLCStyle.margin_xxsmall
-        }
-
-        spacing: VLCStyle.margin_xxsmall
-
-        Repeater {
-            model: labels
-            VideoQualityLabel {
-                Layout.preferredWidth: implicitWidth
-                Layout.preferredHeight: implicitHeight
-                text: modelData
-            }
-        }
+    Loader {
+        id: playCoverLoader
 
-        Item {
-            Layout.fillWidth: true
+        anchors.fill: parent
+        visible: false
+        active: false
+        sourceComponent: Widgets.PlayCover {
+            onlyBorders: root.playCoverOnlyBorders
+            iconSize: root.playIconSize
+            border.width: root.playCoverBorderWidth
+            radius: root.radius
+
+            onIconClicked: root.playIconClicked()
         }
-    }
-
-    Widgets.VideoProgressBar {
-        id: progressBar
 
-        visible: !playCover.visible && value > 0
-        anchors {
-            bottom: parent.bottom
-            left: parent.left
-            right: parent.right
+        onVisibleChanged: {
+            if (visible && !active)
+                active = true
         }
     }
-
-    Widgets.PlayCover {
-        id: playCover
-
-        anchors.fill: parent
-        iconSize: VLCStyle.play_root_small
-        radius: root.radius
-
-        onIconClicked: root.playIconClicked()
-    }
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/OverlayMenu.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/OverlayMenu.qml Changed

@@ -279,18 +279,22 @@
                         color: colors.text
                     }
 
-                    ListLabel {
-                        visible: modelData.marking.length >= 1
-
-                        Layout.alignment: Qt.AlignHCenter
+                    Loader {
+                        active: (button.yieldsAnotherModel ||
+                                 ( (!!modelData.marking) && (modelData.marking.length >= 1) ))
+
+                        sourceComponent: ListLabel {
+                            Layout.alignment: Qt.AlignHCenter
+
+                            text: {
+                                if (button.yieldsAnotherModel)
+                                    "⮕"
+                                else if (!!modelData.marking)
+                                    modelData.marking
+                            }
 
-                        text: {
-                            if (button.yieldsAnotherModel)
-                                "⮕"
-                            else if (!!modelData.marking)
-                                modelData.marking
+                            color: colors.text
                         }
-                        color: colors.text
                     }
                 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/ScrollingText.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/ScrollingText.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/SearchBox.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/SearchBox.qml Changed

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/ShadowCoverGenerator.qml Added

@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * 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 2.11
+import QtGraphicalEffects 1.0
+
+import "qrc:///style/"
+
+Item {
+    id: root
+
+    property real leftPadding: 0
+    property real topPadding: 0
+    property real coverMargins: 0
+    property real coverWidth: 0
+    property real coverHeight: 0
+    property real coverRadius: 0
+    property color coverColor: VLCStyle.colors.bg
+
+    property alias primaryVerticalOffset: primaryShadow.verticalOffset
+    property alias primaryRadius: primaryShadow.radius
+    property alias primarySamples: primaryShadow.samples
+    property alias secondaryVerticalOffset: secondaryShadow.verticalOffset
+    property alias secondaryRadius: secondaryShadow.radius
+    property alias secondarySamples: secondaryShadow.samples
+
+    readonly property real _kernalRadius: Math.max(0, Math.ceil(root.primarySamples / 2))
+    property real _reference: 0
+
+    property Component imageComponent: ShaderEffectSource {
+        sourceItem: container
+        live: true
+        x: - root._kernalRadius + root.leftPadding
+        y: - root._kernalRadius + root.primaryVerticalOffset + root.topPadding
+        width: container.width
+        height: container.height
+        hideSource: true
+
+        Component.onCompleted: ++root._reference;
+        Component.onDestruction: --root._reference;
+    }
+
+    Item {
+        id: container
+
+        // if imageComponent is used with invisible container, generated shadows are too dark
+        // another possible fix is to set DropShadow::cached = false, but that has performance penalty
+        visible: root._reference > 0
+
+        width: baseRect.width + 2 * root._kernalRadius
+        height: baseRect.height + 2 * root._kernalRadius
+
+        Rectangle {
+            id: baseRect
+
+            x: root._kernalRadius + root.coverMargins
+            y: root._kernalRadius - root.primaryVerticalOffset + root.coverMargins
+            width: root.coverWidth - root.coverMargins * 2
+            height: root.coverHeight - root.coverMargins * 2
+            radius: root.coverRadius
+            color: root.coverColor
+        }
+
+        DropShadow {
+            id: primaryShadow
+
+            anchors.fill: baseRect
+            source: baseRect
+            horizontalOffset: 0
+            spread: 0
+            color: Qt.rgba(0, 0, 0, .22)
+            samples: 1 + radius * 2
+            cached: true
+        }
+
+        DropShadow {
+            id: secondaryShadow
+
+            anchors.fill: baseRect
+            source: baseRect
+            horizontalOffset: 0
+            spread: 0
+            color: Qt.rgba(0, 0, 0, .18)
+            samples: 1 + radius * 2
+            cached: true
+        }
+    }
+}

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/TabButtonExt.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/TabButtonExt.qml Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/TableColumns.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/TableColumns.qml Changed

@@ -20,6 +20,7 @@
 import QtQuick.Layouts 1.4
 
 import "qrc:///widgets/" as Widgets
+import "qrc:///util/Helpers.js" as Helpers
 import "qrc:///style/"
 
 Item {
@@ -58,12 +59,27 @@
 
                 anchors.fill: parent
                 source: (rowModel ? (root.showTitleText ? rowModel.cover : rowModel[model.criteria]) : VLCStyle.noArtCover) || VLCStyle.noArtCover
-                mipmap: true // this widget can down scale the source a lot, so for better visuals we use mipmap
                 playCoverVisible: currentlyFocused || containsMouse
                 playIconSize: VLCStyle.play_cover_small
                 onPlayIconClicked: medialib.addAndPlay( rowModel.id )
                 radius: root.titleCover_radius
-                labels: root.titlecoverLabels(rowModel)
+
+                imageOverlay: Item {
+                    width: cover.width
+                    height: cover.height
+
+                    Widgets.VideoQualityLabels {
+                        anchors {
+                            top: parent.top
+                            right: parent.right
+                            topMargin: VLCStyle.margin_xxsmall
+                            leftMargin: VLCStyle.margin_xxsmall
+                            rightMargin: VLCStyle.margin_xxsmall
+                        }
+
+                        labels: root.titlecoverLabels(rowModel)
+                    }
+                }
             }
         }
 
@@ -108,7 +124,7 @@
             width: timeTextMetric.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
-            text: !rowModel ? "" : rowModel[model.criteria] || ""
+            text: !rowModel || !rowModel[model.criteria] ? "" : Helpers.msToString(rowModel[model.criteria], true)
             color: foregroundColor
         }
     }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/qt/widgets/qml/TableViewDelegate.qml -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/TableViewDelegate.qml Changed

vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/qt/widgets/qml/VideoQualityLabels.qml Added

@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * 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 2.11
+import QtQuick.Controls 2.4
+
+import "qrc:///style/"
+
+Row {
+    property alias labels: repeater.model
+
+    spacing: VLCStyle.margin_xxsmall
+
+    Repeater {
+        id: repeater
+
+        delegate: Label {
+            id: label
+
+            text: modelData
+            color: "white"
+            bottomPadding: VLCStyle.margin_xxxsmall
+            topPadding: VLCStyle.margin_xxxsmall
+            leftPadding: VLCStyle.margin_xxxsmall
+            rightPadding: VLCStyle.margin_xxxsmall
+            font.pixelSize: VLCStyle.fontSize_normal
+            background: Rectangle {
+                anchors.fill: label
+                color: "black"
+                opacity: 0.5
+                radius: 3
+            }
+
+            Accessible.ignored: true
+        }
+    }
+}

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/skins2/src/window_manager.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/skins2/src/window_manager.cpp Changed

@@ -33,7 +33,7 @@
 WindowManager::WindowManager( intf_thread_t *pIntf ):
     SkinObject( pIntf ), m_magnet( 0 ), m_alpha( 255 ), m_moveAlpha( 255 ),
     m_opacityEnabled( false ), m_opacity( 255 ), m_direction( kNone ),
-    m_maximizeRect(0, 0, 50, 50), m_pTooltip( NULL ), m_pPopup( NULL )
+    m_maximizeRect(0, 0, 50, 50), m_pPopup( NULL )
 {
     // Create and register a variable for the "on top" status
     VarManager *pVarManager = VarManager::instance( getIntf() );
@@ -47,12 +47,7 @@
     m_opacity = 255 * var_InheritFloat( getIntf(), "qt-opacity" );
 }
 
-
-WindowManager::~WindowManager()
-{
-    delete m_pTooltip;
-}
-
+WindowManager::~WindowManager() = default;
 
 void WindowManager::registerWindow( TopWindow &rWindow )
 {
@@ -156,11 +151,8 @@
     checkAnchors( &rWindow, xOffset, yOffset );
 
     // Move all the windows
-    WinSet_t::const_iterator it;
-    for( it = m_movingWindows.begin(); it != m_movingWindows.end(); ++it )
-    {
-        (*it)->move( (*it)->getLeft() + xOffset, (*it)->getTop() + yOffset );
-    }
+    for( auto *window : m_movingWindows )
+        window->move( window->getLeft() + xOffset, window->getTop() + yOffset );
 }
 
 
@@ -183,29 +175,27 @@
     const AncList_t &ancList1 = rLayout.getAnchorList();
 
     // Iterate through all the hanged windows
-    for( itWin = m_dependencies[rLayout.getWindow()].begin();
-         itWin != m_dependencies[rLayout.getWindow()].end(); ++itWin )
+    for( auto *window : m_dependencies[rLayout.getWindow()] )
     {
         // Now, check for anchoring between the 2 windows
         const AncList_t &ancList2 =
-            (*itWin)->getActiveLayout().getAnchorList();
-        for( itAnc1 = ancList1.begin(); itAnc1 != ancList1.end(); ++itAnc1 )
+            window->getActiveLayout().getAnchorList();
+        for( auto *anc1 : ancList1 )
         {
-            for( itAnc2 = ancList2.begin();
-                 itAnc2 != ancList2.end(); ++itAnc2 )
+            for( auto *anc2 : ancList2 )
             {
-                if( (*itAnc1)->isHanging( **itAnc2 ) )
+                if( anc1->isHanging( *anc2 ) )
                 {
                     // Add the dependencies of the hanged window to one of the
                     // lists of moving windows
                     Position::Ref_t aRefPos =
-                        (*itAnc1)->getPosition().getRefLeftTop();
+                        anc1->getPosition().getRefLeftTop();
                     if( aRefPos == Position::kRightTop )
-                        buildDependSet( m_resizeMovingE, *itWin );
+                        buildDependSet( m_resizeMovingE, window );
                     else if( aRefPos == Position::kLeftBottom )
-                        buildDependSet( m_resizeMovingS, *itWin );
+                        buildDependSet( m_resizeMovingS, window );
                     else if( aRefPos == Position::kRightBottom )
-                        buildDependSet( m_resizeMovingSE, *itWin );
+                        buildDependSet( m_resizeMovingSE, window );
                     break;
                 }
             }
@@ -285,33 +275,32 @@
     rLayout.refreshAll();
 
     // Move all the anchored windows
-    WinSet_t::const_iterator it;
     if( m_direction == kResizeE ||
         m_direction == kResizeSE )
     {
-        for( it = m_resizeMovingE.begin(); it != m_resizeMovingE.end(); ++it )
+        for( auto *window : m_resizeMovingE )
         {
-            (*it)->move( (*it)->getLeft() + xNewOffset,
-                         (*it)->getTop() );
+            window->move( window->getLeft() + xNewOffset,
+                          window->getTop() );
         }
     }
     if( m_direction == kResizeS ||
         m_direction == kResizeSE )
     {
-        for( it = m_resizeMovingS.begin(); it != m_resizeMovingS.end(); ++it )
+        for( auto *window : m_resizeMovingS )
         {
-            (*it)->move( (*it)->getLeft(),
-                         (*it)->getTop( )+ yNewOffset );
+            window->move( window->getLeft(),
+                          window->getTop( )+ yNewOffset );
         }
     }
     if( m_direction == kResizeE ||
         m_direction == kResizeS ||
         m_direction == kResizeSE )
     {
-        for( it = m_resizeMovingSE.begin(); it != m_resizeMovingSE.end(); ++it )
+        for( auto *window : m_resizeMovingSE )
         {
-            (*it)->move( (*it)->getLeft() + xNewOffset,
-                         (*it)->getTop() + yNewOffset );
+            window->move( window->getLeft() + xNewOffset,
+                          window->getTop() + yNewOffset );
         }
     }
 }
@@ -365,13 +354,12 @@
 
 void WindowManager::synchVisibility() const
 {
-    WinSet_t::const_iterator it;
-    for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
+    for( auto *window : m_allWindows )
     {
         // Show the window if it has to be visible
-        if( (*it)->getVisibleVar().get() )
+        if( window->getVisibleVar().get() )
         {
-            (*it)->innerShow();
+            window->innerShow();
         }
     }
 }
@@ -379,14 +367,13 @@
 
 void WindowManager::saveVisibility()
 {
-    WinSet_t::const_iterator it;
     m_savedWindows.clear();
-    for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
+    for( auto *window : m_allWindows )
     {
         // Remember the window if it is visible
-        if( (*it)->getVisibleVar().get() )
+        if( window->getVisibleVar().get() )
         {
-            m_savedWindows.insert( *it );
+            m_savedWindows.insert( window );
         }
     }
 }
@@ -400,10 +387,9 @@
         msg_Warn( getIntf(), "restoring visibility for no window" );
     }
 
-    WinSet_t::const_iterator it;
-    for( it = m_savedWindows.begin(); it != m_savedWindows.end(); ++it )
+    for( auto *window : m_savedWindows )
     {
-        (*it)->show();
+        window->show();
     }
 }
 
@@ -411,10 +397,9 @@
 void WindowManager::raiseAll() const
 {
     // Raise all the windows
-    WinSet_t::const_iterator it;
-    for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
+    for( auto *window : m_allWindows )
     {
-        (*it)->raise();
+        window->raise();
     }
 }
 
@@ -422,14 +407,13 @@
 void WindowManager::showAll( bool firstTime ) const
 {
     // Show all the windows
-    WinSet_t::const_iterator it;
-    for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
+    for( auto *window : m_allWindows )
     {
         // When the theme is opened for the first time,
         // only show the window if set as visible in the XML
-        if( (*it)->getInitialVisibility() || !firstTime )
+        if( window->getInitialVisibility() || !firstTime )
         {
-            (*it)->show();
+            window->show();
         }
     }
 }
@@ -446,10 +430,9 @@

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/gui/skins2/src/window_manager.hpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/gui/skins2/src/window_manager.hpp Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/misc/Makefile.am -> vlc-beta-20210430.0b6b242324.tar.xz/modules/misc/Makefile.am Changed

vlc-beta-20210430.0b6b242324.tar.xz/modules/misc/inhibit/uikit-inhibit.m Added

@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * Copyright © 2021 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.
+ *****************************************************************************/
+
+/**
+ * \file uikit-inhibit.m
+ * \brief iOS display and idle sleep inhibitor using UIKit
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_inhibit.h>
+#include <vlc_vout_window.h>
+
+#include <UIKit/UIKit.h>
+
+static void UpdateInhibit(vlc_inhibit_t *ih, unsigned mask)
+{
+    [UIApplication sharedApplication].idleTimerDisabled =
+        (mask & VLC_INHIBIT_DISPLAY) == VLC_INHIBIT_DISPLAY;
+}
+
+static int OpenInhibit(vlc_object_t *obj)
+{
+    vlc_inhibit_t *ih = (vlc_inhibit_t *)obj;
+    vout_window_t *wnd = vlc_inhibit_GetWindow(ih);
+    if (wnd->type != VOUT_WINDOW_TYPE_NSOBJECT)
+        return VLC_EGENERIC;
+
+    UIView * view = (__bridge UIView*)wnd->handle.nsobject;
+
+    if (unlikely(![view respondsToSelector:@selector(isKindOfClass:)]))
+        return VLC_EGENERIC;
+
+    if (![view isKindOfClass:[UIView class]])
+        return VLC_EGENERIC;
+
+    ih->inhibit = UpdateInhibit;
+    return VLC_SUCCESS;
+}
+
+vlc_module_begin()
+    set_shortname("UIKit sleep inhibition")
+    set_description("UIKit screen sleep inhibition for iOS and tvOS")
+    set_category(CAT_ADVANCED)
+    set_subcategory(SUBCAT_ADVANCED_MISC)
+    set_capability("inhibit", 10)
+    set_callback(OpenInhibit)
+vlc_module_end()

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/misc/medialibrary/entities.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/misc/medialibrary/entities.cpp Changed

@@ -34,6 +34,7 @@
 #include <medialibrary/IAlbumTrack.h>
 #include <medialibrary/IGenre.h>
 #include <medialibrary/ILabel.h>
+#include <medialibrary/IMediaGroup.h>
 #include <medialibrary/IPlaylist.h>
 #include <medialibrary/IAudioTrack.h>
 #include <medialibrary/IVideoTrack.h>
@@ -406,13 +407,40 @@
     return strdup_helper( input->name(), output.psz_name );
 }
 
+bool Convert( const medialibrary::IMediaGroup* input, vlc_ml_group_t& output )
+{
+    output.i_id = input->id();
+
+    output.i_nb_total_media = input->nbTotalMedia();
+
+    output.i_duration = input->duration();
+
+    output.i_creation_date = input->creationDate();
+
+    if( strdup_helper( input->name(), output.psz_name ) == false )
+        return false;
+
+    return true;
+}
+
 bool Convert( const medialibrary::IPlaylist* input, vlc_ml_playlist_t& output )
 {
     output.i_id = input->id();
 
+    output.i_creation_date = input->creationDate();
+
+    output.b_is_read_only = input->isReadOnly();
+
     if( !strdup_helper( input->name(), output.psz_name ) ||
         !strdup_helper( input->artworkMrl(), output.psz_artwork_mrl ) )
         return false;
+
+    // NOTE: mrl() must only be called when isReadOnly() is true.
+    if( output.b_is_read_only && !strdup_helper( input->mrl(), output.psz_mrl ) )
+        return false;
+    else
+        output.psz_mrl = nullptr;
+
     return true;
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/misc/medialibrary/medialibrary.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/misc/medialibrary/medialibrary.cpp Changed

@@ -38,6 +38,7 @@
 #include <medialibrary/IGenre.h>
 #include <medialibrary/IMetadata.h>
 #include <medialibrary/IShow.h>
+#include <medialibrary/IMediaGroup.h>
 #include <medialibrary/IPlaylist.h>
 #include <medialibrary/IBookmark.h>
 
@@ -82,6 +83,7 @@
 void assignToEvent( vlc_ml_event_t* ev, vlc_ml_artist_t* a )   { ev->creation.p_artist   = a; }
 void assignToEvent( vlc_ml_event_t* ev, vlc_ml_album_t* a )    { ev->creation.p_album    = a; }
 void assignToEvent( vlc_ml_event_t* ev, vlc_ml_genre_t* g )    { ev->creation.p_genre    = g; }
+void assignToEvent( vlc_ml_event_t* ev, vlc_ml_group_t* g )    { ev->creation.p_group    = g; }
 void assignToEvent( vlc_ml_event_t* ev, vlc_ml_playlist_t* p ) { ev->creation.p_playlist = p; }
 void assignToEvent( vlc_ml_event_t* ev, vlc_ml_bookmark_t* b ) { ev->creation.p_bookmark = b; }
 
@@ -177,6 +179,26 @@
     wrapEntityDeletedEventCallback( m_vlc_ml, albumIds, VLC_ML_EVENT_ALBUM_DELETED );
 }
 
+//-------------------------------------------------------------------------------------------------
+// Groups
+
+void MediaLibrary::onMediaGroupsAdded( std::vector<medialibrary::MediaGroupPtr> groups )
+{
+    wrapEntityCreatedEventCallback<vlc_ml_group_t>( m_vlc_ml, groups, VLC_ML_EVENT_GROUP_ADDED );
+}
+
+void MediaLibrary::onMediaGroupsModified( std::set<int64_t> groupIds )
+{
+    wrapEntityModifiedEventCallback( m_vlc_ml, groupIds, VLC_ML_EVENT_GROUP_UPDATED );
+}
+
+void MediaLibrary::onMediaGroupsDeleted( std::set<int64_t> groupIds )
+{
+    wrapEntityDeletedEventCallback( m_vlc_ml, groupIds, VLC_ML_EVENT_GROUP_DELETED );
+}
+
+//-------------------------------------------------------------------------------------------------
+
 void MediaLibrary::onPlaylistsAdded( std::vector<medialibrary::PlaylistPtr> playlists )
 {
     wrapEntityCreatedEventCallback<vlc_ml_playlist_t>( m_vlc_ml, playlists, VLC_ML_EVENT_PLAYLIST_ADDED );
@@ -207,18 +229,6 @@
     wrapEntityDeletedEventCallback( m_vlc_ml, genreIds, VLC_ML_EVENT_GENRE_DELETED );
 }
 
-void MediaLibrary::onMediaGroupsAdded( std::vector<medialibrary::MediaGroupPtr> )
-{
-}
-
-void MediaLibrary::onMediaGroupsModified( std::set<int64_t> )
-{
-}
-
-void MediaLibrary::onMediaGroupsDeleted( std::set<int64_t> )
-{
-}
-
 void MediaLibrary::onBookmarksAdded( std::vector<medialibrary::BookmarkPtr> bookmarks )
 {
     wrapEntityCreatedEventCallback<vlc_ml_bookmark_t>( m_vlc_ml, bookmarks,
@@ -935,6 +945,11 @@
                     vlc_assert_unreachable();
             }
         }
+        case VLC_ML_LIST_GROUPS:
+        case VLC_ML_COUNT_GROUPS:
+        case VLC_ML_LIST_GROUP_MEDIA:
+        case VLC_ML_COUNT_GROUP_MEDIA:
+            return listGroup( listQuery, paramsPtr, psz_pattern, nbItems, offset, args );
         case VLC_ML_LIST_PLAYLIST_MEDIA:
         case VLC_ML_COUNT_PLAYLIST_MEDIA:
         case VLC_ML_LIST_PLAYLISTS:
@@ -1039,6 +1054,12 @@
             auto show = m_ml->show( id );
             return CreateAndConvert<vlc_ml_show_t>( show.get() );
         }
+        case VLC_ML_GET_GROUP:
+        {
+            auto id = va_arg( args, int64_t );
+            auto group = m_ml->mediaGroup( id );
+            return CreateAndConvert<vlc_ml_group_t>( group.get() );
+        }
         case VLC_ML_GET_PLAYLIST:
         {
             auto id = va_arg( args, int64_t );
@@ -1392,6 +1413,8 @@
                     return VLC_ML_LIST_SHOW_EPISODES;
                 case VLC_ML_PARENT_GENRE:
                     return VLC_ML_LIST_GENRE_TRACKS;
+                case VLC_ML_PARENT_GROUP:
+                    return VLC_ML_LIST_GROUP_MEDIA;
                 case VLC_ML_PARENT_PLAYLIST:
                     return VLC_ML_LIST_PLAYLIST_MEDIA;
                 default:
@@ -1408,6 +1431,8 @@
                     return VLC_ML_COUNT_SHOW_EPISODES;
                 case VLC_ML_PARENT_GENRE:
                     return VLC_ML_COUNT_GENRE_TRACKS;
+                case VLC_ML_PARENT_GROUP:
+                    return VLC_ML_COUNT_GROUP_MEDIA;
                 case VLC_ML_PARENT_PLAYLIST:
                     return VLC_ML_COUNT_PLAYLIST_MEDIA;
                 default:
@@ -1663,6 +1688,82 @@
     }
 }
 
+int MediaLibrary::listGroup( int listQuery, const medialibrary::QueryParameters* paramsPtr,
+                             const char* pattern, uint32_t nbItems, uint32_t offset, va_list args )
+{
+    switch( listQuery )
+    {
+        case VLC_ML_LIST_GROUPS:
+        case VLC_ML_COUNT_GROUPS:
+        {
+            medialibrary::Query<medialibrary::IMediaGroup> query;
+
+            if ( pattern )
+                query = m_ml->searchMediaGroups( pattern, paramsPtr );
+            else
+                query = m_ml->mediaGroups( medialibrary::IMedia::Type::Unknown, paramsPtr );
+
+            if ( query == nullptr )
+                return VLC_EGENERIC;
+
+            switch ( listQuery )
+            {
+                case VLC_ML_LIST_GROUPS:
+                    *va_arg( args, vlc_ml_group_list_t** ) =
+                            ml_convert_list<vlc_ml_group_list_t, vlc_ml_group_t>(
+                                query->items( nbItems, offset ) );
+                    return VLC_SUCCESS;
+
+                case VLC_ML_COUNT_GROUPS:
+                    *va_arg( args, size_t* ) = query->count();
+                    return VLC_SUCCESS;
+
+                default:
+                    vlc_assert_unreachable();
+            }
+        }
+
+        case VLC_ML_LIST_GROUP_MEDIA:
+        case VLC_ML_COUNT_GROUP_MEDIA:
+        {
+            auto group = m_ml->mediaGroup( va_arg( args, int64_t ) );
+
+            if ( group == nullptr )
+                return VLC_EGENERIC;
+
+            medialibrary::Query<medialibrary::IMedia> query;
+
+            if ( pattern )
+                query = group->searchMedia( pattern, medialibrary::IMedia::Type::Unknown,
+                                            paramsPtr );
+            else
+                query = group->media( medialibrary::IMedia::Type::Unknown, paramsPtr );
+
+            if ( query == nullptr )
+                return VLC_EGENERIC;
+
+            switch ( listQuery )
+            {
+                case VLC_ML_LIST_GROUP_MEDIA:
+                    *va_arg( args, vlc_ml_media_list_t**) =
+                            ml_convert_list<vlc_ml_media_list_t, vlc_ml_media_t>(
+                                query->items( nbItems, offset ) );
+                    return VLC_SUCCESS;
+
+                case VLC_ML_COUNT_GROUP_MEDIA:
+                    *va_arg( args, size_t* ) = query->count();
+                    return VLC_SUCCESS;
+
+                default:
+                    vlc_assert_unreachable();
+            }
+        }
+
+        default:
+            vlc_assert_unreachable();
+    }
+}
+
 int MediaLibrary::listPlaylist( int listQuery, const medialibrary::QueryParameters* paramsPtr,
                                 const char* pattern, uint32_t nbItems, uint32_t offset, va_list args )
 {

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/misc/medialibrary/medialibrary.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/misc/medialibrary/medialibrary.h Changed

@@ -154,6 +154,8 @@
                     const char* pattern, uint32_t nbItems, uint32_t offset, va_list args );
     int listGenre( int listQuery, const medialibrary::QueryParameters* paramsPtr,
                    const char* pattern, uint32_t nbItems, uint32_t offset, va_list args );
+    int listGroup( int listQuery, const medialibrary::QueryParameters* paramsPtr,
+                   const char* pattern, uint32_t nbItems, uint32_t offset, va_list args );
     int listPlaylist( int listQuery, const medialibrary::QueryParameters* paramsPtr,
                       const char* pattern, uint32_t nbItems, uint32_t offset, va_list args );
     int listMedia( int listQuery, const medialibrary::QueryParameters* paramsPtr,
@@ -223,6 +225,7 @@
 bool Convert( const medialibrary::IGenre* input, vlc_ml_genre_t& output );
 bool Convert( const medialibrary::IShow* input, vlc_ml_show_t& output );
 bool Convert( const medialibrary::ILabel* input, vlc_ml_label_t& output );
+bool Convert( const medialibrary::IMediaGroup* input, vlc_ml_group_t& output );
 bool Convert( const medialibrary::IPlaylist* input, vlc_ml_playlist_t& output );
 bool Convert( const medialibrary::IFolder* input, vlc_ml_entry_point_t& output );
 bool Convert( const medialibrary::IBookmark* input, vlc_ml_bookmark_t& output );

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/misc/xml/libxml.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/misc/xml/libxml.c Changed

@@ -79,13 +79,25 @@
  *****************************************************************************/
 static void Close( vlc_object_t *p_this )
 {
-#ifdef LIBXML_GETS_A_CLUE_ABOUT_REENTRANCY_AND_MEMORY_LEAKS
-    vlc_mutex_lock( &lock );
-    xmlCleanupParser();
-    vlc_mutex_unlock( &lock );
-#endif
+    /* /!\
+     * In theory, xmlCleanupParser() should be called here.
+     * Unfortunately that function is not thread-safe,
+     * operating on global state. So even if we would be
+     * able to know when this module is unloaded, we could
+     * still not call it then, as other libraries or the apps
+     * using libVLC could still use libxml themselves.
+     *
+     * Citing the libxml docs for xmlCleanupParser:
+     *
+     * > If your application is multithreaded or has plugin support
+     * > calling this may crash the application if another thread or
+     * > a plugin is still using libxml2. It's sometimes very hard to
+     * > guess if libxml2 is in use in the application, some libraries
+     * > or plugins may use it without notice. In case of doubt abstain
+     * > from calling this function or do it just before calling exit()
+     * > to avoid leak reports from valgrind!
+     */
     VLC_UNUSED(p_this);
-    return;
 }
 
 /*****************************************************************************
@@ -171,16 +183,6 @@
     return likely(p_sys->node != NULL) ? ret : XML_READER_ERROR;
 }
 
-#if 0
-static char *ReaderValue( xml_reader_t *p_reader )
-{
-    const xmlChar *psz_value =
-        xmlTextReaderConstValue( p_reader->p_sys->xml );
-
-    return psz_value ? strdup( (const char *)psz_value ) : NULL;
-}
-#endif
-
 static const char *ReaderNextAttr( xml_reader_t *p_reader, const char **pval )
 {
     xml_reader_sys_t *p_sys = p_reader->p_sys;
@@ -229,6 +231,10 @@
     if( !p_libxml_reader )
     {
         free( p_sys );
+        /* /!\
+         * xmlCleanupParser should but can't be called here,
+         * for the same reason as in Close().
+         */
         return VLC_ENOMEM;
     }
 
@@ -253,13 +259,13 @@
     xml_reader_sys_t *p_sys = p_reader->p_sys;
 
     xmlFreeTextReader( p_sys->xml );
-#ifdef LIBXML_GETS_A_CLUE_ABOUT_REENTRANCY_AND_MEMORY_LEAKS
-    vlc_mutex_lock( &lock );
-    xmlCleanupParser();
-    vlc_mutex_unlock( &lock );
-#endif
     free( p_sys->node );
     free( p_sys );
+
+    /* /!\
+     * xmlCleanupParser should but can't be called here,
+     * same reason as in Close() of the main xml module.
+     */
 }
 
 vlc_module_begin ()

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/mux/mpeg/ts.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/mux/mpeg/ts.c Changed

@@ -153,12 +153,6 @@
   "PCRs (Program Clock Reference) will be sent (in milliseconds). " \
   "This value should be below 100ms. (default is 70ms).")
 
-#define BMIN_TEXT N_( "Minimum B (deprecated)")
-#define BMIN_LONGTEXT N_( "This setting is deprecated and not used anymore" )
-
-#define BMAX_TEXT N_( "Maximum B (deprecated)")
-#define BMAX_LONGTEXT N_( "This setting is deprecated and not used anymore")
-
 #define DTS_TEXT N_("DTS delay (ms)")
 #define DTS_LONGTEXT N_("Delay the DTS (decoding time " \
   "stamps) and PTS (presentation timestamps) of the data in the " \
@@ -226,10 +220,11 @@
     add_bool(SOUT_CFG_PREFIX "use-key-frames", false, KEYF_TEXT, KEYF_LONGTEXT, true)
 
     add_integer( SOUT_CFG_PREFIX "pcr", 70, PCR_TEXT, PCR_LONGTEXT, true)
-    add_integer( SOUT_CFG_PREFIX "bmin", 0, BMIN_TEXT, BMIN_LONGTEXT, true)
-    add_integer( SOUT_CFG_PREFIX "bmax", 0, BMAX_TEXT, BMAX_LONGTEXT, true)
     add_integer( SOUT_CFG_PREFIX "dts-delay", 400, DTS_TEXT, DTS_LONGTEXT, true)
 
+    add_obsolete_integer( "sout-ts-bmin" ) /* since 4.0.0 */
+    add_obsolete_integer( "sout-ts-bmax" ) /* since 4.0.0 */
+
     add_bool( SOUT_CFG_PREFIX "crypt-audio", true, ACRYPT_TEXT, ACRYPT_LONGTEXT, true)
     add_bool( SOUT_CFG_PREFIX "crypt-video", true, VCRYPT_TEXT, VCRYPT_LONGTEXT, true)
     add_string( SOUT_CFG_PREFIX "csa-ck",  NULL, CK_TEXT,   CK_LONGTEXT,   true)
@@ -247,7 +242,7 @@
     "standard",
     "pid-video", "pid-audio", "pid-spu", "pid-pmt", "tsid",
     "netid", "sdtdesc",
-    "es-id-pid", "shaping", "pcr", "bmin", "bmax", "use-key-frames",
+    "es-id-pid", "shaping", "pcr", "use-key-frames",
     "dts-delay", "csa-ck", "csa2-ck", "csa-use", "csa-pkt", "crypt-audio", "crypt-video",
     "muxpmt", "program-pmt", "alignment",
     NULL
@@ -368,9 +363,6 @@
     ts_mux_standard standard;
 
     /* for TS building */
-    int64_t         i_bitrate_min;
-    int64_t         i_bitrate_max;
-
     vlc_tick_t      i_shaping_delay;
     vlc_tick_t      i_pcr_delay;
 
@@ -690,25 +682,6 @@
     p_sys->i_pid_audio = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-audio" );
     p_sys->i_pid_spu = var_GetInteger( p_mux, SOUT_CFG_PREFIX "pid-spu" );
 
-    /* Allow to create constrained stream */
-    p_sys->i_bitrate_min = var_GetInteger( p_mux, SOUT_CFG_PREFIX "bmin" );
-
-    p_sys->i_bitrate_max = var_GetInteger( p_mux, SOUT_CFG_PREFIX "bmax" );
-
-    if( p_sys->i_bitrate_min > 0 && p_sys->i_bitrate_max > 0 &&
-        p_sys->i_bitrate_min > p_sys->i_bitrate_max )
-    {
-        msg_Err( p_mux, "incompatible minimum and maximum bitrate, "
-                 "disabling bitrate control" );
-        p_sys->i_bitrate_min = 0;
-        p_sys->i_bitrate_max = 0;
-    }
-    if( p_sys->i_bitrate_min > 0 || p_sys->i_bitrate_max > 0 )
-    {
-        msg_Err( p_mux, "bmin and bmax no more supported "
-                 "(if you need them report it)" );
-    }
-
     var_Get( p_mux, SOUT_CFG_PREFIX "shaping", &val );
     if( val.i_int <= 0 )
     {
@@ -1767,19 +1740,7 @@
     sout_mux_sys_t  *p_sys = p_mux->p_sys;
     int i_packet_count = p_chain_ts->i_depth;
 
-    if ( likely(i_pcr_length / 1000 > 0) )
-    {
-        int i_bitrate = ((uint64_t)i_packet_count * 188 * 8000)
-                          / MS_FROM_VLC_TICK(i_pcr_length);
-        if ( p_sys->i_bitrate_max && p_sys->i_bitrate_max < i_bitrate )
-        {
-            msg_Warn( p_mux, "max bitrate exceeded at %"PRId64
-                      " (%d bi/s for %d pkt in %"PRId64" us)",
-                      i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - vlc_tick_now(),
-                      i_bitrate, i_packet_count, i_pcr_length);
-        }
-    }
-    else
+    if ( unlikely(i_pcr_length / 1000 <= 0) )
     {
         /* This shouldn't happen, but happens in some rare heavy load
          * and packet losses conditions. */

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/packetizer/avparser.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/packetizer/avparser.c Changed

@@ -183,19 +183,57 @@
     if( unlikely( i_outlen <= 0 || !p_outdata ) )
         goto out;
 
-    block_t * p_ret = block_Alloc( i_outlen );
+    block_t * p_ret;
+    if( (size_t)i_outlen < p_block->i_buffer )
+    {
+        p_ret = block_Alloc( i_outlen );
+        if( unlikely ( !p_ret ) )
+            goto out;
+    }
+    else /* just pass block as-is */
+    {
+        p_ret = p_block;
+    }
 
-    if( unlikely ( !p_ret ) )
-        goto out;
+    if( p_ret != p_block )
+    {
+        p_ret->i_flags = p_block->i_flags;
+
+        if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY )
+            p_block->i_flags &= ~BLOCK_FLAG_DISCONTINUITY;
+
+        memcpy( p_ret->p_buffer, p_outdata, i_outlen );
+        p_ret->i_pts = p_block->i_pts;
+        p_ret->i_dts = p_block->i_dts;
+        p_block->i_pts = p_block->i_dts = VLC_TICK_INVALID;
+    }
+    else /* as-is block is now used */
+    {
+        p_sys->i_offset = 0;
+        *pp_block = NULL;
+    }
+
+    if( p_dec->fmt_in.i_cat == VIDEO_ES )
+    {
+        switch ( p_sys->p_parser_ctx->pict_type )
+        {
+        case AV_PICTURE_TYPE_I:
+            p_ret->i_flags |= BLOCK_FLAG_TYPE_I;
+            break;
+        case AV_PICTURE_TYPE_P:
+            p_ret->i_flags |= BLOCK_FLAG_TYPE_P;
+            break;
+        case AV_PICTURE_TYPE_B:
+            p_ret->i_flags |= BLOCK_FLAG_TYPE_B;
+            break;
+        default:
+            break;
+        }
+    }
 
-    memcpy( p_ret->p_buffer, p_outdata, i_outlen );
-    p_ret->i_pts = p_block->i_pts;
-    p_ret->i_dts = p_block->i_dts;
     if( p_sys->p_parser_ctx->key_frame == 1 )
         p_ret->i_flags |= BLOCK_FLAG_TYPE_I;
 
-    p_block->i_pts = p_block->i_dts = VLC_TICK_INVALID;
-
     return p_ret;
 
 out:

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/services_discovery/upnp.cpp -> vlc-beta-20210430.0b6b242324.tar.xz/modules/services_discovery/upnp.cpp Changed

@@ -658,7 +658,7 @@
     vlc_UrlParse( &url, psz_base_url );
 
     /* Part 1: a user may have provided a custom playlist url */
-    if (strncmp(psz_satip_channellist, "CustomList", 10) == 0) {
+    if (strcmp(psz_satip_channellist, "CustomList") == 0) {
         char *psz_satip_playlist_url = config_GetPsz( "satip-channellist-url" );
         if ( psz_satip_playlist_url ) {
             p_server = new(std::nothrow) SD::MediaServerDesc( psz_udn, psz_friendly_name, psz_satip_playlist_url, iconUrl );
@@ -681,8 +681,8 @@
 
     /* Part 2: device playlist
      * In Automatic mode, or if requested by the user, check for a SAT>IP m3u list on the device */
-    if (strncmp(psz_satip_channellist, "ServerList", 10) == 0 ||
-        strncmp(psz_satip_channellist, "Auto", strlen ("Auto")) == 0 ) {
+    if (strcmp(psz_satip_channellist, "ServerList") == 0 ||
+        strcmp(psz_satip_channellist, "Auto") == 0 ) {
         const char* psz_m3u_url = xml_getChildElementValue( p_device_element, "satip:X_SATIPM3U" );
         if ( psz_m3u_url ) {
             if ( strncmp( "http", psz_m3u_url, 4) )
@@ -712,7 +712,7 @@
             msg_Dbg( m_sd, "SAT>IP server '%s' did not provide a playlist", url.psz_host);
         }
 
-        if(strncmp(psz_satip_channellist, "ServerList", 10) == 0) {
+        if(strcmp(psz_satip_channellist, "ServerList") == 0) {
             /* to comply with the SAT>IP specifications, we don't fallback on another channel list if this path failed,
              * but in Automatic mode, we continue */
             free(psz_satip_channellist);
@@ -727,7 +727,7 @@
      * MasterList is a list of usual Satellites */
 
     /* In Auto mode, default to MasterList list from satip.info */
-    if( strncmp(psz_satip_channellist, "Auto", strlen ("Auto")) == 0 ) {
+    if( strcmp(psz_satip_channellist, "Auto") == 0 ) {
         free(psz_satip_channellist);
         psz_satip_channellist = strdup( "MasterList" );
     }
@@ -909,13 +909,13 @@
             psz_album_artist = xml_getChildElementValue( itemElement, "upnp:albumArtist" );
             psz_albumArt = xml_getChildElementValue( itemElement, "upnp:albumArtURI" );
             const char *psz_media_type = xml_getChildElementValue( itemElement, "upnp:class" );
-            if (strncmp(psz_media_type, "object.item.videoItem", 21) == 0)
+            if (strcmp(psz_media_type, "object.item.videoItem") == 0)
                 media_type = VIDEO;
-            else if (strncmp(psz_media_type, "object.item.audioItem", 21) == 0)
+            else if (strcmp(psz_media_type, "object.item.audioItem") == 0)
                 media_type = AUDIO;
-            else if (strncmp(psz_media_type, "object.item.imageItem", 21) == 0)
+            else if (strcmp(psz_media_type, "object.item.imageItem") == 0)
                 media_type = IMAGE;
-            else if (strncmp(psz_media_type, "object.container", 16 ) == 0)
+            else if (strcmp(psz_media_type, "object.container") == 0)
                 media_type = CONTAINER;
             else
                 return false;

vlc-beta-20210430.0b6b242324.tar.xz/modules/stream_out/chromecast/.gitignore Added

vlc-beta-20210430.0b6b242324.tar.xz/modules/video_filter/egl_surfacetexture.c Added

@@ -0,0 +1,473 @@
+/*****************************************************************************
+ * egl_surfacetexture.c: OpenGL offscreen provider with SurfaceTexture
+ *****************************************************************************
+ * Copyright (C) 2021 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.
+ *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_modules.h>
+#include <vlc_picture.h>
+#include <vlc_filter.h>
+#include <vlc_opengl.h>
+#include <vlc_vout_display.h>
+#include <vlc_atomic.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+#include "../video_output/android/utils.h"
+#include "../video_output/opengl/gl_api.h"
+
+#define BUFFER_COUNT 3
+
+struct video_ctx
+{
+    android_video_context_t android;
+    picture_pool_t *pool;
+    picture_t *pictures[BUFFER_COUNT];
+
+    EGLDisplay display;
+    EGLContext context;
+};
+
+struct picture_ctx
+{
+    struct picture_context_t context;
+    EGLSurface surface;
+
+    struct vlc_asurfacetexture *texture;
+};
+
+#define PRIV(pic_ctx) container_of(pic_ctx, struct picture_ctx, context)
+
+struct surfacetexture_sys
+{
+    android_video_context_t *avctx;
+
+    video_format_t fmt_out;
+
+    size_t current_flip;
+
+    struct vlc_gl_api api;
+
+    EGLConfig cfgv;
+
+    PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
+    PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR;
+
+    picture_t *current_picture;
+};
+
+static inline struct video_ctx *GetVCtx(vlc_gl_t *gl)
+{
+    return vlc_video_context_GetPrivate(gl->offscreen_vctx_out,
+                                        VLC_VIDEO_CONTEXT_AWINDOW);
+}
+
+static int MakeCurrent(vlc_gl_t *gl)
+{
+    struct surfacetexture_sys *sys = gl->sys;
+    struct video_ctx *vctx = GetVCtx(gl);
+
+    /* We must always have a surface mapped. */
+    assert(sys->current_picture);
+    assert(sys->current_picture->context);
+
+    struct picture_ctx *ctx = PRIV(sys->current_picture->context);
+
+    if (eglMakeCurrent (vctx->display, ctx->surface, ctx->surface,
+                        vctx->context) != EGL_TRUE)
+        return VLC_EGENERIC;
+
+    return VLC_SUCCESS;
+}
+
+static void ReleaseCurrent(vlc_gl_t *gl)
+{
+    struct video_ctx *vctx = GetVCtx(gl);
+
+    eglMakeCurrent(vctx->display, EGL_NO_SURFACE, EGL_NO_SURFACE,
+                    EGL_NO_CONTEXT);
+}
+
+static void *GetSymbol(vlc_gl_t *gl, const char *procname)
+{
+    (void) gl;
+    return (void *)eglGetProcAddress(procname);
+}
+
+static const char *QueryString(vlc_gl_t *gl, int32_t name)
+{
+    struct video_ctx *vctx = GetVCtx(gl);
+
+    return eglQueryString(vctx->display, name);
+}
+
+static void *CreateImageKHR(vlc_gl_t *gl, unsigned target, void *buffer,
+                            const int32_t *attrib_list)
+{
+    struct surfacetexture_sys *sys = gl->sys;
+    struct video_ctx *vctx = GetVCtx(gl);
+
+    return sys->eglCreateImageKHR(vctx->display, NULL, target, buffer,
+                                  attrib_list);
+}
+
+static bool DestroyImageKHR(vlc_gl_t *gl, void *image)
+{
+    struct surfacetexture_sys *sys = gl->sys;
+    struct video_ctx *vctx = GetVCtx(gl);
+
+    return sys->eglDestroyImageKHR(vctx->display, image);
+}
+
+static picture_context_t *CopyPictureContext(picture_context_t *input)
+{
+    vlc_video_context_Hold(input->vctx);
+    return input;
+}
+
+static void DestroyPictureContext(picture_context_t *input)
+{
+    (void) input;
+    /* video context is already released by picture_Release. */
+}
+
+static picture_context_t *CreatePictureContext(vlc_gl_t *gl)
+{
+    struct surfacetexture_sys *sys = gl->sys;
+    struct picture_ctx *ctx = malloc(sizeof(*ctx));
+    struct video_ctx *vctx = GetVCtx(gl);
+
+    ctx->texture = vlc_asurfacetexture_New(gl->device->opaque, false);
+
+    struct ANativeWindow *window = ctx->texture->window;
+    native_window_api_t *api =
+        AWindowHandler_getANativeWindowAPI(gl->device->opaque);
+    api->setBuffersGeometry(window, sys->fmt_out.i_width, sys->fmt_out.i_height,
+                            AHARDWAREBUFFER_FORMAT_BLOB);
+
+    /* Create a drawing surface */
+    ctx->surface = eglCreateWindowSurface(vctx->display, sys->cfgv, window,
+                                          NULL);
+    if (ctx->surface == EGL_NO_SURFACE)
+    {
+        msg_Err(gl, "cannot create EGL window surface");
+        goto error;
+    }
+
+    ctx->context.vctx = gl->offscreen_vctx_out;
+    ctx->context.copy = CopyPictureContext;
+    ctx->context.destroy = DestroyPictureContext;
+
+    return &ctx->context;
+
+error:
+    free(ctx);
+    return NULL;
+}
+
+static int InitEGL(vlc_gl_t *gl)
+{
+    struct surfacetexture_sys *sys = gl->sys;
+    struct video_ctx *vctx = GetVCtx(gl);
+
+    vctx->display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    if (vctx->display == EGL_NO_DISPLAY)
+        return VLC_EGENERIC;
+
+    /* Initialize EGL display */
+    EGLint major, minor;
+    if (eglInitialize(vctx->display, &major, &minor) != EGL_TRUE)
+        goto error;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_filter/opengl.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_filter/opengl.c Changed

@@ -171,13 +171,8 @@
     if (sys == NULL)
         return VLC_ENOMEM;
 
-    unsigned width
-        = filter->fmt_out.video.i_visible_width
-        = filter->fmt_in.video.i_visible_width;
-
-    unsigned height
-        = filter->fmt_out.video.i_visible_height
-        = filter->fmt_in.video.i_visible_height;
+    unsigned width = filter->fmt_out.video.i_visible_width;
+    unsigned height = filter->fmt_out.video.i_visible_height;
 
     // TODO: other than BGRA format ?
 #ifdef USE_OPENGL_ES2
@@ -237,6 +232,7 @@
     if (!sys->filters)
     {
         msg_Err(obj, "Could not create filters");
+        free(glfilters_config);
         goto filters_new_failure;
     }
 
@@ -247,7 +243,7 @@
     {
         msg_Err(obj, "Could not load filters: %s", glfilters_config);
         free(glfilters_config);
-        goto filter_config_failure;
+        goto filters_load_failure;
     }
     free(glfilters_config);
 
@@ -282,22 +278,15 @@
         = filter->fmt_out.i_codec
         = sys->gl->offscreen_chroma_out;
 
-    filter->fmt_out.video.i_frame_rate =
-        filter->fmt_in.video.i_frame_rate;
-
-    filter->fmt_out.video.i_frame_rate_base =
-        filter->fmt_in.video.i_frame_rate_base;
-
-    assert(filter->fmt_out.video.i_frame_rate_base != 0);
-
     filter->vctx_out = sys->gl->offscreen_vctx_out;
 
     return VLC_SUCCESS;
 
 init_framebuffer_failure:
-filters_new_failure:
+filters_load_failure:
     vlc_gl_filters_Delete(sys->filters);
 
+filters_new_failure:
 filter_config_failure:
     vlc_gl_interop_Delete(sys->interop);

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/Makefile.am -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/Makefile.am Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/apple/VLCOpenGLES2VideoView.m -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/apple/VLCOpenGLES2VideoView.m Changed

@@ -79,6 +79,35 @@
 - (void)detachFromWindow;
 @end
 
+static void vlc_dispatch_sync(void (^block_function)())
+{
+    CFRunLoopRef runloop = CFRunLoopGetMain();
+
+    __block vlc_sem_t performed;
+    vlc_sem_init(&performed, 0);
+
+    CFStringRef modes_cfstrings[] = {
+        kCFRunLoopDefaultMode,
+        CFSTR("org.videolan.vlccore.window"),
+    };
+
+    CFArrayRef modes = CFArrayCreate(NULL, (const void **)modes_cfstrings,
+            ARRAY_SIZE(modes_cfstrings),
+            &kCFTypeArrayCallBacks);
+
+    /* NOTE: we're using CFRunLoopPerformBlock with a custom mode tag
+     * to avoid deadlocks between the window module (main thread) and the
+     * display module, which would happen when using dispatch_sycn here. */
+    CFRunLoopPerformBlock(runloop, modes, ^{
+        (block_function)();
+        vlc_sem_post(&performed);
+    });
+    CFRunLoopWakeUp(runloop);
+
+    vlc_sem_wait(&performed);
+    CFRelease(modes);
+}
+
 /*****************************************************************************
  * vlc_gl_t callbacks
  *****************************************************************************/
@@ -466,12 +495,13 @@
     if (wnd->type != VOUT_WINDOW_TYPE_NSOBJECT)
         return VLC_EGENERIC;
 
-   @autoreleasepool {
-        /* setup the actual OpenGL ES view */
-        dispatch_sync(dispatch_get_main_queue(), ^{
+    @autoreleasepool {
+        /* NOTE: we're using CFRunLoopPerformBlock with the "vlc_runloop" tag
+         * to avoid deadlocks between the window module (main thread) and the
+         * display module, which would happen when using dispatch_sycn here. */
+        vlc_dispatch_sync(^{
             gl->sys = (__bridge_retained void*)[[VLCOpenGLES2VideoView alloc]
-               // TODO better rect
-               initWithFrame:CGRectMake(0.,0.,320.,240.) gl:gl];
+               initWithFrame:CGRectMake(0.,0.,width,height) gl:gl];
         });
 
         if (gl->sys == NULL)

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/apple/VLCVideoUIView.m -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/apple/VLCVideoUIView.m Changed

@@ -120,6 +120,11 @@
     _tapRecognizer = [[UITapGestureRecognizer alloc]
         initWithTarget:self action:@selector(tapRecognized:)];
 
+    CGSize size = _viewContainer.bounds.size;
+    [self reportEvent:^{
+        vout_window_ReportSize(_wnd, size.width, size.height);
+    }];
+
     return self;
 }
 
@@ -161,6 +166,20 @@
     }
 }
 
+- (void)reportEvent:(void(^)())eventBlock
+{
+    CFStringRef mode = CFSTR("org.videolan.vlccore.window");
+    CFRunLoopRef runloop = CFRunLoopGetCurrent();
+    CFRunLoopPerformBlock(runloop, mode, ^{
+        dispatch_async(dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
+            (eventBlock)();
+            CFRunLoopStop(runloop);
+        });
+    });
+    CFRunLoopWakeUp(runloop);
+    CFRunLoopRunInMode(mode, 0, NO);
+}
+
 - (void)detachFromParent
 {
     /* We need to lock because we consider that _wnd might be destroyed
@@ -263,11 +282,16 @@
     /* We need to lock to ensure _wnd is still valid, see detachFromParent. */
     vlc_mutex_lock(&_mutex);
     if (_wnd == NULL)
-        goto end;
-    vout_window_ReportSize(_wnd,
-            viewSize.width * scaleFactor,
-            viewSize.height * scaleFactor);
-end:
+    {
+        vlc_mutex_unlock(&_mutex);
+        return;
+    }
+
+    [self reportEvent:^{
+        vout_window_ReportSize(_wnd,
+                viewSize.width * scaleFactor,
+                viewSize.height * scaleFactor);
+    }];
     vlc_mutex_unlock(&_mutex);
 }
 
@@ -280,12 +304,17 @@
     /* We need to lock to ensure _wnd is still valid, see detachFromParent. */
     vlc_mutex_lock(&_mutex);
     if (_wnd == NULL)
-        goto end;
-    vout_window_ReportMouseMoved(_wnd,
-            (int)touchPoint.x * scaleFactor, (int)touchPoint.y * scaleFactor);
-    vout_window_ReportMousePressed(_wnd, MOUSE_BUTTON_LEFT);
-    vout_window_ReportMouseReleased(_wnd, MOUSE_BUTTON_LEFT);
-end:
+    {
+        vlc_mutex_unlock(&_mutex);
+        return;
+    }
+
+    [self reportEvent:^{
+        vout_window_ReportMouseMoved(_wnd,
+                (int)touchPoint.x * scaleFactor, (int)touchPoint.y * scaleFactor);
+        vout_window_ReportMousePressed(_wnd, MOUSE_BUTTON_LEFT);
+        vout_window_ReportMouseReleased(_wnd, MOUSE_BUTTON_LEFT);
+    }];
     vlc_mutex_unlock(&_mutex);
 }

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/kms.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/kms.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/Makefile.am -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/Makefile.am Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/filter.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/filter.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/filter.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/filter.h Changed

@@ -35,6 +35,7 @@
 
 struct vlc_gl_input_meta {
     vlc_tick_t pts;
+    unsigned plane;
 };
 
 typedef int
@@ -63,6 +64,9 @@
      * Successive calls to this function for the same filter is guaranteed to
      * always return the same sampler.
      *
+     * Important: filter->config must be initialized *before* getting the
+     * sampler, since the sampler behavior may depend on it.
+     *
      * \param filter the filter
      * \return sampler the sampler, NULL on error
      */
@@ -81,8 +85,20 @@
 
     struct {
         /**
+         * An OpenGL filter may either operate on the input RGBA picture, or on
+         * individual input planes (without chroma conversion) separately.
+         *
+         * In practice, this is useful for deinterlace filters.
+         *
+         * This flag must be set by the filter module (default is false).
+         */
+        bool filter_planes;
+
+        /**
          * A blend filter draws over the input picture (without reading it).
          *
+         * Meaningless if filter_planes is true.
+         *
          * This flag must be set by the filter module (default is false).
          */
         bool blend;
@@ -93,6 +109,8 @@
          * This value must be set by the filter module (default is 0, which
          * means disabled).
          *
+         * Meaningless if filter_planes is true.
+         *
          * The actual MSAA level may be overwritten to 0 if multisampling is
          * not supported, or to a higher value if another filter rendering on
          * the same framebuffer requested a higher MSAA level.

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/filter_draw.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/filter_draw.c Changed

@@ -97,16 +97,7 @@
 
     struct vlc_gl_sampler *sampler = vlc_gl_filter_GetSampler(filter);
 
-#ifdef USE_OPENGL_ES2
-# define SHADER_VERSION "#version 100\n"
-# define FRAGMENT_SHADER_PRECISION "precision highp float;\n"
-#else
-# define SHADER_VERSION "#version 120\n"
-# define FRAGMENT_SHADER_PRECISION
-#endif
-
-    static const char *const VERTEX_SHADER =
-        SHADER_VERSION
+    static const char *const VERTEX_SHADER_BODY =
         "attribute vec2 vertex_pos;\n"
         "varying vec2 tex_coords;\n"
         "void main() {\n"
@@ -115,8 +106,7 @@
         "                    (vertex_pos.y + 1.0) / 2.0);\n"
         "}\n";
 
-    static const char *const VERTEX_SHADER_VFLIP =
-        SHADER_VERSION
+    static const char *const VERTEX_SHADER_BODY_VFLIP =
         "attribute vec2 vertex_pos;\n"
         "varying vec2 tex_coords;\n"
         "void main() {\n"
@@ -125,11 +115,7 @@
         "                    (-vertex_pos.y + 1.0) / 2.0);\n"
         "}\n";
 
-    static const char *const FRAGMENT_SHADER_TEMPLATE =
-        SHADER_VERSION
-        "%s\n" /* extensions */
-        FRAGMENT_SHADER_PRECISION
-        "%s\n" /* vlc_texture definition */
+    static const char *const FRAGMENT_SHADER_BODY =
         "varying vec2 tex_coords;\n"
         "void main() {\n"
         "  gl_FragColor = vlc_texture(tex_coords);\n"
@@ -138,24 +124,40 @@
     const char *extensions = sampler->shader.extensions
                            ? sampler->shader.extensions : "";
 
-    char *fragment_shader;
-    int ret = asprintf(&fragment_shader, FRAGMENT_SHADER_TEMPLATE, extensions,
-                       sampler->shader.body);
-    if (ret < 0)
-        goto error;
-
     const opengl_vtable_t *vt = &filter->api->vt;
 
+    const char *shader_version;
+    const char *shader_precision;
+    if (filter->api->is_gles)
+    {
+        shader_version = "#version 100\n";
+        shader_precision = "precision highp float;\n";
+    }
+    else
+    {
+        shader_version = "#version 120\n";
+        shader_precision = "";
+    }
+
     config_ChainParse(filter, DRAW_CFG_PREFIX, filter_options, config);
     bool vflip = var_InheritBool(filter, DRAW_CFG_PREFIX "vflip");
 
-    const char *vertex_shader = vflip ? VERTEX_SHADER_VFLIP : VERTEX_SHADER;
+    const char *vertex_shader[] = {
+        shader_version,
+        vflip ? VERTEX_SHADER_BODY_VFLIP : VERTEX_SHADER_BODY,
+    };
+    const char *fragment_shader[] = {
+        shader_version,
+        extensions,
+        shader_precision,
+        sampler->shader.body,
+        FRAGMENT_SHADER_BODY,
+    };
+
     GLuint program_id =
         vlc_gl_BuildProgram(VLC_OBJECT(filter), vt,
-                            1, &vertex_shader,
-                            1, (const char **) &fragment_shader);
-
-    free(fragment_shader);
+                            ARRAY_SIZE(vertex_shader), vertex_shader,
+                            ARRAY_SIZE(fragment_shader), fragment_shader);
     if (!program_id)
         goto error;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/filter_mock.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/filter_mock.c Changed

@@ -49,8 +49,12 @@
  * Several instances may be combined:
  *
  *     ./vlc file.mkv --video-filter='opengl{filter="mock{mask,speed=1}:mock{angle=180,speed=-1}"}'
+ *
+ * It can also be used to filter planes separately, drawing each one with a
+ * small offset:
+ *
+ *     ./vlc file.mkv --video-filter='opengl{filter=mock{plane}}'
  */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -69,18 +73,10 @@
 #include "gl_common.h"
 #include "gl_util.h"
 
-#ifdef USE_OPENGL_ES2
-# define SHADER_VERSION "#version 100\n"
-# define FRAGMENT_SHADER_PRECISION "precision mediump float;\n"
-#else
-# define SHADER_VERSION "#version 120\n"
-# define FRAGMENT_SHADER_PRECISION
-#endif
-
 #define MOCK_CFG_PREFIX "mock-"
 
 static const char *const filter_options[] = {
-    "angle", "mask", "msaa", "speed", NULL
+    "angle", "mask", "msaa", "plane", "speed", NULL
 };
 
 struct sys {
@@ -92,6 +88,7 @@
         GLint vertex_pos;
         GLint rotation_matrix;
         GLint vertex_color; // blend (non-mask) only
+        GLint plane;
     } loc;
 
     float theta0;
@@ -193,6 +190,31 @@
     return VLC_SUCCESS;
 }
 
+static int
+DrawPlane(struct vlc_gl_filter *filter, const struct vlc_gl_input_meta *meta)
+{
+    struct sys *sys = filter->sys;
+
+    const opengl_vtable_t *vt = &filter->api->vt;
+
+    vt->UseProgram(sys->program_id);
+
+    struct vlc_gl_sampler *sampler = vlc_gl_filter_GetSampler(filter);
+    vlc_gl_sampler_Load(sampler);
+
+    vt->Uniform1i(sys->loc.plane, (int) meta->plane);
+
+    vt->BindBuffer(GL_ARRAY_BUFFER, sys->vbo);
+    vt->EnableVertexAttribArray(sys->loc.vertex_pos);
+    vt->VertexAttribPointer(sys->loc.vertex_pos, 2, GL_FLOAT, GL_FALSE, 0,
+                            (const void *) 0);
+
+    vt->Clear(GL_COLOR_BUFFER_BIT);
+    vt->DrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+    return VLC_SUCCESS;
+}
+
 static void
 Close(struct vlc_gl_filter *filter)
 {
@@ -211,8 +233,7 @@
     struct sys *sys = filter->sys;
     const opengl_vtable_t *vt = &filter->api->vt;
 
-    static const char *const VERTEX_SHADER =
-        SHADER_VERSION
+    static const char *const VERTEX_SHADER_BODY =
         "attribute vec2 vertex_pos;\n"
         "attribute vec3 vertex_color;\n"
         "uniform mat4 rotation_matrix;\n"
@@ -222,18 +243,39 @@
         "  color = vertex_color;\n"
         "}\n";
 
-    static const char *const FRAGMENT_SHADER =
-        SHADER_VERSION
-        FRAGMENT_SHADER_PRECISION
+    static const char *const FRAGMENT_SHADER_BODY =
         "varying vec3 color;\n"
         "void main() {\n"
         "  gl_FragColor = vec4(color, 0.5);\n"
         "}\n";
 
+    const char *shader_version;
+    const char *shader_precision;
+    if (filter->api->is_gles)
+    {
+        shader_version = "#version 100\n";
+        shader_precision = "precision highp float;\n";
+    }
+    else
+    {
+        shader_version = "#version 120\n";
+        shader_precision = "";
+    }
+
+    const char *vertex_shader[] = {
+        shader_version,
+        VERTEX_SHADER_BODY,
+    };
+    const char *fragment_shader[] = {
+        shader_version,
+        shader_precision,
+        FRAGMENT_SHADER_BODY,
+    };
+
     GLuint program_id =
         vlc_gl_BuildProgram(VLC_OBJECT(filter), vt,
-                            1, (const char **) &VERTEX_SHADER,
-                            1, (const char **) &FRAGMENT_SHADER);
+                            ARRAY_SIZE(vertex_shader), vertex_shader,
+                            ARRAY_SIZE(fragment_shader), fragment_shader);
 
     if (!program_id)
         return VLC_EGENERIC;
@@ -250,6 +292,10 @@
     sys->loc.vertex_color = vt->GetAttribLocation(program_id, "vertex_color");
     assert(sys->loc.vertex_color != -1);
 
+    sys->loc.rotation_matrix = vt->GetUniformLocation(sys->program_id,
+                                                      "rotation_matrix");
+    assert(sys->loc.rotation_matrix != -1);
+
     vt->GenBuffers(1, &sys->vbo);
 
     static const GLfloat data[] = {
@@ -282,8 +328,7 @@
 
     struct vlc_gl_sampler *sampler = vlc_gl_filter_GetSampler(filter);
 
-    static const char *const VERTEX_SHADER =
-        SHADER_VERSION
+    static const char *const VERTEX_SHADER_BODY =
         "attribute vec2 vertex_pos;\n"
         "uniform mat4 rotation_matrix;\n"
         "varying vec2 tex_coords;\n"
@@ -294,11 +339,7 @@
         "  gl_Position = pos\n;"
         "}\n";
 
-    static const char *const FRAGMENT_SHADER_TEMPLATE =
-        SHADER_VERSION
-        "%s\n" /* extensions */
-        FRAGMENT_SHADER_PRECISION
-        "%s\n" /* vlc_texture definition */
+    static const char *const FRAGMENT_SHADER_BODY =
         "varying vec2 tex_coords;\n"
         "void main() {\n"
         "  gl_FragColor = vlc_texture(tex_coords);\n"
@@ -307,17 +348,35 @@
     const char *extensions = sampler->shader.extensions
                            ? sampler->shader.extensions : "";
 
-    char *fragment_shader;
-    int ret = asprintf(&fragment_shader, FRAGMENT_SHADER_TEMPLATE, extensions,
-                       sampler->shader.body);
-    if (ret < 0)
-        return VLC_EGENERIC;
+    const char *shader_version;
+    const char *shader_precision;
+    if (filter->api->is_gles)
+    {
+        shader_version = "#version 100\n";
+        shader_precision = "precision highp float;\n";
+    }
+    else
+    {
+        shader_version = "#version 120\n";
+        shader_precision = "";
+    }
+
+    const char *vertex_shader[] = {
+        shader_version,
+        VERTEX_SHADER_BODY,
+    };
+    const char *fragment_shader[] = {
+        shader_version,
+        extensions,
+        shader_precision,
+        sampler->shader.body,
+        FRAGMENT_SHADER_BODY,
+    };
 
     GLuint program_id =
         vlc_gl_BuildProgram(VLC_OBJECT(filter), vt,
-                            1, (const char **) &VERTEX_SHADER,

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/filter_priv.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/filter_priv.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/filters.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/filters.c Changed

@@ -170,17 +170,17 @@
 }
 
 static int
-InitFramebufferOut(struct vlc_gl_filter_priv *priv)
+InitPlane(struct vlc_gl_filter_priv *priv, unsigned plane, GLsizei width,
+          GLsizei height)
 {
-    assert(priv->size_out.width > 0 && priv->size_out.height > 0);
-
     const opengl_vtable_t *vt = &priv->filter.api->vt;
 
-    /* Create a texture having the expected size */
-    vt->GenTextures(1, &priv->texture_out);
-    vt->BindTexture(GL_TEXTURE_2D, priv->texture_out);
-    vt->TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, priv->size_out.width,
-                   priv->size_out.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+    GLuint framebuffer = priv->framebuffers_out[plane];
+    GLuint texture = priv->textures_out[plane];
+
+    vt->BindTexture(GL_TEXTURE_2D, texture);
+    vt->TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA,
+                   GL_UNSIGNED_BYTE, NULL);
     vt->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     vt->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
@@ -189,12 +189,9 @@
     vt->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
     /* Create a framebuffer and attach the texture */
-    vt->GenFramebuffers(1, &priv->framebuffer_out);
-    vt->BindFramebuffer(GL_FRAMEBUFFER, priv->framebuffer_out);
+    vt->BindFramebuffer(GL_FRAMEBUFFER, framebuffer);
     vt->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                             GL_TEXTURE_2D, priv->texture_out, 0);
-
-    priv->has_framebuffer_out = true;
+                             GL_TEXTURE_2D, texture, 0);
 
     GLenum status = vt->CheckFramebufferStatus(GL_FRAMEBUFFER);
     if (status != GL_FRAMEBUFFER_COMPLETE)
@@ -204,6 +201,57 @@
 }
 
 static int
+InitFramebuffersOut(struct vlc_gl_filter_priv *priv)
+{
+    assert(priv->size_out.width > 0 && priv->size_out.height > 0);
+
+    const opengl_vtable_t *vt = &priv->filter.api->vt;
+
+    struct vlc_gl_filter *filter = &priv->filter;
+    if (filter->config.filter_planes)
+    {
+        struct vlc_gl_sampler *sampler = vlc_gl_filter_GetSampler(filter);
+        if (!sampler)
+            return VLC_EGENERIC;
+
+        priv->tex_count = sampler->tex_count;
+        vt->GenFramebuffers(priv->tex_count, priv->framebuffers_out);
+        vt->GenTextures(priv->tex_count, priv->textures_out);
+
+        for (unsigned i = 0; i < sampler->tex_count; ++i)
+        {
+            priv->tex_widths[i] = priv->size_out.width * sampler->tex_widths[i]
+                                / sampler->tex_widths[0];
+            priv->tex_heights[i] = priv->size_out.height * sampler->tex_heights[i]
+                                 / sampler->tex_heights[0];
+            /* Init one framebuffer and texture for each plane */
+            int ret =
+                InitPlane(priv, i, priv->tex_widths[i], priv->tex_heights[i]);
+            if (ret != VLC_SUCCESS)
+                return ret;
+        }
+    }
+    else
+    {
+        priv->tex_count = 1;
+
+        /* Create a texture having the expected size */
+
+        vt->GenFramebuffers(1, priv->framebuffers_out);
+        vt->GenTextures(1, priv->textures_out);
+
+        priv->tex_widths[0] = priv->size_out.width;
+        priv->tex_heights[0] = priv->size_out.height;
+
+        int ret = InitPlane(priv, 0, priv->tex_widths[0], priv->tex_heights[0]);
+        if (ret != VLC_SUCCESS)
+            return ret;
+    }
+
+    return VLC_SUCCESS;
+}
+
+static int
 InitFramebufferMSAA(struct vlc_gl_filter_priv *priv, unsigned msaa_level)
 {
     assert(msaa_level);
@@ -241,18 +289,27 @@
     struct vlc_gl_filters *filters = priv->filters;
     struct vlc_gl_filter_priv *prev_filter = priv->prev_filter;
 
+    bool expose_planes = filter->config.filter_planes;
     struct vlc_gl_sampler *sampler;
     if (!priv->prev_filter)
-        sampler = vlc_gl_sampler_NewFromInterop(filters->interop);
+        sampler = vlc_gl_sampler_NewFromInterop(filters->interop,
+                                                expose_planes);
     else
     {
         video_format_t fmt;
-        video_format_Init(&fmt, VLC_CODEC_RGBA);
+
+        /* 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->sampler->fmt.i_chroma
+                            : VLC_CODEC_RGBA;
+
+        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;
 
-        sampler =
-            vlc_gl_sampler_NewFromTexture2D(filters->gl, filters->api, &fmt);
+        sampler = vlc_gl_sampler_NewFromTexture2D(filters->gl, filters->api,
+                                                  &fmt, expose_planes);
     }
 
     priv->sampler = sampler;
@@ -312,6 +369,12 @@
            || (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);
+
     /* A blend filter may not read its input, so it is an error if a sampler
      * has been requested.
      *
@@ -323,7 +386,7 @@
 
     if (filter->config.blend)
     {
-        if (!prev_filter)
+        if (!prev_filter || prev_filter->filter.config.filter_planes)
         {
             /* We cannot blend with nothing, so insert a "draw" filter to draw
              * the input picture to blend with. */
@@ -398,10 +461,15 @@
     /* "priv" is the last filter */
     assert(priv); /* There is at least one filter */
 
-    if (priv->filter.config.msaa_level)
-    {
+    bool insert_draw =
         /* Resolving multisampling to the default framebuffer might fail,
-         * because its format may be different. So insert a "draw" filter. */
+         * because its format may be different. */
+        priv->filter.config.msaa_level ||
+        /* A filter operating on planes may produce several textures.
+         * They need to be chroma-converted to a single RGBA texture. */
+        priv->filter.config.filter_planes;
+    if (insert_draw)
+    {
         struct vlc_gl_filter *draw =
             vlc_gl_filters_Append(filters, "draw", NULL);
         if (!draw)
@@ -422,11 +490,11 @@
         if (!is_last)
         {
             /* It was the last non-blend filter before we append this one */
-            assert(!priv->has_framebuffer_out);
+            assert(priv->tex_count == 0);
 
             /* Every non-blend filter needs its own framebuffer, except the last
              * one */
-            int ret = InitFramebufferOut(priv);
+            int ret = InitFramebuffersOut(priv);
             if (ret != VLC_SUCCESS)
                 return ret;
         }
@@ -467,6 +535,7 @@
 
     struct vlc_gl_input_meta meta = {
         .pts = filters->pic.pts,
+        .plane = 0,
     };
 
     struct vlc_gl_filter_priv *priv;
@@ -478,10 +547,10 @@
         if (previous)
         {
             /* Read from the output of the previous filter */
-            int ret = vlc_gl_sampler_UpdateTexture(priv->sampler,
-                                                   previous->texture_out,

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/interop.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/interop.c Changed

@@ -204,6 +204,14 @@
     return size > 0 ? size * mul : size;
 }
 
+static inline void
+DivideRationalByTwo(vlc_rational_t *r) {
+    if (r->num % 2 == 0)
+        r->num /= 2;
+    else
+        r->den *= 2;
+}
+
 static int
 interop_yuv_base_init(struct vlc_gl_interop *interop, GLenum tex_target,
                       vlc_fourcc_t chroma,
@@ -273,12 +281,14 @@
         if (desc->pixel_size == 1)
         {
             interop->texs[0] = (struct vlc_gl_tex_cfg) {
-                { 1, 1 }, { 1, 1 }, oneplane_texfmt, oneplane_texfmt,
-                GL_UNSIGNED_BYTE
+                { desc->p[0].w.num, desc->p[0].w.den },
+                { desc->p[0].h.num, desc->p[0].h.den },
+                oneplane_texfmt, oneplane_texfmt, GL_UNSIGNED_BYTE
             };
             interop->texs[1] = (struct vlc_gl_tex_cfg) {
-                { 1, 2 }, { 1, 2 }, twoplanes_texfmt, twoplanes_texfmt,
-                GL_UNSIGNED_BYTE
+                { desc->p[1].w.num, desc->p[1].w.den },
+                { desc->p[1].h.num, desc->p[1].h.den },
+                twoplanes_texfmt, twoplanes_texfmt, GL_UNSIGNED_BYTE
             };
         }
         else if (desc->pixel_size == 2)
@@ -288,24 +298,49 @@
                                  twoplanes16_texfmt, GL_UNSIGNED_SHORT) != 16)
                 return VLC_EGENERIC;
             interop->texs[0] = (struct vlc_gl_tex_cfg) {
-                { 1, 1 }, { 1, 1 }, oneplane16_texfmt, oneplane_texfmt,
-                GL_UNSIGNED_SHORT
+                { desc->p[0].w.num, desc->p[0].w.den },
+                { desc->p[0].h.num, desc->p[0].h.den },
+                oneplane16_texfmt, oneplane_texfmt, GL_UNSIGNED_SHORT
             };
             interop->texs[1] = (struct vlc_gl_tex_cfg) {
-                { 1, 2 }, { 1, 2 }, twoplanes16_texfmt, twoplanes_texfmt,
-                GL_UNSIGNED_SHORT
+                { desc->p[1].w.num, desc->p[1].w.den },
+                { desc->p[1].h.num, desc->p[1].h.den },
+                twoplanes16_texfmt, twoplanes_texfmt, GL_UNSIGNED_SHORT
             };
         }
         else
             return VLC_EGENERIC;
+
+        /*
+         * If plane_count == 2, then the chroma is semiplanar: the U and V
+         * planes are packed in the second plane. As a consequence, the
+         * horizontal scaling, as reported in the vlc_chroma_description_t, is
+         * doubled.
+         *
+         * But once imported as an OpenGL texture, both components are stored
+         * in a single texel (the two first components of the vec4).
+         * Therefore, from OpenGL, the width is not doubled, so the horizontal
+         * scaling must be divided by 2 to compensate.
+         */
+         DivideRationalByTwo(&interop->texs[1].w);
     }
     else if (desc->plane_count == 1)
     {
+        /* Only YUV 4:2:2 formats */
         /* Y1 U Y2 V fits in R G B A */
         interop->tex_count = 1;
         interop->texs[0] = (struct vlc_gl_tex_cfg) {
-            { 1, 2 }, { 1, 1 }, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE
+            { desc->p[0].w.num, desc->p[0].w.den },
+            { desc->p[0].h.num, desc->p[0].h.den },
+            GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE
         };
+
+        /*
+         * Currently, Y2 is ignored, so the texture is stored at chroma
+         * resolution. In other words, half the horizontal resolution is lost,
+         * so we must adapt the horizontal scaling.
+         */
+        DivideRationalByTwo(&interop->texs[0].w);
     }
     else
         return VLC_EGENERIC;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/interop_android.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/interop_android.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/interop_dxva2.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/interop_dxva2.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/renderer.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/renderer.c Changed

@@ -170,25 +170,14 @@
 #undef ROW
 }
 
-/* https://en.wikipedia.org/wiki/OpenGL_Shading_Language#Versions */
-#ifdef USE_OPENGL_ES2
-# define SHADER_VERSION "#version 100\n"
-  /* In OpenGL ES, the fragment language has no default precision qualifier for
-   * floating point types. */
-# define FRAGMENT_SHADER_PRECISION "precision highp float;\n"
-#else
-# define SHADER_VERSION "#version 120\n"
-# define FRAGMENT_SHADER_PRECISION
-#endif
-
-static char *
-BuildVertexShader(struct vlc_gl_filter *filter)
+static int
+opengl_link_program(struct vlc_gl_filter *filter)
 {
     struct vlc_gl_renderer *renderer = filter->sys;
+    struct vlc_gl_sampler *sampler = renderer->sampler;
+    const opengl_vtable_t *vt = renderer->vt;
 
-    /* Basic vertex shader */
-    static const char *template =
-        SHADER_VERSION
+    static const char *const VERTEX_SHADER_BODY =
         "attribute vec2 PicCoordsIn;\n"
         "varying vec2 PicCoords;\n"
         "attribute vec3 VertexPosition;\n"
@@ -200,29 +189,9 @@
         " PicCoords = (StereoMatrix * vec3(PicCoordsIn, 1.0)).st;\n"
         " gl_Position = ProjectionMatrix * ZoomMatrix * ViewMatrix\n"
         "               * vec4(VertexPosition, 1.0);\n"
-        "}";
-
-    char *code = strdup(template);
-    if (!code)
-        return NULL;
-
-    if (renderer->dump_shaders)
-        msg_Dbg(filter, "\n=== Vertex shader for fourcc: %4.4s ===\n%s\n",
-                (const char *) &renderer->sampler->fmt.i_chroma, code);
-    return code;
-}
-
-static char *
-BuildFragmentShader(struct vlc_gl_filter *filter)
-{
-    struct vlc_gl_renderer *renderer = filter->sys;
-    struct vlc_gl_sampler *sampler = renderer->sampler;
+        "}\n";
 
-    static const char *template =
-        SHADER_VERSION
-        "%s" /* extensions */
-        FRAGMENT_SHADER_PRECISION
-        "%s" /* vlc_texture definition */
+    static const char *const FRAGMENT_SHADER_BODY =
         "varying vec2 PicCoords;\n"
         "void main() {\n"
         " gl_FragColor = vlc_texture(PicCoords);\n"
@@ -231,35 +200,44 @@
     const char *extensions = sampler->shader.extensions
                            ? sampler->shader.extensions : "";
 
-    char *code;
-    int ret = asprintf(&code, template, extensions, sampler->shader.body);
-    if (ret < 0)
-        return NULL;
-
-    if (renderer->dump_shaders)
-        msg_Dbg(filter, "\n=== Fragment shader for fourcc: %4.4s, colorspace: %d ===\n%s\n",
-                        (const char *) &sampler->fmt.i_chroma,
-                        sampler->fmt.space, code);
-
-    return code;
-}
-
-static int
-opengl_link_program(struct vlc_gl_filter *filter)
-{
-    struct vlc_gl_renderer *renderer = filter->sys;
-    struct vlc_gl_sampler *sampler = renderer->sampler;
-    const opengl_vtable_t *vt = renderer->vt;
+    const char *shader_version;
+    const char *shader_precision;
+    if (filter->api->is_gles)
+    {
+        shader_version = "#version 100\n";
+        shader_precision = "precision highp float;\n";
+    }
+    else
+    {
+        shader_version = "#version 120\n";
+        shader_precision = "";
+    }
 
-    char *vertex_shader = BuildVertexShader(filter);
-    if (!vertex_shader)
-        return VLC_EGENERIC;
+    const char *vertex_shader[] = {
+        shader_version,
+        VERTEX_SHADER_BODY,
+    };
+    const char *fragment_shader[] = {
+        shader_version,
+        extensions,
+        shader_precision,
+        sampler->shader.body,
+        FRAGMENT_SHADER_BODY,
+    };
 
-    char *fragment_shader = BuildFragmentShader(filter);
-    if (!fragment_shader)
+    if (renderer->dump_shaders)
     {
-        free(vertex_shader);
-        return VLC_EGENERIC;
+        msg_Dbg(filter, "\n=== Vertex shader for fourcc: %4.4s ===\n",
+                (const char *) &renderer->sampler->fmt.i_chroma);
+        for (unsigned i = 0; i < ARRAY_SIZE(vertex_shader); ++i)
+            msg_Dbg(filter, "[%u] %s", i, vertex_shader[i]);
+
+        msg_Dbg(filter,
+                "\n=== Fragment shader for fourcc: %4.4s, colorspace: %d ===\n",
+                (const char *) &renderer->sampler->fmt.i_chroma,
+                sampler->fmt.space);
+        for (unsigned i = 0; i < ARRAY_SIZE(fragment_shader); ++i)
+            msg_Dbg(filter, "[%u] %s", i, fragment_shader[i]);
     }
 
     assert(sampler->ops &&
@@ -268,10 +246,8 @@
 
     GLuint program_id =
         vlc_gl_BuildProgram(VLC_OBJECT(filter), vt,
-                            1, (const char **) &vertex_shader,
-                            1, (const char **) &fragment_shader);
-    free(vertex_shader);
-    free(fragment_shader);
+                            ARRAY_SIZE(vertex_shader), vertex_shader,
+                            ARRAY_SIZE(fragment_shader), fragment_shader);
     if (!program_id)
         return VLC_EGENERIC;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/sampler.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/sampler.c Changed

@@ -44,7 +44,8 @@
     struct vlc_gl_sampler sampler;
 
     struct vlc_gl_t *gl;
-    const opengl_vtable_t *vt;
+    const struct vlc_gl_api *api;
+    const opengl_vtable_t *vt; /* for convenience, same as &api->vt */
 
     struct {
         GLfloat OrientationMatrix[4*4];
@@ -77,6 +78,8 @@
 
     GLuint textures[PICTURE_PLANE_MAX];
 
+    GLenum tex_target;
+
     struct {
         unsigned int i_x_offset;
         unsigned int i_y_offset;
@@ -88,12 +91,17 @@
      *  - created with _NewFromInterop(), it receives input pictures from VLC
      *    (picture_t) via _UpdatePicture();
      *  - created with _NewFromTexture2D() (interop is NULL), it receives
-     *    directly OpenGL textures via _UpdateTexture().
+     *    directly OpenGL textures via _UpdateTextures().
      */
     struct vlc_gl_interop *interop;
 
     /* Only used for "direct" sampler (when interop == NULL) */
     video_format_t direct_fmt;
+
+    /* If set, vlc_texture() exposes a single plane (without chroma
+     * conversion), selected by vlc_gl_sampler_SetCurrentPlane(). */
+    bool expose_planes;
+    unsigned plane;
 };
 
 #define PRIV(sampler) container_of(sampler, struct vlc_gl_sampler_priv, sampler)
@@ -269,7 +277,6 @@
 {
     struct vlc_gl_sampler_priv *priv = PRIV(sampler);
 
-    struct vlc_gl_interop *interop = priv->interop;
     const opengl_vtable_t *vt = priv->vt;
 
     if (priv->yuv_color)
@@ -286,22 +293,22 @@
         vt->GetUniformLocation(program, "OrientationMatrix");
     assert(priv->uloc.OrientationMatrix != -1);
 
-    assert(interop->tex_count < 10); /* to guarantee variable names length */
-    for (unsigned int i = 0; i < interop->tex_count; ++i)
+    assert(sampler->tex_count < 10); /* to guarantee variable names length */
+    for (unsigned int i = 0; i < sampler->tex_count; ++i)
     {
-        char name[sizeof("TexCoordsMapX")];
+        char name[sizeof("TexCoordsMaps[X]")];
 
-        snprintf(name, sizeof(name), "Texture%1u", i);
+        snprintf(name, sizeof(name), "Textures[%1u]", i);
         priv->uloc.Textures[i] = vt->GetUniformLocation(program, name);
         assert(priv->uloc.Textures[i] != -1);
 
-        snprintf(name, sizeof(name), "TexCoordsMap%1u", i);
+        snprintf(name, sizeof(name), "TexCoordsMaps[%1u]", i);
         priv->uloc.TexCoordsMaps[i] = vt->GetUniformLocation(program, name);
         assert(priv->uloc.TexCoordsMaps[i] != -1);
 
-        if (interop->tex_target == GL_TEXTURE_RECTANGLE)
+        if (priv->tex_target == GL_TEXTURE_RECTANGLE)
         {
-            snprintf(name, sizeof(name), "TexSize%1u", i);
+            snprintf(name, sizeof(name), "TexSizes[%1u]", i);
             priv->uloc.TexSizes[i] = vt->GetUniformLocation(program, name);
             assert(priv->uloc.TexSizes[i] != -1);
         }
@@ -320,7 +327,7 @@
 GetTransformMatrix(const struct vlc_gl_interop *interop)
 {
     const GLfloat *tm = NULL;
-    if (interop->ops && interop->ops->get_transform_matrix)
+    if (interop && interop->ops && interop->ops->get_transform_matrix)
         tm = interop->ops->get_transform_matrix(interop);
     if (!tm)
         tm = MATRIX4_IDENTITY;
@@ -332,34 +339,34 @@
 {
     struct vlc_gl_sampler_priv *priv = PRIV(sampler);
 
-    const struct vlc_gl_interop *interop = priv->interop;
     const opengl_vtable_t *vt = priv->vt;
 
     if (priv->yuv_color)
         vt->UniformMatrix4fv(priv->uloc.ConvMatrix, 1, GL_FALSE,
                              priv->conv_matrix);
 
-    for (unsigned i = 0; i < interop->tex_count; ++i)
+    for (unsigned i = 0; i < sampler->tex_count; ++i)
     {
         vt->Uniform1i(priv->uloc.Textures[i], i);
 
         assert(priv->textures[i] != 0);
         vt->ActiveTexture(GL_TEXTURE0 + i);
-        vt->BindTexture(interop->tex_target, priv->textures[i]);
+        vt->BindTexture(priv->tex_target, priv->textures[i]);
 
         vt->UniformMatrix3fv(priv->uloc.TexCoordsMaps[i], 1, GL_FALSE,
                              priv->var.TexCoordsMaps[i]);
     }
 
-    const GLfloat *tm = GetTransformMatrix(interop);
+    /* Return the expected transform matrix if interop == NULL */
+    const GLfloat *tm = GetTransformMatrix(priv->interop);
     vt->UniformMatrix4fv(priv->uloc.TransformMatrix, 1, GL_FALSE, tm);
 
     vt->UniformMatrix4fv(priv->uloc.OrientationMatrix, 1, GL_FALSE,
                          priv->var.OrientationMatrix);
 
-    if (interop->tex_target == GL_TEXTURE_RECTANGLE)
+    if (priv->tex_target == GL_TEXTURE_RECTANGLE)
     {
-        for (unsigned i = 0; i < interop->tex_count; ++i)
+        for (unsigned i = 0; i < sampler->tex_count; ++i)
             vt->Uniform2f(priv->uloc.TexSizes[i], priv->tex_widths[i],
                           priv->tex_heights[i]);
     }
@@ -404,7 +411,7 @@
     struct vlc_gl_sampler_priv *priv = PRIV(sampler);
     const opengl_vtable_t *vt = priv->vt;
 
-    priv->uloc.Textures[0] = vt->GetUniformLocation(program, "Texture0");
+    priv->uloc.Textures[0] = vt->GetUniformLocation(program, "Textures[0]");
     assert(priv->uloc.Textures[0] != -1);
 
     priv->uloc.TransformMatrix =
@@ -416,7 +423,7 @@
     assert(priv->uloc.OrientationMatrix != -1);
 
     priv->uloc.TexCoordsMaps[0] =
-        vt->GetUniformLocation(program, "TexCoordsMap0");
+        vt->GetUniformLocation(program, "TexCoordsMaps[0]");
     assert(priv->uloc.TexCoordsMaps[0] != -1);
 }
 
@@ -424,19 +431,19 @@
 sampler_xyz12_load(const struct vlc_gl_sampler *sampler)
 {
     struct vlc_gl_sampler_priv *priv = PRIV(sampler);
-    const struct vlc_gl_interop *interop = priv->interop;
     const opengl_vtable_t *vt = priv->vt;
 
     vt->Uniform1i(priv->uloc.Textures[0], 0);
 
     assert(priv->textures[0] != 0);
     vt->ActiveTexture(GL_TEXTURE0);
-    vt->BindTexture(interop->tex_target, priv->textures[0]);
+    vt->BindTexture(priv->tex_target, priv->textures[0]);
 
     vt->UniformMatrix3fv(priv->uloc.TexCoordsMaps[0], 1, GL_FALSE,
                          priv->var.TexCoordsMaps[0]);
 
-    const GLfloat *tm = GetTransformMatrix(interop);
+    /* Return the expected transform matrix if interop == NULL */
+    const GLfloat *tm = GetTransformMatrix(priv->interop);
     vt->UniformMatrix4fv(priv->uloc.TransformMatrix, 1, GL_FALSE, tm);
 
     vt->UniformMatrix4fv(priv->uloc.OrientationMatrix, 1, GL_FALSE,
@@ -459,7 +466,7 @@
      *  - reverse RGB gamma correction
      */
     static const char *template =
-        "uniform sampler2D Texture0;"
+        "uniform sampler2D Textures[1];"
         "uniform vec4 xyz_gamma = vec4(2.6);"
         "uniform vec4 rgb_gamma = vec4(1.0/2.2);"
         /* WARN: matrix Is filled column by column (not row !) */
@@ -472,14 +479,14 @@
 
         "uniform mat4 TransformMatrix;\n"
         "uniform mat4 OrientationMatrix;\n"
-        "uniform mat3 TexCoordsMap0;\n"
+        "uniform mat3 TexCoordsMaps[1];\n"
         "vec4 vlc_texture(vec2 pic_coords)\n"
         "{ "
         " vec4 v_in, v_out;"
         /* Homogeneous (oriented) coordinates */
         " vec3 pic_hcoords = vec3((TransformMatrix * OrientationMatrix * vec4(pic_coords, 0.0, 1.0)).st, 1.0);\n"
-        " vec2 tex_coords = (TexCoordsMap0 * pic_hcoords).st;\n"
-        " v_in  = texture2D(Texture0, tex_coords);\n"
+        " vec2 tex_coords = (TexCoordsMaps[0] * pic_hcoords).st;\n"
+        " v_in  = texture2D(Textures[0], tex_coords);\n"
         " v_in = pow(v_in, xyz_gamma);"
         " v_out = matrix_xyz_rgb * v_in ;"
         " v_out = pow(v_out, rgb_gamma) ;"
@@ -495,13 +502,15 @@
 }
 
 static int
-opengl_init_swizzle(const struct vlc_gl_interop *interop,
+opengl_init_swizzle(struct vlc_gl_sampler *sampler,

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/sampler.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/sampler.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/opengl/sampler_priv.h -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/opengl/sampler_priv.h Changed

@@ -35,9 +35,12 @@
  * uploaded them to OpenGL textures.
  *
  * \param interop the interop
+ * \param expose_planes if set, vlc_texture() exposes a single plane at a time
+ *                      (selected by vlc_gl_sampler_SetCurrentPlane())
  */
 struct vlc_gl_sampler *
-vlc_gl_sampler_NewFromInterop(struct vlc_gl_interop *interop);
+vlc_gl_sampler_NewFromInterop(struct vlc_gl_interop *interop,
+                              bool expose_planes);
 
 /**
  * Create a new direct sampler
@@ -48,11 +51,13 @@
  * \param gl the OpenGL context
  * \param api the OpenGL API
  * \param fmt the input format
+ * \param expose_planes if set, vlc_texture() exposes a single plane at a time
+ *                      (selected by vlc_gl_sampler_SetCurrentPlane())
  */
 struct vlc_gl_sampler *
 vlc_gl_sampler_NewFromTexture2D(struct vlc_gl_t *gl,
                                 const struct vlc_gl_api *api,
-                                const video_format_t *fmt);
+                                const video_format_t *fmt, bool expose_planes);
 
 /**
  * Delete a sampler
@@ -77,17 +82,29 @@
                              picture_t *picture);
 
 /**
- * Update the input texture
+ * Update the input textures
  *
  * Warning: only call on sampler created by vlc_gl_sampler_NewFromTexture2D().
  *
  * \param sampler the sampler
- * \param texture the new texture, with target GL_TEXTURE_2D
- * \param tex_width the texture width
- * \param tex_height the texture height
+ * \param textures the new textures, with target GL_TEXTURE_2D
+ * \param tex_widths the textures width
+ * \param tex_heights the textures height
  */
 int
-vlc_gl_sampler_UpdateTexture(struct vlc_gl_sampler *sampler, GLuint texture,
-                             GLsizei tex_width, GLsizei tex_height);
+vlc_gl_sampler_UpdateTextures(struct vlc_gl_sampler *sampler, GLuint textures[],
+                              GLsizei tex_widths[], GLsizei tex_heights[]);
+
+/**
+ * Select the plane to expose
+ *
+ * If the sampler exposes planes separately (for plane filters), select the
+ * plane to expose via the GLSL function vlc_texture().
+ *
+ * \param sampler the sampler
+ * \param plane the plane number
+ */
+void
+vlc_gl_sampler_SelectPlane(struct vlc_gl_sampler *sampler, unsigned plane);
 
 #endif

vlc-beta-20210405.f3c7ba5bb3.tar.xz/modules/video_output/win32/direct3d9.c -> vlc-beta-20210430.0b6b242324.tar.xz/modules/video_output/win32/direct3d9.c Changed

vlc-beta-20210430.0b6b242324.tar.xz/po/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/po/Makevars -> vlc-beta-20210430.0b6b242324.tar.xz/po/Makevars Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/po/POTFILES.in -> vlc-beta-20210430.0b6b242324.tar.xz/po/POTFILES.in Changed

@@ -295,6 +295,7 @@
 modules/codec/cea708.h
 modules/codec/cvdsub.c
 modules/codec/daala.c
+modules/codec/dav1d.c
 modules/codec/dca.c
 modules/codec/ddummy.c
 modules/codec/dmo/dmo.c
@@ -752,8 +753,6 @@
 modules/gui/qt/dialogs/preferences/preferences.hpp
 modules/gui/qt/dialogs/sout/sout.cpp
 modules/gui/qt/dialogs/sout/sout.hpp
-modules/gui/qt/dialogs/toolbar/toolbareditor.cpp
-modules/gui/qt/dialogs/toolbar/toolbareditor.hpp
 modules/gui/qt/dialogs/vlm/vlm.cpp
 modules/gui/qt/dialogs/vlm/vlm.hpp
 modules/gui/qt/dialogs/dialogs_provider.cpp
@@ -762,6 +761,8 @@
 modules/gui/qt/dialogs/extensions/extensions_manager.hpp
 modules/gui/qt/dialogs/playlists/playlists.cpp
 modules/gui/qt/dialogs/playlists/playlists.hpp
+modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp
+modules/gui/qt/dialogs/toolbar/controlbar_profile_model.hpp
 modules/gui/qt/maininterface/main_interface.cpp
 modules/gui/qt/maininterface/main_interface.hpp
 modules/gui/qt/maininterface/main_interface_win32.cpp
@@ -772,6 +773,10 @@
 modules/gui/qt/medialibrary/mlbookmarkmodel.hpp
 modules/gui/qt/medialibrary/mlfoldersmodel.cpp
 modules/gui/qt/medialibrary/mlfoldersmodel.hpp
+modules/gui/qt/medialibrary/mlgroup.cpp
+modules/gui/qt/medialibrary/mlgroup.hpp
+modules/gui/qt/medialibrary/mlgrouplistmodel.cpp
+modules/gui/qt/medialibrary/mlgrouplistmodel.hpp
 modules/gui/qt/medialibrary/mlplaylistlistmodel.cpp
 modules/gui/qt/medialibrary/mlplaylistlistmodel.hpp
 modules/gui/qt/medialibrary/mlplaylistmedia.cpp
@@ -799,16 +804,22 @@
 modules/gui/qt/util/singleton.hpp
 modules/gui/qt/util/validators.cpp
 modules/gui/qt/util/validators.hpp
+modules/gui/qt/player/player_controlbar_model.cpp
+modules/gui/qt/player/player_controlbar_model.hpp
 modules/gui/qt/dialogs/dialogs/qml/CustomDialog.qml
 modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml
+modules/gui/qt/dialogs/dialogs/qml/WindowDialog.qml
 modules/gui/qt/dialogs/help/qml/About.qml
 modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml
+modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml
 modules/gui/qt/maininterface/qml/BannerSources.qml
 modules/gui/qt/maininterface/qml/MainDisplay.qml
 modules/gui/qt/maininterface/qml/MainInterface.qml
 modules/gui/qt/maininterface/qml/NoMedialibHome.qml
 modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml
 modules/gui/qt/medialibrary/qml/AudioGridItem.qml
+modules/gui/qt/medialibrary/qml/MediaGroupDisplay.qml
+modules/gui/qt/medialibrary/qml/MediaGroupList.qml
 modules/gui/qt/medialibrary/qml/MusicAlbums.qml
 modules/gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml
 modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml
@@ -829,6 +840,7 @@
 modules/gui/qt/medialibrary/qml/VideoListDisplay.qml
 modules/gui/qt/medialibrary/qml/VideoAll.qml
 modules/gui/qt/medialibrary/qml/VideoAllDisplay.qml
+modules/gui/qt/medialibrary/qml/VideoGroupsDisplay.qml
 modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml
 modules/gui/qt/medialibrary/qml/PlaylistMedia.qml
 modules/gui/qt/medialibrary/qml/PlaylistMediaDelegate.qml

vlc-beta-20210430.0b6b242324.tar.xz/share/.gitignore Added

vlc-beta-20210430.0b6b242324.tar.xz/share/lua/.gitignore Added

vlc-beta-20210430.0b6b242324.tar.xz/src/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/clock/clock.h -> vlc-beta-20210430.0b6b242324.tar.xz/src/clock/clock.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/clock/input_clock.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/clock/input_clock.c Changed

@@ -104,6 +104,8 @@
 /* */
 struct input_clock_t
 {
+    vlc_clock_t *clock_listener;
+
     /* Last point
      * It is used to detect unexpected stream discontinuities */
     clock_point_t last;
@@ -142,14 +144,32 @@
 
 static vlc_tick_t ClockGetTsOffset( input_clock_t * );
 
+static void UpdateListener( input_clock_t *cl )
+{
+    if( cl->clock_listener )
+    {
+        const vlc_tick_t system_expected =
+            ClockStreamToSystem( cl, cl->last.stream + AvgGet( &cl->drift ) ) +
+            cl->i_pts_delay + ClockGetTsOffset( cl );
+
+        vlc_clock_Update( cl->clock_listener, system_expected, cl->last.stream, cl->rate );
+    }
+}
+
 /*****************************************************************************
  * input_clock_New: create a new clock
  *****************************************************************************/
-input_clock_t *input_clock_New( float rate )
+input_clock_t *input_clock_New( vlc_clock_t *clock_listener, float rate )
 {
     input_clock_t *cl = malloc( sizeof(*cl) );
     if( !cl )
+    {
+        if( cl->clock_listener )
+            vlc_clock_Delete( cl->clock_listener );
         return NULL;
+    }
+
+    cl->clock_listener = clock_listener;
 
     cl->b_has_reference = false;
     cl->ref = clock_point_Create( VLC_TICK_INVALID, VLC_TICK_INVALID );
@@ -180,6 +200,8 @@
 void input_clock_Delete( input_clock_t *cl )
 {
     AvgClean( &cl->drift );
+    if( cl->clock_listener )
+        vlc_clock_Delete( cl->clock_listener );
     free( cl );
 }
 
@@ -271,6 +293,8 @@
         cl->late.i_index = ( cl->late.i_index + 1 ) % INPUT_CLOCK_LATE_COUNT;
     }
 
+    UpdateListener( cl );
+
     return i_late;
 }
 
@@ -282,6 +306,9 @@
     cl->b_has_reference = false;
     cl->ref = clock_point_Create( VLC_TICK_INVALID, VLC_TICK_INVALID );
     cl->b_has_external_clock = false;
+
+    if( cl->clock_listener )
+        vlc_clock_Reset( cl->clock_listener );
 }
 
 /*****************************************************************************
@@ -296,6 +323,8 @@
         cl->ref.system = cl->last.system - (vlc_tick_t) ((cl->last.system - cl->ref.system) / rate * cl->rate);
     }
     cl->rate = rate;
+
+    UpdateListener( cl );
 }
 
 /*****************************************************************************
@@ -313,6 +342,8 @@
         {
             cl->ref.system += i_duration;
             cl->last.system += i_duration;
+
+            UpdateListener( cl );
         }
     }
     cl->i_pause_date = i_date;
@@ -377,6 +408,8 @@
 
     cl->ref.system += i_offset;
     cl->last.system += i_offset;
+
+    UpdateListener( cl );
 }
 
 void input_clock_GetSystemOrigin( input_clock_t *cl, vlc_tick_t *pi_system, vlc_tick_t *pi_delay )

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/clock/input_clock.h -> vlc-beta-20210430.0b6b242324.tar.xz/src/clock/input_clock.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/input/es_out.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/input/es_out.c Changed

@@ -77,7 +77,7 @@
     /* Clock for this program */
     input_clock_t    *p_input_clock;
     vlc_clock_main_t *p_main_clock;
-    vlc_clock_t      *p_master_clock;
+    const vlc_clock_t *p_master_clock;
 
     vlc_tick_t i_last_pcr;
 
@@ -182,7 +182,7 @@
     struct vlc_list programs;
     es_out_pgrm_t *p_pgrm;  /* Master program */
 
-    enum es_format_category_e i_master_source_cat;
+    enum vlc_clock_master_source clock_source;
 
     /* all es */
     int         i_id;
@@ -264,6 +264,48 @@
 static char *EsOutProgramGetMetaName( es_out_pgrm_t *p_pgrm );
 static char *EsInfoCategoryName( es_out_id_t* es );
 
+struct clock_source_mapping
+{
+    char key[sizeof("monotonic")];
+    enum vlc_clock_master_source val;
+};
+
+static int clock_source_mapping_cmp(const void *key, const void *val)
+{
+    const struct clock_source_mapping *entry = val;
+    return strcasecmp( key, entry->key );
+}
+
+static enum vlc_clock_master_source
+clock_source_Inherit(vlc_object_t *obj)
+{
+    static const struct clock_source_mapping clock_source_list[] =
+    {
+        { "0", VLC_CLOCK_MASTER_AUDIO }, /* legacy option */
+        { "1", VLC_CLOCK_MASTER_MONOTONIC }, /* legacy option */
+        { "audio", VLC_CLOCK_MASTER_AUDIO },
+        { "auto", VLC_CLOCK_MASTER_AUTO },
+        { "input", VLC_CLOCK_MASTER_INPUT },
+        { "monotonic", VLC_CLOCK_MASTER_MONOTONIC },
+    };
+
+    char *master_source_str = var_InheritString(obj, "clock-master");
+    if (master_source_str == NULL)
+        goto default_val;
+
+    const struct clock_source_mapping *entry =
+        bsearch(master_source_str, clock_source_list, ARRAY_SIZE(clock_source_list),
+                sizeof (*clock_source_list), clock_source_mapping_cmp);
+    free(master_source_str);
+    if (entry == NULL)
+        goto default_val;
+
+    return entry->val;
+
+default_val:
+    return VLC_CLOCK_MASTER_AUTO;
+}
+
 static inline int EsOutGetClosedCaptionsChannel( const es_format_t *p_fmt )
 {
     int i_channel;
@@ -516,18 +558,7 @@
 
     p_sys->i_group_id = var_GetInteger( p_input, "program" );
 
-    enum vlc_clock_master_source master_source =
-        var_InheritInteger( p_input, "clock-master" );
-    switch( master_source )
-    {
-        case VLC_CLOCK_MASTER_AUDIO:
-            p_sys->i_master_source_cat = AUDIO_ES;
-            break;
-        case VLC_CLOCK_MASTER_MONOTONIC:
-        default:
-            p_sys->i_master_source_cat = UNKNOWN_ES;
-            break;
-    }
+    p_sys->clock_source = clock_source_Inherit( VLC_OBJECT(p_input) );
 
     p_sys->i_pause_date = -1;
 
@@ -1362,6 +1393,7 @@
 {
     es_out_sys_t *p_sys = container_of(out, es_out_sys_t, out);
     input_thread_t    *p_input = p_sys->p_input;
+    input_thread_private_t *priv = input_priv(p_input);
 
     /* Sticky groups will be attached to any existing programs, no need to
      * create one. */
@@ -1382,15 +1414,39 @@
     p_pgrm->p_meta = NULL;
 
     p_pgrm->p_master_clock = NULL;
-    p_pgrm->p_input_clock = input_clock_New( p_sys->rate );
+
     p_pgrm->p_main_clock = vlc_clock_main_New();
-    if( !p_pgrm->p_input_clock || !p_pgrm->p_main_clock )
+    if( !p_pgrm->p_main_clock )
     {
-        if( p_pgrm->p_input_clock )
-            input_clock_Delete( p_pgrm->p_input_clock );
         free( p_pgrm );
         return NULL;
     }
+
+    vlc_clock_t *p_master_clock = NULL;
+    switch( p_sys->clock_source )
+    {
+        case VLC_CLOCK_MASTER_AUTO:
+            if (priv->b_can_pace_control)
+                break;
+            msg_Dbg( p_input, "The input can't pace, selecting the input (PCR) as the "
+                     "clock source" );
+            /* Fall-through */
+        case VLC_CLOCK_MASTER_INPUT:
+            p_pgrm->p_master_clock = p_master_clock =
+                vlc_clock_main_CreateMaster( p_pgrm->p_main_clock, NULL, NULL );
+            break;
+        default:
+            break;
+    }
+
+    p_pgrm->p_input_clock = input_clock_New( p_master_clock, p_sys->rate );
+    if( !p_pgrm->p_input_clock )
+    {
+        vlc_clock_main_Delete( p_pgrm->p_main_clock );
+        free( p_pgrm );
+        return NULL;
+    }
+
     if( p_sys->b_paused )
         input_clock_ChangePause( p_pgrm->p_input_clock, p_sys->b_paused, p_sys->i_pause_date );
     const vlc_tick_t pts_delay = p_sys->i_pts_delay + p_sys->i_pts_jitter
@@ -2164,8 +2220,23 @@
 
     assert( p_es->p_pgrm );
 
+    enum es_format_category_e clock_source_cat;
+    switch( p_sys->clock_source )
+    {
+        case VLC_CLOCK_MASTER_AUTO:
+        case VLC_CLOCK_MASTER_AUDIO:
+            clock_source_cat = AUDIO_ES;
+            break;
+        case VLC_CLOCK_MASTER_MONOTONIC:
+        case VLC_CLOCK_MASTER_INPUT:
+            clock_source_cat = UNKNOWN_ES;
+            break;
+        default:
+            vlc_assert_unreachable();
+    }
+
     if( p_es->fmt.i_cat != UNKNOWN_ES
-     && p_es->fmt.i_cat == p_sys->i_master_source_cat
+     && p_es->fmt.i_cat == clock_source_cat
      && p_es->p_pgrm->p_master_clock == NULL )
     {
         p_es->master = true;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/input/input.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/input/input.c Changed

@@ -984,8 +984,18 @@
         if( uri == NULL )
             continue;
 
+        vlc_url_t parsed_uri;
+        if ( vlc_UrlParse( &parsed_uri, uri ) != VLC_SUCCESS )
+        {
+            msg_Err( p_input,
+                    "Invalid url passed to the \"input-slave\" option" );
+            vlc_UrlClean( &parsed_uri );
+            free( uri );
+            continue;
+        }
+
         enum slave_type i_type;
-        if ( !input_item_slave_GetType(uri, &i_type) )
+        if ( !input_item_slave_GetType( parsed_uri.psz_path, &i_type ) )
         {
             msg_Warn( p_input,
                      "Can't deduce slave type of `%s\" with file extension.",
@@ -995,6 +1005,7 @@
         input_item_slave_t *p_slave =
             input_item_slave_New( uri, i_type, SLAVE_PRIORITY_USER );
 
+        vlc_UrlClean( &parsed_uri );
         free( uri );
 
         if( unlikely( p_slave == NULL ) )
@@ -1063,6 +1074,9 @@
         free( psz_autopath );
     }
 
+    /* Add slaves from the "input-slave" option */
+    GetVarSlaves( p_input, &pp_slaves, &i_slaves );
+
     /* Add slaves found by the directory demuxer or via libvlc */
     input_item_t *p_item = input_priv(p_input)->p_item;
     vlc_mutex_lock( &p_item->lock );
@@ -1080,9 +1094,6 @@
     TAB_CLEAN( p_item->i_slaves, p_item->pp_slaves );
     vlc_mutex_unlock( &p_item->lock );
 
-    /* Add slaves from the "input-slave" option */
-    GetVarSlaves( p_input, &pp_slaves, &i_slaves );
-
     if( i_slaves > 0 )
         qsort( pp_slaves, i_slaves, sizeof (input_item_slave_t*),
                SlaveCompare );

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/input/input_internal.h -> vlc-beta-20210430.0b6b242324.tar.xz/src/input/input_internal.h Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/input/vlm.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/input/vlm.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/libvlc-module.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/libvlc-module.c Changed

@@ -537,12 +537,22 @@
     "algorithms should try to compensate (in milliseconds)." )
 
 #define CLOCK_MASTER_TEXT N_("Clock master source")
+#define CLOCK_MASTER_LONGTEXT N_( "Select the clock master source:\n" \
+    "auto: best clock source, input if the access can't be paced " \
+    "(when playing live content), or audio otherwise (most likely).\n" \
+    "input: all tracks are driven by the input clock, via PCR updates " \
+    "from the demuxer. This restore the VLC 3.0 clock behavior where both audio " \
+    "and video tracks can be altered to catch up with the input.\n" \
+    "audio: if an audio track is playing, the audio output will drive the " \
+    "clock (Fallback to Monotonic if there is no audio tracks).\n" \
+    "monotonic: all tracks are driven by the monotonic clock of the system.")
 
-static const int pi_clock_master_values[] = {
-    VLC_CLOCK_MASTER_AUDIO,
-    VLC_CLOCK_MASTER_MONOTONIC,
+static const char *const ppsz_clock_master_values[] = {
+    "auto", "input", "audio", "monotonic",
 };
 static const char *const ppsz_clock_master_descriptions[] = {
+    N_("Auto"),
+    N_("Input (PCR)"),
     N_("Audio"),
     N_("Monotonic")
 };
@@ -942,9 +952,8 @@
 
 // DEPRECATED
 #define CODEC_CAT_LONGTEXT N_( \
-    "This option can be used to alter the way VLC selects " \
-    "its codecs (decompression methods). Only advanced users should " \
-    "alter this option as it can break playback of all your streams." )
+    "These options allow you to control the preferred modules used for " \
+    "accessing, demuxing and decoding (or encoding) inputs." )
 
 #define CODEC_TEXT N_("Preferred decoders list")
 #define CODEC_LONGTEXT N_( \
@@ -1031,11 +1040,6 @@
  * Advanced
  ****************************************************************************/
 
-// DEPRECATED
-#define MISC_CAT_LONGTEXT N_( \
-    "These options allow you to select default modules. Leave these " \
-    "alone unless you really know what you are doing." )
-
 #define ACCESS_TEXT N_("Access module")
 #define ACCESS_LONGTEXT N_( \
     "This allows you to force an access module. You can use it if " \
@@ -1527,6 +1531,8 @@
  */
 
 vlc_module_begin ()
+    set_description( N_("core program") )
+
 /* Audio options */
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_GENERAL )
@@ -1761,6 +1767,7 @@
 /* Input options */
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_GENERAL )
+    add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT )
 
     set_section( N_( "Track settings" ), NULL )
     add_integer( "program", 0,
@@ -1977,9 +1984,9 @@
     add_integer( "clock-jitter", 5000, CLOCK_JITTER_TEXT,
               CLOCK_JITTER_LONGTEXT, true )
         change_safe()
-    add_integer( "clock-master", VLC_CLOCK_MASTER_DEFAULT,
-                 CLOCK_MASTER_TEXT, NULL, true )
-        change_integer_list( pi_clock_master_values, ppsz_clock_master_descriptions )
+    add_string( "clock-master", "auto",
+                 CLOCK_MASTER_TEXT, CLOCK_MASTER_LONGTEXT, true )
+        change_string_list( ppsz_clock_master_values, ppsz_clock_master_descriptions )
 
     add_directory("input-record-path", NULL,
                   INPUT_RECORD_PATH_TEXT, INPUT_RECORD_PATH_LONGTEXT)
@@ -1994,30 +2001,33 @@
     add_string( "input-title-format", "$Z", INPUT_TITLE_FORMAT_TEXT, INPUT_TITLE_FORMAT_LONGTEXT, false );
 
 /* Decoder options */
-    set_subcategory( SUBCAT_INPUT_VCODEC )
-    add_category_hint(N_("Decoders"), CODEC_CAT_LONGTEXT)
-    add_string( "codec", NULL, CODEC_TEXT,
-                CODEC_LONGTEXT, true )
-    add_bool( "hw-dec", true, HW_DEC_TEXT, HW_DEC_LONGTEXT, true )
-    add_obsolete_string( "encoder" ) /* since 4.0.0 */
-    add_module("dec-dev", "decoder device", "any", DEC_DEV_TEXT, DEC_DEV_LONGTEXT)
-
+    add_category_hint(N_("Input access and codecs"), CODEC_CAT_LONGTEXT)
     set_subcategory( SUBCAT_INPUT_ACCESS )
-    add_category_hint(N_("Input"), INPUT_CAT_LONGTEXT)
+
     add_module("access", "access", NULL, ACCESS_TEXT, ACCESS_LONGTEXT)
 
     set_subcategory( SUBCAT_INPUT_DEMUX )
+
     add_module("demux", "demux", "any", DEMUX_TEXT, DEMUX_LONGTEXT)
+    add_string( "demux-filter", NULL, DEMUX_FILTER_TEXT, DEMUX_FILTER_LONGTEXT, true )
+
     set_subcategory( SUBCAT_INPUT_ACODEC )
+    set_subcategory( SUBCAT_INPUT_VCODEC )
+
+    add_string( "codec", NULL, CODEC_TEXT, CODEC_LONGTEXT, true )
+    add_bool( "hw-dec", true, HW_DEC_TEXT, HW_DEC_LONGTEXT, true )
+    add_obsolete_string( "encoder" ) /* since 4.0.0 */
+    add_module("dec-dev", "decoder device", "any", DEC_DEV_TEXT, DEC_DEV_LONGTEXT)
+
     set_subcategory( SUBCAT_INPUT_SCODEC )
+
     add_obsolete_bool( "prefer-system-codecs" )
 
     set_subcategory( SUBCAT_INPUT_STREAM_FILTER )
+
     add_module_list("stream-filter", "stream_filter", NULL,
                     STREAM_FILTER_TEXT, STREAM_FILTER_LONGTEXT)
 
-    add_string( "demux-filter", NULL, DEMUX_FILTER_TEXT, DEMUX_FILTER_LONGTEXT, true )
-
 /* Stream output options */
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_GENERAL )
@@ -2081,10 +2091,10 @@
     add_obsolete_bool( "altivec" ) /* since 2.0.0 */
 #endif
 
-/* Misc options */
+/* Advanced options */
     set_subcategory( SUBCAT_ADVANCED_MISC )
+    add_category_hint(N_("Advanced"), NULL)
     set_section( N_("Special modules"), NULL )
-    add_category_hint(N_("Miscellaneous"), MISC_CAT_LONGTEXT)
     add_module("vod-server", "vod server", NULL,
                VOD_SERVER_TEXT, VOD_SERVER_LONGTEXT)
 
@@ -2200,9 +2210,34 @@
     add_string( "services-discovery", "", SD_TEXT, SD_LONGTEXT, true )
         change_short('S')
 
+    /* HACK so these don't get displayed in the GUI */
+    set_subcategory( -1 )
+    set_section(N_("Bookmarks"), NULL)
+    add_string( "bookmark1", NULL,
+             BOOKMARK1_TEXT, BOOKMARK_LONGTEXT, false )
+    add_string( "bookmark2", NULL,
+             BOOKMARK2_TEXT, BOOKMARK_LONGTEXT, false )
+    add_string( "bookmark3", NULL,
+             BOOKMARK3_TEXT, BOOKMARK_LONGTEXT, false )
+    add_string( "bookmark4", NULL,
+             BOOKMARK4_TEXT, BOOKMARK_LONGTEXT, false )
+    add_string( "bookmark5", NULL,
+             BOOKMARK5_TEXT, BOOKMARK_LONGTEXT, false )
+    add_string( "bookmark6", NULL,
+             BOOKMARK6_TEXT, BOOKMARK_LONGTEXT, false )
+    add_string( "bookmark7", NULL,
+             BOOKMARK7_TEXT, BOOKMARK_LONGTEXT, false )
+    add_string( "bookmark8", NULL,
+             BOOKMARK8_TEXT, BOOKMARK_LONGTEXT, false )
+    add_string( "bookmark9", NULL,
+             BOOKMARK9_TEXT, BOOKMARK_LONGTEXT, false )
+    add_string( "bookmark10", NULL,
+              BOOKMARK10_TEXT, BOOKMARK_LONGTEXT, false )
+
 /* Interface options */
     set_category( CAT_INTERFACE )
     set_subcategory( SUBCAT_INTERFACE_GENERAL )
+    add_category_hint( N_("Interface"), INTF_CAT_LONGTEXT )
     add_integer( "verbose", 0, VERBOSE_TEXT, VERBOSE_LONGTEXT,
                  false )
         change_short('v')
@@ -2725,9 +2760,7 @@
     add_integer( "long-jump-size", 300, JILONG_TEXT,
                                     JILONG_LONGTEXT, false )
 
-    /* HACK so these don't get displayed */
-    set_category( -1 )
-    set_subcategory( -1 )
+    set_section ( N_("Bookmarks"), NULL )
     add_key("key-set-bookmark1", KEY_SET_BOOKMARK1,
             SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT)
     add_key("key-set-bookmark2", KEY_SET_BOOKMARK2,
@@ -2778,34 +2811,19 @@
     add_key("key-subtitle-text-scale-down", KEY_SUBTEXT_SCALEDOWN,
             SUBTEXT_SCALEDOWN_KEY_TEXT, SUBTEXT_SCALE_KEY_LONGTEXT)
 
-    add_string( "bookmark1", NULL,
-             BOOKMARK1_TEXT, BOOKMARK_LONGTEXT, false )
-    add_string( "bookmark2", NULL,
-             BOOKMARK2_TEXT, BOOKMARK_LONGTEXT, false )
-    add_string( "bookmark3", NULL,
-             BOOKMARK3_TEXT, BOOKMARK_LONGTEXT, false )
-    add_string( "bookmark4", NULL,
-             BOOKMARK4_TEXT, BOOKMARK_LONGTEXT, false )
-    add_string( "bookmark5", NULL,
-             BOOKMARK5_TEXT, BOOKMARK_LONGTEXT, false )
-    add_string( "bookmark6", NULL,
-             BOOKMARK6_TEXT, BOOKMARK_LONGTEXT, false )

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/libvlccore.sym -> vlc-beta-20210430.0b6b242324.tar.xz/src/libvlccore.sym Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/misc/block.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/misc/block.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/misc/medialibrary.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/misc/medialibrary.c Changed

@@ -231,10 +231,29 @@
     free( p_genre );
 }
 
+//-------------------------------------------------------------------------------------------------
+// Group
+
+static void vlc_ml_group_release_inner( vlc_ml_group_t* p_group )
+{
+    free( p_group->psz_name );
+}
+
+void vlc_ml_group_release( vlc_ml_group_t* p_group )
+{
+    if ( p_group == NULL )
+        return;
+    vlc_ml_group_release_inner( p_group );
+    free( p_group );
+}
+
+//-------------------------------------------------------------------------------------------------
+
 static void vlc_ml_playlist_release_inner( vlc_ml_playlist_t* p_playlist )
 {
-    free( p_playlist->psz_artwork_mrl );
     free( p_playlist->psz_name );
+    free( p_playlist->psz_mrl );
+    free( p_playlist->psz_artwork_mrl );
 }
 
 void vlc_ml_playlist_release( vlc_ml_playlist_t* p_playlist )
@@ -319,6 +338,15 @@
     free( p_list );
 }
 
+void vlc_ml_group_list_release( vlc_ml_group_list_t* p_list )
+{
+    if ( p_list == NULL )
+        return;
+    for ( size_t i = 0; i < p_list->i_nb_items; ++i )
+        vlc_ml_group_release_inner( &p_list->p_items[i] );
+    free( p_list );
+}
+
 void vlc_ml_playlist_list_release( vlc_ml_playlist_list_t* p_list )
 {
     if ( p_list == NULL )

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/misc/picture.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/misc/picture.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/misc/update_crypto.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/misc/update_crypto.c Changed

@@ -53,7 +53,7 @@
 #define packet_header_len( c ) ( ( c & 0x03 ) + 1 ) /* number of bytes in a packet header */
 
 
-static inline int scalar_number( const uint8_t *p, int header_len )
+static inline uint32_t scalar_number( const uint8_t *p, int header_len )
 {
     assert( header_len == 1 || header_len == 2 || header_len == 4 );
 
@@ -62,14 +62,14 @@
     else if( header_len == 2 )
         return( (p[0] << 8) + p[1] );
     else if( header_len == 4 )
-        return( (p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3] );
+        return( ((uint32_t)p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3] );
     else
         abort();
 }
 
 
 /* number of data bytes in a MPI */
-static int mpi_len(const uint8_t *mpi)
+static uint32_t mpi_len(const uint8_t *mpi)
 {
     return (scalar_number(mpi, 2) + 7) / 8;
 }
@@ -481,15 +481,15 @@
     gcry_sexp_t key_sexp, hash_sexp, sig_sexp;
     key_sexp = hash_sexp = sig_sexp = NULL;
 
-    int i_n_len = mpi_len( p_key->sig.rsa.n );
-    int i_e_len = mpi_len( p_key->sig.rsa.e );
+    size_t i_e_len = mpi_len( p_key->sig.rsa.e );
+    size_t i_n_len = mpi_len( p_key->sig.rsa.n );
     if( gcry_mpi_scan( &n, GCRYMPI_FMT_USG, p_key->sig.rsa.n + 2, i_n_len, NULL ) ||
         gcry_mpi_scan( &e, GCRYMPI_FMT_USG, p_key->sig.rsa.e + 2, i_e_len, NULL ) ||
         gcry_sexp_build( &key_sexp, &erroff, key_sexp_s, n, e ) )
         goto out;
 
     uint8_t *p_s = sign->algo_specific.rsa.s;
-    int i_s_len = mpi_len( p_s );
+    size_t i_s_len = mpi_len( p_s );
     if( gcry_mpi_scan( &s, GCRYMPI_FMT_USG, p_s + 2, i_s_len, NULL ) ||
         gcry_sexp_build( &sig_sexp, &erroff, sig_sexp_s, s ) )
         goto out;
@@ -535,10 +535,10 @@
     gcry_sexp_t key_sexp, hash_sexp, sig_sexp;
     key_sexp = hash_sexp = sig_sexp = NULL;
 
-    int i_p_len = mpi_len( p_key->sig.dsa.p );
-    int i_q_len = mpi_len( p_key->sig.dsa.q );
-    int i_g_len = mpi_len( p_key->sig.dsa.g );
-    int i_y_len = mpi_len( p_key->sig.dsa.y );
+    size_t i_p_len = mpi_len( p_key->sig.dsa.p );
+    size_t i_q_len = mpi_len( p_key->sig.dsa.q );
+    size_t i_g_len = mpi_len( p_key->sig.dsa.g );
+    size_t i_y_len = mpi_len( p_key->sig.dsa.y );
     if( gcry_mpi_scan( &p, GCRYMPI_FMT_USG, p_key->sig.dsa.p + 2, i_p_len, NULL ) ||
         gcry_mpi_scan( &q, GCRYMPI_FMT_USG, p_key->sig.dsa.q + 2, i_q_len, NULL ) ||
         gcry_mpi_scan( &g, GCRYMPI_FMT_USG, p_key->sig.dsa.g + 2, i_g_len, NULL ) ||
@@ -548,14 +548,14 @@
 
     uint8_t *p_r = sign->algo_specific.dsa.r;
     uint8_t *p_s = sign->algo_specific.dsa.s;
-    int i_r_len = mpi_len( p_r );
-    int i_s_len = mpi_len( p_s );
+    size_t i_r_len = mpi_len( p_r );
+    size_t i_s_len = mpi_len( p_s );
     if( gcry_mpi_scan( &r, GCRYMPI_FMT_USG, p_r + 2, i_r_len, NULL ) ||
         gcry_mpi_scan( &s, GCRYMPI_FMT_USG, p_s + 2, i_s_len, NULL ) ||
         gcry_sexp_build( &sig_sexp, &erroff, sig_sexp_s, r, s ) )
         goto out;
 
-    int i_hash_len = gcry_md_get_algo_dlen (sign->digest_algo);
+    unsigned int i_hash_len = gcry_md_get_algo_dlen (sign->digest_algo);
     if (i_hash_len > i_q_len)
         i_hash_len = i_q_len;
     if( gcry_mpi_scan( &hash, GCRYMPI_FMT_USG, p_hash, i_hash_len, NULL ) ||
@@ -647,7 +647,7 @@
             ( i_header_len != 1 && i_header_len != 2 && i_header_len != 4 ) )
             goto error;
 
-        int i_packet_len = scalar_number( pos, i_header_len );
+        size_t i_packet_len = scalar_number( pos, i_header_len );
         pos += i_header_len;
 
         if( pos + i_packet_len > max_pos )

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/player/input.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/player/input.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/posix/thread.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/posix/thread.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/test/thread.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/test/thread.c Changed

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/video_output/display.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/video_output/display.c Changed

@@ -76,6 +76,7 @@
                                         const video_format_t *source,
                                         const vout_display_cfg_t *cfg)
 {
+    bool from_source = true;
     /* Requested by the user */
     if (cfg->display.width != 0 && cfg->display.height != 0) {
         *width  = cfg->display.width;
@@ -93,6 +94,8 @@
     else if (cfg->window_props.width != 0 && cfg->window_props.height != 0) {
         *width = cfg->window_props.width;
         *height = cfg->window_props.height;
+        /* The dimensions are not initialized from the source format */
+        from_source = false;
     }
     /* Use the original video size */
     else if (source->i_sar_num >= source->i_sar_den) {
@@ -106,8 +109,9 @@
     *width  = *width  * cfg->zoom.num / cfg->zoom.den;
     *height = *height * cfg->zoom.num / cfg->zoom.den;
 
-    if (ORIENT_IS_SWAP(source->orientation)) {
-
+    if (from_source && ORIENT_IS_SWAP(source->orientation)) {
+        /* Apply the source orientation only if the dimensions are initialized
+         * from the source format */
         unsigned store = *width;
         *width = *height;
         *height = store;

vlc-beta-20210405.f3c7ba5bb3.tar.xz/src/video_output/video_output.c -> vlc-beta-20210430.0b6b242324.tar.xz/src/video_output/video_output.c Changed

@@ -1126,9 +1126,8 @@
     vlc_mutex_lock(&sys->display_lock);
 
     /*
-     * Get the subpicture to be displayed
+     * Get the rendering date for the current subpicture to be displayed.
      */
-    const bool do_snapshot = vout_snapshot_IsRequested(sys->snapshot);
     vlc_tick_t system_now = vlc_tick_now();
     vlc_tick_t render_subtitle_date;
     if (sys->pause.is_on)
@@ -1150,8 +1149,11 @@
     }
 
     /*
-     * Get the subpicture to be displayed
+     * Check whether we let the display draw the subpicture itself (when
+     * do_dr_spu=true), and if we can fallback to blending the subpicture
+     * ourselves (do_early_spu=true).
      */
+    const bool do_snapshot = vout_snapshot_IsRequested(sys->snapshot);
     const bool do_dr_spu = !do_snapshot &&
                            vd->info.subpicture_chromas &&
                            *vd->info.subpicture_chromas != 0;
@@ -1203,6 +1205,7 @@
         }
     }
 
+    /* Get the subpicture to be displayed. */
     video_format_t fmt_spu_rot;
     video_format_ApplyRotation(&fmt_spu_rot, &fmt_spu);
     subpicture_t *subpic = !sys->spu ? NULL :

vlc-beta-20210430.0b6b242324.tar.xz/test/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/test/Makefile.am -> vlc-beta-20210430.0b6b242324.tar.xz/test/Makefile.am Changed

@@ -20,6 +20,7 @@
 	test_libvlc_media_list \
 	test_libvlc_media_player \
 	test_libvlc_media_discoverer \
+	test_libvlc_meta \
 	test_libvlc_renderer_discoverer \
 	test_libvlc_slaves \
 	test_src_config_chain \
@@ -54,19 +55,17 @@
 	modules/lua/telnet.sh \
 	check_POTFILES.sh
 
-# Disabled test:
-# meta: No suitable test file
+# Disabled tests:
 EXTRA_PROGRAMS = \
-	test_libvlc_meta \
 	test_libvlc_media_list_player \
 	test_src_input_stream_net \
 	$(NULL)
 
-#check_DATA = samples/test.sample samples/meta.sample
 EXTRA_DIST = \
 	samples/certs/certkey.pem \
 	samples/empty.voc \
 	samples/image.jpg \
+	samples/meta.mp3 \
 	samples/subitems \
 	samples/slaves \
 	$(check_SCRIPTS)
@@ -75,19 +74,6 @@
 
 TESTS = $(check_PROGRAMS) check_POTFILES.sh
 
-DISTCLEANFILES = samples/test.sample samples/meta.sample
-
-# Samples server
-SAMPLES_SERVER=http://streams.videolan.org/streams-videolan/reference
-
-samples/test.sample:
-	mkdir -p `dirname $@`
-	curl $(SAMPLES_SERVER)/avi/Hero-Div3.avi > $@
-
-samples/meta.sample:
-	mkdir -p `dirname $@`
-	curl $(SAMPLES_SERVER)/metadata/id3tag/Wesh-Bonneville.mp3 > $@
-
 AM_CFLAGS = -DSRCDIR=\"$(srcdir)\"
 AM_LDFLAGS = -no-install
 LIBVLCCORE = -L../src/ -lvlccore
@@ -300,3 +286,7 @@
 if HAVE_IOS
 noinst_PROGRAMS += vlccoreios
 endif
+
+if HAVE_TVOS
+noinst_PROGRAMS += vlccoreios
+endif

vlc-beta-20210430.0b6b242324.tar.xz/test/dynamicoverlay/.gitignore Added

vlc-beta-20210405.f3c7ba5bb3.tar.xz/test/iosvlc.m -> vlc-beta-20210430.0b6b242324.tar.xz/test/iosvlc.m Changed

@@ -32,12 +32,17 @@
 #include <vlc_variables.h>
 #include <vlc_plugin.h>
 
+#include <TargetConditionals.h>
+
 @interface AppDelegate : UIResponder <UIApplicationDelegate> {
     @public
     libvlc_instance_t *_libvlc;
     UIWindow *window;
     UIView *subview;
+
+#if TARGET_OS_IOS
     UIPinchGestureRecognizer *_pinchRecognizer;
+#endif
 
     CGRect _pinchRect;
     CGPoint _pinchOrigin;
@@ -47,6 +52,7 @@
 
 
 @implementation AppDelegate
+#if TARGET_OS_IOS
 - (void)pinchRecognized:(UIPinchGestureRecognizer *)pinchRecognizer
 {
     UIGestureRecognizerState state = [pinchRecognizer state];
@@ -78,6 +84,8 @@
             _pinchPreviousCenter.x + newPosition.x - _pinchOrigin.x,
             _pinchPreviousCenter.y + newPosition.y - _pinchOrigin.y);
 }
+#endif
+
 /* Called after application launch */
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
@@ -112,9 +120,11 @@
     [window addSubview:subview];
     [window makeKeyAndVisible];
 
+#if TARGET_OS_IOS
     _pinchRecognizer = [[UIPinchGestureRecognizer alloc]
         initWithTarget:self action:@selector(pinchRecognized:)];
     [window addGestureRecognizer:_pinchRecognizer];
+#endif
 
     /* Start glue interface, see code below */
     libvlc_add_intf(_libvlc, "ios_interface,none");

vlc-beta-20210405.f3c7ba5bb3.tar.xz/test/libvlc/meta.c -> vlc-beta-20210430.0b6b242324.tar.xz/test/libvlc/meta.c Changed

vlc-beta-20210430.0b6b242324.tar.xz/test/samples/meta.mp3 Added

Changes of Revision 64