X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fzone.cpp;h=8b6c95f9c9af2fd0911c956e76fe44e15cfb0362;hb=1e6ae9272462ae82093a572f34494b265db7b1a3;hp=dc60a3a2630f13ccb3b02cd2d72ef8d722412799;hpb=1124a98ce5e1edee1904eeec089976d446601afd;p=r2c2.git

diff --git a/source/libr2c2/zone.cpp b/source/libr2c2/zone.cpp
index dc60a3a..8b6c95f 100644
--- a/source/libr2c2/zone.cpp
+++ b/source/libr2c2/zone.cpp
@@ -38,6 +38,11 @@ void Zone::set_name(const string &g, const string &q, unsigned n)
 	qualifier = q;
 	number = n;
 
+	update_name();
+}
+
+void Zone::update_name()
+{
 	string full_name = group;
 	if(!qualifier.empty())
 	{
@@ -57,12 +62,24 @@ void Zone::save(list<DataFile::Statement> &st) const
 	if(number)
 		st.push_back((DataFile::Statement("number"), number));
 
-	set<unsigned> block_ids;
-	for(TrackSet::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		block_ids.insert((*i)->get_block().get_id());
+	unsigned last_block = 0;
+	TrackIter iter = ends[0].reverse();
+	while(iter && tracks.count(iter.track()))
+	{
+		unsigned block_id = iter->get_block().get_id();
+		if(block_id!=last_block)
+		{
+			st.push_back((DataFile::Statement("block"), block_id));
+			last_block = block_id;
+		}
 
-	for(set<unsigned>::const_iterator i=block_ids.begin(); i!=block_ids.end(); ++i)
-		st.push_back((DataFile::Statement("block"), *i));
+		iter = next_iter(iter);
+	}
+}
+
+DataFile::Statement Zone::save_reference() const
+{
+	return (DataFile::Statement("zone"), group, number);
 }
 
 
@@ -75,11 +92,15 @@ Zone::Loader::Loader(Zone &z):
 	add("qualifier", &Zone::qualifier);
 }
 
+void Zone::Loader::finish()
+{
+	obj.update_name();
+}
+
 void Zone::Loader::block(unsigned b)
 {
 	Block &blk = obj.layout.get_block(b);
-	const set<Track *> &btracks = blk.get_tracks();
-	obj.tracks.insert(btracks.begin(), btracks.end());
+	obj.add_tracks(blk.get_tracks());
 }
 
 } // namespace R2C2