vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Mon Aug 13 15:54:14 2018 +0200| [a8d1a829c1d39707f5e6738688c91ddcbf274949] | committer: Hugo Beauzée-Luyssen
contribs: medialibrary: Bump hash & update according to API changes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a8d1a829c1d39707f5e6738688c91ddcbf274949 --- contrib/src/medialibrary/rules.mak | 2 +- modules/misc/medialibrary/medialib.cpp | 20 ++++++++++++-------- modules/misc/medialibrary/medialibrary.h | 11 ++++++----- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/contrib/src/medialibrary/rules.mak b/contrib/src/medialibrary/rules.mak index 128cb3809f..a34e964a67 100644 --- a/contrib/src/medialibrary/rules.mak +++ b/contrib/src/medialibrary/rules.mak @@ -1,4 +1,4 @@ -MEDIALIBRARY_HASH := 1f439cc2995e1852b08f3c33c93f5ab847df5cd9 +MEDIALIBRARY_HASH := cc76d54fd87e9376e6fb9dfbdc10b86762256006 MEDIALIBRARY_VERSION := git-$(MEDIALIBRARY_HASH) MEDIALIBRARY_GITURL := https://code.videolan.org/videolan/medialibrary.git diff --git a/modules/misc/medialibrary/medialib.cpp b/modules/misc/medialibrary/medialib.cpp index 1bc2fa65e7..6c2628a497 100644 --- a/modules/misc/medialibrary/medialib.cpp +++ b/modules/misc/medialibrary/medialib.cpp @@ -71,7 +71,7 @@ void MediaLibrary::onMediaAdded( std::vector<medialibrary::MediaPtr> ) { } -void MediaLibrary::onMediaUpdated( std::vector<medialibrary::MediaPtr> ) +void MediaLibrary::onMediaModified( std::vector<medialibrary::MediaPtr> ) { } @@ -103,23 +103,27 @@ void MediaLibrary::onAlbumsDeleted( std::vector<int64_t> ) { } -void MediaLibrary::onTracksAdded( std::vector<medialibrary::AlbumTrackPtr> ) +void MediaLibrary::onPlaylistsAdded( std::vector<medialibrary::PlaylistPtr> ) { } -void MediaLibrary::onTracksDeleted( std::vector<int64_t> ) +void MediaLibrary::onPlaylistsModified( std::vector<medialibrary::PlaylistPtr> ) { } -void MediaLibrary::onPlaylistsAdded( std::vector<medialibrary::PlaylistPtr> ) +void MediaLibrary::onPlaylistsDeleted( std::vector<int64_t> ) { } -void MediaLibrary::onPlaylistsModified( std::vector<medialibrary::PlaylistPtr> ) +void MediaLibrary::onGenresAdded( std::vector<medialibrary::GenrePtr> ) { } -void MediaLibrary::onPlaylistsDeleted( std::vector<int64_t> ) +void MediaLibrary::onGenresModified( std::vector<medialibrary::GenrePtr> ) +{ +} + +void MediaLibrary::onGenresDeleted( std::vector<int64_t> ) { } @@ -131,7 +135,7 @@ void MediaLibrary::onDiscoveryProgress( const std::string& ) { } -void MediaLibrary::onDiscoveryCompleted( const std::string& ) +void MediaLibrary::onDiscoveryCompleted( const std::string&, bool ) { } @@ -139,7 +143,7 @@ void MediaLibrary::onReloadStarted( const std::string& ) { } -void MediaLibrary::onReloadCompleted( const std::string& ) +void MediaLibrary::onReloadCompleted(const std::string&, bool ) { } diff --git a/modules/misc/medialibrary/medialibrary.h b/modules/misc/medialibrary/medialibrary.h index 8246704f8c..0dcb026ead 100644 --- a/modules/misc/medialibrary/medialibrary.h +++ b/modules/misc/medialibrary/medialibrary.h @@ -134,7 +134,7 @@ private: // IMediaLibraryCb interface public: virtual void onMediaAdded(std::vector<medialibrary::MediaPtr> media) override; - virtual void onMediaUpdated(std::vector<medialibrary::MediaPtr> media) override; + virtual void onMediaModified(std::vector<medialibrary::MediaPtr> media) override; virtual void onMediaDeleted(std::vector<int64_t> mediaIds) override; virtual void onArtistsAdded(std::vector<medialibrary::ArtistPtr> artists) override; virtual void onArtistsModified(std::vector<medialibrary::ArtistPtr> artists) override; @@ -142,16 +142,17 @@ public: virtual void onAlbumsAdded(std::vector<medialibrary::AlbumPtr> albums) override; virtual void onAlbumsModified(std::vector<medialibrary::AlbumPtr> albums) override; virtual void onAlbumsDeleted(std::vector<int64_t> albumsIds) override; - virtual void onTracksAdded(std::vector<medialibrary::AlbumTrackPtr> tracks) override; - virtual void onTracksDeleted(std::vector<int64_t> trackIds) override; virtual void onPlaylistsAdded(std::vector<medialibrary::PlaylistPtr> playlists) override; virtual void onPlaylistsModified(std::vector<medialibrary::PlaylistPtr> playlists) override; virtual void onPlaylistsDeleted(std::vector<int64_t> playlistIds) override; + virtual void onGenresAdded(std::vector<medialibrary::GenrePtr> genres) override; + virtual void onGenresModified(std::vector<medialibrary::GenrePtr> genres) override; + virtual void onGenresDeleted(std::vector<int64_t> genreIds) override; virtual void onDiscoveryStarted(const std::string& entryPoint) override; virtual void onDiscoveryProgress(const std::string& entryPoint) override; - virtual void onDiscoveryCompleted(const std::string& entryPoint) override; + virtual void onDiscoveryCompleted(const std::string& entryPoint, bool success) override; virtual void onReloadStarted(const std::string& entryPoint) override; - virtual void onReloadCompleted(const std::string& entryPoint) override; + virtual void onReloadCompleted(const std::string& entryPoint, bool success) override; virtual void onEntryPointRemoved(const std::string& entryPoint, bool success) override; virtual void onEntryPointBanned(const std::string& entryPoint, bool success) override; virtual void onEntryPointUnbanned(const std::string& entryPoint, bool success) override; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
