projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More player debugging for butler video-full states.
[dcpomatic.git]
/
src
/
lib
/
text_content.h
diff --git
a/src/lib/text_content.h
b/src/lib/text_content.h
index 5aacc7ecf7182f38ebcd7685d308ab93cab79b86..83860dff54fb6f733356a30de07833b282a7d336 100644
(file)
--- a/
src/lib/text_content.h
+++ b/
src/lib/text_content.h
@@
-22,6
+22,7
@@
#define DCPOMATIC_CAPTION_CONTENT_H
#include "content_part.h"
#define DCPOMATIC_CAPTION_CONTENT_H
#include "content_part.h"
+#include "dcp_text_track.h"
#include <libcxml/cxml.h>
#include <dcp/types.h>
#include <boost/signals2.hpp>
#include <libcxml/cxml.h>
#include <dcp/types.h>
#include <boost/signals2.hpp>
@@
-47,6
+48,7
@@
public:
static int const FADE_OUT;
static int const OUTLINE_WIDTH;
static int const TYPE;
static int const FADE_OUT;
static int const OUTLINE_WIDTH;
static int const TYPE;
+ static int const DCP_TRACK;
};
/** @class TextContent
};
/** @class TextContent
@@
-58,7
+60,7
@@
public:
class TextContent : public ContentPart
{
public:
class TextContent : public ContentPart
{
public:
- TextContent (Content* parent, TextType original_type);
+ TextContent (Content* parent, TextType
type, TextType
original_type);
TextContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
TextContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
@@
-87,6
+89,8
@@
public:
void set_outline_width (int);
void unset_fade_out ();
void set_type (TextType type);
void set_outline_width (int);
void unset_fade_out ();
void set_type (TextType type);
+ void set_dcp_track (DCPTextTrack track);
+ void unset_dcp_track ();
bool use () const {
boost::mutex::scoped_lock lm (_mutex);
bool use () const {
boost::mutex::scoped_lock lm (_mutex);
@@
-173,6
+177,11
@@
public:
return _original_type;
}
return _original_type;
}
+ boost::optional<DCPTextTrack> dcp_track () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _dcp_track;
+ }
+
static std::list<boost::shared_ptr<TextContent> > from_xml (Content* parent, cxml::ConstNodePtr, int version);
protected:
static std::list<boost::shared_ptr<TextContent> > from_xml (Content* parent, cxml::ConstNodePtr, int version);
protected:
@@
-217,6
+226,8
@@
private:
TextType _type;
/** the original type of these captions in their content */
TextType _original_type;
TextType _type;
/** the original type of these captions in their content */
TextType _original_type;
+ /** the track of closed captions that this content should be put in, or empty to put in the default (only) track */
+ boost::optional<DCPTextTrack> _dcp_track;
};
#endif
};
#endif