[xiph-commits] r7194 - icecast/trunk/libshout/src

[brendan at dactyl.lonelymoon.com]

Author: brendan
Date: Tue Jul 20 14:46:57 2004
New Revision: 7194

Modified:
icecast/trunk/libshout/src/ogg.c
icecast/trunk/libshout/src/shout_ogg.h
icecast/trunk/libshout/src/theora.c
icecast/trunk/libshout/src/vorbis.c
Log:
Mangle the names of the codec open hooks. I forgot they'd be visible outside of libshout
once they were moved into separate files. Anyone know a way to make functions only have
intralibrary visibility?


Modified: icecast/trunk/libshout/src/ogg.c
===================================================================
--- icecast/trunk/libshout/src/ogg.c	2004-07-20 19:23:29 UTC (rev 7193)
+++ icecast/trunk/libshout/src/ogg.c	2004-07-20 21:46:55 UTC (rev 7194)
@@ -49,9 +49,9 @@

typedef int (*codec_open_t)(ogg_codec_t *codec, ogg_page *page);
static codec_open_t codecs[] = {
-	open_vorbis,
+	_shout_open_vorbis,
#ifdef HAVE_THEORA
-	open_theora,
+	_shout_open_theora,
#endif
NULL
};

Modified: icecast/trunk/libshout/src/shout_ogg.h
===================================================================
--- icecast/trunk/libshout/src/shout_ogg.h	2004-07-20 19:23:29 UTC (rev 7193)
+++ icecast/trunk/libshout/src/shout_ogg.h	2004-07-20 21:46:55 UTC (rev 7194)
@@ -44,9 +44,9 @@
} ogg_codec_t;

/* codec hooks */
-int open_vorbis(ogg_codec_t *codec, ogg_page *page);
+int _shout_open_vorbis(ogg_codec_t *codec, ogg_page *page);
#ifdef HAVE_THEORA
-int open_theora(ogg_codec_t *codec, ogg_page *page);
+int _shout_open_theora(ogg_codec_t *codec, ogg_page *page);
#endif

#endif

Modified: icecast/trunk/libshout/src/theora.c
===================================================================
--- icecast/trunk/libshout/src/theora.c	2004-07-20 19:23:29 UTC (rev 7193)
+++ icecast/trunk/libshout/src/theora.c	2004-07-20 21:46:55 UTC (rev 7194)
@@ -42,7 +42,7 @@
static int theora_ilog(unsigned int v);

/* -- theora functions -- */
-int open_theora(ogg_codec_t *codec, ogg_page *page)
+int _shout_open_theora(ogg_codec_t *codec, ogg_page *page)
{
ogg_packet packet;


Modified: icecast/trunk/libshout/src/vorbis.c
===================================================================
--- icecast/trunk/libshout/src/vorbis.c	2004-07-20 19:23:29 UTC (rev 7193)
+++ icecast/trunk/libshout/src/vorbis.c	2004-07-20 21:46:55 UTC (rev 7194)
@@ -41,7 +41,7 @@
static int vorbis_blocksize(vorbis_data_t *vd, ogg_packet *p);

/* -- vorbis functions -- */
-int open_vorbis(ogg_codec_t *codec, ogg_page *page)
+int _shout_open_vorbis(ogg_codec_t *codec, ogg_page *page)
{
vorbis_data_t *vorbis_data = calloc(1, sizeof(vorbis_data_t));
ogg_packet packet;