projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix silly crash in shuffler.
[dcpomatic.git]
/
src
/
lib
/
player_video.h
diff --git
a/src/lib/player_video.h
b/src/lib/player_video.h
index a6e39d66e8196668ef9998eff4c8beb7acbe63a2..f4bf2a47165be5dbc58b35a3f95e752db7e81ab6 100644
(file)
--- a/
src/lib/player_video.h
+++ b/
src/lib/player_video.h
@@
-30,6
+30,7
@@
extern "C" {
#include <libavutil/pixfmt.h>
}
#include <boost/shared_ptr.hpp>
#include <libavutil/pixfmt.h>
}
#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
class Image;
class ImageProxy;
class Image;
class ImageProxy;
@@
-50,7
+51,9
@@
public:
dcp::Size,
Eyes,
Part,
dcp::Size,
Eyes,
Part,
- boost::optional<ColourConversion>
+ boost::optional<ColourConversion>,
+ boost::weak_ptr<Content>,
+ boost::optional<Frame>
);
PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
);
PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
@@
-68,6
+71,8
@@
public:
void add_metadata (xmlpp::Node* node) const;
void send_binary (boost::shared_ptr<Socket> socket) const;
void add_metadata (xmlpp::Node* node) const;
void send_binary (boost::shared_ptr<Socket> socket) const;
+ bool reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size);
+
bool has_j2k () const;
dcp::Data j2k () const;
bool has_j2k () const;
dcp::Data j2k () const;
@@
-105,6
+110,10
@@
private:
Part _part;
boost::optional<ColourConversion> _colour_conversion;
boost::optional<PositionImage> _subtitle;
Part _part;
boost::optional<ColourConversion> _colour_conversion;
boost::optional<PositionImage> _subtitle;
+ /** Content that we came from. This is so that reset_metadata() can work */
+ boost::weak_ptr<Content> _content;
+ /** Video frame that we came from. Again, this is for reset_metadata() */
+ boost::optional<Frame> _video_frame;
};
#endif
};
#endif