Simplify NameFormat stuff.

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

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index af0f0a3dd09aaa265bd124e64d6e48d4a1aaabc5..129e64aeee5b7e88de8bcccd512cdfa8b98c796d 100644 (file)
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -1,26 +1,26 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "screen_kdm.h"
 #include "cinema.h"
 #include "screen.h"
-#include "film.h"
 #include "util.h"
 #include <boost/foreach.hpp>
 
@@ -34,34 +34,14 @@ operator== (ScreenKDM const & a, ScreenKDM const & b)
        return a.screen == b.screen && a.kdm == b.kdm;
 }
 
-string
-ScreenKDM::filename (shared_ptr<const Film> film) const
-{
-       return tidy_for_filename (film->name()) + "_" + tidy_for_filename (screen->cinema->name) + "_" + tidy_for_filename (screen->name) + ".kdm.xml";
-}
-
-list<ScreenKDM>
-ScreenKDM::collect (list<shared_ptr<Screen> > screens, list<dcp::EncryptedKDM> kdms)
-{
-       list<ScreenKDM> screen_kdms;
-
-       list<shared_ptr<Screen> >::iterator i = screens.begin ();
-       list<dcp::EncryptedKDM>::iterator j = kdms.begin ();
-       while (i != screens.end() && j != kdms.end ()) {
-               screen_kdms.push_back (ScreenKDM (*i, *j));
-               ++i;
-               ++j;
-       }
-
-       return screen_kdms;
-}
-
 void
-ScreenKDM::write_files (shared_ptr<const Film> film, list<ScreenKDM> screen_kdms, boost::filesystem::path directory)
+ScreenKDM::write_files (list<ScreenKDM> screen_kdms, boost::filesystem::path directory, dcp::NameFormat name_format, dcp::NameFormat::Map name_values)
 {
        /* Write KDMs to the specified directory */
        BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
-               boost::filesystem::path out = directory / i.filename(film);
+               name_values['c'] = i.screen->cinema->name;
+               name_values['s'] = i.screen->name;
+               boost::filesystem::path out = directory / (name_format.get(name_values) + ".xml");
                i.kdm.as_xml (out);
        }
 }