Make KDM output options checkboxes rather than radios (part of #848).

[dcpomatic.git] / src / wx / dolby_doremi_certificate_panel.cc

diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index 57dc1eef187c2cebfe18d75b951f8325cc005615..cb1de387f61299d122454126991203324b06f3b6 100644 (file)
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2015 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/>.
 
 */
 
@@ -35,6 +36,7 @@ using std::cout;
 using std::list;
 using boost::function;
 using boost::optional;
+using dcp::raw_convert;
 
 DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog)
        : DownloadCertificatePanel (parent, dialog)
@@ -89,7 +91,7 @@ try_ims (list<string>& urls, list<string>& files, string prefix, string serial)
 static void
 try_cat862 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-       int const serial_int = dcp::raw_convert<int> (serial);
+       int const serial_int = raw_convert<int> (serial);
 
        string cat862;
        if (serial_int <= 510999) {
@@ -108,7 +110,7 @@ try_cat862 (list<string>& urls, list<string>& files, string prefix, string seria
 static void
 try_dsp100 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-       int const serial_int = dcp::raw_convert<int> (serial);
+       int const serial_int = raw_convert<int> (serial);
 
        string dsp100;
        if (serial_int <= 999) {
@@ -127,7 +129,7 @@ try_dsp100 (list<string>& urls, list<string>& files, string prefix, string seria
 static void
 try_cat745 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-       int const serial_int = dcp::raw_convert<int> (serial.substr (1));
+       int const serial_int = raw_convert<int> (serial.substr (1));
 
        string cat745;
        if (serial_int <= 999) {
@@ -146,7 +148,7 @@ try_cat745 (list<string>& urls, list<string>& files, string prefix, string seria
 static void
 try_cp850 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-       int const serial_int = dcp::raw_convert<int> (serial.substr (1));
+       int const serial_int = raw_convert<int> (serial.substr (1));
 
        int const lower = serial_int - (serial_int % 1000);
        urls.push_back (String::compose ("%1CP850_CAT1600_F%2-F%3/cert_RMB_SPB_MDE_FMA.Dolby-CP850-F%4.zip", prefix, lower, lower + 999, serial_int));
@@ -204,12 +206,12 @@ DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* messa
        } else {
                message->SetLabel (wxT (""));
 
-               SafeStringStream s;
+               string s;
                BOOST_FOREACH (string e, errors) {
-                       s << e << "\n";
+                       s += e + "\n";
                }
 
-               error_dialog (this, std_to_wx (s.str ()));
+               error_dialog (this, std_to_wx (s));
        }
 }