Makefile.in: use CPPFLAGS also for target mysql.o

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index 4a395593f3aa1a6a5038b3d3c23330c6b0ea5610..9aeff44fd77e508d7c842a386a115ef5f72330cf 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -25,12 +25,13 @@
 #include "server.h"
 #include <sys/time.h> /* gettimeofday */
 #include "server.cmdline.h"
-#include "db.h"
+#include "afs.h"
 #include "afh.h"
 #include "vss.h"
 #include "send.h"
 #include "error.h"
 #include "string.h"
+#include "fd.h"
 
 extern const char *status_item_list[];
 
@@ -42,6 +43,8 @@ static struct timeval autoplay_barrier;
 extern struct misc_meta_data *mmd;
 extern struct audio_file_selector selectors[];
 extern struct sender senders[];
+static char *inbuf;
+static size_t *chunk_table, inbuf_size;
 
 static FILE *audio_file = NULL;
 
@@ -86,6 +89,8 @@ static struct audio_format_handler afl[] = {
 /** iterate over each supported audio format */
 #define FOR_EACH_AUDIO_FORMAT(i) for (i = 0; afl[i].name; i++)
 
+
+
 /**
  * check if vss status flag \a P (playing) is set
  *
@@ -182,7 +187,7 @@ void vss_init(void)
 static int get_file_info(int i)
 {
        return  afl[i].get_file_info(audio_file, mmd->audio_file_info,
-               &mmd->chunks_total, &mmd->seconds_total);
+               &mmd->chunks_total, &mmd->seconds_total, &chunk_table);
 }
 
 /**
@@ -220,7 +225,7 @@ static int get_audio_format(int omit)
        int i;
 
        FOR_EACH_AUDIO_FORMAT(i) {
-               if (i == omit || !afl[i].get_file_info)
+               if (i == omit)
                        continue;
                rewind(audio_file);
                if (get_file_info(i) > 0)
@@ -482,8 +487,6 @@ again:
                }
                mmd->chunks_sent = 0;
        }
-       if (af && vss_repos() && mmd->current_chunk != mmd->repos_request)
-               af->reposition_stream(mmd->repos_request);
        if (vss_repos()) {
                mmd->new_vss_status_flags &= ~(VSS_REPOS);
                mmd->current_chunk = mmd->repos_request;
@@ -498,6 +501,40 @@ again:
        return ret;
 }
 
+/**
+ * read a chunk of data from the current audio file
+ *
+ * \param current_chunk the chunk number to read
+ *
+ * \return The length of the chunk on success, zero on end of file, negative on
+ * errors.  Note: If the current chunk is of length zero, but the end of the
+ * file is not yet reached, this function returns -E_EMPTY_CHUNK.
+ * */
+ssize_t vss_read_chunk(void)
+{
+       ssize_t len;
+       size_t pos;
+       int ret;
+       long unsigned cc = mmd->current_chunk;
+
+       if (cc >= mmd->chunks_total) /* eof */
+               return 0;
+       len = chunk_table[cc + 1] - chunk_table[cc];
+       if (!len) /* nothing to send for this run */
+               return -E_EMPTY_CHUNK;
+       pos = chunk_table[cc];
+       if (inbuf_size < len) {
+               PARA_INFO_LOG("increasing inbuf for chunk #%lu/%lu to %zu bytes\n",
+                       cc, mmd->chunks_total, len);
+               inbuf = para_realloc(inbuf, len);
+               inbuf_size = len;
+       }
+       ret = para_fseek(audio_file, pos, SEEK_SET);
+       if (ret < 0)
+               return ret;
+       return para_fread(inbuf, len, 1, audio_file);
+}
+
 /**
  * main sending function
  *
@@ -510,12 +547,10 @@ again:
  * Return value: Positive return value on success, zero on eof and negative
  * on errors.
  */
-
 void vss_send_chunk(void)
 {
        int i;
        struct audio_format_handler *af;
-       char *buf;
        ssize_t ret;
        struct timeval now, due;
 
@@ -531,16 +566,23 @@ void vss_send_chunk(void)
        if (chk_barrier("data send", &now, &data_send_barrier,
                        &due, 1) < 0)
                return;
-       buf = af->read_chunk(mmd->current_chunk, &ret);
+       ret= vss_read_chunk();
        mmd->new_vss_status_flags &= ~VSS_REPOS;
-       if (!buf) {
-               if (ret < 0)
+       if (!ret || (ret < 0 && ret != -E_EMPTY_CHUNK)) {
+               if (ret < 0) {
                        mmd->new_vss_status_flags = VSS_NEXT;
-               else
+                       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+               } else
                        mmd->new_vss_status_flags |= VSS_NEXT;
                vss_eof(af);
                return;
        }
+       /*
+        * We call the send function also in case of empty chunks as they
+        * might have still some data queued which can be sent in this case.
+        */
+       if (ret < 0)
+               ret = 0;
        if (!mmd->chunks_sent) {
                struct timeval tmp;
                gettimeofday(&mmd->stream_start, NULL);
@@ -549,7 +591,7 @@ void vss_send_chunk(void)
                mmd->events++;
        }
        for (i = 0; senders[i].name; i++)
-               senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, ret);
+               senders[i].send(mmd->current_chunk, mmd->chunks_sent, inbuf, ret);
        mmd->new_vss_status_flags |= VSS_PLAYING;
        mmd->chunks_sent++;
        mmd->current_chunk++;