[vlc-commits] [Git][videolan/libvlcpp][master] Don't expose 3.0 types when using 2.2

[Hugo Beauzée-Luyssen]

Hugo Beauzée-Luyssen pushed to branch master at videolan / libvlcpp


Commits:
5bf9acb9 by Hugo Beauzée-Luyssen at 2016-06-06T02:59:09+02:00
Don't expose 3.0 types when using 2.2

- - - - -


2 changed files:

- vlcpp/Instance.hpp
- vlcpp/MediaDiscoverer.hpp


Changes:

=====================================
vlcpp/Instance.hpp
=====================================
--- a/vlcpp/Instance.hpp
+++ b/vlcpp/Instance.hpp
@@ -492,6 +492,7 @@ public:
         libvlc_dialog_set_callbacks(*this, nullptr, nullptr);
     }
 
+#if LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0)
     /**
      * Get media discoverer services by category
      *
@@ -518,6 +519,7 @@ public:
             res.emplace_back( pp_descs[i]->psz_name, pp_descs[i]->psz_longname, pp_descs[i]->i_cat );
         return res;
     }
+#endif
 
 #endif
 };


=====================================
vlcpp/MediaDiscoverer.hpp
=====================================
--- a/vlcpp/MediaDiscoverer.hpp
+++ b/vlcpp/MediaDiscoverer.hpp
@@ -39,6 +39,7 @@ class MediaList;
 class MediaDiscoverer : public Internal<libvlc_media_discoverer_t>
 {
 public:
+#if LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0)
     enum class Category
     {
         Devices = libvlc_media_discoverer_devices,
@@ -77,7 +78,7 @@ public:
         std::string m_longName;
         Category m_category;
     };
-
+#endif
     /**
      * Discover media service by name.
      *



View it on GitLab: https://code.videolan.org/videolan/libvlcpp/commit/5bf9acb9733554803b94360832fdb75be22dd2f0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-commits/attachments/20160606/cdbd3a7b/attachment-0001.html>