Changeset 2163 for pjproject/trunk/pjsip-apps/src/python/samples/call.py

Timestamp:

Jul 21, 2008 6:20:57 PM (16 years ago)

Author:

bennylp

Message:

Major modifications in Python module and pjsua.py wrapper:

• replaced call/acc/buddy dictionaries with user data attachment
• recommended to install callback when creating the object, to prevent missing some events
• fixed circular references by using weakref
• protect access to pjsua with mutex; found out that without this there will be deadlock in Python
• fixed memory leaks in the _pjsua.c module (objects reference counter not properly maintained)

File:

• pjproject/trunk/pjsip-apps/src/python/samples/call.py (modified) (10 diffs)

pjproject/trunk/pjsip-apps/src/python/samples/call.py

@@ -1 @@
-# $Id:$
+# $Id$
 #
 # SIP call sample.
@@ -19 +19 @@
 class MyAccountCallback(pj.AccountCallback):
 
-    def __init__(self, account):
+    def __init__(self, account=None):
         pj.AccountCallback.__init__(self, account)
 
@@ -25 +25 @@
     def on_incoming_call(self, call):
         global current_call 
-
         if current_call:
             call.answer(486, "Busy")
@@ -44 +43 @@
 class MyCallCallback(pj.CallCallback):
 
-    def __init__(self, call):
+    def __init__(self, call=None):
         pj.CallCallback.__init__(self, call)
 
@@ -50 +49 @@
     def on_state(self):
         global current_call
-
         print "Call with", self.call.info().remote_uri,
         print "is", self.call.info().state_text,
@@ -58 +56 @@
         if self.call.info().state == pj.CallState.DISCONNECTED:
             current_call = None
+            print 'Current call is', current_call
 
     # Notification when call's media state has changed.
@@ -74 +73 @@
     try:
         print "Making call to", uri
-        call = acc.make_call(uri)
-        call_cb = MyCallCallback(call)
-        call.set_callback(call_cb)
-        return call
+        return acc.make_call(uri, cb=MyCallCallback())
     except pj.Error, e:
-        print "Error: " + str(e)
+        print "Exception: " + str(e)
         return None
         
@@ -101 +97 @@
 
     # Create local account
-    acc = lib.create_account_for_transport(transport)
-    acc_cb = MyAccountCallback(acc)
-    acc.set_callback(acc_cb)
+    acc = lib.create_account_for_transport(transport, cb=MyAccountCallback())
 
     # If argument is specified then make call to the URI
     if len(sys.argv) > 1:
+        lck = lib.auto_lock()
         current_call = make_call(sys.argv[1])
+        print 'Current call is', current_call
+        del lck
 
     my_sip_uri = "sip:" + transport.info().host + \
@@ -126 +123 @@
             if input == "":
                 continue
+            lck = lib.auto_lock()
             current_call = make_call(input)
+            del lck
 
         elif input == "h":
@@ -144 +143 @@
 
     # Shutdown the library
+    transport = None
+    acc.delete()
+    acc = None
     lib.destroy()
     lib = None