diff options
68 files changed, 469 insertions, 188 deletions
diff --git a/gst/Makefile.am b/gst/Makefile.am index e64ac0901..7da2d802c 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -82,10 +82,11 @@ libgstinclude_HEADERS = \ cothreads.h \ gstscheduler.h -noinst_HEADERS = \ - gstarch.h \ - gsti386.h \ - gstppc.h +noinst_HEADERS = \ + gst_private.h \ + gstarch.h \ + gsti386.h \ + gstppc.h libgst_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) libgst_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE) diff --git a/gst/cothreads.c b/gst/cothreads.c index 211d655f8..485505f9e 100644 --- a/gst/cothreads.c +++ b/gst/cothreads.c @@ -1,5 +1,8 @@ /* GStreamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * cothreads.c: Cothreading routines * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -27,11 +30,12 @@ /* we make too much noise for normal debugging... */ #define GST_DEBUG_FORCE_DISABLE +#include "gst_private.h" -#include "gstdebug.h" #include "cothreads.h" #include "gstarch.h" + pthread_key_t _cothread_key = -1; /* Disablig this define allows you to shut off a few checks in diff --git a/gst/cothreads.h b/gst/cothreads.h index 0a7d32c4a..c00dd4225 100644 --- a/gst/cothreads.h +++ b/gst/cothreads.h @@ -1,5 +1,8 @@ /* GStreamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * cothreads.h: Header for cothreading routines * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/elements/gstasyncdisksrc.h b/gst/elements/gstasyncdisksrc.h index 826e8d5eb..cc46ec473 100644 --- a/gst/elements/gstasyncdisksrc.h +++ b/gst/elements/gstasyncdisksrc.h @@ -22,7 +22,6 @@ #define __GST_ASYNCDISKSRC_H__ -#include <config.h> #include <gst/gst.h> diff --git a/gst/elements/gstqueue.c b/gst/elements/gstqueue.c index eaf637d3c..19fd6a086 100644 --- a/gst/elements/gstqueue.c +++ b/gst/elements/gstqueue.c @@ -132,7 +132,7 @@ gst_queue_init (GstQueue *queue) queue->queue = NULL; queue->level_buffers = 0; - queue->max_buffers = 20; + queue->max_buffers = 100; queue->block = TRUE; queue->level_bytes = 0; queue->size_buffers = 0; @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gst.c: Initialization and non-pipeline operations * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,7 +20,8 @@ * Boston, MA 02111-1307, USA. */ -#include "gstdebug.h" +#include "gst_private.h" + #include "gstcpu.h" #include "gsttype.h" #include "gstplugin.h" @@ -26,6 +30,7 @@ #include "gstpipeline.h" #include "gstthread.h" + extern gint _gst_trace_on; GHashTable *__gst_function_pointers = NULL; @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gst.h: Main header for GStreamer, apps should include this * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gst_private.h b/gst/gst_private.h new file mode 100644 index 000000000..752708d5a --- /dev/null +++ b/gst/gst_private.h @@ -0,0 +1,34 @@ +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gst_private.h: Private header for within libgst + * + * 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_PRIVATE_H__ +#define __GST_PRIVATE_H__ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <gst/gstdebug.h> +//#include <gst/gstinfo.h> + +#endif /* __GST_PRIVATE_H__ */ diff --git a/gst/gstarch.h b/gst/gstarch.h index 2cf697db1..1ae908378 100644 --- a/gst/gstarch.h +++ b/gst/gstarch.h @@ -1,5 +1,8 @@ /* GStreamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstarch.h: Architecture-specific inclusions * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,8 +20,8 @@ * Boston, MA 02111-1307, USA. */ -#ifndef GST_HGUARD_GSTARCH_H -#define GST_HGUARD_GSTARCH_H +#ifndef __GST_GSTARCH_H__ +#define __GST_GSTARCH_H__ #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,4 +37,4 @@ #endif #endif -#endif /* GST_HGUARD_GSTARCH_H */ +#endif /* __GST_GSTARCH_H__ */ diff --git a/gst/gstautoplug.c b/gst/gstautoplug.c index 1585fd9c8..8b05e2bb2 100644 --- a/gst/gstautoplug.c +++ b/gst/gstautoplug.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstautoplug.c: Autoplugging of pipelines * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,7 +20,9 @@ * Boston, MA 02111-1307, USA. */ -#include "gstdebug.h" +//#define GST_DEBUG_ENABLED +#include "gst_private.h" + #include "gstautoplug.h" static void gst_autoplug_class_init (GstAutoplugClass *klass); diff --git a/gst/gstautoplug.h b/gst/gstautoplug.h index 0493ce991..b895dfe86 100644 --- a/gst/gstautoplug.h +++ b/gst/gstautoplug.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstautoplug.h: Header for autoplugging functionality * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,7 +24,7 @@ #ifndef __GST_AUTOPLUG_H__ #define __GST_AUTOPLUG_H__ -#include "gstelement.h" +#include <gst/gstelement.h> #ifdef __cplusplus extern "C" { diff --git a/gst/gstbin.c b/gst/gstbin.c index c8ff85dd6..68b5a4b9d 100644 --- a/gst/gstbin.c +++ b/gst/gstbin.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstbin.c: GstBin container object and support code * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,14 +21,15 @@ */ //#define GST_DEBUG_ENABLED +#include "gst_private.h" #include "gstbin.h" -#include "gstdebug.h" #include "gstsrc.h" #include "gstconnection.h" #include "gstscheduler.h" + GstElementDetails gst_bin_details = { "Generic bin", "Bin", diff --git a/gst/gstbin.h b/gst/gstbin.h index bb624b441..d5ddad9d0 100644 --- a/gst/gstbin.h +++ b/gst/gstbin.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstbin.h: Header for GstBin container object * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c index 19d68d4bc..c30bad3fd 100644 --- a/gst/gstbuffer.c +++ b/gst/gstbuffer.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstbuffer.c: Buffer operations * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,10 +23,11 @@ /* this file makes too much noise for most debugging sessions */ #define GST_DEBUG_FORCE_DISABLE +#include "gst_private.h" -#include "gstdebug.h" #include "gstbuffer.h" + GMemChunk *_gst_buffer_chunk; void diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h index c585016c9..5f5a13f00 100644 --- a/gst/gstbuffer.h +++ b/gst/gstbuffer.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* 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 @@ -21,16 +24,17 @@ #ifndef __GST_BUFFER_H__ #define __GST_BUFFER_H__ +#include <gst/gstobject.h> +#include <gst/gstmeta.h> + #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #ifdef HAVE_ATOMIC_H #include <asm/atomic.h> #endif -#include <gst/gstobject.h> -#include <gst/gstmeta.h> #ifdef __cplusplus extern "C" { diff --git a/gst/gstbufferpool.c b/gst/gstbufferpool.c index 0f9919a4e..d7ac80ff9 100644 --- a/gst/gstbufferpool.c +++ b/gst/gstbufferpool.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstbufferpool.c: Buffer-pool operations * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,7 +21,8 @@ */ -#include "gstdebug.h" +#include "gst_private.h" + #include "gstbuffer.h" diff --git a/gst/gstbufferpool.h b/gst/gstbufferpool.h index 189fc03f3..9f52b52cc 100644 --- a/gst/gstbufferpool.h +++ b/gst/gstbufferpool.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstbufferpool.h: Header for buffer-pool management * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,12 +20,12 @@ * Boston, MA 02111-1307, USA. */ - #ifndef __GST_BUFFER_POOL_H__ #define __GST_BUFFER_POOL_H__ #include <gst/gstbuffer.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gstcaps.c b/gst/gstcaps.c index b8ec99f1d..811e610e3 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstcaps.c: Element capabilities subsystem * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,13 +20,15 @@ * Boston, MA 02111-1307, USA. */ -//#define DEBUG_ENABLED +//#define GST_DEBUG_ENABLED +#include "gst_private.h" -#include "gstdebug.h" #include "gstcaps.h" #include "gsttype.h" #include "gstpropsprivate.h" + + void _gst_caps_initialize (void) { diff --git a/gst/gstclock.c b/gst/gstclock.c index e269c795a..b103655b9 100644 --- a/gst/gstclock.c +++ b/gst/gstclock.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstclock.c: Clock subsystem for maintaining time sync * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,11 +21,14 @@ */ #include <sys/time.h> -//#define DEBUG_ENABLED + +//#define GST_DEBUG_ENABLED +#include "gst_private.h" + #include "gstclock.h" -#include "gstdebug.h" #include "gstsink.h" + static GstClock *the_system_clock = NULL; /** diff --git a/gst/gstclock.h b/gst/gstclock.h index bb8a0a341..8fc68c4d5 100644 --- a/gst/gstclock.h +++ b/gst/gstclock.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstclock.h: Header for clock subsystem * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,9 +24,9 @@ #ifndef __GST_CLOCK_H__ #define __GST_CLOCK_H__ - #include <gst/gstobject.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gstconnection.c b/gst/gstconnection.c index 4e0dcf1f7..50a8bd5ba 100644 --- a/gst/gstconnection.c +++ b/gst/gstconnection.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstconnection.c: GstConnection element (depracated) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#include "gst_private.h" + #include "gstconnection.h" diff --git a/gst/gstconnection.h b/gst/gstconnection.h index 1640ff4ee..751fcab70 100644 --- a/gst/gstconnection.h +++ b/gst/gstconnection.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstconnection.h: Header for GstConnection element (depracated) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gstcpu.c b/gst/gstcpu.c index 928573ae5..52758a34e 100644 --- a/gst/gstcpu.c +++ b/gst/gstcpu.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstcpu.c: CPU detection and architecture-specific routines * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,12 +22,11 @@ #include <glib.h> -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "gst_private.h" #include "gstcpu.h" + static guint32 _gst_cpu_flags; #ifdef HAVE_CPU_I386 diff --git a/gst/gstcpu.h b/gst/gstcpu.h index 306c67995..f31e70925 100644 --- a/gst/gstcpu.h +++ b/gst/gstcpu.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstcpu.h: Header for CPU-specific routines * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gstdebug.h b/gst/gstdebug.h index b43833205..e07fe45dc 100644 --- a/gst/gstdebug.h +++ b/gst/gstdebug.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstdebug.h: Debugging helper macros * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gstelement.c b/gst/gstelement.c index f657fa6d6..442f9896a 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstelement.c: The base element, all elements derive from this * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,10 +20,13 @@ * Boston, MA 02111-1307, USA. */ -#include "gstdebug.h" +//#define GST_DEBUG_ENABLED +#include "gst_private.h" + #include "gstelement.h" #include "gstextratypes.h" + /* Element signals and args */ enum { STATE_CHANGE, @@ -371,9 +377,10 @@ gst_element_set_state (GstElement *element, GstElementState state) /* if that outright didn't work, we need to bail right away */ /* NOTE: this will bail on ASYNC as well! */ - if (return_val != GST_STATE_SUCCESS && - return_val != GST_STATE_ASYNC) + if (return_val == GST_STATE_FAILURE) { +// DEBUG("have async return from '%s'\n",gst_element_get_name(element)); return return_val; + } } /* this is redundant, really, it will always return SUCCESS */ diff --git a/gst/gstelement.h b/gst/gstelement.h index 3dfe90175..b8b6801ad 100644 --- a/gst/gstelement.h +++ b/gst/gstelement.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstelement.h: Header for GstElement * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,8 +24,8 @@ #ifndef __GST_ELEMENT_H__ #define __GST_ELEMENT_H__ - #include <gnome-xml/parser.h> + #include <gst/gstlog.h> #include <gst/gstobject.h> #include <gst/gstpad.h> diff --git a/gst/gstelementfactory.c b/gst/gstelementfactory.c index 8efdcf357..a6542eda7 100644 --- a/gst/gstelementfactory.c +++ b/gst/gstelementfactory.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstelementfactory.c: GstElementFactory object, support routines * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,8 +21,8 @@ */ //#define DEBUG_ENABLED +#include "gst_private.h" -#include "gstdebug.h" #include "gstelement.h" #include "gstplugin.h" diff --git a/gst/gstextratypes.c b/gst/gstextratypes.c index c23898afc..75e8a3a9b 100644 --- a/gst/gstextratypes.c +++ b/gst/gstextratypes.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstextratypes.c: Extra GtkTypes: filename type, etc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#include "gst_private.h" + #include "gstextratypes.h" GtkType diff --git a/gst/gstextratypes.h b/gst/gstextratypes.h index 7d39009b8..e482be63b 100644 --- a/gst/gstextratypes.h +++ b/gst/gstextratypes.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstextratypes.h: Header for extra GtkTypes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,6 +26,7 @@ #include <gtk/gtk.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gstfilter.c b/gst/gstfilter.c index 5bfe20847..2fe81b1b9 100644 --- a/gst/gstfilter.c +++ b/gst/gstfilter.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstfilter.c: GstFilter element (depracated) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#include "gst_private.h" + #include "gstfilter.h" diff --git a/gst/gstfilter.h b/gst/gstfilter.h index 2764bd18f..67ffd30a7 100644 --- a/gst/gstfilter.h +++ b/gst/gstfilter.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstfilter.h: Header for GstFilter element (depracated) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,6 +26,7 @@ #include <gst/gstelement.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gsti386.h b/gst/gsti386.h index 0201be664..628374471 100644 --- a/gst/gsti386.h +++ b/gst/gsti386.h @@ -1,5 +1,8 @@ /* GStreamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gsti386.h: Header for x86-specific architecture issues * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gstlog.h b/gst/gstlog.h index e9b353ba9..cba96eb92 100644 --- a/gst/gstlog.h +++ b/gst/gstlog.h @@ -1,8 +1,11 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstlog.h: Header for event logging (depracated?) * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * 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. * diff --git a/gst/gstmeta.c b/gst/gstmeta.c index db3621842..42484e9f7 100644 --- a/gst/gstmeta.c +++ b/gst/gstmeta.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstmeta.c: Metadata subsystem for describing buffer properties * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,6 +20,7 @@ * Boston, MA 02111-1307, USA. */ +#include "gst_private.h" #include "gstmeta.h" #include "gsttrace.h" diff --git a/gst/gstmeta.h b/gst/gstmeta.h index cb8d6008e..3a6ae4491 100644 --- a/gst/gstmeta.h +++ b/gst/gstmeta.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstmeta.h: Header for metadata subsystem * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,15 +26,16 @@ #define __GST_META_H__ #include <glib.h> - + #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #ifdef HAVE_ATOMIC_H #include <asm/atomic.h> #endif + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gstobject.c b/gst/gstobject.c index c12e88e20..07d9a0ed5 100644 --- a/gst/gstobject.c +++ b/gst/gstobject.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstobject.c: Fundamental class used for all of GStreamer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#include "gst_private.h" + #include "gstobject.h" /* Object signals and args */ diff --git a/gst/gstobject.h b/gst/gstobject.h index b44370f3b..14bec67a7 100644 --- a/gst/gstobject.h +++ b/gst/gstobject.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstobject.h: Header for base GstObject * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,7 +28,7 @@ #include <gst/gsttrace.h> #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #ifdef HAVE_ATOMIC_H diff --git a/gst/gstpad.c b/gst/gstpad.c index 1bf181f0e..8aeab156e 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstpad.c: Pads for connecting elements together * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gstpad.h b/gst/gstpad.h index 571598ff2..d404ffef1 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstpad.h: Header for GstPad object * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,7 +24,6 @@ #ifndef __GST_PAD_H__ #define __GST_PAD_H__ - #include <gnome-xml/parser.h> #include <gst/gstobject.h> @@ -29,6 +31,7 @@ #include <gst/cothreads.h> #include <gst/gstcaps.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gstpipeline.c b/gst/gstpipeline.c index 9d55996ec..af34e1edd 100644 --- a/gst/gstpipeline.c +++ b/gst/gstpipeline.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstpipeline.c: Overall pipeline management element * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,8 +21,8 @@ */ //#define GST_DEBUG_ENABLED +#include "gst_private.h" -#include "gstdebug.h" #include "gstpipeline.h" #include "gstthread.h" #include "gstsink.h" @@ -27,6 +30,7 @@ #include "gsttype.h" #include "gstautoplug.h" + GstElementDetails gst_pipeline_details = { "Pipeline object", "Bin", diff --git a/gst/gstpipeline.h b/gst/gstpipeline.h index bfbbb3868..5ab0afe10 100644 --- a/gst/gstpipeline.h +++ b/gst/gstpipeline.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstpipeline.h: Header for GstPipeline element * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,9 +24,9 @@ #ifndef __GST_PIPELINE_H__ #define __GST_PIPELINE_H__ - #include <gst/gstbin.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gstplugin.c b/gst/gstplugin.c index 13ca3945a..a0c67d2dc 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -1,11 +1,14 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstplugin.c: Plugin subsystem for loading elements, types, and libs * * 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 @@ -17,17 +20,15 @@ * Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <sys/types.h> #include <sys/stat.h> #include <dirent.h> #include <unistd.h> #include <string.h> -#include "gstdebug.h" +//#define GST_DEBUG_ENABLED +#include "gst_private.h" + #include "gstplugin.h" diff --git a/gst/gstplugin.h b/gst/gstplugin.h index 997fd39f7..7f9e535cc 100644 --- a/gst/gstplugin.h +++ b/gst/gstplugin.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstplugin.h: Header for plugin subsystem * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -27,6 +30,7 @@ #include <gst/gsttype.h> #include <gst/gstelement.h> + typedef struct _GstPlugin GstPlugin; typedef struct _GstPluginElement GstPluginElement; diff --git a/gst/gstppc.h b/gst/gstppc.h index f98d10300..c23b7c77b 100644 --- a/gst/gstppc.h +++ b/gst/gstppc.h @@ -1,5 +1,8 @@ /* GStreamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstppc.h: Header for PPC-specific architecture issues * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gstprops.c b/gst/gstprops.c index 1dd465f6d..6e03d114e 100644 --- a/gst/gstprops.c +++ b/gst/gstprops.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstprops.c: Properties subsystem for generic usage * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,11 +21,12 @@ */ #define DEBUG_ENABLED +#include "gst_private.h" -#include "gstdebug.h" #include "gstprops.h" #include "gstpropsprivate.h" + static gboolean gst_props_entry_check_compatibility (GstPropsEntry *entry1, GstPropsEntry *entry2); diff --git a/gst/gstprops.h b/gst/gstprops.h index c7311e367..57079b1d7 100644 --- a/gst/gstprops.h +++ b/gst/gstprops.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstprops.h: Header for properties subsystem * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,6 +27,7 @@ #include <glib.h> #include <gnome-xml/parser.h> + typedef struct _GstProps GstProps; typedef gpointer GstPropsFactoryEntry; typedef GstPropsFactoryEntry GstPropsFactory[]; diff --git a/gst/gstpropsprivate.h b/gst/gstpropsprivate.h index ebdec45c8..8a5fb057f 100644 --- a/gst/gstpropsprivate.h +++ b/gst/gstpropsprivate.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstpropsprivate.h: Private header for properties subsystem * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gstscheduler.c b/gst/gstscheduler.c index 40fb11d22..acf62ebfa 100644 --- a/gst/gstscheduler.c +++ b/gst/gstscheduler.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstscheduler.c: Default scheduling code for most cases * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,9 +21,9 @@ */ //#define GST_DEBUG_ENABLED +#include "gst_private.h" #include "gstscheduler.h" -#include "gstdebug.h" static int diff --git a/gst/gstscheduler.h b/gst/gstscheduler.h index a57348f81..5cfbfff80 100644 --- a/gst/gstscheduler.h +++ b/gst/gstscheduler.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstscheduler.h: Header for default scheduler code * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,6 +26,7 @@ #include <gst/gstbin.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gstsink.c b/gst/gstsink.c index 235fb3d47..046ca1aee 100644 --- a/gst/gstsink.c +++ b/gst/gstsink.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstsink.c: GstSink object (depracated) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,6 +20,7 @@ * Boston, MA 02111-1307, USA. */ +#include "gst_private.h" #include "gstsink.h" diff --git a/gst/gstsink.h b/gst/gstsink.h index e64ad8a13..a049a34f7 100644 --- a/gst/gstsink.h +++ b/gst/gstsink.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstsink.h: Header for GstSink element (depracated) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,7 +24,6 @@ #ifndef __GST_SINK_H__ #define __GST_SINK_H__ - #include <gst/gstelement.h> diff --git a/gst/gstsrc.c b/gst/gstsrc.c index 29aab57e1..635348840 100644 --- a/gst/gstsrc.c +++ b/gst/gstsrc.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstsrc.c: GstSrc object (depracated) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#include "gst_private.h" + #include "gstsrc.h" diff --git a/gst/gstsrc.h b/gst/gstsrc.h index 36b12c983..75cdd5bae 100644 --- a/gst/gstsrc.h +++ b/gst/gstsrc.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstsrc.h: Header for GstSrc element (depracated) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,9 +24,9 @@ #ifndef __GST_SRC_H__ #define __GST_SRC_H__ - #include <gst/gstelement.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gsttee.c b/gst/gsttee.c index 7c69dba4d..c59b87809 100644 --- a/gst/gsttee.c +++ b/gst/gsttee.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gsttee.c: Tee element, one in N out * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,8 +20,11 @@ * Boston, MA 02111-1307, USA. */ +#include "gst_private.h" + #include "gsttee.h" + GstElementDetails gst_tee_details = { "Tee pipe fitting", "Tee", diff --git a/gst/gsttee.h b/gst/gsttee.h index e2a204682..79c558cda 100644 --- a/gst/gsttee.h +++ b/gst/gsttee.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gsttee.h: Header for GstTee element * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,9 +24,9 @@ #ifndef __GST_TEE_H__ #define __GST_TEE_H__ - #include <gst/gstfilter.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gstthread.c b/gst/gstthread.c index 172accfd4..be867edcb 100644 --- a/gst/gstthread.c +++ b/gst/gstthread.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstthread.c: Threaded container object * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,8 +22,11 @@ #include <unistd.h> +//#define GST_DEBUG_ENABLED +#include "gst_private.h" + #include "gstthread.h" -#include "gstdebug.h" + GstElementDetails gst_thread_details = { "Threaded container", @@ -57,6 +63,7 @@ static void gst_thread_restore_thyself (GstElement *element,xmlNodePtr parent GHashTable *elements); static void gst_thread_signal_thread (GstThread *thread); +static void gst_thread_wait_thread (GstThread *thread); static void gst_thread_create_plan_dummy (GstBin *bin); static void* gst_thread_main_loop (void *arg); @@ -216,7 +223,7 @@ gst_thread_change_state (GstElement *element) pending = GST_STATE_PENDING (element); transition = GST_STATE_TRANSITION (element); - if (pending == GST_STATE (element)) return GST_STATE_SUCCESS; +// if (pending == GST_STATE (element)) return GST_STATE_SUCCESS; GST_FLAG_UNSET (thread, GST_THREAD_STATE_SPINNING); @@ -228,34 +235,37 @@ gst_thread_change_state (GstElement *element) switch (transition) { case GST_STATE_NULL_TO_READY: - if (!stateset) return FALSE; +// if (!stateset) return FALSE; // we want to prepare our internal state for doing the iterations gst_info("gstthread: preparing thread \"%s\" for iterations:\n", gst_element_get_name (GST_ELEMENT (element))); - + // set the state to idle GST_FLAG_UNSET (thread, GST_THREAD_STATE_SPINNING); // create the thread if that's what we're supposed to do gst_info("gstthread: flags are 0x%08x\n", GST_FLAGS (thread)); - + if (GST_FLAG_IS_SET (thread, GST_THREAD_CREATE)) { gst_info("gstthread: starting thread \"%s\"\n", gst_element_get_name (GST_ELEMENT (element))); - + + // create the thread pthread_create (&thread->thread_id, NULL, gst_thread_main_loop, thread); + + // wait for it to 'spin up' +// gst_thread_wait_thread (thread); } else { gst_info("gstthread: NOT starting thread \"%s\"\n", gst_element_get_name (GST_ELEMENT (element))); } - return GST_STATE_ASYNC; break; case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_READY_TO_PLAYING: if (!stateset) return FALSE; gst_info("gstthread: starting thread \"%s\"\n", gst_element_get_name (GST_ELEMENT (element))); - + GST_FLAG_SET (thread, GST_THREAD_STATE_SPINNING); gst_thread_signal_thread (thread); break; @@ -295,16 +305,16 @@ gst_thread_main_loop (void *arg) gst_info("gstthread: thread \"%s\" is running with PID %d\n", gst_element_get_name (GST_ELEMENT (thread)), getpid ()); + // construct the plan and signal back if (GST_BIN_CLASS (parent_class)->create_plan) GST_BIN_CLASS (parent_class)->create_plan (GST_BIN (thread)); + gst_thread_signal_thread (thread); while (!GST_FLAG_IS_SET (thread, GST_THREAD_STATE_REAPING)) { if (GST_FLAG_IS_SET (thread, GST_THREAD_STATE_SPINNING)) gst_bin_iterate (GST_BIN (thread)); else { - g_mutex_lock (thread->lock); - g_cond_wait (thread->cond, thread->lock); - g_mutex_unlock (thread->lock); + gst_thread_wait_thread (thread); } } @@ -319,11 +329,22 @@ gst_thread_main_loop (void *arg) static void gst_thread_signal_thread (GstThread *thread) { + DEBUG("signaling thread\n"); g_mutex_lock (thread->lock); g_cond_signal (thread->cond); g_mutex_unlock (thread->lock); } +static void +gst_thread_wait_thread (GstThread *thread) +{ + DEBUG("waiting for thread\n"); + g_mutex_lock (thread->lock); + g_cond_wait (thread->cond, thread->lock); + g_mutex_unlock (thread->lock); +} + + static void gst_thread_restore_thyself (GstElement *element, xmlNodePtr parent, diff --git a/gst/gstthread.h b/gst/gstthread.h index 02a115637..8c53a118a 100644 --- a/gst/gstthread.h +++ b/gst/gstthread.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstthread.h: Header for GstThread object * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,11 +24,11 @@ #ifndef __GST_THREAD_H__ #define __GST_THREAD_H__ - #include <pthread.h> #include <gst/gstbin.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gst/gsttrace.c b/gst/gsttrace.c index 3101fd525..182cdc9f0 100644 --- a/gst/gsttrace.c +++ b/gst/gsttrace.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gsttrace.c: Tracing functions (depracated) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,8 +28,11 @@ #include <fcntl.h> #include <string.h> +#include "gst_private.h" + #include "gsttrace.h" + #ifdef HAVE_RDTS __inline__ void read_tsc(guint64 *dst) { __asm__ __volatile__ diff --git a/gst/gsttrace.h b/gst/gsttrace.h index 36a588f19..9af6e6e12 100644 --- a/gst/gsttrace.h +++ b/gst/gsttrace.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gsttrace.h: Header for tracing functions (depracated) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,6 +26,7 @@ #include <glib.h> + typedef struct _GstTrace GstTrace; typedef struct _GstTraceEntry GstTraceEntry; diff --git a/gst/gsttype.c b/gst/gsttype.c index f3ad1dd55..caf66008f 100644 --- a/gst/gsttype.c +++ b/gst/gsttype.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gsttype.c: Media-type management functions * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,10 +29,12 @@ #include <string.h> -#include "gstdebug.h" +#include "gst_private.h" + #include "gsttype.h" #include "gstplugin.h" + /* global list of registered types */ GList *_gst_types; guint16 _gst_maxtype; diff --git a/gst/gsttype.h b/gst/gsttype.h index f5b0d8a88..571e3c008 100644 --- a/gst/gsttype.h +++ b/gst/gsttype.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gsttype.h: Header for type management * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,7 +24,6 @@ #ifndef __GST_TYPE_H__ #define __GST_TYPE_H__ - #include <gst/gstbuffer.h> #include <gst/gstcaps.h> diff --git a/gst/gstutils.c b/gst/gstutils.c index 18706866e..baaae4c7b 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstutils.c: Utility functions: gtk_get_arg stuff, etc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gstutils.h b/gst/gstutils.h index c1a7ba0a2..a6465fee0 100644 --- a/gst/gstutils.h +++ b/gst/gstutils.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstutils.h: Header for various utility functions * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/gstxml.c b/gst/gstxml.c index 4a08f811c..63bae9a86 100644 --- a/gst/gstxml.c +++ b/gst/gstxml.c @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstxml.c: XML save/restore of pipelines * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,9 +20,11 @@ * Boston, MA 02111-1307, USA. */ -#include "gstdebug.h" +#include "gst_private.h" + #include "gstxml.h" + static void gst_xml_class_init (GstXMLClass *klass); static void gst_xml_init (GstXML *xml); diff --git a/gst/gstxml.h b/gst/gstxml.h index 3c5714be8..85f2980d1 100644 --- a/gst/gstxml.h +++ b/gst/gstxml.h @@ -1,5 +1,8 @@ -/* Gnome-Streamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu> + * 2000 Wim Taymans <wtay@chello.be> + * + * gstxml.h: Header for XML save/restore operations * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,13 +20,13 @@ * Boston, MA 02111-1307, USA. */ - #ifndef __GST_XML_H__ #define __GST_XML_H__ #include <gnome-xml/parser.h> #include <gst/gstelement.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/plugins/elements/gstasyncdisksrc.h b/plugins/elements/gstasyncdisksrc.h index 826e8d5eb..cc46ec473 100644 --- a/plugins/elements/gstasyncdisksrc.h +++ b/plugins/elements/gstasyncdisksrc.h @@ -22,7 +22,6 @@ #define __GST_ASYNCDISKSRC_H__ -#include <config.h> #include <gst/gst.h> diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index eaf637d3c..19fd6a086 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -132,7 +132,7 @@ gst_queue_init (GstQueue *queue) queue->queue = NULL; queue->level_buffers = 0; - queue->max_buffers = 20; + queue->max_buffers = 100; queue->block = TRUE; queue->level_bytes = 0; queue->size_buffers = 0; |