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

Consolidate playback and playback_user

Browse Source
This commit is contained in:
Cort Buffington 2014-08-17 11:23:10 -04:00
parent c04bbc1b84
commit 211ebab6bd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playback.py
View File

@ -45,6 +45,7 @@ class playbackIPSC(IPSC):
#************************************************ #************************************************
# #
if GROUP_REPEAT: if GROUP_REPEAT:
logger.info('DEFINING GROUP REPEAT FUNCTION')
def group_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data): def group_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
if HEX_TGID == _dst_sub and _ts in GROUP_TS: if HEX_TGID == _dst_sub and _ts in GROUP_TS:
if not _end: if not _end:
@ -55,7 +56,7 @@ class playbackIPSC(IPSC):
self.CALL_DATA.append(_tmp_data) self.CALL_DATA.append(_tmp_data)
if _end: if _end:
self.CALL_DATA.append(_data) self.CALL_DATA.append(_data)
time.sleep(2) time.sleep(1)
logger.info('(%s) Playing back transmission from subscriber: %s', _network, int_id(_src_sub)) logger.info('(%s) Playing back transmission from subscriber: %s', _network, int_id(_src_sub))
for i in self.CALL_DATA: for i in self.CALL_DATA:
_tmp_data = i _tmp_data = i
@ -67,6 +68,7 @@ class playbackIPSC(IPSC):
self.CALL_DATA = [] self.CALL_DATA = []
if PRIVATE_REPEAT: if PRIVATE_REPEAT:
logger.info('DEFINING PRIVATE REPEAT FUNCTION')
def private_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data): def private_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
if HEX_SUB == _dst_sub and _ts in PRIVATE_TS: if HEX_SUB == _dst_sub and _ts in PRIVATE_TS:
if not _end: if not _end:
@ -92,7 +94,6 @@ class playbackIPSC(IPSC):
time.sleep(0.06) time.sleep(0.06)
self.CALL_DATA = [] self.CALL_DATA = []
if __name__ == '__main__': if __name__ == '__main__':
logger.info('DMRlink \'playback.py\' (c) 2013, 2014 N0MJS & the K0USY Group - SYSTEM STARTING...') logger.info('DMRlink \'playback.py\' (c) 2013, 2014 N0MJS & the K0USY Group - SYSTEM STARTING...')
for ipsc_network in NETWORK: for ipsc_network in NETWORK: