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

PlayerThread: use SongTime for elapsed_time

Browse Source
This commit is contained in:
Max Kellermann
2014-08-29 13:07:38 +02:00
parent 2289968634
commit 75a89c5983
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/queue/PlaylistControl.cxx
View File

@@ -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();
}

8
src/queue/PlaylistState.cxx
View File

@@ -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)