oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

player/Thread: move code to CheckCrossFade()

This commit is contained in:
Max Kellermann 2021-12-03 23:28:46 +01:00
parent 2518612b1b
commit b78c64376f
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/player/Thread.cxx
View File

@ -328,6 +328,8 @@ private:
*/ */
bool OpenOutput() noexcept; bool OpenOutput() noexcept;
void CheckCrossFade() noexcept;
/** /**
* Obtains the next chunk from the music pipe, optionally applies * Obtains the next chunk from the music pipe, optionally applies
* cross-fading, and sends it to all audio outputs. * cross-fading, and sends it to all audio outputs.
@ -783,6 +785,46 @@ Player::ProcessCommand(std::unique_lock<Mutex> &lock) noexcept
return true; return true;
} }
inline void
Player::CheckCrossFade() noexcept
{
if (xfade_state != CrossFadeState::UNKNOWN)
/* already decided */
return;
if (pc.border_pause) {
/* no cross-fading if MPD is going to pause at the end
of the current song */
xfade_state = CrossFadeState::UNKNOWN;
return;
}
if (!IsDecoderAtNextSong() || dc.IsStarting())
/* we need information about the next song before we
can decide */
return;
/* enable cross fading in this song? if yes, calculate how
many chunks will be required for it */
cross_fade_chunks =
pc.cross_fade.Calculate(pc.total_time,
dc.total_time,
dc.replay_gain_db,
dc.replay_gain_prev_db,
dc.GetMixRampStart(),
dc.GetMixRampPreviousEnd(),
dc.out_audio_format,
play_audio_format,
buffer.GetSize() -
buffer_before_play);
if (cross_fade_chunks > 0)
xfade_state = CrossFadeState::ENABLED;
else
/* cross fading is disabled or the
next song is too short */
xfade_state = CrossFadeState::DISABLED;
}
inline void inline void
PlayerControl::LockUpdateSongTag(DetachedSong &song, PlayerControl::LockUpdateSongTag(DetachedSong &song,
const Tag &new_tag) noexcept const Tag &new_tag) noexcept
@ -1039,33 +1081,7 @@ Player::Run() noexcept
false); false);
} }
if (/* no cross-fading if MPD is going to pause at the CheckCrossFade();
end of the current song */
!pc.border_pause &&
IsDecoderAtNextSong() &&
xfade_state == CrossFadeState::UNKNOWN &&
!dc.IsStarting()) {
/* enable cross fading in this song? if yes,
calculate how many chunks will be required
for it */
cross_fade_chunks =
pc.cross_fade.Calculate(pc.total_time,
dc.total_time,
dc.replay_gain_db,
dc.replay_gain_prev_db,
dc.GetMixRampStart(),
dc.GetMixRampPreviousEnd(),
dc.out_audio_format,
play_audio_format,
buffer.GetSize() -
buffer_before_play);
if (cross_fade_chunks > 0)
xfade_state = CrossFadeState::ENABLED;
else
/* cross fading is disabled or the
next song is too short */
xfade_state = CrossFadeState::DISABLED;
}
if (paused) { if (paused) {
if (pc.command == PlayerCommand::NONE) if (pc.command == PlayerCommand::NONE)