MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-24 01:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use stdio instead of iostream, fix file not properly closed

Browse Source
This commit is contained in:
Geoffrey Merck
2020-05-24 10:47:11 +02:00
parent c0a9bb81a3
commit 8b31cb34ff
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
FMControl.cpp
View File

@@ -21,8 +21,7 @@
#include <string> #include <string>
#if defined(DUMP_RF_AUDIO) #if defined(DUMP_RF_AUDIO)
#include <iostream> #include <stdio.h>
#include <fstream>
#endif #endif
const float EMPHASIS_GAIN_DB = 0.0F; //Gain needs to be the same for pre an deeemphasis const float EMPHASIS_GAIN_DB = 0.0F; //Gain needs to be the same for pre an deeemphasis
@@ -43,11 +42,6 @@ CFMControl::~CFMControl()
bool CFMControl::writeModem(const unsigned char* data, unsigned int length) bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
{ {
#if defined(DUMP_RF_AUDIO)
std::ofstream audiofile;
audiofile.open("audiodump.bin", std::ios::out | std::ios::app | std::ios::binary);
#endif
assert(data != NULL); assert(data != NULL);
assert(length > 0U); assert(length > 0U);
@@ -70,6 +64,10 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
bufferLength = 255U; bufferLength = 255U;
if (bufferLength >= 3U) { if (bufferLength >= 3U) {
#if defined(DUMP_RF_AUDIO)
FILE * audiofile = fopen("./audiodump.bin", "ab");
#endif
bufferLength = bufferLength - bufferLength % 3U; //round down to nearest multiple of 3 bufferLength = bufferLength - bufferLength % 3U; //round down to nearest multiple of 3
unsigned char bufferData[255U]; unsigned char bufferData[255U];
m_incomingRFAudio.getData(bufferData, bufferLength); m_incomingRFAudio.getData(bufferData, bufferLength);
@@ -103,7 +101,8 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
samples[i] = m_deemphasis.filter(samples[i]); samples[i] = m_deemphasis.filter(samples[i]);
#if defined(DUMP_RF_AUDIO) #if defined(DUMP_RF_AUDIO)
audiofile.write((char*)(void*)samples, nSamples * sizeof(float)); if(audiofile != NULL)
fwrite(samples, sizeof(float), nSamples, audiofile);
#endif #endif
unsigned short out[170U]; // 85 * 2 unsigned short out[170U]; // 85 * 2
@@ -116,13 +115,14 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
out[nOut++] = (sample >> 0) & 0xFFU; out[nOut++] = (sample >> 0) & 0xFFU;
} }
#if defined(DUMP_RF_AUDIO)
if(audiofile != NULL)
fclose(audiofile);
#endif
return m_network->writeData((unsigned char*)out, nOut); return m_network->writeData((unsigned char*)out, nOut);
} }
#if defined(DUMP_RF_AUDIO)
audiofile.close();
#endif
return true; return true;
} }