summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-02 20:20:32 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-02 20:20:32 +0100
commitae15eeca8588c6928d7671894db98c2e289fa601 (patch)
treed284aff5b975d57c3a69926634f2259a8828583e /src/lib/player.cc
parenta38095fc533b2620e375695024beca5f5540b10d (diff)
Remove approximate size stuff where playback viewer would round
down to nearest 4 pixels to try and speed up scaling. It didn't work as the two estimates of what would be scaled didn't always agree. It could probably be resurrected.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 495d20533..436ae3fe8 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -71,7 +71,6 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
: _film (f)
, _playlist (p)
, _have_valid_pieces (false)
- , _approximate_size (false)
, _ignore_video (false)
{
_playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
@@ -295,12 +294,6 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
return all;
}
-void
-Player::set_approximate_size ()
-{
- _approximate_size = true;
-}
-
shared_ptr<PlayerVideo>
Player::black_player_video_frame (DCPTime time) const
{
@@ -352,7 +345,7 @@ Player::get_video (DCPTime time, bool accurate)
return pvf;
}
- dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size (), _approximate_size ? 4 : 1);
+ dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ());
for (list<ContentVideo>::const_iterator i = content_video.begin(); i != content_video.end(); ++i) {
pvf.push_back (