More player debugging for butler video-full states.

[dcpomatic.git] / src / lib / reel_writer.cc

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 7b0233d21e1a407ffe416231905a5bcb60cbbb9a..8ed085dbd18480bf528904406087a73a54466eab 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -23,6 +23,7 @@
 #include "cross.h"
 #include "job.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "digester.h"
 #include "font.h"
 #include "compose.hpp"
@@ -49,11 +50,6 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-#define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_WARNING);
-#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR);
-
 using std::list;
 using std::string;
 using std::cout;
@@ -147,9 +143,9 @@ ReelWriter::write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const
                throw OpenFileError (info_file, errno, read);
        }
        dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET);
-       fwrite (&info.offset, sizeof (info.offset), 1, file);
-       fwrite (&info.size, sizeof (info.size), 1, file);
-       fwrite (info.hash.c_str(), 1, info.hash.size(), file);
+       checked_fwrite (&info.offset, sizeof (info.offset), file, info_file);
+       checked_fwrite (&info.size, sizeof (info.size), file, info_file);
+       checked_fwrite (info.hash.c_str(), info.hash.size(), file, info_file);
        fclose (file);
 }
 
@@ -158,11 +154,11 @@ ReelWriter::read_frame_info (FILE* file, Frame frame, Eyes eyes) const
 {
        dcp::FrameInfo info;
        dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET);
-       fread (&info.offset, sizeof (info.offset), 1, file);
-       fread (&info.size, sizeof (info.size), 1, file);
+       checked_fread (&info.offset, sizeof(info.offset), file, _film->info_file(_period));
+       checked_fread (&info.size, sizeof(info.size), file, _film->info_file(_period));
 
        char hash_buffer[33];
-       fread (hash_buffer, 1, 32, file);
+       checked_fread (hash_buffer, 32, file, _film->info_file(_period));
        hash_buffer[32] = '\0';
        info.hash = hash_buffer;
 
@@ -335,7 +331,7 @@ ReelWriter::finish ()
 }
 
 template <class T>
-void
+shared_ptr<T>
 maybe_add_text (
        shared_ptr<dcp::SubtitleAsset> asset,
        int64_t picture_duration,
@@ -366,9 +362,9 @@ maybe_add_text (
                        liberation_normal = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf";
                }
 
-               /* Add all the fonts to the subtitle content */
+               /* Add the font to the subtitle content */
                BOOST_FOREACH (shared_ptr<Font> j, fonts) {
-                       asset->add_font (j->id(), j->file(FontFiles::NORMAL).get_value_or(liberation_normal));
+                       asset->add_font (j->id(), j->file().get_value_or(liberation_normal));
                }
 
                if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (asset)) {
@@ -419,6 +415,8 @@ maybe_add_text (
                }
                reel->add (reel_asset);
        }
+
+       return reel_asset;
 }
 
 shared_ptr<dcp::Reel>
@@ -507,9 +505,13 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
        }
        reel->add (reel_sound_asset);
 
-       maybe_add_text<dcp::ReelSubtitleAsset> (_subtitle_asset,  reel_picture_asset->duration(), reel, refs, fonts, _film, _period);
+       maybe_add_text<dcp::ReelSubtitleAsset> (_subtitle_asset, reel_picture_asset->duration(), reel, refs, fonts, _film, _period);
        for (map<DCPTextTrack, shared_ptr<dcp::SubtitleAsset> >::const_iterator i = _closed_caption_assets.begin(); i != _closed_caption_assets.end(); ++i) {
-               maybe_add_text<dcp::ReelClosedCaptionAsset> (i->second, reel_picture_asset->duration(), reel, refs, fonts, _film, _period);
+               shared_ptr<dcp::ReelClosedCaptionAsset> a = maybe_add_text<dcp::ReelClosedCaptionAsset> (
+                       i->second, reel_picture_asset->duration(), reel, refs, fonts, _film, _period
+                       );
+               a->set_annotation_text (i->first.name);
+               a->set_language (i->first.language);
        }
 
        return reel;
@@ -564,19 +566,22 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
 
        if (!asset) {
                string lang = _film->subtitle_language ();
-               if (lang.empty ()) {
-                       lang = "Unknown";
-               }
                if (_film->interop ()) {
                        shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset ());
                        s->set_movie_title (_film->name ());
-                       s->set_language (lang);
+                       if (lang.empty()) {
+                               s->set_language ("Unknown");
+                       } else {
+                               s->set_language (lang);
+                       }
                        s->set_reel_number (raw_convert<string> (_reel_index + 1));
                        asset = s;
                } else {
                        shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset ());
                        s->set_content_title_text (_film->name ());
-                       s->set_language (lang);
+                       if (!lang.empty()) {
+                               s->set_language (lang);
+                       }
                        s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1));
                        s->set_reel_number (_reel_index + 1);
                        s->set_time_code_rate (_film->video_frame_rate ());