From 1573f2a6edeb4170a6195d83f03975682f41bf01 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Wed, 6 Jan 2021 15:15:59 +0100 Subject: [PATCH] medialib: bump contrib & reflect API changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hugo Beauzée-Luyssen --- configure.ac | 2 +- contrib/src/medialibrary/rules.mak | 4 ++-- modules/misc/medialibrary/fs/file.cpp | 2 +- modules/misc/medialibrary/fs/file.h | 2 +- modules/misc/medialibrary/medialibrary.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index cf55145c99..d3ea76c423 100644 --- a/configure.ac +++ b/configure.ac @@ -4464,7 +4464,7 @@ dnl Libnotify notification plugin dnl PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto]) -PKG_ENABLE_MODULES_VLC([MEDIALIBRARY], [medialibrary], [medialibrary >= 0.9.0], (medialibrary support), [auto]) +PKG_ENABLE_MODULES_VLC([MEDIALIBRARY], [medialibrary], [medialibrary >= 0.9.1], (medialibrary support), [auto]) dnl dnl Endianness check diff --git a/contrib/src/medialibrary/rules.mak b/contrib/src/medialibrary/rules.mak index e2ba1c7a8e..97ce83de49 100644 --- a/contrib/src/medialibrary/rules.mak +++ b/contrib/src/medialibrary/rules.mak @@ -1,9 +1,9 @@ -MEDIALIBRARY_HASH := b208f5b7f0e7981efbc779018d5ae7f117f331d2 +MEDIALIBRARY_HASH := f624aad56071999f899eb1380c914b5f61dfc52c MEDIALIBRARY_VERSION := git-$(MEDIALIBRARY_HASH) MEDIALIBRARY_GITURL := https://code.videolan.org/videolan/medialibrary.git PKGS += medialibrary -ifeq ($(call need_pkg,"medialibrary >= 0.9"),) +ifeq ($(call need_pkg,"medialibrary >= 0.9.1"),) PKGS_FOUND += medialibrary endif diff --git a/modules/misc/medialibrary/fs/file.cpp b/modules/misc/medialibrary/fs/file.cpp index daa77f99f9..77b48329e5 100644 --- a/modules/misc/medialibrary/fs/file.cpp +++ b/modules/misc/medialibrary/fs/file.cpp @@ -53,7 +53,7 @@ SDFile::extension() const return m_extension; } -unsigned int +time_t SDFile::lastModificationDate() const { return 0; diff --git a/modules/misc/medialibrary/fs/file.h b/modules/misc/medialibrary/fs/file.h index 41584b2476..05730f6bda 100644 --- a/modules/misc/medialibrary/fs/file.h +++ b/modules/misc/medialibrary/fs/file.h @@ -36,7 +36,7 @@ public: const std::string& mrl() const override; const std::string& name() const override; const std::string& extension() const override; - unsigned int lastModificationDate() const override; + time_t lastModificationDate() const override; int64_t size() const override; inline bool isNetwork() const override { return true; } LinkedFileType linkedType() const override; diff --git a/modules/misc/medialibrary/medialibrary.cpp b/modules/misc/medialibrary/medialibrary.cpp index 943b6483ab..a58032668d 100644 --- a/modules/misc/medialibrary/medialibrary.cpp +++ b/modules/misc/medialibrary/medialibrary.cpp @@ -575,7 +575,7 @@ int MediaLibrary::Control( int query, va_list args ) case VLC_ML_NEW_EXTERNAL_MEDIA: { auto mrl = va_arg( args, const char* ); - auto media = m_ml->addExternalMedia( mrl ); + auto media = m_ml->addExternalMedia( mrl, -1 ); if ( media == nullptr ) return VLC_EGENERIC; *va_arg( args, vlc_ml_media_t**) = CreateAndConvert( media.get() );