From: Andre <maan@p133.(none)>
Date: Mon, 13 Mar 2006 02:49:05 +0000 (+0100)
Subject: update to libortp-0.9.1
X-Git-Tag: v0.2.12~156
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=044dd6b25189b24d862d50b965fc2feaf93b01d7;p=paraslash.git

update to libortp-0.9.1

glib was dropped from libortp, and paraslash does not need it
either. So kill the check for glib in configure.ac and no longer
link para_server, para_recv, and para_audiod gainst glib. Moreover,
change guint32 to uint32_t in ortp_recv.c and ortp_send.c.
---

diff --git a/NEWS b/NEWS
index 6517d05c..ec27bc67 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ NEWS
 
 	o compress filter speed improvements
 
+	o update to libortp-0.9.1
+
+
 0.2.11 (2006-03-11) "atomic duality"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/configure.ac b/configure.ac
index fd34ed90..7c1cfc98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,11 +214,6 @@ extras="$extras $play"
 
 ########################################################################### ortp
 have_ortp="yes"
-pkg_modules="glib-2.0 >= 2.0.4"
-PKG_CHECK_MODULES(GLIB, [$pkg_modules], [], [
-	have_ortp="no"
-])
-CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"
 AC_CHECK_HEADERS([ortp/ortp.h], [], [
 	have_ortp="no"
 ])
@@ -234,9 +229,9 @@ if test "$have_ortp" = "yes"; then
 
 	server_errlist_objs="$server_errlist_objs ortp_send"
 
-	recv_ldflags="$recv_ldflags $GLIB_LIBS -lortp"
-	server_ldflags="$server_ldflags $GLIB_LIBS -lortp"
-	audiod_ldflags="$audiod_ldflags $GLIB_LIBS -lortp"
+	recv_ldflags="$recv_ldflags -lortp"
+	server_ldflags="$server_ldflags -lortp"
+	audiod_ldflags="$audiod_ldflags -lortp"
 	AC_DEFINE(HAVE_ORTP, 1, [define to 1 to turn on ortp support])
 
 else
diff --git a/ortp_recv.c b/ortp_recv.c
index 71c8b106..1443ab46 100644
--- a/ortp_recv.c
+++ b/ortp_recv.c
@@ -17,8 +17,8 @@
  */
 /** \file ortp_recv.c paraslash's ortp receiver */
 
-#include "para.h"
 #include <ortp/ortp.h>
+#include "para.h"
 
 #include "ortp.h"
 #include "recv.h"
@@ -30,7 +30,7 @@
 
 #define CHUNK_SIZE 128 * 1024
 
-extern gint msg_to_buf(mblk_t *, char *, gint);
+extern int msg_to_buf(mblk_t *, char *, int);
 
 /**
  * data specific to the ortp receiver
@@ -61,9 +61,9 @@ struct timeval next_chunk;
 /** number of consecutive bad chunks */
 int c_bad;
 /** the current timestamp which is passed to the receiving function of libortp */
-guint32 timestamp;
+uint32_t timestamp;
 /** \a timestamp increases by this amount */
-guint32 chunk_ts;
+uint32_t chunk_ts;
 };
 
 #if 1
@@ -301,5 +301,4 @@ void ortp_recv_init(struct receiver *r)
 	r->parse_config = ortp_recv_parse_config;
 
 	ortp_init();
-	ortp_set_debug_file("oRTP", NULL);
 }
diff --git a/ortp_send.c b/ortp_send.c
index 94c979fc..fbd4077e 100644
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -18,13 +18,13 @@
 
 /** \file ortp_send.c para_server's ortp sender */
 
+#include <ortp/ortp.h>
 
 #include "server.cmdline.h"
 #include "server.h"
 #include "afs.h"
 #include "send.h"
 #include "list.h"
-#include <ortp/ortp.h>
 #include "ortp.h"
 #include "string.h"
 
@@ -311,7 +311,6 @@ static char *ortp_help(void)
 void ortp_send_init(struct sender *s)
 {
 	ortp_init();
-	ortp_set_debug_file("oRTP", NULL);
 	INIT_LIST_HEAD(&targets);
 	s->info = ortp_info;
 	s->help = ortp_help;