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 6517d05ccbabc46e1e35407c124733c159bae6ea..ec27bc6715a6574e16c4e8c3e711cca873316d37 100644 (file)
--- 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 fd34ed900790d90cd0eee4da239699ebcc00bb9e..7c1cfc98cbd0c569a10f988469ec80634e39c143 100644 (file)
--- 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 71c8b1068ff3102c6d97b6c6159c1d01861ee94b..1443ab46e7c278ecf27dde13eba6788d86d0cde2 100644 (file)
--- 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 94c979fcd7b8bcdf37ebc913e28ea1940a993cb6..fbd4077e828e7e945fc8c0c4497e56f0dcacffa8 100644 (file)
--- 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;