Switch to unified view

a/src/ohproduct.cxx b/src/ohproduct.cxx
...
...
265
    } else if (m_dev->m_ohrcv && !curtp.compare("Receiver") &&
265
    } else if (m_dev->m_ohrcv && !curtp.compare("Receiver") &&
266
               !curnm.compare("Receiver")) {
266
               !curnm.compare("Receiver")) {
267
        m_dev->m_ohrcv->setActive(false);
267
        m_dev->m_ohrcv->setActive(false);
268
    } else if (m_dev->m_ohrd && !curtp.compare("Radio") &&
268
    } else if (m_dev->m_ohrd && !curtp.compare("Radio") &&
269
               !curnm.compare("Radio")) {
269
               !curnm.compare("Radio")) {
270
        m_dev->setRadio(false);
270
        m_dev->m_ohrd->setActive(false);
271
        m_dev->m_ohrd->setActive(false);
271
    } else if (m_dev->m_sndrcv && m_dev->m_ohpl &&
272
    } else if (m_dev->m_sndrcv && m_dev->m_ohpl &&
272
               !curtp.compare("Playlist") &&
273
               !curtp.compare("Playlist") &&
273
               !curnm.compare(SndRcvPLName)) {
274
               !curnm.compare(SndRcvPLName)) {
274
        m_dev->m_ohpl->setActive(false);
275
        m_dev->m_ohpl->setActive(false);
275
        m_dev->m_sndrcv->stop();
276
        m_dev->m_sndrcv->stop();
276
    } else if (m_dev->m_sndrcv && m_dev->m_ohrd &&
277
    } else if (m_dev->m_sndrcv && m_dev->m_ohrd &&
277
               !curtp.compare("Radio") &&
278
               !curtp.compare("Radio") &&
278
               !curnm.compare(SndRcvRDName)) {
279
               !curnm.compare(SndRcvRDName)) {
280
        m_dev->setRadio(false);
279
        m_dev->m_ohrd->setActive(false);
281
        m_dev->m_ohrd->setActive(false);
280
        m_dev->m_sndrcv->stop();
282
        m_dev->m_sndrcv->stop();
281
    } else {
283
    } else {
282
        // External inputs managed by scripts Analog/Digital/Hdmi etc.
284
        // External inputs managed by scripts Analog/Digital/Hdmi etc.
283
        m_dev->m_sndrcv->stop();
285
        m_dev->m_sndrcv->stop();
...
...
288
    if (m_dev->m_ohpl && !newnm.compare("Playlist")) {
290
    if (m_dev->m_ohpl && !newnm.compare("Playlist")) {
289
        m_dev->m_ohpl->setActive(true);
291
        m_dev->m_ohpl->setActive(true);
290
    } else if (m_dev->m_ohrcv && !newnm.compare("Receiver")) {
292
    } else if (m_dev->m_ohrcv && !newnm.compare("Receiver")) {
291
        m_dev->m_ohrcv->setActive(true);
293
        m_dev->m_ohrcv->setActive(true);
292
    } else if (m_dev->m_ohrd && !newnm.compare("Radio")) {
294
    } else if (m_dev->m_ohrd && !newnm.compare("Radio")) {
295
        m_dev->setRadio(true);
293
        m_dev->m_ohrd->setActive(true);
296
        m_dev->m_ohrd->setActive(true);
294
    } else if (m_dev->m_ohpl && m_dev->m_sndrcv &&
297
    } else if (m_dev->m_ohpl && m_dev->m_sndrcv &&
295
               !newnm.compare(SndRcvPLName)) {
298
               !newnm.compare(SndRcvPLName)) {
296
        m_dev->m_sndrcv->start(string(), 0 /*savedms*/);
299
        m_dev->m_sndrcv->start(string(), 0 /*savedms*/);
297
        m_dev->m_ohpl->setActive(true);
300
        m_dev->m_ohpl->setActive(true);