|
a/src/upmpd.cxx |
|
b/src/upmpd.cxx |
|
... |
|
... |
| 70 |
if (m_options & upmpdDoOH) {
|
70 |
if (m_options & upmpdDoOH) {
|
| 71 |
m_ohif = new OHInfo(this);
|
71 |
m_ohif = new OHInfo(this);
|
| 72 |
m_services.push_back(m_ohif);
|
72 |
m_services.push_back(m_ohif);
|
| 73 |
m_services.push_back(new OHTime(this));
|
73 |
m_services.push_back(new OHTime(this));
|
| 74 |
m_services.push_back(new OHVolume(this));
|
74 |
m_services.push_back(new OHVolume(this));
|
|
|
75 |
bool lumincompat = configBool(g_config, "lumincompat");
|
|
|
76 |
if (!lumincompat) {
|
| 75 |
m_services.push_back(new OHCredentials(this, opts.cachedir));
|
77 |
m_services.push_back(new OHCredentials(this, opts.cachedir));
|
|
|
78 |
}
|
| 76 |
m_ohpl = new OHPlaylist(this, opts.ohmetasleep);
|
79 |
m_ohpl = new OHPlaylist(this, opts.ohmetasleep);
|
| 77 |
m_services.push_back(m_ohpl);
|
80 |
m_services.push_back(m_ohpl);
|
| 78 |
if (m_avt)
|
81 |
if (m_avt)
|
| 79 |
m_avt->setOHP(m_ohpl);
|
82 |
m_avt->setOHP(m_ohpl);
|
| 80 |
if (m_ohif)
|
83 |
if (m_ohif)
|
|
... |
|
... |
| 106 |
// Note: this is not an UPnP service
|
109 |
// Note: this is not an UPnP service
|
| 107 |
m_sndrcv = new SenderReceiver(this, opts.senderpath,
|
110 |
m_sndrcv = new SenderReceiver(this, opts.senderpath,
|
| 108 |
opts.sendermpdport);
|
111 |
opts.sendermpdport);
|
| 109 |
}
|
112 |
}
|
| 110 |
// Create ohpr last, so that it can ask questions to other services
|
113 |
// Create ohpr last, so that it can ask questions to other services
|
|
|
114 |
//
|
|
|
115 |
// We set the service version to 1 if credentials are
|
|
|
116 |
// hidden. The 2 are actually unrelated, but both are needed
|
|
|
117 |
// for Lumin 1.10 to discover upmpdcli (without the credentials
|
|
|
118 |
// service of course). I could not find what Lumin does not
|
|
|
119 |
// like when either Product:2 or ohcreds is enabled. Maybe
|
|
|
120 |
// this will go away at some point.
|
| 111 |
m_ohpr = new OHProduct(this, ohProductDesc);
|
121 |
m_ohpr = new OHProduct(this, ohProductDesc, lumincompat ? 1 : 2);
|
| 112 |
m_services.push_back(m_ohpr);
|
122 |
m_services.push_back(m_ohpr);
|
| 113 |
}
|
123 |
}
|
| 114 |
}
|
124 |
}
|
| 115 |
|
125 |
|
| 116 |
UpMpd::~UpMpd()
|
126 |
UpMpd::~UpMpd()
|