Switch to unified view

a/src/upmpd.cxx b/src/upmpd.cxx
...
...
69
    UpMpdAVTransport* avt = new UpMpdAVTransport(this);
69
    UpMpdAVTransport* avt = new UpMpdAVTransport(this);
70
    m_services.push_back(avt);
70
    m_services.push_back(avt);
71
    m_services.push_back(new UpMpdConMan(this));
71
    m_services.push_back(new UpMpdConMan(this));
72
    bool ohReceiver = (m_options & upmpdOhReceiver) != 0; 
72
    bool ohReceiver = (m_options & upmpdOhReceiver) != 0; 
73
    if (m_options & upmpdDoOH) {
73
    if (m_options & upmpdDoOH) {
74
        m_services.push_back(new OHProduct(this, friendlyname, ohReceiver));
74
        OHProduct *ohpr = new OHProduct(this, friendlyname, ohReceiver);
75
        m_services.push_back(ohpr);
75
        m_services.push_back(new OHInfo(this));
76
        m_services.push_back(new OHInfo(this));
76
        m_services.push_back(new OHTime(this));
77
        m_services.push_back(new OHTime(this));
77
        m_services.push_back(new OHVolume(this, rdctl));
78
        m_services.push_back(new OHVolume(this, rdctl));
78
        OHPlaylist *ohp = new OHPlaylist(this, rdctl, opts.ohmetasleep);
79
        OHPlaylist *ohpl = new OHPlaylist(this, rdctl, opts.ohmetasleep);
79
        m_services.push_back(ohp);
80
        m_services.push_back(ohpl);
80
        if (avt)
81
        if (avt)
81
            avt->setOHP(ohp);
82
            avt->setOHP(ohpl);
82
        if (ohReceiver) {
83
        if (ohReceiver) {
83
            m_services.push_back(new OHReceiver(this, ohp, opts.schttpport));
84
            m_services.push_back(new OHReceiver(this, ohpl, ohpr, 
85
                                                opts.schttpport));
84
        }
86
        }
85
    }
87
    }
86
}
88
}
87
89
88
UpMpd::~UpMpd()
90
UpMpd::~UpMpd()