Commit 29ae46b3 authored by Wim Taymans's avatar Wim Taymans

Fixed the missing .h file and some reorg (not sure what's best)

Original commit message from CVS:
Fixed the missing .h file and some reorg (not sure what's best)
parent 4afbf577
......@@ -136,6 +136,7 @@ libgstreamerinclude_HEADERS = \
gstautoplug.h \
gstbin.h \
gstbuffer.h \
gstbufferpool-default.h \
gstcaps.h \
gstclock.h \
gstcpu.h \
......@@ -169,8 +170,7 @@ libgstreamerinclude_HEADERS = \
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) \
......
......@@ -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>
......
......@@ -50,6 +50,7 @@ _gst_buffer_initialize (void)
(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 @@ gst_buffer_pool_get_user_data (GstBufferPool *pool)
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);
}
......@@ -167,9 +167,6 @@ void gst_buffer_pool_set_active (GstBufferPool *pool, gboolean active);
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
......
......@@ -63,7 +63,7 @@ static GHashTable *_default_pools = NULL;
* 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;
......
/* GStreamer
* Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
* 2000 Wim Taymans <wtay@chello.be>
*
* 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__ */
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