Merge.

[dcpomatic.git] / src / wx / dolby_certificate_dialog.h

diff --git a/src/wx/dolby_certificate_dialog.h b/src/wx/dolby_certificate_dialog.h
index 7c8e6c525351211fd7f6019c147e8ef82390bc92..e9bbffda0ccadb8105d669dd6c56397478f16dba 100644 (file)
--- a/src/wx/dolby_certificate_dialog.h
+++ b/src/wx/dolby_certificate_dialog.h
@@ -25,14 +25,19 @@ class DolbyCertificateDialog : public DownloadCertificateDialog
 public:
        DolbyCertificateDialog (wxWindow *, boost::function<void (boost::filesystem::path)>);
 
-       void setup ();
-
 private:
        void download ();
+       void finish_download ();
+       void setup_countries ();
+       void finish_setup_countries ();
        void country_selected ();
+       void finish_country_selected ();
        void cinema_selected ();
-       std::list<std::string> ftp_ls (std::string) const;
+       void finish_cinema_selected ();
+       void serial_selected ();
+       std::list<std::string> get_dir (std::string) const;
 
        wxChoice* _country;
        wxChoice* _cinema;
+       wxChoice* _serial;
 };