summaryrefslogtreecommitdiffstats
path: root/src/DabMultiplexer.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-04-15 11:10:00 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-04-15 11:10:00 +0200
commit07d3536083ad8d0f08819e8be89aa5934fcaa712 (patch)
treec56bd0a1f14a0b8722f9950cf539a12b641706c1 /src/DabMultiplexer.cpp
parent8ee90d42fc999d4048d789fa719aff20df3dfba4 (diff)
downloaddabmux-07d3536083ad8d0f08819e8be89aa5934fcaa712.tar.gz
dabmux-07d3536083ad8d0f08819e8be89aa5934fcaa712.tar.bz2
dabmux-07d3536083ad8d0f08819e8be89aa5934fcaa712.zip
Rename dabSubchannel to DabSubchannel
Diffstat (limited to 'src/DabMultiplexer.cpp')
-rw-r--r--src/DabMultiplexer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp
index 201e710..7ae3f7f 100644
--- a/src/DabMultiplexer.cpp
+++ b/src/DabMultiplexer.cpp
@@ -155,7 +155,7 @@ void DabMultiplexer::prepare()
throw MuxInitException();
}
- vector<dabSubchannel*>::iterator subchannel =
+ vector<DabSubchannel*>::iterator subchannel =
ensemble->subchannels.end() - 1;
if ((*subchannel)->startAddress + (*subchannel)->getSizeCu() > 864) {
@@ -223,7 +223,7 @@ void DabMultiplexer::prepare_services_components()
dabProtection* protection = NULL;
vector<DabComponent*>::iterator component;
- vector<dabSubchannel*>::iterator subchannel;
+ vector<DabSubchannel*>::iterator subchannel;
for (auto service : ensemble->services) {
if (ids.find(service->id) != ids.end()) {
@@ -303,7 +303,7 @@ void DabMultiplexer::prepare_services_components()
void DabMultiplexer::prepare_data_inputs()
{
dabProtection* protection = NULL;
- vector<dabSubchannel*>::iterator subchannel;
+ vector<DabSubchannel*>::iterator subchannel;
// Prepare and check the data inputs
for (subchannel = ensemble->subchannels.begin();
@@ -372,7 +372,7 @@ void DabMultiplexer::mux_frame(std::vector<std::shared_ptr<DabOutput> >& outputs
vector<std::shared_ptr<DabService> >::iterator service;
vector<DabComponent*>::iterator component;
- vector<dabSubchannel*>::iterator subchannel;
+ vector<DabSubchannel*>::iterator subchannel;
// FIC Length, DAB Mode I, II, IV -> FICL = 24, DAB Mode III -> FICL = 32
unsigned FICL = (ensemble->mode == 3 ? 32 : 24);
@@ -380,7 +380,7 @@ void DabMultiplexer::mux_frame(std::vector<std::shared_ptr<DabOutput> >& outputs
// For EDI, save ETI(LI) Management data into a TAG Item DETI
TagDETI edi_tagDETI;
TagStarPTR edi_tagStarPtr;
- map<dabSubchannel*, TagESTn> edi_subchannelToTag;
+ map<DabSubchannel*, TagESTn> edi_subchannelToTag;
// The above Tag Items will be assembled into a TAG Packet
TagPacket edi_tagpacket(edi_conf.tagpacket_alignment);