Tidy up nanomsg class API; add unmounting for Linux.

3 files changed, 70 insertions, 0 deletions

diff --git a/src/wx/try_unmount_dialog.cc b/src/wx/try_unmount_dialog.cc
new file mode 100644
index 000000000..d25ae8c3e
--- /dev/null
+++ b/src/wx/try_unmount_dialog.cc
@@ -0,0 +1,42 @@
+/*
+    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+    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.
+
+    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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "try_unmount_dialog.h"
+#include "wx_util.h"
+#include "static_text.h"
+#include <wx/wx.h>
+
+TryUnmountDialog::TryUnmountDialog (wxWindow* parent, wxString description)
+	: wxDialog (parent, wxID_ANY, _("DCP-o-matic Disk Writer"))
+{
+	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	wxStaticText* text = new StaticText (this, wxString::Format(_("The drive %s is mounted.\nIt must be unmounted before DCP-o-matic can write to it.  Do you want to try to unmount it now?"), description));
+	sizer->Add (text, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+	if (buttons) {
+		sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	SetSizer (sizer);
+	sizer->Layout ();
+	sizer->SetSizeHints (this);
+}
+
diff --git a/src/wx/try_unmount_dialog.h b/src/wx/try_unmount_dialog.h
new file mode 100644
index 000000000..9ae7de933
--- /dev/null
+++ b/src/wx/try_unmount_dialog.h
@@ -0,0 +1,27 @@
+/*
+    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+    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.
+
+    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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <wx/wx.h>
+
+class TryUnmountDialog : public wxDialog
+{
+public:
+	TryUnmountDialog (wxWindow* parent, wxString description);
+};
diff --git a/src/wx/wscript b/src/wx/wscript
index 87ae38aac..6a9003ef1 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -147,6 +147,7 @@ sources = """
           timeline_video_content_view.cc
           timeline_view.cc
           timing_panel.cc
+          try_unmount_dialog.cc
           update_dialog.cc
           verify_dcp_dialog.cc
           video_panel.cc