From 2c006cfccc51122a13f04afa7fe52c798a175390 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 3 Jul 2007 13:05:01 +0000 Subject: [PATCH] And yet more docs enabled. Original commit message from CVS: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-ugly-plugins-docs.sgml: * docs/plugins/gst-plugins-ugly-plugins-sections.txt: * gst/synaesthesia/Makefile.am: * gst/synaesthesia/gstsynaesthesia.c: * gst/synaesthesia/gstsynaesthesia.h: And yet more docs enabled. --- ChangeLog | 10 +++ docs/plugins/Makefile.am | 3 +- docs/plugins/gst-plugins-ugly-plugins-docs.sgml | 2 + docs/plugins/gst-plugins-ugly-plugins-sections.txt | 14 ++++ gst/synaesthesia/Makefile.am | 2 +- gst/synaesthesia/gstsynaesthesia.c | 63 +--------------- gst/synaesthesia/gstsynaesthesia.h | 87 ++++++++++++++++++++++ 7 files changed, 120 insertions(+), 61 deletions(-) create mode 100644 gst/synaesthesia/gstsynaesthesia.h diff --git a/ChangeLog b/ChangeLog index 2087006..7a380a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,16 @@ * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-ugly-plugins-docs.sgml: * docs/plugins/gst-plugins-ugly-plugins-sections.txt: + * gst/synaesthesia/Makefile.am: + * gst/synaesthesia/gstsynaesthesia.c: + * gst/synaesthesia/gstsynaesthesia.h: + And yet more docs enabled. + +2007-07-03 Stefan Kost + + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-ugly-plugins-docs.sgml: + * docs/plugins/gst-plugins-ugly-plugins-sections.txt: * docs/plugins/inspect/plugin-a52dec.xml: * docs/plugins/inspect/plugin-amrnb.xml: * docs/plugins/inspect/plugin-asf.xml: diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 25e53a8..b9f49a3 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -90,7 +90,8 @@ EXTRA_HFILES = \ $(top_srcdir)/ext/amrnb/amrnbparse.h \ $(top_srcdir)/ext/lame/gstlame.h \ $(top_srcdir)/ext/mad/gstmad.h \ - $(top_srcdir)/ext/sidplay/gstsiddec.h + $(top_srcdir)/ext/sidplay/gstsiddec.h \ + $(top_srcdir)/gst/synaesthesia/gstsynaesthesia.h # Images to copy into HTML directory. HTML_IMAGES = diff --git a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml index b22422a..693be83 100644 --- a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml @@ -18,6 +18,7 @@ + @@ -30,6 +31,7 @@ + diff --git a/docs/plugins/gst-plugins-ugly-plugins-sections.txt b/docs/plugins/gst-plugins-ugly-plugins-sections.txt index ae75041..3f0a16f 100644 --- a/docs/plugins/gst-plugins-ugly-plugins-sections.txt +++ b/docs/plugins/gst-plugins-ugly-plugins-sections.txt @@ -84,3 +84,17 @@ GST_TYPE_SIDDEC gst_siddec_get_type +
+element-synaesthesia +synaesthesia +GstSynaesthesia + +GstSynaesthesiaClass +GST_SYNAESTHESIA +GST_SYNAESTHESIA_CLASS +GST_IS_SYNAESTHESIA +GST_IS_SYNAESTHESIA_CLASS +GST_TYPE_SYNAESTHESIA +gst_synaesthesia_get_type +
+ diff --git a/gst/synaesthesia/Makefile.am b/gst/synaesthesia/Makefile.am index c23dc4f..aa84df6 100644 --- a/gst/synaesthesia/Makefile.am +++ b/gst/synaesthesia/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstsynaesthesia.la libgstsynaesthesia_la_SOURCES = gstsynaesthesia.c synaescope.c -noinst_HEADERS = synaescope.h +noinst_HEADERS = synaescope.h gstsynaesthesia.h libgstsynaesthesia_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstsynaesthesia_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) diff --git a/gst/synaesthesia/gstsynaesthesia.c b/gst/synaesthesia/gstsynaesthesia.c index 5aca348..2c8f007 100644 --- a/gst/synaesthesia/gstsynaesthesia.c +++ b/gst/synaesthesia/gstsynaesthesia.c @@ -1,6 +1,8 @@ -/* gstsynaesthesia.c: implementation of synaesthesia drawing element +/* GStreamer * Copyright (C) <2001> Richard Boulton * + * gstsynaesthesia.c: implementation of synaesthesia drawing element + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -38,64 +40,7 @@ #include "config.h" #endif -#include -#include -#include -#include -#include -#include "synaescope.h" - -#define SYNAES_SAMPLES 512 -#define SYNAES_WIDTH 320 -#define SYNAES_HEIGHT 200 - -#define GST_TYPE_SYNAESTHESIA (gst_synaesthesia_get_type()) -#define GST_SYNAESTHESIA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SYNAESTHESIA,GstSynaesthesia)) -#define GST_SYNAESTHESIA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SYNAESTHESIA,GstSynaesthesiaClass)) -#define GST_IS_SYNAESTHESIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SYNAESTHESIA)) -#define GST_IS_SYNAESTHESIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SYNAESTHESIA)) - -typedef struct _GstSynaesthesia GstSynaesthesia; -typedef struct _GstSynaesthesiaClass GstSynaesthesiaClass; - -GST_DEBUG_CATEGORY_STATIC (synaesthesia_debug); -#define GST_CAT_DEFAULT (synaesthesia_debug) - -struct _GstSynaesthesia -{ - GstElement element; - - /* pads */ - GstPad *sinkpad, *srcpad; - GstAdapter *adapter; - - guint64 next_ts; /* the timestamp of the next frame */ - guint64 frame_duration; - guint bps; /* bytes per sample */ - guint spf; /* samples per video frame */ - - gint16 datain[2][SYNAES_SAMPLES]; - - /* video state */ - gint fps_n, fps_d; - gint width; - gint height; - gint channels; - - /* Audio state */ - gint sample_rate; - gint rate; - - /* Synaesthesia instance */ - syn_instance *si; -}; - -struct _GstSynaesthesiaClass -{ - GstElementClass parent_class; -}; - -GType gst_synaesthesia_get_type (void); +#include "gstsynaesthesia.h" /* elementfactory information */ diff --git a/gst/synaesthesia/gstsynaesthesia.h b/gst/synaesthesia/gstsynaesthesia.h new file mode 100644 index 0000000..78ab698 --- /dev/null +++ b/gst/synaesthesia/gstsynaesthesia.h @@ -0,0 +1,87 @@ +/* GStreamer + * Copyright (C) <2001> Richard Boulton + * + * gstsynaesthesia.c: implementation of synaesthesia drawing element + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_SYNAESTHESIA_H__ +#define __GST_SYNAESTHESIA_H__ + +#include +#include +#include +#include +#include +#include "synaescope.h" + +G_BEGIN_DECLS + +#define SYNAES_SAMPLES 512 +#define SYNAES_WIDTH 320 +#define SYNAES_HEIGHT 200 + +#define GST_TYPE_SYNAESTHESIA (gst_synaesthesia_get_type()) +#define GST_SYNAESTHESIA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SYNAESTHESIA,GstSynaesthesia)) +#define GST_SYNAESTHESIA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SYNAESTHESIA,GstSynaesthesiaClass)) +#define GST_IS_SYNAESTHESIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SYNAESTHESIA)) +#define GST_IS_SYNAESTHESIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SYNAESTHESIA)) + +typedef struct _GstSynaesthesia GstSynaesthesia; +typedef struct _GstSynaesthesiaClass GstSynaesthesiaClass; + +GST_DEBUG_CATEGORY_STATIC (synaesthesia_debug); +#define GST_CAT_DEFAULT (synaesthesia_debug) + +struct _GstSynaesthesia +{ + GstElement element; + + /* pads */ + GstPad *sinkpad, *srcpad; + GstAdapter *adapter; + + guint64 next_ts; /* the timestamp of the next frame */ + guint64 frame_duration; + guint bps; /* bytes per sample */ + guint spf; /* samples per video frame */ + + gint16 datain[2][SYNAES_SAMPLES]; + + /* video state */ + gint fps_n, fps_d; + gint width; + gint height; + gint channels; + + /* Audio state */ + gint sample_rate; + gint rate; + + /* Synaesthesia instance */ + syn_instance *si; +}; + +struct _GstSynaesthesiaClass +{ + GstElementClass parent_class; +}; + +GType gst_synaesthesia_get_type (void); + +G_END_DECLS + +#endif /* __GST_SYNAESTHESIA_H__ */ -- 2.7.4