projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update ISDCF name when DCP track changes.
[dcpomatic.git]
/
src
/
wx
/
playlist_controls.h
diff --git
a/src/wx/playlist_controls.h
b/src/wx/playlist_controls.h
index 8375f952e29ebd6e12b4f11060923e4a6fa79663..76ec6382497fa3367d08df7e1cde720830fe5092 100644
(file)
--- a/
src/wx/playlist_controls.h
+++ b/
src/wx/playlist_controls.h
@@
-18,17
+18,18
@@
*/
*/
+
#include "controls.h"
#include "lib/spl.h"
#include "controls.h"
#include "lib/spl.h"
+
class DCPContent;
class DCPContent;
+
class PlaylistControls : public Controls
{
public:
class PlaylistControls : public Controls
{
public:
- PlaylistControls (wxWindow* parent, std::shared_ptr<FilmViewer> viewer);
-
- void set_film (std::shared_ptr<Film> film);
+ PlaylistControls(wxWindow* parent, FilmViewer& viewer);
/** This is so that we can tell our parent player to reset the film
when we have created one from a SPL. We could call a method
/** This is so that we can tell our parent player to reset the film
when we have created one from a SPL. We could call a method
@@
-36,8
+37,8
@@
public:
*/
boost::signals2::signal<void (std::weak_ptr<Film>)> ResetFilm;
*/
boost::signals2::signal<void (std::weak_ptr<Film>)> ResetFilm;
- void play ();
- void stop ();
+ void play ()
override
;
+ void stop ()
override
;
private:
void play_clicked ();
private:
void play_clicked ();
@@
-50,10
+51,10
@@
private:
void update_playlist_directory ();
void spl_selection_changed ();
void select_playlist (int selected, int position);
void update_playlist_directory ();
void spl_selection_changed ();
void select_playlist (int selected, int position);
- void started ();
- void stopped ();
- void setup_sensitivity ();
- void config_changed (int);
+ void started ()
override
;
+ void stopped ()
override
;
+ void setup_sensitivity ()
override
;
+ void config_changed (int)
override
;
void viewer_finished ();
void reset_film ();
void update_current_content ();
void viewer_finished ();
void reset_film ();
void update_current_content ();