ShaYmez/RYSEN
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add more silence padding to voice

Browse Source
This commit is contained in:
Simon 2020-11-07 17:03:40 +00:00
parent bdad00ffdc
commit f5f87d540b
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bridge_master.py
View File

@ -408,11 +408,13 @@ def disconnectedVoice(system):
_nine = bytes_3(9) _nine = bytes_3(9)
logger.info('(%s) Sending disconnected voice',system) logger.info('(%s) Sending disconnected voice',system)
_say = [words['silence']] _say = [words['silence']]
_say.append(words['silence'])
if CONFIG['SYSTEMS'][system]['DEFAULT_REFLECTOR'] > 0: if CONFIG['SYSTEMS'][system]['DEFAULT_REFLECTOR'] > 0:
_say.append(words['silence']) _say.append(words['silence'])
_say.append(words['linked']) _say.append(words['linked'])
_say.append(words['silence']) _say.append(words['silence'])
_say.append(words['2']) _say.append(words['2'])
_say.append(words['silence'])
_say.append(words['silence']) _say.append(words['silence'])
for number in str(CONFIG['SYSTEMS'][system]['DEFAULT_REFLECTOR']): for number in str(CONFIG['SYSTEMS'][system]['DEFAULT_REFLECTOR']):
@ -421,6 +423,8 @@ def disconnectedVoice(system):
else: else:
_say.append(words['notlinked']) _say.append(words['notlinked'])
_say.append(words['silence'])
speech = pkt_gen(_nine, _nine, bytes_4(9), 1, _say) speech = pkt_gen(_nine, _nine, bytes_4(9), 1, _say)
sleep(1) sleep(1)
@ -476,11 +480,13 @@ def ident():
#_stream_id = hex_str_4(1234567) #_stream_id = hex_str_4(1234567)
logger.info('(%s) Repeater idle. Sending voice ident',system) logger.info('(%s) Repeater idle. Sending voice ident',system)
_say = [words['silence']] _say = [words['silence']]
_say.append(words['silence'])
_systemcs = re.sub(r'\W+', '', system) _systemcs = re.sub(r'\W+', '', system)
_systemcs.upper() _systemcs.upper()
for character in _systemcs: for character in _systemcs:
_say.append(words[character]) _say.append(words[character])
_say.append(words['silence']) _say.append(words['silence'])
_say.append(words['silence'])
#test #test
#_say.append(AMBEobj.readSingleFile('44xx.ambe')) #_say.append(AMBEobj.readSingleFile('44xx.ambe'))
_all_call = bytes_3(16777215) _all_call = bytes_3(16777215)
@ -1126,6 +1132,7 @@ class routerHBP(HBSYSTEM):
_say.append(words['linked']) _say.append(words['linked'])
_say.append(words['silence']) _say.append(words['silence'])
_say.append(words['2']) _say.append(words['2'])
_say.append(words['silence'])
_say.append(words['silence']) _say.append(words['silence'])
for num in str(_dehash_bridge): for num in str(_dehash_bridge):
@ -1146,6 +1153,7 @@ class routerHBP(HBSYSTEM):
_say.append(words['silence']) _say.append(words['silence'])
_say.append(words['2']) _say.append(words['2'])
_say.append(words['silence']) _say.append(words['silence'])
_say.append(words['silence'])
for num in str(_int_dst_id): for num in str(_int_dst_id):
_say.append(words[num]) _say.append(words[num])

1
hblink.py
View File

@ -729,6 +729,7 @@ class reportFactory(Factory):
def send_config(self): def send_config(self):
serialized = pickle.dumps(self._config['SYSTEMS'], protocol=2) #.decode('utf-8', errors='ignore') #pickle.HIGHEST_PROTOCOL) serialized = pickle.dumps(self._config['SYSTEMS'], protocol=2) #.decode('utf-8', errors='ignore') #pickle.HIGHEST_PROTOCOL)
print(self._config['SYSTEMS'])
self.send_clients(b''.join([REPORT_OPCODES['CONFIG_SND'], serialized])) self.send_clients(b''.join([REPORT_OPCODES['CONFIG_SND'], serialized]))