projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change video content scaling so that it either:
[dcpomatic.git]
/
src
/
wx
/
controls.h
diff --git
a/src/wx/controls.h
b/src/wx/controls.h
index dfa11e6d74ecc67e8526d9f4c8f43760bfe7d4c6..b9c4604b6b298b7cd80d785ff759bbad58079e1e 100644
(file)
--- a/
src/wx/controls.h
+++ b/
src/wx/controls.h
@@
-24,7
+24,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>
@@
-53,6
+52,11
@@
public:
virtual void log (wxString) {}
virtual void set_film (boost::shared_ptr<Film> film);
virtual void log (wxString) {}
virtual void set_film (boost::shared_ptr<Film> film);
+
+ virtual void play () {};
+ virtual void stop () {};
+ void seek (int slider);
+
boost::shared_ptr<Film> film () const;
void back_frame ();
void forward_frame ();
boost::shared_ptr<Film> film () const;
void back_frame ();
void forward_frame ();
@@
-87,7
+91,7
@@
private:
void image_changed (boost::weak_ptr<PlayerVideo>);
void outline_content_changed ();
void eye_changed ();
void image_changed (boost::weak_ptr<PlayerVideo>);
void outline_content_changed ();
void eye_changed ();
- void
position_changed
();
+ void
update_position
();
void film_change (ChangeType, Film::Property);
typedef std::pair<boost::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
void film_change (ChangeType, Film::Property);
typedef std::pair<boost::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
@@
-105,6
+109,8
@@
private:
ClosedCaptionsDialog* _closed_captions_dialog;
ClosedCaptionsDialog* _closed_captions_dialog;
+ wxTimer _timer;
+
boost::signals2::scoped_connection _film_change_connection;
boost::signals2::scoped_connection _config_changed_connection;
};
boost::signals2::scoped_connection _film_change_connection;
boost::signals2::scoped_connection _config_changed_connection;
};