diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
| commit | 6b4964727bffb379aca9601e1cf69051ccbf600c (patch) | |
| tree | 1d9739ea8b3b5e0421f1d99b39e798b1514fb644 /pjsip-apps/src/python | |
| parent | 85ac546acb235df62169c4ad317da74a62e56a88 (diff) | |
Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3999 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src/python')
| -rw-r--r-- | pjsip-apps/src/python/_pjsua.c | 2 | ||||
| -rw-r--r-- | pjsip-apps/src/python/setup.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pjsip-apps/src/python/_pjsua.c b/pjsip-apps/src/python/_pjsua.c index 9267434c..bb5d91f1 100644 --- a/pjsip-apps/src/python/_pjsua.c +++ b/pjsip-apps/src/python/_pjsua.c @@ -2347,7 +2347,7 @@ static PyObject *py_pjsua_conf_get_port_info(PyObject *pSelf, PyObject *pArgs) ret = (PyObj_pjsua_conf_port_info *) conf_port_info_new(&PyTyp_pjsua_conf_port_info, NULL, NULL); ret->bits_per_sample = info.bits_per_sample; - ret->channel_count = info.bits_per_sample; + ret->channel_count = info.channel_count; ret->clock_rate = info.clock_rate; ret->name = PyString_FromPJ(&info.name); ret->samples_per_frame = info.samples_per_frame; diff --git a/pjsip-apps/src/python/setup.py b/pjsip-apps/src/python/setup.py index 98b2d786..43e4ef7e 100644 --- a/pjsip-apps/src/python/setup.py +++ b/pjsip-apps/src/python/setup.py @@ -21,6 +21,7 @@ from distutils.core import setup, Extension import os import sys +import platform # find pjsip version pj_version="" @@ -58,9 +59,12 @@ for line in f: f.close() # Mac OS X depedencies -if sys.platform == 'darwin': +if platform.system() == 'Darwin': extra_link_args = ["-framework", "CoreFoundation", "-framework", "AudioToolbox"] + # OS X Lion support + if platform.mac_ver()[0].startswith("10.7"): + extra_link_args += ["-framework", "AudioUnit"] else: extra_link_args = [] |