projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
wx
/
closed_captions_dialog.h
diff --git
a/src/wx/closed_captions_dialog.h
b/src/wx/closed_captions_dialog.h
index 5c366ca7b0dbe2cc9d9f61e8eba4002b5e71c6ff..1f0e450ff3203bc632ec2601d898af05a57963c6 100644
(file)
--- a/
src/wx/closed_captions_dialog.h
+++ b/
src/wx/closed_captions_dialog.h
@@
-21,7
+21,10
@@
#include "lib/dcpomatic_time.h"
#include "lib/player.h"
#include "lib/text_ring_buffers.h"
#include "lib/dcpomatic_time.h"
#include "lib/player.h"
#include "lib/text_ring_buffers.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
class Butler;
class FilmViewer;
class Butler;
class FilmViewer;
@@
-32,7
+35,8
@@
public:
explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
void clear ();
explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
void clear ();
- void set_film_and_butler (boost::shared_ptr<Film>, boost::weak_ptr<Butler>);
+ void update_tracks (std::shared_ptr<const Film> film);
+ void set_butler (std::weak_ptr<Butler>);
private:
void shown (wxShowEvent);
private:
void shown (wxShowEvent);
@@
-47,6
+51,6
@@
private:
bool _current_in_lines;
std::vector<wxString> _lines;
std::vector<DCPTextTrack> _tracks;
bool _current_in_lines;
std::vector<wxString> _lines;
std::vector<DCPTextTrack> _tracks;
-
boost
::weak_ptr<Butler> _butler;
+
std
::weak_ptr<Butler> _butler;
wxTimer _timer;
};
wxTimer _timer;
};