summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2014-04-18 19:57:12 +0200
committerLars-Dominik Braun <lars@6xq.net>2014-04-18 19:57:12 +0200
commit274324aab47c51d6c07ace5e219d196077c3e5d1 (patch)
tree8288f27d2302a3836865c5b818eaad1f20aa46b5 /src
parentcc229aa68f13ecce55cfbc1cc032cc4d67c85b08 (diff)
downloadpianobar-windows-274324aab47c51d6c07ace5e219d196077c3e5d1.tar.gz
pianobar-windows-274324aab47c51d6c07ace5e219d196077c3e5d1.tar.bz2
pianobar-windows-274324aab47c51d6c07ace5e219d196077c3e5d1.zip
player: Fix state-machine
Song timer was shown without song playing.
Diffstat (limited to 'src')
-rw-r--r--src/main.c2
-rw-r--r--src/player.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index eeb4279..2e9203c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -388,7 +388,7 @@ static void BarMainLoop (BarApp_t *app) {
BarMainHandleUserInput (app);
/* show time */
- if (app->player.mode < PLAYER_FINISHED) {
+ if (app->player.mode == PLAYER_PLAYING) {
BarMainPrintTime (app);
}
}
diff --git a/src/player.c b/src/player.c
index 34573d7..b8d0719 100644
--- a/src/player.c
+++ b/src/player.c
@@ -242,6 +242,7 @@ void *BarPlayerThread (void *data) {
player->songPlayed = 0;
player->songDuration = av_q2d (st->time_base) * (double) st->duration;
+ player->mode = PLAYER_PLAYING;
while (av_read_frame (fctx, &pkt) >= 0) {
AVPacket pkt_orig = pkt;