Add simple/full interface option and make DCP panel respect it.

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

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 0e12e59de652074c63093bfedeb33e968c377734..f59f5d68376cc41109981d89543a4f8582f1b30e 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -39,6 +39,7 @@ class FilePickerCtrl;
 class wxSpinCtrl;
 class wxSpinCtrlDouble;
 class wxGridBagSizer;
+class wxSplashScreen;
 
 #define DCPOMATIC_SIZER_X_GAP 8
 #define DCPOMATIC_SIZER_Y_GAP 8
@@ -56,7 +57,7 @@ class wxGridBagSizer;
 #define DCPOMATIC_RTAUDIO_API RtAudio::LINUX_PULSE
 #endif
 #ifdef DCPOMATIC_WINDOWS
-#define DCPOMATIC_RTAUDIO_API RtAudio::WINDOWS_WASAPI
+#define DCPOMATIC_RTAUDIO_API RtAudio::WINDOWS_DS
 #endif
 #ifdef DCPOMATIC_OSX
 #define DCPOMATIC_RTAUDIO_API RtAudio::MACOSX_CORE
@@ -68,11 +69,14 @@ class wxGridBagSizer;
  */
 #define S_(x) context_translation(x)
 
-extern void error_dialog (wxWindow *, wxString);
+extern void error_dialog (wxWindow *, wxString, boost::optional<wxString> e = boost::optional<wxString>());
 extern void message_dialog (wxWindow *, wxString);
 extern bool confirm_dialog (wxWindow *, wxString);
-extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0);
+extern wxStaticText* create_label (wxWindow* p, wxString t, bool left);
+extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0, int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT);
+extern wxStaticText* add_label_to_sizer (wxSizer *, wxStaticText *, bool left, int prop = 0, int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT);
 extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
+extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxStaticText *, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
 extern std::string wx_to_std (wxString);
 extern wxString std_to_wx (std::string);
 extern void dcpomatic_setup_i18n ();
@@ -80,6 +84,9 @@ extern wxString context_translation (wxString);
 extern std::string string_client_data (wxClientData* o);
 extern wxString time_to_timecode (DCPTime t, double fps);
 extern void setup_audio_channels_choice (wxChoice* choice, int minimum);
+extern wxSplashScreen* maybe_show_splash ();
+extern boost::filesystem::path path_from_file_dialog (wxFileDialog* dialog, std::string extension);
+extern double calculate_mark_interval (double start);
 
 extern void checked_set (FilePickerCtrl* widget, boost::filesystem::path value);
 extern void checked_set (wxSpinCtrl* widget, int value);