Switch to unified view

a/src/mediaserver.cxx b/src/mediaserver.cxx
...
...
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
17
18
#include "mediaserver.hxx"
18
#include "mediaserver.hxx"
19
19
20
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
25
MediaServer::MediaServer(const string& deviceid, const string& friendlyname)
27
MediaServer::MediaServer(const string& deviceid, const string& friendlyname,
26
    : UpnpDevice(deviceid, unordered_map<string, VDirContent>())
28
    const std::unordered_map<std::string, VDirContent>& files)
29
    : UpnpDevice(deviceid, files)
27
{
30
{
28
    m_cd = new ContentDirectory(this);
31
    m_cd = new ContentDirectory(this);
32
    m_cm = new UpMpdConMan(this, g_protocolInfo);
29
}
33
}
30
34
31
35
32
MediaServer::~MediaServer()
36
MediaServer::~MediaServer()
33
{
37
{
34
    delete m_cd;
38
    delete m_cd;
39
    delete m_cm;
35
}
40
}
36
37
38