Browse Source

medialib: bump contrib & reflect API changes

Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
pull/119/head
Romain Vimont 6 years ago
committed by Hugo Beauzée-Luyssen
parent
commit
1573f2a6ed
  1. 2
      configure.ac
  2. 4
      contrib/src/medialibrary/rules.mak
  3. 2
      modules/misc/medialibrary/fs/file.cpp
  4. 2
      modules/misc/medialibrary/fs/file.h
  5. 2
      modules/misc/medialibrary/medialibrary.cpp

2
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

4
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

2
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;

2
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;

2
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<vlc_ml_media_t>( media.get() );

Loading…
Cancel
Save