Switch to unified view

a/src/upmpd.cxx b/src/upmpd.cxx
...
...
66
}
66
}
67
67
68
// Note: if we ever need this to work without cxx11, there is this:
68
// Note: if we ever need this to work without cxx11, there is this:
69
// http://www.tutok.sk/fastgl/callback.html
69
// http://www.tutok.sk/fastgl/callback.html
70
UpMpd::UpMpd(const string& deviceid, const string& friendlyname,
70
UpMpd::UpMpd(const string& deviceid, const string& friendlyname,
71
             ohProductDesc_t& ohProductDesc,
71
             const unordered_map<string, VDirContent>& files,
72
             const unordered_map<string, VDirContent>& files,
72
             MPDCli *mpdcli, Options opts)
73
             MPDCli *mpdcli, Options opts)
73
    : UpnpDevice(deviceid, files), m_mpdcli(mpdcli), m_mpds(0),
74
    : UpnpDevice(deviceid, files), m_mpdcli(mpdcli), m_mpds(0),
74
      m_options(opts.options),
75
      m_options(opts.options),
75
      m_mcachefn(opts.cachefn),
76
      m_mcachefn(opts.cachefn),
...
...
118
        if (m_options& upmpdOhSenderReceiver) {
119
        if (m_options& upmpdOhSenderReceiver) {
119
            // Note: this is not an UPnP service
120
            // Note: this is not an UPnP service
120
            m_sndrcv = new SenderReceiver(this, opts.senderpath,
121
            m_sndrcv = new SenderReceiver(this, opts.senderpath,
121
                                          opts.sendermpdport);
122
                                          opts.sendermpdport);
122
        }
123
        }
123
124
        // Create ohpr last, so that it can ask questions to other
124
        // Create ohpr last, so that it can ask questions to other services
125
        // services or check their existence
126
        m_ohpr = new OHProduct(this, friendlyname);
125
        m_ohpr = new OHProduct(this, ohProductDesc);
127
        m_services.push_back(m_ohpr);
126
        m_services.push_back(m_ohpr);
128
    }
127
    }
129
}
128
}
130
129
131
UpMpd::~UpMpd()
130
UpMpd::~UpMpd()