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.
parent a4ddb7b6
2006-05-01 Thomas Vander Stichele <thomas at apestaart dot org>
* 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.
2006-04-29 Tim-Philipp Müller <tim at centricular dot net>
* gst/wavparse/gstwavparse.c: (gst_wavparse_stream_headers):
......
......@@ -651,6 +651,21 @@ GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [
])
])
dnl *** taglib ***
translit(dnm, m, l) AM_CONDITIONAL(USE_TAGLIB, true)
GST_CHECK_FEATURE(TAGLIB, [taglib ID3v2 tag writer], taglib, [
PKG_CHECK_MODULES(TAGLIB, taglib >= 1.4, HAVE_TAGLIB="yes", [
HAVE_TAGLIB="no"
AC_MSG_RESULT(no)
])
AC_SUBST(TAGLIB_CFLAGS)
AC_SUBST(TAGLIB_LIBS)
if test "x$HAVE_CXX" != "xyes"; then
USE_TAGLIB=false
AC_MSG_NOTICE([Not building taglib plugin: no C++ compiler found])
fi
])
dnl *** id3demux prefers to have zlib ***
translit(dnm, m, l) AM_CONDITIONAL(USE_ZLIB, true)
GST_CHECK_FEATURE(ZLIB, [zlib support for id3demux],, [
......@@ -757,6 +772,7 @@ ext/libpng/Makefile
ext/raw1394/Makefile
ext/shout2/Makefile
ext/speex/Makefile
ext/taglib/Makefile
sys/Makefile
sys/oss/Makefile
sys/sunaudio/Makefile
......
......@@ -45,7 +45,7 @@ DOC_SOURCE_DIR = $(top_srcdir)
SCAN_OPTIONS=
# Extra options to supply to gtkdoc-mkdb.
MKDB_OPTIONS=--sgml-mode
MKDB_OPTIONS=--sgml-mode --source-suffixes=c,h,cc
# Extra options to supply to gtkdoc-fixref.
# FIXME get the location of the installed gstreamer docs
......@@ -53,7 +53,7 @@ MKDB_OPTIONS=--sgml-mode
# Used for dependencies.
HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.h
CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.c
CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.c $(DOC_SOURCE_DIR)/*/*/*.cc
# this is a wingo addition
# thomasvs: another nice wingo addition would be an explanation on why
......@@ -94,6 +94,8 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/jpeg/gstjpegenc.h \
$(top_srcdir)/ext/jpeg/gstsmokedec.h \
$(top_srcdir)/ext/jpeg/gstsmokeenc.h \
$(top_srcdir)/ext/taglib/gsttaglibmux.h \
$(top_srcdir)/ext/taglib/gstid3v2mux.h \
$(top_srcdir)/gst/multipart/multipartmux.c \
$(top_srcdir)/gst/multipart/multipartdemux.c \
$(top_srcdir)/gst/udp/gstudpsrc.h \
......
......@@ -26,6 +26,7 @@
<xi:include href="xml/element-halaudiosink.xml" />
<xi:include href="xml/element-halaudiosrc.xml" />
<xi:include href="xml/element-id3demux.xml" />
<xi:include href="xml/element-id3v2mux.xml" />
<xi:include href="xml/element-jpegdec.xml" />
<xi:include href="xml/element-jpegenc.xml" />
<xi:include href="xml/element-level.xml" />
......@@ -82,6 +83,7 @@
<xi:include href="xml/plugin-shout2send.xml" />
<xi:include href="xml/plugin-smpte.xml" />
<xi:include href="xml/plugin-speex.xml" />
<xi:include href="xml/plugin-taglib.xml" />
<xi:include href="xml/plugin-udp.xml" />
<xi:include href="xml/plugin-videobox.xml" />
<xi:include href="xml/plugin-videobalance.xml" />
......
......@@ -110,6 +110,14 @@ GstHalAudioSrc
GstHalAudioSrcClass
</SECTION>
<SECTION>
<FILE>element-id3v2mux</FILE>
GstId3v2Mux
<TITLE>id3v2mux</TITLE>
<SUBSECTION Standard>
GstId3v2MuxClass
</SECTION>
<SECTION>
<FILE>element-jpegdec</FILE>
GstJpegDec
......
......@@ -112,6 +112,12 @@ else
SPEEX_DIR =
endif
if USE_TAGLIB
TAGLIB_DIR = taglib
else
TAGLIB_DIR =
endif
SUBDIRS = \
$(AALIB_DIR) \
$(ANNODEX_DIR) \
......@@ -131,7 +137,8 @@ SUBDIRS = \
$(LIBPNG_DIR) \
$(MIKMOD_DIR) \
$(SHOUT2_DIR) \
$(SPEEX_DIR)
$(SPEEX_DIR) \
$(TAGLIB_DIR)
DIST_SUBDIRS = \
aalib \
......@@ -150,4 +157,5 @@ DIST_SUBDIRS = \
libpng \
raw1394 \
shout2 \
speex
speex \
taglib
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
......@@ -21,7 +21,7 @@
#ifndef GST_ID3V2_MUX_H
#define GST_ID3V2_MUX_H
#include "gsttaglib.h"
#include "gsttaglibmux.h"
G_BEGIN_DECLS
......
......@@ -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
......
......@@ -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 */
......
......@@ -15,7 +15,11 @@ CLEANFILES = core.* test-registry.xml
clean-local: clean-local-check
TESTS = $(check_PROGRAMS)
if USE_TAGLIB
check_taglib = elements/id3v2mux
else
check_taglib =
endif
check_PROGRAMS = \
elements/avimux \
......@@ -25,9 +29,10 @@ check_PROGRAMS = \
elements/cmmlenc \
elements/icydemux
TESTS = $(check_PROGRAMS)
# these tests don't even pass
noinst_PROGRAMS =
noinst_PROGRAMS = $(check_taglib)
AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
......
......@@ -397,9 +397,9 @@ GST_START_TEST (test_id3v2mux)
GST_END_TEST;
static Suite *
tagid3v2mux_suite (void)
id3v2mux_suite (void)
{
Suite *s = suite_create ("tagid3v2mux");
Suite *s = suite_create ("id3v2mux");
TCase *tc_chain = tcase_create ("general");
suite_add_tcase (s, tc_chain);
......@@ -413,7 +413,7 @@ main (int argc, char **argv)
{
int nf;
Suite *s = tagid3v2mux_suite ();
Suite *s = id3v2mux_suite ();
SRunner *sr = srunner_create (s);
gst_check_init (&argc, &argv);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment