guru
/
gnuradionetwork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More fixes to the crosslink "last" command

This commit is contained in:
Maurizio Porrato 2010-09-05 18:16:00 +02:00
parent fc2b35a6ea
commit 795dae9aa2
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
twisted/plugins/frncrosslink.py
View File

@ -76,10 +76,6 @@ class FRNCrosslinkClient(FRNClient):
self.sendMultiLineTextMessage(client, cl)
elif cmd == "last":
ml = []
if talking is None:
ml.append("No client talking now")
else:
ml.append("%s is talking now" % talking.user.ON)
ml.append("Last active talkers (most recent first):")
for n in lastMessages:
ml.append(n)
@ -97,21 +93,20 @@ class FRNCrosslinkClient(FRNClient):
global talking, lastMessages
self.txReq = False
self.txOk = False
if talking is not None: # FIXME: This is not the right place
l = talking.user.ON
if len(lastMessages) > 0:
if lastMessages[0] == l:
l = None
if l is not None:
lastMessages.insert(0, l)
lastMessages = lastMessages[:5]
talking = None
self.stopTransmission()
def audioFrameReceived(self, from_id, frames):
global clients, talking
global clients, talking, lastMessages
if talking is None or talking == self:
talking = self
talkingUser = self.clients[from_id-1]['on']
if len(lastMessages) > 0:
if lastMessages[0] == talkingUser:
talkingUser = None
if talkingUser is not None:
lastMessages.insert(0, talkingUser)
lastMessages = lastMessages[:5]
for _, _, _, factory in clients:
conn = factory.connection
if conn != self: