Allow configuration of KDM filename format.

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

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 7eff1b719bf5eadc74c7967aa86ffd561b239f36..4834657edbf592064d4c764643c92ae02f0e02c0 100644 (file)
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013 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/>.
 
 */
 
@@ -31,18 +32,16 @@ using boost::shared_ptr;
 
 /** @param log Log to write to, or 0 */
 SendKDMEmailJob::SendKDMEmailJob (
-       string film_name,
-       string cpl_name,
-       boost::posix_time::ptime from,
-       boost::posix_time::ptime to,
        list<CinemaKDMs> cinema_kdms,
+       KDMNameFormat name_format,
+       NameFormat::Map name_values,
+       string cpl_name,
        shared_ptr<Log> log
        )
        : Job (shared_ptr<Film>())
-       , _film_name (film_name)
+       , _name_format (name_format)
+       , _name_values (name_values)
        , _cpl_name (cpl_name)
-       , _from (from)
-       , _to (to)
        , _cinema_kdms (cinema_kdms)
        , _log (log)
 {
@@ -52,11 +51,12 @@ SendKDMEmailJob::SendKDMEmailJob (
 string
 SendKDMEmailJob::name () const
 {
-       if (_film_name.empty ()) {
+       NameFormat::Map::const_iterator i = _name_values.find ("film_name");
+       if (i == _name_values.end() || i->second.empty ()) {
                return _("Email KDMs");
        }
 
-       return String::compose (_("Email KDMs for %1"), _film_name);
+       return String::compose (_("Email KDMs for %1"), i->second);
 }
 
 string
@@ -69,7 +69,7 @@ void
 SendKDMEmailJob::run ()
 {
        set_progress_unknown ();
-       CinemaKDMs::email (_film_name, _cpl_name, _cinema_kdms, _from, _to, shared_from_this(), _log);
+       CinemaKDMs::email (_cinema_kdms, _name_format, _name_values, _cpl_name, _log);
        set_progress (1);
        set_state (FINISHED_OK);
 }