Merge.

[dcpomatic.git] / src / lib / subtitle_content.h

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index 39a3f32ebb4b6c715ce0cc7b5d09afa4d4954c8d..e74164f774b4cb97c671737101e64901fb1d4c63 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -84,10 +84,14 @@ public:
                return _subtitle_y_scale;
        }
 
-       boost::optional<std::string> subtitle_language () const {
+       std::string subtitle_language () const {
                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;