aboutsummaryrefslogtreecommitdiffstats
path: root/src/OutputUHD.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli (think) <matthias@mpb.li>2012-08-16 18:28:13 +0200
committerMatthias P. Braendli (think) <matthias@mpb.li>2012-08-16 18:28:13 +0200
commit06fe89bd86fc709908c5882a2c48d03fc0977a25 (patch)
treec2b39935d99e841e350af95c3d878155875f0a6a /src/OutputUHD.cpp
parentb946ff6bceef6150f19da0a86950ed9ebbf0c2cb (diff)
downloaddabmod-06fe89bd86fc709908c5882a2c48d03fc0977a25.tar.gz
dabmod-06fe89bd86fc709908c5882a2c48d03fc0977a25.tar.bz2
dabmod-06fe89bd86fc709908c5882a2c48d03fc0977a25.zip
crc-dabmod: added UHD tx gain remote control
Diffstat (limited to 'src/OutputUHD.cpp')
-rw-r--r--src/OutputUHD.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/OutputUHD.cpp b/src/OutputUHD.cpp
index 0195841..808d0e1 100644
--- a/src/OutputUHD.cpp
+++ b/src/OutputUHD.cpp
@@ -43,7 +43,7 @@ OutputUHD::OutputUHD(const char* device, unsigned sampleRate,
double frequency, int txgain, bool enableSync, bool muteNoTimestamps,
Logger& logger) :
ModOutput(ModFormat(1), ModFormat(0)),
- RemoteControl("uhd"),
+ RemoteControllable("uhd"),
myLogger(logger),
mySampleRate(sampleRate),
myTxGain(txgain),
@@ -55,7 +55,7 @@ OutputUHD::OutputUHD(const char* device, unsigned sampleRate,
device, this);
/* register the parameters that can be remote controlled */
- RC_ADD_PARAMETER("txgain", "UHD analog daughterboard TX gain")
+ RC_ADD_PARAMETER(txgain, "UHD analog daughterboard TX gain")
myDevice = device;
@@ -506,13 +506,13 @@ loopend:
}
-virtual void OutputUHD::set_parameter(string parameter, string value)
+void OutputUHD::set_parameter(string parameter, string value)
{
stringstream ss(value);
ss.exceptions ( stringstream::failbit | stringstream::badbit );
if (parameter == "txgain") {
- ss >> myTxStream;
+ ss >> myTxGain;
#if ENABLE_UHD
myUsrp->set_tx_gain(myTxGain);
#endif
@@ -524,7 +524,7 @@ virtual void OutputUHD::set_parameter(string parameter, string value)
}
}
-virtual string OutputUHD::get_parameter(string parameter)
+string OutputUHD::get_parameter(string parameter)
{
stringstream ss;
if (parameter == "txgain") {