MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-22 06:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use new audio files and add some new languages.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-09-29 21:41:22 +01:00
parent 15ea4418e0
commit b72539dab1
22 changed files with 475 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
Voice.cpp
View File

@@ -30,19 +30,6 @@
const unsigned char SILENCE[] = {0xACU, 0xAAU, 0x40U, 0x20U, 0x00U, 0x44U, 0x40U, 0x80U, 0x80U};
const unsigned int POSITION_0 = 0U;
const unsigned int POSITION_1 = 1U;
const unsigned int POSITION_2 = 2U;
const unsigned int POSITION_3 = 3U;
const unsigned int POSITION_4 = 4U;
const unsigned int POSITION_5 = 5U;
const unsigned int POSITION_6 = 6U;
const unsigned int POSITION_7 = 7U;
const unsigned int POSITION_8 = 8U;
const unsigned int POSITION_9 = 9U;
const unsigned int POSITION_CONNECTED = 10U;
const unsigned int POSITION_DISCONNECTED = 11U;
const unsigned char COLOR_CODE = 3U;
CVoice::CVoice(const std::string& directory, const std::string& language, unsigned int id, unsigned int slot, unsigned int tg) :
@@ -58,15 +45,12 @@ m_seqNo(0U),
m_streamId(0U),
m_sent(0U),
m_ambe(NULL),
m_positions(NULL),
m_positions(),
m_data(),
m_it()
{
m_embeddedLC.setLC(m_lc);
m_positions = new CPositions[12U];
::memset(m_positions, 0x00U, 12U * sizeof(CPositions));
#if defined(_WIN32) || defined(_WIN64)
m_indxFile = directory + "\\" + language + ".indx";
m_ambeFile = directory + "\\" + language + ".ambe";
@@ -81,10 +65,13 @@ CVoice::~CVoice()
for (std::vector<CDMRData*>::iterator it = m_data.begin(); it != m_data.end(); ++it)
delete *it;
for (std::map<std::string, CPositions*>::iterator it = m_positions.begin(); it != m_positions.end(); ++it)
delete it->second;
m_data.clear();
m_positions.clear();
delete[] m_ambe;
delete[] m_positions;
}
bool CVoice::open()
@@ -121,46 +108,15 @@ bool CVoice::open()
char* p3 = ::strtok(NULL, "\t\r\n");
if (p1 != NULL && p2 != NULL && p3 != NULL) {
std::string symbol = std::string(p1);
unsigned int start = ::atoi(p2) * 9U;
unsigned int length = ::atoi(p3) * 9U;
if (::strcmp(p1, "0") == 0) {
m_positions[POSITION_0].m_start = start;
m_positions[POSITION_0].m_length = length;
} else if (::strcmp(p1, "1") == 0) {
m_positions[POSITION_1].m_start = start;
m_positions[POSITION_1].m_length = length;
} else if (::strcmp(p1, "2") == 0) {
m_positions[POSITION_2].m_start = start;
m_positions[POSITION_2].m_length = length;
} else if (::strcmp(p1, "3") == 0) {
m_positions[POSITION_3].m_start = start;
m_positions[POSITION_3].m_length = length;
} else if (::strcmp(p1, "4") == 0) {
m_positions[POSITION_4].m_start = start;
m_positions[POSITION_4].m_length = length;
} else if (::strcmp(p1, "5") == 0) {
m_positions[POSITION_5].m_start = start;
m_positions[POSITION_5].m_length = length;
} else if (::strcmp(p1, "6") == 0) {
m_positions[POSITION_6].m_start = start;
m_positions[POSITION_6].m_length = length;
} else if (::strcmp(p1, "7") == 0) {
m_positions[POSITION_7].m_start = start;
m_positions[POSITION_7].m_length = length;
} else if (::strcmp(p1, "8") == 0) {
m_positions[POSITION_8].m_start = start;
m_positions[POSITION_8].m_length = length;
} else if (::strcmp(p1, "9") == 0) {
m_positions[POSITION_9].m_start = start;
m_positions[POSITION_9].m_length = length;
} else if (::strcmp(p1, "connected") == 0) {
m_positions[POSITION_CONNECTED].m_start = start;
m_positions[POSITION_CONNECTED].m_length = length;
} else if (::strcmp(p1, "disconnected") == 0) {
m_positions[POSITION_DISCONNECTED].m_start = start;
m_positions[POSITION_DISCONNECTED].m_length = length;
}
CPositions* pos = new CPositions;
pos->m_start = start;
pos->m_length = length;
m_positions[symbol] = pos;
}
}
}
@@ -174,32 +130,36 @@ bool CVoice::open()
void CVoice::linkedTo(unsigned int number, unsigned int room)
{
char letters[10U];
::sprintf(letters, "%03u%02u", number, room % 100U);
::sprintf(letters, "%03u", number);
std::vector<unsigned int> words;
words.push_back(POSITION_CONNECTED);
words.push_back(letters[0U] - '0');
words.push_back(letters[1U] - '0');
words.push_back(letters[2U] - '0');
words.push_back(letters[3U] - '0');
words.push_back(letters[4U] - '0');
std::vector<std::string> words;
words.push_back("linkedto");
words.push_back("X");
words.push_back("L");
words.push_back("X");
words.push_back(std::string(1U, letters[0U]));
words.push_back(std::string(1U, letters[1U]));
words.push_back(std::string(1U, letters[2U]));
words.push_back(std::string(1U, 'A' + room - 1U));
createVoice(words);
}
void CVoice::unlinked()
{
std::vector<unsigned int> words;
words.push_back(POSITION_DISCONNECTED);
std::vector<std::string> words;
words.push_back("notlinked");
createVoice(words);
}
void CVoice::createVoice(const std::vector<unsigned int>& words)
void CVoice::createVoice(const std::vector<std::string>& words)
{
unsigned int ambeLength = 0U;
for (std::vector<unsigned int>::const_iterator it = words.begin(); it != words.end(); ++it)
ambeLength += m_positions[*it].m_length;
for (std::vector<std::string>::const_iterator it = words.begin(); it != words.end(); ++it) {
CPositions* position = m_positions.at(*it);
ambeLength += position->m_length;
}
// Ensure that the AMBE is an integer number of DMR frames
if ((ambeLength % 27U) != 0U) {
@@ -215,9 +175,10 @@ void CVoice::createVoice(const std::vector<unsigned int>& words)
::memcpy(ambeData + i, SILENCE, 9U);
unsigned int pos = 0U;
for (std::vector<unsigned int>::const_iterator it = words.begin(); it != words.end(); ++it) {
unsigned int start = m_positions[*it].m_start;
unsigned int length = m_positions[*it].m_length;
for (std::vector<std::string>::const_iterator it = words.begin(); it != words.end(); ++it) {
CPositions* position = m_positions.at(*it);
unsigned int start = position->m_start;
unsigned int length = position->m_length;
::memcpy(ambeData + pos, m_ambe + start, length);
pos += length;
}