Merge branch 't/kill_sender_osl_dep'

Was cooking for three weeks.

* t/kill_sender_osl_dep:
  Make senders independent of afs and osl.

diff --git a/afh.h b/afh.h
index ec1d67065c757402b3a63d81e27450d763d87263..4204108a33131e3b4bda8a007bd429665246860c 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -58,6 +58,18 @@ struct afh_info {
        uint16_t bitrate;
 };
 
+/** Data about the current audio file, passed from afs to server. */
+struct audio_file_data {
+       /** The open file descriptor to the current audio file. */
+       int fd;
+       /** Vss needs this for streaming. */
+       struct afh_info afhi;
+       /** Size of the largest chunk. */
+       uint32_t max_chunk_size;
+       /** Needed to get the audio file header. */
+       uint8_t audio_format_id;
+};
+
 /**
  *  Structure for audio format handling.
  *

diff --git a/afs.h b/afs.h
index 9669b26d7fba7802af4b2156a26e804e937ea051..0b443354b74a115d1e81349ba8d3fada358dde62 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -122,18 +122,6 @@ struct ls_data {
        unsigned char *hash;
 };
 
-/** Data about the current audio file, passed from afs to server. */
-struct audio_file_data {
-       /** The open file descriptor to the current audio file. */
-       int fd;
-       /** Vss needs this for streaming. */
-       struct afh_info afhi;
-       /** Size of the largest chunk. */
-       uint32_t max_chunk_size;
-       /** Needed to get the audio file header. */
-       uint8_t audio_format_id;
-};
-
 /**
  * Codes used for communication between the server and the afs process.
  *

diff --git a/dccp_send.c b/dccp_send.c
index ed03b6140d3854710b85355f68165f6316f878ce..92a22162954ee030353017101803f1d9ef4a53bf 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -15,7 +15,6 @@
 #include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
-#include <osl.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
@@ -24,7 +23,6 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
-#include "afs.h"
 #include "server.h"
 #include "net.h"
 #include "list.h"

diff --git a/http_send.c b/http_send.c
index ce2dddfa82dcbcfbcc039e7b805af157947a2f26..51edd9d96704f20bb8969e53d8171ccc328458aa 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -10,7 +10,6 @@
 #include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
-#include <osl.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
@@ -20,7 +19,6 @@
 #include "string.h"
 #include "server.cmdline.h"
 #include "afh.h"
-#include "afs.h"
 #include "server.h"
 #include "http.h"
 #include "list.h"

diff --git a/udp_send.c b/udp_send.c
index 96f12ff0f716b3e26176ab5d03b3ca0d3dba2d7e..35cb61358bb616a0733224c2f4494b72989e9c02 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -15,7 +15,6 @@
 #include <net/if.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
-#include <osl.h>
 #include <netdb.h>
 
 #include "server.cmdline.h"
@@ -23,7 +22,6 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
-#include "afs.h"
 #include "server.h"
 #include "list.h"
 #include "send.h"