summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-04-30 15:36:05 +0100
committerCarl Hetherington <cth@carlh.net>2015-04-30 15:36:05 +0100
commit6a804ace532c13b2095972cd48d422e2c9fa0b70 (patch)
tree8757bc276e783c97150f1ec3f1f56e75e5bcba53 /src
parentea4b476dd21e99bbc292f7fc6db4e4ba578489c0 (diff)
Add a very simple test for writing subtitles.
Diffstat (limited to 'src')
-rw-r--r--src/object.h4
-rw-r--r--src/subtitle_string.cc1
-rw-r--r--src/subtitle_string.h2
3 files changed, 6 insertions, 1 deletions
diff --git a/src/object.h b/src/object.h
index 82598c58..70cbe999 100644
--- a/src/object.h
+++ b/src/object.h
@@ -27,6 +27,8 @@
#include <boost/noncopyable.hpp>
#include <string>
+class write_subtitle_test;
+
namespace dcp {
/** @class Object
@@ -45,6 +47,8 @@ public:
}
protected:
+ friend class ::write_subtitle_test;
+
/** ID */
std::string _id;
};
diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc
index a8dfd555..15131873 100644
--- a/src/subtitle_string.cc
+++ b/src/subtitle_string.cc
@@ -25,6 +25,7 @@ using std::ostream;
using boost::optional;
using namespace dcp;
+/** @param v_position Vertical position as a fraction of the screen height (between 0 and 1) from v_align */
SubtitleString::SubtitleString (
optional<string> font,
bool italic,
diff --git a/src/subtitle_string.h b/src/subtitle_string.h
index 0f066164..966ae8cb 100644
--- a/src/subtitle_string.h
+++ b/src/subtitle_string.h
@@ -135,7 +135,7 @@ private:
int _size;
Time _in;
Time _out;
- /** Vertical position as a proportion of the screen height from the top
+ /** Vertical position as a proportion of the screen height from the _v_align
* (between 0 and 1)
*/
float _v_position;