projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support Dolby-style WAV back surround names when guessing mappings (#2427).
[dcpomatic.git]
/
src
/
lib
/
content_part.h
diff --git
a/src/lib/content_part.h
b/src/lib/content_part.h
index 4f6e9e396bbb70325505cfd7f7cce191ead95e3b..590be311289406c738b153423d5a6ab206a8d9e2 100644
(file)
--- a/
src/lib/content_part.h
+++ b/
src/lib/content_part.h
@@
-1,6
+1,5
@@
-
/*
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-19,16
+18,20
@@
*/
*/
+
#ifndef DCPOMATIC_CONTENT_PART_H
#define DCPOMATIC_CONTENT_PART_H
#ifndef DCPOMATIC_CONTENT_PART_H
#define DCPOMATIC_CONTENT_PART_H
+
+#include "change_signaller.h"
#include "content.h"
#include "content.h"
-#include <boost/weak_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/mutex.hpp>
+
class Content;
class Film;
class Content;
class Film;
+
class ContentPart
{
public:
class ContentPart
{
public:
@@
-41,32
+44,35
@@
protected:
void
maybe_set (T& member, T new_value, int property) const
{
void
maybe_set (T& member, T new_value, int property) const
{
+ ContentChangeSignaller cc (_parent, property);
{
boost::mutex::scoped_lock lm (_mutex);
if (member == new_value) {
{
boost::mutex::scoped_lock lm (_mutex);
if (member == new_value) {
+ cc.abort ();
return;
}
member = new_value;
}
return;
}
member = new_value;
}
- _parent->signal_changed (property);
}
template <class T>
void
maybe_set (boost::optional<T>& member, T new_value, int property) const
{
}
template <class T>
void
maybe_set (boost::optional<T>& member, T new_value, int property) const
{
+ ContentChangeSignaller cc (_parent, property);
{
boost::mutex::scoped_lock lm (_mutex);
if (member && member.get() == new_value) {
{
boost::mutex::scoped_lock lm (_mutex);
if (member && member.get() == new_value) {
+ cc.abort ();
return;
}
member = new_value;
}
return;
}
member = new_value;
}
- _parent->signal_changed (property);
}
Content* _parent;
mutable boost::mutex _mutex;
};
}
Content* _parent;
mutable boost::mutex _mutex;
};
+
#endif
#endif