diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-05-14 21:29:53 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-05-14 21:29:53 +0000 |
commit | 81d169d37d7b8dff50b1b065de6c62873d264be3 (patch) | |
tree | b851abc9dee9ac64539e89ce76da588286612e12 | |
parent | 55df6692425a5ba65ddd6e35c209d348e9dc1baa (diff) |
Changed default sound back-end on Win32 to own DirectSound
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@445 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjlib/src/pj/config.c | 2 | ||||
-rw-r--r-- | pjmedia/include/pjmedia/config.h | 5 | ||||
-rw-r--r-- | pjsip-apps/src/samples/sndinfo.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pjlib/src/pj/config.c b/pjlib/src/pj/config.c index 3e8480eb..0784be39 100644 --- a/pjlib/src/pj/config.c +++ b/pjlib/src/pj/config.c @@ -21,7 +21,7 @@ #include <pj/ioqueue.h> static const char *id = "config.c"; -const char *PJ_VERSION = "0.5.5.1"; +const char *PJ_VERSION = "0.5.5.5"; PJ_DEF(void) pj_dump_config(void) { diff --git a/pjmedia/include/pjmedia/config.h b/pjmedia/include/pjmedia/config.h index 62d27e5f..89bbd4e8 100644 --- a/pjmedia/include/pjmedia/config.h +++ b/pjmedia/include/pjmedia/config.h @@ -34,8 +34,11 @@ * by default. */ #ifndef PJMEDIA_SOUND_IMPLEMENTATION -//# define PJMEDIA_SOUND_IMPLEMENTATION PJMEDIA_SOUND_PORTAUDIO_SOUND +# if defined(PJ_WIN32) && PJ_WIN32!=0 # define PJMEDIA_SOUND_IMPLEMENTATION PJMEDIA_SOUND_WIN32_DIRECT_SOUND +# else +# define PJMEDIA_SOUND_IMPLEMENTATION PJMEDIA_SOUND_PORTAUDIO_SOUND +# endif #endif diff --git a/pjsip-apps/src/samples/sndinfo.c b/pjsip-apps/src/samples/sndinfo.c index 3a184164..5ddc67a9 100644 --- a/pjsip-apps/src/samples/sndinfo.c +++ b/pjsip-apps/src/samples/sndinfo.c @@ -127,7 +127,7 @@ static pj_status_t rec_cb(void *user_data, pj_uint32_t timestamp, ++rec_counter; - if (timestamp - last_rec_timestamp >= clock_rate) { + if (timestamp - last_rec_timestamp >= clock_rate && last_play_timestamp) { int diff; diff = last_play_timestamp - timestamp; printf("Play timestamp=%u, capture timestamp=%u, diff=%d\n", |