From 83ccefb24e059f7283ac498f93658e2fe204064a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 31 Oct 2011 02:40:08 +0100
Subject: [PATCH] update for netbuffer api change

---
 gst/rtpmanager/rtpsession.c | 8 ++++----
 gst/rtpmanager/rtpsource.c  | 8 ++++----
 gst/udp/gstdynudpsink.c     | 2 +-
 gst/udp/gstudpsrc.c         | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c
index 786a855..00261d5 100644
--- a/gst/rtpmanager/rtpsession.c
+++ b/gst/rtpmanager/rtpsession.c
@@ -1280,7 +1280,7 @@ check_collision (RTPSession * sess, RTPSource * source,
     }
 
     if (have_from) {
-      if (gst_netaddress_equal (from, &arrival->address)) {
+      if (gst_net_address_equal (from, &arrival->address)) {
         /* Address is the same */
         return FALSE;
       } else {
@@ -1290,7 +1290,7 @@ check_collision (RTPSession * sess, RTPSource * source,
           if (rtp_source_find_conflicting_address (source,
                   &arrival->address, arrival->current_time)) {
             gchar buf1[40];
-            gst_netaddress_to_string (&arrival->address, buf1, 40);
+            gst_net_address_to_string (&arrival->address, buf1, 40);
             GST_LOG ("Known conflict on %x for %s, dropping packet",
                 rtp_source_get_ssrc (source), buf1);
             return TRUE;
@@ -1303,8 +1303,8 @@ check_collision (RTPSession * sess, RTPSource * source,
             rtp_source_add_conflicting_address (source, from,
                 arrival->current_time);
 
-            gst_netaddress_to_string (from, buf1, 40);
-            gst_netaddress_to_string (&arrival->address, buf2, 40);
+            gst_net_address_to_string (from, buf1, 40);
+            gst_net_address_to_string (&arrival->address, buf2, 40);
             GST_DEBUG ("New conflict for ssrc %x, replacing %s with %s,"
                 " saving old as known conflict",
                 rtp_source_get_ssrc (source), buf1, buf2);
diff --git a/gst/rtpmanager/rtpsource.c b/gst/rtpmanager/rtpsource.c
index 720ad18..be81293 100644
--- a/gst/rtpmanager/rtpsource.c
+++ b/gst/rtpmanager/rtpsource.c
@@ -307,12 +307,12 @@ rtp_source_create_stats (RTPSource * src)
 
   /* add address and port */
   if (src->have_rtp_from) {
-    gst_netaddress_to_string (&src->rtp_from, address_str,
+    gst_net_address_to_string (&src->rtp_from, address_str,
         sizeof (address_str));
     gst_structure_set (s, "rtp-from", G_TYPE_STRING, address_str, NULL);
   }
   if (src->have_rtcp_from) {
-    gst_netaddress_to_string (&src->rtcp_from, address_str,
+    gst_net_address_to_string (&src->rtcp_from, address_str,
         sizeof (address_str));
     gst_structure_set (s, "rtcp-from", G_TYPE_STRING, address_str, NULL);
   }
@@ -1718,7 +1718,7 @@ rtp_source_find_conflicting_address (RTPSource * src, GstNetAddress * address,
       item; item = g_list_next (item)) {
     RTPConflictingAddress *known_conflict = item->data;
 
-    if (gst_netaddress_equal (address, &known_conflict->address)) {
+    if (gst_net_address_equal (address, &known_conflict->address)) {
       known_conflict->time = time;
       return TRUE;
     }
@@ -1778,7 +1778,7 @@ rtp_source_timeout (RTPSource * src, GstClockTime current_time,
 
       src->conflicting_addresses =
           g_list_delete_link (src->conflicting_addresses, item);
-      gst_netaddress_to_string (&known_conflict->address, buf, 40);
+      gst_net_address_to_string (&known_conflict->address, buf, 40);
       GST_DEBUG ("collision %p timed out: %s", known_conflict, buf);
       g_free (known_conflict);
     }
diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c
index b34dc60..42f13bd 100644
--- a/gst/udp/gstdynudpsink.c
+++ b/gst/udp/gstdynudpsink.c
@@ -199,7 +199,7 @@ gst_dynudpsink_render (GstBaseSink * bsink, GstBuffer * buffer)
   GST_DEBUG ("about to send %d bytes", size);
 
   /* let's get the address from the metaata */
-  gst_netaddress_get_ip4_address (&meta->naddr, &destaddr, &destport);
+  gst_net_address_get_ip4_address (&meta->naddr, &destaddr, &destport);
 
   GST_DEBUG ("sending %d bytes to client %d port %d", size, destaddr, destport);
 
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index 059cdad..c7ecc8f 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -534,7 +534,7 @@ no_select:
   switch (sa.sa.sa_family) {
     case AF_INET:
     {
-      gst_netaddress_set_ip4_address (&meta->naddr, sa.sa_in.sin_addr.s_addr,
+      gst_net_address_set_ip4_address (&meta->naddr, sa.sa_in.sin_addr.s_addr,
           sa.sa_in.sin_port);
     }
       break;
@@ -543,7 +543,7 @@ no_select:
       guint8 ip6[16];
 
       memcpy (ip6, &sa.sa_in6.sin6_addr, sizeof (ip6));
-      gst_netaddress_set_ip6_address (&meta->naddr, ip6, sa.sa_in6.sin6_port);
+      gst_net_address_set_ip6_address (&meta->naddr, ip6, sa.sa_in6.sin6_port);
     }
       break;
     default:
-- 
2.7.4