projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: more variable renames.
[dcpomatic.git]
/
src
/
lib
/
content_part.h
diff --git
a/src/lib/content_part.h
b/src/lib/content_part.h
index eb96b13710e210593ca47c8911225362d5bfb084..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,17
+18,20
@@
*/
*/
+
#ifndef DCPOMATIC_CONTENT_PART_H
#define DCPOMATIC_CONTENT_PART_H
#ifndef DCPOMATIC_CONTENT_PART_H
#define DCPOMATIC_CONTENT_PART_H
-#include "content.h"
+
#include "change_signaller.h"
#include "change_signaller.h"
-#include
<boost/weak_ptr.hpp>
+#include
"content.h"
#include <boost/thread/mutex.hpp>
#include <boost/thread/mutex.hpp>
+
class Content;
class Film;
class Content;
class Film;
+
class ContentPart
{
public:
class ContentPart
{
public:
@@
-42,7
+44,7
@@
protected:
void
maybe_set (T& member, T new_value, int property) const
{
void
maybe_set (T& member, T new_value, int property) const
{
- C
hangeSignaller<Content>
cc (_parent, property);
+ C
ontentChangeSignaller
cc (_parent, property);
{
boost::mutex::scoped_lock lm (_mutex);
if (member == new_value) {
{
boost::mutex::scoped_lock lm (_mutex);
if (member == new_value) {
@@
-57,7
+59,7
@@
protected:
void
maybe_set (boost::optional<T>& member, T new_value, int property) const
{
void
maybe_set (boost::optional<T>& member, T new_value, int property) const
{
- C
hangeSignaller<Content>
cc (_parent, property);
+ C
ontentChangeSignaller
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) {
@@
-72,4
+74,5
@@
protected:
mutable boost::mutex _mutex;
};
mutable boost::mutex _mutex;
};
+
#endif
#endif