Store subtitle language(s) in Film, and allow setup of those

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

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 19b874f8a498bcd87ce9efdee1ae0d624cecf2bb..a927770a5858e55698dc83a86df8787f2860475f 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -60,9 +60,14 @@ using std::string;
 using std::cout;
 using std::exception;
 using std::map;
+using std::vector;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using dcp::ArrayData;
 using dcp::Data;
 using dcp::raw_convert;
 using namespace dcpomatic;
@@ -155,7 +160,7 @@ ReelWriter::ReelWriter (
 
        if (_film->audio_channels ()) {
                _sound_asset.reset (
-                       new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels (), standard)
+                       new dcp::SoundAsset (dcp::Fraction(_film->video_frame_rate(), 1), _film->audio_frame_rate(), _film->audio_channels(), _film->audio_language(), standard)
                        );
 
                _sound_asset->set_metadata (mxf_metadata());
@@ -166,11 +171,17 @@ ReelWriter::ReelWriter (
 
                DCPOMATIC_ASSERT (_film->directory());
 
+               vector<dcp::Channel> active;
+               BOOST_FOREACH (int i, _film->mapped_audio_channels()) {
+                       active.push_back (static_cast<dcp::Channel>(i));
+               }
+
                /* Write the sound asset into the film directory so that we leave the creation
                   of the DCP directory until the last minute.
                */
                _sound_asset_writer = _sound_asset->start_write (
                        _film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
+                       active,
                        _film->contains_atmos_content()
                        );
        }
@@ -242,7 +253,7 @@ ReelWriter::check_existing_picture_asset (boost::filesystem::path asset)
 
        try {
                info_file = _film->info_file_handle (_period, true);
-       } catch (OpenFileError) {
+       } catch (OpenFileError &) {
                LOG_GENERAL_NC ("Could not open film info file");
                fclose (asset_file);
                return 0;
@@ -279,14 +290,14 @@ ReelWriter::check_existing_picture_asset (boost::filesystem::path asset)
 }
 
 void
-ReelWriter::write (optional<Data> encoded, Frame frame, Eyes eyes)
+ReelWriter::write (shared_ptr<const Data> encoded, Frame frame, Eyes eyes)
 {
        if (!_picture_asset_writer) {
                /* We're not writing any data */
                return;
        }
 
-       dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data().get (), encoded->size());
+       dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data(), encoded->size());
        write_frame_info (frame, eyes, fin);
        _last_written[eyes] = encoded;
 }
@@ -328,7 +339,7 @@ ReelWriter::repeat_write (Frame frame, Eyes eyes)
        }
 
        dcp::FrameInfo fin = _picture_asset_writer->write (
-               _last_written[eyes]->data().get(),
+               _last_written[eyes]->data(),
                _last_written[eyes]->size()
                );
        write_frame_info (frame, eyes, fin);
@@ -439,24 +450,9 @@ maybe_add_text (
        shared_ptr<T> reel_asset;
 
        if (asset) {
-               boost::filesystem::path liberation_normal;
-               try {
-                       liberation_normal = shared_path() / "LiberationSans-Regular.ttf";
-                       if (!boost::filesystem::exists (liberation_normal)) {
-                               /* Hack for unit tests */
-                               liberation_normal = shared_path() / "fonts" / "LiberationSans-Regular.ttf";
-                       }
-               } catch (boost::filesystem::filesystem_error& e) {
-
-               }
-
-               if (!boost::filesystem::exists(liberation_normal)) {
-                       liberation_normal = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf";
-               }
-
                /* Add the font to the subtitle content */
                BOOST_FOREACH (shared_ptr<Font> j, fonts) {
-                       asset->add_font (j->id(), j->file().get_value_or(liberation_normal));
+                       asset->add_font (j->id(), j->file().get_value_or(default_font_file()));
                }
 
                if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (asset)) {
@@ -610,9 +606,10 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
                a->set_language (i->first.language);
        }
 
-       map<dcp::Marker, DCPTime> markers = _film->markers ();
-       map<dcp::Marker, DCPTime> reel_markers;
-       for (map<dcp::Marker, DCPTime>::const_iterator i = markers.begin(); i != markers.end(); ++i) {
+       Film::Markers markers = _film->markers ();
+       _film->add_ffoc_lfoc (markers);
+       Film::Markers reel_markers;
+       for (Film::Markers::const_iterator i = markers.begin(); i != markers.end(); ++i) {
                if (_period.contains(i->second)) {
                        reel_markers[i->first] = i->second;
                }
@@ -688,12 +685,12 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
        }
 
        if (!asset) {
-               string lang = _film->subtitle_language ();
+               vector<dcp::LanguageTag> lang = _film->subtitle_languages ();
                if (_film->interop ()) {
                        shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset ());
                        s->set_movie_title (_film->name ());
                        if (type == TEXT_OPEN_SUBTITLE) {
-                               s->set_language (lang.empty() ? "Unknown" : lang);
+                               s->set_language (lang.empty() ? "Unknown" : lang.front().to_string());
                        } else {
                                s->set_language (track->language);
                        }
@@ -704,7 +701,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
                        s->set_content_title_text (_film->name ());
                        s->set_metadata (mxf_metadata());
                        if (type == TEXT_OPEN_SUBTITLE && !lang.empty()) {
-                               s->set_language (lang);
+                               s->set_language (lang.front().to_string());
                        } else {
                                s->set_language (track->language);
                        }
@@ -767,15 +764,15 @@ ReelWriter::existing_picture_frame_ok (FILE* asset_file, shared_ptr<InfoFileHand
 
        /* Read the data from the asset and hash it */
        dcpomatic_fseek (asset_file, info.offset, SEEK_SET);
-       Data data (info.size);
-       size_t const read = fread (data.data().get(), 1, data.size(), asset_file);
+       ArrayData data (info.size);
+       size_t const read = fread (data.data(), 1, data.size(), asset_file);
        LOG_GENERAL ("Read %1 bytes of asset data; wanted %2", read, info.size);
        if (read != static_cast<size_t> (data.size ())) {
                LOG_GENERAL ("Existing frame %1 is incomplete", frame);
                ok = false;
        } else {
                Digester digester;
-               digester.add (data.data().get(), data.size());
+               digester.add (data.data(), data.size());
                LOG_GENERAL ("Hash %1 vs %2", digester.get(), info.hash);
                if (digester.get() != info.hash) {
                        LOG_GENERAL ("Existing frame %1 failed hash check", frame);