--- a
+++ b/libupnpp/control/mediaserver.hxx
@@ -0,0 +1,50 @@
+/* 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.
+ */
+#ifndef _MEDIASERVER_HXX_INCLUDED_
+#define _MEDIASERVER_HXX_INCLUDED_
+
+#include <memory>
+#include <string>
+
+#include "libupnpp/control/device.hxx"
+#include "libupnpp/control/description.hxx"
+#include "libupnpp/control/cdirectory.hxx"
+
+namespace UPnPClient {
+
+class MediaServer;
+typedef std::shared_ptr<MediaServer> MSRH;
+
+class MediaServer : public Device {
+public:
+    MediaServer(const UPnPDeviceDesc& desc);
+
+    CDSH cds() {return m_cds;}
+
+    static bool getDeviceDescs(std::vector<UPnPDeviceDesc>& devices,
+                               const std::string& friendlyName = "");
+    static bool isMSDevice(const std::string& devicetype);
+
+protected:
+    CDSH m_cds;
+
+    static const std::string DType;
+};
+
+}
+
+#endif /* _MEDIASERVER_HXX_INCLUDED_ */