|
a/src/upmpd.cxx |
|
b/src/upmpd.cxx |
|
... |
|
... |
| 62 |
MPDCli *mpdcli, Options opts)
|
62 |
MPDCli *mpdcli, Options opts)
|
| 63 |
: UpnpDevice(deviceid, files), m_mpdcli(mpdcli), m_mpds(0),
|
63 |
: UpnpDevice(deviceid, files), m_mpdcli(mpdcli), m_mpds(0),
|
| 64 |
m_options(opts.options),
|
64 |
m_options(opts.options),
|
| 65 |
m_mcachefn(opts.cachefn)
|
65 |
m_mcachefn(opts.cachefn)
|
| 66 |
{
|
66 |
{
|
|
|
67 |
bool avtnoev = (m_options & upmpdNoAV) != 0;
|
| 67 |
// Note: the order is significant here as it will be used when
|
68 |
// Note: the order is significant here as it will be used when
|
| 68 |
// calling the getStatus() methods, and we want AVTransport to
|
69 |
// calling the getStatus() methods, and we want AVTransport to
|
| 69 |
// update the mpd status for OHInfo
|
70 |
// update the mpd status for OHInfo
|
| 70 |
UpMpdRenderCtl *rdctl = new UpMpdRenderCtl(this);
|
71 |
UpMpdRenderCtl *rdctl = new UpMpdRenderCtl(this, avtnoev);
|
| 71 |
m_services.push_back(rdctl);
|
72 |
m_services.push_back(rdctl);
|
| 72 |
UpMpdAVTransport* avt = new UpMpdAVTransport(this);
|
73 |
UpMpdAVTransport* avt = new UpMpdAVTransport(this, avtnoev);
|
| 73 |
m_services.push_back(avt);
|
74 |
m_services.push_back(avt);
|
| 74 |
m_services.push_back(new UpMpdConMan(this));
|
75 |
m_services.push_back(new UpMpdConMan(this));
|
| 75 |
bool ohReceiver = (m_options & upmpdOhReceiver) != 0;
|
76 |
bool ohReceiver = (m_options & upmpdOhReceiver) != 0;
|
| 76 |
if (m_options & upmpdDoOH) {
|
77 |
if (m_options & upmpdDoOH) {
|
| 77 |
OHProduct *ohpr = new OHProduct(this, friendlyname, ohReceiver);
|
78 |
OHProduct *ohpr = new OHProduct(this, friendlyname, ohReceiver);
|
|
... |
|
... |
| 512 |
opts.options |= UpMpd::upmpdDoOH;
|
513 |
opts.options |= UpMpd::upmpdDoOH;
|
| 513 |
if (ohmetapersist)
|
514 |
if (ohmetapersist)
|
| 514 |
opts.options |= UpMpd::upmpdOhMetaPersist;
|
515 |
opts.options |= UpMpd::upmpdOhMetaPersist;
|
| 515 |
if (!g_sc2mpd_path.empty())
|
516 |
if (!g_sc2mpd_path.empty())
|
| 516 |
opts.options |= UpMpd::upmpdOhReceiver;
|
517 |
opts.options |= UpMpd::upmpdOhReceiver;
|
| 517 |
|
518 |
if (!enableAV)
|
|
|
519 |
opts.options |= UpMpd::upmpdNoAV;
|
| 518 |
// Initialize the UPnP device object.
|
520 |
// Initialize the UPnP device object.
|
| 519 |
UpMpd device(string("uuid:") + UUID, friendlyname,
|
521 |
UpMpd device(string("uuid:") + UUID, friendlyname,
|
| 520 |
files, mpdclip, opts);
|
522 |
files, mpdclip, opts);
|
| 521 |
dev = &device;
|
523 |
dev = &device;
|
| 522 |
|
524 |
|