projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_image_proxy.h
diff --git
a/src/lib/ffmpeg_image_proxy.h
b/src/lib/ffmpeg_image_proxy.h
index 62b99d280f42e4b7f42f790e2cb52f0be66d475b..21109c9d6f2dccf9baf64f11ebbc3b2ac24618bc 100644
(file)
--- a/
src/lib/ffmpeg_image_proxy.h
+++ b/
src/lib/ffmpeg_image_proxy.h
@@
-19,6
+19,7
@@
*/
#include "image_proxy.h"
*/
#include "image_proxy.h"
+#include "types.h"
#include <dcp/array_data.h>
#include <boost/thread/mutex.hpp>
#include <boost/filesystem.hpp>
#include <dcp/array_data.h>
#include <boost/thread/mutex.hpp>
#include <boost/filesystem.hpp>
@@
-28,15
+29,15
@@
class FFmpegImageProxy : public ImageProxy
public:
explicit FFmpegImageProxy (boost::filesystem::path);
explicit FFmpegImageProxy (dcp::ArrayData);
public:
explicit FFmpegImageProxy (boost::filesystem::path);
explicit FFmpegImageProxy (dcp::ArrayData);
- FFmpegImageProxy (
boost::shared_ptr<cxml::Node> xml, boost
::shared_ptr<Socket> socket);
+ FFmpegImageProxy (
std
::shared_ptr<Socket> socket);
Result image (
boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
) const;
void add_metadata (xmlpp::Node *) const;
Result image (
boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
) const;
void add_metadata (xmlpp::Node *) const;
- void write_to_socket (
boost
::shared_ptr<Socket>) const;
- bool same (
boost
::shared_ptr<const ImageProxy> other) const;
+ void write_to_socket (
std
::shared_ptr<Socket>) const;
+ bool same (
std
::shared_ptr<const ImageProxy> other) const;
size_t memory_used () const;
int avio_read (uint8_t* buffer, int const amount);
size_t memory_used () const;
int avio_read (uint8_t* buffer, int const amount);
@@
-49,6
+50,6
@@
private:
failed-decode errors can give more detail.
*/
boost::optional<boost::filesystem::path> _path;
failed-decode errors can give more detail.
*/
boost::optional<boost::filesystem::path> _path;
- mutable
boost
::shared_ptr<Image> _image;
+ mutable
std
::shared_ptr<Image> _image;
mutable boost::mutex _mutex;
};
mutable boost::mutex _mutex;
};