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

[oddsock at dactyl.lonelymoon.com]

Author: oddsock
Date: Mon Jul 12 12:13:39 2004
New Revision: 7103

Modified:
trunk/ezstream/src/configfile.c
trunk/ezstream/src/configfile.h
trunk/ezstream/src/ezstream.c
Log:
support for theora streams


Modified: trunk/ezstream/src/configfile.c
===================================================================
--- trunk/ezstream/src/configfile.c	2004-07-12 18:40:07 UTC (rev 7102)
+++ trunk/ezstream/src/configfile.c	2004-07-12 19:13:14 UTC (rev 7103)
@@ -24,8 +24,8 @@
if (ezConfig.format == MP3_FORMAT) {
printf("Broadcasting in MP3 format\n");
}
-	if (ezConfig.format == OGGVORBIS_FORMAT) {
-		printf("Broadcasting in Ogg Vorbis format\n");
+	if (ezConfig.format == OGG_FORMAT) {
+		printf("Broadcasting in Ogg format\n");
}
if (ezConfig.format == 0) {
printf("Broadcast format not set\n");
@@ -145,8 +145,8 @@
if (!strcmp(ls_xmlContentPtr, "MP3")) {
ezConfig.format = MP3_FORMAT;
}
-					if (!strcmp(ls_xmlContentPtr, "OGGVORBIS")) {
-						ezConfig.format = OGGVORBIS_FORMAT;
+					if (!strcmp(ls_xmlContentPtr, "OGG")) {
+						ezConfig.format = OGG_FORMAT;
}
}
xmlFree(ls_xmlContentPtr);

Modified: trunk/ezstream/src/configfile.h
===================================================================
--- trunk/ezstream/src/configfile.h	2004-07-12 18:40:07 UTC (rev 7102)
+++ trunk/ezstream/src/configfile.h	2004-07-12 19:13:14 UTC (rev 7103)
@@ -5,7 +5,7 @@


#define MP3_FORMAT 1
-#define OGGVORBIS_FORMAT 2
+#define OGG_FORMAT 2

typedef struct tag_EZCONFIG {
char	*URL;

Modified: trunk/ezstream/src/ezstream.c
===================================================================
--- trunk/ezstream/src/ezstream.c	2004-07-12 18:40:07 UTC (rev 7102)
+++ trunk/ezstream/src/ezstream.c	2004-07-12 19:13:14 UTC (rev 7103)
@@ -320,8 +320,8 @@
return 1;
}
}
-	if (pezConfig->format == OGGVORBIS_FORMAT) {
-		if (shout_set_format(shout, SHOUT_FORMAT_VORBIS) != SHOUTERR_SUCCESS) {
+	if (pezConfig->format == OGG_FORMAT) {
+		if (shout_set_format(shout, SHOUT_FORMAT_OGG) != SHOUTERR_SUCCESS) {
printf("Error setting user: %s\n", shout_get_error(shout));
return 1;
}