From: Wim T. <wt...@us...> - 2002-07-24 20:21:04
|
CVS Root: /cvsroot/gstreamer Module: gstreamer Changes by: wtay Date: Wed Jul 24 2002 13:21:03 PDT Log message: Fixed the missing .h file and some reorg (not sure what's best) Modified files: gst : Makefile.am gst.h gstbuffer.c gstbuffer.h gstbufferpool-default.c Added files: gst : gstbufferpool-default.h Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/Makefile.am.diff?r1=1.112&r2=1.113 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.h.diff?r1=1.43&r2=1.44 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbuffer.c.diff?r1=1.53&r2=1.54 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbuffer.h.diff?r1=1.43&r2=1.44 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbufferpool-default.c.diff?r1=1.1&r2=1.2 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbufferpool-default.h?rev=1.1&content-type=text/vnd.viewcvs-markup ====Begin Diffs==== Index: Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/Makefile.am,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- Makefile.am 24 Jul 2002 18:31:11 -0000 1.112 +++ Makefile.am 24 Jul 2002 20:20:50 -0000 1.113 @@ -136,6 +136,7 @@ gstautoplug.h \ gstbin.h \ gstbuffer.h \ + gstbufferpool-default.h \ gstcaps.h \ gstclock.h \ gstcpu.h \ @@ -169,8 +170,7 @@ noinst_HEADERS = \ gst_private.h \ gstarch.h \ - cothreads.h \ - gstbufferpool-default.h + cothreads.h libgstreamer_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \ $(LIBGST_CFLAGS) \ Index: gst.h =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/gst.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- gst.h 8 Jul 2002 19:07:22 -0000 1.43 +++ gst.h 24 Jul 2002 20:20:50 -0000 1.44 @@ -34,6 +34,7 @@ #include <gst/gstobject.h> #include <gst/gstpad.h> #include <gst/gstbuffer.h> +#include <gst/gstbufferpool-default.h> #include <gst/gstcpu.h> #include <gst/gstelement.h> #include <gst/gstbin.h> Index: gstbuffer.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/gstbuffer.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- gstbuffer.c 24 Jul 2002 18:31:12 -0000 1.53 +++ gstbuffer.c 24 Jul 2002 20:20:50 -0000 1.54 @@ -50,6 +50,7 @@ (GBoxedFreeFunc) gst_data_unref); _gst_buffer_live = 0; + _gst_buffer_pool_live = 0; chunk = gst_mem_chunk_new ("GstBufferChunk", sizeof (GstBuffer), sizeof (GstBuffer) * 200, 0); @@ -505,17 +506,3 @@ return pool->user_data; } -/** - * gst_buffer_pool_get_default: - * @size: The size of the buffers to allocate from this pool - * @numbuffers: The number of buffer to preallocate in the pool - * - * Create a pool with buffers of the given size. - * - * Returns: A new bufferpool to create buffers of the given size. - */ -GstBufferPool* -gst_buffer_pool_get_default (guint size, guint numbuffers) -{ - return _gst_buffer_pool_get_default (size, numbuffers); -} Index: gstbuffer.h =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/gstbuffer.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- gstbuffer.h 24 Jul 2002 18:31:12 -0000 1.43 +++ gstbuffer.h 24 Jul 2002 20:20:50 -0000 1.44 @@ -167,9 +167,6 @@ void gst_buffer_pool_set_user_data (GstBufferPool *pool, gpointer user_data); gpointer gst_buffer_pool_get_user_data (GstBufferPool *pool); -/* a default pool */ -GstBufferPool* gst_buffer_pool_get_default (guint size, guint numbuffers); - G_END_DECLS Index: gstbufferpool-default.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/gstbufferpool-default.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gstbufferpool-default.c 24 Jul 2002 18:31:12 -0000 1.1 +++ gstbufferpool-default.c 24 Jul 2002 20:20:50 -0000 1.2 @@ -63,7 +63,7 @@ * Returns: an instance of GstBufferPool */ GstBufferPool* -_gst_buffer_pool_get_default (guint buffer_size, guint pool_size) +gst_buffer_pool_get_default (guint buffer_size, guint pool_size) { GstBufferPool *pool; GstMemChunk *data_chunk; --- NEW FILE: gstbufferpool-default.h --- /* GStreamer * Copyright (C) 1999,2000 Erik Walthinsen <om...@cs...> * 2000 Wim Taymans <wt...@ch...> * * gstbuffer.h: Header for GstBuffer object * * 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_BUFFER_POOL_DEFAULT_H__ #define __GST_BUFFER_POOL_DEFAULT_H__ #include <gst/gstbuffer.h> G_BEGIN_DECLS /* a default pool */ GstBufferPool* gst_buffer_pool_get_default (guint size, guint numbuffers); G_END_DECLS #endif /* __GST_BUFFER_POOL_DEFAULT_H__ */ |