Switch to unified view

a/src/httpfs.cxx b/src/httpfs.cxx
...
...
172
// Read and setup our (mostly XML) data to make it available from the
172
// Read and setup our (mostly XML) data to make it available from the
173
// virtual directory
173
// virtual directory
174
bool initHttpFs(unordered_map<string, VDirContent>& files,
174
bool initHttpFs(unordered_map<string, VDirContent>& files,
175
                const string& datadir,
175
                const string& datadir,
176
                const string& UUID, const string& friendlyname, 
176
                const string& UUID, const string& friendlyname, 
177
                bool enableAV, bool enableOH, 
177
                bool enableAV, bool enableOH, bool enableReceiver,
178
                const string& iconpath, const string& presentationhtml)
178
                const string& iconpath, const string& presentationhtml)
179
{
179
{
180
    if (enableOH) {
180
    if (enableOH) {
181
        if (!g_sc2mpd_path.empty()) {
181
        if (enableReceiver) {
182
            ohxmlfilenames.push_back("OHReceiver.xml");
182
            ohxmlfilenames.push_back("OHReceiver.xml");
183
        }
183
        }
184
        xmlfilenames.insert(xmlfilenames.end(), ohxmlfilenames.begin(),
184
        xmlfilenames.insert(xmlfilenames.end(), ohxmlfilenames.begin(),
185
                            ohxmlfilenames.end());
185
                            ohxmlfilenames.end());
186
    }
186
    }
...
...
221
                data = regsub1("@UPNPAV@", data, upnpAVDesc);
221
                data = regsub1("@UPNPAV@", data, upnpAVDesc);
222
            } else {
222
            } else {
223
                data = regsub1("@UPNPAV@", data, "");
223
                data = regsub1("@UPNPAV@", data, "");
224
            }
224
            }
225
            if (enableOH) {
225
            if (enableOH) {
226
                if (!g_sc2mpd_path.empty()) {
226
                if (enableReceiver) {
227
                    ohDesc += ohDescReceive;
227
                    ohDesc += ohDescReceive;
228
                }
228
                }
229
                data = regsub1("@OPENHOME@", data, ohDesc);
229
                data = regsub1("@OPENHOME@", data, ohDesc);
230
            } else {
230
            } else {
231
                data = regsub1("@OPENHOME@", data, "");
231
                data = regsub1("@OPENHOME@", data, "");