X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=bff58a3239940b735093f8ad66bd72305d3792d6;hb=3e4f6d59b46e3c09c9d0aba907ff0633bf0bc2e5;hp=0438fcee23317669242eb1c162fc81e6d03f6803;hpb=6829a1c1b3c577cdd6bc6d206dd52608b0a976ab;p=dcpomatic.git

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 0438fcee2..bff58a323 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,9 +31,6 @@
 #include <boost/function.hpp>
 #include <boost/thread.hpp>
 #include <boost/signals2.hpp>
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
 
 class FilePickerCtrl;
 class wxDirPickerCtrl;
@@ -41,6 +38,7 @@ class wxSpinCtrl;
 class wxSpinCtrlDouble;
 class wxGridBagSizer;
 class wxSplashScreen;
+class PasswordEntry;
 
 #define DCPOMATIC_SIZER_X_GAP 8
 #define DCPOMATIC_SIZER_Y_GAP 8
@@ -58,7 +56,7 @@ class wxSplashScreen;
 #define DCPOMATIC_RTAUDIO_API RtAudio::LINUX_PULSE
 #endif
 #ifdef DCPOMATIC_WINDOWS
-#define DCPOMATIC_RTAUDIO_API RtAudio::WINDOWS_DS
+#define DCPOMATIC_RTAUDIO_API RtAudio::UNSPECIFIED
 #endif
 #ifdef DCPOMATIC_OSX
 #define DCPOMATIC_RTAUDIO_API RtAudio::MACOSX_CORE
@@ -83,10 +81,29 @@ extern wxString std_to_wx (std::string);
 extern void dcpomatic_setup_i18n ();
 extern wxString context_translation (wxString);
 extern std::string string_client_data (wxClientData* o);
-extern wxString time_to_timecode (DCPTime t, double fps);
+extern wxString time_to_timecode (dcpomatic::DCPTime t, double fps);
 extern void setup_audio_channels_choice (wxChoice* choice, int minimum);
 extern wxSplashScreen* maybe_show_splash ();
 extern double calculate_mark_interval (double start);
+extern bool display_progress (wxString title, wxString task);
+extern bool report_errors_from_last_job (wxWindow* parent);
+extern wxString bitmap_path (std::string name);
+
+struct Offset
+{
+	Offset (wxString n, int h, int m)
+		: name (n)
+		, hour (h)
+		, minute (m)
+	{}
+
+	wxString name;
+	int hour;
+	int minute;
+};
+
+extern int get_offsets (std::vector<Offset>& offsets);
+
 
 extern void checked_set (FilePickerCtrl* widget, boost::filesystem::path value);
 extern void checked_set (wxDirPickerCtrl* widget, boost::filesystem::path value);
@@ -97,6 +114,7 @@ extern void checked_set (wxChoice* widget, std::string value);
 extern void checked_set (wxChoice* widget, std::vector<std::pair<std::string, std::string> > items);
 extern void checked_set (wxTextCtrl* widget, std::string value);
 extern void checked_set (wxTextCtrl* widget, wxString value);
+extern void checked_set (PasswordEntry* widget, std::string value);
 extern void checked_set (wxCheckBox* widget, bool value);
 extern void checked_set (wxRadioButton* widget, bool value);
 extern void checked_set (wxStaticText* widget, std::string value);
@@ -106,11 +124,7 @@ extern int wx_get (wxChoice* widget);
 extern int wx_get (wxSpinCtrl* widget);
 extern double wx_get (wxSpinCtrlDouble* widget);
 
-/* GTK 2.24.17 has a buggy GtkFileChooserButton and it was put in Ubuntu 13.04.
-   This also seems to apply to 2.24.20 in Ubuntu 13.10 and 2.24.23 in Ubuntu 14.04.
-   Use our own dir picker as this is the least bad option I can think of.
-*/
-#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && (GTK_MICRO_VERSION == 17 || GTK_MICRO_VERSION == 20 || GTK_MICRO_VERSION == 23))
+#if defined(__WXMSW__)
 #define DCPOMATIC_USE_OWN_PICKER
 #endif