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

Merge pull request #158 from g0wfv/develop

Browse Source 
D-Star: Solve insertion of silence packets at start of every over
This commit is contained in:
Jonathan Naylor
2016-09-28 06:31:20 +01:00
committed by GitHub
parent 5e22470b98 150cf171bc
commit 7cd591fe15
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DStarControl.cpp
View File

@@ -470,7 +470,7 @@ void CDStarControl::writeNetwork()
m_netTimeoutTimer.start(); m_netTimeoutTimer.start();
m_packetTimer.start(); m_packetTimer.start();
m_elapsed.start(); //m_elapsed.start(); // commented out and placed lower down due to delay introduced somewhere below here.
m_ackTimer.stop(); m_ackTimer.stop();
m_lastFrameValid = false; m_lastFrameValid = false;
@@ -501,6 +501,11 @@ void CDStarControl::writeNetwork()
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) " "); m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) " ");
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your); LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your);
} }
// Something just above here introduces a large delay forcing erroneous(?) insertion of silence packets.
// Starting the elapsed timer here instead of the commented out position above solves that.
m_elapsed.start();
} else if (type == TAG_EOT) { } else if (type == TAG_EOT) {
if (m_netState != RS_NET_AUDIO) if (m_netState != RS_NET_AUDIO)
return; return;