[hamradio-commits] [gnss-sdr] 13/44: Changing names to emphasize that they are complex types
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sun Feb 15 15:32:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.
commit bd01c841c9ec160886d276b6f8cf67ff88db95e2
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Wed Feb 4 02:12:37 2015 +0100
Changing names to emphasize that they are complex types
---
.../adapters/direct_resampler_conditioner.cc | 8 +++----
.../resampler/gnuradio_blocks/CMakeLists.txt | 4 ++--
...er_bb.cc => direct_resampler_conditioner_cb.cc} | 20 ++++++++--------
...oner_bb.h => direct_resampler_conditioner_cb.h} | 28 +++++++++++-----------
...er_ss.cc => direct_resampler_conditioner_cs.cc} | 20 ++++++++--------
...oner_ss.h => direct_resampler_conditioner_cs.h} | 28 +++++++++++-----------
6 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc
index 867a7ce..e2a5628 100644
--- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc
+++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc
@@ -34,8 +34,8 @@
#include <gnuradio/blocks/file_sink.h>
#include <volk/volk.h>
#include "direct_resampler_conditioner_cc.h"
-#include "direct_resampler_conditioner_ss.h"
-#include "direct_resampler_conditioner_bb.h"
+#include "direct_resampler_conditioner_cs.h"
+#include "direct_resampler_conditioner_cb.h"
#include "configuration_interface.h"
@@ -67,7 +67,7 @@ DirectResamplerConditioner::DirectResamplerConditioner(
else if (item_type_.compare("cshort") == 0)
{
item_size_ = sizeof(lv_16sc_t);
- resampler_ = direct_resampler_make_conditioner_ss(sample_freq_in_, sample_freq_out_);
+ resampler_ = direct_resampler_make_conditioner_cs(sample_freq_in_, sample_freq_out_);
DLOG(INFO) << "sample_freq_in " << sample_freq_in_;
DLOG(INFO) << "sample_freq_out" << sample_freq_out_;
DLOG(INFO) << "Item size " << item_size_;
@@ -76,7 +76,7 @@ DirectResamplerConditioner::DirectResamplerConditioner(
else if (item_type_.compare("cbyte") == 0)
{
item_size_ = sizeof(lv_8sc_t);
- resampler_ = direct_resampler_make_conditioner_bb(sample_freq_in_, sample_freq_out_);
+ resampler_ = direct_resampler_make_conditioner_cb(sample_freq_in_, sample_freq_out_);
DLOG(INFO) << "sample_freq_in " << sample_freq_in_;
DLOG(INFO) << "sample_freq_out" << sample_freq_out_;
DLOG(INFO) << "Item size " << item_size_;
diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
index 1ff2212..12d803c 100644
--- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
@@ -19,8 +19,8 @@
set(RESAMPLER_GR_BLOCKS_SOURCES
direct_resampler_conditioner_cc.cc
- direct_resampler_conditioner_ss.cc
- direct_resampler_conditioner_bb.cc
+ direct_resampler_conditioner_cs.cc
+ direct_resampler_conditioner_cb.cc
)
include_directories(
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_bb.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
similarity index 86%
rename from src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_bb.cc
rename to src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
index d3561a0..ed164b8 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_bb.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
@@ -1,5 +1,5 @@
/*!
- * \file direct_resampler_conditioner_bb.cc
+ * \file direct_resampler_conditioner_cb.cc
* \brief Nearest neighborhood resampler with std::complex<signed char>
* input and std::complex<signed char> output
* \author Luis Esteve, 2011. luis(at)epsilon-formacion.com
@@ -32,7 +32,7 @@
*/
-#include "direct_resampler_conditioner_bb.h"
+#include "direct_resampler_conditioner_cb.h"
#include <algorithm>
#include <iostream>
#include <gnuradio/io_signature.h>
@@ -41,18 +41,18 @@
using google::LogMessage;
-direct_resampler_conditioner_bb_sptr direct_resampler_make_conditioner_bb(
+direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb(
double sample_freq_in, double sample_freq_out)
{
- return direct_resampler_conditioner_bb_sptr(
- new direct_resampler_conditioner_bb(sample_freq_in,
+ return direct_resampler_conditioner_cb_sptr(
+ new direct_resampler_conditioner_cb(sample_freq_in,
sample_freq_out));
}
-direct_resampler_conditioner_bb::direct_resampler_conditioner_bb(
+direct_resampler_conditioner_cb::direct_resampler_conditioner_cb(
double sample_freq_in, double sample_freq_out) :
- gr::block("direct_resampler_make_conditioner_bb", gr::io_signature::make(1,
+ gr::block("direct_resampler_make_conditioner_cb", gr::io_signature::make(1,
1, sizeof(lv_8sc_t)), gr::io_signature::make(1, 1, sizeof(lv_8sc_t))),
d_sample_freq_in(sample_freq_in), d_sample_freq_out(
sample_freq_out), d_phase(0), d_lphase(0), d_history(1)
@@ -72,12 +72,12 @@ direct_resampler_conditioner_bb::direct_resampler_conditioner_bb(
set_output_multiple(1);
}
-direct_resampler_conditioner_bb::~direct_resampler_conditioner_bb()
+direct_resampler_conditioner_cb::~direct_resampler_conditioner_cb()
{
}
-void direct_resampler_conditioner_bb::forecast(int noutput_items,
+void direct_resampler_conditioner_cb::forecast(int noutput_items,
gr_vector_int &ninput_items_required)
{
@@ -91,7 +91,7 @@ void direct_resampler_conditioner_bb::forecast(int noutput_items,
}
}
-int direct_resampler_conditioner_bb::general_work(int noutput_items,
+int direct_resampler_conditioner_cb::general_work(int noutput_items,
gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_bb.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
similarity index 74%
rename from src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_bb.h
rename to src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
index 03b10cf..8f34c64 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_bb.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
@@ -1,5 +1,5 @@
/*!
- * \file direct_resampler_conditioner_bb.h
+ * \file direct_resampler_conditioner_cb.h
* \brief Nearest neighborhood resampler with
* std::complex<signed char> input and std::complex<signed char> output
* \author Luis Esteve, 2011. luis(at)epsilon-formacion.com
@@ -29,30 +29,30 @@
* -------------------------------------------------------------------------
*/
-#ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_BB_H
-#define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_BB_H
+#ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CB_H
+#define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CB_H
#include <gnuradio/block.h>
-class direct_resampler_conditioner_bb;
-typedef boost::shared_ptr<direct_resampler_conditioner_bb>
- direct_resampler_conditioner_bb_sptr;
+class direct_resampler_conditioner_cb;
+typedef boost::shared_ptr<direct_resampler_conditioner_cb>
+ direct_resampler_conditioner_cb_sptr;
-direct_resampler_conditioner_bb_sptr
-direct_resampler_make_conditioner_bb(double sample_freq_in,
+direct_resampler_conditioner_cb_sptr
+direct_resampler_make_conditioner_cb(double sample_freq_in,
double sample_freq_out);
/*!
* \brief This class implements a direct resampler conditioner for std::complex<signed char>
*
* Direct resampling without interpolation
*/
-class direct_resampler_conditioner_bb: public gr::block
+class direct_resampler_conditioner_cb: public gr::block
{
private:
- friend direct_resampler_conditioner_bb_sptr
- direct_resampler_make_conditioner_bb(double sample_freq_in,
+ friend direct_resampler_conditioner_cb_sptr
+ direct_resampler_make_conditioner_cb(double sample_freq_in,
double sample_freq_out);
double d_sample_freq_in;
@@ -62,12 +62,12 @@ private:
unsigned int d_phase_step;
unsigned int d_history;
- direct_resampler_conditioner_bb(double sample_freq_in,
+ direct_resampler_conditioner_cb(double sample_freq_in,
double sample_freq_out);
public:
- ~direct_resampler_conditioner_bb();
+ ~direct_resampler_conditioner_cb();
unsigned int sample_freq_in() const
{
@@ -83,4 +83,4 @@ public:
gr_vector_void_star &output_items);
};
-#endif /* GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_SS_H */
+#endif /* GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H */
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_ss.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
similarity index 86%
rename from src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_ss.cc
rename to src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
index af1f300..3f5830e 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_ss.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
@@ -1,5 +1,5 @@
/*!
- * \file direct_resampler_conditioner_ss.cc
+ * \file direct_resampler_conditioner_cs.cc
* \brief Nearest neighborhood resampler with
* complex short input and complex short output
* \author Luis Esteve, 2011. luis(at)epsilon-formacion.com
@@ -32,7 +32,7 @@
*/
-#include "direct_resampler_conditioner_ss.h"
+#include "direct_resampler_conditioner_cs.h"
#include <algorithm>
#include <iostream>
#include <gnuradio/io_signature.h>
@@ -41,18 +41,18 @@
using google::LogMessage;
-direct_resampler_conditioner_ss_sptr direct_resampler_make_conditioner_ss(
+direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs(
double sample_freq_in, double sample_freq_out)
{
- return direct_resampler_conditioner_ss_sptr(
- new direct_resampler_conditioner_ss(sample_freq_in,
+ return direct_resampler_conditioner_cs_sptr(
+ new direct_resampler_conditioner_cs(sample_freq_in,
sample_freq_out));
}
-direct_resampler_conditioner_ss::direct_resampler_conditioner_ss(
+direct_resampler_conditioner_cs::direct_resampler_conditioner_cs(
double sample_freq_in, double sample_freq_out) :
- gr::block("direct_resampler_make_conditioner_ss", gr::io_signature::make(1,
+ gr::block("direct_resampler_make_conditioner_cs", gr::io_signature::make(1,
1, sizeof(lv_16sc_t)), gr::io_signature::make(1, 1, sizeof(lv_16sc_t))),
d_sample_freq_in(sample_freq_in), d_sample_freq_out(
sample_freq_out), d_phase(0), d_lphase(0), d_history(1)
@@ -72,12 +72,12 @@ direct_resampler_conditioner_ss::direct_resampler_conditioner_ss(
set_output_multiple(1);
}
-direct_resampler_conditioner_ss::~direct_resampler_conditioner_ss()
+direct_resampler_conditioner_cs::~direct_resampler_conditioner_cs()
{
}
-void direct_resampler_conditioner_ss::forecast(int noutput_items,
+void direct_resampler_conditioner_cs::forecast(int noutput_items,
gr_vector_int &ninput_items_required)
{
@@ -91,7 +91,7 @@ void direct_resampler_conditioner_ss::forecast(int noutput_items,
}
}
-int direct_resampler_conditioner_ss::general_work(int noutput_items,
+int direct_resampler_conditioner_cs::general_work(int noutput_items,
gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_ss.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
similarity index 74%
rename from src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_ss.h
rename to src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
index 7903728..eb0b69d 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_ss.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
@@ -1,5 +1,5 @@
/*!
- * \file direct_resampler_conditioner_ss.h
+ * \file direct_resampler_conditioner_cs.h
* \brief Nearest neighborhood resampler with
* std::complex<short> input and std::complex<short> output
* \author Luis Esteve, 2011. luis(at)epsilon-formacion.com
@@ -29,30 +29,30 @@
* -------------------------------------------------------------------------
*/
-#ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_SS_H
-#define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_SS_H
+#ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H
+#define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H
#include <gnuradio/block.h>
-class direct_resampler_conditioner_ss;
-typedef boost::shared_ptr<direct_resampler_conditioner_ss>
- direct_resampler_conditioner_ss_sptr;
+class direct_resampler_conditioner_cs;
+typedef boost::shared_ptr<direct_resampler_conditioner_cs>
+ direct_resampler_conditioner_cs_sptr;
-direct_resampler_conditioner_ss_sptr
-direct_resampler_make_conditioner_ss(double sample_freq_in,
+direct_resampler_conditioner_cs_sptr
+direct_resampler_make_conditioner_cs(double sample_freq_in,
double sample_freq_out);
/*!
* \brief This class implements a direct resampler conditioner for std::complex<short>
*
* Direct resampling without interpolation
*/
-class direct_resampler_conditioner_ss: public gr::block
+class direct_resampler_conditioner_cs: public gr::block
{
private:
- friend direct_resampler_conditioner_ss_sptr
- direct_resampler_make_conditioner_ss(double sample_freq_in,
+ friend direct_resampler_conditioner_cs_sptr
+ direct_resampler_make_conditioner_cs(double sample_freq_in,
double sample_freq_out);
double d_sample_freq_in;
@@ -62,12 +62,12 @@ private:
unsigned int d_phase_step;
unsigned int d_history;
- direct_resampler_conditioner_ss(double sample_freq_in,
+ direct_resampler_conditioner_cs(double sample_freq_in,
double sample_freq_out);
public:
- ~direct_resampler_conditioner_ss();
+ ~direct_resampler_conditioner_cs();
unsigned int sample_freq_in() const
{
@@ -83,4 +83,4 @@ public:
gr_vector_void_star &output_items);
};
-#endif /* GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_SS_H */
+#endif /* GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list