|
|
|
@ -1286,7 +1286,7 @@ Fader::run()
|
|
|
|
|
elapsedUs += stepSizeUs;
|
|
|
|
|
|
|
|
|
|
// get volume (amarok main * equalizer preamp)
|
|
|
|
|
float vol = Engine::Base::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp;
|
|
|
|
|
float vol = XineEngine::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp;
|
|
|
|
|
|
|
|
|
|
// compute the mix factor as the percentage of time spent since fade begun
|
|
|
|
|
float mix = (elapsedUs / 1000.0) / (float)m_fadeLength;
|
|
|
|
|