diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-10-09 20:50:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-10-09 20:50:20 +0100 |
| commit | 71589ebfea5a7adc49f013d405b3158ea612222a (patch) | |
| tree | 205ecd463c7405ee052a0dfd553426d92cef27c5 /src/wx | |
| parent | 23f2dc3bfb94930b938281c7f1e5663b761fa508 (diff) | |
Add SPL class.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/controls.cc | 5 | ||||
| -rw-r--r-- | src/wx/controls.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/wx/controls.cc b/src/wx/controls.cc index 0c9a27518..753014c46 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -26,6 +26,7 @@ #include "lib/job_manager.h" #include "lib/player_video.h" #include "lib/dcp_content.h" +#include "lib/spl_entry.h" #include <dcp/dcp.h> #include <dcp/cpl.h> #include <dcp/reel.h> @@ -192,7 +193,7 @@ Controls::add_clicked () { optional<CPL> sel = selected_cpl (); DCPOMATIC_ASSERT (sel); - _spl.push_back (SPLEntry(sel->first, sel->second)); + _spl.playlist.push_back (SPLEntry(sel->first, sel->second)); add_cpl_to_list (sel->first, _spl_view); SPLChanged (_spl); setup_sensitivity (); @@ -416,7 +417,7 @@ Controls::setup_sensitivity () { /* examine content is the only job which stops the viewer working */ bool const active_job = _active_job && *_active_job != "examine_content"; - bool const c = ((_film && !_film->content().empty()) || !_spl.empty()) && !active_job; + bool const c = ((_film && !_film->content().empty()) || !_spl.playlist.empty()) && !active_job; _slider->Enable (c); _rewind_button->Enable (c); diff --git a/src/wx/controls.h b/src/wx/controls.h index ba7c46fcc..fd8178435 100644 --- a/src/wx/controls.h +++ b/src/wx/controls.h @@ -21,7 +21,7 @@ #include "lib/dcpomatic_time.h" #include "lib/types.h" #include "lib/film.h" -#include "lib/spl_entry.h" +#include "lib/spl.h" #include <wx/wx.h> #include <boost/shared_ptr.hpp> #include <boost/signals2.hpp> @@ -54,7 +54,7 @@ public: void show_extended_player_controls (bool s); void log (wxString s); - boost::signals2::signal<void (std::list<SPLEntry>)> SPLChanged; + boost::signals2::signal<void (SPL)> SPLChanged; private: void update_position_label (); @@ -125,7 +125,7 @@ private: wxToggleButton* _play_button; #endif boost::optional<std::string> _active_job; - std::list<SPLEntry> _spl; + SPL _spl; ClosedCaptionsDialog* _closed_captions_dialog; |