g4klx/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway.git synced 2026-04-06 23:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prepare for having two voice subsystems.

Browse source
This commit is contained in:
Jonathan Naylor 2020-04-03 15:25:33 +01:00
parent 73270ad7a5
commit 9771b1ff0c
7 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DMRGateway.cpp
View file

@ -29,10 +29,10 @@
#include "PassAllPC.h"
#include "PassAllTG.h"
#include "DMRFullLC.h"
#include "XLXVoice.h"
#include "Version.h"
#include "Thread.h"
#include "DMRLC.h"
#include "Voice.h"
#include "Sync.h"
#include "Log.h"
#include "GitVersion.h"
@ -409,7 +409,7 @@ int CDMRGateway::run()
unsigned int rfTimeout = m_conf.getRFTimeout();
unsigned int netTimeout = m_conf.getNetTimeout();
CVoice* voice = NULL;
CXLXVoice* voice = NULL;
if (m_conf.getVoiceEnabled() && m_xlxNetwork != NULL) {
std::string language = m_conf.getVoiceLanguage();
std::string directory = m_conf.getVoiceDirectory();
@ -419,7 +419,7 @@ int CDMRGateway::run()
LogInfo(" Language: %s", language.c_str());
LogInfo(" Directory: %s", directory.c_str());
voice = new CVoice(directory, language, m_repeater->getId(), m_xlxSlot, m_xlxTG);
voice = new CXLXVoice(directory, language, m_repeater->getId(), m_xlxSlot, m_xlxTG);
bool ret = voice->open();
if (!ret) {
delete voice;