More fixes for errors / crashes / misbehaviour with content changes

and the butler.

Here we signal both before and after a change in content.  Before,
the player disables itself so that any pass()/seek() will be no-ops.
After, the player rebuilds its pieces and the butler re-seeks to
get back to where it was before the change.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/lib/content_part.h b/src/lib/content_part.h
index 4f6e9e396..58833655f 100644
--- a/src/lib/content_part.h
+++ b/src/lib/content_part.h
@@ -23,6 +23,7 @@
 #define DCPOMATIC_CONTENT_PART_H
 
 #include "content.h"
+#include "content_change.h"
 #include <boost/weak_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 
@@ -41,28 +42,30 @@ protected:
 	void
 	maybe_set (T& member, T new_value, int property) const
 	{
+		ContentChange cc (_parent, property);
 		{
 			boost::mutex::scoped_lock lm (_mutex);
 			if (member == new_value) {
+				cc.abort ();
 				return;
 			}
 			member = new_value;
 		}
-		_parent->signal_changed (property);
 	}
 
 	template <class T>
 	void
 	maybe_set (boost::optional<T>& member, T new_value, int property) const
 	{
+		ContentChange cc (_parent, property);
 		{
 			boost::mutex::scoped_lock lm (_mutex);
 			if (member && member.get() == new_value) {
+				cc.abort ();
 				return;
 			}
 			member = new_value;
 		}
-		_parent->signal_changed (property);
 	}
 
 	Content* _parent;