aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2020-04-21 15:39:26 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2020-04-21 15:39:26 +0200
commit8c478b0fd3988c1967bb1040fd97d5b4ac9a4ff4 (patch)
tree4ad5a0ea151f2117845eda1acf6c820076014ef9 /contrib
parentb1438d4fa31aa9e967f1f7e2d48f55ca371151d1 (diff)
downloadODR-AudioEnc-8c478b0fd3988c1967bb1040fd97d5b4ac9a4ff4.tar.gz
ODR-AudioEnc-8c478b0fd3988c1967bb1040fd97d5b4ac9a4ff4.tar.bz2
ODR-AudioEnc-8c478b0fd3988c1967bb1040fd97d5b4ac9a4ff4.zip
Fix multi output when combining EDI and ZMQ
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Socket.cpp4
-rw-r--r--contrib/Socket.h2
-rw-r--r--contrib/edi/Transport.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/Socket.cpp b/contrib/Socket.cpp
index 8b8d0e2..159de7e 100644
--- a/contrib/Socket.cpp
+++ b/contrib/Socket.cpp
@@ -925,13 +925,13 @@ TCPSendClient::~TCPSendClient()
}
}
-void TCPSendClient::sendall(std::vector<uint8_t>&& buffer)
+void TCPSendClient::sendall(const std::vector<uint8_t>& buffer)
{
if (not m_running) {
throw runtime_error(m_exception_data);
}
- m_queue.push(move(buffer));
+ m_queue.push(buffer);
}
void TCPSendClient::process()
diff --git a/contrib/Socket.h b/contrib/Socket.h
index b342d8b..84def40 100644
--- a/contrib/Socket.h
+++ b/contrib/Socket.h
@@ -300,7 +300,7 @@ class TCPSendClient {
/* Throws a runtime_error on error
*/
- void sendall(std::vector<uint8_t>&& buffer);
+ void sendall(const std::vector<uint8_t>& buffer);
private:
void process();
diff --git a/contrib/edi/Transport.cpp b/contrib/edi/Transport.cpp
index c7bde8f..4c91483 100644
--- a/contrib/edi/Transport.cpp
+++ b/contrib/edi/Transport.cpp
@@ -149,7 +149,7 @@ void Sender::write(const TagPacket& tagpacket)
tcp_dispatchers.at(tcp_dest.get())->write(edi_frag);
}
else if (auto tcp_dest = dynamic_pointer_cast<edi::tcp_client_t>(dest)) {
- tcp_senders.at(tcp_dest.get())->sendall(move(edi_frag));
+ tcp_senders.at(tcp_dest.get())->sendall(edi_frag);
}
else {
throw logic_error("EDI destination not implemented");
@@ -175,7 +175,7 @@ void Sender::write(const TagPacket& tagpacket)
tcp_dispatchers.at(tcp_dest.get())->write(af_packet);
}
else if (auto tcp_dest = dynamic_pointer_cast<edi::tcp_client_t>(dest)) {
- tcp_senders.at(tcp_dest.get())->sendall(move(af_packet));
+ tcp_senders.at(tcp_dest.get())->sendall(af_packet);
}
else {
throw logic_error("EDI destination not implemented");