summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-01-06 11:19:05 +0000
committerCarl Hetherington <cth@carlh.net>2017-01-06 11:19:05 +0000
commit568241745673e68031a72739a5e5a73ba3ee20a7 (patch)
tree12257b4850b868d0355a64a1685e98b93438ed11 /src
parent839bc2d9d75f0d35a2c09d5e55e075e3ab1076b2 (diff)
const-correctness fix.
Diffstat (limited to 'src')
-rw-r--r--src/mono_picture_asset_writer.cc4
-rw-r--r--src/mono_picture_asset_writer.h4
-rw-r--r--src/mxf.h2
-rw-r--r--src/picture_asset_writer.h4
-rw-r--r--src/picture_asset_writer_common.cc2
-rw-r--r--src/stereo_picture_asset_writer.cc4
-rw-r--r--src/stereo_picture_asset_writer.h4
7 files changed, 12 insertions, 12 deletions
diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index b6f8cc1b..a51c3861 100644
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -65,14 +65,14 @@ MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::file
}
void
-MonoPictureAssetWriter::start (uint8_t* data, int size)
+MonoPictureAssetWriter::start (uint8_t const * data, int size)
{
dcp::start (this, _state, _standard, _picture_asset, data, size);
_picture_asset->set_frame_rate (_picture_asset->edit_rate());
}
FrameInfo
-MonoPictureAssetWriter::write (uint8_t* data, int size)
+MonoPictureAssetWriter::write (uint8_t const * data, int size)
{
DCP_ASSERT (!_finalized);
diff --git a/src/mono_picture_asset_writer.h b/src/mono_picture_asset_writer.h
index 532f7ad7..dcea0294 100644
--- a/src/mono_picture_asset_writer.h
+++ b/src/mono_picture_asset_writer.h
@@ -59,7 +59,7 @@ namespace dcp {
class MonoPictureAssetWriter : public PictureAssetWriter
{
public:
- FrameInfo write (uint8_t *, int);
+ FrameInfo write (uint8_t const *, int);
void fake_write (int size);
bool finalize ();
@@ -67,7 +67,7 @@ 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
diff --git a/src/mxf.h b/src/mxf.h
index 52d335ea..8f83fafd 100644
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -114,7 +114,7 @@ public:
protected:
template <class P, class Q>
- friend void start (PictureAssetWriter* writer, boost::shared_ptr<P> state, Standard standard, Q* mxf, uint8_t* data, int size);
+ friend void start (PictureAssetWriter* writer, boost::shared_ptr<P> state, Standard standard, Q* mxf, uint8_t const * data, int size);
std::string read_writer_info (ASDCP::WriterInfo const &);
/** Fill in a ADSCP::WriteInfo struct.
diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index 1ef519ba..f26ff2a0 100644
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -77,12 +77,12 @@ struct FrameInfo
class PictureAssetWriter : public AssetWriter
{
public:
- virtual FrameInfo write (uint8_t *, int) = 0;
+ virtual FrameInfo write (uint8_t const *, int) = 0;
virtual void fake_write (int) = 0;
protected:
template <class P, class Q>
- friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Standard, Q *, uint8_t *, int);
+ friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Standard, Q *, uint8_t const *, int);
PictureAssetWriter (PictureAsset *, boost::filesystem::path, Standard standard, bool);
diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc
index a0e66bea..eae6318f 100644
--- a/src/picture_asset_writer_common.cc
+++ b/src/picture_asset_writer_common.cc
@@ -50,7 +50,7 @@ struct ASDCPStateBase
}
template <class P, class Q>
-void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* asset, uint8_t* data, int size)
+void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* asset, uint8_t const * data, int size)
{
asset->set_file (writer->_file);
diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc
index 00a738de..09faec28 100644
--- a/src/stereo_picture_asset_writer.cc
+++ b/src/stereo_picture_asset_writer.cc
@@ -59,7 +59,7 @@ StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* mxf, boost::fi
}
void
-StereoPictureAssetWriter::start (uint8_t* data, int size)
+StereoPictureAssetWriter::start (uint8_t const * data, int size)
{
dcp::start (this, _state, _standard, _picture_asset, data, size);
_picture_asset->set_frame_rate (Fraction (_picture_asset->edit_rate().numerator * 2, _picture_asset->edit_rate().denominator));
@@ -70,7 +70,7 @@ StereoPictureAssetWriter::start (uint8_t* data, int size)
* @param size Size of data.
*/
FrameInfo
-StereoPictureAssetWriter::write (uint8_t* data, int size)
+StereoPictureAssetWriter::write (uint8_t const * data, int size)
{
DCP_ASSERT (!_finalized);
diff --git a/src/stereo_picture_asset_writer.h b/src/stereo_picture_asset_writer.h
index c6a2c5c5..1b0956d3 100644
--- a/src/stereo_picture_asset_writer.h
+++ b/src/stereo_picture_asset_writer.h
@@ -58,7 +58,7 @@ public:
* @param data JPEG2000 data.
* @param size Size of data.
*/
- FrameInfo write (uint8_t* data, int size);
+ FrameInfo write (uint8_t const * data, int size);
void fake_write (int size);
bool finalize ();
@@ -66,7 +66,7 @@ private:
friend class StereoPictureAsset;
StereoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, 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