From 86a866d5f3f5bf2fec67d1c813524479c6727eab Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 19 Nov 2019 17:07:35 +0100
Subject: Clean up access to stuff from Film.

---
 src/lib/playlist.cc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 9e96c693a..73a3214d3 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -113,6 +113,9 @@ Playlist::content_change (weak_ptr<const Film> weak_film, ChangeType type, weak_
 			if (changed) {
 				OrderChanged ();
 			}
+
+			/* The length might have changed, and that's good enough for this signal */
+			LengthChange ();
 		}
 	}
 
@@ -281,6 +284,8 @@ Playlist::add (shared_ptr<const Film> film, shared_ptr<Content> c)
 	}
 
 	Change (CHANGE_TYPE_DONE);
+
+	LengthChange ();
 }
 
 void
@@ -312,6 +317,8 @@ Playlist::remove (shared_ptr<Content> c)
 	}
 
 	/* This won't change order, so it does not need a sort */
+
+	LengthChange ();
 }
 
 void
@@ -334,9 +341,11 @@ Playlist::remove (ContentList c)
 		}
 	}
 
+	Change (CHANGE_TYPE_DONE);
+
 	/* This won't change order, so it does not need a sort */
 
-	Change (CHANGE_TYPE_DONE);
+	LengthChange ();
 }
 
 class FrameRateCandidate
-- 
cgit v1.2.3


From 73713b742a2be95ea736d2d3d889f5b535a0f0f1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 19 Nov 2019 17:13:25 +0100
Subject: Naming tweak.

---
 src/lib/film.cc     | 2 +-
 src/lib/playlist.cc | 2 +-
 src/lib/playlist.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index aa71834a1..90b18ea70 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -167,7 +167,7 @@ Film::Film (optional<boost::filesystem::path> dir)
 	set_isdcf_date_today ();
 
 	_playlist_change_connection = _playlist->Change.connect (bind (&Film::playlist_change, this, _1));
-	_playlist_order_changed_connection = _playlist->OrderChanged.connect (bind (&Film::playlist_order_changed, this));
+	_playlist_order_changed_connection = _playlist->OrderChange.connect (bind (&Film::playlist_order_changed, this));
 	_playlist_content_change_connection = _playlist->ContentChange.connect (bind (&Film::playlist_content_change, this, _1, _2, _3, _4));
 	_playlist_length_change_connection = _playlist->LengthChange.connect (bind(&Film::playlist_length_change, this));
 
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 73a3214d3..48053bbf4 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -111,7 +111,7 @@ Playlist::content_change (weak_ptr<const Film> weak_film, ChangeType type, weak_
 			}
 
 			if (changed) {
-				OrderChanged ();
+				OrderChange ();
 			}
 
 			/* The length might have changed, and that's good enough for this signal */
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index b6e23b4a5..dc984aacf 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -77,7 +77,7 @@ public:
 
 	/** Emitted when content has been added to or removed from the playlist; implies OrderChanged */
 	mutable boost::signals2::signal<void (ChangeType)> Change;
-	mutable boost::signals2::signal<void ()> OrderChanged;
+	mutable boost::signals2::signal<void ()> OrderChange;
 	/** Emitted when the length might have changed; may sometimes be emitted when it has not */
 	mutable boost::signals2::signal<void ()> LengthChange;
 
-- 
cgit v1.2.3