X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=ca22160d3fa378bd1849cb16549b85a6b409c254;hp=ec8290b06a2330c5197d43f68a14e68782ad9b40;hb=045273c289eb3d972eea99df99967f680b06940f;hpb=b43af255d4514b68c98b23fb220306cf5ba1df60 diff --git a/audiod.h b/audiod.h index ec8290b0..ca22160d 100644 --- a/audiod.h +++ b/audiod.h @@ -1,19 +1,7 @@ /* * Copyright (C) 2006-2007 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file audiod.h symbols exported from audiod.c */ @@ -37,8 +25,8 @@ extern const char *audio_formats[]; * - off: disconnect from para_server * - on: receive status information from para_server and play the audio stream * - sb: only receive status information but not the audio stream -*/ -enum {AUDIOD_OFF, AUDIOD_ON, AUDIOD_STANDBY}; + */ +enum audiod_status_info {AUDIOD_OFF, AUDIOD_ON, AUDIOD_STANDBY}; /** defines one command of para_audiod */ struct audiod_command { @@ -55,7 +43,7 @@ struct audiod_command { /** one-line description of the command */ const char *description; /** summary of the command line options */ - const char *synopsis; + const char *usage; /** the long help text */ const char *help; }; @@ -63,9 +51,9 @@ struct audiod_command { /** * describes one instance of a receiver-filter-writer chain * - * \sa receier_node, receiver, filter, filter_node, filter_chain, writer, + * \sa receiver_node, receiver, filter, filter_node, filter_chain, writer, * writer_node, writer_node_group. - */ + */ struct slot_info { /** number of the audio format in this slot */ int format; @@ -79,16 +67,6 @@ struct slot_info { struct writer_node_group *wng; }; -/** - * the main task of audiod - * - * \sa struct task, struct sched - */ -struct audiod_task { - struct timeval *now; - struct task task; -}; - /** * the task for obtaining para_server's status (para_client stat) *