|
a/upmpd/upmpd.cxx |
|
b/upmpd/upmpd.cxx |
|
... |
|
... |
88 |
// Note: the order is significant here as it will be used when
|
88 |
// Note: the order is significant here as it will be used when
|
89 |
// calling the getStatus() methods, and we want AVTransport to
|
89 |
// calling the getStatus() methods, and we want AVTransport to
|
90 |
// update the mpd status for OHInfo
|
90 |
// update the mpd status for OHInfo
|
91 |
UpMpdRenderCtl *rdctl = new UpMpdRenderCtl(this);
|
91 |
UpMpdRenderCtl *rdctl = new UpMpdRenderCtl(this);
|
92 |
m_services.push_back(rdctl);
|
92 |
m_services.push_back(rdctl);
|
93 |
m_services.push_back(new UpMpdAVTransport(this));
|
93 |
UpMpdAVTransport* avt = new UpMpdAVTransport(this);
|
|
|
94 |
m_services.push_back(avt);
|
94 |
m_services.push_back(new UpMpdConMan(this));
|
95 |
m_services.push_back(new UpMpdConMan(this));
|
95 |
if (m_options & upmpdDoOH) {
|
96 |
if (m_options & upmpdDoOH) {
|
96 |
m_services.push_back(new OHProduct(this, friendlyname));
|
97 |
m_services.push_back(new OHProduct(this, friendlyname));
|
97 |
m_services.push_back(new OHInfo(this));
|
98 |
m_services.push_back(new OHInfo(this));
|
98 |
m_services.push_back(new OHTime(this));
|
99 |
m_services.push_back(new OHTime(this));
|
99 |
m_services.push_back(new OHVolume(this, rdctl));
|
100 |
m_services.push_back(new OHVolume(this, rdctl));
|
100 |
m_services.push_back(new OHPlaylist(this, rdctl));
|
101 |
OHPlaylist *ohp = new OHPlaylist(this, rdctl);
|
|
|
102 |
m_services.push_back(ohp);
|
|
|
103 |
if (avt)
|
|
|
104 |
avt->setOHP(ohp);
|
101 |
}
|
105 |
}
|
102 |
}
|
106 |
}
|
103 |
|
107 |
|
104 |
UpMpd::~UpMpd()
|
108 |
UpMpd::~UpMpd()
|
105 |
{
|
109 |
{
|