summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-20 14:27:00 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-20 14:27:00 +0100
commitf2caad0df1a451e2aff68dfd37277faa72116e12 (patch)
tree3ebf116a6cb847dd099ad113c80b3249d99fa264 /src/lib/player.cc
parent21ce34c2cd04a2e7e133ff693b84c054182f4f91 (diff)
Various time-related fixes; fix daft hang on decodes.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 9cc166204..e38b12ec3 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
@@ -80,8 +82,6 @@ Player::pass ()
_have_valid_decoders = true;
}
- cout << "-> Player::pass\n";
-
/* Here we are just finding the active decoder with the earliest last emission time, then
calling pass on it. If there is no decoder, we skip our position on until there is.
Hence this method will cause video and audio to be emitted, and it is up to the
@@ -114,11 +114,9 @@ Player::pass ()
} else if (next_wait < TIME_MAX) {
_position += next_wait;
} else {
- cout << "<- Player::pass\n";
return true;
}
- cout << "<- Player::pass\n";
return false;
}