Switch to unified view

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
        if (!g_lumincompat) {
77
            m_services.push_back(new OHCredentials(this, opts.cachedir));
76
            m_services.push_back(new OHCredentials(this, opts.cachedir));
78
        }
77
        }
79
        m_ohpl = new OHPlaylist(this, opts.ohmetasleep);
78
        m_ohpl = new OHPlaylist(this, opts.ohmetasleep);
80
        m_services.push_back(m_ohpl);
79
        m_services.push_back(m_ohpl);
81
        if (m_avt)
80
        if (m_avt)
...
...
116
        // hidden. The 2 are actually unrelated, but both are needed
115
        // hidden. The 2 are actually unrelated, but both are needed
117
        // for Lumin 1.10 to discover upmpdcli (without the credentials
116
        // for Lumin 1.10 to discover upmpdcli (without the credentials
118
        // service of course). I could not find what Lumin does not
117
        // service of course). I could not find what Lumin does not
119
        // like when either Product:2 or ohcreds is enabled. Maybe
118
        // like when either Product:2 or ohcreds is enabled. Maybe
120
        // this will go away at some point.
119
        // this will go away at some point.
121
        m_ohpr = new OHProduct(this, ohProductDesc, lumincompat ? 1 : 2);
120
        m_ohpr = new OHProduct(this, ohProductDesc, g_lumincompat ? 1 : 2);
122
        m_services.push_back(m_ohpr);
121
        m_services.push_back(m_ohpr);
123
    }
122
    }
124
}
123
}
125
124
126
UpMpd::~UpMpd()
125
UpMpd::~UpMpd()