Revert "Revert "Simplify the logic by removing the ring buffer.""

This reverts commit d4d26fc05f.
This commit is contained in:
Jonathan Naylor
2017-11-28 10:19:13 +00:00
parent fc3328fb60
commit 71bd38f9e9
3 changed files with 70 additions and 107 deletions

View File

@@ -946,7 +946,7 @@ bool CMMDVMHost::createDMRNetwork()
LogInfo(" Slot 2: %s", slot2 ? "enabled" : "disabled");
LogInfo(" Mode Hang: %us", m_dmrNetModeHang);
m_dmrNetwork = new CDMRNetwork(address, port, local, id, password, m_duplex, VERSION, debug, slot1, slot2, hwType, jitter);
m_dmrNetwork = new CDMRNetwork(address, port, local, id, password, m_duplex, VERSION, debug, slot1, slot2, hwType);
std::string options = m_conf.getDMRNetworkOptions();
if (!options.empty()) {