Rename some variables and re-implement collect().

1 files changed, 15 insertions, 24 deletions

diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc
index fe4f9ccdd..58d9e5357 100644
--- a/src/lib/kdm_with_metadata.cc
+++ b/src/lib/kdm_with_metadata.cc
@@ -105,41 +105,32 @@ make_zip_file (list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file,
 }
 
 
-/** Collect a list of KDMWithMetadatas into a list of list<KDMWithMetadata> so that each
- *  CinemaKDM contains the KDMs for its cinema.
+/** Collect a list of KDMWithMetadatas into a list of lists so that
+ *  each list contains the KDMs for one cinema.
  */
 list<list<KDMWithMetadataPtr> >
-collect (list<KDMWithMetadataPtr> screen_kdms)
+collect (list<KDMWithMetadataPtr> kdms)
 {
-	list<list<KDMWithMetadataPtr> > cinema_kdms;
+	list<list<KDMWithMetadataPtr> > grouped;
 
-	while (!screen_kdms.empty ()) {
-
-		/* Get all the screens from a single cinema */
-
-		list<KDMWithMetadataPtr> ck;
+	BOOST_FOREACH (KDMWithMetadataPtr i, kdms) {
 
-		list<KDMWithMetadataPtr>::iterator i = screen_kdms.begin ();
-		ck.push_back (*i);
-		list<KDMWithMetadataPtr>::iterator j = i;
-		++i;
-		screen_kdms.remove (*j);
+		list<list<KDMWithMetadataPtr> >::iterator j = grouped.begin ();
 
-		while (i != screen_kdms.end ()) {
-			if ((*i)->cinema() == ck.front()->cinema()) {
-				ck.push_back (*i);
-				list<KDMWithMetadataPtr>::iterator j = i;
-				++i;
-				screen_kdms.remove (*j);
-			} else {
-				++i;
+		while (j != grouped.end()) {
+			if (j->front()->cinema() == i->cinema()) {
+				j->push_back (i);
+				break;
 			}
 		}
 
-		cinema_kdms.push_back (ck);
+		if (j == grouped.end()) {
+			grouped.push_back (list<KDMWithMetadataPtr>());
+			grouped.back().push_back (i);
+		}
 	}
 
-	return cinema_kdms;
+	return grouped;
 }