Switch to unified view

a/upmpd/conman.cxx b/upmpd/conman.cxx
...
...
38
#include "upmpd.hxx"
38
#include "upmpd.hxx"
39
#include "conman.hxx"
39
#include "conman.hxx"
40
#include "mpdcli.hxx"
40
#include "mpdcli.hxx"
41
#include "upmpdutils.hxx"
41
#include "upmpdutils.hxx"
42
42
43
static const string sTpCM("urn:schemas-upnp-org:service:ConnectionManager:1");
43
static const string serviceIdCM("urn:upnp-org:serviceId:ConnectionManager");
44
static const string sIdCM("urn:upnp-org:serviceId:ConnectionManager");
44
45
45
UpMpdConMan::UpMpdConMan(UpMpd *dev)
46
UpMpdConMan::UpMpdConMan(UpMpd *dev)
46
    : UpnpService(dev)
47
    : UpnpService(sTpCM, sIdCM, dev)
47
{
48
{
48
    dev->addService(this, serviceIdCM);
49
    dev->addActionMapping("GetCurrentConnectionIDs", 
49
    dev->addActionMapping("GetCurrentConnectionIDs", 
50
                          bind(&UpMpdConMan::getCurrentConnectionIDs, 
50
                          bind(&UpMpdConMan::getCurrentConnectionIDs, 
51
                               this, _1,_2));
51
                               this, _1,_2));
52
    dev->addActionMapping("GetCurrentConnectionInfo", 
52
    dev->addActionMapping("GetCurrentConnectionInfo", 
53
                          bind(&UpMpdConMan::getCurrentConnectionInfo, 
53
                          bind(&UpMpdConMan::getCurrentConnectionInfo, 
54
                               this,_1,_2));
54
                               this,_1,_2));
55
    dev->addActionMapping("GetProtocolInfo", 
55
    dev->addActionMapping("GetProtocolInfo", 
56
                          bind(&UpMpdConMan::getProtocolInfo, this, _1, _2));
56
                          bind(&UpMpdConMan::getProtocolInfo, this, _1, _2));
57
}
58
59
const std::string& UpMpdConMan::getServiceType()
60
{
61
    return serviceIdCM;
62
}
57
}
63
58
64
// "http-get:*:audio/mpeg:DLNA.ORG_PN=MP3,"
59
// "http-get:*:audio/mpeg:DLNA.ORG_PN=MP3,"
65
// "http-get:*:audio/L16:DLNA.ORG_PN=LPCM,"
60
// "http-get:*:audio/L16:DLNA.ORG_PN=LPCM,"
66
// "http-get:*:audio/x-flac:DLNA.ORG_PN=FLAC"
61
// "http-get:*:audio/x-flac:DLNA.ORG_PN=FLAC"