Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

2 files changed, 81 insertions, 0 deletions

diff --git a/src/lib/content_change.cc b/src/lib/content_change.cc
new file mode 100644
index 000000000..c286f80eb
--- /dev/null
+++ b/src/lib/content_change.cc
@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "content_change.h"
+#include "content.h"
+
+ContentChange::ContentChange (Content* c, int p)
+	: _content (c)
+	, _property (p)
+	, _done (true)
+{
+	_content->MayChange ();
+}
+
+
+ContentChange::~ContentChange ()
+{
+	if (_done) {
+		_content->signal_changed (_property);
+	} else {
+		_content->NotChanged ();
+	}
+}
+
+void
+ContentChange::abort ()
+{
+	_done = false;
+}
diff --git a/src/lib/content_change.h b/src/lib/content_change.h
new file mode 100644
index 000000000..67012a7a5
--- /dev/null
+++ b/src/lib/content_change.h
@@ -0,0 +1,35 @@
+/*
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+class Content;
+
+class ContentChange
+{
+public:
+	ContentChange (Content* c, int p);
+	~ContentChange ();
+
+	void abort ();
+
+private:
+	Content* _content;
+	int _property;
+	bool _done;
+};