diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-09-10 18:03:22 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-09-10 18:03:22 +0000 |
| commit | a1f8b7e0849a66bcd7b1e93a96da58a632248beb (patch) | |
| tree | 3877ee8d86bf3e15cd83f7ac92a04dd43e46ca8e | |
| parent | d517c305b1524804d76a77f58c0354a16e6fe7eb (diff) | |
From Alejandro Vaquero:
Need to use HAVE_LIBPORTAUDIO instead
of PORTAUDIO_DIR in voip_calls.c
And build the windows version with Port audio.
svn path=/trunk/; revision=19187
| -rw-r--r-- | config.nmake | 4 | ||||
| -rw-r--r-- | gtk/voip_calls.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index e623b0515b..048521a506 100644 --- a/config.nmake +++ b/config.nmake @@ -207,12 +207,12 @@ LUA_DIR=$(WIRESHARK_LIBS)\lua5.1 # If you don't have PORTAUDIO, comment this line out, so that # PORTAUDIO_DIR isn't defined. # -# PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1 +PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1 # If the PORTAUDIO library is used this line must be uncommented if v18 # is used. V18 uses API version 1 and v19 API version 2 # -# PORTAUDIO_API_CONFIG=^#define PORTAUDIO_API_1 1 +PORTAUDIO_API_CONFIG=^#define PORTAUDIO_API_1 1 # diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index dad420d88c..650362ec31 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -126,7 +126,7 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo) /* reset the RTP player */ #if GTK_MAJOR_VERSION >= 2 -#ifdef PORTAUDIO_DIR +#ifdef HAVE_LIBPORTAUDIO reset_rtp_player(); #endif #endif @@ -489,7 +489,7 @@ RTP_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void con /* add this RTP for future listening using the RTP Player*/ #if GTK_MAJOR_VERSION >= 2 -#ifdef PORTAUDIO_DIR +#ifdef HAVE_LIBPORTAUDIO add_rtp_packet(pi, pinfo); #endif #endif |