diff options
| author | Max Kellermann <max@musicpd.org> | 2018-09-22 19:24:34 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-09-22 19:37:02 +0200 |
| commit | 224400074c61f667fb6d0d89d7170a4d04ba39b4 (patch) | |
| tree | b02aae9496bf02c1596d7eb0275ea6ee3134173a /src/queue/PlaylistState.cxx | |
| parent | 863722545f1d892ce4d30b91f6bf25bb08b48a19 (diff) | |
player/CrossFade: use std::chrono::duration
Diffstat (limited to 'src/queue/PlaylistState.cxx')
| -rw-r--r-- | src/queue/PlaylistState.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx index 33e701aca..f4b7bdef6 100644 --- a/src/queue/PlaylistState.cxx +++ b/src/queue/PlaylistState.cxx @@ -92,10 +92,10 @@ playlist_state_save(BufferedOutputStream &os, const struct playlist &playlist, (int)playlist.queue.single); os.Format(PLAYLIST_STATE_FILE_CONSUME "%i\n", playlist.queue.consume); os.Format(PLAYLIST_STATE_FILE_CROSSFADE "%i\n", - (int)pc.GetCrossFade()); + (int)pc.GetCrossFade().count()); os.Format(PLAYLIST_STATE_FILE_MIXRAMPDB "%f\n", pc.GetMixRampDb()); os.Format(PLAYLIST_STATE_FILE_MIXRAMPDELAY "%f\n", - pc.GetMixRampDelay()); + pc.GetMixRampDelay().count()); os.Write(PLAYLIST_STATE_FILE_PLAYLIST_BEGIN "\n"); queue_save(os, playlist.queue); os.Write(PLAYLIST_STATE_FILE_PLAYLIST_END "\n"); @@ -159,14 +159,14 @@ playlist_state_restore(const StateFileConfig &config, } else if ((p = StringAfterPrefix(line, PLAYLIST_STATE_FILE_CONSUME))) { playlist.SetConsume(StringIsEqual(p, "1")); } else if ((p = StringAfterPrefix(line, PLAYLIST_STATE_FILE_CROSSFADE))) { - pc.SetCrossFade(atoi(p)); + pc.SetCrossFade(FloatDuration(atoi(p))); } else if ((p = StringAfterPrefix(line, PLAYLIST_STATE_FILE_MIXRAMPDB))) { pc.SetMixRampDb(ParseFloat(p)); } else if ((p = StringAfterPrefix(line, PLAYLIST_STATE_FILE_MIXRAMPDELAY))) { /* this check discards "nan" which was used prior to MPD 0.18 */ if (IsDigitASCII(*p)) - pc.SetMixRampDelay(ParseFloat(p)); + pc.SetMixRampDelay(FloatDuration(ParseFloat(p))); } else if ((p = StringAfterPrefix(line, PLAYLIST_STATE_FILE_RANDOM))) { random_mode = StringIsEqual(p, "1"); } else if ((p = StringAfterPrefix(line, PLAYLIST_STATE_FILE_CURRENT))) { @@ -232,7 +232,7 @@ playlist_state_get_hash(const playlist &playlist, (playlist.current >= 0 ? (playlist.queue.OrderToPosition(playlist.current) << 16) : 0) ^ - ((int)pc.GetCrossFade() << 20) ^ + ((int)pc.GetCrossFade().count() << 20) ^ (unsigned(player_status.state) << 24) ^ /* note that this takes 2 bits */ ((int)playlist.queue.single << 25) ^ |