From 32e93176fa91b215d68dee24e7887a21041da54c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 31 Jul 2012 11:41:22 +0100
Subject: Use int64 in a few places.

---
 src/asset_map.cc |  8 ++++----
 src/asset_map.h  |  8 ++++----
 src/cpl.cc       | 12 ++++++------
 src/cpl.h        | 12 ++++++------
 src/pkl.cc       |  2 +-
 src/pkl.h        |  2 +-
 src/xml.cc       |  6 +++---
 src/xml.h        |  2 +-
 8 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/asset_map.cc b/src/asset_map.cc
index 11e80284..9276170c 100644
--- a/src/asset_map.cc
+++ b/src/asset_map.cc
@@ -8,7 +8,7 @@ AssetMap::AssetMap (string file)
 {
 	id = string_node ("Id");
 	creator = string_node ("Creator");
-	volume_count = int_node ("VolumeCount");
+	volume_count = int64_node ("VolumeCount");
 	issue_date = string_node ("IssueDate");
 	issuer = string_node ("Issuer");
 	assets = sub_nodes<AssetMapAsset> ("AssetList", "Asset");
@@ -26,8 +26,8 @@ Chunk::Chunk (xmlpp::Node const * node)
 	: XMLNode (node)
 {
 	path = string_node ("Path");
-	volume_index = int_node ("VolumeIndex");
-	offset = int_node ("Offset");
-	length = int_node ("Length");
+	volume_index = int64_node ("VolumeIndex");
+	offset = int64_node ("Offset");
+	length = int64_node ("Length");
 }
 
diff --git a/src/asset_map.h b/src/asset_map.h
index 754528ec..34e301a5 100644
--- a/src/asset_map.h
+++ b/src/asset_map.h
@@ -10,9 +10,9 @@ public:
 	Chunk (xmlpp::Node const * node);
 
 	std::string path;
-	int volume_index;
-	int offset;
-	int length;
+	int64_t volume_index;
+	int64_t offset;
+	int64_t length;
 };
 
 class AssetMapAsset : public XMLNode
@@ -33,7 +33,7 @@ public:
 
 	std::string id;
 	std::string creator;
-	int volume_count;
+	int64_t volume_count;
 	std::string issue_date;
 	std::string issuer;
 	std::list<boost::shared_ptr<AssetMapAsset> > assets;
diff --git a/src/cpl.cc b/src/cpl.cc
index 521e270e..b0bf6fcf 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -51,9 +51,9 @@ MainPicture::MainPicture (xmlpp::Node const * node)
 	id = string_node ("Id");
 	annotation_text = string_node ("AnnotationText");
 	edit_rate = fraction_node ("EditRate");
-	intrinsic_duration = int_node ("IntrinsicDuration");
-	entry_point = int_node ("EntryPoint");
-	duration = int_node ("Duration");
+	intrinsic_duration = int64_node ("IntrinsicDuration");
+	entry_point = int64_node ("EntryPoint");
+	duration = int64_node ("Duration");
 	frame_rate = fraction_node ("FrameRate");
 	screen_aspect_ratio = fraction_node ("ScreenAspectRatio");
 
@@ -66,9 +66,9 @@ MainSound::MainSound (xmlpp::Node const * node)
 	id = string_node ("Id");
 	annotation_text = string_node ("AnnotationText");
 	edit_rate = fraction_node ("EditRate");
-	intrinsic_duration = int_node ("IntrinsicDuration");
-	entry_point = int_node ("EntryPoint");
-	duration = int_node ("Duration");
+	intrinsic_duration = int64_node ("IntrinsicDuration");
+	entry_point = int64_node ("EntryPoint");
+	duration = int64_node ("Duration");
 
 	done ();
 }
diff --git a/src/cpl.h b/src/cpl.h
index e11294bd..f49b6efb 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -12,9 +12,9 @@ public:
 	std::string id;
 	std::string annotation_text;
 	Fraction edit_rate;
-	int intrinsic_duration;
-	int entry_point;
-	int duration;
+	int64_t intrinsic_duration;
+	int64_t entry_point;
+	int64_t duration;
 	Fraction frame_rate;
 	Fraction screen_aspect_ratio;
 };
@@ -28,9 +28,9 @@ public:
 	std::string id;
 	std::string annotation_text;
 	Fraction edit_rate;
-	int intrinsic_duration;
-	int entry_point;
-	int duration;
+	int64_t intrinsic_duration;
+	int64_t entry_point;
+	int64_t duration;
 };
 
 class CPLAssetList : public XMLNode
diff --git a/src/pkl.cc b/src/pkl.cc
index 7e492d99..23a4f533 100644
--- a/src/pkl.cc
+++ b/src/pkl.cc
@@ -20,7 +20,7 @@ PKLAsset::PKLAsset (xmlpp::Node const * node)
 	id = string_node ("Id");
 	annotation_text = optional_string_node ("AnnotationText");
 	hash = string_node ("Hash");
-	size = int_node ("Size");
+	size = int64_node ("Size");
 	type = string_node ("Type");
 }
 	
diff --git a/src/pkl.h b/src/pkl.h
index 2b58c590..56cda966 100644
--- a/src/pkl.h
+++ b/src/pkl.h
@@ -12,7 +12,7 @@ public:
 	std::string id;
 	std::string annotation_text;
 	std::string hash;
-	int size;
+	int64_t size;
 	std::string type;
 };
 
diff --git a/src/xml.cc b/src/xml.cc
index 62e231d1..da4ae743 100644
--- a/src/xml.cc
+++ b/src/xml.cc
@@ -100,10 +100,10 @@ XMLNode::fraction_node (string name)
 	return Fraction (string_node (name));
 }
 
-int
-XMLNode::int_node (string name)
+int64_t
+XMLNode::int64_node (string name)
 {
-	return lexical_cast<int> (string_node (name));
+	return lexical_cast<int64_t> (string_node (name));
 }
 
 void
diff --git a/src/xml.h b/src/xml.h
index 3ff3e360..7cfb8e91 100644
--- a/src/xml.h
+++ b/src/xml.h
@@ -26,7 +26,7 @@ protected:
 	std::string optional_string_node (std::string);
 	ContentKind kind_node (std::string);
 	Fraction fraction_node (std::string);
-	int int_node (std::string);
+	int64_t int64_node (std::string);
 	void ignore_node (std::string);
 	void done ();
 
-- 
cgit v1.2.3