Commit bca5b838 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Fix build with VLC 2.2

parent 428dec95
......@@ -482,6 +482,7 @@ class MediaPlayerEventManager : public EventManager
});
}
#if LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0)
template <typename Func>
RegisteredEvent onESAdded( Func&& f )
{
......@@ -514,6 +515,7 @@ class MediaPlayerEventManager : public EventManager
(*callback)( e->u.media_player_es_changed.i_type, e->u.media_player_es_changed.i_id );
});
}
#endif
};
class MediaListEventManager : public EventManager
......
......@@ -48,7 +48,7 @@ public:
* fairly expensive to instantiate.
*/
MediaDiscoverer(Instance& inst, const std::string& name)
#if LIBVLC_VERSION(3, 0, 0, 0) >= LIBVLC_VERSION_INT
#if LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0)
: Internal{ libvlc_media_discoverer_new(getInternalPtr<libvlc_instance_t>( inst ), name.c_str()),
#else
: Internal{ libvlc_media_discoverer_new_from_name(getInternalPtr<libvlc_instance_t>( inst ), name.c_str()),
......@@ -57,7 +57,7 @@ public:
{
}
#if LIBVLC_VERSION(3, 0, 0, 0) >= LIBVLC_VERSION_INT
#if LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0)
/**
* Start media discovery.
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment