From bad673c79b29d84abc802fb47c427586a14f2b5a Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 17 Mar 2014 20:22:41 +0100
Subject: Rename serviceProgramInd to serviceProgFIG0_2

---
 src/DabMux.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/DabMux.cpp b/src/DabMux.cpp
index f015927..5875b3e 100644
--- a/src/DabMux.cpp
+++ b/src/DabMux.cpp
@@ -267,7 +267,7 @@ int main(int argc, char *argv[])
 
     vector<dabOutput*> outputs;
     vector<DabService*>::iterator service = ensemble->services.end();
-    vector<DabService*>::iterator serviceProgramInd;
+    vector<DabService*>::iterator serviceProgFIG0_2;
     vector<DabService*>::iterator serviceDataInd;
     vector<DabService*>::iterator servicePty;
     vector<DabComponent*>::iterator component = ensemble->components.end();
@@ -613,7 +613,7 @@ int main(int argc, char *argv[])
     /*   Each iteration of the main loop creates one ETI frame */
 
     /* Used for FIG0/2 insertion */
-    serviceProgramInd = ensemble->services.end();
+    serviceProgFIG0_2 = ensemble->services.end();
     serviceDataInd = ensemble->services.end();
 
     componentIndicatorProgram = ensemble->components.end();
@@ -917,15 +917,15 @@ int main(int argc, char *argv[])
             fig0_2 = NULL;
             cur = 0;
 
-            if (serviceProgramInd == ensemble->services.end()) {
-                serviceProgramInd = ensemble->services.begin();
+            if (serviceProgFIG0_2 == ensemble->services.end()) {
+                serviceProgFIG0_2 = ensemble->services.begin();
             }
-            for (; serviceProgramInd != ensemble->services.end();
-                    ++serviceProgramInd) {
-                if (!(*serviceProgramInd)->nbComponent(ensemble->components)) {
+            for (; serviceProgFIG0_2 != ensemble->services.end();
+                    ++serviceProgFIG0_2) {
+                if (!(*serviceProgFIG0_2)->nbComponent(ensemble->components)) {
                     continue;
                 }
-                if ((*serviceProgramInd)->getType(ensemble) != 0) {
+                if ((*serviceProgFIG0_2)->getType(ensemble) != 0) {
                     continue;
                 }
 
@@ -945,28 +945,28 @@ int main(int argc, char *argv[])
                 }
 
                 if (figSize + 3
-                        + (*serviceProgramInd)->nbComponent(ensemble->components)
+                        + (*serviceProgFIG0_2)->nbComponent(ensemble->components)
                         * 2 > 30) {
                     break;
                 }
 
                 fig0_2serviceAudio = (FIGtype0_2_Service*) &etiFrame[index];
 
-                fig0_2serviceAudio->SId = htons((*serviceProgramInd)->id);
+                fig0_2serviceAudio->SId = htons((*serviceProgFIG0_2)->id);
                 fig0_2serviceAudio->Local_flag = 0;
                 fig0_2serviceAudio->CAId = 0;
                 fig0_2serviceAudio->NbServiceComp =
-                    (*serviceProgramInd)->nbComponent(ensemble->components);
+                    (*serviceProgFIG0_2)->nbComponent(ensemble->components);
                 index += 3;
                 fig0_2->Length += 3;
                 figSize += 3;
 
                 int curCpnt = 0;
                 for (component = getComponent(ensemble->components,
-                            (*serviceProgramInd)->id);
+                            (*serviceProgFIG0_2)->id);
                         component != ensemble->components.end();
                         component = getComponent(ensemble->components,
-                            (*serviceProgramInd)->id, component)) {
+                            (*serviceProgFIG0_2)->id, component)) {
                     subchannel = getSubchannel(ensemble->subchannels,
                             (*component)->subchId);
                     if (subchannel == ensemble->subchannels.end()) {
-- 
cgit v1.2.3