summaryrefslogtreecommitdiff
path: root/src/wx
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/wx
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/wx')
-rw-r--r--src/wx/film_viewer.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a1cc5dfc4..311ec734c 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -147,7 +147,6 @@ FilmViewer::set_film (shared_ptr<Film> f)
_film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
- _player->set_approximate_size ();
_player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
calculate_sizes ();
@@ -320,13 +319,6 @@ FilmViewer::calculate_sizes ()
_out_size.width = max (64, _out_size.width);
_out_size.height = max (64, _out_size.height);
- /* The player will round its image size down to the next lowest 4 pixels
- to speed up its scale, so do similar here to avoid black borders
- around things. This is a bit of a hack.
- */
- _out_size.width &= ~3;
- _out_size.height &= ~3;
-
_player->set_video_container_size (_out_size);
}