|
a/src/main.cxx |
|
b/src/main.cxx |
|
... |
|
... |
| 37 |
#include "execmd.h"
|
37 |
#include "execmd.h"
|
| 38 |
#include "conftree.hxx"
|
38 |
#include "conftree.hxx"
|
| 39 |
#include "mpdcli.hxx"
|
39 |
#include "mpdcli.hxx"
|
| 40 |
#include "upmpd.hxx"
|
40 |
#include "upmpd.hxx"
|
| 41 |
#include "httpfs.hxx"
|
41 |
#include "httpfs.hxx"
|
|
|
42 |
#include "upmpdutils.hxx"
|
| 42 |
|
43 |
|
| 43 |
using namespace std;
|
44 |
using namespace std;
|
| 44 |
using namespace UPnPP;
|
45 |
using namespace UPnPP;
|
| 45 |
|
46 |
|
| 46 |
static char *thisprog;
|
47 |
static char *thisprog;
|
|
... |
|
... |
| 274 |
enableAV = atoi(value.c_str()) != 0;
|
275 |
enableAV = atoi(value.c_str()) != 0;
|
| 275 |
}
|
276 |
}
|
| 276 |
if (g_config->get("ohmetapersist", value)) {
|
277 |
if (g_config->get("ohmetapersist", value)) {
|
| 277 |
ohmetapersist = atoi(value.c_str()) != 0;
|
278 |
ohmetapersist = atoi(value.c_str()) != 0;
|
| 278 |
}
|
279 |
}
|
|
|
280 |
if (g_config->get("pkgdatadir", g_datadir)) {
|
|
|
281 |
path_catslash(g_datadir);
|
|
|
282 |
iconpath = path_cat(g_datadir, "icon.png");
|
|
|
283 |
presentationhtml = path_cat(g_datadir, "presentation.html");
|
|
|
284 |
}
|
| 279 |
g_config->get("iconpath", iconpath);
|
285 |
g_config->get("iconpath", iconpath);
|
| 280 |
g_config->get("presentationhtml", presentationhtml);
|
286 |
g_config->get("presentationhtml", presentationhtml);
|
| 281 |
g_config->get("cachedir", cachedir);
|
287 |
g_config->get("cachedir", cachedir);
|
| 282 |
g_config->get("pidfile", pidfilename);
|
288 |
g_config->get("pidfile", pidfilename);
|
| 283 |
if (!(op_flags & OPT_i)) {
|
289 |
if (!(op_flags & OPT_i)) {
|