From 55a66f6408042abfd102f92fd0072a000d8e0235 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 15 Aug 2015 11:53:55 +0200
Subject: Add cluster handling for announcements

---
 src/fig/FIG0.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/fig/FIG0.cpp')

diff --git a/src/fig/FIG0.cpp b/src/fig/FIG0.cpp
index 7cb3dde..9f89109 100644
--- a/src/fig/FIG0.cpp
+++ b/src/fig/FIG0.cpp
@@ -953,8 +953,7 @@ FillStatus FIG0_18::fill(uint8_t *buf, size_t max_size)
             continue;
         }
 
-        // TODO support more than one cluster
-        const int numclusters = 1;
+        const ssize_t numclusters = (*service)->clusters.size();
 
         if (remaining < (int)sizeof(FIGtype0_18) + numclusters) {
             break;
@@ -982,8 +981,10 @@ FillStatus FIG0_18::fill(uint8_t *buf, size_t max_size)
         programme->Rfa = 0;
         programme->NumClusters = numclusters;
         buf += sizeof(FIGtype0_18);
-        buf[0] = 0x1; // TODO support not only cluster 1
-        buf += numclusters;
+
+        for (uint8_t cluster : (*service)->clusters) {
+            *(buf++) = cluster;
+        }
 
         fig0->Length += sizeof(FIGtype0_18) + numclusters;
         remaining -= sizeof(FIGtype0_18) + numclusters;
-- 
cgit v1.2.3