Commit 910dba37 authored by Jean-Francois Dockes's avatar Jean-Francois Dockes
Browse files

Fix volume restore when switching between PL and PL-to-Songcast sources

parent 38b342d3
......@@ -391,13 +391,10 @@ bool MPDCli::restoreState(const MpdState& st)
single_i(st.status.single);
consume_i(st.status.consume);
#if 0
// Do not restore the volume level, we want to keep whatever the user set
m_cachedvolume = st.status.volume;
//no need to set volume if it is controlled external
if (!m_externalvolumecontrol)
mpd_run_set_volume(m_conn, st.status.volume);
#endif
if (st.status.state == MpdStatus::MPDS_PAUSE ||
st.status.state == MpdStatus::MPDS_PLAY) {
......
......@@ -219,13 +219,14 @@ bool SenderReceiver::start(const string& script, int seekms)
copyMpd(m->dev->getmpdcli(), m->mpd, seekms);
if (m->scalestream) {
m->mpd->forceInternalVControl();
// Stream is scaled, set the main mixer to 100 to allow
// full scale. Actually this appears to have no effect
// (appear automagically for some other cause).
m->dev->getmpdcli()->setVolume(100);
}
m->origmpd = m->dev->getmpdcli();
m->dev->setmpdcli(m->mpd);
if (m->scalestream) {
// Stream is scaled, set the main mixer to 100 to allow
// full scale. Else we are compositing the two volumes.
m->origmpd->setVolume(100);
}
} else {
m->origmpd = 0;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment