Various fixes to subtitling.

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

diff --git a/src/lib/options.h b/src/lib/options.h
index 45a1768c2df0bb3a7f54777b0c21deab23dfb029..86db35210a377cad8f3a0caa08059214f467751d 100644 (file)
--- a/src/lib/options.h
+++ b/src/lib/options.h
@@ -39,8 +39,10 @@ public:
        Options (std::string f, std::string e, std::string m)
                : padding (0)
                , apply_crop (true)
+               , black_after (0)
                , decode_video_frequency (0)
                , decode_audio (true)
+               , decode_subtitles (false)
                , _frame_out_path (f)
                , _frame_out_extension (e)
                , _multichannel_audio_out_path (m)
@@ -55,11 +57,15 @@ public:
         *  @param t true to return a temporary file path, otherwise a permanent one.
         *  @return The path to write this video frame to.
         */
-       std::string frame_out_path (int f, bool t) const {
+       std::string frame_out_path (int f, bool t, std::string e = "") const {
+               if (e.empty ()) {
+                       e = _frame_out_extension;
+               }
+               
                std::stringstream s;
                s << _frame_out_path << "/";
                s.width (8);
-               s << std::setfill('0') << f << _frame_out_extension;
+               s << std::setfill('0') << f << e;
 
                if (t) {
                        s << ".tmp";
@@ -94,6 +100,7 @@ public:
        int black_after;            ///< first frame for which to output a black frame, rather than the actual video content, or 0 for none
        int decode_video_frequency; ///< skip frames so that this many are decoded in all (or 0) (for generating thumbnails)
        bool decode_audio;          ///< true to decode audio, otherwise false
+       bool decode_subtitles;
 
 private:
        /** Path of the directory to write video frames to */