projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3cb5a4c2064d4cf4d8cbdca75a84615a6c56fb7c from master; use j2c_uuid and pcm_uuid for...
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle_content.h
diff --git
a/src/lib/dcp_subtitle_content.h
b/src/lib/dcp_subtitle_content.h
index 5794b59516e6767f586cc5d0a33663b2ed9ef376..05af716906a31b05f96de284c4cbf1df5e62b9b7 100644
(file)
--- a/
src/lib/dcp_subtitle_content.h
+++ b/
src/lib/dcp_subtitle_content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2015
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-18,8
+18,9
@@
*/
#include "subtitle_content.h"
*/
#include "subtitle_content.h"
+#include "dcp_subtitle.h"
-class DCPSubtitleContent : public SubtitleContent
+class DCPSubtitleContent : public SubtitleContent
, public DCPSubtitle
{
public:
DCPSubtitleContent (boost::shared_ptr<const Film>, boost::filesystem::path);
{
public:
DCPSubtitleContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@
-29,7
+30,6
@@
public:
void examine (boost::shared_ptr<Job>);
std::string summary () const;
std::string technical_summary () const;
void examine (boost::shared_ptr<Job>);
std::string summary () const;
std::string technical_summary () const;
- std::string information () const;
void as_xml (xmlpp::Node *) const;
DCPTime full_length () const;
void as_xml (xmlpp::Node *) const;
DCPTime full_length () const;