--- a
+++ b/libupnpp/control/mediaserver.cxx
@@ -0,0 +1,89 @@
+/* Copyright (C) 2014 J.F.Dockes
+ *       This program is free software; you can redistribute it and/or modify
+ *       it under the terms of the GNU General Public License as published by
+ *       the Free Software Foundation; either version 2 of the License, or
+ *       (at your option) any later version.
+ *
+ *       This program is distributed in the hope that it will be useful,
+ *       but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *       GNU General Public License for more details.
+ *
+ *       You should have received a copy of the GNU General Public License
+ *       along with this program; if not, write to the
+ *       Free Software Foundation, Inc.,
+ *       59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <functional>
+using namespace std;
+using namespace std::placeholders;
+
+#include "libupnpp/log.hxx"
+#include "libupnpp/control/discovery.hxx"
+#include "libupnpp/control/mediaserver.hxx"
+#include "libupnpp/control/cdirectory.hxx"
+
+namespace UPnPClient {
+
+const string 
+MediaServer::DType("urn:schemas-upnp-org:device:MediaServer:1");
+
+// We don't include a version in comparisons, as we are satisfied with
+// version 1
+bool MediaServer::isMSDevice(const string& st)
+{
+    const string::size_type sz(DType.size()-2);
+    return !DType.compare(0, sz, st, 0, sz);
+}
+
+static bool MDAccum(unordered_map<string, UPnPDeviceDesc>* out,
+                    const string& friendlyName,
+                    const UPnPDeviceDesc& device, 
+                    const UPnPServiceDesc& service)
+{
+    //LOGDEB("MDAccum: friendlyname: " << friendlyName << 
+    //    " dev friendlyName " << device.friendlyName << endl);
+    if (ContentDirectory::isCDService(service.serviceType) &&
+        (friendlyName.empty() ? true : 
+         !friendlyName.compare(device.friendlyName))) {
+        //LOGDEB("MDAccum setting " << device.UDN << endl);
+        (*out)[device.UDN] = device;
+    }
+    return true;
+}
+
+bool MediaServer::getDeviceDescs(vector<UPnPDeviceDesc>& devices, 
+                                   const string& friendlyName)
+{
+    unordered_map<string, UPnPDeviceDesc> mydevs;
+
+    UPnPDeviceDirectory::Visitor visitor = bind(MDAccum, &mydevs, friendlyName,
+                                                _1, _2);
+    UPnPDeviceDirectory::getTheDir()->traverse(visitor);
+    for (auto& entry : mydevs)
+        devices.push_back(entry.second);
+    return !devices.empty();
+}
+
+MediaServer::MediaServer(const UPnPDeviceDesc& desc)
+{
+    bool found = false;
+    for (auto& entry : desc.services) {
+        if (ContentDirectory::isCDService(entry.serviceType)) {
+            m_cds = CDSH(new ContentDirectory(desc, entry));
+            found = true;
+            break;
+        }
+    }
+    if (!found) {
+        LOGERR("MediaServer::MediaServer: ContentDirectory service not "
+               "found in device" << endl);
+    }
+}
+
+}
+