Cleanup: rename some methods in FilePickerCtrl and use boost::filesystem::path more.

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

diff --git a/src/wx/export_video_file_dialog.cc b/src/wx/export_video_file_dialog.cc
index 208481225d09a5642ef169f882af06dc382587c1..8b01282b659cdbd848b6efa0b8ead841dc18b54b 100644 (file)
--- a/src/wx/export_video_file_dialog.cc
+++ b/src/wx/export_video_file_dialog.cc
@@ -97,7 +97,7 @@ ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)
           so disable its check and the caller will have to do it themselves.
        */
        _file = new FilePickerCtrl (this, _("Select output file"), format_filters[0], false, false);
-       _file->SetPath (_initial_name);
+       _file->set_path(_initial_name);
        add (_file);
 
        for (int i = 0; i < FORMATS; ++i) {
@@ -167,8 +167,8 @@ ExportVideoFileDialog::format_changed ()
 {
        auto const selection = _format->GetSelection();
        DCPOMATIC_ASSERT (selection >= 0 && selection < FORMATS);
-       _file->SetWildcard (format_filters[selection]);
-       _file->SetPath (_initial_name);
+       _file->set_wildcard(format_filters[selection]);
+       _file->set_path(_initial_name);
        _x264_crf->Enable (formats[selection] == ExportFormat::H264_AAC);
        for (int i = 0; i < 2; ++i) {
                _x264_crf_label[i]->Enable(formats[selection] == ExportFormat::H264_AAC);
@@ -180,7 +180,7 @@ ExportVideoFileDialog::format_changed ()
 boost::filesystem::path
 ExportVideoFileDialog::path () const
 {
-       wxFileName fn (_file->GetPath());
+       wxFileName fn(std_to_wx(_file->path().string()));
        fn.SetExt (format_extensions[_format->GetSelection()]);
        return wx_to_std (fn.GetFullPath());
 }