projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up access to stuff from Film.
[dcpomatic.git]
/
src
/
wx
/
video_view.h
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index d9ef2a65f4859afd8a8bea01dd8ef9abd0c8642b..06067130c5a330d64a103b4bd47f0ac75eac514f 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-39,6
+39,7
@@
public:
#ifdef DCPOMATIC_VARIANT_SWAROOP
, _in_watermark (false)
#endif
#ifdef DCPOMATIC_VARIANT_SWAROOP
, _in_watermark (false)
#endif
+ , _video_frame_rate (0)
{}
virtual ~VideoView () {}
{}
virtual ~VideoView () {}
@@
-66,9
+67,14
@@
public:
return _player_video.second;
}
return _player_video.second;
}
- void set_
film (boost::shared_ptr<const Film> film
) {
+ void set_
video_frame_rate (int r
) {
boost::mutex::scoped_lock lm (_mutex);
boost::mutex::scoped_lock lm (_mutex);
- _film = film;
+ _video_frame_rate = r;
+ }
+
+ void set_length (dcpomatic::DCPTime len) {
+ boost::mutex::scoped_lock lm (_mutex);
+ _length = len;
}
protected:
}
protected:
@@
-78,10
+84,13
@@
protected:
bool get_next_frame (bool non_blocking);
int time_until_next_frame () const;
dcpomatic::DCPTime one_video_frame () const;
bool get_next_frame (bool non_blocking);
int time_until_next_frame () const;
dcpomatic::DCPTime one_video_frame () const;
-
- boost::shared_ptr<const Film> film () const {
+ int video_frame_rate () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _video_frame_rate;
+ }
+ dcpomatic::DCPTime length () const {
boost::mutex::scoped_lock lm (_mutex);
boost::mutex::scoped_lock lm (_mutex);
- return _
film
;
+ return _
length
;
}
FilmViewer* _viewer;
}
FilmViewer* _viewer;
@@
-97,7
+106,8
@@
protected:
#endif
private:
#endif
private:
- boost::shared_ptr<const Film> _film;
+ int _video_frame_rate;
+ dcpomatic::DCPTime _length;
};
#endif
};
#endif