Merge commit 'remotes/yangtse/master'

[paraslash.git] / vss.h

diff --git a/vss.h b/vss.h
index 9b10a5e89460693058246ae313cfd5e1abc3d0ef..eb3685fecb0900f01ab8bd609ffa110913fe5029 100644 (file)
--- a/vss.h
+++ b/vss.h
@@ -7,17 +7,15 @@
 /** \file vss.h exported functions from vss.c (para_server) */
 void vss_init(void);
 void vss_send_chunk(void);
 /** \file vss.h exported functions from vss.c (para_server) */
 void vss_init(void);
 void vss_send_chunk(void);

-struct timeval *vss_preselect(void);
-const char *audio_format_name(int);
+struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno);
+void vss_post_select(fd_set *rfds, fd_set *wfds);

 unsigned int vss_playing(void);
 unsigned int vss_next(void);
 unsigned int vss_repos(void);
 unsigned int vss_paused(void);
 unsigned int vss_playing(void);
 unsigned int vss_next(void);
 unsigned int vss_repos(void);
 unsigned int vss_paused(void);

+unsigned int vss_stopped(void);

 char *vss_get_header(size_t *header_len);
 struct timeval *vss_chunk_time(void);
 char *vss_get_header(size_t *header_len);
 struct timeval *vss_chunk_time(void);

-int guess_audio_format(const char *name);
-int compute_afhi(const char *path, char *data, size_t size,
-       struct audio_format_info *afhi);

 const char *supported_audio_formats(void);
 int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len);
 
 const char *supported_audio_formats(void);
 int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len);