diff --git a/software/libcariboulite/src/soapy_api/Cariboulite.cpp b/software/libcariboulite/src/soapy_api/Cariboulite.cpp index bee19e00..be0e4b03 100644 --- a/software/libcariboulite/src/soapy_api/Cariboulite.cpp +++ b/software/libcariboulite/src/soapy_api/Cariboulite.cpp @@ -246,7 +246,7 @@ void Cariboulite::setSampleRate( const int direction, const size_t channel, cons if (std::fabs(rate - (666000.0)) < 1) { fs = cariboulite_radio_rx_sample_rate_666khz; - SoapySDR::logf(SOAPY_SDR_WARNING, "setSampleRate: using rounded rate 666000 is deprecated; use 2e6/3 or 666666.7."); + SoapySDR_logf(SOAPY_SDR_WARNING, "setSampleRate: using rounded rate 666000 is deprecated; use 2e6/3 or 666666.7."); } if (std::fabs(rate - (2000000.0/3)) < 1) fs = cariboulite_radio_rx_sample_rate_666khz; if (std::fabs(rate - (800000.0)) < 1) fs = cariboulite_radio_rx_sample_rate_800khz; @@ -254,7 +254,7 @@ void Cariboulite::setSampleRate( const int direction, const size_t channel, cons if (std::fabs(rate - (1333000.0)) < 1) fs = cariboulite_radio_rx_sample_rate_1333khz; { fs = cariboulite_radio_rx_sample_rate_1333khz; - SoapySDR::logf(SOAPY_SDR_WARNING, "setSampleRate: using rounded rate 1333000 is deprecated; use 4e6/3 or 1333333.3."); + SoapySDR_logf(SOAPY_SDR_WARNING, "setSampleRate: using rounded rate 1333000 is deprecated; use 4e6/3 or 1333333.3."); } if (std::fabs(rate - (4000000.0/3)) < 1) fs = cariboulite_radio_rx_sample_rate_1333khz; if (std::fabs(rate - (2000000.0)) < 1) fs = cariboulite_radio_rx_sample_rate_2000khz; diff --git a/software/libcariboulite/src/soapy_api/CaribouliteSession.cpp b/software/libcariboulite/src/soapy_api/CaribouliteSession.cpp index 545bdb08..8d1f828e 100644 --- a/software/libcariboulite/src/soapy_api/CaribouliteSession.cpp +++ b/software/libcariboulite/src/soapy_api/CaribouliteSession.cpp @@ -49,7 +49,7 @@ SoapyCaribouliteSession::SoapyCaribouliteSession(void) int ret = cariboulite_init_driver(&sys, NULL); if (ret != 0) { - SoapySDR::logf(SOAPY_SDR_ERROR, "cariboulite_init_driver() failed"); + SoapySDR_logf(SOAPY_SDR_ERROR, "cariboulite_init_driver() failed"); } // setup the signal handler diff --git a/software/libcariboulite/src/soapy_api/CaribouliteStream.hpp b/software/libcariboulite/src/soapy_api/CaribouliteStream.hpp index 42abe51e..d61ec881 100644 --- a/software/libcariboulite/src/soapy_api/CaribouliteStream.hpp +++ b/software/libcariboulite/src/soapy_api/CaribouliteStream.hpp @@ -103,7 +103,7 @@ class SoapySDR::Stream cariboulite_channel_dir_en getInnerStreamType(void); void setInnerStreamType(cariboulite_channel_dir_en dir); void setDigitalFilter(DigitalFilterType type); - DigitalFilterType getDigitalFilter() const { return filterType }; + DigitalFilterType getDigitalFilter() const { return filterType; } int setFormat(const std::string &fmt); inline int readerThreadRunning() {return reader_thread_running;} void activateStream(int active) {stream_active = active;}