player: removed player_control.fileTime

This variable is superfluous, it is only used to copy its value to player_control.totalTime. Since the original source of this value (song->tag->time) will still be available at this point, we can safely remove fileTime.

player: removed player_control.fileTime
42409a35 · Max Kellermann · dd7711d8 · 42409a35 · 42409a35 · 42409a35
Commit 42409a35 authored Oct 11, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

player_control.c src/player_control.c +0 -1

player_control.h src/player_control.h +0 -1

player_thread.c src/player_thread.c +2 -1

No files found.
--- a/src/player_control.c
+++ b/src/player_control.c
@@ -50,7 +50,6 @@ set_current_song(struct song *song)
 	assert(song != NULL);
 	assert(song->url != NULL);

-	pc.fileTime = song->tag ? song->tag->time : 0;
 	pc.next_song = song;
 }


--- a/src/player_control.h
+++ b/src/player_control.h
@@ -90,7 +90,6 @@ struct player_control {
 	struct audio_format audio_format;
 	volatile float totalTime;
 	volatile float elapsedTime;
-	volatile float fileTime;
 	struct song *volatile next_song;
 	struct song *errored_song;
 	volatile enum player_queue_state queueState;

--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -60,7 +60,8 @@ static int waitOnDecode(int *decodeWaitedOn)
 		return -1;
 	}

-	pc.totalTime = pc.fileTime;
+	pc.totalTime = pc.next_song->tag != NULL
+		? pc.next_song->tag->time : 0;
 	pc.bitRate = 0;
 	audio_format_clear(&pc.audio_format);
 	*decodeWaitedOn = 1;