projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted c++11 cleanups.
[libdcp.git]
/
src
/
mono_picture_asset_writer.h
diff --git
a/src/mono_picture_asset_writer.h
b/src/mono_picture_asset_writer.h
index 532f7ad7575a79f174b05ddbf72f3203e86a882a..a5799d2737ce6319bd55429d37d6fbf69ed4a9f8 100644
(file)
--- a/
src/mono_picture_asset_writer.h
+++ b/
src/mono_picture_asset_writer.h
@@
-39,7
+39,7
@@
#define LIBDCP_MONO_PICTURE_ASSET_WRITER_H
#include "picture_asset_writer.h"
#define LIBDCP_MONO_PICTURE_ASSET_WRITER_H
#include "picture_asset_writer.h"
-#include <
boost/shared_ptr.hpp
>
+#include <
memory
>
#include <boost/utility.hpp>
#include <stdint.h>
#include <string>
#include <boost/utility.hpp>
#include <stdint.h>
#include <string>
@@
-59,22
+59,22
@@
namespace dcp {
class MonoPictureAssetWriter : public PictureAssetWriter
{
public:
class MonoPictureAssetWriter : public PictureAssetWriter
{
public:
- FrameInfo write (uint8_t *, int);
+ MonoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, bool);
+
+ FrameInfo write (uint8_t const *, int);
void fake_write (int size);
bool finalize ();
private:
friend class MonoPictureAsset;
void fake_write (int size);
bool finalize ();
private:
friend class MonoPictureAsset;
- MonoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, Standard standard, bool);
- void start (uint8_t *, int);
+ void start (uint8_t const *, int);
/* do this with an opaque pointer so we don't have to include
ASDCP headers
*/
/* do this with an opaque pointer so we don't have to include
ASDCP headers
*/
-
struct ASDCPState;
struct ASDCPState;
-
boost
::shared_ptr<ASDCPState> _state;
+
std
::shared_ptr<ASDCPState> _state;
};
}
};
}