summaryrefslogtreecommitdiffstats
path: root/src/dabInputZmq.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-04-23 09:10:35 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-04-23 09:10:35 +0200
commit606e22abcf8b9f3c3d63ccc8ccf8ae4020c6ffd3 (patch)
treee067c99ea946ba4877e12e3939c7fe6433d94f6f /src/dabInputZmq.cpp
parent262a43fc5dcc04731a8951ee44555f582f7e8106 (diff)
downloaddabmux-606e22abcf8b9f3c3d63ccc8ccf8ae4020c6ffd3.tar.gz
dabmux-606e22abcf8b9f3c3d63ccc8ccf8ae4020c6ffd3.tar.bz2
dabmux-606e22abcf8b9f3c3d63ccc8ccf8ae4020c6ffd3.zip
Enable and take care of some warnings
Diffstat (limited to 'src/dabInputZmq.cpp')
-rw-r--r--src/dabInputZmq.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/dabInputZmq.cpp b/src/dabInputZmq.cpp
index 9d39945..5c20baf 100644
--- a/src/dabInputZmq.cpp
+++ b/src/dabInputZmq.cpp
@@ -386,9 +386,9 @@ int DabInputZmqMPEG::readFromSocket(size_t framesize)
}
else if (m_enable_input) {
// copy the input frame blockwise into the frame_buffer
- uint8_t* frame = new uint8_t[framesize];
- memcpy(frame, data, framesize);
- m_frame_buffer.push_back(frame);
+ uint8_t* framedata = new uint8_t[framesize];
+ memcpy(framedata, data, framesize);
+ m_frame_buffer.push_back(framedata);
}
else {
return 0;
@@ -397,7 +397,7 @@ int DabInputZmqMPEG::readFromSocket(size_t framesize)
else {
etiLog.level(error) <<
"inputZMQ " << m_name <<
- " wrong data size: recv'd " << msg.size() <<
+ " wrong data size: recv'd " << msg.size() << " Bytes" <<
", need " << framesize << ".";
messageReceived = false;
}
@@ -498,9 +498,6 @@ int DabInputZmqAAC::readFromSocket(size_t framesize)
void DabInputZmqBase::set_parameter(const string& parameter,
const string& value)
{
- stringstream ss(value);
- ss.exceptions ( stringstream::failbit | stringstream::badbit );
-
if (parameter == "buffer") {
size_t new_limit = atol(value.c_str());