From b4823b1e44c42e137f85202621b07d01ccde111b Mon Sep 17 00:00:00 2001
From: Stefan Pöschel <github@basicmaster.de>
Date: Sun, 26 Jul 2015 14:21:16 +0200
Subject: FIG 0/13: fixed wrongly set DG flag + removed CAOrg (as already
 indicated)

---
 src/DabMultiplexer.cpp | 5 ++---
 src/DabMultiplexer.h   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp
index db158da..e79d3fa 100644
--- a/src/DabMultiplexer.cpp
+++ b/src/DabMultiplexer.cpp
@@ -1385,8 +1385,8 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu
 
                     FIG0_13_app* app = (FIG0_13_app*)&etiFrame[index];
                     app->setType((*componentFIG0_13)->audio.uaType);
-                    app->length = 4;
-                    app->xpad = htonl(0x0cbc0000);
+                    app->length = 2;
+                    app->xpad = htons(0x0c3c);
                     /* xpad meaning
                        CA        = 0
                        CAOrg     = 0
@@ -1395,7 +1395,6 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu
                        DG        = 0 (MSC data groups used)
                        Rfu       = 0
                        DSCTy(6)  = 60 (MOT)
-                       CAOrg(16) = 0
                        */
 
                     index += 2 + app->length;
diff --git a/src/DabMultiplexer.h b/src/DabMultiplexer.h
index 44e9bdb..de05b6c 100644
--- a/src/DabMultiplexer.h
+++ b/src/DabMultiplexer.h
@@ -435,7 +435,7 @@ struct FIG0_13_app {
         typeHigh = type >> 3;
         typeLow = type & 0x1f;
     }
-    uint32_t xpad;
+    uint16_t xpad;
 } PACKED;
 
 #define FIG0_13_APPTYPE_SLIDESHOW  0x2
-- 
cgit v1.2.3