[vlc-commits] [Git][videolan/vlc][master] 2 commits: medialibrary: Update to 0.12.0 API changes

[Hugo Beauzée-Luyssen (@chouquette)]

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


Commits:
bc03e6e4 by Hugo Beauzée-Luyssen at 2022-05-20T07:40:41+00:00
medialibrary: Update to 0.12.0 API changes

- - - - -
7abfc1fa by Hugo Beauzée-Luyssen at 2022-05-20T07:40:41+00:00
contrib: Bump medialibrary to 0.12.0

- - - - -


5 changed files:

- configure.ac
- contrib/src/medialibrary/SHA512SUMS
- contrib/src/medialibrary/rules.mak
- modules/misc/medialibrary/medialibrary.cpp
- modules/misc/medialibrary/medialibrary.h


Changes:

=====================================
configure.ac
=====================================
@@ -4283,7 +4283,7 @@ dnl Libnotify notification plugin
 dnl
 PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto])
 
-PKG_ENABLE_MODULES_VLC([MEDIALIBRARY], [medialibrary], [medialibrary >= 0.11.2], (medialibrary support), [auto])
+PKG_ENABLE_MODULES_VLC([MEDIALIBRARY], [medialibrary], [medialibrary >= 0.12.0], (medialibrary support), [auto])
 
 dnl
 dnl  Endianness check


=====================================
contrib/src/medialibrary/SHA512SUMS
=====================================
@@ -1 +1 @@
-f4d67d06339cd0d07536b012eb30e5ddd3decca4eeba3c1bb1d1b76ab233acc0e0145fc4c9b1f1bc3d2e3686dadd3c7a9525bd71f85d9dadd54bdadc10e53feb  medialibrary-0.11.2.tar.bz2
+f5895381135834a04499a3043e2f69b2f56c042e1fae1dd504f7f4ab6f501ee17bc1a9f298183c0b855e5e7373d97912cd5154a0656d9a6d168da16f36ce5ff3  medialibrary-0.12.0.tar.bz2


=====================================
contrib/src/medialibrary/rules.mak
=====================================
@@ -1,8 +1,8 @@
-MEDIALIBRARY_VERSION := 0.11.2
+MEDIALIBRARY_VERSION := 0.12.0
 MEDIALIBRARY_URL := https://code.videolan.org/videolan/medialibrary/-/archive/$(MEDIALIBRARY_VERSION)/medialibrary-$(MEDIALIBRARY_VERSION).tar.bz2
 
 PKGS += medialibrary
-ifeq ($(call need_pkg,"medialibrary >= 0.11.0"),)
+ifeq ($(call need_pkg,"medialibrary >= 0.12.0"),)
 PKGS_FOUND += medialibrary
 endif
 


=====================================
modules/misc/medialibrary/medialibrary.cpp
=====================================
@@ -150,10 +150,6 @@ void MediaLibrary::onMediaDeleted( std::set<int64_t> mediaIds )
     wrapEntityDeletedEventCallback( m_vlc_ml, mediaIds, VLC_ML_EVENT_MEDIA_DELETED );
 }
 
-void MediaLibrary::onMediaConvertedToExternal(std::set<int64_t>)
-{
-}
-
 void MediaLibrary::onArtistsAdded( std::vector<medialibrary::ArtistPtr> artists )
 {
     wrapEntityCreatedEventCallback<vlc_ml_artist_t>( m_vlc_ml, artists, VLC_ML_EVENT_ARTIST_ADDED );
@@ -416,6 +412,9 @@ MediaLibrary* MediaLibrary::create( vlc_medialibrary_module_t* vlc_ml )
     cfg.parserServices = {
         std::make_shared<MetadataExtractor>( VLC_OBJECT( vlc_ml ) )
     };
+    cfg.logLevel = var_InheritBool( VLC_OBJECT( vlc_ml ), "ml-verbose" ) ?
+                        medialibrary::LogLevel::Debug : medialibrary::LogLevel::Warning;
+    cfg.logger = std::make_shared<Logger>( VLC_OBJECT( vlc_ml ) );
 
     auto ml = NewMediaLibrary( dbPath.c_str(), mlFolderPath.c_str(), true, &cfg );
     if ( !ml )
@@ -429,10 +428,6 @@ MediaLibrary::MediaLibrary( vlc_medialibrary_module_t* vlc_ml,
     : m_vlc_ml( vlc_ml )
     , m_ml( ml )
 {
-    m_logger.reset( new Logger( VLC_OBJECT( m_vlc_ml ) ) );
-    m_ml->setVerbosity( var_InheritBool( VLC_OBJECT( m_vlc_ml ), "ml-verbose" ) ?
-                          medialibrary::LogLevel::Debug : medialibrary::LogLevel::Warning );
-    m_ml->setLogger( m_logger.get() );
 }
 
 bool MediaLibrary::Init()


=====================================
modules/misc/medialibrary/medialibrary.h
=====================================
@@ -189,7 +189,6 @@ private:
     MediaLibrary( vlc_medialibrary_module_t* vlc_ml, medialibrary::IMediaLibrary* ml );
 
     vlc_medialibrary_module_t* m_vlc_ml;
-    std::unique_ptr<Logger> m_logger;
     std::unique_ptr<medialibrary::IMediaLibrary> m_ml;
 
     vlc::threads::mutex m_mutex;
@@ -202,7 +201,6 @@ public:
     virtual void onMediaAdded(std::vector<medialibrary::MediaPtr> media) override;
     virtual void onMediaModified(std::set<int64_t> media) override;
     virtual void onMediaDeleted(std::set<int64_t> mediaIds) override;
-    virtual void onMediaConvertedToExternal(std::set<int64_t> mediaIds) override;
     virtual void onArtistsAdded(std::vector<medialibrary::ArtistPtr> artists) override;
     virtual void onArtistsModified(std::set<int64_t> artists) override;
     virtual void onArtistsDeleted(std::set<int64_t> artistsIds) override;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d1cab3478894132797d48d2094d4aed2f333ab54...7abfc1fa74d2ffe313fa8a885c87bd6a1e88786a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d1cab3478894132797d48d2094d4aed2f333ab54...7abfc1fa74d2ffe313fa8a885c87bd6a1e88786a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance