diff options
| author | Olivier Crête <olivier.crete@collabora.co.uk> | 2011-01-20 21:24:54 -0500 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.co.uk> | 2011-01-20 21:24:54 -0500 |
| commit | 33c8decb747ca2052cc04006746365abed82093a (patch) | |
| tree | 5fdeca307dc9c30dc129a59e1c7ebed9396e3134 | |
| parent | 8a7ef0893b1f7abca05c24f9829e5c29778abc8f (diff) | |
| download | farstream-33c8decb747ca2052cc04006746365abed82093a.tar.gz | |
nice: Update to use the nice 0.1.0 API
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | transmitters/rawudp/fs-rawudp-component.c | 6 |
3 files changed, 6 insertions, 4 deletions
@@ -19,7 +19,7 @@ Build time: - gst-plugins-base 0.10.26 - glib 2.16 - Python 2.4 - - libnice 0.0.9 + - libnice 0.1.0 For UPnP support: - GUPnP-IGD diff --git a/configure.ac b/configure.ac index ff619c8d..139961c4 100644 --- a/configure.ac +++ b/configure.ac @@ -161,7 +161,7 @@ AC_ARG_WITH(transmitter-plugins, [FS2_TRANSMITTER_PLUGINS_SELECTED=$FS2_TRANSMITTER_PLUGINS_ALL]) -NICE_REQUIRED=0.0.9 +NICE_REQUIRED=0.1.0 PKG_CHECK_MODULES(NICE, \ nice >= $NICE_REQUIRED,, AC_MSG_ERROR([Need libnice >= $NICE_REQUIRED])) diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c index 35d02cb4..3052583e 100644 --- a/transmitters/rawudp/fs-rawudp-component.c +++ b/transmitters/rawudp/fs-rawudp-component.c @@ -1479,14 +1479,16 @@ stun_timeout_func (gpointer user_data) } FS_RAWUDP_COMPONENT_LOCK(self); - stun_timer_start (&stun_timer); + stun_timer_start (&stun_timer, STUN_TIMER_DEFAULT_TIMEOUT, + STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS); while (!self->priv->stun_stop && timeout_accum_ms < self->priv->stun_timeout * 1000) { if (self->priv->stun_server_changed) { - stun_timer_start (&stun_timer); + stun_timer_start (&stun_timer, STUN_TIMER_DEFAULT_TIMEOUT, + STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS); self->priv->stun_server_changed = FALSE; timer_ret = STUN_USAGE_TIMER_RETURN_RETRANSMIT; } |