aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Krysik <ptrkrysik@gmail.com>2016-06-29 22:22:27 +0200
committerPiotr Krysik <ptrkrysik@gmail.com>2016-06-29 22:22:27 +0200
commit0a60e7a70a44bc5b3bb49be1ca623c93f9d339ee (patch)
tree43b4d65f2c8dd691f7d31e726d8ae4ea349ab509
parent72db257caa467138dcf5ca26b039b3e52e6717ca (diff)
Corrections of tch/f decoder - removal of parameter continued
-rw-r--r--grc/decoding/gsm_tch_f_decoder.xml2
-rw-r--r--include/grgsm/decoding/tch_f_decoder.h2
-rw-r--r--lib/decoding/tch_f_decoder_impl.cc8
-rw-r--r--lib/decoding/tch_f_decoder_impl.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/grc/decoding/gsm_tch_f_decoder.xml b/grc/decoding/gsm_tch_f_decoder.xml
index cbc3234..3d1152e 100644
--- a/grc/decoding/gsm_tch_f_decoder.xml
+++ b/grc/decoding/gsm_tch_f_decoder.xml
@@ -3,7 +3,7 @@
<name>TCH/F decoder</name>
<key>gsm_tch_f_decoder</key>
<import>import grgsm</import>
- <make>grgsm.tch_f_decoder($mode, $file, $boundary_check)</make>
+ <make>grgsm.tch_f_decoder($mode, $boundary_check)</make>
<param>
<name>TCH coding mode</name>
diff --git a/include/grgsm/decoding/tch_f_decoder.h b/include/grgsm/decoding/tch_f_decoder.h
index 53f10bd..93fe971 100644
--- a/include/grgsm/decoding/tch_f_decoder.h
+++ b/include/grgsm/decoding/tch_f_decoder.h
@@ -62,7 +62,7 @@ namespace gr {
* class. gsm::tch_f_decoder::make is the public interface for
* creating new instances.
*/
- static sptr make(tch_mode mode, const std::string &file, bool boundary_check=false);
+ static sptr make(tch_mode mode, bool boundary_check=false);
};
diff --git a/lib/decoding/tch_f_decoder_impl.cc b/lib/decoding/tch_f_decoder_impl.cc
index b9aa057..cc88c90 100644
--- a/lib/decoding/tch_f_decoder_impl.cc
+++ b/lib/decoding/tch_f_decoder_impl.cc
@@ -35,16 +35,16 @@ namespace gr {
namespace gsm {
tch_f_decoder::sptr
- tch_f_decoder::make(tch_mode mode, const std::string &file, bool boundary_check)
+ tch_f_decoder::make(tch_mode mode, bool boundary_check)
{
return gnuradio::get_initial_sptr
- (new tch_f_decoder_impl(mode, file, boundary_check));
+ (new tch_f_decoder_impl(mode, boundary_check));
}
/*
* Constructor
*/
- tch_f_decoder_impl::tch_f_decoder_impl(tch_mode mode, const std::string &file, bool boundary_check)
+ tch_f_decoder_impl::tch_f_decoder_impl(tch_mode mode, bool boundary_check)
: gr::block("tch_f_decoder",
gr::io_signature::make(0, 0, 0),
gr::io_signature::make(0, 0, 0)),
@@ -249,7 +249,7 @@ namespace gr {
return;
}
- // Decode voice frames and write to file
+ // Decode voice frames and send to the output
if (d_tch_mode == TCH_FS || d_tch_mode == TCH_EFR)
{
mVR204Coder.decode(mClass1_c, mTCHU);
diff --git a/lib/decoding/tch_f_decoder_impl.h b/lib/decoding/tch_f_decoder_impl.h
index c6eda09..0119b5a 100644
--- a/lib/decoding/tch_f_decoder_impl.h
+++ b/lib/decoding/tch_f_decoder_impl.h
@@ -89,7 +89,7 @@ namespace gr {
void decode(pmt::pmt_t msg);
void setCodingMode(tch_mode mode);
public:
- tch_f_decoder_impl(tch_mode mode, const std::string &file, bool boundary_check=false);
+ tch_f_decoder_impl(tch_mode mode, bool boundary_check=false);
~tch_f_decoder_impl();
};