Fix problems with FFmpeg files that have all-zero stream IDs.

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

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 3503306e74060c181d93dfb2abd73e81a851c522..4d8f29723d5f400bddb0b53455b607bf31d4e02d 100644 (file)
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -44,12 +44,18 @@ struct ScreenKDM
        libdcp::KDM kdm;
 };
 
+static string
+kdm_filename (shared_ptr<Film> film, ScreenKDM kdm)
+{
+       return tidy_for_filename (film->name()) + "_" + tidy_for_filename (kdm.screen->cinema->name) + "_" + tidy_for_filename (kdm.screen->name) + ".kdm.xml";
+}
+
 struct CinemaKDMs
 {
        shared_ptr<Cinema> cinema;
        list<ScreenKDM> screen_kdms;
 
-       void make_zip_file (boost::filesystem::path zip_file) const
+       void make_zip_file (shared_ptr<Film> film, boost::filesystem::path zip_file) const
        {
                int error;
                struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, &error);
@@ -71,10 +77,7 @@ struct CinemaKDMs
                                throw StringError ("could not create ZIP source");
                        }
                        
-                       string const name = tidy_for_filename (i->screen->cinema->name) + "_" +
-                               tidy_for_filename (i->screen->name) + ".kdm.xml";
-                       
-                       if (zip_add (zip, name.c_str(), source) == -1) {
+                       if (zip_add (zip, kdm_filename (film, *i).c_str(), source) == -1) {
                                throw StringError ("failed to add KDM to ZIP archive");
                        }
                }
@@ -95,9 +98,15 @@ operator== (ScreenKDM const & a, ScreenKDM const & b)
 }
 
 static list<ScreenKDM>
-make_screen_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::posix_time::ptime from, boost::posix_time::ptime to)
+make_screen_kdms (
+       shared_ptr<Film> film,
+       list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
+       boost::posix_time::ptime from,
+       boost::posix_time::ptime to
+       )
 {
-       list<libdcp::KDM> kdms = film->make_kdms (screens, from, to);
+       list<libdcp::KDM> kdms = film->make_kdms (screens, dcp, from, to);
           
        list<ScreenKDM> screen_kdms;
        
@@ -113,9 +122,15 @@ make_screen_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boos
 }
 
 static list<CinemaKDMs>
-make_cinema_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::posix_time::ptime from, boost::posix_time::ptime to)
+make_cinema_kdms (
+       shared_ptr<Film> film,
+       list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
+       boost::posix_time::ptime from,
+       boost::posix_time::ptime to
+       )
 {
-       list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, from, to);
+       list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, dcp, from, to);
        list<CinemaKDMs> cinema_kdms;
 
        while (!screen_kdms.empty ()) {
@@ -150,43 +165,59 @@ make_cinema_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boos
 
 void
 write_kdm_files (
-       shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::posix_time::ptime from, boost::posix_time::ptime to, boost::filesystem::path directory
+       shared_ptr<Film> film,
+       list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
+       boost::posix_time::ptime from,
+       boost::posix_time::ptime to,
+       boost::filesystem::path directory
        )
 {
-       list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, from, to);
+       list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, dcp, from, to);
 
        /* Write KDMs to the specified directory */
        for (list<ScreenKDM>::iterator i = screen_kdms.begin(); i != screen_kdms.end(); ++i) {
                boost::filesystem::path out = directory;
-               out /= tidy_for_filename (i->screen->cinema->name) + "_" + tidy_for_filename (i->screen->name) + ".kdm.xml";
+               out /= kdm_filename (film, *i);
                i->kdm.as_xml (out);
        }
 }
 
 void
 write_kdm_zip_files (
-       shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::posix_time::ptime from, boost::posix_time::ptime to, boost::filesystem::path directory
+       shared_ptr<Film> film,
+       list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
+       boost::posix_time::ptime from,
+       boost::posix_time::ptime to,
+       boost::filesystem::path directory
        )
 {
-       list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, from, to);
+       list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, dcp, from, to);
 
        for (list<CinemaKDMs>::const_iterator i = cinema_kdms.begin(); i != cinema_kdms.end(); ++i) {
                boost::filesystem::path path = directory;
                path /= tidy_for_filename (i->cinema->name) + ".zip";
-               i->make_zip_file (path);
+               i->make_zip_file (film, path);
        }
 }
 
 void
-email_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::posix_time::ptime from, boost::posix_time::ptime to)
+email_kdms (
+       shared_ptr<Film> film,
+       list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
+       boost::posix_time::ptime from,
+       boost::posix_time::ptime to
+       )
 {
-       list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, from, to);
+       list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, dcp, from, to);
 
        for (list<CinemaKDMs>::const_iterator i = cinema_kdms.begin(); i != cinema_kdms.end(); ++i) {
                
                boost::filesystem::path zip_file = boost::filesystem::temp_directory_path ();
                zip_file /= boost::filesystem::unique_path().string() + ".zip";
-               i->make_zip_file (zip_file);
+               i->make_zip_file (film, zip_file);
                
                /* Send email */
                
@@ -198,7 +229,7 @@ email_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::pos
                boost::algorithm::replace_all (body, "$DCP_NAME", film->dcp_name ());
                
                quickmail_set_body (mail, body.c_str());
-               quickmail_add_attachment_file (mail, zip_file.string().c_str());
+               quickmail_add_attachment_file (mail, zip_file.string().c_str(), "application/zip");
                char const* error = quickmail_send (mail, Config::instance()->mail_server().c_str(), 25, "", "");
                if (error) {
                        quickmail_destroy (mail);