projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract common code out into kdm_for_screen()
[dcpomatic.git]
/
src
/
wx
/
player_information.h
diff --git
a/src/wx/player_information.h
b/src/wx/player_information.h
index 0fcbb15ee840920e99b9cbd402fbe96c455cdb29..b932281746b0fe37c2e00c4860f3ce8d58935404 100644
(file)
--- a/
src/wx/player_information.h
+++ b/
src/wx/player_information.h
@@
-20,13
+20,14
@@
#include <wx/wx.h>
#include <boost/scoped_ptr.hpp>
#include <wx/wx.h>
#include <boost/scoped_ptr.hpp>
+#include <boost/weak_ptr.hpp>
class FilmViewer;
class PlayerInformation : public wxPanel
{
public:
class FilmViewer;
class PlayerInformation : public wxPanel
{
public:
- PlayerInformation (wxWindow* parent,
FilmViewer*
viewer);
+ PlayerInformation (wxWindow* parent,
boost::weak_ptr<FilmViewer>
viewer);
void triggered_update ();
void triggered_update ();
@@
-34,9
+35,10
@@
private:
void periodic_update ();
void periodic_update ();
-
FilmViewer*
_viewer;
+
boost::weak_ptr<FilmViewer>
_viewer;
wxSizer* _sizer;
wxStaticText** _dcp;
wxStaticText* _dropped;
wxSizer* _sizer;
wxStaticText** _dcp;
wxStaticText* _dropped;
+ wxStaticText* _decode_resolution;
boost::scoped_ptr<wxTimer> _timer;
};
boost::scoped_ptr<wxTimer> _timer;
};