summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-09-09 08:16:28 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-09-09 08:16:28 +0200
commita0896965f237d0cbaec9d40e374425971db8c61a (patch)
tree6383347a66275136c392c92e89f2c64c5436c95d
parent2d1e3d06c515178f3a173030a64885ad5ca7cc1f (diff)
downloaddabmux-a0896965f237d0cbaec9d40e374425971db8c61a.tar.gz
dabmux-a0896965f237d0cbaec9d40e374425971db8c61a.tar.bz2
dabmux-a0896965f237d0cbaec9d40e374425971db8c61a.zip
Reindent code and update doc
-rw-r--r--doc/advanced.mux12
-rw-r--r--src/fig/FIG0.cpp26
2 files changed, 17 insertions, 21 deletions
diff --git a/doc/advanced.mux b/doc/advanced.mux
index e82dcb3..4543998 100644
--- a/doc/advanced.mux
+++ b/doc/advanced.mux
@@ -276,25 +276,21 @@ components {
; FIG 0/13 is only transmitted when figtype is defined.
; The -d option on the command line is:
;datagroup (true|false)
- ; and defaults to false. You should normally set
- ;datagroup true
- ; if your packet mode channel is tranferrng an MOT application such
- ; as EPG or Slideshow.
+ ; and defaults to false. You should normally set
+ ;datagroup true
+ ; if your packet mode subchannel is tranferring an MOT application such
+ ; as EPG or Slideshow.
}
comp-lu {
service srv-lu
subchannel sub-lu
-
- datagroup true
figtype 0x2
}
comp-ri {
service srv-ri
subchannel sub-ri
-
- datagroup true
figtype 0x2
}
}
diff --git a/src/fig/FIG0.cpp b/src/fig/FIG0.cpp
index 8c26dff..4ac4e5e 100644
--- a/src/fig/FIG0.cpp
+++ b/src/fig/FIG0.cpp
@@ -980,19 +980,19 @@ FillStatus FIG0_13::fill(uint8_t *buf, size_t max_size)
FIG0_13_app* app = (FIG0_13_app*)buf;
app->setType((*componentFIG0_13)->packet.appType);
- if (app->typeLow == FIG0_13_APPTYPE_EPG) {
- app->length = 2;
- app->xpad = htons(0x0100);
- /* xpad used to hold two bytes of EPG profile information
- 01 = basic profile
- 00 = list terminator */
- }
- else {
- app->length = 0;
- }
- buf += 2 + app->length;
- remaining -= 2 + app->length;
- fig0->Length += 2 + app->length;
+ if (app->typeLow == FIG0_13_APPTYPE_EPG) {
+ app->length = 2;
+ app->xpad = htons(0x0100);
+ /* xpad used to hold two bytes of EPG profile information
+ 01 = basic profile
+ 00 = list terminator */
+ }
+ else {
+ app->length = 0;
+ }
+ buf += 2 + app->length;
+ remaining -= 2 + app->length;
+ fig0->Length += 2 + app->length;
}
}