Switch to unified view

a/src/main.cxx b/src/main.cxx
...
...
120
        "",                                         // url
120
        "",                                         // url
121
        ""                                          // imageUri
121
        ""                                          // imageUri
122
    }
122
    }
123
};
123
};
124
124
125
// This is global
125
// The following protocolinfo data is read from a configuration file
126
// (in httpfs.cxx with the rest of the xml data), global and logically
127
// const:
126
string g_protocolInfo;
128
string g_protocolInfo;
129
unordered_set<string> g_supportedFormats;
127
130
128
// Static for cleanup in sig handler.
131
// Static for cleanup in sig handler.
129
static UpnpDevice *dev;
132
static UpnpDevice *dev;
130
133
131
string g_datadir(DATADIR "/");
134
string g_datadir(DATADIR "/");
...
...
275
            enableOH = atoi(value.c_str()) != 0;
278
            enableOH = atoi(value.c_str()) != 0;
276
        }
279
        }
277
        if (g_config->get("upnpav", value)) {
280
        if (g_config->get("upnpav", value)) {
278
            enableAV = atoi(value.c_str()) != 0;
281
            enableAV = atoi(value.c_str()) != 0;
279
        }
282
        }
283
284
        if (g_config->get("checkcontentformat", value)) {
285
            // If option is specified and 0, set nocheck flag
286
            if (atoi(value.c_str()) == 0) {
287
                opts.options |= UpMpd::upmpdNoContentFormatCheck;
288
            }
289
        }
290
        
280
        if (g_config->get("ohmetapersist", value)) {
291
        if (g_config->get("ohmetapersist", value)) {
281
            ohmetapersist = atoi(value.c_str()) != 0;
292
            ohmetapersist = atoi(value.c_str()) != 0;
282
        }
293
        }
283
        if (g_config->get("pkgdatadir", g_datadir)) {
294
        if (g_config->get("pkgdatadir", g_datadir)) {
284
            path_catslash(g_datadir);
295
            path_catslash(g_datadir);