projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do all text -> HTML conversion for subtitles in the same place.
[dcpomatic.git]
/
src
/
lib
/
content.h
diff --git
a/src/lib/content.h
b/src/lib/content.h
index 567cd5c1f78c68901ef13cdbfcf6ff49ed81fc34..550b3cd9cf52770e7a9acb7786a86dac3829130d 100644
(file)
--- a/
src/lib/content.h
+++ b/
src/lib/content.h
@@
-191,7
+191,7
@@
public:
std::string calculate_digest () const;
std::string calculate_digest () const;
- /* C
HANGE_TYPE_PENDING and CHANGE_TYPE_CANCELLED may be emitted from any thread; CHANGE_TYPE_
DONE always from GUI thread */
+ /* C
hangeType::PENDING and ChangeType::CANCELLED may be emitted from any thread; ChangeType::
DONE always from GUI thread */
boost::signals2::signal<void (ChangeType, std::weak_ptr<Content>, int, bool)> Change;
std::shared_ptr<VideoContent> video;
boost::signals2::signal<void (ChangeType, std::weak_ptr<Content>, int, bool)> Change;
std::shared_ptr<VideoContent> video;