From 4d1540181d7dd98ce4fa73db68b4454c052a01c5 Mon Sep 17 00:00:00 2001 From: Victor Castillo Date: Mon, 19 Aug 2024 15:36:03 +0200 Subject: [PATCH] Removed unused member fields and function parameters --- .../signal_source/adapters/ion_gsms_signal_source.cc | 5 ++--- .../signal_source/adapters/ion_gsms_signal_source.h | 1 - src/algorithms/signal_source/libs/ion_gsms.cc | 2 -- src/algorithms/signal_source/libs/ion_gsms.h | 3 --- .../signal_source/libs/ion_gsms_metadata_handler.cc | 4 +--- .../signal_source/libs/ion_gsms_metadata_handler.h | 2 +- 6 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc index c0db26e71..5dde9915c 100644 --- a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc +++ b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc @@ -56,9 +56,8 @@ IONGSMSSignalSource::IONGSMSSignalSource(const ConfigurationInterface* configura unsigned int out_streams, Concurrent_Queue* queue __attribute__((unused))) : SignalSourceBase(configuration, role, "ION_GSMS_Signal_Source"s), - metadata_file_(configuration->property(role + ".metadata_filename"s, "../data/example_capture_metadata.sdrx"s)), stream_ids_(parse_comma_list(configuration->property(role + ".streams"s, ""s))), - metadata_(metadata_file_), + metadata_(configuration->property(role + ".metadata_filename"s, "../data/example_capture_metadata.sdrx"s)), timestamp_clock_offset_ms_(configuration->property(role + ".timestamp_clock_offset_ms"s, 0.0)), in_streams_(in_streams), out_streams_(out_streams) @@ -72,7 +71,7 @@ IONGSMSSignalSource::IONGSMSSignalSource(const ConfigurationInterface* configura LOG(ERROR) << "A signal source does not have an output stream"; } - sources_ = metadata_.make_stream_sources(configuration, role, stream_ids_); + sources_ = metadata_.make_stream_sources(stream_ids_); for (const auto& source : sources_) { diff --git a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h index d724d101b..6e0aa6364 100644 --- a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h +++ b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h @@ -58,7 +58,6 @@ protected: } private: - std::string metadata_file_; std::vector stream_ids_; std::vector sources_; std::vector> copy_blocks_; diff --git a/src/algorithms/signal_source/libs/ion_gsms.cc b/src/algorithms/signal_source/libs/ion_gsms.cc index e44c0abab..78f9060bd 100644 --- a/src/algorithms/signal_source/libs/ion_gsms.cc +++ b/src/algorithms/signal_source/libs/ion_gsms.cc @@ -22,8 +22,6 @@ using namespace std::string_literals; IONGSMSFileSource::IONGSMSFileSource( - const ConfigurationInterface* configuration __attribute__((unused)), - const std::string& role __attribute__((unused)), const fs::path& metadata_filepath, const GnssMetadata::File& file, const GnssMetadata::Block& block, diff --git a/src/algorithms/signal_source/libs/ion_gsms.h b/src/algorithms/signal_source/libs/ion_gsms.h index 054b1e9dd..64a3e8c16 100644 --- a/src/algorithms/signal_source/libs/ion_gsms.h +++ b/src/algorithms/signal_source/libs/ion_gsms.h @@ -17,7 +17,6 @@ #ifndef GNSS_SDR_ION_GNSS_SDR_METADATA_STANDARD_H #define GNSS_SDR_ION_GNSS_SDR_METADATA_STANDARD_H -#include "configuration_interface.h" #include "gnss_block_interface.h" #include "gnss_sdr_filesystem.h" #include "ion_gsms_chunk_data.h" @@ -40,8 +39,6 @@ public: using sptr = gnss_shared_ptr; IONGSMSFileSource( - const ConfigurationInterface* configuration, - const std::string& role, const fs::path& metadata_filepath, const GnssMetadata::File& file, const GnssMetadata::Block& block, diff --git a/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.cc b/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.cc index eea6e9c5f..7d4c96fa5 100644 --- a/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.cc +++ b/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.cc @@ -62,7 +62,7 @@ void IONGSMSMetadataHandler::load_metadata() } } -std::vector IONGSMSMetadataHandler::make_stream_sources(const ConfigurationInterface* configuration, const std::string& role, const std::vector& stream_ids) const +std::vector IONGSMSMetadataHandler::make_stream_sources(const std::vector& stream_ids) const { std::vector sources{}; for (const auto& file : metadata_.Files()) @@ -92,8 +92,6 @@ std::vector IONGSMSMetadataHandler::make_stream_sources if (found) { auto source = gnss_make_shared( - configuration, - role, metadata_filepath_, file, block, diff --git a/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h b/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h index 2431fbec8..969a3f4be 100644 --- a/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h +++ b/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h @@ -34,7 +34,7 @@ class IONGSMSMetadataHandler public: explicit IONGSMSMetadataHandler(const std::string& metadata_filepath); - std::vector make_stream_sources(const ConfigurationInterface* configuration, const std::string& role, const std::vector& stream_ids) const; + std::vector make_stream_sources(const std::vector& stream_ids) const; const std::string& metadata_filepath() const; private: