diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2006-05-01 11:46:33 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2006-05-01 11:46:33 +0000 |
| commit | 8d58b030d62888b25efa032fb7dba368730704b0 (patch) | |
| tree | 300f444b9e9210ab3ccf2ef40d4447f0c7b2ade4 /ext/taglib | |
| parent | a4ddb7b60a7a0750de0b80a47d6cbe1b41b71f3a (diff) | |
docs/plugins/Makefile.am: also check .cc files for gtk-doc markup
Original commit message from CVS:
* docs/plugins/Makefile.am:
also check .cc files for gtk-doc markup
* configure.ac:
* docs/plugins/gst-plugins-good-plugins-docs.sgml:
* docs/plugins/gst-plugins-good-plugins-sections.txt:
* tests/check/Makefile.am:
* tests/check/elements/id3v2mux.c: (id3v2mux_suite), (main):
* ext/Makefile.am:
* ext/taglib/Makefile.am:
* ext/taglib/gstid3v2mux.h:
* ext/taglib/gsttaglibmux.c:
* ext/taglib/gsttaglibmux.h:
move taglib-based id3v2muxer to -good. Fixes #336110.
Diffstat (limited to 'ext/taglib')
| -rw-r--r-- | ext/taglib/Makefile.am | 10 | ||||
| -rw-r--r-- | ext/taglib/gstid3v2mux.h | 2 | ||||
| -rw-r--r-- | ext/taglib/gsttaglibmux.c | 3 | ||||
| -rw-r--r-- | ext/taglib/gsttaglibmux.h | 8 |
4 files changed, 13 insertions, 10 deletions
diff --git a/ext/taglib/Makefile.am b/ext/taglib/Makefile.am index 0b608f3d..e1ffd5cd 100644 --- a/ext/taglib/Makefile.am +++ b/ext/taglib/Makefile.am @@ -1,6 +1,10 @@ plugin_LTLIBRARIES = libgsttaglib.la -libgsttaglib_la_SOURCES = gsttaglib.cc gstid3v2mux.cc +libgsttaglib_la_SOURCES = gsttaglibmux.c gstid3v2mux.cc +libgsttaglib_la_CFLAGS = \ + $(GST_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(TAGLIB_CFLAGS) libgsttaglib_la_CXXFLAGS = \ $(GST_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ @@ -11,6 +15,4 @@ libgsttaglib_la_LIBADD = \ $(TAGLIB_LIBS) libgsttaglib_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -noinst_HEADERS = gsttaglib.h gstid3v2mux.h - -#EXTRA_DIST = README +noinst_HEADERS = gsttaglibmux.h gstid3v2mux.h diff --git a/ext/taglib/gstid3v2mux.h b/ext/taglib/gstid3v2mux.h index 855b2296..f3d3124e 100644 --- a/ext/taglib/gstid3v2mux.h +++ b/ext/taglib/gstid3v2mux.h @@ -21,7 +21,7 @@ #ifndef GST_ID3V2_MUX_H #define GST_ID3V2_MUX_H -#include "gsttaglib.h" +#include "gsttaglibmux.h" G_BEGIN_DECLS diff --git a/ext/taglib/gsttaglibmux.c b/ext/taglib/gsttaglibmux.c index 35ec89fe..5224e6c1 100644 --- a/ext/taglib/gsttaglibmux.c +++ b/ext/taglib/gsttaglibmux.c @@ -25,7 +25,8 @@ #include <string.h> #include <gst/gsttagsetter.h> #include <gst/tag/tag.h> -#include "gsttaglib.h" + +#include "gsttaglibmux.h" GST_DEBUG_CATEGORY_STATIC (gst_tag_lib_mux_debug); #define GST_CAT_DEFAULT gst_tag_lib_mux_debug diff --git a/ext/taglib/gsttaglibmux.h b/ext/taglib/gsttaglibmux.h index 5b91a93e..26c9de7b 100644 --- a/ext/taglib/gsttaglibmux.h +++ b/ext/taglib/gsttaglibmux.h @@ -18,8 +18,8 @@ * Boston, MA 02111-1307, USA. */ -#ifndef GST_TAG_LIB_H -#define GST_TAG_LIB_H +#ifndef GST_TAG_LIB_MUX_H +#define GST_TAG_LIB_MUX_H #include <gst/gst.h> @@ -29,7 +29,7 @@ typedef struct _GstTagLibMux GstTagLibMux; typedef struct _GstTagLibMuxClass GstTagLibMuxClass; /* Definition of structure storing data for this element. */ -typedef struct _GstTagLibMux { +struct _GstTagLibMux { GstElement element; GstPad *srcpad; @@ -42,7 +42,7 @@ typedef struct _GstTagLibMux { }; /* Standard definition defining a class for this element. */ -typedef struct _GstTagLibMuxClass { +struct _GstTagLibMuxClass { GstElementClass parent_class; /* vfuncs */ |