diff --git a/src/configfile.c b/src/configfile.c index e8ddf13..55e2035 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -24,8 +24,8 @@ void printConfig() 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 @@ int parseConfig(char *fileName) 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); diff --git a/src/configfile.h b/src/configfile.h index a22346e..93f0c43 100644 --- a/src/configfile.h +++ b/src/configfile.h @@ -5,7 +5,7 @@ #define MP3_FORMAT 1 -#define OGGVORBIS_FORMAT 2 +#define OGG_FORMAT 2 typedef struct tag_EZCONFIG { char *URL; diff --git a/src/ezstream.c b/src/ezstream.c index a9e0695..01c7998 100644 --- a/src/ezstream.c +++ b/src/ezstream.c @@ -320,8 +320,8 @@ int main(int argc, char **argv) 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; }