mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-11-10 20:10:05 +00:00
Removed unused member fields and function parameters
This commit is contained in:
parent
f7cd58a5a5
commit
4d1540181d
@ -56,9 +56,8 @@ IONGSMSSignalSource::IONGSMSSignalSource(const ConfigurationInterface* configura
|
|||||||
unsigned int out_streams,
|
unsigned int out_streams,
|
||||||
Concurrent_Queue<pmt::pmt_t>* queue __attribute__((unused)))
|
Concurrent_Queue<pmt::pmt_t>* queue __attribute__((unused)))
|
||||||
: SignalSourceBase(configuration, role, "ION_GSMS_Signal_Source"s),
|
: 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))),
|
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)),
|
timestamp_clock_offset_ms_(configuration->property(role + ".timestamp_clock_offset_ms"s, 0.0)),
|
||||||
in_streams_(in_streams),
|
in_streams_(in_streams),
|
||||||
out_streams_(out_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";
|
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_)
|
for (const auto& source : sources_)
|
||||||
{
|
{
|
||||||
|
@ -58,7 +58,6 @@ protected:
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::string metadata_file_;
|
|
||||||
std::vector<std::string> stream_ids_;
|
std::vector<std::string> stream_ids_;
|
||||||
std::vector<IONGSMSFileSource::sptr> sources_;
|
std::vector<IONGSMSFileSource::sptr> sources_;
|
||||||
std::vector<gnss_shared_ptr<gr::block>> copy_blocks_;
|
std::vector<gnss_shared_ptr<gr::block>> copy_blocks_;
|
||||||
|
@ -22,8 +22,6 @@
|
|||||||
using namespace std::string_literals;
|
using namespace std::string_literals;
|
||||||
|
|
||||||
IONGSMSFileSource::IONGSMSFileSource(
|
IONGSMSFileSource::IONGSMSFileSource(
|
||||||
const ConfigurationInterface* configuration __attribute__((unused)),
|
|
||||||
const std::string& role __attribute__((unused)),
|
|
||||||
const fs::path& metadata_filepath,
|
const fs::path& metadata_filepath,
|
||||||
const GnssMetadata::File& file,
|
const GnssMetadata::File& file,
|
||||||
const GnssMetadata::Block& block,
|
const GnssMetadata::Block& block,
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
#ifndef GNSS_SDR_ION_GNSS_SDR_METADATA_STANDARD_H
|
#ifndef GNSS_SDR_ION_GNSS_SDR_METADATA_STANDARD_H
|
||||||
#define 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_block_interface.h"
|
||||||
#include "gnss_sdr_filesystem.h"
|
#include "gnss_sdr_filesystem.h"
|
||||||
#include "ion_gsms_chunk_data.h"
|
#include "ion_gsms_chunk_data.h"
|
||||||
@ -40,8 +39,6 @@ public:
|
|||||||
using sptr = gnss_shared_ptr<IONGSMSFileSource>;
|
using sptr = gnss_shared_ptr<IONGSMSFileSource>;
|
||||||
|
|
||||||
IONGSMSFileSource(
|
IONGSMSFileSource(
|
||||||
const ConfigurationInterface* configuration,
|
|
||||||
const std::string& role,
|
|
||||||
const fs::path& metadata_filepath,
|
const fs::path& metadata_filepath,
|
||||||
const GnssMetadata::File& file,
|
const GnssMetadata::File& file,
|
||||||
const GnssMetadata::Block& block,
|
const GnssMetadata::Block& block,
|
||||||
|
@ -62,7 +62,7 @@ void IONGSMSMetadataHandler::load_metadata()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<IONGSMSFileSource::sptr> IONGSMSMetadataHandler::make_stream_sources(const ConfigurationInterface* configuration, const std::string& role, const std::vector<std::string>& stream_ids) const
|
std::vector<IONGSMSFileSource::sptr> IONGSMSMetadataHandler::make_stream_sources(const std::vector<std::string>& stream_ids) const
|
||||||
{
|
{
|
||||||
std::vector<IONGSMSFileSource::sptr> sources{};
|
std::vector<IONGSMSFileSource::sptr> sources{};
|
||||||
for (const auto& file : metadata_.Files())
|
for (const auto& file : metadata_.Files())
|
||||||
@ -92,8 +92,6 @@ std::vector<IONGSMSFileSource::sptr> IONGSMSMetadataHandler::make_stream_sources
|
|||||||
if (found)
|
if (found)
|
||||||
{
|
{
|
||||||
auto source = gnss_make_shared<IONGSMSFileSource>(
|
auto source = gnss_make_shared<IONGSMSFileSource>(
|
||||||
configuration,
|
|
||||||
role,
|
|
||||||
metadata_filepath_,
|
metadata_filepath_,
|
||||||
file,
|
file,
|
||||||
block,
|
block,
|
||||||
|
@ -34,7 +34,7 @@ class IONGSMSMetadataHandler
|
|||||||
public:
|
public:
|
||||||
explicit IONGSMSMetadataHandler(const std::string& metadata_filepath);
|
explicit IONGSMSMetadataHandler(const std::string& metadata_filepath);
|
||||||
|
|
||||||
std::vector<IONGSMSFileSource::sptr> make_stream_sources(const ConfigurationInterface* configuration, const std::string& role, const std::vector<std::string>& stream_ids) const;
|
std::vector<IONGSMSFileSource::sptr> make_stream_sources(const std::vector<std::string>& stream_ids) const;
|
||||||
const std::string& metadata_filepath() const;
|
const std::string& metadata_filepath() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Loading…
Reference in New Issue
Block a user