diff options
| -rw-r--r-- | src/DabModulator.cpp | 2 | ||||
| -rw-r--r-- | src/DabModulator.h | 4 | ||||
| -rw-r--r-- | src/FIRFilter.cpp | 2 | ||||
| -rw-r--r-- | src/FIRFilter.h | 2 | ||||
| -rw-r--r-- | src/OutputFile.cpp | 2 | ||||
| -rw-r--r-- | src/OutputFile.h | 4 | ||||
| -rw-r--r-- | src/OutputUHD.cpp | 4 | ||||
| -rw-r--r-- | src/OutputUHD.h | 2 | ||||
| -rw-r--r-- | src/TimestampDecoder.h | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp index e186fd3..d89716b 100644 --- a/src/DabModulator.cpp +++ b/src/DabModulator.cpp @@ -51,7 +51,7 @@ DabModulator::DabModulator( struct modulator_offset_config& modconf, unsigned outputRate, unsigned clockRate, unsigned dabMode, GainMode gainMode, float factor, - char* filterTapsFilename + const char* filterTapsFilename ) : ModCodec(ModFormat(1), ModFormat(0)), myOutputRate(outputRate), diff --git a/src/DabModulator.h b/src/DabModulator.h index 0eecfa4..72fee41 100644 --- a/src/DabModulator.h +++ b/src/DabModulator.h @@ -46,7 +46,7 @@ public: struct modulator_offset_config& modconf, unsigned outputRate = 2048000, unsigned clockRate = 0, unsigned dabMode = 0, GainMode gainMode = GAIN_VAR, - float factor = 1.0, char* filterTapsFilename = NULL); + float factor = 1.0, const char* filterTapsFilename = NULL); DabModulator(const DabModulator& copy); virtual ~DabModulator(); @@ -67,7 +67,7 @@ protected: EtiReader myEtiReader; Flowgraph* myFlowgraph; OutputMemory* myOutput; - char* myFilterTapsFilename; + const char* myFilterTapsFilename; size_t myNbSymbols; size_t myNbCarriers; diff --git a/src/FIRFilter.cpp b/src/FIRFilter.cpp index 2ba4294..540e015 100644 --- a/src/FIRFilter.cpp +++ b/src/FIRFilter.cpp @@ -227,7 +227,7 @@ void FIRFilterWorker::process(struct FIRFilterWorkerData *fwd) } -FIRFilter::FIRFilter(char* taps_file) : +FIRFilter::FIRFilter(const char* taps_file) : ModCodec(ModFormat(sizeof(complexf)), ModFormat(sizeof(complexf))) { PDEBUG("FIRFilter::FIRFilter(%s) @ %p\n", diff --git a/src/FIRFilter.h b/src/FIRFilter.h index 7f34fd8..0c06930 100644 --- a/src/FIRFilter.h +++ b/src/FIRFilter.h @@ -136,7 +136,7 @@ class FIRFilterWorker { class FIRFilter : public ModCodec { public: - FIRFilter(char* taps_file); + FIRFilter(const char* taps_file); virtual ~FIRFilter(); FIRFilter(const FIRFilter&); FIRFilter& operator=(const FIRFilter&); diff --git a/src/OutputFile.cpp b/src/OutputFile.cpp index fc90879..c411c85 100644 --- a/src/OutputFile.cpp +++ b/src/OutputFile.cpp @@ -26,7 +26,7 @@ #include <stdexcept> -OutputFile::OutputFile(char* filename) : +OutputFile::OutputFile(const char* filename) : ModOutput(ModFormat(1), ModFormat(0)), myFilename(filename) { diff --git a/src/OutputFile.h b/src/OutputFile.h index e9cd43b..1223aef 100644 --- a/src/OutputFile.h +++ b/src/OutputFile.h @@ -36,14 +36,14 @@ class OutputFile : public ModOutput { public: - OutputFile(char* filename); + OutputFile(const char* filename); virtual ~OutputFile(); virtual int process(Buffer* dataIn, Buffer* dataOut); const char* name() { return "OutputFile"; } protected: - char* myFilename; + const char* myFilename; FILE* myFile; }; diff --git a/src/OutputUHD.cpp b/src/OutputUHD.cpp index c8f4ea9..3fb23d5 100644 --- a/src/OutputUHD.cpp +++ b/src/OutputUHD.cpp @@ -37,7 +37,7 @@ typedef std::complex<float> complexf; -OutputUHD::OutputUHD(char* device, unsigned sampleRate, +OutputUHD::OutputUHD(const char* device, unsigned sampleRate, double frequency, int txgain, bool enableSync, bool muteNoTimestamps) : ModOutput(ModFormat(1), ModFormat(0)), mySampleRate(sampleRate), @@ -203,7 +203,7 @@ int OutputUHD::process(Buffer* dataIn, Buffer* dataOut) // the worker sends the other. myEtiReader->calculateTimestamp(ts); - uwd.sourceContainsTimestamp = myEtiReader->sourceContainsTimestamp(); + uwd.sourceContainsTimestamp = enable_sync && myEtiReader->sourceContainsTimestamp(); if (activebuffer == 0) { memcpy(uwd.frame0.buf, dataIn->getData(), uwd.bufsize); diff --git a/src/OutputUHD.h b/src/OutputUHD.h index 953675d..d460af4 100644 --- a/src/OutputUHD.h +++ b/src/OutputUHD.h @@ -134,7 +134,7 @@ class UHDWorker { class OutputUHD: public ModOutput { public: - OutputUHD(char* device, unsigned sampleRate, double frequency, int txgain, + OutputUHD(const char* device, unsigned sampleRate, double frequency, int txgain, bool enableSync, bool muteNoTimestamps); ~OutputUHD(); diff --git a/src/TimestampDecoder.h b/src/TimestampDecoder.h index 68fe546..f55813f 100644 --- a/src/TimestampDecoder.h +++ b/src/TimestampDecoder.h @@ -38,7 +38,7 @@ struct modulator_offset_config /* These two fields are used when the modulator is run with a fixed offset */ bool use_offset_file; - char* offset_filename; + const char* offset_filename; /* These two fields are used when the modulator reads the offset from a file */ unsigned delay_calculation_pipeline_stages; |