projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4b102c1
)
Some const-correctness for Player.
author
Carl Hetherington
<cth@carlh.net>
Fri, 9 Sep 2022 22:43:59 +0000
(
00:43
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 10 Sep 2022 19:00:06 +0000
(21:00 +0200)
src/lib/player.h
patch
|
blob
|
history
diff --git
a/src/lib/player.h
b/src/lib/player.h
index 694ee70b77cca871eb83854a2b3a8c0a964da1f7..71b3cc4644a6b14dfd6e13cdb8abb52c3772f691 100644
(file)
--- a/
src/lib/player.h
+++ b/
src/lib/player.h
@@
-163,9
+163,9
@@
private:
*/
mutable boost::mutex _mutex;
*/
mutable boost::mutex _mutex;
- std::shared_ptr<const Film> _film;
+ std::shared_ptr<const Film>
const
_film;
/** Playlist, or 0 if we are using the one from the _film */
/** Playlist, or 0 if we are using the one from the _film */
- std::shared_ptr<const Playlist> _playlist;
+ std::shared_ptr<const Playlist>
const
_playlist;
/** > 0 if we are suspended (i.e. pass() and seek() do nothing) */
boost::atomic<int> _suspended;
/** > 0 if we are suspended (i.e. pass() and seek() do nothing) */
boost::atomic<int> _suspended;
@@
-186,7
+186,7
@@
private:
/** true if we should try to be fast rather than high quality */
bool _fast = false;
/** true if we should keep going in the face of `survivable' errors */
/** true if we should try to be fast rather than high quality */
bool _fast = false;
/** true if we should keep going in the face of `survivable' errors */
- bool
_tolerant = false
;
+ bool
const _tolerant
;
/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
bool _play_referenced = false;
/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
bool _play_referenced = false;
@@
-230,7
+230,7
@@
private:
dcpomatic::DCPTime _playback_length;
/** Alignment for subtitle images that we create */
dcpomatic::DCPTime _playback_length;
/** Alignment for subtitle images that we create */
- Image::Alignment _subtitle_alignment = Image::Alignment::PADDED;
+ Image::Alignment
const
_subtitle_alignment = Image::Alignment::PADDED;
boost::signals2::scoped_connection _film_changed_connection;
boost::signals2::scoped_connection _playlist_change_connection;
boost::signals2::scoped_connection _film_changed_connection;
boost::signals2::scoped_connection _playlist_change_connection;