[xiph-commits] r12543 - trunk/ezstream/src

[moritz at svn.xiph.org]

Author: moritz
Date: 2007-02-24 14:16:39 -0800 (Sat, 24 Feb 2007)
New Revision: 12543

Modified:
   trunk/ezstream/src/configfile.h
Log:
Begin merging configfile.* changes by cleaning up the .h file: Add license
reference, remove prototype of nonexistent getMetadataGrabber() function, and
do some formatting.


Modified: trunk/ezstream/src/configfile.h
===================================================================
--- trunk/ezstream/src/configfile.h	2007-02-24 22:03:36 UTC (rev 12542)
+++ trunk/ezstream/src/configfile.h	2007-02-24 22:16:39 UTC (rev 12543)
@@ -1,15 +1,37 @@
-#ifndef __EZSTREAM_CONFIG_H__
-#define __EZSTREAM_CONFIG_H__
+/*
+ *  ezstream - source client for Icecast with external en-/decoder support
+ *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock at oddsock.org>
+ *  Copyright (C) 2007                    Moritz Grimm <gtgbr at gmx.net>
+ *
+ *  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-1307  USA
+ */
 
+#ifndef __CONFIGFILE_H__
+#define __CONFIGFILE_H__
+
 #include <libxml/parser.h>
 
+#define MP3_FORMAT		"MP3"
+#define VORBIS_FORMAT		"VORBIS"
+#define THEORA_FORMAT		"THEORA"
 
-#define MP3_FORMAT "MP3"
-#define VORBIS_FORMAT "VORBIS"
-#define THEORA_FORMAT "THEORA"
-
 #define MAX_FORMAT_ENCDEC	15
 
+#define TRACK_PLACEHOLDER	"@T@"
+#define METADATA_PLACEHOLDER	"@M@"
+
 typedef struct tag_FORMAT_ENCDEC {
 	char	*format;
 	char	*match;
@@ -18,31 +40,29 @@
 } FORMAT_ENCDEC;
 
 typedef struct tag_EZCONFIG {
-	char	*URL;
-	char	*password;
-	char	*format;
-	char	*fileName;
-	char	*serverName;
-	char	*serverURL;
-	char	*serverGenre;
-	char	*serverDescription;
-	char	*serverBitrate;
-	char	*serverChannels;
-	char	*serverSamplerate;
-	char	*serverQuality;
-	int		serverPublic;
-	int	reencode;
+	char		*URL;
+	char		*password;
+	char		*format;
+	char		*fileName;
+	char		*serverName;
+	char		*serverURL;
+	char		*serverGenre;
+	char		*serverDescription;
+	char		*serverBitrate;
+	char		*serverChannels;
+	char		*serverSamplerate;
+	char		*serverQuality;
+	int		 serverPublic;
+	int		 reencode;
 	FORMAT_ENCDEC	*encoderDecoders[MAX_FORMAT_ENCDEC];
-	int	numEncoderDecoders;
+	int		 numEncoderDecoders;
+	int		 shuffle;
 } EZCONFIG;
 
+void		printConfig(void);
+EZCONFIG *	getEZConfig(void);
+char *		getFormatEncoder(char *format);
+char *		getFormatDecoder(char *match);
+int		parseConfig(char *fileName);
 
-
-void printConfig();
-int parseConfig(char *fileName);
-EZCONFIG *getEZConfig();
-char*   getFormatEncoder(char *format);
-char*   getFormatDecoder(char *match);
-char*   getMetadataGrabber(char *match);
-
-#endif
+#endif /* __CONFIGFILE_H__ */