summaryrefslogtreecommitdiff
path: root/src/wx/controls.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-09-27 15:13:15 +0100
committerCarl Hetherington <cth@carlh.net>2018-09-27 15:13:15 +0100
commit464801a7b386f93be65cdfc60c3807cb5365467e (patch)
tree7457e2699f7f3ed75df05ce95d0d23feafb343bc /src/wx/controls.h
parentf76453d0b78e5b71abbd9b4fcfda9e8eb0b61ad0 (diff)
Basic SPL support.
Diffstat (limited to 'src/wx/controls.h')
-rw-r--r--src/wx/controls.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/wx/controls.h b/src/wx/controls.h
index 63e9fb38a..968ffa921 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -21,6 +21,7 @@
#include "lib/dcpomatic_time.h"
#include "lib/types.h"
#include "lib/film.h"
+#include "lib/spl_entry.h"
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
@@ -49,8 +50,7 @@ public:
void show_extended_player_controls (bool s);
void log (wxString s);
- boost::signals2::signal<void (boost::filesystem::path)> DCPDirectorySelected;
- boost::signals2::signal<void ()> DCPEjected;
+ boost::signals2::signal<void (std::list<SPLEntry>)> SPLChanged;
private:
void update_position_label ();
@@ -80,12 +80,13 @@ private:
void film_changed ();
void update_dcp_directory ();
void dcp_directory_changed ();
- void dcp_directory_selected ();
void config_changed (int property);
+ boost::optional<boost::filesystem::path> selected_dcp () const;
#ifdef DCPOMATIC_VARIANT_SWAROOP
void pause_clicked ();
void stop_clicked ();
#endif
+ void add_clicked ();
boost::shared_ptr<Film> _film;
boost::shared_ptr<FilmViewer> _viewer;
@@ -98,7 +99,9 @@ private:
wxChoice* _eye;
wxCheckBox* _jump_to_selected;
wxListCtrl* _dcp_directory;
+ wxListCtrl* _spl_view;
wxTextCtrl* _log;
+ wxButton* _add_button;
std::vector<boost::filesystem::path> _dcp_directories;
wxSlider* _slider;
wxButton* _rewind_button;
@@ -114,6 +117,7 @@ private:
wxToggleButton* _play_button;
#endif
boost::optional<std::string> _active_job;
+ std::list<SPLEntry> _spl;
ClosedCaptionsDialog* _closed_captions_dialog;