summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-11-26 17:52:51 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commitb29571d1fbf3bcd9f5cbd9c20f1d5f8211876e94 (patch)
tree4ef4c05977b846b18d9959c0c410da3da47d1078 /src/wx
parent8b0cdac1ce437a46815b04ff3261febd1269a71c (diff)
Various bits; preview video seems to work.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/film_viewer.cc5
-rw-r--r--src/wx/film_viewer.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index beab8f321..bddd3abba 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -178,9 +178,10 @@ FilmViewer::set_film (shared_ptr<Film> film)
_player->set_ignore_audio ();
_player->set_play_referenced ();
- _film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
+ _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
- _player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
+ _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
+ _player->Video.connect (boost::bind (&FilmViewer::video, this, _1));
calculate_sizes ();
refresh ();
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 563178ac3..399441f18 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -112,6 +112,4 @@ private:
* can get the same one that we got last time.
*/
bool _last_seek_accurate;
- boost::signals2::scoped_connection _film_connection;
- boost::signals2::scoped_connection _player_connection;
};