Commit bdae23a5 authored by Erik Walthinsen's avatar Erik Walthinsen
Browse files

merge from HEAD on 20011016

Original commit message from CVS:
merge from HEAD on 20011016
parent 022e9168
......@@ -15,7 +15,7 @@ SUBDIRS_DOCS =
endif
if BUILD_TESTS
SUBDIRS_TESTS = test tests testsuite
SUBDIRS_TESTS =
else
SUBDIRS_TESTS =
endif
......@@ -47,7 +47,7 @@ EXTRA_DIST = gstreamer.spec.in gstreamer-config.in gstreamer.m4 \
gstreamer.pc.in gstreamer-uninstalled.pc.in \
configure.base autogen.sh \
LICENSE REQUIREMENTS ABOUT-NLS $(man_MANS) \
idiottest.mak ltconfig.sh
idiottest.mak
dist-hook:
cp gstreamer.spec $(distdir)
......
......@@ -79,9 +79,10 @@ CVS (using autogen.sh):
Required tools:
===============
autoconf
automake v1.4 or better
libtool v1.3.5 or better
autoconf v2.13 or better, 2.52 prefered
automake v1.4 or better, 1.5 prefered
libtool v1.4 or better
pkgconfig 0.8.0 (http://www.freedesktop.org/software/pkgconfig/)
Optional tools:
===============
......
......@@ -83,6 +83,9 @@ else
HAVE_NASM="yes"
fi
dnl Check for pkgconfig
AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, true, false)
dnl check for gtkdoc
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, true, false)
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-scanobj, :, false)
......@@ -803,8 +806,12 @@ AC_ARG_ENABLE(profiling,
esac],
[USE_PROFILING=no]) dnl Default value
dnl Default value
GST_CONFIG_DIR=/etc/gstreamer
dnl default to building registry in the source tree if we are enabling plugin build dir
if test "x$PLUGINS_USE_BUILDDIR" = xyes; then
GST_CONFIG_DIR=$builddir
else
GST_CONFIG_DIR=/etc/gstreamer
fi
AC_ARG_WITH(configdir,
[ --with-configdir specify path to use for configdir],
[case "${withval}" in
......@@ -1181,6 +1188,7 @@ libs/putbits/Makefile
libs/idct/Makefile
libs/audio/Makefile
libs/bytestream/Makefile
libs/control/Makefile
plugins/Makefile
plugins/a52dec/Makefile
plugins/aasink/Makefile
......@@ -1228,7 +1236,7 @@ plugins/rtp/Makefile
plugins/rtp/rtpsend/Makefile
plugins/mulaw/Makefile
plugins/alaw/Makefile
plugins/ffmpeg/Makefile
dnl until ffmpeg is handled by configure plugins/ffmpeg/Makefile
plugins/filters/Makefile
plugins/filters/smooth/Makefile
plugins/filters/median/Makefile
......@@ -1281,12 +1289,14 @@ plugins/gsm/Makefile
plugins/1394/Makefile
plugins/sdlsink/Makefile
plugins/dv/Makefile
plugins/synthesis/Makefile
plugins/synthesis/sinesrc/Makefile
gstplay/Makefile
dnl components/bonobo-gstmediaplay/Makefile
test/Makefile
test/xml/Makefile
test/bindings/Makefile
test/misc/Makefile
dnl someone should fix this test/misc/Makefile
test/memchunk/Makefile
test/events/Makefile
tests/Makefile
......@@ -1296,7 +1306,7 @@ tests/muxing/Makefile
testsuite/Makefile
testsuite/capsnego/Makefile
testsuite/refcounting/Makefile
testsuite/plugin/Makefile
dnl someone should fix this testsuite/plugin/Makefile
tests/nego/Makefile
examples/Makefile
examples/autoplug/Makefile
......
......@@ -19,6 +19,7 @@ recommended plugins:
optional plugins:
gstreamer-a52dec
gstreamer-aa
gstreamer-alsa
gstreamer-arts
......@@ -35,10 +36,12 @@ optional plugins:
gstreamer-jpeg
gstreamer-lame
gstreamer-mad
gstreamer-mikmod
gstreamer-mpeg2dec
gstreamer-mpg123
gstreamer-oss
gstreamer-sdl
gstreamer-sid
gstreamer-vorbis
gstreamer-x
......
......@@ -3,8 +3,8 @@
set -e
if [ "$1" = "configure" ]; then
gstreamer-register --gst-mask=0
gstreamer-compprep --gst-mask=0
gstreamer-register --gst-mask=0 || true
gstreamer-compprep --gst-mask=0 || true
fi
#DEBHELPER#
......
......@@ -3,8 +3,8 @@
set -e
if [ "$1" = "remove" ]; then
gstreamer-register --gst-mask=0
gstreamer-compprep --gst-mask=0
gstreamer-register --gst-mask=0 || true
gstreamer-compprep --gst-mask=0 || true
fi
#DEBHELPER#
......
......@@ -3,8 +3,8 @@
set -e
if [ "$1" = "configure" ]; then
gstreamer-register --gst-mask=0
gstreamer-compprep --gst-mask=0
gstreamer-register --gst-mask=0 || true
gstreamer-compprep --gst-mask=0 || true
fi
#DEBHELPER#
......
......@@ -9,6 +9,9 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
# The directory containing the source code (if it contains documentation).
DOC_SOURCE_DIR=$(top_srcdir)/gst
# thomas
# there's something wrong with gstreamer-sections.txt not being in the dist
# maybe it doesn't resolve
EXTRA_DIST = gstreamer.types.in gstreamer.hierarchy $(DOC_MODULE)-sections.txt $(DOC_MAIN_SGML_FILE)
HTML_DIR=$(datadir)/gstreamer/html
......
......@@ -16,7 +16,6 @@ gst_fakesink_get_type
gst_disksrc_get_type
@GST_HTTPSRC_GET_TYPE@
gst_fdsrc_get_type
gst_sinesrc_get_type
gst_fdsink_get_type
......
......@@ -67,8 +67,6 @@ libgst_la_SOURCES = \
gstcaps.c \
gstclock.c \
gstcpu.c \
gstdparam.c \
gstdparammanager.c \
gstelement.c \
gstelementfactory.c \
gstevent.c \
......@@ -139,12 +137,11 @@ cothreads.o: $(srcdir)/cothreads.c $(srcdir)/cothreads.h $(srcdir)/gst_private.h
# Generate both marshal files together. Makes dependency work easier.
gstmarshal.h: gstmarshal.list
glib-genmarshal --header --prefix=gst_marshal gstmarshal.list > gstmarshal.h
echo "#include \"glib-object.h\"" >gstmarshal.c
glib-genmarshal --body --prefix=gst_marshal gstmarshal.list >> gstmarshal.c
gstmarshal.c: gstmarshal.list
glib-genmarshal --header --prefix=gst_marshal gstmarshal.list > gstmarshal.h
echo "#include \"glib-object.h\"" >gstmarshal.c
echo "#include \"gstlog.h\"" >> gstmarshal.c
echo "#include \"gstmarshal.h\"" >> gstmarshal.c
glib-genmarshal --body --prefix=gst_marshal gstmarshal.list >> gstmarshal.c
##### end built sources #####
......@@ -172,8 +169,6 @@ libgstinclude_HEADERS = \
gstclock.h \
gstcpu.h \
gstdata.h \
gstdparam.h \
gstdparammanager.h \
gstelement.h \
gstevent.h \
gstextratypes.h \
......@@ -201,6 +196,18 @@ noinst_HEADERS = \
gstarch.h \
gstpropsprivate.h
CFLAGS = \
$(LIBGST_CFLAGS) \
-D_GNU_SOURCE \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
\
-W -Wpointer-arith -Wbad-function-cast \
-Wcast-align -Wsign-compare \
-Wmissing-prototypes -Wmissing-declarations \
-Wnested-externs \
-Winline -Wno-unused
CFLAGS = $(LIBGST_CFLAGS) -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" -Wall
LIBS = $(LIBGST_LIBS)
LDFLAGS = ""
......
......@@ -187,7 +187,7 @@ gst_autoplug_pads_autoplug_func (GstElement *src, GstPad *pad, GstElement *sink)
if (state == GST_STATE_PLAYING)
gst_element_set_state (GST_ELEMENT (gst_element_get_parent (src)), GST_STATE_PAUSED);
if ((connected = gst_pad_connect (pad, sinkpad))) {
if ((connected = gst_pad_try_connect (pad, sinkpad))) {
if (state == GST_STATE_PLAYING)
gst_element_set_state (GST_ELEMENT (gst_element_get_parent (src)), GST_STATE_PLAYING);
break;
......
......@@ -66,7 +66,7 @@ struct _cothread_state {
};
cothread_context* cothread_init();
cothread_context* cothread_init (void);
cothread_state* cothread_create (cothread_context *ctx);
void cothread_setfunc (cothread_state *thread, cothread_func func,
int argc, char **argv);
......
......@@ -25,7 +25,6 @@ libgstelements_la_SOURCES = \
gstpipefilter.c \
gsttee.c \
gstaggregator.c \
gstsinesrc.c \
$(GSTHTTPSRC)
noinst_HEADERS = \
......
......@@ -32,7 +32,6 @@
#include "gstfdsrc.h"
#include "gstmultidisksrc.h"
#include "gstpipefilter.h"
#include "gstsinesrc.h"
#include "gsttee.h"
#include "gstaggregator.h"
......@@ -64,7 +63,6 @@ static struct _elements_entry _elements[] = {
{ "fdsrc", gst_fdsrc_get_type, &gst_fdsrc_details, NULL },
{ "multidisksrc", gst_multidisksrc_get_type, &gst_multidisksrc_details, NULL },
{ "pipefilter", gst_pipefilter_get_type, &gst_pipefilter_details, NULL },
{ "sinesrc", gst_sinesrc_get_type, &gst_sinesrc_details, gst_sinesrc_factory_init },
{ "tee", gst_tee_get_type, &gst_tee_details, gst_tee_factory_init },
{ "aggregator", gst_aggregator_get_type, &gst_aggregator_details, gst_aggregator_factory_init },
......@@ -87,13 +85,20 @@ plugin_init (GModule *module, GstPlugin *plugin)
factory = gst_elementfactory_new (_elements[i].name,
(_elements[i].type) (),
_elements[i].details);
if (factory != NULL) {
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
if (_elements[i].factoryinit) {
_elements[i].factoryinit (factory);
if (!factory)
{
g_warning ("gst_elementfactory_new failed for `%s'",
_elements[i].name);
continue;
}
// g_print("added factory '%s'\n",_elements[i].name);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
if (_elements[i].factoryinit) {
_elements[i].factoryinit (factory);
}
// g_print("added factory '%s'\n",_elements[i].name);
i++;
}
......
......@@ -2,6 +2,7 @@
/* Modified by Jamie Gennis 06-2001 */
#include <string.h>
#include <stdio.h>
#include "gstlog.h"
#include "gobject2gtk.h"
......@@ -126,16 +127,16 @@ g2g_object_class_find_property(GObjectClass *class, const gchar *name)
//fprintf(stderr,"class name is %s\n",gtk_type_name(class->type));
gtk_object_arg_get_info(class->type,name,&info);
// the return value NULL if no error
if (gtk_object_arg_get_info(class->type,name,&info) != NULL) {
return NULL;
}
spec = g_new0(GParamSpec,1);
if (info) {
spec->name = (gchar *) name;
spec->value_type = info->type;
spec->flags = info->arg_flags;
} else {
spec->value_type = GTK_TYPE_NONE;
}
spec->name = (gchar *) name;
spec->value_type = info->type;
spec->flags = info->arg_flags;
return spec;
}
......
......@@ -23,6 +23,9 @@ GSList *g_slist_delete_link (GSList *list, GSList *llink);
typedef struct _GObject GObject;
typedef struct _GObjectClass GObjectClass;
#define g_string_printf g_string_sprintf
#define g_string_printfa g_string_sprintfa
#define g_object_ref(obj) gtk_object_ref((GtkObject *)(obj))
#define g_object_unref(obj) gtk_object_unref((GtkObject *)(obj))
......@@ -79,6 +82,7 @@ typedef struct _GObjectClass GObjectClass;
#define gst_marshal_VOID__VOID gtk_marshal_NONE__NONE
#define gst_marshal_VOID__BOOLEAN gtk_marshal_NONE__BOOL
#define gst_marshal_VOID__INT gtk_marshal_NONE__INT
#define gst_marshal_VOID__INT_INT gtk_marshal_NONE__INT_INT
#define gst_marshal_VOID__STRING gtk_marshal_NONE__STRING
#define gst_marshal_VOID__POINTER gtk_marshal_NONE__POINTER
#define gst_marshal_VOID__OBJECT gtk_marshal_NONE__POINTER
......@@ -241,7 +245,7 @@ struct _GParamSpec {
};
#define g_value_init(value,t) ((value)->type = (t))
#define g_value_copy gtk_arg_copy
#define g_value_copy(src_val,dest_val) (dest_val = gtk_arg_copy(src_val,dest_val))
#define g_value_unset(val)
#define g_object_class_install_property g2g_object_class_install_property
......
......@@ -53,6 +53,18 @@ static void load_plugin_func (gpointer data, gpointer user_data);
static GSList *preload_plugins = NULL;
const gchar *g_log_domain_gstreamer = "GStreamer";
static void
debug_log_handler (const gchar *log_domain,
GLogLevelFlags log_level,
const gchar *message,
gpointer user_data)
{
g_log_default_handler(log_domain, log_level, message, user_data);
g_on_error_query(NULL);
}
/**
* gst_init:
* @argc: pointer to application's argc
......@@ -64,6 +76,7 @@ static GSList *preload_plugins = NULL;
void
gst_init (int *argc, char **argv[])
{
GLogLevelFlags llf;
#ifndef GST_DISABLE_TRACE
GstTrace *gst_trace;
#endif
......@@ -92,6 +105,9 @@ gst_init (int *argc, char **argv[])
exit (0); // FIXME!
}
llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL;
g_log_set_handler(g_log_domain_gstreamer, llf, debug_log_handler, NULL);
GST_INFO (GST_CAT_GST_INIT, "Initializing GStreamer Core Library");
gst_object_get_type ();
......
......@@ -49,8 +49,6 @@
#include <gst/gstxml.h>
#include <gst/cothreads.h>
#include <gst/gstscheduler.h>
#include <gst/gstdparam.h>
#include <gst/gstdparammanager.h>
#include <gst/gsttimecache.h>
#include <gst/gstevent.h>
......
......@@ -61,6 +61,7 @@ GType gst_autoplug_get_type(void)
sizeof(GstAutoplug),
4,
(GInstanceInitFunc)gst_autoplug_init,
NULL
};
autoplug_type = g_type_register_static (GST_TYPE_OBJECT, "GstAutoplug", &autoplug_info, G_TYPE_FLAG_ABSTRACT);
}
......@@ -194,6 +195,7 @@ gst_autoplugfactory_get_type (void)
sizeof(GstAutoplugFactory),
0,
(GInstanceInitFunc) gst_autoplugfactory_init,
NULL
};
autoplugfactory_type = g_type_register_static (GST_TYPE_PLUGIN_FEATURE,
"GstAutoplugFactory", &autoplugfactory_info, 0);
......
......@@ -37,7 +37,7 @@ GstElementDetails gst_bin_details = {
};
static void gst_bin_real_destroy (GObject *object);
static void gst_bin_dispose (GObject *object);
static GstElementStateReturn gst_bin_change_state (GstElement *element);
static GstElementStateReturn gst_bin_change_state_norecurse (GstBin *bin);
......@@ -87,6 +87,7 @@ gst_bin_get_type (void)
sizeof(GstBin),
8,
(GInstanceInitFunc)gst_bin_init,
NULL
};
bin_type = g_type_register_static (GST_TYPE_ELEMENT, "GstBin", &bin_info, 0);
}
......@@ -122,8 +123,7 @@ gst_bin_class_init (GstBinClass *klass)
gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_bin_change_state);
// FIXME
// gobject_class->destroy = GST_DEBUG_FUNCPTR (gst_bin_real_destroy);
gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_bin_dispose);
}
static void
......@@ -170,7 +170,7 @@ gst_bin_reset_element_sched (GstElement *element, GstSchedule *sched)
// GST_SCHEDULE_ADD_ELEMENT (sched, element);
}
void
static void
gst_bin_set_element_sched (GstElement *element,GstSchedule *sched)
{
GList *children;
......@@ -211,7 +211,7 @@ gst_bin_set_element_sched (GstElement *element,GstSchedule *sched)
}
void
static void
gst_bin_unset_element_sched (GstElement *element)
{
GList *children;
......@@ -475,13 +475,13 @@ gst_bin_set_state_type (GstBin *bin,
}
static void
gst_bin_real_destroy (GObject *object)
gst_bin_dispose (GObject *object)
{
GstBin *bin = GST_BIN (object);
GList *children, *orig;
GstElement *child;
GST_DEBUG (GST_CAT_REFCOUNTING,"destroy()\n");
GST_DEBUG (GST_CAT_REFCOUNTING,"dispose\n");
if (bin->children) {
orig = children = g_list_copy (bin->children);
......@@ -500,9 +500,7 @@ gst_bin_real_destroy (GObject *object)
g_cond_free (bin->eoscond);
// FIXME!!!
// if (G_OBJECT_CLASS (parent_class)->destroy)
// G_OBJECT_CLASS (parent_class)->destroy (object);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
/**
......
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