diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-04-04 10:47:58 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-04-04 11:07:37 +0200 |
| commit | 5953e2ce95dc0cb809d529c4103ae6b80f0248c0 (patch) | |
| tree | 5ef857b37b4ab889e8d8f56c010283f77821a8c1 /src/DabMux.cpp.patch | |
| parent | 2e325d2c2a34ecda37636e67969ee1550e78fbba (diff) | |
| download | dabmux-5953e2ce95dc0cb809d529c4103ae6b80f0248c0.tar.gz dabmux-5953e2ce95dc0cb809d529c4103ae6b80f0248c0.tar.bz2 dabmux-5953e2ce95dc0cb809d529c4103ae6b80f0248c0.zip | |
Remove some compilation warnings
Diffstat (limited to 'src/DabMux.cpp.patch')
| -rw-r--r-- | src/DabMux.cpp.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/src/DabMux.cpp.patch b/src/DabMux.cpp.patch new file mode 100644 index 0000000..a6057c9 --- /dev/null +++ b/src/DabMux.cpp.patch @@ -0,0 +1,58 @@ ++++ DabMux.cpp 2014-02-27 17:56:41.108646157 +0100 +--- DabMux.cpp.orig 2014-02-27 17:56:01.080447673 +0100 +@@ -616,8 +616,6 @@ + typeHigh = type >> 3; + typeLow = type & 0x1f; + } ++ //CSP - SERGIO ++ uint32_t xpad; + } PACKED; + + +@@ -2060,14 +2058,12 @@ + returnCode = -1; + goto EXIT; + } ++ /* CSP - SERGIO + if (!(*component)->isPacketComponent(ensemble->subchannels)) { + etiLog.printHeader(TcpLog::ERR, "application type\n"); + printUsage(progName); + returnCode = -1; + goto EXIT; + } ++ */ + (*component)->packet.appType = strtoul(optarg, NULL, 0); + break; + case 'g': +@@ -3210,7 +3206,7 @@ + goto EXIT; + } + ++ // CSP - SERGIO if ((*subchannel)->type != 3) continue; +- if ((*subchannel)->type != 3) continue; + + if ((*component)->packet.appType != 0xffff) { + if (fig0 == NULL) { +@@ -3236,18 +3232,10 @@ + + FIG0_13_app* app = (FIG0_13_app*)&etiFrame[index]; + app->setType((*component)->packet.appType); ++ // CSP - SERGIO app->length = 0; ++ app->length = 4; ++ app->xpad = 0x0cbc0000; ++ ++ ++ //index += 2; ++ //figSize += 2; ++ //fig0->Length += 2; ++ ++ index += 6; ++ figSize += 6; ++ fig0->Length += 6; +- app->length = 0; +- index += 2; +- figSize += 2; +- fig0->Length += 2; + + if (figSize > 30) { + etiLog.printHeader(TcpLog::ERR, |