vorbis: Rename vorbis*.h to gstvorbis*.h to prevent name conflicts

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 1f056e2..47bff89 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -94,10 +94,10 @@ EXTRA_HFILES = \
        $(top_srcdir)/ext/theora/gsttheoradec.h \
        $(top_srcdir)/ext/theora/gsttheoraenc.h \
        $(top_srcdir)/ext/theora/gsttheoraparse.h \
-       $(top_srcdir)/ext/vorbis/vorbisdec.h \
-       $(top_srcdir)/ext/vorbis/vorbisenc.h \
-       $(top_srcdir)/ext/vorbis/vorbisparse.h \
-       $(top_srcdir)/ext/vorbis/vorbistag.h \
+       $(top_srcdir)/ext/vorbis/gstvorbisdec.h \
+       $(top_srcdir)/ext/vorbis/gstvorbisenc.h \
+       $(top_srcdir)/ext/vorbis/gstvorbisparse.h \
+       $(top_srcdir)/ext/vorbis/gstvorbistag.h \
        $(top_srcdir)/gst/adder/gstadder.h \
        $(top_srcdir)/gst/audioconvert/audioconvert.h \
        $(top_srcdir)/gst/audioconvert/gstaudioconvert.h \

diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am
index 21355f2..604431e 100644 (file)
--- a/ext/vorbis/Makefile.am
+++ b/ext/vorbis/Makefile.am
@@ -13,4 +13,4 @@ libgstvorbis_la_LIBADD = \
 libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvorbis_la_LIBTOOLFLAGS = --tag=disable-static
 
-noinst_HEADERS = vorbisenc.h vorbisdec.h vorbisparse.h vorbistag.h
+noinst_HEADERS = gstvorbisenc.h gstvorbisdec.h gstvorbisparse.h gstvorbistag.h

diff --git a/ext/vorbis/vorbisdec.h b/ext/vorbis/gstvorbisdec.h
similarity index 100%
rename from ext/vorbis/vorbisdec.h
rename to ext/vorbis/gstvorbisdec.h

diff --git a/ext/vorbis/vorbisenc.h b/ext/vorbis/gstvorbisenc.h
similarity index 100%
rename from ext/vorbis/vorbisenc.h
rename to ext/vorbis/gstvorbisenc.h

diff --git a/ext/vorbis/vorbisparse.h b/ext/vorbis/gstvorbisparse.h
similarity index 100%
rename from ext/vorbis/vorbisparse.h
rename to ext/vorbis/gstvorbisparse.h

diff --git a/ext/vorbis/vorbistag.h b/ext/vorbis/gstvorbistag.h
similarity index 98%
rename from ext/vorbis/vorbistag.h
rename to ext/vorbis/gstvorbistag.h
index 66d26a6..9a44300 100644 (file)
--- a/ext/vorbis/vorbistag.h
+++ b/ext/vorbis/gstvorbistag.h
@@ -22,7 +22,7 @@
 #ifndef __GST_VORBIS_TAG_H__
 #define __GST_VORBIS_TAG_H__
 
-#include "vorbisparse.h"
+#include "gstvorbisparse.h"
 
 
 G_BEGIN_DECLS

diff --git a/ext/vorbis/vorbis.c b/ext/vorbis/vorbis.c
index 3ad81b0..8a337a6 100644 (file)
--- a/ext/vorbis/vorbis.c
+++ b/ext/vorbis/vorbis.c
@@ -23,10 +23,10 @@
 
 #include "gst/tag/tag.h"
 
-#include "vorbisenc.h"
-#include "vorbisdec.h"
-#include "vorbisparse.h"
-#include "vorbistag.h"
+#include "gstvorbisenc.h"
+#include "gstvorbisdec.h"
+#include "gstvorbisparse.h"
+#include "gstvorbistag.h"
 
 GST_DEBUG_CATEGORY (vorbisenc_debug);
 GST_DEBUG_CATEGORY (vorbisdec_debug);

diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c
index e27126b..5d462d2 100644 (file)
--- a/ext/vorbis/vorbisdec.c
+++ b/ext/vorbis/vorbisdec.c
@@ -40,7 +40,7 @@
 #  include "config.h"
 #endif
 
-#include "vorbisdec.h"
+#include "gstvorbisdec.h"
 #include <string.h>
 #include <gst/audio/audio.h>
 #include <gst/tag/tag.h>

diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c
index 3447ccf..b3eade9 100644 (file)
--- a/ext/vorbis/vorbisenc.c
+++ b/ext/vorbis/vorbisenc.c
@@ -39,10 +39,10 @@
  *
  * Last reviewed on 2006-03-01 (0.10.4)
  */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -51,7 +51,7 @@
 #include <gst/gsttagsetter.h>
 #include <gst/tag/tag.h>
 #include <gst/audio/multichannel.h>
-#include "vorbisenc.h"
+#include "gstvorbisenc.h"
 
 GST_DEBUG_CATEGORY_EXTERN (vorbisenc_debug);
 #define GST_CAT_DEFAULT vorbisenc_debug

diff --git a/ext/vorbis/vorbisparse.c b/ext/vorbis/vorbisparse.c
index 08cd993..96a1a31 100644 (file)
--- a/ext/vorbis/vorbisparse.c
+++ b/ext/vorbis/vorbisparse.c
@@ -53,7 +53,7 @@
 #  include "config.h"
 #endif
 
-#include "vorbisparse.h"
+#include "gstvorbisparse.h"
 
 GST_DEBUG_CATEGORY_EXTERN (vorbisparse_debug);
 #define GST_CAT_DEFAULT vorbisparse_debug

diff --git a/ext/vorbis/vorbistag.c b/ext/vorbis/vorbistag.c
index fda84e4..67a931d 100644 (file)
--- a/ext/vorbis/vorbistag.c
+++ b/ext/vorbis/vorbistag.c
@@ -54,7 +54,7 @@
 
 #include <vorbis/codec.h>
 
-#include "vorbistag.h"
+#include "gstvorbistag.h"
 
 
 GST_DEBUG_CATEGORY_EXTERN (vorbisparse_debug);