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

Change the logic of starting an FM network stream.

Browse Source
This commit is contained in:
Jonathan Naylor
2024-11-09 14:05:18 +00:00
parent a2f0d1c81c
commit 33f673e446
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
FMControl.cpp
View File

@@ -85,7 +85,6 @@ m_rxAudioGain(rxAudioGain),
m_preEmphasisOn(preEmphasisOn), m_preEmphasisOn(preEmphasisOn),
m_deEmphasisOn(deEmphasisOn), m_deEmphasisOn(deEmphasisOn),
m_enabled(false), m_enabled(false),
m_begin(true),
m_incomingRFAudio(1600U, "Incoming RF FM Audio"), m_incomingRFAudio(1600U, "Incoming RF FM Audio"),
m_preEmphasis(8.315375384336983F, -7.03334621603483F, 0.0F, 1.0F, 0.282029168302153F, 0.0F, PREEMPHASIS_GAIN_DB), m_preEmphasis(8.315375384336983F, -7.03334621603483F, 0.0F, 1.0F, 0.282029168302153F, 0.0F, PREEMPHASIS_GAIN_DB),
m_deEmphasis(0.07708787090460224F, 0.07708787090460224F, 0.0F, 1.0F, -0.8458242581907955F, 0.0F, DEEMPHASIS_GAIN_DB), m_deEmphasis(0.07708787090460224F, 0.07708787090460224F, 0.0F, 1.0F, -0.8458242581907955F, 0.0F, DEEMPHASIS_GAIN_DB),
@@ -108,21 +107,14 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
return true; return true;
if (data[0U] == TAG_HEADER) if (data[0U] == TAG_HEADER)
return true; return m_network->writeStart();
if (data[0U] == TAG_EOT) { if (data[0U] == TAG_EOT)
m_begin = true;
return m_network->writeEnd(); return m_network->writeEnd();
}
if (data[0U] != TAG_DATA) if (data[0U] != TAG_DATA)
return false; return false;
if (m_begin) {
m_begin = false;
m_network->writeStart();
}
m_incomingRFAudio.addData(data + 1U, length - 1U); m_incomingRFAudio.addData(data + 1U, length - 1U);
unsigned int bufferLength = m_incomingRFAudio.dataSize(); unsigned int bufferLength = m_incomingRFAudio.dataSize();
if (bufferLength > 240U) // 160 samples 12-bit if (bufferLength > 240U) // 160 samples 12-bit

1
FMControl.h
View File

@@ -50,7 +50,6 @@ private:
bool m_preEmphasisOn; bool m_preEmphasisOn;
bool m_deEmphasisOn; bool m_deEmphasisOn;
bool m_enabled; bool m_enabled;
bool m_begin;
CRingBuffer<unsigned char> m_incomingRFAudio; CRingBuffer<unsigned char> m_incomingRFAudio;
CIIR m_preEmphasis; CIIR m_preEmphasis;

2
Version.h
View File

@@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20241101"; const char* VERSION = "20241109";
#endif #endif