/*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "net.h"
#include "server.cmdline.h"
#include "vss.h"
+#include "list.h"
#include "send.h"
#include "ipc.h"
#include "fd.h"
-extern const char *status_item_list[];
-
static struct timeval announce_tv;
static struct timeval data_send_barrier;
static struct timeval eof_barrier;
&& !(mmd->new_vss_status_flags & VSS_PLAYING);
}
+/**
+ * Check if the vss is currently stopped.
+ *
+ * \return Greater than zero if paused, zero otherwise.
+ *
+ */
+unsigned int vss_stopped(void)
+{
+ return (mmd->new_vss_status_flags & VSS_NEXT)
+ && !(mmd->new_vss_status_flags & VSS_PLAYING);
+}
+
/**
* Initialize the virtual streaming system.
*
return -1;
}
-static void vss_next_chunk_time(struct timeval *due)
-{
- struct timeval tmp;
-
- tv_scale(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv, &tmp);
- tv_add(&tmp, &mmd->stream_start, due);
-}
-
/*
* != NULL: timeout for next chunk
* NULL: nothing to do
return &the_timeout;
if (!vss_playing() || !map)
return NULL;
- vss_next_chunk_time(&next_chunk);
- if (chk_barrier(audio_format_name(mmd->afd.afsi.audio_format_id),
- &now, &next_chunk, &the_timeout, 0) < 0)
+ compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
+ &mmd->stream_start, &next_chunk);
+ if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0)
return &the_timeout;
/* chunk is due or bof */
the_timeout.tv_sec = 0;
senders[i].shutdown_clients();
return;
}
+ if (mmd->new_vss_status_flags & VSS_NOMORE)
+ mmd->new_vss_status_flags = VSS_NEXT;
gettimeofday(&now, NULL);
tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
munmap(map, mmd->size);
mmd->afd.afhi.seconds_total = 0;
free(mmd->afd.afhi.chunk_table);
mmd->afd.afhi.chunk_table = NULL;
- tmp = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
- status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
- strcpy(mmd->afd.afhi.info_string, tmp);
+ tmp = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
+ status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]);
+ strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string));
+ mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0';
+ make_empty_status_items(mmd->afd.verbose_ls_output);
free(tmp);
- mmd->afd.path[0] = '\0';
- mmd->afd.afsi.lyrics_id = 0;
- mmd->afd.afsi.image_id = 0;
mmd->mtime = 0;
- mmd->afd.attributes_string[0] = '\0';
mmd->size = 0;
mmd->events++;
}
/**
* Get the header of the current audio file.
*
- * \param header_len The length of the header is stored here.
- *
- * \return A pointer to a buffer containing the header, or NULL, if no audio
- * file is selected or if the current audio format does not need special header
- * treamtment.
+ * \param buf The length of the header is stored here.
+ * \param len Points to a buffer containing the header on return.
*
+ * \sa afh_get_header.
*/
-char *vss_get_header(size_t *header_len)
+void vss_get_header(char **buf, size_t *len)
{
- if (!map || !mmd->afd.afhi.header_len)
- return NULL;
- *header_len = mmd->afd.afhi.header_len;
- return map + mmd->afd.afhi.header_offset;
+ afh_get_header(&mmd->afd.afhi, map, buf, len);
}
/**
return &mmd->afd.afhi.chunk_tv;
}
+/** The possible states of the afs socket. See \ref afs_socket. */
enum afs_socket_status {
+ /** Socket is inactive. */
AFS_SOCKET_READY,
+ /** Socket fd was included in the write fd set for select(). */
AFS_SOCKET_CHECK_FOR_WRITE,
+ /** vss wrote a request to the socket and waits for afs to reply. */
AFS_SOCKET_AFD_PENDING
};
* This function gets called from para_server to determine the timeout value
* for its main select loop.
*
+ * \param rfds The set of file descriptors to be checked for reading.
+ * \param wfds The set of file descriptors to be checked for writing.
+ * \param max_fileno The highest-numbered file descriptor.
+ *
* Before the timeout is computed, the current vss status flags are evaluated
* and acted upon by calling appropriate functions from the lower layers.
* Possible actions include
tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
if (vss_repos())
tv_add(&now, &announce_tv, &data_send_barrier);
- if (mmd->new_vss_status_flags & VSS_NOMORE)
- mmd->new_vss_status_flags = VSS_NEXT;
}
mmd->chunks_sent = 0;
}
return tv;
if (!map && vss_playing() &&
!(mmd->new_vss_status_flags & VSS_NOMORE)) {
- if (afsss == AFS_SOCKET_READY) {
+ if (afsss == AFS_SOCKET_READY ||
+ afsss == AFS_SOCKET_CHECK_FOR_WRITE) {
PARA_DEBUG_LOG("ready and playing, but no audio file\n");
para_fd_set(afs_socket, wfds, max_fileno);
afsss = AFS_SOCKET_CHECK_FOR_WRITE;
struct iovec iov;
int ret = 0;
+ *fd = -1;
iov.iov_base = buf;
iov.iov_len = sizeof(buf);
msg.msg_iov = &iov;
ret = recvmsg(afs_socket, &msg, 0);
if (ret < 0)
return -ERRNO_TO_PARA_ERROR(errno);
+ afsss = AFS_SOCKET_READY;
if (iov.iov_len != sizeof(buf))
- return -E_SHORT_AFS_READ;
+ return -E_AFS_SHORT_READ;
*code = *(uint32_t*)buf;
*data = *(uint32_t*)(buf + 4);
- cmsg = CMSG_FIRSTHDR(&msg);
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level != SOL_SOCKET
|| cmsg->cmsg_type != SCM_RIGHTS)
static void recv_afs_result(void)
{
- int ret, passed_fd = -1, shmid;
+ int ret, passed_fd, shmid;
uint32_t afs_code = 0, afs_data = 0;
struct stat statbuf;
struct timeval now;
+ mmd->afd.afhi.chunk_table = NULL;
ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data);
if (ret < 0)
goto err;
- PARA_DEBUG_LOG("got the fd: %d, code: %u, shmid: %u\n",
- passed_fd, afs_code, afs_data);
- ret = -E_BAD_AFS_CODE;
+ PARA_DEBUG_LOG("fd: %d, code: %u, shmid: %u\n", passed_fd, afs_code,
+ afs_data);
+ ret = -E_NOFD;
if (afs_code != NEXT_AUDIO_FILE)
goto err;
- afsss = AFS_SOCKET_READY;
+ if (passed_fd < 0)
+ goto err;
shmid = afs_data;
ret = load_afd(shmid, &mmd->afd);
if (ret < 0)
goto err;
shm_destroy(shmid);
- PARA_NOTICE_LOG("next audio file: %s (%lu chunks)\n", mmd->afd.path,
- mmd->afd.afhi.chunks_total);
ret = fstat(passed_fd, &statbuf);
if (ret < 0) {
PARA_ERROR_LOG("fstat error:\n");
map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
passed_fd, 0);
close(passed_fd);
- mmd->afd.afhi.header_len = 0; /* default: no header */
mmd->chunks_sent = 0;
mmd->current_chunk = 0;
mmd->offset = 0;
tv_add(&now, &announce_tv, &data_send_barrier);
return;
err:
+ free(mmd->afd.afhi.chunk_table);
if (passed_fd >= 0)
close(passed_fd);
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+ mmd->new_vss_status_flags = VSS_NEXT;
}
void vss_post_select(fd_set *rfds, fd_set *wfds)
ret = send_buffer(afs_socket, "new");
afsss = AFS_SOCKET_AFD_PENDING;
}
-
-static void get_chunk(long unsigned chunk_num, char **buf, size_t *len)
-{
- size_t pos = mmd->afd.afhi.chunk_table[chunk_num];
- *buf = map + pos;
- *len = mmd->afd.afhi.chunk_table[chunk_num + 1] - pos;
-}
-
/**
* Get the data of the given chunk.
*
return -E_CHUNK;
if (chunk_num >= mmd->afd.afhi.chunks_total)
return -E_CHUNK;
- get_chunk(chunk_num, buf, len);
+ afh_get_chunk(chunk_num, &mmd->afd.afhi, map, buf, len);
return 1;
}
if (!map || !vss_playing())
return;
gettimeofday(&now, NULL);
- vss_next_chunk_time(&due);
+ compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
+ &mmd->stream_start, &due);
if (tv_diff(&due, &now, NULL) > 0)
return;
if (chk_barrier("eof", &now, &eof_barrier, &due, 1) < 0)
}
/*
* 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.
- */
+ * might have still some data queued which can be sent in this case.
+ */
if (!mmd->chunks_sent) {
struct timeval tmp;
gettimeofday(&mmd->stream_start, NULL);
mmd->offset = tv2ms(&tmp);
mmd->events++;
}
- get_chunk(mmd->current_chunk, &buf, &len);
+ afh_get_chunk(mmd->current_chunk, &mmd->afd.afhi, map, &buf, &len);
for (i = 0; senders[i].name; i++)
senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, len);
mmd->new_vss_status_flags |= VSS_PLAYING;
projects / paraslash.git / blobdiff