summaryrefslogtreecommitdiff
path: root/src/wx/dolby_doremi_certificate_panel.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-08-14 23:23:15 +0100
committerCarl Hetherington <cth@carlh.net>2018-08-15 10:57:06 +0100
commitc0d3ccb11d1bc31767a431c72f99e4a84c26b194 (patch)
treea67617ccd7c8091c39be10c960409357620260a3 /src/wx/dolby_doremi_certificate_panel.cc
parent10b6c135f34b9d5168142d0a8c3e06f4d91dae4b (diff)
Move some stuff into DownloadCertificatePanel; add name().
Diffstat (limited to 'src/wx/dolby_doremi_certificate_panel.cc')
-rw-r--r--src/wx/dolby_doremi_certificate_panel.cc20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index 6f59b9147..5a0ce028e 100644
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -50,17 +50,6 @@ DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (wxWindow* parent, Down
layout ();
}
-void
-DolbyDoremiCertificatePanel::download (wxStaticText* message)
-{
- message->SetLabel (_("Downloading certificate"));
-
- /* Hack: without this the SetLabel() above has no visible effect */
- wxMilliSleep (200);
-
- signal_manager->when_idle (boost::bind (&DolbyDoremiCertificatePanel::finish_download, this, wx_to_std (_serial->GetValue ()), message));
-}
-
static void
try_dcp2000 (list<string>& urls, list<string>& files, string prefix, string serial)
{
@@ -156,13 +145,14 @@ try_cp850 (list<string>& urls, list<string>& files, string prefix, string serial
}
void
-DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* message)
+DolbyDoremiCertificatePanel::do_download (wxStaticText* message)
{
/* Try dcp2000, imb and ims prefixes (see mantis #375) */
string const prefix = "ftp://anonymous@ftp.cinema.dolby.com/Certificates/";
list<string> urls;
list<string> files;
+ string const serial = wx_to_std (_serial->GetValue());
bool starts_with_digit = false;
optional<char> starting_char;
@@ -220,3 +210,9 @@ DolbyDoremiCertificatePanel::ready_to_download () const
{
return !_serial->IsEmpty ();
}
+
+wxString
+DolbyDoremiCertificatePanel::name () const
+{
+ return _("Dolby / Doremi");
+}