joris
/
SoftFM
1
0
Fork 0
Code Pull Requests Activity

Fix incorrect use of uint8_t, FILE, etc. outside std namespace.

This commit is contained in:
Joris van Rantwijk 2014-01-19 11:43:22 +01:00
parent ddcb6a8500
commit cfc5e07db6
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AudioOutput.h
View File

@ -45,7 +45,7 @@ protected:
/** Encode a list of samples as signed 16-bit little-endian integers. */ /** Encode a list of samples as signed 16-bit little-endian integers. */
static void samplesToInt16(const SampleVector& samples, static void samplesToInt16(const SampleVector& samples,
std::vector<uint8_t>& bytes); std::vector<std::uint8_t>& bytes);
std::string m_error; std::string m_error;
bool m_zombie; bool m_zombie;
@ -72,8 +72,8 @@ public:
bool write(const SampleVector& samples); bool write(const SampleVector& samples);
private: private:
int m_fd; int m_fd;
std::vector<uint8_t> m_bytebuf; std::vector<std::uint8_t> m_bytebuf;
}; };
@ -101,15 +101,15 @@ private:
/** (Re-)Write .WAV header. */ /** (Re-)Write .WAV header. */
bool write_header(unsigned int nsamples); bool write_header(unsigned int nsamples);
static void encode_chunk_id(uint8_t * ptr, const char * chunkname); static void encode_chunk_id(std::uint8_t * ptr, const char * chunkname);
template <typename T> template <typename T>
static void set_value(uint8_t * ptr, T value); static void set_value(std::uint8_t * ptr, T value);
const unsigned numberOfChannels; const unsigned numberOfChannels;
const unsigned sampleRate; const unsigned sampleRate;
FILE *m_stream; std::FILE *m_stream;
std::vector<uint8_t> m_bytebuf; std::vector<std::uint8_t> m_bytebuf;
}; };
@ -135,7 +135,7 @@ public:
private: private:
unsigned int m_nchannels; unsigned int m_nchannels;
struct _snd_pcm * m_pcm; struct _snd_pcm * m_pcm;
std::vector<uint8_t> m_bytebuf; std::vector<std::uint8_t> m_bytebuf;
}; };
#endif #endif

8
RtlSdrSource.h
View File

@ -30,15 +30,17 @@ public:
* *
* Return true for success, false if an error occurred. * Return true for success, false if an error occurred.
*/ */
bool configure(uint32_t sample_rate, uint32_t frequency, int tuner_gain, bool configure(std::uint32_t sample_rate,
std::uint32_t frequency,
int tuner_gain,
int block_length=default_block_length, int block_length=default_block_length,
bool agcmode=false); bool agcmode=false);
/** Return current sample frequency in Hz. */ /** Return current sample frequency in Hz. */
uint32_t get_sample_rate(); std::uint32_t get_sample_rate();
/** Return current center frequency in Hz. */ /** Return current center frequency in Hz. */
uint32_t get_frequency(); std::uint32_t get_frequency();
/** Return current tuner gain in dB. */ /** Return current tuner gain in dB. */
double get_tuner_gain(); double get_tuner_gain();