projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add empty playlist list and configuration option.
[dcpomatic.git]
/
src
/
wx
/
controls.h
diff --git
a/src/wx/controls.h
b/src/wx/controls.h
index fd8178435e253c7ffbb51f2f712019357e32a250..2c0b84d8d3870a20c0e2a0bdafcb0293e78e3d8b 100644
(file)
--- a/
src/wx/controls.h
+++ b/
src/wx/controls.h
@@
-21,7
+21,6
@@
#include "lib/dcpomatic_time.h"
#include "lib/types.h"
#include "lib/film.h"
#include "lib/dcpomatic_time.h"
#include "lib/types.h"
#include "lib/film.h"
-#include "lib/spl.h"
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
@@
-54,8
+53,6
@@
public:
void show_extended_player_controls (bool s);
void log (wxString s);
void show_extended_player_controls (bool s);
void log (wxString s);
- boost::signals2::signal<void (SPL)> SPLChanged;
-
private:
void update_position_label ();
void update_position_slider ();
private:
void update_position_label ();
void update_position_slider ();
@@
-82,19
+79,20
@@
private:
void started ();
void stopped ();
void film_changed ();
void started ();
void stopped ();
void film_changed ();
- void update_dcp_directory ();
- void dcp_directory_changed ();
+ void update_content_directory ();
void config_changed (int property);
typedef std::pair<boost::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
void config_changed (int property);
typedef std::pair<boost::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
- boost::
optional<CPL> selected_cpl
() const;
+ boost::
shared_ptr<Content> selected_content
() const;
#ifdef DCPOMATIC_VARIANT_SWAROOP
void pause_clicked ();
void stop_clicked ();
#endif
void add_clicked ();
#ifdef DCPOMATIC_VARIANT_SWAROOP
void pause_clicked ();
void stop_clicked ();
#endif
void add_clicked ();
- void add_cpl_to_list (boost::shared_ptr<dcp::CPL> cpl, wxListCtrl* list);
+ void save_clicked ();
+ void load_clicked ();
+ void add_content_to_list (boost::shared_ptr<Content> content, wxListCtrl* list);
boost::shared_ptr<Film> _film;
boost::shared_ptr<FilmViewer> _viewer;
boost::shared_ptr<Film> _film;
boost::shared_ptr<FilmViewer> _viewer;
@@
-106,11
+104,14
@@
private:
wxCheckBox* _outline_content;
wxChoice* _eye;
wxCheckBox* _jump_to_selected;
wxCheckBox* _outline_content;
wxChoice* _eye;
wxCheckBox* _jump_to_selected;
- wxListCtrl* _c
pl
;
+ wxListCtrl* _c
ontent_view
;
wxListCtrl* _spl_view;
wxListCtrl* _spl_view;
+ wxListCtrl* _current_spl_view;
wxTextCtrl* _log;
wxButton* _add_button;
wxTextCtrl* _log;
wxButton* _add_button;
- std::vector<CPL> _cpls;
+ wxButton* _save_button;
+ wxButton* _load_button;
+ std::vector<boost::shared_ptr<Content> > _content;
wxSlider* _slider;
wxButton* _rewind_button;
wxButton* _back_button;
wxSlider* _slider;
wxButton* _rewind_button;
wxButton* _back_button;
@@
-125,7
+126,6
@@
private:
wxToggleButton* _play_button;
#endif
boost::optional<std::string> _active_job;
wxToggleButton* _play_button;
#endif
boost::optional<std::string> _active_job;
- SPL _spl;
ClosedCaptionsDialog* _closed_captions_dialog;
ClosedCaptionsDialog* _closed_captions_dialog;