gui: Only check STDIN for readability if curses is active.

[paraslash.git] / ortp_send.c

diff --git a/ortp_send.c b/ortp_send.c
index 1521b63d4031a853e9839aa617d3055241cb8cf0..aabbb7da09abf953457dfb4915f593eb0f0a6612 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"
 
@@ -103,7 +103,11 @@ static void ortp_init_session(struct ortp_target *ot)
        if (!ot->session)
                return;
        s = ot->session;
-//     rtp_session_set_jitter_compensation(ot->session, 100);
+       if (conf.ortp_jitter_compensation_arg) {
+               rtp_session_enable_adaptive_jitter_compensation(ot->session, TRUE);
+               rtp_session_set_jitter_compensation(ot->session,
+                       conf.ortp_jitter_compensation_arg);
+       }
        /* always successful */
        rtp_session_set_send_payload_type(s, PAYLOAD_AUDIO_CONTINUOUS);
        ret = rtp_session_set_remote_addr(s, TARGET_ADDR(ot), ot->port);
@@ -146,7 +150,7 @@ static void ortp_send(struct audio_format *af, long unsigned current_chunk,
 {
        struct ortp_target *ot, *tmp;
        size_t sendbuf_len;
-       size_t header_len = 0;
+       int header_len = 0;
        int packet_type = ORTP_DATA, stream_type = af && af->get_header_info; /* header stream? */
        char *sendbuf, *header_buf = NULL;
 
@@ -159,8 +163,10 @@ static void ortp_send(struct audio_format *af, long unsigned current_chunk,
                                continue;
                }
                if (!ot->chunk_ts)
-                       ot->chunk_ts = rtp_session_time_to_ts(ot->session, tv2ms(&af->chunk_tv));
-//             PARA_DEBUG_LOG("len: %d, af: %p, ts: %d\n", len, af, ot->chunk_ts);
+                       ot->chunk_ts = rtp_session_time_to_ts(ot->session,
+                               tv2ms(&af->chunk_tv));
+//             PARA_DEBUG_LOG("len: %d, ts: %lu, ts: %d\n",
+//                     len, ot->chunk_ts * chunks_sent, ot->chunk_ts);
                ot->streaming = 1;
        }
        if (list_empty(&targets))
@@ -311,7 +317,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;