aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2019-07-02 15:30:45 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2019-07-02 15:30:45 +0200
commit6ff1dd95a6552c0f7e868dda1dffeb9ae572b8b7 (patch)
treeb728fb72c47c4199c8c7fefdba34d16658fe47a6 /src
parent03967733d70220e2de7af3cdad320aec5c82ede1 (diff)
parent9f4230fe2977806e213b2747c9b7748763b99c0f (diff)
downloaddabmux-6ff1dd95a6552c0f7e868dda1dffeb9ae572b8b7.tar.gz
dabmux-6ff1dd95a6552c0f7e868dda1dffeb9ae572b8b7.tar.bz2
dabmux-6ff1dd95a6552c0f7e868dda1dffeb9ae572b8b7.zip
Merge branch 'next' into ediInput
Diffstat (limited to 'src')
-rw-r--r--src/DabMultiplexer.cpp6
-rw-r--r--src/zmq2edi/zmq2edi.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp
index 9ff28a3..489787f 100644
--- a/src/DabMultiplexer.cpp
+++ b/src/DabMultiplexer.cpp
@@ -284,13 +284,13 @@ void DabMultiplexer::prepare_services_components()
component->subchId, component->serviceId);
throw MuxInitException();
}
- if ((*subchannel)->type != subchannel_type_t::Packet) continue;
- component->packet.id = cur_packetid++;
+ if ((*subchannel)->type == subchannel_type_t::Packet) {
+ component->packet.id = cur_packetid++;
+ }
rcs.enrol(component.get());
}
-
}
void DabMultiplexer::prepare_data_inputs()
diff --git a/src/zmq2edi/zmq2edi.cpp b/src/zmq2edi/zmq2edi.cpp
index a2daf49..3888d8a 100644
--- a/src/zmq2edi/zmq2edi.cpp
+++ b/src/zmq2edi/zmq2edi.cpp
@@ -169,7 +169,7 @@ static void add_edi_destination(void)
}
edi_conf.destinations.push_back(move(edi_destination));
- edi_destination.reset();
+ edi_destination = std::make_shared<edi::udp_destination_t>();
source_port_set = false;
source_addr_set = false;