projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite audiod help text.
[paraslash.git]
/
afh.h
diff --git
a/afh.h
b/afh.h
index 52d50a9103c8093a840c9b8e09003ad764f69c1f..a441d5fecc322726189c43dc45c78ceae108b847 100644
(file)
--- a/
afh.h
+++ b/
afh.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-200
7
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-200
8
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-23,13
+23,10
@@
/** \endcond */
/** \endcond */
-/**
size of the audio_file info string
*/
+/**
Size of the audio_file info string.
*/
#define AUDIO_FILE_INFO_SIZE 256
#define AUDIO_FILE_INFO_SIZE 256
-/**
- * Audio format dependent information. Details vary between each audio format
- * handler.
- */
+/** Audio format dependent information. */
struct afh_info {
/** The number of chunks this audio file contains. */
long unsigned chunks_total;
struct afh_info {
/** The number of chunks this audio file contains. */
long unsigned chunks_total;
@@
-46,6
+43,11
@@
struct afh_info {
struct timeval chunk_tv;
/** End of file timeout - Do not load new audio file until this time. */
struct timeval eof_tv;
struct timeval chunk_tv;
/** End of file timeout - Do not load new audio file until this time. */
struct timeval eof_tv;
+ /**
+ * The position of the header within the audio file. Ignored if \a
+ * header_len equals zero.
+ */
+ uint32_t header_offset;
/**
* The header is needed by senders in case a new client connects in the
* middle of the stream. The length of the header defaults to zero
/**
* The header is needed by senders in case a new client connects in the
* middle of the stream. The length of the header defaults to zero
@@
-53,15
+55,10
@@
struct afh_info {
* treatment. The audio format handler does not need to set this to
* zero in this case.
*/
* treatment. The audio format handler does not need to set this to
* zero in this case.
*/
- unsigned header_len;
- /**
- * The position of the header within the audio file. Ignored if \a
- * header_len equals zero.
- */
- unsigned header_offset;
+ uint32_t header_len;
/** The number of channels. */
uint8_t channels;
/** The number of channels. */
uint8_t channels;
- /** Fr
quency o
n Hz. */
+ /** Fr
equency i
n Hz. */
uint16_t frequency;
/** Exact meaning depends on audio format. */
uint16_t bitrate;
uint16_t frequency;
/** Exact meaning depends on audio format. */
uint16_t bitrate;
@@
-106,3
+103,6
@@
int guess_audio_format(const char *name);
int compute_afhi(const char *path, char *data, size_t size,
struct afh_info *afhi);
const char *audio_format_name(int);
int compute_afhi(const char *path, char *data, size_t size,
struct afh_info *afhi);
const char *audio_format_name(int);
+void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
+ void *map, char **buf, size_t *len);
+void afh_get_header(struct afh_info *afhi, void *map, char **buf, size_t *len);