projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: fix default stat command
[paraslash.git]
/
audiod.h
diff --git
a/audiod.h
b/audiod.h
index 7e2e2769985f08efcf3227db068e2d7b155ab564..c8d5fc2ea704d19d77b3db50b399e7d28c0497f5 100644
(file)
--- a/
audiod.h
+++ b/
audiod.h
@@
-37,6
+37,7
@@
struct slot_info {
/** the active writer node group */
struct writer_node_group *wng;
};
/** the active writer node group */
struct writer_node_group *wng;
};
+
/**
* the main task of audiod
*
/**
* the main task of audiod
*
@@
-46,33
+47,39
@@
struct audiod_task {
struct timeval *now;
struct task task;
};
struct timeval *now;
struct task task;
};
+
/**
* the task for audiod's child (para_client stat)
*
* \sa struct task, struct sched
*/
struct status_task {
/**
* the task for audiod's child (para_client stat)
*
* \sa struct task, struct sched
*/
struct status_task {
- /** the output of the stat command is read from this fd */
- int fd;
- /** stat data is stored here */
- char buf[STRINGSIZE];
- /** number of bytes loaded in \a buf */
- unsigned loaded;
- /** the associated task structure */
+ /** the associated task structure of audiod */
struct task task;
struct task task;
+ struct private_client_data *pcd;
+ /** the array of status items sent by para_server */
+ char *stat_item_values[NUM_STAT_ITEMS];
/** do not restart client command until this time */
struct timeval restart_barrier;
/** do not restart client command until this time */
struct timeval restart_barrier;
- int playing;
+ /** the offset value announced by para_server */
int offset_seconds;
int offset_seconds;
+ /** the length of the current audio file as announced by para_server */
int length_seconds;
int length_seconds;
- int sa_time_diff_sign;
- char *stat_item_values[NUM_STAT_ITEMS];
+ /** the start of the current stream from the view of para_server */
struct timeval server_stream_start;
struct timeval server_stream_start;
+ /** the averaged time deviation between para_server and para_audiod */
struct timeval sa_time_diff;
struct timeval sa_time_diff;
+ /** whether client time is ahead of server time */
+ int sa_time_diff_sign;
+ /** the audio format announced in server status */
+ char *af_status;
+ /** non-zero if \a af_status is "playing" */
+ int playing;
};
};
+
extern struct status_task *stat_task;
extern struct slot_info slot[MAX_STREAM_SLOTS];
extern struct status_task *stat_task;
extern struct slot_info slot[MAX_STREAM_SLOTS];
-extern struct
gengetopt
_args_info conf;
+extern struct
audiod
_args_info conf;
extern int audiod_status;
extern const char *status_item_list[NUM_STAT_ITEMS];
extern int audiod_status;
extern const char *status_item_list[NUM_STAT_ITEMS];