Take DCP-o-matic's version of Data class.

1 files changed, 18 insertions, 14 deletions

diff --git a/src/data.h b/src/data.h
index 12949fe4..60689031 100644
--- a/src/data.h
+++ b/src/data.h
@@ -20,33 +20,37 @@
 #ifndef LIBDCP_DATA_H
 #define LIBDCP_DATA_H
 
-/** @file  src/data.h
- *  @brief Data class.
- */
-
 #include <boost/shared_array.hpp>
 #include <boost/filesystem.hpp>
 #include <stdint.h>
 
 namespace dcp {
 
-/** A block of arbitrary data */
 class Data
 {
 public:
-	Data () {}
+	Data ();
+	Data (int size);
+	Data (uint8_t const * data, int size);
+	Data (boost::shared_array<uint8_t> data, int size);
+	Data (boost::filesystem::path file);
 
-	Data (boost::shared_array<uint8_t> data_, boost::uintmax_t size_)
-		: data (data_)
-		, size (size_)
-	{}
+	virtual ~Data () {}
 
-	Data (uint8_t const * data, boost::uintmax_t size_);
+	void write (boost::filesystem::path file) const;
+	void write_via_temp (boost::filesystem::path temp, boost::filesystem::path final) const;
 
-	Data (boost::filesystem::path file);
+	boost::shared_array<uint8_t> data () const {
+		return _data;
+	}
+
+	int size () const {
+		return _size;
+	}
 
-	boost::shared_array<uint8_t> data;
-	boost::uintmax_t size;
+private:
+	boost::shared_array<uint8_t> _data;
+	int _size;
 };
 
 }