projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some more unnecessary use of shared_ptr.
[dcpomatic.git]
/
src
/
lib
/
butler.h
diff --git
a/src/lib/butler.h
b/src/lib/butler.h
index bac94a74297e8f785ed38211d59683564aea8ae6..1dba6e129839ab1ff9920bd1ee61d3cac622d2c3 100644
(file)
--- a/
src/lib/butler.h
+++ b/
src/lib/butler.h
@@
-50,7
+50,7
@@
public:
Butler (
std::weak_ptr<const Film> film,
Butler (
std::weak_ptr<const Film> film,
-
std::shared_ptr<Player>
player,
+
Player&
player,
AudioMapping map,
int audio_channels,
std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
AudioMapping map,
int audio_channels,
std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
@@
-105,7
+105,7
@@
private:
void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
std::weak_ptr<const Film> _film;
void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
std::weak_ptr<const Film> _film;
-
std::shared_ptr<Player>
_player;
+
Player&
_player;
boost::thread _thread;
VideoRingBuffers _video;
boost::thread _thread;
VideoRingBuffers _video;