|
a/upmpd/upmpd.cxx |
|
b/upmpd/upmpd.cxx |
|
... |
|
... |
| 196 |
string logfilename;
|
196 |
string logfilename;
|
| 197 |
int loglevel(upnppdebug::Logger::LLINF);
|
197 |
int loglevel(upnppdebug::Logger::LLINF);
|
| 198 |
string configfile;
|
198 |
string configfile;
|
| 199 |
string friendlyname(dfltFriendlyName);
|
199 |
string friendlyname(dfltFriendlyName);
|
| 200 |
bool ownqueue = true;
|
200 |
bool ownqueue = true;
|
| 201 |
bool openhome = false;
|
201 |
bool openhome = true;
|
|
|
202 |
bool ohmetapersist = true;
|
| 202 |
string upmpdcliuser("upmpdcli");
|
203 |
string upmpdcliuser("upmpdcli");
|
| 203 |
string pidfilename("/var/run/upmpdcli.pid");
|
204 |
string pidfilename("/var/run/upmpdcli.pid");
|
| 204 |
string iface;
|
205 |
string iface;
|
| 205 |
unsigned short upport = 0;
|
206 |
unsigned short upport = 0;
|
| 206 |
string upnpip;
|
207 |
string upnpip;
|
|
... |
|
... |
| 286 |
ownqueue = atoi(value.c_str()) != 0;
|
287 |
ownqueue = atoi(value.c_str()) != 0;
|
| 287 |
}
|
288 |
}
|
| 288 |
if (config.get("openhome", value)) {
|
289 |
if (config.get("openhome", value)) {
|
| 289 |
openhome = atoi(value.c_str()) != 0;
|
290 |
openhome = atoi(value.c_str()) != 0;
|
| 290 |
}
|
291 |
}
|
|
|
292 |
if (config.get("ohmetapersist", value)) {
|
|
|
293 |
ohmetapersist = atoi(value.c_str()) != 0;
|
|
|
294 |
}
|
| 291 |
if (!(op_flags & OPT_i)) {
|
295 |
if (!(op_flags & OPT_i)) {
|
| 292 |
config.get("upnpiface", iface);
|
296 |
config.get("upnpiface", iface);
|
| 293 |
if (iface.empty()) {
|
297 |
if (iface.empty()) {
|
| 294 |
config.get("upnpip", upnpip);
|
298 |
config.get("upnpip", upnpip);
|
| 295 |
}
|
299 |
}
|
|
... |
|
... |
| 454 |
unsigned int options = UpMpd::upmpdNone;
|
458 |
unsigned int options = UpMpd::upmpdNone;
|
| 455 |
if (ownqueue)
|
459 |
if (ownqueue)
|
| 456 |
options |= UpMpd::upmpdOwnQueue;
|
460 |
options |= UpMpd::upmpdOwnQueue;
|
| 457 |
if (openhome)
|
461 |
if (openhome)
|
| 458 |
options |= UpMpd::upmpdDoOH;
|
462 |
options |= UpMpd::upmpdDoOH;
|
|
|
463 |
if (ohmetapersist)
|
|
|
464 |
options |= UpMpd::upmpdOhMetaPersist;
|
| 459 |
|
465 |
|
| 460 |
// Initialize the UPnP device object.
|
466 |
// Initialize the UPnP device object.
|
| 461 |
UpMpd device(string("uuid:") + UUID, friendlyname,
|
467 |
UpMpd device(string("uuid:") + UUID, friendlyname,
|
| 462 |
xmlfiles, mpdclip, options, mcfn);
|
468 |
xmlfiles, mpdclip, options, mcfn);
|
| 463 |
|
469 |
|