diff options
| -rw-r--r-- | build/rules.mak | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | pjlib-util/build/Makefile | 2 | ||||
| -rw-r--r-- | pjmedia/build/Makefile | 2 | ||||
| -rw-r--r-- | pjmedia/build/os-win32.mak | 3 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia.h | 1 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/silencedet.h | 7 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/errno.c | 5 | ||||
| -rw-r--r-- | pjsip-apps/build/Makefile | 2 | ||||
| -rw-r--r-- | pjsip-apps/src/pjsua/main.c | 6 |
10 files changed, 22 insertions, 10 deletions
diff --git a/build/rules.mak b/build/rules.mak index 2076a9bd..c43cb928 100644 --- a/build/rules.mak +++ b/build/rules.mak @@ -153,7 +153,7 @@ depend: $(subst @@,$(DEP_FILE),$(HOST_RM)) for F in $(FULL_SRCS); do \ if test -f $$F; then \ - echo -n "$(OBJDIR)/" >> $(DEP_FILE); \ + echo "$(OBJDIR)/" | tr -d '\n' >> $(DEP_FILE); \ if gcc -M $(DEPFLAGS) $$F | sed '/^#/d' >> $(DEP_FILE); then \ true; \ else \ @@ -8,7 +8,7 @@ if echo $MACHINE | grep unknown > /dev/null; then MACHINE=`uname -m` fi; -if echo $MACHINE | grep sun4u > /dev/null; then +if echo $MACHINE | grep sparc > /dev/null; then MACHINE_NAME=sparc elif echo $MACHINE | grep i.86 > /dev/null; then MACHINE_NAME=i386 diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile index e167f838..bd170f00 100644 --- a/pjlib-util/build/Makefile +++ b/pjlib-util/build/Makefile @@ -71,7 +71,7 @@ pjlib-util-test: $(PJLIB_LIB) clean depend realclean: $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $@ $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $@ - @if test "$@" == "depend"; then \ + @if test "$@" = "depend"; then \ echo '$(TEST_EXE): $(PJLIB_UTIL_LIB)' >> .pjlib-util-test-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ fi diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 9b347edb..7cf6012f 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -160,7 +160,7 @@ clean depend realclean: $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ - @if test "$@" == "depend"; then \ + @if test "$@" = "depend"; then \ echo '$(PJMEDIA_LIB): .pjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend' >> .pjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ echo '$(PJMEDIA_CODEC_LIB): .pjmedia-codec-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend' >> .pjmedia-codec-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ echo '$(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjmedia-test-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ diff --git a/pjmedia/build/os-win32.mak b/pjmedia/build/os-win32.mak index ffd043b0..9a7c836b 100644 --- a/pjmedia/build/os-win32.mak +++ b/pjmedia/build/os-win32.mak @@ -13,8 +13,9 @@ export PJMEDIA_OBJS += $(PA_DIR)/pa_win_hostapis.o $(PA_DIR)/pa_win_util.o \ export OS_CFLAGS += -DPA_NO_ASIO -DPA_NO_DS # Example: -# to activate Null sound, uncomment this line below. +# to activate Null sound, uncomment these two lines below. #export SOUND_OBJS = $(NULLSOUND_OBJS) +#export OS_CFLAGS += $(CC_DEF)PJMEDIA_HAS_NULL_SOUND # Example: # to include only GSM and exclude Speex codec, uncomment the "export" line below. diff --git a/pjmedia/include/pjmedia.h b/pjmedia/include/pjmedia.h index 9a8c4237..8cdc0b72 100644 --- a/pjmedia/include/pjmedia.h +++ b/pjmedia/include/pjmedia.h @@ -38,6 +38,7 @@ #include <pjmedia/rtp.h> #include <pjmedia/sdp.h> #include <pjmedia/sdp_neg.h> +#include <pjmedia/silencedet.h> #include <pjmedia/session.h> #include <pjmedia/sound.h> #include <pjmedia/sound_port.h> diff --git a/pjmedia/include/pjmedia/silencedet.h b/pjmedia/include/pjmedia/silencedet.h index f251c082..4e823979 100644 --- a/pjmedia/include/pjmedia/silencedet.h +++ b/pjmedia/include/pjmedia/silencedet.h @@ -130,7 +130,14 @@ PJ_DECL(pj_bool_t) pjmedia_silence_det_apply( pjmedia_silence_det *sd, pj_uint32_t level); +/** + * Declaration linear2ulaw + */ +unsigned char linear2ulaw(int pcm_val); + + PJ_END_DECL + #endif /* __PJMEDIA_SILENCE_DET_H__ */ diff --git a/pjmedia/src/pjmedia/errno.c b/pjmedia/src/pjmedia/errno.c index 7ea7af8c..86c78d5f 100644 --- a/pjmedia/src/pjmedia/errno.c +++ b/pjmedia/src/pjmedia/errno.c @@ -145,6 +145,7 @@ PJ_DEF(pj_str_t) pjmedia_strerror( pj_status_t statcode, #if defined(PJ_HAS_ERROR_STRING) && (PJ_HAS_ERROR_STRING != 0) /* See if the error comes from PortAudio. */ +#if defined(PJMEDIA_HAS_PORTAUDIO_SOUND) && PJMEDIA_HAS_PORTAUDIO_SOUND!=0 if (statcode >= PJMEDIA_ERRNO_FROM_PORTAUDIO(paNotInitialized) && statcode < PJMEDIA_ERRNO_FROM_PORTAUDIO(paNotInitialized + 10000)) { @@ -159,7 +160,9 @@ PJ_DEF(pj_str_t) pjmedia_strerror( pj_status_t statcode, pj_strncpy_with_null(&errstr, &msg, bufsize); return errstr; - } else if (statcode >= PJMEDIA_ERRNO_START && + } else +#endif /* PJMEDIA_HAS_PORTAUDIO_SOUND */ + if (statcode >= PJMEDIA_ERRNO_START && statcode < PJMEDIA_ERRNO_START + PJ_ERRNO_SPACE_SIZE) { /* Find the error in the table. diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index dfcadb63..d57228af 100644 --- a/pjsip-apps/build/Makefile +++ b/pjsip-apps/build/Makefile @@ -92,7 +92,7 @@ clean depend realclean: $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@ $(MAKE) -f $(RULES_MAK) APP=PJSIPPERF app=pjsip-perf $@ $(MAKE) -f Samples.mak $@ - @if test "$@" == "depend"; then \ + @if test "$@" = "depend"; then \ echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) Makefile' >> .pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ echo '$(PJSIPPERF_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjsip-perf-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ fi diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c index 3e6339db..3c7e2fdd 100644 --- a/pjsip-apps/src/pjsua/main.c +++ b/pjsip-apps/src/pjsua/main.c @@ -317,7 +317,7 @@ static void ui_input_url(const char *title, char *buf, int len, len = strlen(buf); /* Left trim */ - while (isspace(*buf)) { + while (pj_isspace(*buf)) { ++buf; --len; } @@ -329,7 +329,7 @@ static void ui_input_url(const char *title, char *buf, int len, if (len == 0 || buf[0]=='q') return; - if (isdigit(*buf) || *buf=='-') { + if (pj_isdigit(*buf) || *buf=='-') { int i; @@ -339,7 +339,7 @@ static void ui_input_url(const char *title, char *buf, int len, i = 0; for (; i<len; ++i) { - if (!isdigit(buf[i])) { + if (!pj_isdigit(buf[i])) { puts("Invalid input"); return; } |