Changeset 4687 for pjproject

Timestamp:

Dec 5, 2013 1:20:37 PM (11 years ago)

Author:

nanang

Message:

Re #1708: Misc updates:

• Explicitly invoke call hangup in stopping audio.
• Show text chat box, if it's hidden, when user initiates instant message (right click on buddy).

Location:

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui

Files:

• application.py (modified) (1 diff)
• chat.py (modified) (2 diffs)

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/application.py

@@ -399 +399 @@
                         chat = acc.findChat(bud.cfg.uri)
                         if not chat: chat = acc.newChat(bud.cfg.uri)
-                        chat.showWindow()
+                        chat.showWindow(True)
                 elif label=='Subscribe':
                         bud.subscribePresence(True)

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/chat.py

@@ -196 +196 @@
                         assert(0) # idx must be found!
                 
-        def showWindow(self):
+        def showWindow(self, show_text_chat = False):
                 self._gui.bringToFront()
+                if show_text_chat:
+                        self._gui.textShowHide(True)
 
         # helper
@@ -293 +295 @@
                         
         def stopCall(self):
-                for p in self._participantList:
+                for idx, p in enumerate(self._participantList):
                         self._gui.audioUpdateState(str(p), gui.AudioState.DISCONNECTED)
-                        if True or not self.isPrivate():
+                        c = self._callList[idx]
+                        if c:
+                                c.hangup(pj.CallOpParam())
+
+                        if not self.isPrivate():
                                 self.kickParticipant(p)
-                
-                # clear call list, calls should be auto-destroyed by GC (and hungup by destructor)
-                #for idx, c in enumerate(self._callList):
-                #       self._callList[idx] = None
                 
         def updateCallState(self, thecall, info = None):