|
a/src/mpdcli.cxx |
|
b/src/mpdcli.cxx |
|
... |
|
... |
| 284 |
}
|
284 |
}
|
| 285 |
repeat(st.status.rept);
|
285 |
repeat(st.status.rept);
|
| 286 |
random(st.status.random);
|
286 |
random(st.status.random);
|
| 287 |
single(st.status.single);
|
287 |
single(st.status.single);
|
| 288 |
consume(st.status.consume);
|
288 |
consume(st.status.consume);
|
|
|
289 |
m_cachedvolume = st.status.volume;
|
|
|
290 |
mpd_run_set_volume(M_CONN, st.status.volume);
|
| 289 |
// If songelapsedms is set, we have to start playing to restore it
|
291 |
// If songelapsedms is set, we have to start playing to restore it
|
| 290 |
if (st.status.songelapsedms > 0 ||
|
292 |
if (st.status.songelapsedms > 0 ||
|
| 291 |
st.status.state == MpdStatus::MPDS_PLAY) {
|
293 |
st.status.state == MpdStatus::MPDS_PLAY) {
|
| 292 |
play(st.status.songpos);
|
294 |
play(st.status.songpos);
|
| 293 |
setVolume(st.status.volume);
|
295 |
mpd_run_set_volume(M_CONN, st.status.volume);
|
| 294 |
if (st.status.songelapsedms > 0)
|
296 |
if (st.status.songelapsedms > 0)
|
| 295 |
seek(st.status.songelapsedms/1000);
|
297 |
seek(st.status.songelapsedms/1000);
|
| 296 |
}
|
298 |
}
|
| 297 |
return true;
|
299 |
return true;
|
| 298 |
}
|
300 |
}
|
|
... |
|
... |
| 394 |
|
396 |
|
| 395 |
// ??MPD does not want to set the volume if not active.??
|
397 |
// ??MPD does not want to set the volume if not active.??
|
| 396 |
// This does not seem to be the case with recent MPD versions
|
398 |
// This does not seem to be the case with recent MPD versions
|
| 397 |
if (!(m_stat.state == MpdStatus::MPDS_PLAY) &&
|
399 |
if (!(m_stat.state == MpdStatus::MPDS_PLAY) &&
|
| 398 |
!(m_stat.state == MpdStatus::MPDS_PAUSE)) {
|
400 |
!(m_stat.state == MpdStatus::MPDS_PAUSE)) {
|
| 399 |
LOGINF("MPDCli::setVolume: not active" << endl);
|
401 |
LOGDEB1("MPDCli::setVolume: not active" << endl);
|
| 400 |
return true;
|
|
|
| 401 |
}
|
402 |
}
|
| 402 |
|
403 |
|
| 403 |
LOGDEB("MPDCli::setVolume: vol " << volume << " isMute " << isMute << endl);
|
404 |
LOGDEB("MPDCli::setVolume: vol " << volume << " isMute " << isMute << endl);
|
| 404 |
|
405 |
|
| 405 |
if (isMute) {
|
406 |
if (isMute) {
|