summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-28 16:20:23 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-28 16:20:23 +0100
commit95e289ac980fb0775b17e40e377c5f6e09908a1f (patch)
tree6bde6b72f667b28b7e7c0c2c1dedb652f2caf5bd /src/lib
parent1cc240c747868e3cfca66b61de0f08ccb158b869 (diff)
Some missing signal disconnections.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/player.cc6
-rw-r--r--src/lib/player.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index bf5bc6489..33a5bbfef 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -100,9 +100,9 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
, _audio_merger (f->audio_channels(), bind (&Film::time_to_audio_frames, f.get(), _1), bind (&Film::audio_frames_to_time, f.get(), _1))
, _last_emit_was_black (false)
{
- _playlist->Changed.connect (bind (&Player::playlist_changed, this));
- _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
- _film->Changed.connect (bind (&Player::film_changed, this, _1));
+ _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
+ _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
+ _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
set_video_container_size (_film->container()->size (_film->full_frame ()));
}
diff --git a/src/lib/player.h b/src/lib/player.h
index cb5643753..85d750f6f 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -136,6 +136,10 @@ private:
#endif
bool _last_emit_was_black;
+
+ boost::signals2::scoped_connection _playlist_changed_connection;
+ boost::signals2::scoped_connection _playlist_content_changed_connection;
+ boost::signals2::scoped_connection _film_changed_connection;
};
#endif