From e87a22eb62d56a333f1efda2ef1abe853d999beb Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Fri, 18 Nov 2005 16:26:05 +0000
Subject: [PATCH] gst/Makefile.am: Add GST_NET libs. gst/gst.defs
 (gst_net_time_provider_new)

Original commit message from CVS:
2005-11-18  Andy Wingo  <wingo@pobox.com>

* gst/Makefile.am: Add GST_NET libs.

* gst/gst.defs (gst_net_time_provider_new)
(gst_net_client_clock_new): Add constructors

* configure.ac: Check for gstreamer-net as well.

* gst/gst.override: Include gst/net/gstnet.h.

* gst/gst-types.defs (NetTimeProvider, NetClientClock): Added new
types.
---
 ChangeLog          | 14 ++++++++++++++
 common             |  2 +-
 configure.ac       | 11 +++++++++++
 gst/Makefile.am    |  3 ++-
 gst/gst-types.defs | 14 ++++++++++++++
 gst/gst.defs       | 27 +++++++++++++++++++++++++++
 gst/gst.override   |  2 ++
 7 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6065881..a19d325 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-11-18  Andy Wingo  <wingo@pobox.com>
+
+	* gst/Makefile.am: Add GST_NET libs.
+
+	* gst/gst.defs (gst_net_time_provider_new) 
+	(gst_net_client_clock_new): Add constructors
+
+	* configure.ac: Check for gstreamer-net as well.
+
+	* gst/gst.override: Include gst/net/gstnet.h.
+
+	* gst/gst-types.defs (NetTimeProvider, NetClientClock): Added new
+	types.
+
 2005-11-15  Edward Hervey  <edward@fluendo.com>
 
 	* gst/gst.defs:
diff --git a/common b/common
index 657b549..ea14091 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 657b549dfb640a76f3d7ab7676e453c801a83dca
+Subproject commit ea1409191cc1e71273b2dbdd94e7ab5fc5a60a51
diff --git a/configure.ac b/configure.ac
index b2a36d9..638ddaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,17 @@ fi
 AC_SUBST(GST_CONTROLLER_LIBS)
 AC_SUBST(GST_CONTROLLER_CFLAGS)
 
+dnl check for gstreamer-net
+PKG_CHECK_MODULES(GST_NET, gstreamer-net-$GST_MAJORMINOR >= $GST_REQ,
+  HAVE_GST_NET="yes", HAVE_GST_NET="no")
+
+if test "x$HAVE_GST_NET" = "xno"; then
+  AC_MSG_ERROR(no GStreamer Networking Libs found)
+fi
+
+AC_SUBST(GST_NET_LIBS)
+AC_SUBST(GST_NET_CFLAGS)
+
 
 dnl check for pygtk
 PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQ)
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 19b5733..b58f02a 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -32,7 +32,8 @@ GEN_FILES = arg-types.py gst-types.defs libs.defs
 # GStreamer bindings
 _gst_la_CFLAGS = $(common_cflags)
 _gst_la_LIBADD = $(common_libadd)
-_gst_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gst $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS)
+_gst_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gst \
+	$(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_NET_LIBS)
 _gst_la_SOURCES = 		\
 	gst-argtypes.c 		\
 	gstmodule.c 		\
diff --git a/gst/gst-types.defs b/gst/gst-types.defs
index 436448b..30bef88 100644
--- a/gst/gst-types.defs
+++ b/gst/gst-types.defs
@@ -138,6 +138,20 @@
   (gtype-id "GST_TYPE_XML")
 )
 
+(define-object NetClientClock
+  (in-module "Gst")
+  (parent "GstSystemClock")
+  (c-name "GstNetClientClock")
+  (gtype-id "GST_TYPE_NET_CLIENT_CLOCK")
+)
+
+(define-object NetTimeProvider
+  (in-module "Gst")
+  (parent "GstObject")
+  (c-name "GstNetTimeProvider")
+  (gtype-id "GST_TYPE_NET_TIME_PROVIDER")
+)
+
 ;;
 ;; MiniObject types
 ;;
diff --git a/gst/gst.defs b/gst/gst.defs
index b508d85..7f171bf 100644
--- a/gst/gst.defs
+++ b/gst/gst.defs
@@ -6624,3 +6624,30 @@
 )
 
 
+;; From ../gstreamer/gst/net/gstnetclientclock.h
+
+(define-function gst_net_client_clock_new
+  (c-name "gst_net_client_clock_new")
+  (is-constructor-of "GstNetClientClock")
+  (return-type "GstClock*")
+  (parameters
+    '("gchar*" "name")
+    '("gchar*" "remote_address")
+    '("gint" "remote_port")
+    '("GstClockTime" "base_time")
+  )
+)
+
+
+;; From ../gstreamer/gst/net/gstnettimeprovider.h
+
+(define-function gst_net_time_provider_new
+  (c-name "gst_net_time_provider_new")
+  (is-constructor-of "GstNetTimeProvider")
+  (return-type "GstNetTimeProvider*")
+  (parameters
+    '("GstClock*" "clock")
+    '("gchar*" "address" (null-ok) (default "NULL"))
+    '("gint" "port" (default 0))
+  )
+)
diff --git a/gst/gst.override b/gst/gst.override
index c94a52f..2de8d1b 100644
--- a/gst/gst.override
+++ b/gst/gst.override
@@ -42,6 +42,8 @@ headers
 #include <gst/dataprotocol/dataprotocol.h>
 #include <gst/base/gstadapter.h>
 
+#include <gst/net/gstnet.h>
+
 #include "pygstvalue.h"
 #include "pygstminiobject.h"
 #include "pygstexception.h"
-- 
2.7.4