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
    if (!g_configfilename.empty()) {
153
        args.push_back("-c");
154
        args.push_back(g_configfilename);
155
    }
156
        
152
    LOGDEB("OHReceiver::play: executing sc2mpd" << endl);
157
    LOGDEB("OHReceiver::play: executing " << g_sc2mpd_path << endl);
153
    ok = m_cmd->startExec("sc2mpd", args, false, true) >= 0;
158
    ok = m_cmd->startExec(g_sc2mpd_path, args, false, true) >= 0;
154
    if (!ok) {
159
    if (!ok) {
155
        LOGERR("OHReceiver::play: executing sc2mpd failed" <<endl);
160
        LOGERR("OHReceiver::play: executing " << g_sc2mpd_path << " failed" 
161
               << endl);
156
        goto out;
162
        goto out;
157
    } else {
163
    } else {
158
        LOGDEB("OHReceiver::play: sc2mpd pid "<< m_cmd->getChildPid()<< endl);
164
        LOGDEB("OHReceiver::play: sc2mpd pid "<< m_cmd->getChildPid()<< endl);
159
    }
165
    }
160
    // Wait for sc2mpd to signal ready, then play
166
    // Wait for sc2mpd to signal ready, then play