[hamradio-commits] [gnss-sdr] 53/80: Remove unused queue in Signal Conditioners

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch upstream
in repository gnss-sdr.

commit f1a5708891c19192914aad48cb0a5d06fb226964
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon May 9 18:53:48 2016 +0200

    Remove unused queue in Signal Conditioners
---
 .../conditioner/adapters/array_signal_conditioner.cc       |  7 +++----
 .../conditioner/adapters/array_signal_conditioner.h        |  4 +---
 src/algorithms/conditioner/adapters/signal_conditioner.cc  | 14 ++++++--------
 src/algorithms/conditioner/adapters/signal_conditioner.h   |  5 +----
 src/core/receiver/gnss_block_factory.cc                    |  4 ++--
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc
index d40adeb..7e37851 100644
--- a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc
+++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc
@@ -38,10 +38,9 @@ using google::LogMessage;
 // Constructor
 ArraySignalConditioner::ArraySignalConditioner(ConfigurationInterface *configuration,
         std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
-        std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation,
-        boost::shared_ptr<gr::msg_queue> queue) : data_type_adapt_(data_type_adapt),
-                in_filt_(in_filt), res_(res), role_(role), implementation_(implementation),
-                queue_(queue)
+        std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation) :
+                data_type_adapt_(data_type_adapt),
+                in_filt_(in_filt), res_(res), role_(role), implementation_(implementation)
 {
     connected_ = false;
     if(configuration){ };
diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.h b/src/algorithms/conditioner/adapters/array_signal_conditioner.h
index 1a635da..d0f1004 100644
--- a/src/algorithms/conditioner/adapters/array_signal_conditioner.h
+++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.h
@@ -53,8 +53,7 @@ public:
     //! Constructor
     ArraySignalConditioner(ConfigurationInterface *configuration,
             std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
-            std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation,
-            boost::shared_ptr<gr::msg_queue> queue);
+            std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation);
 
     //! Virtual destructor
     virtual ~ArraySignalConditioner();
@@ -81,7 +80,6 @@ private:
     std::string implementation_;
     bool connected_;
     //bool stop_;
-    boost::shared_ptr<gr::msg_queue> queue_;
 };
 
 #endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/
diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.cc b/src/algorithms/conditioner/adapters/signal_conditioner.cc
index 42feb8f..962b0da 100644
--- a/src/algorithms/conditioner/adapters/signal_conditioner.cc
+++ b/src/algorithms/conditioner/adapters/signal_conditioner.cc
@@ -38,10 +38,9 @@ using google::LogMessage;
 // Constructor
 SignalConditioner::SignalConditioner(ConfigurationInterface *configuration,
         std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
-        std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation,
-        boost::shared_ptr<gr::msg_queue> queue) : data_type_adapt_(data_type_adapt),
-                in_filt_(in_filt), res_(res), role_(role), implementation_(implementation),
-                queue_(queue)
+        std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation) :
+                data_type_adapt_(data_type_adapt),
+                in_filt_(in_filt), res_(res), role_(role), implementation_(implementation)
 {
     connected_ = false;
     if(configuration){ };
@@ -64,11 +63,10 @@ void SignalConditioner::connect(gr::top_block_sptr top_block)
     in_filt_->connect(top_block);
     res_->connect(top_block);
 
-    top_block->connect(data_type_adapt_->get_right_block(), 0,
-                       in_filt_->get_left_block(), 0);
+    top_block->connect(data_type_adapt_->get_right_block(), 0, in_filt_->get_left_block(), 0);
     DLOG(INFO) << "data_type_adapter -> input_filter";
-    top_block->connect(in_filt_->get_right_block(), 0,
-                       res_->get_left_block(), 0);
+
+    top_block->connect(in_filt_->get_right_block(), 0, res_->get_left_block(), 0);
     DLOG(INFO) << "input_filter -> resampler";
     connected_ = true;
 }
diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h
index ef46a64..de83036 100644
--- a/src/algorithms/conditioner/adapters/signal_conditioner.h
+++ b/src/algorithms/conditioner/adapters/signal_conditioner.h
@@ -33,7 +33,6 @@
 #define GNSS_SDR_SIGNAL_CONDITIONER_H_
 
 #include <string>
-#include <gnuradio/msg_queue.h>
 #include "gnss_block_interface.h"
 
 
@@ -52,8 +51,7 @@ public:
     //! Constructor
     SignalConditioner(ConfigurationInterface *configuration,
             std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
-            std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation,
-            boost::shared_ptr<gr::msg_queue> queue);
+            std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation);
 
     //! Virtual destructor
     virtual ~SignalConditioner();
@@ -80,7 +78,6 @@ private:
     std::string implementation_;
     bool connected_;
     //bool stop_;
-    boost::shared_ptr<gr::msg_queue> queue_;
 };
 
 #endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 438238b..3e5f22c 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -203,7 +203,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalConditioner(
                 std::move(GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1, queue)), 
                 std::move(GetBlock(configuration, role_inputfilter, input_filter, 1, 1, queue)),
                 std::move(GetBlock(configuration, role_resampler, resampler, 1, 1, queue)),
-                role_conditioner, "Signal_Conditioner", queue));
+                role_conditioner, "Signal_Conditioner"));
             return conditioner_;
         }
     else
@@ -213,7 +213,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalConditioner(
                 std::move(GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1, queue)), 
                 std::move(GetBlock(configuration, role_inputfilter, input_filter, 1, 1, queue)),
                 std::move(GetBlock(configuration, role_resampler, resampler, 1, 1, queue)),
-                role_conditioner, "Signal_Conditioner", queue));
+                role_conditioner, "Signal_Conditioner"));
             return conditioner_;
         }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git