diff options
| author | Guy Harris <guy@alum.mit.edu> | 2006-09-21 17:39:17 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2006-09-21 17:39:17 +0000 |
| commit | 2ac876197887a5db0fb5e927ea4e988f1a2c56f8 (patch) | |
| tree | 710abb4bfdd277bf784c5e48f302dc8f37e38fb6 /gtk | |
| parent | 18664a78036986a4e639840f2938144661f033c3 (diff) | |
Include "rtp_player.h" in "voip_calls.c" if we're supporting the RTP
player, so that we get declartions of rtp_player_init() and
add_rtp_packet().
Constify the first argument to add_rtp_packet(), as it's passed a
pointer to a const value.
svn path=/trunk/; revision=19272
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/rtp_player.c | 2 | ||||
| -rw-r--r-- | gtk/rtp_player.h | 2 | ||||
| -rw-r--r-- | gtk/voip_calls.c | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c index 5b31d153f1..daeaa8467a 100644 --- a/gtk/rtp_player.c +++ b/gtk/rtp_player.c @@ -325,7 +325,7 @@ bt_state(gboolean decode, gboolean play, gboolean pause, gboolean stop) /****************************************************************************/ void -add_rtp_packet(struct _rtp_info *rtp_info, packet_info *pinfo) +add_rtp_packet(const struct _rtp_info *rtp_info, packet_info *pinfo) { rtp_stream_info_t *stream_info = NULL; rtp_packet_t *new_rtp_packet; diff --git a/gtk/rtp_player.h b/gtk/rtp_player.h index 5184c9cab2..f795946a65 100644 --- a/gtk/rtp_player.h +++ b/gtk/rtp_player.h @@ -37,7 +37,7 @@ #if GTK_MAJOR_VERSION >= 2 void rtp_player_init(voip_calls_tapinfo_t *voip_calls_tap); -void add_rtp_packet(struct _rtp_info *rtp_info, packet_info *pinfo); +void add_rtp_packet(const struct _rtp_info *rtp_info, packet_info *pinfo); void reset_rtp_player(void); #endif diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index 650362ec31..08a7b68964 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -65,6 +65,12 @@ #include "alert_box.h" #include "simple_dialog.h" +#if GTK_MAJOR_VERSION >= 2 +#ifdef HAVE_LIBPORTAUDIO +#include "rtp_player.h" +#endif /* HAVE_LIBPORTAUDIO */ +#endif /* GTK_MAJOR_VERSION >= 2 */ + const char *voip_call_state_name[7]={ "CALL SETUP", "RINGING", |