From: Robin Gareus <robin@gareus.org>
Date: Thu, 14 Apr 2016 10:45:02 +0000 (+0200)
Subject: Revert "remove C++11'isms from libptformat. back to C++98 compat."
X-Git-Tag: 5.0-pre0~957
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=eda1508da1c7fadc7683fe1e6940d09237278d40;p=ardour.git

Revert "remove C++11'isms from libptformat. back to C++98 compat."

This reverts commit 48532baaa7eeda99e9b5ea880f52308570dc3181.
---

diff --git a/libs/ptformat/ptfformat.cc b/libs/ptformat/ptfformat.cc
index 6d055d4a36..62fc0293c7 100644
--- a/libs/ptformat/ptfformat.cc
+++ b/libs/ptformat/ptfformat.cc
@@ -589,13 +589,18 @@ PTFFormat::parserest5(void) {
 				vector<track_t>::iterator ti;
 				vector<track_t>::iterator bt = tracks.begin();
 				vector<track_t>::iterator et = tracks.end();
-				track_t tr ( name, 0, 0, &r);
+				track_t tr = { name, 0, 0, r };
 				if ((ti = std::find(bt, et, tr)) != et) {
 					tracknumber = (*ti).index;
 				} else {
 					tracknumber = tracks.size() + 1;
 				}
-				track_t t ( name, (uint16_t)tracknumber, uint8_t(0), &r);
+				track_t t = {
+					name,
+					(uint16_t)tracknumber,
+					uint8_t(0),
+					r
+				};
 				tracks.push_back(t);
 			} else {
 				region_t r = {
@@ -610,13 +615,18 @@ PTFFormat::parserest5(void) {
 				vector<track_t>::iterator ti;
 				vector<track_t>::iterator bt = tracks.begin();
 				vector<track_t>::iterator et = tracks.end();
-				track_t tr ( name, 0, 0, &r );
+				track_t tr = { name, 0, 0, r };
 				if ((ti = std::find(bt, et, tr)) != et) {
 					tracknumber = (*ti).index;
 				} else {
 					tracknumber = tracks.size() + 1;
 				}
-				track_t t ( name, (uint16_t)tracknumber, uint8_t(0), &r);
+				track_t t = {
+					name,
+					(uint16_t)tracknumber,
+					uint8_t(0),
+					r
+				};
 				tracks.push_back(t);
 			}
 			rindex++;
@@ -1297,7 +1307,7 @@ PTFFormat::parserest10(void) {
 					vector<region_t>::iterator finish = regions.end();
 					vector<region_t>::iterator found;
 					if ((found = std::find(begin, finish, tr.reg)) != finish) {
-						tr.set_region (&(*found));
+						tr.reg = (*found);
 					}
 					i = l+16;
 					offset = 0;
diff --git a/libs/ptformat/ptfformat.h b/libs/ptformat/ptfformat.h
index 8b2f58de73..f2c51d9830 100644
--- a/libs/ptformat/ptfformat.h
+++ b/libs/ptformat/ptfformat.h
@@ -39,12 +39,12 @@ public:
 		int64_t     posabsolute;
 		int64_t     length;
 
-		bool operator <(const struct wav& other) const {
+		bool operator <(const struct wav& other) {
 			return (strcasecmp(this->filename.c_str(),
 					other.filename.c_str()) < 0);
 		}
 
-		bool operator ==(const struct wav& other) const {
+		bool operator ==(const struct wav& other) {
 			return (this->filename == other.filename ||
 				this->index == other.index);
 		}
@@ -65,25 +65,6 @@ public:
 	} region_t;
 
 	typedef struct track {
-		track ()
-			: index (0)
-			, playlist (0)
-		{
-			memset ((void*)&reg, 0, sizeof(region_t));
-		}
-
-		track (std::string n, uint16_t i, uint8_t p, region_t *r)
-			: name (n)
-			, index (i)
-			, playlist (p)
-		{
-			set_region (r);
-		}
-
-		void set_region (region_t *r) {
-			memcpy ((void*)&reg, (void*)r, sizeof(region_t));
-		}
-
 		std::string name;
 		uint16_t    index;
 		uint8_t     playlist;