Various libdcp API changes.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index f0ddd14a8a941810e06dc8c8905fd39b2e975fb4..a8e05b751c267ea6eb3800a4829abdd674d49aaa 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -48,6 +48,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
 #include <unistd.h>
 #include <stdexcept>
 #include <iostream>
@@ -55,7 +56,7 @@
 #include <fstream>
 #include <cstdlib>
 #include <iomanip>
-
+#include <set>
 
 #include "i18n.h"
 
@@ -70,6 +71,7 @@ using std::make_pair;
 using std::endl;
 using std::cout;
 using std::list;
+using std::set;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
@@ -150,7 +152,7 @@ Film::Film (boost::filesystem::path dir, bool log)
                }
        }
 
-       set_directory (result);
+       set_directory (result.make_preferred ());
        if (log) {
                _log.reset (new FileLog (file ("log")));
        } else {
@@ -163,7 +165,7 @@ Film::Film (boost::filesystem::path dir, bool log)
 string
 Film::video_identifier () const
 {
-       assert (container ());
+       DCPOMATIC_ASSERT (container ());
 
        SafeStringStream s;
        s.imbue (std::locale::classic ());
@@ -270,11 +272,6 @@ Film::make_dcp ()
                throw BadSettingError (_("name"), _("cannot contain slashes"));
        }
 
-       /* It seems to make sense to auto-save metadata here, since the make DCP may last
-          a long time, and crashes/power failures are moderately likely.
-        */
-       write_metadata ();
-
        LOG_GENERAL ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary());
 
        {
@@ -1073,7 +1070,7 @@ Film::full_frame () const
                return dcp::Size (4096, 2160);
        }
 
-       assert (false);
+       DCPOMATIC_ASSERT (false);
        return dcp::Size ();
 }
 
@@ -1148,3 +1145,28 @@ Film::should_be_enough_disk_space (double& required, double& available) const
        available = double (s.available) / 1073741824.0f;
        return (available - required) > 1;
 }
+
+string
+Film::subtitle_language () const
+{
+       set<string> languages;
+       
+       ContentList cl = content ();
+       BOOST_FOREACH (shared_ptr<Content>& c, cl) {
+               shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c);
+               if (sc) {
+                       languages.insert (sc->subtitle_language ());
+               }
+       }
+
+       string all;
+       BOOST_FOREACH (string s, languages) {
+               if (!all.empty ()) {
+                       all += "/" + s;
+               } else {
+                       all += s;
+               }
+       }
+
+       return all;
+}