diff options
| author | Max Kellermann <max@duempel.org> | 2014-08-29 13:07:38 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-08-29 13:20:58 +0200 |
| commit | 75a89c59838ff764b55ba3ce359d59d031446b3d (patch) | |
| tree | 0aa5187ec74f592669133b2fd266c0b40b3a1611 /src/queue | |
| parent | 22899686346088a536be11e0c6a68700d4a237a4 (diff) | |
| download | mpd-75a89c59838ff764b55ba3ce359d59d031446b3d.tar.gz mpd-75a89c59838ff764b55ba3ce359d59d031446b3d.tar.xz mpd-75a89c59838ff764b55ba3ce359d59d031446b3d.zip | |
PlayerThread: use SongTime for elapsed_time
Diffstat (limited to 'src/queue')
| -rw-r--r-- | src/queue/PlaylistControl.cxx | 2 | ||||
| -rw-r--r-- | src/queue/PlaylistState.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/queue/PlaylistControl.cxx b/src/queue/PlaylistControl.cxx index e33386e41..df6b6ed0f 100644 --- a/src/queue/PlaylistControl.cxx +++ b/src/queue/PlaylistControl.cxx @@ -252,7 +252,7 @@ playlist::SeekCurrent(PlayerControl &pc, status.state != PlayerState::PAUSE) return PlaylistResult::NOT_PLAYING; - seek_time += SignedSongTime::FromS(status.elapsed_time); + seek_time += status.elapsed_time; if (seek_time.IsNegative()) seek_time = SignedSongTime::zero(); } diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx index 316a0767f..6ea86166e 100644 --- a/src/queue/PlaylistState.cxx +++ b/src/queue/PlaylistState.cxx @@ -77,8 +77,8 @@ playlist_state_save(BufferedOutputStream &os, const struct playlist &playlist, } os.Format(PLAYLIST_STATE_FILE_CURRENT "%i\n", playlist.queue.OrderToPosition(playlist.current)); - os.Format(PLAYLIST_STATE_FILE_TIME "%i\n", - (int)player_status.elapsed_time); + os.Format(PLAYLIST_STATE_FILE_TIME "%f\n", + player_status.elapsed_time.ToDoubleS()); } else { os.Write(PLAYLIST_STATE_FILE_STATE_STOP "\n"); @@ -150,7 +150,7 @@ playlist_state_restore(const char *line, TextFile &file, while ((line = file.ReadLine()) != nullptr) { if (StringStartsWith(line, PLAYLIST_STATE_FILE_TIME)) { - unsigned seconds = atoi(&(line[strlen(PLAYLIST_STATE_FILE_TIME)])); + double seconds = atof(line + strlen(PLAYLIST_STATE_FILE_TIME)); seek_time = SongTime::FromS(seconds); } else if (StringStartsWith(line, PLAYLIST_STATE_FILE_REPEAT)) { playlist.SetRepeat(pc, @@ -229,7 +229,7 @@ playlist_state_get_hash(const playlist &playlist, return playlist.queue.version ^ (player_status.state != PlayerState::STOP - ? ((int)player_status.elapsed_time << 8) + ? (player_status.elapsed_time.ToS() << 8) : 0) ^ (playlist.current >= 0 ? (playlist.queue.OrderToPosition(playlist.current) << 16) |