mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00
Code Issues Releases Wiki Activity

Fix building

Browse Source
This commit is contained in:
Carles Fernandez 2018-12-02 12:11:59 +01:00
parent 3bb47ff755
commit 1ed73eb2f8
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc
View File

@ -46,8 +46,13 @@ using google::LogMessage;
TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterface* configuration, TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterface* configuration,
std::string role, unsigned int in_streams, unsigned int out_streams, std::string role,
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue) unsigned int in_streams,
unsigned int out_streams,
boost::shared_ptr<gr::msg_queue> queue) : role_(role),
in_streams_(in_streams),
out_streams_(out_streams),
queue_(queue)
{ {
std::string default_filename = "../data/my_capture.dat"; std::string default_filename = "../data/my_capture.dat";
std::string default_item_type = "byte"; std::string default_item_type = "byte";
@ -56,7 +61,7 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac
double default_seconds_to_skip = 0.0; double default_seconds_to_skip = 0.0;
samples_ = configuration->property(role + ".samples", 0ULL); samples_ = configuration->property(role + ".samples", 0ULL);
sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0); sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL);
filename_ = configuration->property(role + ".filename", default_filename); filename_ = configuration->property(role + ".filename", default_filename);
// override value with commandline flag, if present // override value with commandline flag, if present
@ -72,7 +77,7 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
enable_throttle_control_ = configuration->property(role + ".enable_throttle_control", false); enable_throttle_control_ = configuration->property(role + ".enable_throttle_control", false);
double seconds_to_skip = configuration->property(role + ".seconds_to_skip", default_seconds_to_skip); double seconds_to_skip = configuration->property(role + ".seconds_to_skip", default_seconds_to_skip);
long bytes_to_skip = 0; int64_t bytes_to_skip = 0;
if (item_type_.compare("byte") == 0) if (item_type_.compare("byte") == 0)
{ {
@ -122,7 +127,7 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac
if (seconds_to_skip > 0) if (seconds_to_skip > 0)
{ {
bytes_to_skip = static_cast<long>( bytes_to_skip = static_cast<int64_t>(
seconds_to_skip * sampling_frequency_ / 4); seconds_to_skip * sampling_frequency_ / 4);
if (is_complex_) if (is_complex_)
{ {

7
src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
View File

@ -43,6 +43,7 @@
#include <gnuradio/hier_block2.h> #include <gnuradio/hier_block2.h>
#include <gnuradio/msg_queue.h> #include <gnuradio/msg_queue.h>
#include <gnuradio/blocks/interleaved_char_to_complex.h> #include <gnuradio/blocks/interleaved_char_to_complex.h>
#include <cstdint>
#include <string> #include <string>
@ -98,12 +99,12 @@ public:
return repeat_; return repeat_;
} }
inline long sampling_frequency() const inline int64_t sampling_frequency() const
{ {
return sampling_frequency_; return sampling_frequency_;
} }
inline long samples() const inline uint64_t samples() const
{ {
return samples_; return samples_;
} }
@ -130,7 +131,7 @@ public:
private: private:
uint64_t samples_; uint64_t samples_;
long sampling_frequency_; int64_t sampling_frequency_;
std::string filename_; std::string filename_;
std::string item_type_; std::string item_type_;
bool repeat_; bool repeat_;