[vlc-commits] contrib: medialib: Bump version

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Dec 19 16:27:27 2019 +0100| [7244f4240efa80aac5eb1e453bd552436377f7d2] | committer: Hugo Beauzée-Luyssen

contrib: medialib: Bump version

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7244f4240efa80aac5eb1e453bd552436377f7d2
---

 configure.ac                                 |  2 +-
 contrib/src/medialibrary/fix-win-build.patch | 24 ------------------------
 contrib/src/medialibrary/rules.mak           |  5 ++---
 modules/misc/medialibrary/medialib.cpp       | 24 +++++++++++++++++++++---
 modules/misc/medialibrary/medialibrary.h     |  3 +++
 5 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/configure.ac b/configure.ac
index 78f5db1b15..c2a2a231ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4362,7 +4362,7 @@ dnl Libnotify notification plugin
 dnl
 PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-3.0], [libnotify notification], [auto])
 
-PKG_ENABLE_MODULES_VLC([MEDIALIBRARY], [medialibrary], [medialibrary], (medialibrary support), [auto])
+PKG_ENABLE_MODULES_VLC([MEDIALIBRARY], [medialibrary], [medialibrary >= 0.7.1], (medialibrary support), [auto])
 
 dnl
 dnl  Endianness check
diff --git a/contrib/src/medialibrary/fix-win-build.patch b/contrib/src/medialibrary/fix-win-build.patch
deleted file mode 100644
index b44c8fd5e8..0000000000
--- a/contrib/src/medialibrary/fix-win-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 52dbd4f4449876c4776a35a519970bf584b0d63f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
-Date: Mon, 16 Dec 2019 13:21:51 +0100
-Subject: [PATCH] utils: Filename: Fix win32 build with GCC
-
----
- src/utils/Filename.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/utils/Filename.cpp b/src/utils/Filename.cpp
-index 737191cd..1216d12e 100644
---- a/src/utils/Filename.cpp
-+++ b/src/utils/Filename.cpp
-@@ -29,6 +29,7 @@
- #include "medialibrary/filesystem/Errors.h"
- 
- #ifdef _WIN32
-+# include <algorithm>
- # define DIR_SEPARATOR "\\/"
- # define DIR_SEPARATOR_CHAR '\\'
- #else
--- 
-2.20.1
-
diff --git a/contrib/src/medialibrary/rules.mak b/contrib/src/medialibrary/rules.mak
index 0059aaa6b8..9e532e5991 100644
--- a/contrib/src/medialibrary/rules.mak
+++ b/contrib/src/medialibrary/rules.mak
@@ -1,9 +1,9 @@
-MEDIALIBRARY_HASH := 3dddb7b13466930792bf10c27ece35943edefaaf
+MEDIALIBRARY_HASH := 16d4ad78bdbdb8122b57e48edd68279009f062c3
 MEDIALIBRARY_VERSION := git-$(MEDIALIBRARY_HASH)
 MEDIALIBRARY_GITURL := https://code.videolan.org/videolan/medialibrary.git
 
 PKGS += medialibrary
-ifeq ($(call need_pkg,"medialibrary"),)
+ifeq ($(call need_pkg,"medialibrary >= 0.7.1"),)
 PKGS_FOUND += medialibrary
 endif
 
@@ -20,7 +20,6 @@ medialibrary: medialibrary-$(MEDIALIBRARY_VERSION).tar.xz .sum-medialibrary
 	rm -rf $@-$(MEDIALIBRARY_VERSION) $@
 	mkdir -p $@-$(MEDIALIBRARY_VERSION)
 	tar xvf "$<" --strip-components=1 -C $@-$(MEDIALIBRARY_VERSION)
-	$(APPLY) $(SRC)/medialibrary/fix-win-build.patch
 	$(call pkg_static, "medialibrary.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
diff --git a/modules/misc/medialibrary/medialib.cpp b/modules/misc/medialibrary/medialib.cpp
index f4e27676f7..1b97b1ae38 100644
--- a/modules/misc/medialibrary/medialib.cpp
+++ b/modules/misc/medialibrary/medialib.cpp
@@ -204,6 +204,18 @@ void MediaLibrary::onGenresDeleted( std::vector<int64_t> genreIds )
     wrapEntityDeletedEventCallback( m_vlc_ml, genreIds, VLC_ML_EVENT_GENRE_DELETED );
 }
 
+void MediaLibrary::onMediaGroupAdded( std::vector<medialibrary::MediaGroupPtr> )
+{
+}
+
+void MediaLibrary::onMediaGroupModified( std::vector<int64_t> )
+{
+}
+
+void MediaLibrary::onMediaGroupDeleted( std::vector<int64_t> )
+{
+}
+
 void MediaLibrary::onDiscoveryStarted( const std::string& entryPoint )
 {
     vlc_ml_event_t ev;
@@ -421,10 +433,16 @@ bool MediaLibrary::Start()
     if ( Init() == false )
         return false;
 
-    if ( m_ml->start() == false )
+    auto startRes = m_ml->start();
+    switch ( startRes )
     {
-        msg_Err( m_vlc_ml, "Failed to start the MediaLibrary" );
-        return false;
+        case medialibrary::StartResult::Failed:
+            msg_Err( m_vlc_ml, "Failed to start the MediaLibrary" );
+            return false;
+        case medialibrary::StartResult::AlreadyStarted:
+            return true;
+        case medialibrary::StartResult::Success:
+            break;
     }
 
     // Reload entry points we already know about, and then add potential new ones.
diff --git a/modules/misc/medialibrary/medialibrary.h b/modules/misc/medialibrary/medialibrary.h
index c359e8c7e0..c2d8359383 100644
--- a/modules/misc/medialibrary/medialibrary.h
+++ b/modules/misc/medialibrary/medialibrary.h
@@ -182,6 +182,9 @@ public:
     virtual void onGenresAdded(std::vector<medialibrary::GenrePtr> genres) override;
     virtual void onGenresModified(std::vector<int64_t> genres) override;
     virtual void onGenresDeleted(std::vector<int64_t> genreIds) override;
+    virtual void onMediaGroupAdded( std::vector<medialibrary::MediaGroupPtr> mediaGroups ) override;
+    virtual void onMediaGroupModified( std::vector<int64_t> mediaGroupsIds ) override;
+    virtual void onMediaGroupDeleted( std::vector<int64_t> mediaGroupsIds ) override;
     virtual void onDiscoveryStarted(const std::string& entryPoint) override;
     virtual void onDiscoveryProgress(const std::string& entryPoint) override;
     virtual void onDiscoveryCompleted(const std::string& entryPoint, bool success) override;