From 5dbd022f3abb0ebab57fb67073a07ed60df902a6 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 20 Aug 2018 23:01:14 +0100
Subject: Make ContentChange into a generic ChangeSignaller and use it for Film
 changes, since we setup_pieces() in response to at least one of these and
 hence we must know before it happens so we can suspend the butler and player.

---
 src/lib/ffmpeg_content.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/ffmpeg_content.cc')

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 05b6ae8ea..961c0b0a3 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -251,8 +251,8 @@ FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
 void
 FFmpegContent::examine (shared_ptr<Job> job)
 {
-	ContentChange cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS);
-	ContentChange cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM);
+	ChangeSignaller<Content> cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS);
+	ChangeSignaller<Content> cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM);
 
 	job->set_progress_unknown ();
 
@@ -369,7 +369,7 @@ FFmpegContent::technical_summary () const
 void
 FFmpegContent::set_subtitle_stream (shared_ptr<FFmpegSubtitleStream> s)
 {
-	ContentChange cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
+	ChangeSignaller<Content> cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -410,7 +410,7 @@ FFmpegContent::full_length () const
 void
 FFmpegContent::set_filters (vector<Filter const *> const & filters)
 {
-	ContentChange cc (this, FFmpegContentProperty::FILTERS);
+	ChangeSignaller<Content> cc (this, FFmpegContentProperty::FILTERS);
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -630,7 +630,7 @@ void
 FFmpegContent::signal_subtitle_stream_changed ()
 {
 	/* XXX: this is too late; really it should be before the change */
-	ContentChange cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
+	ChangeSignaller<Content> cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
 }
 
 vector<shared_ptr<FFmpegAudioStream> >
-- 
cgit v1.2.3