Switch to unified view

a/src/mediaserver/mediaserver.cxx b/src/mediaserver/mediaserver.cxx
...
...
20
#include "conman.hxx"
20
#include "conman.hxx"
21
#include "contentdirectory.hxx"
21
#include "contentdirectory.hxx"
22
22
23
using namespace std;
23
using namespace std;
24
24
25
extern string g_protocolInfo;
26
27
MediaServer::MediaServer(const string& deviceid, const string& friendlyname,
25
MediaServer::MediaServer(const string& deviceid, const string& friendlyname,
28
    const std::unordered_map<std::string, VDirContent>& files)
26
    const std::unordered_map<std::string, VDirContent>& files)
29
    : UpnpDevice(deviceid, files)
27
    : UpnpDevice(deviceid, files)
30
{
28
{
31
    m_cd = new ContentDirectory(this);
29
    m_cd = new ContentDirectory(this);
32
    m_cm = new UpMpdConMan(this, g_protocolInfo);
30
    m_cm = new UpMpdConMan(this);
33
}
31
}
34
32
35
33
36
MediaServer::~MediaServer()
34
MediaServer::~MediaServer()
37
{
35
{