projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missed bits of sl_SI translation update.
[dcpomatic.git]
/
src
/
wx
/
playlist_controls.h
diff --git
a/src/wx/playlist_controls.h
b/src/wx/playlist_controls.h
index 4f144834ab342c0cb3ee4c90dfa7ce3197d80dd1..bc283f288db3936fa6dd5b740c5a52b4863571f8 100644
(file)
--- a/
src/wx/playlist_controls.h
+++ b/
src/wx/playlist_controls.h
@@
-18,27
+18,29
@@
*/
*/
+
#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,
boost
::shared_ptr<FilmViewer> viewer);
+ PlaylistControls (wxWindow* parent,
std
::shared_ptr<FilmViewer> viewer);
- void log (wxString s);
- void set_film (boost::shared_ptr<Film> film);
+ void set_film (std::shared_ptr<Film> film) override;
/** 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
in the player's DOMFrame but we don't have that in a header.
*/
/** 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
in the player's DOMFrame but we don't have that in a header.
*/
- boost::signals2::signal<void (
boost
::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 ();
@@
-51,10
+53,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 ();
@@
-62,7
+64,7
@@
private:
bool can_do_next ();
void deselect_playlist ();
bool can_do_next ();
void deselect_playlist ();
- boost::optional<dcp::EncryptedKDM> get_kdm_from_directory (
boost
::shared_ptr<DCPContent> dcp);
+ boost::optional<dcp::EncryptedKDM> get_kdm_from_directory (
std
::shared_ptr<DCPContent> dcp);
wxButton* _play_button;
wxButton* _pause_button;
wxButton* _play_button;
wxButton* _pause_button;