diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-11 15:56:55 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-11 15:56:55 +0100 |
| commit | fdbea05b16e3c716b5226a1f0d45cc98561500e4 (patch) | |
| tree | d6f4046b7f10e9b68d279cd3e6f33665582b6177 /src/OutputUHD.cpp | |
| parent | f0cd709e645a3d2210fce5daf80138696aac84e3 (diff) | |
| download | dabmod-fdbea05b16e3c716b5226a1f0d45cc98561500e4.tar.gz dabmod-fdbea05b16e3c716b5226a1f0d45cc98561500e4.tar.bz2 dabmod-fdbea05b16e3c716b5226a1f0d45cc98561500e4.zip | |
Fix all the warnings shown since previous commit
Diffstat (limited to 'src/OutputUHD.cpp')
| -rw-r--r-- | src/OutputUHD.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/OutputUHD.cpp b/src/OutputUHD.cpp index e2616a6..b533075 100644 --- a/src/OutputUHD.cpp +++ b/src/OutputUHD.cpp @@ -472,7 +472,7 @@ int OutputUHD::process(Buffer* dataIn) myUsrp, myConf.dpdFeedbackServerPort, myConf.sampleRate); } - size_t num_frames = frames.push_wait_if_full(frame, + size_t num_frames = m_frames.push_wait_if_full(frame, FRAMES_MAX_SIZE); etiLog.log(trace, "UHD,push %zu", num_frames); } @@ -686,7 +686,7 @@ void OutputUHD::workerthread() struct UHDWorkerFrameData frame; etiLog.log(trace, "UHD,wait"); - frames.wait_and_pop(frame, pop_prebuffering); + m_frames.wait_and_pop(frame, pop_prebuffering); etiLog.log(trace, "UHD,pop"); handle_frame(&frame); @@ -989,10 +989,10 @@ void OutputUHD::set_parameter(const string& parameter, const string& value) throw ParameterError("Parameter " + parameter + " is read-only."); } else { - stringstream ss; - ss << "Parameter '" << parameter + stringstream ss_err; + ss_err << "Parameter '" << parameter << "' is not exported by controllable " << get_rc_name(); - throw ParameterError(ss.str()); + throw ParameterError(ss_err.str()); } } |