From f01338bfbcb8122fb6fd47eaa26afbff23595ec9 Mon Sep 17 00:00:00 2001
From: Benny Prijono <bennylp@teluu.com>
Date: Thu, 9 Feb 2006 15:47:12 +0000
Subject: Fixed Linux OSS sound

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@173 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjmedia/build/os-linux.mak    | 3 ++-
 pjmedia/src/pjmedia/pasound.c | 4 ++++
 pjsip/build/Makefile          | 2 +-
 pjsip/src/pjsua/pjsua_core.c  | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pjmedia/build/os-linux.mak b/pjmedia/build/os-linux.mak
index d64d8e26..2e6d1e98 100644
--- a/pjmedia/build/os-linux.mak
+++ b/pjmedia/build/os-linux.mak
@@ -9,5 +9,6 @@
 #
 export PJMEDIA_OBJS += $(PA_DIR)/pa_unix_hostapis.o $(PA_DIR)/pa_unix_util.o \
 		       $(PA_DIR)/pa_unix_oss.o
+#		       $(PA_DIR)/pa_linux_alsa.o
 
-export OS_CFLAGS += 
+export OS_CFLAGS +=  $(CC_DEF)PA_USE_OSS=1
diff --git a/pjmedia/src/pjmedia/pasound.c b/pjmedia/src/pjmedia/pasound.c
index 5c5c7bd0..a664d9fd 100644
--- a/pjmedia/src/pjmedia/pasound.c
+++ b/pjmedia/src/pjmedia/pasound.c
@@ -141,6 +141,10 @@ PJ_DEF(pj_status_t) pj_snd_init(pj_pool_factory *factory)
     err = Pa_Initialize();
 
     PJ_LOG(4,(THIS_FILE, "PortAudio sound library initialized, status=%d", err));
+    PJ_LOG(4,(THIS_FILE, "PortAudio host api count=%d",
+			 Pa_GetHostApiCount()));
+    PJ_LOG(4,(THIS_FILE, "Sound device count=%d",
+			 pj_snd_get_dev_count()));
 
     return err;
 }
diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
index 976ef8f8..cf82a3b3 100644
--- a/pjsip/build/Makefile
+++ b/pjsip/build/Makefile
@@ -24,7 +24,7 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
 		   $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
-		   $(LDFLAGS) 
+		   $(LDFLAGS) -lm
 
 
 ###############################################################################
diff --git a/pjsip/src/pjsua/pjsua_core.c b/pjsip/src/pjsua/pjsua_core.c
index 3bdf94ee..fc110409 100644
--- a/pjsip/src/pjsua/pjsua_core.c
+++ b/pjsip/src/pjsua/pjsua_core.c
@@ -665,6 +665,9 @@ pj_status_t pjsua_destroy(void)
 
     pjsua.quit_flag = 1;
 
+    /* Destroy sound framework: */
+    pj_snd_deinit();
+
     /* Wait worker threads to quit: */
 
     for (i=0; i<pjsua.thread_cnt; ++i) {
-- 
cgit v1.2.3