Switch to unified view

a/src/ohreceiver.cxx b/src/ohreceiver.cxx
...
...
147
        m_cmd->zapChild();
147
        m_cmd->zapChild();
148
    m_cmd = shared_ptr<ExecCmd>(new ExecCmd());
148
    m_cmd = shared_ptr<ExecCmd>(new ExecCmd());
149
    vector<string> args;
149
    vector<string> args;
150
    args.push_back("-u");
150
    args.push_back("-u");
151
    args.push_back(m_uri);
151
    args.push_back(m_uri);
152
    LOGDEB("OHReceiver::play: executing scmpdcli" << endl);
152
    LOGDEB("OHReceiver::play: executing sc2mpd" << endl);
153
    ok = m_cmd->startExec("scmpdcli", args, false, true) >= 0;
153
    ok = m_cmd->startExec("sc2mpd", args, false, true) >= 0;
154
    if (!ok) {
154
    if (!ok) {
155
        LOGERR("OHReceiver::play: executing scmpdcli failed" <<endl);
155
        LOGERR("OHReceiver::play: executing sc2mpd failed" <<endl);
156
        goto out;
156
        goto out;
157
    } else {
157
    } else {
158
        LOGDEB("OHReceiver::play: scmpdcli pid "<< m_cmd->getChildPid()<< endl);
158
        LOGDEB("OHReceiver::play: sc2mpd pid "<< m_cmd->getChildPid()<< endl);
159
    }
159
    }
160
    // Wait for scmpdcli to signal ready, then play
160
    // Wait for sc2mpd to signal ready, then play
161
    m_cmd->getline(line);
161
    m_cmd->getline(line);
162
    LOGDEB("OHReceiver: scmpdcli sent: " << line);
162
    LOGDEB("OHReceiver: sc2mpd sent: " << line);
163
163
164
    // And insert the appropriate uri in the mpd playlist
164
    // And insert the appropriate uri in the mpd playlist
165
    if (!m_pl->urlMap(urlmap)) {
165
    if (!m_pl->urlMap(urlmap)) {
166
        LOGERR("OHReceiver::play: urlMap() failed" <<endl);
166
        LOGERR("OHReceiver::play: urlMap() failed" <<endl);
167
        goto out;
167
        goto out;