diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gst/multifile/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/multifile/gstmultifile.c | 7 | ||||
| -rw-r--r-- | gst/multifile/gstmultifilesink.c | 41 | ||||
| -rw-r--r-- | gst/multifile/gstmultifilesink.h | 72 | ||||
| -rw-r--r-- | gst/multifile/gstmultifilesrc.c | 34 | ||||
| -rw-r--r-- | gst/multifile/gstmultifilesrc.h | 65 |
7 files changed, 151 insertions, 80 deletions
@@ -1,5 +1,15 @@ 2007-07-03 Stefan Kost <ensonic@users.sf.net> + * gst/multifile/Makefile.am: + * gst/multifile/gstmultifile.c: + * gst/multifile/gstmultifilesink.c: + * gst/multifile/gstmultifilesink.h: + * gst/multifile/gstmultifilesrc.c: + * gst/multifile/gstmultifilesrc.h: + Add .h files to be able to add it to the docs. + +2007-07-03 Stefan Kost <ensonic@users.sf.net> + * gst/modplug/gstmodplug.cc: Activate doc section. diff --git a/gst/multifile/Makefile.am b/gst/multifile/Makefile.am index f0412293..2863d85e 100644 --- a/gst/multifile/Makefile.am +++ b/gst/multifile/Makefile.am @@ -6,3 +6,5 @@ libgstmultifile_la_CFLAGS = $(GST_CFLAGS) libgstmultifile_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgstmultifile_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +noinst_HEADERS = gstmultifilesrc.h gstmultifilesink.h + diff --git a/gst/multifile/gstmultifile.c b/gst/multifile/gstmultifile.c index 7147f463..873dcb17 100644 --- a/gst/multifile/gstmultifile.c +++ b/gst/multifile/gstmultifile.c @@ -21,13 +21,6 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -/** - * SECTION:element-multifilesink - * @short_description: write buffers to sequentially-named files - * @see_also: #GstFileSrc - * - * Write incoming data to a series of files in the local file system. - */ #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/gst/multifile/gstmultifilesink.c b/gst/multifile/gstmultifilesink.c index 4815bfb7..58977817 100644 --- a/gst/multifile/gstmultifilesink.c +++ b/gst/multifile/gstmultifilesink.c @@ -33,46 +33,7 @@ # include "config.h" #endif -#include <gst/gst.h> -#include <gst/base/gstbasesink.h> -#include <errno.h> -#include <string.h> -#include <sys/stat.h> -#include <sys/types.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#define GST_TYPE_MULTI_FILE_SINK \ - (gst_multi_file_sink_get_type()) -#define GST_MULTI_FILE_SINK(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MULTI_FILE_SINK,GstMultiFileSink)) -#define GST_MULTI_FILE_SINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTI_FILE_SINK,GstMultiFileSinkClass)) -#define GST_IS_MULTI_FILE_SINK(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTI_FILE_SINK)) -#define GST_IS_MULTI_FILE_SINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTI_FILE_SINK)) - -typedef struct _GstMultiFileSink GstMultiFileSink; -typedef struct _GstMultiFileSinkClass GstMultiFileSinkClass; - -struct _GstMultiFileSink -{ - GstBaseSink parent; - - gchar *filename; - gchar *uri; - int index; -}; - -struct _GstMultiFileSinkClass -{ - GstBaseSinkClass parent_class; -}; - -GType gst_multi_file_sink_get_type (void); - +#include "gstmultifilesink.h" static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, diff --git a/gst/multifile/gstmultifilesink.h b/gst/multifile/gstmultifilesink.h new file mode 100644 index 00000000..c26a64a1 --- /dev/null +++ b/gst/multifile/gstmultifilesink.h @@ -0,0 +1,72 @@ +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * 2006 Wim Taymans <wim@fluendo.com> + * 2006 David A. Schleef <ds@schleef.org> + * + * gstmultifilesink.h: + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_MULTIFILESINK_H__ +#define __GST_MULTIFILESINK_H__ + +#include <gst/gst.h> +#include <gst/base/gstbasesink.h> +#include <errno.h> +#include <string.h> +#include <sys/stat.h> +#include <sys/types.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +G_BEGIN_DECLS + +#define GST_TYPE_MULTI_FILE_SINK \ + (gst_multi_file_sink_get_type()) +#define GST_MULTI_FILE_SINK(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MULTI_FILE_SINK,GstMultiFileSink)) +#define GST_MULTI_FILE_SINK_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTI_FILE_SINK,GstMultiFileSinkClass)) +#define GST_IS_MULTI_FILE_SINK(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTI_FILE_SINK)) +#define GST_IS_MULTI_FILE_SINK_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTI_FILE_SINK)) + +typedef struct _GstMultiFileSink GstMultiFileSink; +typedef struct _GstMultiFileSinkClass GstMultiFileSinkClass; + +struct _GstMultiFileSink +{ + GstBaseSink parent; + + gchar *filename; + gchar *uri; + int index; +}; + +struct _GstMultiFileSinkClass +{ + GstBaseSinkClass parent_class; +}; + +GType gst_multi_file_sink_get_type (void); + +G_END_DECLS + +#endif /* __GST_MULTIFILESINK_H__ */ diff --git a/gst/multifile/gstmultifilesrc.c b/gst/multifile/gstmultifilesrc.c index 10275dbe..7978a1e7 100644 --- a/gst/multifile/gstmultifilesrc.c +++ b/gst/multifile/gstmultifilesrc.c @@ -30,39 +30,7 @@ # include "config.h" #endif -#include <gst/gst.h> -#include <gst/base/gstpushsrc.h> - -#define GST_TYPE_MULTI_FILE_SRC \ - (gst_multi_file_src_get_type()) -#define GST_MULTI_FILE_SRC(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MULTI_FILE_SRC,GstMultiFileSrc)) -#define GST_MULTI_FILE_SRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTI_FILE_SRC,GstMultiFileSrcClass)) -#define GST_IS_MULTI_FILE_SRC(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTI_FILE_SRC)) -#define GST_IS_MULTI_FILE_SRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTI_FILE_SRC)) - -typedef struct _GstMultiFileSrc GstMultiFileSrc; -typedef struct _GstMultiFileSrcClass GstMultiFileSrcClass; - -struct _GstMultiFileSrc -{ - GstPushSrc parent; - - gchar *filename; - int index; - - int offset; - - GstCaps *caps; -}; - -struct _GstMultiFileSrcClass -{ - GstPushSrcClass parent_class; -}; +#include "gstmultifilesrc.h" static GstFlowReturn gst_multi_file_src_create (GstPushSrc * src, diff --git a/gst/multifile/gstmultifilesrc.h b/gst/multifile/gstmultifilesrc.h new file mode 100644 index 00000000..7a08046c --- /dev/null +++ b/gst/multifile/gstmultifilesrc.h @@ -0,0 +1,65 @@ +/* GStreamer + * Copyright (C) 2006 David A. Schleef <ds@schleef.org> + * + * gstmultifilesrc.c: + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_MULTIFILESRC_H__ +#define __GST_MULTIFILESRC_H__ + +#include <gst/gst.h> +#include <gst/base/gstpushsrc.h> + +G_BEGIN_DECLS + +#define GST_TYPE_MULTI_FILE_SRC \ + (gst_multi_file_src_get_type()) +#define GST_MULTI_FILE_SRC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MULTI_FILE_SRC,GstMultiFileSrc)) +#define GST_MULTI_FILE_SRC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTI_FILE_SRC,GstMultiFileSrcClass)) +#define GST_IS_MULTI_FILE_SRC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTI_FILE_SRC)) +#define GST_IS_MULTI_FILE_SRC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTI_FILE_SRC)) + +typedef struct _GstMultiFileSrc GstMultiFileSrc; +typedef struct _GstMultiFileSrcClass GstMultiFileSrcClass; + +struct _GstMultiFileSrc +{ + GstPushSrc parent; + + gchar *filename; + int index; + + int offset; + + GstCaps *caps; +}; + +struct _GstMultiFileSrcClass +{ + GstPushSrcClass parent_class; +}; + +GType gst_multi_file_src_get_type (void); + +G_END_DECLS + +#endif /* __GST_MULTIFILESRC_H__ */ |