[vlc-commits] [Git][videolan/vlc][master] contrib: aom: update to 3.1.0

2021-05-08 Thread Tristan Matthews 


Tristan Matthews pushed to branch master at VideoLAN / VLC


Commits:
3924a5da by Tristan Matthews at 2021-05-08T10:18:54-04:00
contrib: aom: update to 3.1.0

- - - - -


2 changed files:

- contrib/src/aom/aom-android-pthreads.patch
- contrib/src/aom/rules.mak


Changes:

=
contrib/src/aom/aom-android-pthreads.patch
=
@@ -1,17 +1,14 @@
-diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake
-index c3914d79e..1eb36f7ec 100644
 a/build/cmake/pkg_config.cmake
-+++ b/build/cmake/pkg_config.cmake
-@@ -53,10 +53,6 @@ file(
- file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n")
- file(APPEND "${pkgconfig_file}" "Requires:\n")
- file(APPEND "${pkgconfig_file}" "Conflicts:\n")
+--- aom/build/cmake/pkg_config.cmake   2021-05-07 16:22:27.118065285 -0400
 aom/build/cmake/pkg_config.cmake.new   2021-05-07 16:23:24.937812883 
-0400
+@@ -56,10 +56,6 @@
+   file(APPEND "${pkgconfig_file}" " libvmaf")
+ endif()
+ file(APPEND "${pkgconfig_file}" "\nConflicts:\n")
 -file(APPEND "${pkgconfig_file}" "Libs: -L\${libdir} -l${pkg_name}\n")
 -if(CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
 -  file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
 -else()
--  file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
--endif()
 +file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
-+file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
+   file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
+-endif()
  file(APPEND "${pkgconfig_file}" "Cflags: -I\${includedir}\n")


=
contrib/src/aom/rules.mak
=
@@ -1,5 +1,5 @@
 # aom
-AOM_VERSION := v3.0.0
+AOM_VERSION := v3.1.0
 AOM_GITURL := 
https://aomedia.googlesource.com/aom/+archive/$(AOM_VERSION).tar.gz
 
 PKGS += aom



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/3924a5dab72a0bf87572696c6d1519fd7f16363c

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/3924a5dab72a0bf87572696c6d1519fd7f16363c
You're receiving this email because of your account on code.videolan.org.


___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] qml: fix empty duration column in video list

2021-05-08 Thread Hugo Beauzée-Luyssen 


Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
ddf748ac by Prince Gupta at 2021-05-08T11:48:22+00:00
qml: fix empty duration column in video list

- - - - -


1 changed file:

- modules/gui/qt/medialibrary/qml/VideoListDisplay.qml


Changes:

=
modules/gui/qt/medialibrary/qml/VideoListDisplay.qml
=
@@ -66,7 +66,7 @@ MainInterface.MainTableView {
 
 text: i18n.qtr("Title")
 }, {
-criteria: "duration_short",
+criteria: "duration",
 
 width: VLCStyle.colWidth(1),
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/ddf748ac30fedb1430e173fc7c0460937437df61

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/ddf748ac30fedb1430e173fc7c0460937437df61
You're receiving this email because of your account on code.videolan.org.


___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 7 commits: qt/mlbasemodel: Add the 'itemCache' function

2021-05-08 Thread Hugo Beauzée-Luyssen 


Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
80b1d991 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt/mlbasemodel: Add the 'itemCache' function

This is useful when we only want to return a cached item.

- - - - -
22bc7af6 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt: Create CoverGenerator

This class can be useful to retrieve composed thumbnails for groups, playlists 
and genres.

It supports a few options like custom size, count and division type.

- - - - -
74ffcb26 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt/mlgroup: Add CoverGenerator implementation

- - - - -
e6ebc5f8 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt/mlgrouplistmodel: Add CoverGenerator implementation

- - - - -
73072c14 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt/mlgenre: Add CoverGenerator implementation

- - - - -
43e3ea1e by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt/mlgenremodel: Add CoverGenerator implementation

- - - - -
4362af46 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qml/MusicGenres: Add gradient overlay

fix #25595

- - - - -


16 changed files:

- modules/gui/qt/Makefile.am
- modules/gui/qt/maininterface/mainui.cpp
- modules/gui/qt/medialibrary/mlbasemodel.cpp
- modules/gui/qt/medialibrary/mlbasemodel.hpp
- modules/gui/qt/medialibrary/mlgenre.cpp
- modules/gui/qt/medialibrary/mlgenre.hpp
- modules/gui/qt/medialibrary/mlgenremodel.cpp
- modules/gui/qt/medialibrary/mlgenremodel.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/qml/MusicGenres.qml
- + modules/gui/qt/util/covergenerator.cpp
- + modules/gui/qt/util/covergenerator.hpp
- po/POTFILES.in


Changes:

=
modules/gui/qt/Makefile.am
=
@@ -218,6 +218,8 @@ libqt_plugin_la_SOURCES = \
gui/qt/util/audio_device_model.cpp  \
gui/qt/util/audio_device_model.hpp \
gui/qt/util/color_scheme_model.cpp gui/qt/util/color_scheme_model.hpp \
+   gui/qt/util/covergenerator.cpp \
+   gui/qt/util/covergenerator.hpp \
gui/qt/util/imageluminanceextractor.cpp 
gui/qt/util/imageluminanceextractor.hpp \
gui/qt/util/imagehelper.cpp gui/qt/util/imagehelper.hpp \
gui/qt/util/i18n.cpp gui/qt/util/i18n.hpp \
@@ -343,9 +345,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/medialibrary/mlartistmodel.moc.cpp \
gui/qt/medialibrary/mlbasemodel.moc.cpp \
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 \
@@ -374,6 +374,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/util/asynctask.moc.cpp \
gui/qt/util/audio_device_model.moc.cpp \
gui/qt/util/color_scheme_model.moc.cpp \
+   gui/qt/util/covergenerator.moc.cpp \
gui/qt/util/imageluminanceextractor.moc.cpp \
gui/qt/util/i18n.moc.cpp \
gui/qt/util/listcache.moc.cpp \


=
modules/gui/qt/maininterface/mainui.cpp
=
@@ -199,7 +199,6 @@ void MainUI::registerQMLTypes()
 registerAnonymousType("org.videolan.medialib", 1);
 registerAnonymousType("org.videolan.medialib", 1);
 registerAnonymousType("org.videolan.medialib", 1);
-registerAnonymousType("org.videolan.medialib", 1);
 registerAnonymousType("org.videolan.medialib", 1);
 
 qmlRegisterType( "org.videolan.medialib", 0, 1, 
"AlbumContextMenu" );


=
modules/gui/qt/medialibrary/mlbasemodel.cpp
=
@@ -408,19 +408,37 @@ void MLBaseModel::invalidateCache()
 m_cache.reset();
 }
 
+//-
+
 MLItem *MLBaseModel::item(int signedidx) const
 {
 validateCache();
 
 ssize_t count = m_cache->count();
-if (count == COUNT_UNINITIALIZED || signedidx < 0
-|| signedidx >= count)
+
+if (count == COUNT_UNINITIALIZED || signedidx < 0 || signedidx >= count)
 return nullptr;
 
 unsigned int idx = static_cast(signedidx);
+
 m_cache->refer(idx);
 
 const std::unique_ptr *item = m_cache->get(idx);
+
+if (!item)
+/* Not in cache */
+return nullptr;
+
+/* Return raw pointer */
+return item->get();
+}
+
+MLItem *MLBaseModel::itemCache(int signedidx) const
+{
+unsigned int idx = static_cast(signedidx);
+
+const std::unique_ptr *item = m_cache->get(idx);
+
 if (!item)
 /* Not in cache */
 return nullptr;
@@ -429,6 +447,8 @@ MLItem *MLBas

[vlc-commits] [Git][videolan/vlc][master] qml/MediaGroupList: Fix DragItem id and name implementation

2021-05-08 Thread Jean-Baptiste Kempf 


Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
12d1b4f8 by Benjamin Arnaud at 2021-05-08T10:18:51+00:00
qml/MediaGroupList: Fix DragItem id and name implementation
fix #25668

- - - - -


1 changed file:

- modules/gui/qt/medialibrary/qml/MediaGroupList.qml


Changes:

=
modules/gui/qt/medialibrary/qml/MediaGroupList.qml
=
@@ -194,7 +194,7 @@ Widgets.NavigableFocusScope {
 }
 
 Widgets.DragItem {
-id: dragItem
+id: dragItemGroup
 
 function updateComponents(maxCovers) {
 var items = modelSelect.selectedIndexes.slice(0, 
maxCovers).map(function (x){
@@ -205,13 +205,13 @@ Widgets.NavigableFocusScope {
 return { artwork: item.thumbnail || VLCStyle.noArtCover }
 });
 
-var title = items.map(function (item) {
-return item.title
+var name = items.map(function (item) {
+return item.name
 }).join(", ");
 
 return {
 covers: covers,
-title: title,
+title: name,
 count: modelSelect.selectedIndexes.length
 }
 }
@@ -284,7 +284,7 @@ Widgets.NavigableFocusScope {
 // NOTE: We don't want to show the indicator for a group.
 showNewIndicator: (model.count === 1)
 
-dragItem: root.dragItem
+dragItem: dragItemGroup
 
 selectedUnderlay  : shadows.selected
 unselectedUnderlay: shadows.unselected
@@ -364,7 +364,7 @@ Widgets.NavigableFocusScope {
 
 selectionDelegateModel: modelSelect
 
-dragItem: root.dragItem
+dragItem: dragItemGroup
 
 header: root.header
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/12d1b4f87cdd89cc9a4d325c1303445ac94abf03

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/12d1b4f87cdd89cc9a4d325c1303445ac94abf03
You're receiving this email because of your account on code.videolan.org.


___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] qml/MediaGroupListDisplay: Fix name property

2021-05-08 Thread Hugo Beauzée-Luyssen 


Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
5b1fb7d5 by Benjamin Arnaud at 2021-05-07T19:27:26+00:00
qml/MediaGroupListDisplay: Fix name property
fix #25663

- - - - -


1 changed file:

- modules/gui/qt/medialibrary/qml/MediaGroupDisplay.qml


Changes:

=
modules/gui/qt/medialibrary/qml/MediaGroupDisplay.qml
=
@@ -44,7 +44,7 @@ VideoAll {
 property alias parentId: modelGroup.parentId
 
 // NOTE: The name of the group.
-property string name
+property string name: initialName
 
 
//-
 // Childs



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5b1fb7d5d2ef69d7c374b50a97ea0304b36f2132

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5b1fb7d5d2ef69d7c374b50a97ea0304b36f2132
You're receiving this email because of your account on code.videolan.org.


___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits