|
a/upmpd/renderctl.cxx |
|
b/upmpd/renderctl.cxx |
|
... |
|
... |
| 86 |
const MpdStatus &mpds = m_dev->getMpdStatus();
|
86 |
const MpdStatus &mpds = m_dev->getMpdStatus();
|
| 87 |
|
87 |
|
| 88 |
int volume = m_desiredvolume >= 0 ? m_desiredvolume : mpds.volume;
|
88 |
int volume = m_desiredvolume >= 0 ? m_desiredvolume : mpds.volume;
|
| 89 |
if (volume < 0)
|
89 |
if (volume < 0)
|
| 90 |
volume = 0;
|
90 |
volume = 0;
|
| 91 |
status["Volume"] = SoapArgs::i2s(volume);
|
91 |
status["Volume"] = SoapHelp::i2s(volume);
|
| 92 |
//status["VolumeDB"] = SoapArgs::i2s(percentodbvalue(volume));
|
92 |
//status["VolumeDB"] = SoapHelp::i2s(percentodbvalue(volume));
|
| 93 |
status["Mute"] = volume == 0 ? "1" : "0";
|
93 |
status["Mute"] = volume == 0 ? "1" : "0";
|
| 94 |
return true;
|
94 |
return true;
|
| 95 |
}
|
95 |
}
|
| 96 |
|
96 |
|
| 97 |
bool UpMpdRenderCtl::getEventData(bool all, std::vector<std::string>& names,
|
97 |
bool UpMpdRenderCtl::getEventData(bool all, std::vector<std::string>& names,
|
|
... |
|
... |
| 124 |
changefound = true;
|
124 |
changefound = true;
|
| 125 |
|
125 |
|
| 126 |
chgdata += "<";
|
126 |
chgdata += "<";
|
| 127 |
chgdata += it->first;
|
127 |
chgdata += it->first;
|
| 128 |
chgdata += " val=\"";
|
128 |
chgdata += " val=\"";
|
| 129 |
chgdata += SoapArgs::xmlQuote(it->second);
|
129 |
chgdata += SoapHelp::xmlQuote(it->second);
|
| 130 |
chgdata += "\"/>\n";
|
130 |
chgdata += "\"/>\n";
|
| 131 |
}
|
131 |
}
|
| 132 |
chgdata += "</InstanceID>\n</Event>\n";
|
132 |
chgdata += "</InstanceID>\n</Event>\n";
|
| 133 |
|
133 |
|
| 134 |
if (!changefound) {
|
134 |
if (!changefound) {
|
|
... |
|
... |
| 286 |
|
286 |
|
| 287 |
int volume = getvolume_i();
|
287 |
int volume = getvolume_i();
|
| 288 |
if (isDb) {
|
288 |
if (isDb) {
|
| 289 |
volume = percentodbvalue(volume);
|
289 |
volume = percentodbvalue(volume);
|
| 290 |
}
|
290 |
}
|
| 291 |
data.addarg("CurrentVolume", SoapArgs::i2s(volume));
|
291 |
data.addarg("CurrentVolume", SoapHelp::i2s(volume));
|
| 292 |
return UPNP_E_SUCCESS;
|
292 |
return UPNP_E_SUCCESS;
|
| 293 |
}
|
293 |
}
|
| 294 |
|
294 |
|
| 295 |
int UpMpdRenderCtl::listPresets(const SoapArgs& sc, SoapData& data)
|
295 |
int UpMpdRenderCtl::listPresets(const SoapArgs& sc, SoapData& data)
|
| 296 |
{
|
296 |
{
|