aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--src/DabMultiplexer.cpp6
-rw-r--r--src/zmq2edi/zmq2edi.cpp2
4 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9909265..307023f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
This file contains information about the changes done to
ODR-DabMux in this repository
+2019-06-25: Matthias P. Braendli <matthias@mpb.li>
+ (v2.4.1):
+ Fix bug when odr-zmq2edi is used with more than one destination.
+
2019-06-07: Matthias P. Braendli <matthias@mpb.li>
(v2.4.0):
Add timestamp offset setting, and fix bug due to UTCO offset
diff --git a/configure.ac b/configure.ac
index 8c7c3b0..50623a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
# along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.69)
-AC_INIT([ODR-DabMux], [2.4.0], [matthias.braendli@mpb.li])
+AC_INIT([ODR-DabMux], [2.4.1], [matthias.braendli@mpb.li])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
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;