Fix crash when unsetting forced video frame rates in the timing panel.

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

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 40e72543a7e374495057f8872c792b68f1ed71e8..e017f404de8df788a2017923704145c703d17fda 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,11 +26,15 @@
 #include "file_picker_ctrl.h"
 #include "lib/config.h"
 #include "lib/util.h"
+#include "lib/cross.h"
+#include <dcp/locale_convert.h>
 #include <wx/spinctrl.h>
+#include <wx/splash.h>
 #include <boost/thread.hpp>
 
 using namespace std;
 using namespace boost;
+using dcp::locale_convert;
 
 /** Add a wxStaticText to a wxSizer, aligning it at vertical centre.
  *  @param s Sizer to add to.
@@ -81,11 +85,15 @@ add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPositi
 /** Pop up an error dialogue box.
  *  @param parent Parent.
  *  @param m Message.
+ *  @param e Extended message.
  */
 void
-error_dialog (wxWindow* parent, wxString m)
+error_dialog (wxWindow* parent, wxString m, optional<wxString> e)
 {
        wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_ERROR);
+       if (e) {
+               d->SetExtendedMessage (*e);
+       }
        d->ShowModal ();
        d->Destroy ();
 }
@@ -357,3 +365,52 @@ time_to_timecode (DCPTime t, double fps)
        int const f = lrint (w * fps);
        return wxString::Format (wxT("%02d:%02d:%02d.%02d"), h, m, s, f);
 }
+
+void
+setup_audio_channels_choice (wxChoice* choice, int minimum)
+{
+       vector<pair<string, string> > items;
+       for (int i = minimum; i <= 16; i += 2) {
+               if (i == 2) {
+                       items.push_back (make_pair (wx_to_std (_("2 - stereo")), locale_convert<string> (i)));
+               } else if (i == 4) {
+                       items.push_back (make_pair (wx_to_std (_("4 - L/C/R/Lfe")), locale_convert<string> (i)));
+               } else if (i == 6) {
+                       items.push_back (make_pair (wx_to_std (_("6 - 5.1")), locale_convert<string> (i)));
+               } else if (i == 8) {
+                       items.push_back (make_pair (wx_to_std (_("8 - 5.1/HI/VI")), locale_convert<string> (i)));
+               } else if (i == 12) {
+                       items.push_back (make_pair (wx_to_std (_("12 - 7.1/HI/VI")), locale_convert<string> (i)));
+               } else {
+                       items.push_back (make_pair (locale_convert<string> (i), locale_convert<string> (i)));
+               }
+       }
+
+       checked_set (choice, items);
+}
+
+wxSplashScreen *
+maybe_show_splash ()
+{
+       wxSplashScreen* splash = 0;
+       try {
+               if (!Config::have_existing ("config.xml")) {
+                       wxBitmap bitmap;
+                       boost::filesystem::path p = shared_path () / "splash.png";
+                       if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) {
+                               splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
+                               wxYield ();
+                       }
+               }
+       } catch (boost::filesystem::filesystem_error& e) {
+               /* Maybe we couldn't find the splash image; never mind */
+       }
+
+       return splash;
+}
+
+boost::filesystem::path
+path_from_file_dialog (wxFileDialog* dialog, string extension)
+{
+       return boost::filesystem::path(wx_to_std(dialog->GetPath())).replace_extension(extension);
+}