mp3_afh.c: set bitrate, frequency and channels of struct audio_file_info

[paraslash.git] / ortp_send.c

diff --git a/ortp_send.c b/ortp_send.c
index 9d244225d39f557fc1a7132b0173e2d8b0269c16..b06a1b84f80f4d9daa88b635d48790f9a1bf8aa3 100644 (file)
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 
 #include "server.cmdline.h"
 #include "server.h"
-#include "afs.h"
+#include "vss.h"
 #include "send.h"
 #include "list.h"
 #include "ortp.h"
@@ -32,8 +32,6 @@
 #define TARGET_ADDR(oc) inet_ntoa((oc)->addr)
 /** \endcond */
 
-extern struct gengetopt_args_info conf;
-
 /** describes one entry in the list of targets for the ortp sender */
 struct ortp_target {
 /** address info */
@@ -80,15 +78,30 @@ static void ortp_send_buf(char *buf, int len, long unsigned chunks_sent)
                        continue;
                WRITE_CHUNK_TS(buf, ot->chunk_ts);
                ts = ot->chunk_ts * chunks_sent;
-               ret = rtp_session_send_with_ts(ot->session, buf, len, ts);
+               ret = rtp_session_send_with_ts(ot->session,
+                       (unsigned char*)buf, len, ts);
                ot->last_ts = ts;
                if (ret < 0)
                        ortp_delete_target(ot, "send error");
-               if (ret != len +12)
+               if (ret != len + 12)
                        PARA_NOTICE_LOG("short write %d\n", ret);
        }
 }
 
+static int set_multicast(RtpSession *s)
+{
+       unsigned char loop = 1;
+       int ret;
+
+       ret = setsockopt(s->rtp.socket,
+               IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop));
+       if (ret < 0) {
+               PARA_ERROR_LOG("IP_MULTICAST_LOOP error %d\n", ret);
+
+       }
+       return 1;
+}
+
 static void ortp_init_session(struct ortp_target *ot)
 {
        RtpSession *s;
@@ -110,13 +123,15 @@ static void ortp_init_session(struct ortp_target *ot)
        if (ret < 0) {
                rtp_session_destroy(ot->session);
                ot->session = NULL;
+               return;
        }
+       set_multicast(s);
 }
 
-/* called by afs */
+/* called by vss */
 static void ortp_shutdown_targets(void)
 {
-       char buf[ORTP_AUDIO_HEADER_LEN];
+       unsigned char buf[ORTP_AUDIO_HEADER_LEN];
        struct ortp_target *ot, *tmp;
 
        WRITE_PACKET_TYPE(buf, ORTP_EOF);
@@ -160,7 +175,7 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
 
        if (self->status != SENDER_ON)
                return;
-       chunk_tv = afs_chunk_time();
+       chunk_tv = vss_chunk_time();
        if (!chunk_tv)
                return;
        list_for_each_entry_safe(ot, tmp, &targets, node) {
@@ -178,7 +193,7 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
        }
        if (list_empty(&targets))
                return;
-       header_buf = afs_get_header(&header_len);
+       header_buf = vss_get_header(&header_len);
        if (!need_extra_header(current_chunk))
                header_len = 0;
        sendbuf_len = ORTP_AUDIO_HEADER_LEN + header_len + len;
@@ -234,7 +249,7 @@ static void ortp_add_target(int port, struct in_addr *addr)
        ot->addr = *addr;
        PARA_INFO_LOG("adding to target list (%s:%d)\n",
                TARGET_ADDR(ot), ot->port);
-       list_add(&ot->node, &targets);
+       para_list_add(&ot->node, &targets);
 }
 
 static int ortp_com_add(struct sender_command_data *scd)