projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix confusion over when DCPDecoder::_next means wrt reels.
[dcpomatic.git]
/
src
/
lib
/
subtitle_content.h
diff --git
a/src/lib/subtitle_content.h
b/src/lib/subtitle_content.h
index 4cbef657ab5b18da060024ee4bd13f608e53552e..e9017e40da4d51d500a4704235cf160ee6e13b4f 100644
(file)
--- a/
src/lib/subtitle_content.h
+++ b/
src/lib/subtitle_content.h
@@
-22,6
+22,8
@@
#include "content.h"
#include "content.h"
+class Font;
+
class SubtitleContentProperty
{
public:
class SubtitleContentProperty
{
public:
@@
-30,7
+32,10
@@
public:
static int const SUBTITLE_X_SCALE;
static int const SUBTITLE_Y_SCALE;
static int const USE_SUBTITLES;
static int const SUBTITLE_X_SCALE;
static int const SUBTITLE_Y_SCALE;
static int const USE_SUBTITLES;
+ static int const BURN_SUBTITLES;
static int const SUBTITLE_LANGUAGE;
static int const SUBTITLE_LANGUAGE;
+ static int const FONTS;
+ static int const SUBTITLE_VIDEO_FRAME_RATE;
};
/** @class SubtitleContent
};
/** @class SubtitleContent
@@
-50,9
+55,15
@@
public:
void as_xml (xmlpp::Node *) const;
std::string identifier () const;
void as_xml (xmlpp::Node *) const;
std::string identifier () const;
- virtual bool has_subtitles () const = 0;
+ bool has_subtitles () const;
+ virtual bool has_text_subtitles () const = 0;
+ virtual bool has_image_subtitles () const = 0;
+ virtual double subtitle_video_frame_rate () const = 0;
+
+ void add_font (boost::shared_ptr<Font> font);
void set_use_subtitles (bool);
void set_use_subtitles (bool);
+ void set_burn_subtitles (bool);
void set_subtitle_x_offset (double);
void set_subtitle_y_offset (double);
void set_subtitle_x_scale (double);
void set_subtitle_x_offset (double);
void set_subtitle_y_offset (double);
void set_subtitle_x_scale (double);
@@
-64,6
+75,11
@@
public:
return _use_subtitles;
}
return _use_subtitles;
}
+ bool burn_subtitles () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _burn_subtitles;
+ }
+
double subtitle_x_offset () const {
boost::mutex::scoped_lock lm (_mutex);
return _subtitle_x_offset;
double subtitle_x_offset () const {
boost::mutex::scoped_lock lm (_mutex);
return _subtitle_x_offset;
@@
-84,18
+100,27
@@
public:
return _subtitle_y_scale;
}
return _subtitle_y_scale;
}
+ std::list<boost::shared_ptr<Font> > fonts () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _fonts;
+ }
+
std::string subtitle_language () const {
std::string subtitle_language () const {
+ boost::mutex::scoped_lock lm (_mutex);
return _subtitle_language;
}
protected:
/** subtitle language (e.g. "German") or empty if it is not known */
std::string _subtitle_language;
return _subtitle_language;
}
protected:
/** subtitle language (e.g. "German") or empty if it is not known */
std::string _subtitle_language;
-
+
private:
friend struct ffmpeg_pts_offset_test;
private:
friend struct ffmpeg_pts_offset_test;
+ void font_changed ();
+ void connect_to_fonts ();
bool _use_subtitles;
bool _use_subtitles;
+ bool _burn_subtitles;
/** x offset for placing subtitles, as a proportion of the container width;
* +ve is further right, -ve is further left.
*/
/** x offset for placing subtitles, as a proportion of the container width;
* +ve is further right, -ve is further left.
*/
@@
-108,6
+133,8
@@
private:
double _subtitle_x_scale;
/** y scale factor to apply to subtitles */
double _subtitle_y_scale;
double _subtitle_x_scale;
/** y scale factor to apply to subtitles */
double _subtitle_y_scale;
+ std::list<boost::shared_ptr<Font> > _fonts;
+ std::list<boost::signals2::connection> _font_connections;
};
#endif
};
#endif