Hugo Beauzée-Luyssen pushed to branch master at videolan / libvlcpp
Commits:
404379fb by Hugo Beauzée-Luyssen at 2016-07-20T14:19:04+02:00
Rename some types to follow recent libvlc changes
- - - - -
2 changed files:
- vlcpp/Instance.hpp
- vlcpp/MediaDiscoverer.hpp
Changes:
=====================================
vlcpp/Instance.hpp
=====================================
--- a/vlcpp/Instance.hpp
+++ b/vlcpp/Instance.hpp
@@ -519,15 +519,15 @@ public:
*/
std::vector<MediaDiscoverer::Description>
mediaDiscoverers(MediaDiscoverer::Category category)
{
- libvlc_media_discoverer_description** pp_descs;
- auto nbSd = libvlc_media_discoverer_list_get( *this,
static_cast<libvlc_media_discoverer_category>( category ),
+ libvlc_media_discoverer_description_t** pp_descs;
+ auto nbSd = libvlc_media_discoverer_list_get( *this,
static_cast<libvlc_media_discoverer_category_t>( category ),
&pp_descs );
if ( nbSd == 0 )
return {};
- auto releaser = [nbSd](libvlc_media_discoverer_description** ptr) {
+ auto releaser = [nbSd](libvlc_media_discoverer_description_t** ptr) {
libvlc_media_discoverer_list_release( ptr, nbSd );
};
- std::unique_ptr<libvlc_media_discoverer_description*,
decltype(releaser)> descPtr( pp_descs, releaser );
+ std::unique_ptr<libvlc_media_discoverer_description_t*,
decltype(releaser)> descPtr( pp_descs, releaser );
std::vector<MediaDiscoverer::Description> res;
res.reserve( nbSd );
for ( auto i = 0u; i < nbSd; ++i )
=====================================
vlcpp/MediaDiscoverer.hpp
=====================================
--- a/vlcpp/MediaDiscoverer.hpp
+++ b/vlcpp/MediaDiscoverer.hpp
@@ -53,7 +53,7 @@ public:
class Description
{
public:
- explicit Description( const std::string& name, const std::string&
longName, libvlc_media_discoverer_category cat )
+ explicit Description( const std::string& name, const std::string&
longName, libvlc_media_discoverer_category_t cat )
: m_name( name )
, m_longName( longName )
, m_category( static_cast<Category>( cat ) )
View it on GitLab:
https://code.videolan.org/videolan/libvlcpp/commit/404379fb3bc57d413382d10adfef35b5009ddc0b
_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
