Merge pull request #66 from pothosware/vso_fix_remote_scale_args

Fix wrong remote:scale argument parsing
pothosware · Mar 2, 2019 · a6fbf2d · a6fbf2d
2 parents 594af0e + 7a2a857
commit a6fbf2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/client/Streaming.cpp b/client/Streaming.cpp
@@ -188,7 +188,7 @@ SoapySDR::Stream *SoapyRemoteDevice::setupStream(
     //use the native scale factor when the remote format is native,
     //otherwise the default scale factor is the max signed integer
     double scaleFactor = (remoteFormat == nativeFormat)?nativeScaleFactor:double(1 << ((SoapySDR::formatToSize(remoteFormat)*4)-1));
-    const auto scaleFactorIt = args.find(SOAPY_REMOTE_KWARG_SCALAR);
+    const auto scaleFactorIt = args.find(SOAPY_REMOTE_KWARG_SCALE);
     if (scaleFactorIt != args.end()) scaleFactor = std::stod(scaleFactorIt->second);
 
     //determine reliable stream mode with tcp or datagram mode

diff --git a/common/SoapyRemoteDefs.hpp b/common/SoapyRemoteDefs.hpp
@@ -17,8 +17,8 @@
 //! Stream args key to set the format on the remote server
 #define SOAPY_REMOTE_KWARG_FORMAT (SOAPY_REMOTE_KWARG_PREFIX "format")
 
-//! Stream args key to set the scalar for local float conversions
-#define SOAPY_REMOTE_KWARG_SCALAR (SOAPY_REMOTE_KWARG_PREFIX "scalar")
+//! Stream args key to set the scale for local float conversions
+#define SOAPY_REMOTE_KWARG_SCALE (SOAPY_REMOTE_KWARG_PREFIX "scale")
 
 //! Stream args key to set the buffer MTU bytes for network transfers
 #define SOAPY_REMOTE_KWARG_MTU (SOAPY_REMOTE_KWARG_PREFIX "mtu")