Emit no audio from DCPs if none is mapped

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

diff --git a/src/wx/file_dialog.cc b/src/wx/file_dialog.cc
index bed8b4e0d2c32e1c8776026cc47c7f6c17fd2d7f..9f547f85a5648890155dd17f7be97efa85ca839b 100644 (file)
--- a/src/wx/file_dialog.cc
+++ b/src/wx/file_dialog.cc
@@ -27,30 +27,43 @@
 #include <vector>
 
 
+using std::string;
 using std::vector;
 using boost::optional;
 
 
+wxString initial_path(
+       std::string initial_path_key,
+       optional<boost::filesystem::path> override_path
+       )
+{
+       if (override_path) {
+               return std_to_wx(override_path->string());
+       }
+
+       return std_to_wx(Config::instance()->initial_path(initial_path_key).get_value_or(home_directory()).string());
+}
+
+
 FileDialog::FileDialog(
        wxWindow* parent,
        wxString title,
        wxString allowed,
        long style,
        std::string initial_path_key,
+       boost::optional<std::string> initial_filename,
        optional<boost::filesystem::path> override_path
        )
        : wxFileDialog(
                parent,
                title,
-               std_to_wx(
-                       override_path.get_value_or(
-                               Config::instance()->initial_path(initial_path_key).get_value_or(home_directory())
-                               ).string()),
-               wxEmptyString,
+               initial_path(initial_path_key, override_path),
+               std_to_wx(initial_filename.get_value_or("")),
                allowed,
                style
                )
        , _initial_path_key(initial_path_key)
+       , _multiple(style & wxFD_MULTIPLE)
 {
 
 }
@@ -84,9 +97,14 @@ FileDialog::show()
                return false;
        }
 
-       auto p = paths();
-       DCPOMATIC_ASSERT(!p.empty());
-       Config::instance()->set_initial_path(_initial_path_key, p[0].parent_path());
+       if (_multiple) {
+               auto p = paths();
+               DCPOMATIC_ASSERT(!p.empty());
+               Config::instance()->set_initial_path(_initial_path_key, p[0].parent_path());
+       } else {
+               Config::instance()->set_initial_path(_initial_path_key, path().parent_path());
+       }
+
        return true;
 }