projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to tidy up channel mapping a bit.
[dcpomatic.git]
/
src
/
lib
/
subtitle.h
diff --git
a/src/lib/subtitle.h
b/src/lib/subtitle.h
index de8f025964fc468683573813f8948ad6715d81c7..38ba4e70e0170fabd5e2a71ee2ad9eadceb5a2ee 100644
(file)
--- a/
src/lib/subtitle.h
+++ b/
src/lib/subtitle.h
@@
-17,6
+17,10
@@
*/
*/
+/** @file src/subtitle.h
+ * @brief Representations of subtitles.
+ */
+
#include <list>
#include <boost/shared_ptr.hpp>
#include "util.h"
#include <list>
#include <boost/shared_ptr.hpp>
#include "util.h"
@@
-24,6
+28,7
@@
struct AVSubtitle;
class Image;
struct AVSubtitle;
class Image;
+/** A subtitle, consisting of an image and a position */
class Subtitle
{
public:
class Subtitle
{
public:
@@
-41,19
+46,20
@@
public:
return _image;
}
return _image;
}
- Rect
angle
area () const;
+ Rect area () const;
private:
Position _position;
boost::shared_ptr<Image> _image;
};
private:
Position _position;
boost::shared_ptr<Image> _image;
};
-Rect
angle
+Rect
subtitle_transformed_area (
float target_x_scale, float target_y_scale,
subtitle_transformed_area (
float target_x_scale, float target_y_scale,
- Rect
angle
sub_area, int subtitle_offset, float subtitle_scale
+ Rect sub_area, int subtitle_offset, float subtitle_scale
);
);
-
+
+/** A Subtitle class with details of the time over which it should be shown */
class TimedSubtitle
{
public:
class TimedSubtitle
{
public:
@@
-66,8
+72,8
@@
public:
}
private:
}
private:
+ /** the subtitle */
boost::shared_ptr<Subtitle> _subtitle;
boost::shared_ptr<Subtitle> _subtitle;
-
/** display from time in seconds from the start of the film */
double _from;
/** display to time in seconds from the start of the film */
/** display from time in seconds from the start of the film */
double _from;
/** display to time in seconds from the start of the film */