#include "send.h"
#include "error.h"
#include "string.h"
+#include "fd.h"
extern const char *status_item_list[];
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;
/** 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
*
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);
}
/**
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)
}
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;
return ret;
}
+static char *vss_read_chunk(long unsigned current_chunk, ssize_t *len)
+{
+ int ret;
+ size_t pos;
+
+ *len = 0;
+ if (current_chunk >= mmd->chunks_total)
+ return NULL;
+ *len = chunk_table[current_chunk + 1] - chunk_table[current_chunk];
+ if (!*len) /* nothing to send for this run */
+ return inbuf;
+ pos = chunk_table[current_chunk];
+ if (inbuf_size < *len) {
+ PARA_INFO_LOG("increasing inbuf for chunk #%lu/%lu to %zd bytes\n",
+ current_chunk, mmd->chunks_total, *len);
+ inbuf = para_realloc(inbuf, *len);
+ inbuf_size = *len;
+ }
+// PARA_DEBUG_LOG("reading chunk #%lu@%zd (%zd bytes)\n", current_chunk,
+// pos, *len);
+ ret = fseek(audio_file, pos, SEEK_SET);
+ if (ret < 0)
+ return NULL;
+ ret = para_fread(inbuf, *len, 1, audio_file);
+ if (ret != *len)
+ return NULL;
+ return inbuf;
+}
+
/**
* main sending function
*
* Return value: Positive return value on success, zero on eof and negative
* on errors.
*/
-
void vss_send_chunk(void)
{
int i;
if (chk_barrier("data send", &now, &data_send_barrier,
&due, 1) < 0)
return;
- buf = af->read_chunk(mmd->current_chunk, &ret);
+ buf = vss_read_chunk(mmd->current_chunk, &ret);
mmd->new_vss_status_flags &= ~VSS_REPOS;
if (!buf) {
if (ret < 0)