Remove old documentation system

Original commit message from CVS:
* README-docs:
* configure.ac:
* Makefile.am:
Remove old documentation system
* gst/gst.defs:
* gst/gst-types.defs:
Updating defs files
* gst/gst.override:
Wrapped gst_flow_get_name() for const-gchar *
* gst/gstelement.override:
I really should test everything on 32 AND 64 bits systems...
* gst/gstevent.override:
Updated gst_event_new_seek() wrapper
Added gst_event_get_structure() wrapper
* gst/gstmodule.c:
Changed definition of gst.CLOCK_TIME_NONE to wrap GST_CLOCK_TIME_NONE
* testsuite/testhelpermodule.c:
gst_event_new --> gst_event_new_custom
This commit is contained in:
Edward Hervey 2005-08-01 09:59:55 +00:00
parent 79554d544f
commit 32dbfea730
11 changed files with 262 additions and 182 deletions

View file

@ -1,3 +1,30 @@
2005-08-01 Edward Hervey <edward@fluendo.com>
* README-docs:
* configure.ac:
* Makefile.am:
Remove old documentation system
* gst/gst.defs:
* gst/gst-types.defs:
Updating defs files
* gst/gst.override:
Wrapped gst_flow_get_name() for const-gchar *
* gst/gstelement.override:
I really should test everything on 32 AND 64 bits systems...
* gst/gstevent.override:
Updated gst_event_new_seek() wrapper
Added gst_event_get_structure() wrapper
* gst/gstmodule.c:
Changed definition of gst.CLOCK_TIME_NONE to wrap GST_CLOCK_TIME_NONE
* testsuite/testhelpermodule.c:
gst_event_new --> gst_event_new_custom
2005-07-25 Edward Hervey <edward@fluendo.com>
* gst/gst-types.defs: (GhostPad):

View file

@ -1,20 +1,12 @@
if BUILD_DOCS
SUBDIRS_DOCS = docs
else
SUBDIRS_DOCS =
endif
UNCONDDIRS = examples gst pkgconfig testsuite
SUBDIRS = \
$(UNCONDDIRS) \
$(SUBDIRS_DOCS)
DIST_SUBDIRS = $(UNCONDDIRS) docs
$(UNCONDDIRS)
DIST_SUBDIRS = $(UNCONDDIRS)
EXTRA_DIST = \
ltihooks.py \
gst-python.spec.in \
gst-python.spec \
README-docs \
RELEASE
include $(top_srcdir)/common/release.mak

View file

@ -1,2 +0,0 @@
Some documentation is generated from XML DocBook sources in docs/ when a new
release is created. This currently includes README, NEWS, TODO, and AUTHORS.

View file

@ -86,50 +86,6 @@ AM_CONDITIONAL(BUILD_INTERFACES, test "x$HAVE_INTERFACES" = "xyes")
AC_SUBST(GST_INTERFACES_CFLAGS)
AC_SUBST(GST_INTERFACES_LIBS)
BUILD_DOCS=yes
AC_CHECK_PROG(XMLTO, xmlto, xmlto, no)
if test "x$XMLTO" = xno ; then
BUILD_DOCS=no
fi
AC_SUBST(XMLTO)
AC_CHECK_PROG(XMLCATALOG, xmlcatalog, xmlcatalog, no)
if test "x$XMLCATALOG" = xno ; then
BUILD_DOCS=no
fi
AC_SUBST(XMLCATALOG)
AC_CHECK_PROG(XMLLINT, xmllint, xmllint, no)
if test "x$XMLLINT" = xno ; then
BUILD_DOCS=no
fi
AC_SUBST(XMLLINT)
AC_ARG_ENABLE(docs,
AC_HELP_STRING([--enable-docs],[enable building of documentation]),
[case "${enableval}" in
yes)
if test "x$XMLTO" = "xno" ; then
AC_MSG_ERROR([you don't have xmlto, so don't use --enable-docs])
BUILD_DOCS=no
fi
if test "x$XMLCATALOG" = "xno" ; then
AC_MSG_ERROR([you don't have xmlcatalog, so don't use --enable-docs])
BUILD_DOCS=no
fi
if test "x$XMLLINT" = "xno" ; then
AC_MSG_ERROR([you don't have xmllint, so don't use --enable-docs])
BUILD_DOCS=no
fi
;;
no)
BUILD_DOCS=no
;;
*)
AC_MSG_ERROR(bad value ${enableval} for --enable-docs)
;;
esac])
AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes")
dnl decide on error flags
dnl if we support -Wall, set it unconditionally
AS_COMPILER_FLAG(-Wall,
@ -164,13 +120,12 @@ changequote([,])dnl
AC_OUTPUT([
Makefile
pygst.py
examples/Makefile
gst/Makefile
pkgconfig/Makefile
pkgconfig/gst-python.pc
pkgconfig/gst-python-uninstalled.pc
docs/Makefile
docs/gst-python.ent
testsuite/Makefile
gst-python.spec
])

View file

@ -427,38 +427,28 @@
)
)
(define-flags EventFlag
(in-module "Gst")
(c-name "GstEventFlag")
(gtype-id "GST_TYPE_EVENT_FLAG")
(values
'("event-flag-none" "GST_EVENT_FLAG_NONE")
'("rate-flag-negative" "GST_RATE_FLAG_NEGATIVE")
)
)
(define-flags SeekType
(define-enum SeekType
(in-module "Gst")
(c-name "GstSeekType")
(gtype-id "GST_TYPE_SEEK_TYPE")
(values
'("method-cur" "GST_SEEK_METHOD_CUR")
'("method-set" "GST_SEEK_METHOD_SET")
'("method-end" "GST_SEEK_METHOD_END")
'("flag-flush" "GST_SEEK_FLAG_FLUSH")
'("flag-accurate" "GST_SEEK_FLAG_ACCURATE")
'("flag-key-unit" "GST_SEEK_FLAG_KEY_UNIT")
'("flag-segment-loop" "GST_SEEK_FLAG_SEGMENT_LOOP")
'("none" "GST_SEEK_TYPE_NONE")
'("cur" "GST_SEEK_TYPE_CUR")
'("set" "GST_SEEK_TYPE_SET")
'("end" "GST_SEEK_TYPE_END")
)
)
(define-enum SeekAccuracy
(define-flags SeekFlags
(in-module "Gst")
(c-name "GstSeekAccuracy")
(gtype-id "GST_TYPE_SEEK_ACCURACY")
(c-name "GstSeekFlags")
(gtype-id "GST_TYPE_SEEK_FLAGS")
(values
'("certain" "GST_SEEK_CERTAIN")
'("fuzzy" "GST_SEEK_FUZZY")
'("none" "GST_SEEK_FLAG_NONE")
'("flush" "GST_SEEK_FLAG_FLUSH")
'("accurate" "GST_SEEK_FLAG_ACCURATE")
'("key-unit" "GST_SEEK_FLAG_KEY_UNIT")
'("segment" "GST_SEEK_FLAG_SEGMENT")
)
)
@ -660,12 +650,13 @@
(c-name "GstPadLinkReturn")
(gtype-id "GST_TYPE_PAD_LINK_RETURN")
(values
'("nosched" "GST_PAD_LINK_NOSCHED")
'("noformat" "GST_PAD_LINK_NOFORMAT")
'("refused" "GST_PAD_LINK_REFUSED")
'("wrong-direction" "GST_PAD_LINK_WRONG_DIRECTION")
'("was-linked" "GST_PAD_LINK_WAS_LINKED")
'("ok" "GST_PAD_LINK_OK")
'("wrong-hierarchy" "GST_PAD_LINK_WRONG_HIERARCHY")
'("was-linked" "GST_PAD_LINK_WAS_LINKED")
'("wrong-direction" "GST_PAD_LINK_WRONG_DIRECTION")
'("noformat" "GST_PAD_LINK_NOFORMAT")
'("nosched" "GST_PAD_LINK_NOSCHED")
'("refused" "GST_PAD_LINK_REFUSED")
)
)

View file

@ -962,10 +962,13 @@
(c-name "gst_element_seek")
(return-type "gboolean")
(parameters
'("GstSeekType" "seek_method")
'("GstFormat" "seek_format")
'("GstSeekType" "seek_flags")
'("guint64" "offset")
'("gdouble" "rate")
'("GstFormat" "format")
'("GstSeekFlags" "flags")
'("GstSeekType" "cur_type")
'("gint64" "cur")
'("GstSeekType" "stop_type")
'("gint64" "stop")
)
)
@ -1331,18 +1334,13 @@
(return-type "GType")
)
(define-function gst_event_flag_get_type
(c-name "gst_event_flag_get_type")
(return-type "GType")
)
(define-function gst_seek_type_get_type
(c-name "gst_seek_type_get_type")
(return-type "GType")
)
(define-function gst_seek_accuracy_get_type
(c-name "gst_seek_accuracy_get_type")
(define-function gst_seek_flags_get_type
(c-name "gst_seek_flags_get_type")
(return-type "GType")
)
@ -1568,93 +1566,142 @@
(return-type "GType")
)
(define-function gst_event_new
(c-name "gst_event_new")
(is-constructor-of "GstEvent")
(define-function gst_event_new_custom
(c-name "gst_event_new_custom")
(return-type "GstEvent*")
(parameters
'("GstEventType" "type")
'("GstStructure*" "structure")
)
)
(define-method s_contains
(of-object "GstEventMask")
(c-name "gst_event_masks_contains")
(return-type "gboolean")
(define-method get_structure
(of-object "GstEvent")
(c-name "gst_event_get_structure")
(return-type "const-GstStructure*")
)
(define-function gst_event_new_flush_start
(c-name "gst_event_new_flush_start")
(return-type "GstEvent*")
)
(define-function gst_event_new_flush_stop
(c-name "gst_event_new_flush_stop")
(return-type "GstEvent*")
)
(define-function gst_event_new_eos
(c-name "gst_event_new_eos")
(return-type "GstEvent*")
)
(define-function gst_event_new_newsegment
(c-name "gst_event_new_newsegment")
(return-type "GstEvent*")
(parameters
'("GstEventMask*" "mask")
'("gdouble" "rate")
'("GstFormat" "format")
'("gint64" "start_value")
'("gint64" "stop_value")
'("gint64" "base")
)
)
(define-function event_new_seek
(define-method parse_newsegment
(of-object "GstEvent")
(c-name "gst_event_parse_newsegment")
(return-type "none")
(parameters
'("gdouble*" "rate")
'("GstFormat*" "format")
'("gint64*" "start_value")
'("gint64*" "end_value")
'("gint64*" "base")
)
)
(define-function gst_event_new_tag
(c-name "gst_event_new_tag")
(return-type "GstEvent*")
(parameters
'("GstTagList*" "taglist")
)
)
(define-method parse_tag
(of-object "GstEvent")
(c-name "gst_event_parse_tag")
(return-type "none")
(parameters
'("GstTagList**" "taglist")
)
)
(define-function gst_event_new_filler
(c-name "gst_event_new_filler")
(return-type "GstEvent*")
)
(define-function gst_event_new_qos
(c-name "gst_event_new_qos")
(return-type "GstEvent*")
(parameters
'("gdouble" "proportion")
'("GstClockTimeDiff" "diff")
'("GstClockTime" "timestamp")
)
)
(define-method parse_qos
(of-object "GstEvent")
(c-name "gst_event_parse_qos")
(return-type "none")
(parameters
'("gdouble*" "proportion")
'("GstClockTimeDiff*" "diff")
'("GstClockTime*" "timestamp")
)
)
(define-function gst_event_new_seek
(c-name "gst_event_new_seek")
(return-type "GstEvent*")
(parameters
'("GstSeekType" "type")
'("gint64" "offset")
)
)
(define-function event_new_segment_seek
(c-name "gst_event_new_segment_seek")
(return-type "GstEvent*")
(parameters
'("GstSeekType" "type")
'("gint64" "start")
'("gdouble" "rate")
'("GstFormat" "format")
'("GstSeekFlags" "flags")
'("GstSeekType" "cur_type")
'("gint64" "cur")
'("GstSeekType" "stop_type")
'("gint64" "stop")
)
)
(define-function event_new_size
(c-name "gst_event_new_size")
(return-type "GstEvent*")
(parameters
'("GstFormat" "format")
'("gint64" "value")
)
)
(define-function event_new_discontinuous
(c-name "gst_event_new_discontinuous")
(return-type "GstEvent*")
(parameters
'("gdouble" "rate")
'("GstFormat" "format1")
)
(varargs #t)
)
(define-function event_new_discontinuous_valist
(c-name "gst_event_new_discontinuous_valist")
(return-type "GstEvent*")
(parameters
'("gdouble" "rate")
'("GstFormat" "format1")
'("va_list" "var_args")
)
)
(define-method discont_get_value
(define-method parse_seek
(of-object "GstEvent")
(c-name "gst_event_discont_get_value")
(return-type "gboolean")
(c-name "gst_event_parse_seek")
(return-type "none")
(parameters
'("GstFormat" "format")
'("gint64*" "start_value")
'("gint64*" "end_value")
'("gdouble*" "rate")
'("GstFormat*" "format")
'("GstSeekFlags*" "flags")
'("GstSeekType*" "cur_type")
'("gint64*" "cur")
'("GstSeekType*" "stop_type")
'("gint64*" "stop")
)
)
(define-function event_new_flush
(c-name "gst_event_new_flush")
(define-function gst_event_new_navigation
(c-name "gst_event_new_navigation")
(return-type "GstEvent*")
(parameters
'("gboolean" "done")
'("GstStructure*" "structure")
)
)
;; From ../gstreamer/gst/gstfilter.h
(define-function filter_run
@ -1728,6 +1775,30 @@
)
)
(define-function gst_ghost_pad_new_notarget
(c-name "gst_ghost_pad_new_notarget")
(return-type "GstPad*")
(parameters
'("const-gchar*" "name")
'("GstPadDirection" "dir")
)
)
(define-method get_target
(of-object "GstGhostPad")
(c-name "gst_ghost_pad_get_target")
(return-type "GstPad*")
)
(define-method set_target
(of-object "GstGhostPad")
(c-name "gst_ghost_pad_set_target")
(return-type "gboolean")
(parameters
'("GstPad*" "newtarget")
)
)
;; From ../gstreamer/gst/gstindex.h
@ -4233,6 +4304,15 @@
(return-type "GQuark")
)
(define-method has_name
(of-object "GstStructure")
(c-name "gst_structure_has_name")
(return-type "gboolean")
(parameters
'("const-gchar*" "name")
)
)
(define-method set_name
(of-object "GstStructure")
(c-name "gst_structure_set_name")
@ -4996,21 +5076,6 @@
)
)
(define-function event_new_tag
(c-name "gst_event_new_tag")
(return-type "GstEvent*")
(parameters
'("GstTagList*" "list")
)
)
(define-method tag_get_list
(of-object "GstEvent")
(c-name "gst_event_tag_get_list")
(return-type "GstTagList*")
)
;; From ../gstreamer/gst/gsttaginterface.h
@ -5706,6 +5771,14 @@
(return-type "GstElement*")
)
(define-function flow_get_name
(c-name "gst_flow_get_name")
(return-type "const-gchar*")
(parameters
'("GstFlowReturn" "ret")
)
)
(define-method query_position
(of-object "GstPad")
(c-name "gst_pad_query_position")

View file

@ -931,3 +931,26 @@ _wrap_gst_registry_pool_list (PyObject *what)
}
return ret;
}
%%
override gst_flow_get_name kwargs
static PyObject *
_wrap_gst_flow_get_name(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "ret", NULL };
PyObject *py_ret = NULL;
const gchar *ret;
gchar *nret;
GstFlowReturn flow;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:gst_flow_get_name", kwlist, &py_ret))
return NULL;
if (pyg_enum_get_value(GST_TYPE_FLOW_RETURN, py_ret, (gint *)&flow))
return NULL;
ret = gst_flow_get_name(flow);
if (ret) {
nret = g_strdup(ret);
return PyString_FromString(nret);
}
Py_INCREF(Py_None);
return Py_None;
}

View file

@ -412,8 +412,8 @@ _wrap_gst_element_query_position (PyGObject *self, PyObject *args)
ret = PyList_New(0);
if ((gst_element_query_position(GST_ELEMENT (self->obj), (GstFormat*) &format, &cur, &end))) {
PyList_Append(ret, PyLong_FromLong(cur));
PyList_Append(ret, PyLong_FromLong(end));
PyList_Append(ret, PyLong_FromLongLong(cur));
PyList_Append(ret, PyLong_FromLongLong(end));
PyList_Append(ret, pyg_enum_from_gtype (GST_TYPE_FORMAT, format ));
} else {
Py_INCREF(Py_None);

View file

@ -59,17 +59,27 @@ override gst_event_new_seek kwargs
static PyObject *
_wrap_gst_event_new_seek(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "type", "offset", NULL };
PyObject *py_type = NULL;
gint64 offset;
static char *kwlist[] = { "rate", "format", "flags", "cur_type", "cur", "stop_type", "stop", NULL };
GstSeekType cur_type, stop_type;
PyObject *py_format = NULL, *py_flags = NULL, *py_cur_type = NULL, *py_stop_type = NULL;
double rate;
GstEvent *ret;
GstSeekType type;
GstFormat format;
gint64 cur, stop;
GstSeekFlags flags;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OL:event_new_seek", kwlist, &py_type, &offset))
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "dOOOLOL:GstEvent.new_seek", kwlist, &rate, &py_format, &py_flags, &py_cur_type, &cur, &py_stop_type, &stop))
return NULL;
if (pyg_flags_get_value(GST_TYPE_SEEK_TYPE, py_type, (gint *)&type))
if (pyg_enum_get_value(GST_TYPE_FORMAT, py_format, (gint *)&format))
return NULL;
ret = gst_event_new_seek(type, offset);
if (pyg_flags_get_value(GST_TYPE_SEEK_FLAGS, py_flags, (gint *)&flags))
return NULL;
if (pyg_flags_get_value(GST_TYPE_SEEK_TYPE, py_cur_type, (gint *)&cur_type))
return NULL;
if (pyg_flags_get_value(GST_TYPE_SEEK_TYPE, py_stop_type, (gint *)&stop_type))
return NULL;
ret = gst_event_new_seek(rate, format, flags, cur_type, cur, stop_type, stop);
/* pygobject_new handles NULL checking */
return pygstminiobject_new_noref((GstMiniObject *)ret);
}
@ -148,3 +158,14 @@ _wrap_gst_event_new_tag(PyObject *self, PyObject *args, PyObject *kwargs)
/* pygobject_new handles NULL checking */
return pygstminiobject_new_noref((GstMiniObject *)ret);
}
%%
override gst_event_get_structure noargs
static PyObject *
_wrap_gst_event_get_structure(PyGstMiniObject *self)
{
GstStructure *ret;
ret = (GstStructure *) gst_event_get_structure(GST_EVENT(self->obj));
/* pyg_boxed_new handles NULL checking */
return pyg_boxed_new(GST_TYPE_STRUCTURE, ret, TRUE, TRUE);
}

View file

@ -150,7 +150,7 @@ init_gst (void)
PyModule_AddIntConstant(m, "MSECOND", GST_MSECOND);
PyModule_AddIntConstant(m, "NSECOND", GST_NSECOND);
PyModule_AddObject(m, "CLOCK_TIME_NONE", PyLong_FromUnsignedLongLong(-1));
PyModule_AddObject(m, "CLOCK_TIME_NONE", PyLong_FromUnsignedLongLong(GST_CLOCK_TIME_NONE));
/* LinkError exception */
PyGstExc_LinkError = PyErr_NewException("gst.LinkError",

View file

@ -26,7 +26,7 @@ _wrap_emit_event (PyObject * self, PyObject *args)
if (!PyArg_ParseTuple(args, "O|i", &obj, &event_type))
return NULL;
event = gst_event_new(event_type);
event = gst_event_new_custom(event_type, NULL);
g_signal_emit_by_name(G_OBJECT(obj->obj), "event", event);